chore(deps): update nixpkgs

PostgREST · Jul 6, 2024 · a3b2cb7 · a3b2cb7
1 parent 37c9a26
commit a3b2cb7
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 72 deletions.
diff --git a/nix/docs-extensions/sphinx-rtd-dark-mode.nix b/nix/docs-extensions/sphinx-rtd-dark-mode.nix
diff --git a/nix/nixpkgs-version.nix b/nix/nixpkgs-version.nix
@@ -2,7 +2,8 @@
 {
   owner = "NixOS";
   repo = "nixpkgs";
-  date = "2024-04-20";
-  rev = "92d295f588631b0db2da509f381b4fb1e74173c5";
-  tarballHash = "162w28y4i5c8g5qhjvs827qxphf2a8n4c8fwhcywzl1j1a35h2im";
+  ref = "refs/heads/nixpkgs-24.05-darwin";
+  date = "2024-07-06";
+  rev = "835cf2d3f37989c5db6585a28de967a667a75fb1";
+  tarballHash = "0raz6228z96x0bj5di9pnpzf4cs63jjlavjwpd0yklb3dicvrg1m";
 }
diff --git a/nix/overlays/haskell-packages.nix b/nix/overlays/haskell-packages.nix
@@ -48,33 +48,22 @@ let
 
       # Before upgrading fuzzyset to 0.3, check: https://github.com/PostgREST/postgrest/issues/3329
       # jailbreak, because hspec limit for tests
-      fuzzyset = lib.doJailbreak
-        (prev.callHackageDirect
-          {
-            pkg = "fuzzyset";
-            ver = "0.2.4";
-            sha256 = "sha256-lpkrTFcR0B4rT/P6x7ui31Twgq7BBj6KIvjKyqXKdpc=";
-          }
-          { });
+      fuzzyset = prev.fuzzyset_0_2_4;
 
-      hasql-pool = lib.dontCheck prev.hasql-pool_1_0_1;
+      hasql-pool = lib.dontCheck (prev.callHackageDirect
+        {
+          pkg = "hasql-pool";
+          ver = "1.0.1";
+          sha256 = "sha256-Hf1f7lX0LWkjrb25SDBovCYPRdmUP1H6pAxzi7kT4Gg=";
+        }
+        { });
 
       jose-jwt = prev.jose-jwt_0_10_0;
 
       postgresql-libpq = lib.dontCheck
-        (prev.postgresql-libpq.override {
+        (prev.postgresql-libpq_0_10_1_0.override {
           postgresql = super.libpq;
         });
-
-      hasql-notifications = lib.dontCheck (prev.callHackageDirect
-        {
-          pkg = "hasql-notifications";
-          ver = "0.2.2.0";
-          sha256 = "sha256-73OQ9/su2qvO7HavF3xuuNWLXSXyB9reBUQDaHys06I=";
-        }
-        { }
-      );
-
     };
 in
 {

diff --git a/nix/static.nix b/nix/static.nix
@@ -25,9 +25,16 @@ let
 
       overrides = pkgs.lib.composeExtensions old.overrides (_: prev: {
         postgresql-libpq = (lib.overrideCabal prev.postgresql-libpq {
+          # TODO: This section can be simplified when this PR has made it's way to us:
+          #  https://github.com/NixOS/nixpkgs/pull/286370
+          # Additionally, we need to use the default version in nixpkgs, otherwise the
+          # override will not be active as well.
+          # Using use-pkg-config flag, because pg_config won't work when cross-compiling
+          configureFlags = [ "-fuse-pkg-config" ];
           # postgresql doesn't build in the fully static overlay - but the default
           # derivation is built with static libraries anyway.
           libraryPkgconfigDepends = [ pkgsCross.libpq ];
+          librarySystemDepends = [ ];
         }).overrideAttrs (_: prevAttrs: {
           buildInputs = prevAttrs.buildInputs ++ [ pkgsStatic.openssl ];
         });

diff --git a/nix/tools/docs.nix b/nix/tools/docs.nix
@@ -15,9 +15,7 @@ let
     ps.sphinx-tabs
     ps.sphinx-copybutton
     ps.sphinxext-opengraph
-    (ps.callPackage ../docs-extensions/sphinx-rtd-dark-mode.nix { })
-    # TODO: Remove override once new sphinx-intl version (> 2.1.0) is released and available in nixpkgs
-    (ps.sphinx-intl.overrideAttrs (drv: { nativeBuildInputs = drv.nativeBuildInputs ++ [ ps.six ]; }))
+    ps.sphinx-rtd-dark-mode
   ];
 
   python = python3.withPackages selectPythonPackages;