Merge pull request #103579 from blitz/unbreak-hail

haskellPackages.hail: relax cabal dependencies to unbreak
2020-11-12 14:08:26 +01:00 · 2020-11-12 14:08:26 +01:00 · 2de60095d2
commit 2de60095d2
parent d7c97ebde4 cd11c0c817
2 changed files with 3 additions and 4 deletions
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -1110,9 +1110,9 @@ self: super: {
      })
      (pkgs.fetchpatch {
        # Relax dependency constraints,
-        # upstream PR: https://github.com/james-preston/hail/pull/15
-        url = "https://patch-diff.githubusercontent.com/raw/james-preston/hail/pull/15.patch";
-        sha256 = "03kdvr8hxi6isb8yxp5rgcmz855n19m1yacn3d56a4i58j2mldjw";
+        # upstream PR: https://github.com/james-preston/hail/pull/16
+        url = "https://patch-diff.githubusercontent.com/raw/james-preston/hail/pull/16.patch";
+        sha256 = "0dpagpn654zjrlklihsg911lmxjj8msylbm3c68xa5aad1s9gcf7";
      })
    ];
  });
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@ -5717,7 +5717,6 @@ broken-packages:
  - Haggressive
  - hahp
  - haiji
-  - hail
  - hailgun-send
  - hairy
  - hakaru