From 85f892b988c4412373238609c8f8a5493fa4f5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 14 Aug 2018 11:41:42 +0100 Subject: [PATCH] stack2nix: cleanup --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f345e0b910a..80ec7194465 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 74d62f70fa3..70bd3170e4b 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" ''; });