upgrade nixpkgs and apply related fixes

nix/overlays/checked-shell-script/checked-shell-script.nix

@@ -9,8 +9,7 @@
 }:
 name: text:
 let
-  writeBin =
-    name: text:
+  bin =
     writeTextFile {
       inherit name;
       executable = true;
@@ -34,9 +33,6 @@ let
         '';
     };
 
-  bin =
-    writeBin name text;
-
   script =
     runCommand name { inherit bin name; } "ln -s $bin/bin/$name $out";
 in

nix/overlays/haskell-packages.nix

@@ -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
 {