git.iko.soy/typeable/cabal2nix
on master help sign in
update-nixpkgs: update script to commit changes to all relevant files
d0a5561Peter Simons
hackage2nix/update-nixpkgs.sh+4−4
compare with master
unifiedsplit
@@ -15,6 +15,7 @@ cabal2nix=$(git describe --dirty)
15
15
16cd nixpkgs
16cd nixpkgs
17git reset -q --hard
17git reset -q --hard
18+git clean -dxf -q
18git pull -q
19git pull -q
19export NIX_PATH=nixpkgs=$PWD
20export NIX_PATH=nixpkgs=$PWD
20cd ..
21cd ..
@@ -47,13 +48,12 @@ hackage=$(git rev-parse --verify HEAD)
47cd ..
48cd ..
48
49
49stack --verbosity 0 build --test hackage2nix
50stack --verbosity 0 build --test hackage2nix
50−stack --verbosity 0 exec hackage2nix -- >hackage-packages.nix
51+stack --verbosity 0 exec hackage2nix -- --nixpkgs=$PWD/nixpkgs
51
52
52cd nixpkgs
53cd nixpkgs
53−git pull -q
54−mv ../hackage-packages.nix pkgs/development/haskell-modules/hackage-packages.nix
54+git add pkgs/development/haskell-modules
55if [ -n "$(git status --porcelain)" ]; then
55if [ -n "$(git status --porcelain)" ]; then
56− cat <<EOF | git commit -q -F - -- pkgs/development/haskell-modules/hackage-packages.nix
56+ cat <<EOF | git commit -q -F -
57hackage-packages.nix: update Haskell package set
57hackage-packages.nix: update Haskell package set
58
58
59This update was generated by hackage2nix $cabal2nix using the following inputs:
59This update was generated by hackage2nix $cabal2nix using the following inputs: