nix: Update to latest nixpkgs#master

PostgREST · Apr 20, 2024 · 30309a1 · 30309a1
1 parent eeee1e9
commit 30309a1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 48 deletions.
diff --git a/default.nix b/default.nix
@@ -28,12 +28,6 @@ let
       sha256 = tarballHash;
     };
 
-  nixpkgs-patched = (import nixpkgs { inherit overlays system; }).applyPatches {
-    name = "nixpkgs-patched";
-    src = nixpkgs;
-    patches = [ nix/split-sections-cross.patch ];
-  };
-
   allOverlays =
     import nix/overlays;
 
@@ -52,7 +46,7 @@ let
 
   # Evaluated expression of the Nixpkgs repository.
   pkgs =
-    import nixpkgs-patched { inherit overlays system; };
+    import nixpkgs { inherit overlays system; };
 
   postgresqlVersions =
     [
@@ -88,7 +82,7 @@ let
   inherit (pkgs.haskell) lib;
 in
 rec {
-  inherit nixpkgs-patched pkgs;
+  inherit nixpkgs pkgs;
 
   # Derivation for the PostgREST Haskell package, including the executable,
   # libraries and documentation. We disable running the test suite on Nix

diff --git a/nix/nixpkgs-version.nix b/nix/nixpkgs-version.nix
@@ -2,7 +2,7 @@
 {
   owner = "NixOS";
   repo = "nixpkgs";
-  date = "2024-01-06";
-  rev = "4bbf5a2eb6046c54f7a29a0964c642ebfe912cbc";
-  tarballHash = "03p45qdcxqxc41mmzmmyzbkff29vv95vv643z0kd3mf1s2nnsy5b";
+  date = "2024-04-20";
+  rev = "92d295f588631b0db2da509f381b4fb1e74173c5";
+  tarballHash = "162w28y4i5c8g5qhjvs827qxphf2a8n4c8fwhcywzl1j1a35h2im";
 }
diff --git a/nix/overlays/haskell-packages.nix b/nix/overlays/haskell-packages.nix
@@ -44,37 +44,21 @@ let
       #   + For stack.yml.lock, CI should report an error with the correct lock, copy/paste that one into the file
       # - To modify and try packages locally, see "Working with locally modified Haskell packages" in the Nix README.
 
-      configurator-pg =
-        prev.callHackageDirect
-          {
-            pkg = "configurator-pg";
-            ver = "0.2.9";
-            sha256 = "sha256-UqFiOgPlksbIdHBVO0wYhCnboB+mxKJcXVhY9C1V7Hg=";
-          }
-          { };
-
       # Before upgrading fuzzyset to 0.3, check: https://github.com/PostgREST/postgrest/issues/3329
-      fuzzyset =
-        prev.callHackageDirect
+      # jailbreak, because hspec limit for tests
+      fuzzyset = lib.doJailbreak
+        (prev.callHackageDirect
           {
             pkg = "fuzzyset";
             ver = "0.2.4";
             sha256 = "sha256-lpkrTFcR0B4rT/P6x7ui31Twgq7BBj6KIvjKyqXKdpc=";
           }
-          { };
+          { });
 
-      hasql-pool =
-        lib.dontCheck (prev.callHackageDirect
-          {
-            pkg = "hasql-pool";
-            ver = "1.0.1";
-            sha256 = "sha256-Hf1f7lX0LWkjrb25SDBovCYPRdmUP1H6pAxzi7kT4Gg=";
-          }
-          { }
-        );
+      hasql-pool = lib.dontCheck prev.hasql-pool_1_0_1;
 
       postgresql-libpq = lib.dontCheck
-        (prev.postgresql-libpq_0_10_0_0.override {
+        (prev.postgresql-libpq.override {
           postgresql = super.libpq;
         });
 

diff --git a/nix/split-sections-cross.patch b/nix/split-sections-cross.patch
diff --git a/postgrest.cabal b/postgrest.cabal
@@ -121,7 +121,7 @@ library
                     , mtl                       >= 2.2.2 && < 2.4
                     , network                   >= 2.6 && < 3.2
                     , network-uri               >= 2.6.1 && < 2.8
-                    , optparse-applicative      >= 0.13 && < 0.18
+                    , optparse-applicative      >= 0.13 && < 0.19
                     , parsec                    >= 3.1.11 && < 3.2
                     , postgresql-libpq          >= 0.10
                     , protolude                 >= 0.3.1 && < 0.4