update-nixpkgs.sh: switch to "cabal new-run" (needs a development version of cabal-install)
commit8d48acafa061f96c0d7f9dfacf02908968511e8b
authorPeter Simons <simons@cryp.to>
dateSun 1 Oct 2017, 10:22 (9 years ago)
parent5a860e4
update-nixpkgs.sh+3−3
@@ -30,9 +30,9 @@ done
3030hackage=$(git rev-parse --verify HEAD)
3131cd ..
3232
33−cabal -v0 new-build hackage2nix
34−exe=( dist-newstyle/build/$(uname -m)-$(uname -s | tr '[:upper:]' '[:lower:]')/ghc-$(ghc --numeric-version)/cabal2nix-*/build/hackage2nix/hackage2nix )
35−$exe --nixpkgs="$PWD/nixpkgs" +RTS -M4G -RTS
33+# This command needs a recent development version of cabal-install. I don't
34+# think this works properly in verson 2.0.0.0 already.
35+cabal -v0 new-run hackage2nix -- --nixpkgs="$PWD/nixpkgs" +RTS -M4G -RTS
3636
3737cd nixpkgs
3838git add pkgs/development/haskell-modules