From b616e332f7726b959ae7f9674bcff7b40d9c7b56 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 31 Mar 2024 21:37:05 +0200
Subject: [PATCH] nix: Update to latest nixpkgs#master

---
 default.nix                       | 10 ++--------
 nix/nixpkgs-version.nix           |  6 +++---
 nix/overlays/haskell-packages.nix | 31 +------------------------------
 nix/split-sections-cross.patch    | 14 --------------
 postgrest.cabal                   |  2 +-
 5 files changed, 7 insertions(+), 56 deletions(-)
 delete mode 100644 nix/split-sections-cross.patch

diff --git a/default.nix b/default.nix
index 898430a087a..c94f2e93be5 100644
--- 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
index f374fe49fe0..af8bfcf3c90 100644
--- 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
index 5bc0c067484..e1ec4b08c15 100644
--- a/nix/overlays/haskell-packages.nix
+++ b/nix/overlays/haskell-packages.nix
@@ -44,15 +44,6 @@ 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
@@ -63,30 +54,10 @@ let
           }
           { };
 
-      hasql-pool =
-        lib.dontCheck (prev.callHackageDirect
-          {
-            pkg = "hasql-pool";
-            ver = "1.0.1";
-            sha256 = "sha256-Hf1f7lX0LWkjrb25SDBovCYPRdmUP1H6pAxzi7kT4Gg=";
-          }
-          { }
-        );
-
       postgresql-libpq = lib.dontCheck
-        (prev.postgresql-libpq_0_10_0_0.override {
+        (prev.postgresql-libpq.override {
           postgresql = super.libpq;
         });
-
-      hasql-notifications = lib.dontCheck (prev.callHackageDirect
-        {
-          pkg = "hasql-notifications";
-          ver = "0.2.1.1";
-          sha256 = "sha256-oPhKA/pSQGJvgQyhsi7CVr9iDT7uWpKUz0iJfXsaxXo=";
-        }
-        { }
-      );
-
     };
 in
 {
diff --git a/nix/split-sections-cross.patch b/nix/split-sections-cross.patch
deleted file mode 100644
index 22d1fc59dce..00000000000
--- a/nix/split-sections-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This works around https://github.com/NixOS/nixpkgs/issues/286285 by passing --enable-split-sections instead of ghc-options.
----
---- a/pkgs/development/haskell-modules/generic-builder.nix
-+++ b/pkgs/development/haskell-modules/generic-builder.nix
-@@ -245,8 +245,7 @@ let
-     (enableFeature doBenchmark "benchmarks")
-     "--enable-library-vanilla"  # TODO: Should this be configurable?
-     (enableFeature enableLibraryForGhci "library-for-ghci")
--  ] ++ optionals (enableDeadCodeElimination && (lib.versionOlder "8.0.1" ghc.version)) [
--     "--ghc-option=-split-sections"
-+    (enableFeature enableDeadCodeElimination "split-sections")
-   ] ++ optionals dontStrip [
-     "--disable-library-stripping"
-     "--disable-executable-stripping"
diff --git a/postgrest.cabal b/postgrest.cabal
index 1893f263787..d444d61e834 100644
--- 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