fix: rebase on develop and fix code api changes from nixpkgs

samrose · samrose · commit a33cf5dccb27 · 2025-09-10T13:58:14.000-04:00
diff --git a/flake.lock b/flake.lock
diff --git a/nix/cargo-pgrx/default.nix b/nix/cargo-pgrx/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  darwin,
+  apple-sdk_11,
   fetchCrate,
   openssl,
   pkg-config,
@@ -33,7 +33,7 @@ let
       nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
       buildInputs =
         lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
 
       OPENSSL_DIR = "${openssl.dev}";
       OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";
diff --git a/nix/checks.nix b/nix/checks.nix
@@ -2,7 +2,6 @@
 {
   perSystem =
     {
-      lib,
       self',
       system,
       pkgs,
diff --git a/nix/ext/default.nix b/nix/ext/default.nix
@@ -4,7 +4,10 @@
     { pkgs, ... }:
     {
       packages = {
-        sfcgal = pkgs.callPackage ./sfcgal/sfcgal.nix { };
+        sfcgal = pkgs.callPackage ./sfcgal/sfcgal.nix {
+          # Use CGAL 5.x for compatibility with current sfcgal version
+          cgal = pkgs.cgal_5;
+        };
         mecab_naist_jdic = pkgs.callPackage ./mecab-naist-jdic/default.nix { };
       };
     };
diff --git a/nix/ext/plv8.nix b/nix/ext/plv8.nix
@@ -9,7 +9,7 @@
   # to nixpkgs
   clang,
   xcbuild,
-  darwin,
+  apple-sdk_11,
   patchelf,
 }:
 let
@@ -50,8 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     postgresql
   ]
   ++ lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk.frameworks.CoreFoundation
-    darwin.apple_sdk.frameworks.Kerberos
+    apple-sdk_11
   ];
 
   buildFlags = [ "all" ];
@@ -77,10 +76,8 @@ stdenv.mkDerivation (finalAttrs: {
       "-lpq"
       "-lpgcommon"
       "-lpgport"
-      "-F${darwin.apple_sdk.frameworks.CoreFoundation}/Library/Frameworks"
       "-framework"
       "CoreFoundation"
-      "-F${darwin.apple_sdk.frameworks.Kerberos}/Library/Frameworks"
       "-framework"
       "Kerberos"
       "-undefined"
diff --git a/nix/ext/postgis.nix b/nix/ext/postgis.nix
@@ -15,10 +15,14 @@
   pcre2,
   nixosTests,
   callPackage,
+  cgal_5,
 }:
 
 let
-  sfcgal = callPackage ./sfcgal/sfcgal.nix { };
+  sfcgal = callPackage ./sfcgal/sfcgal.nix {
+    # Use CGAL 5.x for compatibility with current sfcgal version
+    cgal = cgal_5;
+  };
   gdal = callPackage ./gdal.nix { inherit postgresql; };
 in
 stdenv.mkDerivation rec {
diff --git a/nix/ext/tests/lib.py b/nix/ext/tests/lib.py
@@ -76,9 +76,9 @@ def assert_version_matches(self, expected_version: str):
             AssertionError: If the installed version does not match the expected version
         """
         installed_version = self.get_installed_version()
-        assert (
-            installed_version == expected_version
-        ), f"Expected version {expected_version}, but found {installed_version}"
+        assert installed_version == expected_version, (
+            f"Expected version {expected_version}, but found {installed_version}"
+        )
 
     def check_upgrade_path(self, pg_version: str):
         """Test the complete upgrade path for a PostgreSQL version.
@@ -146,24 +146,24 @@ def check_switch_extension_with_background_worker(
                 f"No versions available for PostgreSQL version {pg_version}"
             )
         last_version = available_versions[-1]
-        assert ext_version.endswith(
-            f"{self.extension_name}-{last_version}.so"
-        ), f"Expected {self.extension_name} version {last_version}, but found {ext_version}"
+        assert ext_version.endswith(f"{self.extension_name}-{last_version}.so"), (
+            f"Expected {self.extension_name} version {last_version}, but found {ext_version}"
+        )
 
         # Switch to the first version
         first_version = available_versions[0]
         self.vm.succeed(f"switch_{self.extension_name}_version {first_version}")
 
         # Check that we are using the first version now
         ext_version = self.vm.succeed(f"readlink -f {extension_lib_path}").strip()
-        assert ext_version.endswith(
-            f"{self.extension_name}-{first_version}.so"
-        ), f"Expected {self.extension_name} version {first_version}, but found {ext_version}"
+        assert ext_version.endswith(f"{self.extension_name}-{first_version}.so"), (
+            f"Expected {self.extension_name} version {first_version}, but found {ext_version}"
+        )
 
         # Switch to the first version
         self.vm.succeed(f"switch_{self.extension_name}_version {last_version}")
         # Check that we are using the last version now
         ext_version = self.vm.succeed(f"readlink -f {extension_lib_path}").strip()
-        assert ext_version.endswith(
-            f"{self.extension_name}-{last_version}.so"
-        ), f"Expected {self.extension_name} version {last_version}, but found {ext_version}"
+        assert ext_version.endswith(f"{self.extension_name}-{last_version}.so"), (
+            f"Expected {self.extension_name} version {last_version}, but found {ext_version}"
+        )
diff --git a/nix/ext/wrappers/default.nix b/nix/ext/wrappers/default.nix
@@ -7,7 +7,7 @@
   pkg-config,
   postgresql,
   buildEnv,
-  darwin,
+  apple-sdk_11,
   rust-bin,
   git,
 }:
@@ -42,9 +42,7 @@ let
           postgresql
         ]
         ++ lib.optionals stdenv.isDarwin [
-          darwin.apple_sdk.frameworks.CoreFoundation
-          darwin.apple_sdk.frameworks.Security
-          darwin.apple_sdk.frameworks.SystemConfiguration
+          apple-sdk_11
         ];
 
         NIX_LDFLAGS = "-L${postgresql}/lib -lpq";
diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix
@@ -18,7 +18,7 @@
 
     cargo-pgrx = final.callPackage ../cargo-pgrx/default.nix {
       inherit (final) lib;
-      inherit (final) darwin;
+      inherit (final) apple-sdk_11;
       inherit (final) fetchCrate;
       inherit (final) openssl;
       inherit (final) pkg-config;
diff --git a/nix/packages/packer.nix b/nix/packages/packer.nix
@@ -33,8 +33,7 @@ buildGoModule rec {
   nativeBuildInputs = [ installShellFiles ];
 
   buildInputs = lib.optionals pkgs.stdenv.isDarwin [
-    pkgs.darwin.apple_sdk.frameworks.IOKit
-    pkgs.darwin.apple_sdk.frameworks.Security
+    pkgs.apple-sdk_11
   ];
 
   postInstall = ''
diff --git a/nix/postgresql/generic.nix b/nix/postgresql/generic.nix
@@ -7,7 +7,6 @@ let
       stdenv,
       lib,
       fetchurl,
-      fetchpatch,
       makeWrapper,
       glibc,
       zlib,
@@ -112,7 +111,7 @@ let
         zlib
         readline
         openssl
-        (libxml2.override { python = python3; })
+        (libxml2.override { python3 = python3; })
         icu
       ]
       ++ lib.optionals (olderThan "13") [ libxcrypt ]
@@ -189,20 +188,21 @@ let
           locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
         })
       ]
