diff options
| author | Domen Kožar <domen@dev.si> | 2018-08-14 11:41:42 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2018-08-14 11:41:42 +0100 |
| commit | 85f892b988c4412373238609c8f8a5493fa4f5f6 (patch) | |
| tree | fe2790ac9f842e0c3362e20c7aec7da1bed33c21 | |
| parent | cc671a1374baa4df136e0ed85ee14f101e132665 (diff) | |
| download | nixlib-85f892b988c4412373238609c8f8a5493fa4f5f6.tar nixlib-85f892b988c4412373238609c8f8a5493fa4f5f6.tar.gz nixlib-85f892b988c4412373238609c8f8a5493fa4f5f6.tar.bz2 nixlib-85f892b988c4412373238609c8f8a5493fa4f5f6.tar.lz nixlib-85f892b988c4412373238609c8f8a5493fa4f5f6.tar.xz nixlib-85f892b988c4412373238609c8f8a5493fa4f5f6.tar.zst nixlib-85f892b988c4412373238609c8f8a5493fa4f5f6.zip | |
stack2nix: cleanup
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f345e0b910aa..80ec7194465a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -858,9 +858,6 @@ self: super: { fluid-idl-http-client = markBroken super.fluid-idl-http-client; fluid-idl-scotty = markBroken super.fluid-idl-scotty; - # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4 - stack2nix = doJailbreak super.stack2nix; - # Work around https://github.com/haskell/c2hs/issues/192. c2hs = dontCheck super.c2hs; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74d62f70fa3a..70bd3170e4b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1013,7 +1013,7 @@ with pkgs; executableToolDepends = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/stack2nix \ - --prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin:${stack}/bin" + --prefix PATH ":" "${git}/bin:${cabal-install}/bin" ''; }); |