about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorWolfgang Walther <walther@technowledgy.de>2024-02-29 13:47:03 +0100
committerWolfgang Walther <walther@technowledgy.de>2024-03-15 18:51:02 +0100
commit1d9f2bd7266d46b2f3abaefb5fadba26f0eb8e1a (patch)
tree0066d213b8ddff40afe94b5e9ee9d612267e12de /pkgs/servers
parent9af8c0a3b7ef345ff0c32e65f110ac71f8a139a7 (diff)
downloadnixlib-1d9f2bd7266d46b2f3abaefb5fadba26f0eb8e1a.tar
nixlib-1d9f2bd7266d46b2f3abaefb5fadba26f0eb8e1a.tar.gz
nixlib-1d9f2bd7266d46b2f3abaefb5fadba26f0eb8e1a.tar.bz2
nixlib-1d9f2bd7266d46b2f3abaefb5fadba26f0eb8e1a.tar.lz
nixlib-1d9f2bd7266d46b2f3abaefb5fadba26f0eb8e1a.tar.xz
nixlib-1d9f2bd7266d46b2f3abaefb5fadba26f0eb8e1a.tar.zst
nixlib-1d9f2bd7266d46b2f3abaefb5fadba26f0eb8e1a.zip
postgresql: refactor to split up default.nix (2/2)
The recommended [1] structure for a package regarding versioning is to have each
version in a separate file. This commit just mechanically copies code around
without any changes.

Pure refactor, not changing any derivations.

[1]: pkgs/README.md
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/sql/postgresql/12.nix5
-rw-r--r--pkgs/servers/sql/postgresql/13.nix5
-rw-r--r--pkgs/servers/sql/postgresql/14.nix5
-rw-r--r--pkgs/servers/sql/postgresql/15.nix5
-rw-r--r--pkgs/servers/sql/postgresql/16.nix5
-rw-r--r--pkgs/servers/sql/postgresql/default.nix43
-rw-r--r--pkgs/servers/sql/postgresql/generic.nix63
7 files changed, 74 insertions, 57 deletions
diff --git a/pkgs/servers/sql/postgresql/12.nix b/pkgs/servers/sql/postgresql/12.nix
new file mode 100644
index 000000000000..4979df61136e
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/12.nix
@@ -0,0 +1,5 @@
+import ./generic.nix {
+  version = "12.18";
+  psqlSchema = "12";
+  hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo=";
+}
diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix
new file mode 100644
index 000000000000..61985518ce61
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/13.nix
@@ -0,0 +1,5 @@
+import ./generic.nix {
+  version = "13.14";
+  psqlSchema = "13";
+  hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0=";
+}
diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix
new file mode 100644
index 000000000000..efd7da0778ab
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/14.nix
@@ -0,0 +1,5 @@
+import ./generic.nix {
+  version = "14.11";
+  psqlSchema = "14";
+  hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg=";
+}
diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix
new file mode 100644
index 000000000000..4efb790542be
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/15.nix
@@ -0,0 +1,5 @@
+import ./generic.nix {
+  version = "15.6";
+  psqlSchema = "15";
+  hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs=";
+}
diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix
new file mode 100644
index 000000000000..2dfc54277df1
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/16.nix
@@ -0,0 +1,5 @@
+import ./generic.nix {
+  version = "16.2";
+  psqlSchema = "16";
+  hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI=";
+}
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
new file mode 100644
index 000000000000..fc242d08ec0b
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -0,0 +1,43 @@
+let
+  mkPackages = self: {
+    postgresql_12 = import ./12.nix {
+      this = self.postgresql_12;
+      thisAttr = "postgresql_12";
+      inherit self;
+    };
+
+    postgresql_13 = import ./13.nix {
+      this = self.postgresql_13;
+      thisAttr = "postgresql_13";
+      inherit self;
+    };
+
+    postgresql_14 = import ./14.nix {
+      this = self.postgresql_14;
+      thisAttr = "postgresql_14";
+      inherit self;
+    };
+
+    postgresql_15 = import ./15.nix {
+      this = self.postgresql_15;
+      thisAttr = "postgresql_15";
+      inherit self;
+    };
+
+    postgresql_16 = import ./16.nix {
+      this = self.postgresql_16;
+      thisAttr = "postgresql_16";
+      inherit self;
+    };
+  };
+
+in self:
+  let packages = mkPackages self; in
+  packages
+  // self.lib.mapAttrs'
+    (attrName: postgres: self.lib.nameValuePair "${attrName}_jit" (postgres.override rec {
+      jitSupport = true;
+      thisAttr = "${attrName}_jit";
+      this = self.${thisAttr};
+    }))
+    packages
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index c769fff259c7..2e8054060a3a 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -353,60 +353,9 @@ let
     passthru.psqlSchema = postgresql.psqlSchema;
   };
 
-  mkPackages = self: {
-    postgresql_12 = self.callPackage generic {
-      version = "12.18";
-      psqlSchema = "12";
-      hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo=";
-      this = self.postgresql_12;
-      thisAttr = "postgresql_12";
-      inherit self;
-    };
-
-    postgresql_13 = self.callPackage generic {
-      version = "13.14";
-      psqlSchema = "13";
-      hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0=";
-      this = self.postgresql_13;
-      thisAttr = "postgresql_13";
-      inherit self;
-    };
-
-    postgresql_14 = self.callPackage generic {
-      version = "14.11";
-      psqlSchema = "14";
-      hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg=";
-      this = self.postgresql_14;
-      thisAttr = "postgresql_14";
-      inherit self;
-    };
-
-    postgresql_15 = self.callPackage generic {
-      version = "15.6";
-      psqlSchema = "15";
-      hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs=";
-      this = self.postgresql_15;
-      thisAttr = "postgresql_15";
-      inherit self;
-    };
-
-    postgresql_16 = self.callPackage generic {
-      version = "16.2";
-      psqlSchema = "16";
-      hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI=";
-      this = self.postgresql_16;
-      thisAttr = "postgresql_16";
-      inherit self;
-    };
-  };
-
-in self:
-  let packages = mkPackages self; in
-  packages
-  // self.lib.mapAttrs'
-    (attrName: postgres: self.lib.nameValuePair "${attrName}_jit" (postgres.override rec {
-      jitSupport = true;
-      thisAttr = "${attrName}_jit";
-      this = self.${thisAttr};
-    }))
-    packages
+in
+# passed by <major>.nix
+versionArgs:
+# passed by default.nix
+{ self, ... } @defaultArgs:
+self.callPackage generic (defaultArgs // versionArgs)