-      ++ lib.optionals (olderThan "17") [
-        # back port changes related to tzdata release 2024b
-        (fetchpatch ({
-          url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch";
-          hash = "sha256-7G+BkJULhyx6nlMEjClcr2PJg6awgymZHr2JgGhXanA=";
-          excludes = [ "doc/*" ];
-        }))
-        # back port changes related to tzdata release 2025a
-        (fetchpatch ({
-          url = "https://github.com/postgres/postgres/commit/aac0384975ff1129557cd2158fab4656f933cdc8.patch";
-          hash = "sha256-4Aua4QJhCS9B0zegQ9I6Us5QfX7GuRUilnkmOpSTUUw=";
-          excludes = [ "doc/*" ];
-        }))
-      ]
+      # tzdata patches temporarily removed due to conflicts with PostgreSQL 15.14
+      # ++ lib.optionals (olderThan "17") [
+      #   # back port changes related to tzdata release 2024b
+      #   (fetchpatch ({
+      #     url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch";
+      #     hash = "sha256-7G+BkJULhyx6nlMEjClcr2PJg6awgymZHr2JgGhXanA=";
+      #     excludes = [ "doc/*" ];
+      #   }))
+      #   # back port changes related to tzdata release 2025a
+      #   (fetchpatch ({
+      #     url = "https://github.com/postgres/postgres/commit/aac0384975ff1129557cd2158fab4656f933cdc8.patch";
+      #     hash = "sha256-4Aua4QJhCS9B0zegQ9I6Us5QfX7GuRUilnkmOpSTUUw=";
+      #     excludes = [ "doc/*" ];
+      #   }))
+      # ]
       ++ lib.optionals stdenv'.hostPlatform.isMusl (
         # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
         map fetchurl (lib.attrValues muslPatches)
diff --git a/testinfra/test_ami_nix.py b/testinfra/test_ami_nix.py
@@ -397,9 +397,9 @@ def is_healthy(ssh) -> bool:
 def test_postgrest_is_running(host):
     """Check if postgrest service is running using our SSH connection."""
     result = run_ssh_command(host["ssh"], "systemctl is-active postgrest")
-    assert (
-        result["succeeded"] and result["stdout"].strip() == "active"
-    ), "PostgREST service is not running"
+    assert result["succeeded"] and result["stdout"].strip() == "active", (
+        "PostgREST service is not running"
+    )
 
 
 def test_postgrest_responds_to_requests(host):
@@ -541,9 +541,9 @@ def test_postgresql_version(host):
         if version_match:
             major_version = int(version_match.group(1))
             print(f"PostgreSQL major version: {major_version}")
-            assert (
-                major_version >= 14
-            ), f"PostgreSQL version {major_version} is less than 14"
+            assert major_version >= 14, (
+                f"PostgreSQL version {major_version} is less than 14"
+            )
         else:
             assert False, "Could not parse PostgreSQL version number"
     else:
@@ -573,9 +573,9 @@ def test_libpq5_version(host):
         if version_match:
             major_version = int(version_match.group(1))
             print(f"libpq5 major version: {major_version}")
-            assert (
-                major_version >= 14
-            ), f"libpq5 version {major_version} is less than 14"
+            assert major_version >= 14, (
+                f"libpq5 version {major_version} is less than 14"
+            )
         else:
             print("Could not parse libpq5 version from dpkg output")
     else:
@@ -608,9 +608,9 @@ def test_libpq5_version(host):
         if version_match:
             major_version = int(version_match.group(1))
             print(f"psql/libpq major version: {major_version}")
-            assert (
-                major_version >= 14
-            ), f"psql/libpq version {major_version} is less than 14"
+            assert major_version >= 14, (
+                f"psql/libpq version {major_version} is less than 14"
+            )
         else:
             print("Could not parse psql version")
 
@@ -771,7 +771,9 @@ def test_postgrest_read_only_session_attrs(host):
             print(
                 f"\nFound 'session is not read-only' errors in PostgREST logs:\n{result['stdout']}"
             )
-            assert False, "PostgREST logs contain 'session is not read-only' errors even though PostgreSQL is configured for read-only mode"
+            assert False, (
+                "PostgREST logs contain 'session is not read-only' errors even though PostgreSQL is configured for read-only mode"
+            )
         else:
             print("\nNo 'session is not read-only' errors found in PostgREST logs")
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`{`
`3`	`3`	`perSystem =`
`4`	`4`	`{`
`5`		`- lib,`
`6`	`5`	`self',`
`7`	`6`	`system,`
`8`	`7`	`pkgs,`