chore: refactor based on review

Author: samrose

nix/ext/pg_cron.nix

@@ -1,92 +1,96 @@
-{ lib, stdenv, fetchFromGitHub, postgresql }:
+{ 
+  lib, 
+  stdenv, 
+  fetchFromGitHub, 
+  postgresql,
+  runCommand
+}:
 
 let
-  allVersions = {
-    "1.3.1" = {
-      rev = "v1.3.1";
-      hash = "sha256-rXotNOtQNmA55ErNxGoNSKZ0pP1uxEVlDGITFHuqGG4=";
-      patches = [ ./pg_cron-1.3.1-pg15.patch ];
-    };
-    "1.4.2" = {
-      rev = "v1.4.2";
-      hash = "sha256-P0Fd10Q1p+KrExb35G6otHpc6pD61WnMll45H2jkevM=";
-    };
-    "1.6.4" = {
-      rev = "v1.6.4";
-      hash = "sha256-t1DpFkPiSfdoGG2NgNT7g1lkvSooZoRoUrix6cBID40=";
-    };
-    "1.5.2" = {
-      rev = "v1.5.2";
-      hash = "sha256-+quVWbKJy6wXpL/zwTk5FF7sYwHA7I97WhWmPO/HSZ4=";
-    };
-  };
-
-  # Simple version string that concatenates all versions with dashes
-  versionString = "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings ["."] ["-"] v) (lib.attrNames allVersions));
-
-  mkPgCron = pgCronVersion: { rev, hash, patches ? [] }: stdenv.mkDerivation {
-    pname = "pg_cron";
-    version = "${pgCronVersion}-pg${lib.versions.major postgresql.version}";
+  pname = "pg_cron";
 
-    buildInputs = [ postgresql ];
-    inherit patches;
-
-    src = fetchFromGitHub {
-      owner = "citusdata";
-      repo = "pg_cron";
-      inherit rev hash;
-    };
+  meta = with lib; {
+    description = "Run Cron jobs through PostgreSQL (multi-version compatible)";
+    homepage = "https://github.com/citusdata/${pname}";
+    inherit (postgresql.meta) platforms;
+    license = licenses.postgresql;
+  };
 
-    buildPhase = ''
-      make PG_CONFIG=${postgresql}/bin/pg_config
-  
-      # Create version-specific SQL file
-      cp pg_cron.sql pg_cron--${pgCronVersion}.sql
-
-      # Create versioned control file with modified module path
-      sed -e "/^default_version =/d" \
-          -e "s|^module_pathname = .*|module_pathname = '\$libdir/pg_cron'|" \
-          pg_cron.control > pg_cron--${pgCronVersion}.control
-    '';
-
-    installPhase = ''
-      mkdir -p $out/{lib,share/postgresql/extension,bin}
-      
-      # Install versioned library
-      install -Dm755 pg_cron${postgresql.dlSuffix} $out/lib/pg_cron-${pgCronVersion}${postgresql.dlSuffix}
-      
-      # Install version-specific files
-      install -Dm644 pg_cron--${pgCronVersion}.sql $out/share/postgresql/extension/
-      install -Dm644 pg_cron--${pgCronVersion}.control $out/share/postgresql/extension/
-      
-      # Install upgrade scripts
-      find . -name 'pg_cron--*--*.sql' -exec install -Dm644 {} $out/share/postgresql/extension/ \;
-    '';
+  allVersions = {
+    "1.6.4" = "sha256-t1DpFkPiSfdoGG2NgNT7g1lkvSooZoRoUrix6cBID40=";
+    "1.5.2" = "sha256-+quVWbKJy6wXpL/zwTk5FF7sYwHA7I97WhWmPO/HSZ4=";
+    "1.4.2" = "sha256-P0Fd10Q1p+KrExb35G6otHpc6pD61WnMll45H2jkevM=";
   };
 
   getVersions = pg:
     if lib.versionAtLeast pg.version "17"
     then { "1.6.4" = allVersions."1.6.4"; }
     else allVersions;
 
-  allVersionsForPg = lib.mapAttrs mkPgCron (getVersions postgresql);
+  mkPackage = version: hash:
+    stdenv.mkDerivation (finalAttrs: {
+      inherit pname meta;
+      version = "${version}-pg${lib.versions.major postgresql.version}";
 
-in
-stdenv.mkDerivation {
-  pname = "pg_cron-all";
-  version = versionString;
+      src = fetchFromGitHub {
+        owner = "citusdata";
+        repo = pname;
+        rev = "refs/tags/v${version}";
+        inherit hash;
+      };
+
+      buildInputs = [ postgresql ];
 
-  buildInputs = lib.attrValues allVersionsForPg;
+      buildPhase = ''
+        make PG_CONFIG=${postgresql}/bin/pg_config
+  
+        # Create version-specific SQL file
+        cp pg_cron.sql pg_cron--${version}.sql
+
+        # Create versioned control file with modified module path
+        sed -e "/^default_version =/d" \
+            -e "s|^module_pathname = .*|module_pathname = '\$libdir/pg_cron'|" \
+            pg_cron.control > pg_cron--${version}.control
+      '';
+
+      installPhase = ''
+        mkdir -p $out/{lib,share/postgresql/extension}
+        
+        # Install versioned library
+        install -Dm755 pg_cron${postgresql.dlSuffix} $out/lib/pg_cron-${version}${postgresql.dlSuffix}
+        
+        # Install version-specific files
+        install -Dm644 pg_cron--${version}.sql $out/share/postgresql/extension/
+        install -Dm644 pg_cron--${version}.control $out/share/postgresql/extension/
+        
+        # Install upgrade scripts
+        find . -name 'pg_cron--*--*.sql' -exec install -Dm644 {} $out/share/postgresql/extension/ \;
+      '';
+    });
+
+  packages = lib.listToAttrs (
+    lib.attrValues (
+      lib.mapAttrs (version: hash: lib.nameValuePair "v${version}" (mkPackage version hash)) (getVersions postgresql)
+    )
+  );
+
+in
+runCommand "${pname}-all"
+  {
+    inherit pname meta;
+    version = "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings ["."] ["-"] v) (lib.attrNames (getVersions postgresql)));
 
-  dontUnpack = true;
-  dontConfigure = true;
-  dontBuild = true;
+    buildInputs = lib.attrValues packages;
 
-  installPhase = ''
+    passthru = {
+      inherit packages;
+    };
+  }
+  ''
     mkdir -p $out/{lib,share/postgresql/extension,bin}
     
     # Install all versions
-    for drv in ${lib.concatStringsSep " " (lib.attrValues allVersionsForPg)}; do
+    for drv in ''${buildInputs[@]}; do
       ln -sv $drv/lib/* $out/lib/
       cp -v --no-clobber $drv/share/postgresql/extension/* $out/share/postgresql/extension/ || true
     done
@@ -136,12 +140,4 @@ stdenv.mkDerivation {
     EOF
 
     chmod +x $out/bin/switch_pg_cron_version
-  '';
-
-  meta = with lib; {
-    description = "Run Cron jobs through PostgreSQL (multi-version compatible)";
-    homepage = "https://github.com/citusdata/pg_cron";
-    inherit (postgresql.meta) platforms;
-    license = licenses.postgresql;
-  };
-}
+  ''