nix: bring back net-with-pg-xx commands

Author: steve-chavez

.github/workflows/main.yml

@@ -17,9 +17,7 @@ jobs:
           nix_path: nixpkgs=channel:nixos-unstable
 
       - name: Run tests
-        run: |
-            nix-shell --run "nxpg-${{ matrix.pg-version }} nxpg-build"
-            nix-shell --run "net-with-nginx nxpg-${{ matrix.pg-version }} nxpg-tmp nxpg-test"
+        run: nix-shell --run "net-with-nginx net-with-pg-${{ matrix.pg-version }} python -m pytest -vv"
 
       #- name: Check C files are formatted
         #run: nix-shell --run "net-check-format"
@@ -37,9 +35,7 @@ jobs:
       with:
         nix_path: nixpkgs=channel:nixos-unstable
     - name: Run tests
-      run: |
-          nix-shell --run "nxpg-${{ matrix.pg-version }} nxpg-build"
-          nix-shell --run "net-with-nginx nxpg-${{ matrix.pg-version }} nxpg-tmp nxpg-test"
+      run: nix-shell --run "net-with-nginx net-with-pg-${{ matrix.pg-version }} python -m pytest -vv"
 
   coverage:
 
@@ -58,9 +54,7 @@ jobs:
           nix_path: nixpkgs=channel:nixos-unstable
 
       - name: Run coverage
-        run: |
-          nix-shell --run "nxpg-${{ matrix.pg-version }} nxpg-build-cov"
-          nix-shell --run "net-with-nginx nxpg-${{ matrix.pg-version }} nxpg-tmp nxpg-coverage"
+        run: nix-shell --run "net-with-nginx net-with-pg-${{ matrix.pg-version }} nxpg-coverage"
 
       - name: Send coverage to Coveralls
         uses: coverallsapp/[email protected]

docs/contributing.md

@@ -14,10 +14,10 @@ For testing locally, execute:
 $ nix-shell
 
 # test on pg 12
-$ nxpg-12 nxpg-build && net-with-nginx nxpg-12 nxpg-tmp nxpg-test
+$ net-with-pg-12 python -m pytest -vv
 
 # test on pg 13
