fix: apparently incorrectly rebased changes

Author: yvan-sraka

flake.lock

@@ -8,6 +8,7 @@
   };
   inputs = {
     nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz";
+    nixpkgs-pgbackrest.url = "github:nixos/nixpkgs/nixos-unstable-small";
     flake-parts.url = "github:hercules-ci/flake-parts";
     nixpkgs-go124.url = "github:Nixos/nixpkgs/d2ac4dfa61fba987a84a0a81555da57ae0b9a2b0";
     flake-utils.url = "github:numtide/flake-utils";

flake.nix

@@ -5,6 +5,7 @@
       self',
       system,
       pkgs,
+      lib,
       ...
     }:
     let

nix/checks.nix

@@ -56,11 +56,11 @@ let
 
       cmakeFlags =
         [ "-DPOSTGRESQL_VERSION=${postgresql.version}" ]
-        ++ lib.optionals (stdenv.isDarwin && lib.versionAtLeast postgresql.version "16") [
-          "-DCMAKE_MACOSX_RPATH=ON"
-          "-DCMAKE_SHARED_MODULE_SUFFIX=.dylib"
-          "-DCMAKE_SHARED_LIBRARY_SUFFIX=.dylib"
-        ];
+      ++ lib.optionals (stdenv.isDarwin && lib.versionAtLeast postgresql.version "16") [
+        "-DCMAKE_MACOSX_RPATH=ON"
+        "-DCMAKE_SHARED_MODULE_SUFFIX=.dylib"
+        "-DCMAKE_SHARED_LIBRARY_SUFFIX=.dylib"
+      ];
 
       preConfigure = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast postgresql.version "16") ''
         export DLSUFFIX=.dylib
@@ -127,34 +127,12 @@ buildEnv {
     expectedFiles=${toString (numberOfVersions + 1)}
     actualFiles=$(ls -l $out/lib/lib${pname}*${postgresql.dlSuffix} | wc -l)
 
-<<<<<<< HEAD
     if [[ "$actualFiles" != "$expectedFiles" ]]; then
       echo "Error: Expected $expectedFiles library files, found $actualFiles"
       echo "Files found:"
       ls -la $out/lib/*${postgresql.dlSuffix} || true
       exit 1
     fi
-=======
-  #disable compile time warnings for incompatible pointer types only on macos and pg16
-  NIX_CFLAGS_COMPILE = lib.optionalString (
-    stdenv.isDarwin && lib.versionAtLeast postgresql.version "16"
-  ) "-Wno-error=int-conversion -Wno-error=incompatible-pointer-types";
-
-  cmakeFlags = [
-    "-DPOSTGRESQL_VERSION=${postgresql.version}"
-  ]
-  ++ lib.optionals (stdenv.isDarwin && lib.versionAtLeast postgresql.version "16") [
-    "-DCMAKE_MACOSX_RPATH=ON"
-    "-DCMAKE_SHARED_MODULE_SUFFIX=.dylib"
-    "-DCMAKE_SHARED_LIBRARY_SUFFIX=.dylib"
-  ];
-
-  preConfigure = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast postgresql.version "16") ''
-    export DLSUFFIX=.dylib
-    export CMAKE_SHARED_LIBRARY_SUFFIX=.dylib
-    export CMAKE_SHARED_MODULE_SUFFIX=.dylib
-    export MACOSX_RPATH=ON
->>>>>>> 4847adac (chore: update fmt)
   '';
 
   passthru = {

nix/ext/pgrouting.nix

@@ -43,6 +43,8 @@ let
       inherit pname version;
       #version = "3.1.10";
 
+      v8 = (if (builtins.compareVersions "3.1.10" version >= 0) then v8 else nodejs_20.libv8);
+
       src = fetchFromGitHub {
         owner = "plv8";
         repo = "plv8";
@@ -70,7 +72,7 @@ let
 
       buildInputs =
         [
-          (if (builtins.compareVersions "3.1.10" version >= 0) then v8 else nodejs_20.libv8)
+          v8
           postgresql
         ]
         ++ lib.optionals stdenv.isDarwin [

nix/ext/plv8/default.nix

@@ -1,6 +1,6 @@
 { self, ... }:
 {
-  flake.overlays.default = final: _prev: {
+  flake.overlays.default = final: prev: {
     # NOTE: add any needed overlays here. in theory we could
     # pull them from the overlays/ directory automatically, but we don't
     # want to have an arbitrary order, since it might matter. being

nix/overlays/default.nix

@@ -79,8 +79,6 @@ let
         else
           (lib.warn "postgresql: argument enableSystemd is deprecated, please use systemdSupport instead." enableSystemd);
 
-      isOrioleDB = (builtins.match "[0-9][0-9]_.*" version) != null;
-
       pname = "postgresql";
 
       stdenv' = if jitSupport then llvmPackages.stdenv else stdenv;