@@ -15,6 +15,7 @@ cabal2nix=$(git describe --dirty)
1515
1616cd nixpkgs
1717git reset -q --hard
18+git clean -dxf -q
1819git pull -q
1920export NIX_PATH=nixpkgs=$PWD
2021cd ..
@@ -47,13 +48,12 @@ hackage=$(git rev-parse --verify HEAD)
4748cd ..
4849
4950stack --verbosity 0 build --test hackage2nix
50−stack --verbosity 0 exec hackage2nix -- >hackage-packages.nix
51+stack --verbosity 0 exec hackage2nix -- --nixpkgs=$PWD/nixpkgs
5152
5253cd nixpkgs
53−git pull -q
54−mv ../hackage-packages.nix pkgs/development/haskell-modules/hackage-packages.nix
54+git add pkgs/development/haskell-modules
5555if [ -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 -
5757hackage-packages.nix: update Haskell package set
5858
5959This update was generated by hackage2nix $cabal2nix using the following inputs: