hackage2nix: tweaks to update-nixpkgs script
1. The all-cabal-hashes repo defaults to the wrong branch.
2. Some people (e.g. me) might have git commit hooks configured which
prevent commits with trailing whitespace.
commit9aa1ad23606f11e0abfd70eb24bf9ee3a9aa5cbe
authorRodney Lorrimar <dev@rodney.id.au>
dateSun 7 Jan 2018, 15:48 (9 years ago)
parent6a27c62
hackage2nix/README.md+1−2
@@ -21,8 +21,7 @@ Replace `git@github.com:NixOS/nixpkgs.git` with a fork you have access to.
2121git clone git@github.com:NixOS/cabal2nix.git
2222cd cabal2nix
2323git clone git@github.com:NixOS/nixpkgs.git
24−git clone git@github.com:commercialhaskell/all-cabal-hashes.git
25−mv all-cabal-hashes hackage
24+git clone git@github.com:commercialhaskell/all-cabal-hashes.git --branch hackage hackage
2625cabal install
2726```
2827
update-nixpkgs.sh+1−1
@@ -37,7 +37,7 @@ cabal -v0 new-run hackage2nix -- --nixpkgs="$PWD/nixpkgs" +RTS -M4G -RTS
3737cd nixpkgs
3838git add pkgs/development/haskell-modules
3939if [ -n "$(git status --porcelain)" ]; then
40− cat <<EOF | git commit -q -F -
40+ cat <<EOF | git commit -n -q -F -
4141hackage-packages.nix: automatic Haskell package set update
4242
4343This update was generated by hackage2nix $cabal2nix from Hackage revision