git.iko.soy/typeable/cabal2nix
on master help sign in
update-nixpkgs.sh: switch to "cabal new-run" (needs a development version of cabal-install)
8d48acaPeter Simons
update-nixpkgs.sh+3−3
compare with master
unifiedsplit
@@ -30,9 +30,9 @@ done
30hackage=$(git rev-parse --verify HEAD)
30hackage=$(git rev-parse --verify HEAD)
31cd ..
31cd ..
32
32
33−cabal -v0 new-build hackage2nix
33+# This command needs a recent development version of cabal-install. I don't
34−exe=( dist-newstyle/build/$(uname -m)-$(uname -s | tr '[:upper:]' '[:lower:]')/ghc-$(ghc --numeric-version)/cabal2nix-*/build/hackage2nix/hackage2nix )
34+# think this works properly in verson 2.0.0.0 already.
35−$exe --nixpkgs="$PWD/nixpkgs" +RTS -M4G -RTS
35+cabal -v0 new-run hackage2nix -- --nixpkgs="$PWD/nixpkgs" +RTS -M4G -RTS
36
36
37cd nixpkgs
37cd nixpkgs
38git add pkgs/development/haskell-modules
38git add pkgs/development/haskell-modules