git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix hackage cabal revisions attempt 2 (#600)

* Revert "Update Hackage and Stackage" This reverts commit 566d63bc018e432b90072bb351ef887421f95a8b. * Fix file missed hackage-db.nix update * Remove `*` from message in case it confuses others Copying with `*` leaves out `.plan.nix`

commit5e276a6a10f15eb5bcb6304a5efebc85b8ca7c16 authorHamish Mackenzie <Hamish.Mackenzie@iohk.io> dateWed 13 May 2020, 11:25 (6 years ago) parent566d63b
3 files changed+6−6
compare with iko/ghcjs-patch-master
unifiedsplit
hackage-src.json+3−3 nix-tools/.plan.nix/hackage-db.nix+2−2 nix-tools/regenerate.nix+1−1
hackage-src.json+3−3
@@ -1,7 +1,7 @@
11{
22 "url": "https://github.com/input-output-hk/hackage.nix",
3− "rev": "4f511413473411e88c68178a4ec4b4608d9a065e",
4− "date": "2020-05-12T14:09:08+00:00",
5− "sha256": "0364f2r48yzxbkp5qzg33vs43gldi5wc0z2qx1w9z6vc4l3aj40w",
3+ "rev": "becd747fdbc1a5df1abfbfb461b727b7da82f47e",
4+ "date": "2020-05-03T01:16:00+00:00",
5+ "sha256": "03kb8ml0lhrfz7d20wichaasdaav9c5lvncpl7k73fc7gpvm8x66",
66 "fetchSubmodules": false
77}
nix-tools/.plan.nix/hackage-db.nix+2−2
@@ -75,7 +75,7 @@
7575 } // {
7676 src = (pkgs.lib).mkDefault (pkgs.fetchgit {
7777 url = "https://github.com/hamishmack/hackage-db.git";
78− rev = "f1f528db7b02d90e9953297c716de5e046f3570f";
79− sha256 = "0j86xkpndxn41sy2mchx029zc3isaxh61hdvnakpiflkcmfaji1w";
78+ rev = "3f12730c0d6092efce142cad87264e7b7eb2b05a";
79+ sha256 = "13nl8swdd3g1rh14f29v6nhnzaxgc8l70vs6hviw8qgdpbxvhs45";
8080 });
8181 }
nix-tools/regenerate.nix+1−1
@@ -82,7 +82,7 @@ writeShellScriptBin "update-nix-tools" ''
8282 rm -f nix-tools.cabal
8383 echo "--> Done."
8484 echo "******"
85− echo "*** please copy $TMP/* into haskell.nix/nix-tools"
85+ echo "*** please copy $TMP/ into haskell.nix/nix-tools"
8686 echo "***"
8787 echo "*** cp -fr "$TMP/" ."
8888 echo "***"