upgrade nixpkgs and apply related fixes

2020-12-23 09:39:36 -05:00
parent bf141ca13f
commit 9cfc66a6a4
9 changed files with 51 additions and 171 deletions
@@ -2,6 +2,9 @@

 self: super:
 let
+  lib =
+    self.haskell.lib;
+
  overrides =
    final: prev:
    rec {
@@ -18,33 +21,14 @@ let
      # To get the sha256:
      #   nix-prefetch-url --unpack https://hackage.haskell.org/package/protolude-0.3.0/protolude-0.3.0.tar.gz

-      # TODO: We need to patch upstream for unbreaking hasql-dynamic-statements, hasql-implicits, ptr
      hasql-dynamic-statements =
-        self.haskell.lib.dontCheck (prev.callHackageDirect
-          {
-            pkg = "hasql-dynamic-statements";
-            ver = "0.3.1";
-            sha256 = "1zjv91xlfkyxwq6mhzj7rsfm4kjvs9ygkgbl6jbbg19jihcn2kiy";
-          }
-          { }
-        );
+        lib.dontCheck (lib.unmarkBroken prev.hasql-dynamic-statements);
+
      hasql-implicits =
-        prev.callHackageDirect
-          {
-            pkg = "hasql-implicits";
-            ver = "0.1.0.2";
-            sha256 = "1z05amiy5zmf8fmr3dqp8b4svb0sj037gdjc5b9va5d5kdi95bv7";
-          }
-          { };
+        lib.dontCheck (lib.unmarkBroken prev.hasql-implicits);
+
      ptr =
-        prev.callHackageDirect
-          {
-            pkg = "ptr";
-            ver = "0.16.7.2";
-            sha256 = "1njb05jc1bdyxk7qh7s1y4ivn5nrpy3rhlkf4jlfamvlg8idkavc";
-          }
-          { };
-      protolude = prev.protolude_0_3_0;
+        lib.dontCheck (lib.unmarkBroken prev.ptr);
    } // extraOverrides final prev;
 in
 {