diff --git a/maintainers/scripts/haskell/update-cabal2nix-unstable.sh b/maintainers/scripts/haskell/update-cabal2nix-unstable.sh index c310b4b8145d..b81592b35fc7 100755 --- a/maintainers/scripts/haskell/update-cabal2nix-unstable.sh +++ b/maintainers/scripts/haskell/update-cabal2nix-unstable.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable.bin -I nixpkgs=. +#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable.bin nix-prefetch-scripts -I nixpkgs=. # Updates cabal2nix-unstable to the latest master of the nixos/cabal2nix repository. # See regenerate-hackage-packages.sh for details on the purpose of this script. diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d6ecac6df3eb..e06ed946f481 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1260,21 +1260,6 @@ builtins.intersectAttrs super { # not used to link against by anyone, we can make it’s closure smaller and # add its runtime dependencies in `haskellPackages` (as opposed to cabal2nix). cabal2nix-unstable = overrideCabal (drv: { - buildTools = (drv.buildTools or [ ]) ++ [ - pkgs.buildPackages.makeWrapper - ]; - postInstall = '' - ${drv.postInstall or ""} - - wrapProgram $out/bin/cabal2nix \ - --prefix PATH ":" "${ - pkgs.lib.makeBinPath [ - pkgs.nix - pkgs.nix-prefetch-scripts - ] - }" - ''; - passthru = drv.passthru or { } // { updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; diff --git a/pkgs/development/tools/purescript/spago/update.sh b/pkgs/development/tools/purescript/spago/update.sh index 7f8de2da7360..51988546262e 100755 --- a/pkgs/development/tools/purescript/spago/update.sh +++ b/pkgs/development/tools/purescript/spago/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix curl jq haskellPackages.cabal2nix-unstable.bin -I nixpkgs=. +#!nix-shell -i bash -p cabal2nix curl jq haskellPackages.cabal2nix-unstable.bin nix-prefetch-scripts -I nixpkgs=. # # This script will update the spago derivation to the latest version using # cabal2nix.