-$ nxpg-13 nxpg-build && net-with-nginx nxpg-13 nxpg-tmp nxpg-test
+$ net-with-pg-13 python -m pytest -vv
 ```
 
 ### Debugging

nix/nxpg.nix

@@ -1,7 +1,4 @@
-{ stdenv, lib, makeWrapper, fetchurl, writeShellScriptBin, findutils, entr, callPackage, lcov
-, pidFileName, gnused, python3
-, postgresql_16, postgresql_15, postgresql_14, postgresql_13, postgresql_12
-} :
+{ stdenv, lib, makeWrapper, fetchurl, writeShellScriptBin, findutils, entr, callPackage, lcov, pidFileName, gnused, python3 } :
 let
   prefix = "nxpg";
   ourPg = callPackage ./postgresql {
@@ -13,11 +10,11 @@ let
   };
   supportedPgs = [
     ourPg.postgresql_17
-    postgresql_16
-    postgresql_15
-    postgresql_14
-    postgresql_13
-    postgresql_12
+    ourPg.postgresql_16
+    ourPg.postgresql_15
+    ourPg.postgresql_14
+    ourPg.postgresql_13
+    ourPg.postgresql_12
   ];
   build =
     writeShellScriptBin "${prefix}-build" ''
@@ -108,21 +105,29 @@ let
     allPgPaths = map (pg:
       let
         ver = builtins.head (builtins.splitVersion pg.version);
-        patchedPg = pg.overrideAttrs(oldAttrs: {
-          patches = oldAttrs.patches ++ [
-            ./postgresql/patches/${ver}-add-extension_control_path-for.patch
-          ];
-        });
         script = ''
           set -euo pipefail
 
-          export PATH=${patchedPg}/bin:"$PATH"
+          export PATH=${pg}/bin:"$PATH"
 
           "$@"
         '';
       in
       writeShellScriptBin "${prefix}-${ver}" script
     ) supportedPgs;
+
+    netWith = map (pg:
+        let
+          ver = builtins.head (builtins.splitVersion pg.version);
+          script = ''
+            set -euo pipefail
+            export PATH=${pg}/bin:"$PATH"
+            ${buildCov}/bin/${prefix}-build-cov
+            ${tmpDb}/bin/${prefix}-tmp "$@"
+          '';
+        in
+        writeShellScriptBin "net-with-pg-${ver}" script
+    ) supportedPgs;
 in
 [
   build
@@ -132,4 +137,5 @@ in
   watch
   tmpDb
   allPgPaths
+  netWith
 ]

nix/postgresql/12.nix

@@ -0,0 +1,4 @@
+import ./generic.nix {
+  version = "12.19";
+  hash = "sha256-YX495Swi6CL09X0B1bIkBQPhmKnsyvWYqFEQm9GOb7s=";
+}

nix/postgresql/13.nix

@@ -0,0 +1,4 @@
+import ./generic.nix {
+  version = "13.15";
+  hash = "sha256-Qu3UFURtM7jCQr520a0FdTGyJksuhpOTObcHXG5OySU=";
+}

nix/postgresql/14.nix

@@ -0,0 +1,10 @@
+import ./generic.nix {
+  version = "14.12";
+  hash = "sha256-YRjQj53cwb2Dzyt8x007WDvc7C835iRaisADuPqoCSM=";
+  muslPatches = {
+    disable-test-collate-icu-utf8 = {
+      url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
+      hash = "sha256-jXe23AxnFjEl+TZQm4R7rStk2Leo08ctxMNmu1xr5zM=";
+    };
+  };
+}

nix/postgresql/15.nix

@@ -0,0 +1,4 @@
+import ./generic.nix {
+  version = "15.7";
+  hash = "sha256-pG/klIWrY4Xjnau7tlT10wSSBvds1pXiJCaHKVIJmPc=";
+}

nix/postgresql/16.nix

@@ -0,0 +1,4 @@
+import ./generic.nix {
+  version = "16.3";
+  hash = "sha256-Mxlj1dPcTK9CFqBJ+kC2bWvLjHMGFYWUEblRh2TmBYU=";
+}

nix/postgresql/default.nix

@@ -8,7 +8,13 @@ let
   # for a bit longer to still update up to this commit to at least get the latest minor
   # version. In other words: Do not remove the second-to-last minor version from nixpkgs,
   # yet. Update first.
+
   versions = {
+    postgresql_12 = ./12.nix;
+    postgresql_13 = ./13.nix;
+    postgresql_14 = ./14.nix;
+    postgresql_15 = ./15.nix;
+    postgresql_16 = ./16.nix;
     postgresql_17 = ./17.nix;
   };
 

nix/postgresql/generic.nix

@@ -117,6 +117,7 @@ let
       ./patches/specify_pkglibdir_at_runtime.patch
       ./patches/paths-with-postgresql-suffix.patch
 
+
       (substituteAll {
         src = ./patches/locale-binary-path.patch;
         locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
@@ -127,7 +128,20 @@ let
       map fetchurl (lib.attrValues muslPatches)
     ) ++ lib.optionals stdenv'.isLinux  [
       (if atLeast "13" then ./patches/socketdir-in-run-13+.patch else ./patches/socketdir-in-run.patch)
-    ];
+    ] ++ (if atLeast "17"
+      then [./patches/17-add-extension_control_path-for.patch]
+      else if atLeast "16"
+      then [./patches/16-add-extension_control_path-for.patch]
+      else if atLeast "15"
+      then [./patches/15-add-extension_control_path-for.patch]
+      else if atLeast "14"
+      then [./patches/14-add-extension_control_path-for.patch]
+      else if atLeast "13"
+      then [./patches/13-add-extension_control_path-for.patch]
+      else if atLeast "12"
+      then [./patches/12-add-extension_control_path-for.patch]
+      else []
+      );
 
     installTargets = [ "install-world" ];