git.iko.soy/typeable/cabal2nix
on master help sign in
update-nixpkgs.sh: switch to "cabal new-build" for creating the hackage2nix executable
commit6e331f224a6a380916447fcc1bd8d0b563ba3350 authorPeter Simons <simons@cryp.to> dateThu 6 Jul 2017, 09:35 (9 years ago) parentaa50929
1 file changed+3−1
compare with master
unifiedsplit
update-nixpkgs.sh+3−1
update-nixpkgs.sh+3−1
@@ -38,7 +38,9 @@ gzip -k "$TAR"
3838hackage=$(git rev-parse --verify HEAD)
3939cd ..
4040
41−cabal run -v0 hackage2nix -- --nixpkgs="$PWD/nixpkgs" +RTS -M4G -RTS
41+cabal -v0 new-build hackage2nix
42+exe=( dist-newstyle/build/$(uname -m)-$(uname -s | tr '[:upper:]' '[:lower:]')/ghc-$(ghc --numeric-version)/cabal2nix-*/build/hackage2nix/hackage2nix )
43+$exe --nixpkgs="$PWD/nixpkgs" +RTS -M4G -RTS
4244
4345cd nixpkgs
4446git add pkgs/development/haskell-modules