update-nixpkgs.sh: adapt to new directory structure
commit8e97f6265c98b6e4e37242933be91998ef03e56d
authorPeter Simons <simons@cryp.to>
dateWed 15 Jun 2016, 21:35 (10 years ago)
parent97d3b63
.gitignore+8−1
@@ -1,4 +1,4 @@
1−# ignore build Cabal build files
1+## ignore build Cabal build files
22
33.cabal-sandbox
44Setup
@@ -22,3 +22,10 @@ TAGS
2222.stack-work
2323/src/highlight.js
2424/src/style.css
25+
26+# hackage2nix ususally needs those two repositories around
27+
28+/hackage/*
29+/lts-haskell/*
30+/nixpkgs/*
31+/stackage-nightly/*
cabal2nix.cabal+1−1
@@ -102,7 +102,7 @@ executable hackage2nix
102102 main-is: Main.hs
103103 hs-source-dirs:
104104 hackage2nix
105− ghc-options: -Wall
105+ ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
106106 build-depends:
107107 aeson
108108 , ansi-wl-pprint
hackage2nix/.gitignoredeleted−6
@@ -1,6 +0,0 @@
1−# hackage2nix ususally needs those two repositories around
2−
3−/hackage/*
4−/lts-haskell/*
5−/nixpkgs/*
6−/stackage-nightly/*
hackage2nix/update-nixpkgs.sh → update-nixpkgs.shrenamed+1−2
@@ -48,8 +48,7 @@ gzip -k "$TAR"
4848hackage=$(git rev-parse --verify HEAD)
4949cd ..
5050
51−stack --verbosity 0 build --test hackage2nix
52−stack --verbosity 0 exec hackage2nix -- --nixpkgs="$PWD/nixpkgs" +RTS -M4G -RTS
51+cabal run -v0 hackage2nix -- --nixpkgs="$PWD/nixpkgs" +RTS -M4G -RTS
5352
5453cd nixpkgs
5554git add pkgs/development/haskell-modules