From 52083ce9388169bec5ee315843d2becb51fbdb10 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 18:52:37 +0000 Subject: [PATCH 01/72] postgresqlPackages.citus: 13.0.0 -> 13.0.2 --- pkgs/servers/sql/postgresql/ext/citus.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index 7877f48a7620..83e300bff8d5 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -10,13 +10,13 @@ buildPostgresqlExtension rec { pname = "citus"; - version = "13.0.0"; + version = "13.0.2"; src = fetchFromGitHub { owner = "citusdata"; repo = "citus"; rev = "v${version}"; - hash = "sha256-1if/rYMQV1RG4ZkjqTFuFYu5f1JhJiMF4rCVo8gp7+8="; + hash = "sha256-SuJs6OCHKO7efQagsATgn/V9rgMyuXQIHGCEP9ME7tQ="; }; buildInputs = [ @@ -29,7 +29,7 @@ buildPostgresqlExtension rec { # latest release with Postgres' 3 latest releases." # https://www.citusdata.com/updates/v12-0/#deprecated_features broken = - versionOlder postgresql.version "14" + versionOlder postgresql.version "15" || # PostgreSQL 17 support issue upstream: https://github.com/citusdata/citus/issues/7708 # Check after next package update. From 18c1698f439540dae36d47b8e855f6a272b47816 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 18:52:41 +0000 Subject: [PATCH 02/72] postgresqlPackages.pg-gvm: 22.6.7 -> 22.6.8 --- pkgs/servers/sql/postgresql/ext/pg-gvm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix index 0332bf986232..33b6f2aa24b4 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix @@ -14,13 +14,13 @@ buildPostgresqlExtension (finalAttrs: { pname = "pg-gvm"; - version = "22.6.7"; + version = "22.6.8"; src = fetchFromGitHub { owner = "greenbone"; repo = "pg-gvm"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Sa9ltW3KV/69OCxD3gRcp5owL0oW+z3fs4fRBHbSh30="; + hash = "sha256-D8KpOTF+vcBNIn//8Y0Hwk4B+OBF2Hh3dkWyO2KYeqw="; }; nativeBuildInputs = [ From 74b4466fe99eff242fb73a130f93dc98a885599a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:05:39 +0100 Subject: [PATCH 03/72] postgresqlPackages.pg_repack: fix update script --- pkgs/servers/sql/postgresql/ext/pg_repack.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index f7cb29c40ad5..388a82cb29cb 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -6,6 +6,7 @@ postgresqlTestExtension, testers, buildPostgresqlExtension, + gitUpdater, }: buildPostgresqlExtension (finalAttrs: { @@ -21,6 +22,10 @@ buildPostgresqlExtension (finalAttrs: { sha256 = "sha256-wfjiLkx+S3zVrAynisX1GdazueVJ3EOwQEPcgUQt7eA="; }; + passthru.updateScript = gitUpdater { + rev-prefix = "ver_"; + }; + passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; From d53a2206256872d89f2068af119c154a1bfc63ee Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:06:09 +0100 Subject: [PATCH 04/72] postgresqlPackages.pgvecto-rs: modernize --- .../sql/postgresql/ext/pgvecto-rs/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix index b7a1496a37fe..800a0b1fa279 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix @@ -1,17 +1,17 @@ { - lib, buildPgrxExtension, cargo-pgrx_0_12_0_alpha_1, clang_16, fetchFromGitHub, + lib, nix-update-script, nixosTests, openssl, pkg-config, postgresql, + replaceVars, rustPlatform, stdenv, - replaceVars, }: let @@ -50,7 +50,7 @@ in src = fetchFromGitHub { owner = "tensorchord"; repo = "pgvecto.rs"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-X7BY2Exv0xQNhsS/GA7GNvj9OeVDqVCd/k3lUkXtfgE="; }; @@ -90,18 +90,18 @@ in tests = nixosTests.postgresql.pgvecto-rs.passthru.override postgresql; }; - meta = with lib; { + meta = { # Upstream removed support for PostgreSQL 13 on 0.3.0: https://github.com/tensorchord/pgvecto.rs/issues/343 broken = - (versionOlder postgresql.version "14") + (lib.versionOlder postgresql.version "14") || # PostgreSQL 17 support issue upstream: https://github.com/tensorchord/pgvecto.rs/issues/607 # Check after next package update. - versionAtLeast postgresql.version "17" && version == "0.3.0"; + lib.versionAtLeast postgresql.version "17" && version == "0.3.0"; description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres"; homepage = "https://github.com/tensorchord/pgvecto.rs"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ diogotcorreia esclear ]; From 8fc19e6d7e1505b3b08f9ed9abfa02f32d929113 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:06:21 +0100 Subject: [PATCH 05/72] postgresqlPackages.plv8: modernize --- pkgs/servers/sql/postgresql/ext/plv8/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix index 3e00db9400fe..7ab270d50f04 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -1,16 +1,16 @@ { - stdenv, - lib, + buildPostgresqlExtension, fetchFromGitHub, + jitSupport, + lib, nodejs_20, perl, postgresql, - jitSupport, - buildPostgresqlExtension, + stdenv, # For test - runCommand, coreutils, gnugrep, + runCommand, }: let @@ -23,7 +23,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "plv8"; repo = "plv8"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ivQZJSNn5giWF351fqZ7mBZoJkGtby5T7beK45g3Zqs="; }; @@ -130,7 +130,7 @@ buildPostgresqlExtension (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; homepage = "https://plv8.github.io/"; changelog = "https://github.com/plv8/plv8/blob/r${finalAttrs.version}/Changes"; @@ -139,7 +139,7 @@ buildPostgresqlExtension (finalAttrs: { "x86_64-linux" "aarch64-linux" ]; - license = licenses.postgresql; + license = lib.licenses.postgresql; broken = jitSupport; }; }) From c982a346b590723ec58b4f7021b8c519640cec1e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:06:31 +0100 Subject: [PATCH 06/72] postgresqlPackages.age: modernize --- pkgs/servers/sql/postgresql/ext/age.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index ca052c4c7ff7..29283f8c1875 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, bison, + buildPostgresqlExtension, fetchFromGitHub, flex, + lib, perl, postgresql, - buildPostgresqlExtension, + stdenv, }: let @@ -27,7 +27,7 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "apache"; repo = "age"; - rev = "PG${lib.versions.major postgresql.version}/v${ + tag = "PG${lib.versions.major postgresql.version}/v${ builtins.replaceStrings [ "." ] [ "_" ] version }"; hash = @@ -73,13 +73,13 @@ buildPostgresqlExtension rec { ''; }; - meta = with lib; { - broken = !builtins.elem (versions.major postgresql.version) (builtins.attrNames hashes); + meta = { + broken = !builtins.elem (lib.versions.major postgresql.version) (builtins.attrNames hashes); description = "Graph database extension for PostgreSQL"; homepage = "https://age.apache.org/"; changelog = "https://github.com/apache/age/raw/v${src.rev}/RELEASE"; maintainers = [ ]; platforms = postgresql.meta.platforms; - license = licenses.asl20; + license = lib.licenses.asl20; }; } From 783eaa5d9109805dd5b9ff058b7e1dfcc4ee19f8 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:07:07 +0100 Subject: [PATCH 07/72] postgresqlPackages.age: remove hash for v12 v12 had been removed from nixpkgs a while ago. --- pkgs/servers/sql/postgresql/ext/age.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index 29283f8c1875..ddd93d953313 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -17,7 +17,6 @@ let "15" = "sha256-webZWgWZGnSoXwTpk816tjbtHV1UIlXkogpBDAEL4gM="; "14" = "sha256-jZXhcYBubpjIJ8M5JHXKV5f6VK/2BkypH3P7nLxZz3E="; "13" = "sha256-HR6nnWt/V2a0rD5eHHUsFIZ1y7lmvLz36URt9pPJnCw="; - "12" = "sha256-JFNk17ESsIt20dwXrfBkQ5E6DbZzN/Q9eS6+WjCXGd4="; }; in buildPostgresqlExtension rec { From 3a0a1704d312fa103bfe613f8fbb099c4c36f01b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:07:38 +0100 Subject: [PATCH 08/72] postgresqlPackages.anonymizer: sort arguments --- pkgs/servers/sql/postgresql/ext/anonymizer.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix index e70a6afad1c4..3fdb9e3b78b4 100644 --- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix +++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix @@ -1,13 +1,13 @@ { + buildPostgresqlExtension, + jitSupport, lib, - stdenv, + llvm, + nixosTests, pg-dump-anon, postgresql, runtimeShell, - jitSupport, - llvm, - buildPostgresqlExtension, - nixosTests, + stdenv, }: buildPostgresqlExtension (finalAttrs: { From 569b0d15e41c3aaf34a678bc5ef2a81a96a2ee43 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:08:54 +0100 Subject: [PATCH 09/72] postgresqlPackages.apache_datasketches: modernize --- .../sql/postgresql/ext/apache_datasketches.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix index 25c06e6c038c..142e6aa6ce3a 100644 --- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix +++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix @@ -1,11 +1,11 @@ { - stdenv, - lib, - fetchFromGitHub, - postgresql, boost186, - postgresqlTestExtension, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + postgresqlTestExtension, + stdenv, }: let @@ -15,7 +15,7 @@ let name = "datasketches-postgresql"; owner = "apache"; repo = "datasketches-postgresql"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-W41uAs3W4V7c9O/wBw3rut65bcmY8EdQS1/tPszMGqA="; }; @@ -23,7 +23,7 @@ let name = "datasketches-cpp"; owner = "apache"; repo = "datasketches-cpp"; - rev = "refs/tags/5.0.2"; + tag = "5.0.2"; hash = "sha256-yGk1OckYipAgLTQK6w6p6EdHMxBIQSjPV/MMND3cDks="; }; in From f403641247f3e665c516770b22c3ff70276f828f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:11:38 +0100 Subject: [PATCH 10/72] postgresqlPackages.citus: modernize --- pkgs/servers/sql/postgresql/ext/citus.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index 83e300bff8d5..f0feef2f904b 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -1,11 +1,11 @@ { - lib, - stdenv, + buildPostgresqlExtension, curl, fetchFromGitHub, + lib, lz4, postgresql, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension rec { @@ -15,7 +15,7 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "citusdata"; repo = "citus"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-SuJs6OCHKO7efQagsATgn/V9rgMyuXQIHGCEP9ME7tQ="; }; @@ -24,20 +24,20 @@ buildPostgresqlExtension rec { lz4 ]; - meta = with lib; { + meta = { # "Our soft policy for Postgres version compatibility is to support Citus' # latest release with Postgres' 3 latest releases." # https://www.citusdata.com/updates/v12-0/#deprecated_features broken = - versionOlder postgresql.version "15" + lib.versionOlder postgresql.version "15" || # PostgreSQL 17 support issue upstream: https://github.com/citusdata/citus/issues/7708 # Check after next package update. - (versionAtLeast postgresql.version "17" && version == "12.1.6"); + (lib.versionAtLeast postgresql.version "17" && version == "12.1.6"); description = "Distributed PostgreSQL as an extension"; homepage = "https://www.citusdata.com/"; changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md"; - license = licenses.agpl3Only; + license = lib.licenses.agpl3Only; maintainers = [ ]; inherit (postgresql.meta) platforms; }; From 07f318ab2d1e1124e250e530efa26dccf2da3db9 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:13:52 +0100 Subject: [PATCH 11/72] postgresqlPackages.citus: remove left-over broken condition --- pkgs/servers/sql/postgresql/ext/citus.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index f0feef2f904b..e42976419fb9 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -28,12 +28,7 @@ buildPostgresqlExtension rec { # "Our soft policy for Postgres version compatibility is to support Citus' # latest release with Postgres' 3 latest releases." # https://www.citusdata.com/updates/v12-0/#deprecated_features - broken = - lib.versionOlder postgresql.version "15" - || - # PostgreSQL 17 support issue upstream: https://github.com/citusdata/citus/issues/7708 - # Check after next package update. - (lib.versionAtLeast postgresql.version "17" && version == "12.1.6"); + broken = lib.versionOlder postgresql.version "15"; description = "Distributed PostgreSQL as an extension"; homepage = "https://www.citusdata.com/"; changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md"; From 2bd4a4b670b715a946b1d84ef50b444ebf532279 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:14:10 +0100 Subject: [PATCH 12/72] postgresqlPackages.cstore_fdw: modernize --- pkgs/servers/sql/postgresql/ext/cstore_fdw.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index b9223e4beecc..1d49438d08eb 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -1,10 +1,10 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + lib, postgresql, protobufc, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension { @@ -18,15 +18,15 @@ buildPostgresqlExtension { owner = "citusdata"; repo = "cstore_fdw"; rev = "90e22b62fbee6852529104fdd463f532cf7a3311"; - sha256 = "sha256-02wcCqs8A5ZOZX080fgcNJTQrYQctnlwnA8+YPaRTZc="; + hash = "sha256-02wcCqs8A5ZOZX080fgcNJTQrYQctnlwnA8+YPaRTZc="; }; - meta = with lib; { - broken = versionAtLeast postgresql.version "14"; + meta = { + broken = lib.versionAtLeast postgresql.version "14"; description = "Columnar storage for PostgreSQL"; homepage = "https://github.com/citusdata/cstore_fdw"; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; - license = licenses.asl20; + license = lib.licenses.asl20; }; } From 7cad011574b4ce10d5319089286fe0d3636d8ea6 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:14:50 +0100 Subject: [PATCH 13/72] postgresqlPackages.h3-pg: modernize --- pkgs/servers/sql/postgresql/ext/h3-pg.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix index 88435112e0dd..9f45ec8d7544 100644 --- a/pkgs/servers/sql/postgresql/ext/h3-pg.nix +++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, + buildPostgresqlExtension, cmake, fetchFromGitHub, h3_4, + lib, postgresql, postgresqlTestExtension, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -16,7 +16,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "zachasme"; repo = "h3-pg"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2xp9gssPMTroLT/1Me0VWvtIPyouIk9MW0Rp13uYBEw="; }; @@ -50,10 +50,10 @@ buildPostgresqlExtension (finalAttrs: { ''; }; - meta = with lib; { + meta = { description = "PostgreSQL bindings for H3, a hierarchical hexagonal geospatial indexing system"; homepage = "https://github.com/zachasme/h3-pg"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; inherit (postgresql.meta) platforms; }; From 713a4107e3f2d69acf44dc99cd6322f3aadcccb4 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:15:56 +0100 Subject: [PATCH 14/72] postgresqlPackages.hypopg: modernize --- pkgs/servers/sql/postgresql/ext/hypopg.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/hypopg.nix index f85a743d9fca..47931377fb67 100644 --- a/pkgs/servers/sql/postgresql/ext/hypopg.nix +++ b/pkgs/servers/sql/postgresql/ext/hypopg.nix @@ -1,10 +1,10 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, - gitUpdater, buildPostgresqlExtension, + fetchFromGitHub, + gitUpdater, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -14,7 +14,7 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "HypoPG"; repo = "hypopg"; - rev = version; + tag = version; hash = "sha256-88uKPSnITRZ2VkelI56jZ9GWazG/Rn39QlyHKJKSKMM="; }; @@ -24,11 +24,11 @@ buildPostgresqlExtension rec { }; }; - meta = with lib; { + meta = { description = "Hypothetical Indexes for PostgreSQL"; homepage = "https://hypopg.readthedocs.io"; - license = licenses.postgresql; + license = lib.licenses.postgresql; platforms = postgresql.meta.platforms; - maintainers = with maintainers; [ bbigras ]; + maintainers = with lib.maintainers; [ bbigras ]; }; } From 408c32a5e4c447b40feb92a3137bb3b89210dace Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:18:09 +0100 Subject: [PATCH 15/72] postgresqlPackages.jsonb_deep_sum: modernize --- .../sql/postgresql/ext/jsonb_deep_sum.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix index 8d8ccf12e56b..bfb69e6df0f8 100644 --- a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix +++ b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension { @@ -14,14 +14,14 @@ buildPostgresqlExtension { owner = "furstenheim"; repo = "jsonb_deep_sum"; rev = "d9c69aa6b7da860e5522a9426467e67cb787980c"; - sha256 = "sha256-W1wNILAwTAjFPezq+grdRMA59KEnMZDz69n9xQUqdc0="; + hash = "sha256-W1wNILAwTAjFPezq+grdRMA59KEnMZDz69n9xQUqdc0="; }; - meta = with lib; { + meta = { description = "PostgreSQL extension to easily add jsonb numeric"; homepage = "https://github.com/furstenheim/jsonb_deep_sum"; - maintainers = with maintainers; [ _1000101 ]; + maintainers = with lib.maintainers; [ _1000101 ]; platforms = postgresql.meta.platforms; - license = licenses.mit; + license = lib.licenses.mit; }; } From f0a6c688a62ddda19f9aba5c88ea436b54966e39 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:18:21 +0100 Subject: [PATCH 16/72] postgresqlPackages.lantern: modernize --- pkgs/servers/sql/postgresql/ext/lantern.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix index fcfd82e61345..51150b5e6ec6 100644 --- a/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, + buildPostgresqlExtension, cmake, fetchFromGitHub, + lib, openssl, postgresql, postgresqlTestExtension, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -16,7 +16,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "lanterndata"; repo = "lantern"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-IsDD/um5pVvbzin8onf45DQVszl+Id/pJSQ2iijgHmg="; fetchSubmodules = true; }; @@ -51,11 +51,11 @@ buildPostgresqlExtension (finalAttrs: { ''; }; - meta = with lib; { + meta = { description = "PostgreSQL vector database extension for building AI applications"; homepage = "https://lantern.dev/"; changelog = "https://github.com/lanterndata/lantern/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = licenses.agpl3Only; + license = lib.licenses.agpl3Only; maintainers = [ ]; platforms = postgresql.meta.platforms; }; From ebe805eedd255e3e2737c6983f879eeb25784a8f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:18:29 +0100 Subject: [PATCH 17/72] postgresqlPackages.periods: modernize --- pkgs/servers/sql/postgresql/ext/periods.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix index 343482d26c7b..422c76ae668d 100644 --- a/pkgs/servers/sql/postgresql/ext/periods.nix +++ b/pkgs/servers/sql/postgresql/ext/periods.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -12,16 +12,16 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "xocolatl"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-97v6+WNDcYb/KivlE/JBlRIZ3gYHj68AlK0fylp1cPo="; + repo = "periods"; + tag = "v${version}"; + hash = "sha256-97v6+WNDcYb/KivlE/JBlRIZ3gYHj68AlK0fylp1cPo="; }; - meta = with lib; { + meta = { description = "PostgreSQL extension implementing SQL standard functionality for PERIODs and SYSTEM VERSIONING"; homepage = "https://github.com/xocolatl/periods"; - maintainers = with maintainers; [ ivan ]; + maintainers = with lib.maintainers; [ ivan ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From 8825d441ce4adaaef944602e6a9a48de5f9dc906 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:18:54 +0100 Subject: [PATCH 18/72] postgresqlPackages.pg-gvm: modernize --- pkgs/servers/sql/postgresql/ext/pg-gvm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix index 33b6f2aa24b4..80cf0a80ae6f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix @@ -19,7 +19,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "greenbone"; repo = "pg-gvm"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-D8KpOTF+vcBNIn//8Y0Hwk4B+OBF2Hh3dkWyO2KYeqw="; }; From f9fa6c8385d2662edd29cb9b3c8d4e92d3873fe2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:19:16 +0100 Subject: [PATCH 19/72] postgresqlPackages.pg-gvm: remove mainProgram This is an extension, which doesn't have a binary to begin with. --- pkgs/servers/sql/postgresql/ext/pg-gvm.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix index 80cf0a80ae6f..a4761bad5cd0 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix @@ -42,7 +42,6 @@ buildPostgresqlExtension (finalAttrs: { changelog = "https://github.com/greenbone/pg-gvm/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ tochiaha ]; - mainProgram = "pg-gvm"; platforms = postgresql.meta.platforms; }; }) From 13ca9125caad853805931795a1313a8b1c6c00c5 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:25:49 +0100 Subject: [PATCH 20/72] postgresqlPackages.pg-semver: modernize --- pkgs/servers/sql/postgresql/ext/pg-semver.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg-semver.nix b/pkgs/servers/sql/postgresql/ext/pg-semver.nix index d379981cd0df..ea8d4c70a4a2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-semver.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-semver.nix @@ -1,10 +1,10 @@ { - lib, + buildPostgresqlExtension, fetchFromGitHub, + lib, postgresql, postgresqlTestExtension, testers, - buildPostgresqlExtension, }: buildPostgresqlExtension (finalAttrs: { @@ -14,7 +14,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "theory"; repo = "pg-semver"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9f+QuGupjTUK3cQk7DFDrL7MOIwDE9SAUyVZ9RfrdDM="; }; From 29029695329826ce04b57ee73cae2d87c7e7c7e7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:26:01 +0100 Subject: [PATCH 21/72] postgresqlPackages.pg_auto_failover: modernize --- .../sql/postgresql/ext/pg_auto_failover.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 0d43faa7fe2e..dbb723e31049 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -12,23 +12,23 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "citusdata"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-OIWykfFbVskrkPG/zSmZtZjc+W956KSfIzK7f5QOqpI="; + repo = "pg_auto_failover"; + tag = "v${version}"; + hash = "sha256-OIWykfFbVskrkPG/zSmZtZjc+W956KSfIzK7f5QOqpI="; }; buildInputs = postgresql.buildInputs; - meta = with lib; { + meta = { description = "PostgreSQL extension and service for automated failover and high-availability"; mainProgram = "pg_autoctl"; homepage = "https://github.com/citusdata/pg_auto_failover"; changelog = "https://github.com/citusdata/pg_auto_failover/blob/v${version}/CHANGELOG.md"; maintainers = [ ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; # PostgreSQL 17 support issue upstream: https://github.com/hapostgres/pg_auto_failover/issues/1048 # Check after next package update. - broken = versionAtLeast postgresql.version "17" && version == "2.1"; + broken = lib.versionAtLeast postgresql.version "17" && version == "2.1"; }; } From fdc0616a17198f0c66715764aaefef21ad460c09 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:28:59 +0100 Subject: [PATCH 22/72] postgresqlPackages.pg_bigm: modernize --- pkgs/servers/sql/postgresql/ext/pg_bigm.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix index e4c12f676d07..68daf6bcb3d0 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix @@ -1,8 +1,8 @@ { - lib, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, }: buildPostgresqlExtension rec { @@ -12,17 +12,17 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "pgbigm"; repo = "pg_bigm"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-5Uy1DmGZR4WdtRUvNdZ5b9zBHJUb9idcEzW20rkreBs="; }; makeFlags = [ "USE_PGXS=1" ]; - meta = with lib; { + meta = { description = "Text similarity measurement and index searching based on bigrams"; homepage = "https://pgbigm.osdn.jp/"; maintainers = [ ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From a79b661577734b2f25e61c4f3f2b968c45c1a9dc Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:29:12 +0100 Subject: [PATCH 23/72] postgresqlPackages.pg_cron: modernize --- pkgs/servers/sql/postgresql/ext/pg_cron.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 124f58fababf..28befb93aacc 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -12,17 +12,17 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "citusdata"; - repo = pname; - rev = "v${version}"; + repo = "pg_cron"; + tag = "v${version}"; hash = "sha256-Llksil7Fk7jvJJmCpfCN0Qm2b2I4J1VOA7/ibytO+KM="; }; - meta = with lib; { + meta = { description = "Run Cron jobs through PostgreSQL"; homepage = "https://github.com/citusdata/pg_cron"; changelog = "https://github.com/citusdata/pg_cron/releases/tag/v${version}"; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From 1fe9671159f70d5c6f7a5e521b40b6258a4ba3d1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:29:22 +0100 Subject: [PATCH 24/72] postgresqlPackages.pg_ed25519: modernize --- pkgs/servers/sql/postgresql/ext/pg_ed25519.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix index 6e823f82b560..4eb97283b5b2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitLab, - postgresql, buildPostgresqlExtension, + fetchFromGitLab, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -13,16 +13,16 @@ buildPostgresqlExtension rec { src = fetchFromGitLab { owner = "dwagin"; repo = "pg_ed25519"; - rev = version; - sha256 = "16w3qx3wj81bzfhydl2pjhn8b1jak6h7ja9wq1kc626g0siggqi0"; + tag = version; + hash = "sha256-IOL3ogbPCMNmwDwpeaCZSoaFLJRX0Oah+ysgyUfHg5s="; }; - meta = with lib; { + meta = { description = "PostgreSQL extension for signing and verifying ed25519 signatures"; homepage = "https://gitlab.com/dwagin/pg_ed25519"; - maintainers = [ maintainers.renzo ]; + maintainers = with lib.maintainers; [ renzo ]; platforms = postgresql.meta.platforms; - license = licenses.mit; + license = lib.licenses.mit; # Broken with no upstream fix available. broken = lib.versionAtLeast postgresql.version "16"; }; From db0b636cffbcb5ab2fb424d53f429d3168839013 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:29:44 +0100 Subject: [PATCH 25/72] postgresqlPackages.pg_hint_plan: modernize --- pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index 20d31530164e..4f4e4ddd8882 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: let @@ -44,7 +44,7 @@ buildPostgresqlExtension { src = fetchFromGitHub { owner = "ossc-db"; repo = "pg_hint_plan"; - rev = "REL${lib.versions.major postgresql.version}_${ + tag = "REL${lib.versions.major postgresql.version}_${ builtins.replaceStrings [ "." ] [ "_" ] source.version }"; inherit (source) hash; @@ -57,11 +57,11 @@ buildPostgresqlExtension { enableUpdateScript = false; - meta = with lib; { + meta = { description = "Extension to tweak PostgreSQL execution plans using so-called 'hints' in SQL comments"; homepage = "https://github.com/ossc-db/pg_hint_plan"; - maintainers = with maintainers; [ _1000101 ]; + maintainers = with lib.maintainers; [ _1000101 ]; platforms = postgresql.meta.platforms; - license = licenses.bsd3; + license = lib.licenses.bsd3; }; } From 1201a679319da22c8660f8d7732bcbaddb074115 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:30:07 +0100 Subject: [PATCH 26/72] postgresqlPackages.pg_hint_plan: remove hash for v12 v12 had been removed from nixpkgs a while ago. --- pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index 4f4e4ddd8882..4b4a8c07bc89 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -29,10 +29,6 @@ let version = "1.3.9"; hash = "sha256-KGcHDwk8CgNHPZARfLBfS8r7TRCP9LPjT+m4fNSnnW0="; }; - "12" = { - version = "1.3.9"; - hash = "sha256-64/dlm6e4flCxMQ8efsxfKSlja+Tko0zsghTgLatN+Y="; - }; } .${lib.versions.major postgresql.version} or (throw "Source for pg_hint_plan is not available for ${postgresql.version}"); From 35b7e2c03109c7f78332fa2903dd3180f71bc193 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:32:33 +0100 Subject: [PATCH 27/72] postgresqlPackages.pg_hll: modernize --- pkgs/servers/sql/postgresql/ext/pg_hll.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index 709424365e7c..4f817d799aeb 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -13,16 +13,16 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "citusdata"; repo = "postgresql-hll"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Latdxph1Ura8yKEokEjalJ+/GY+pAKOT3GXjuLprj6c="; }; - meta = with lib; { + meta = { description = "HyperLogLog for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-hll"; changelog = "https://github.com/citusdata/postgresql-hll/blob/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; - license = licenses.asl20; + license = lib.licenses.asl20; }; } From f7761b09ac5e77f55c68883e7916ed586ea7e120 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:32:43 +0100 Subject: [PATCH 28/72] postgresqlPackages.pg_ivm: modernize --- pkgs/servers/sql/postgresql/ext/pg_ivm.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index 675eab8fee5c..c652d50dfe89 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -12,18 +12,18 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "sraoss"; - repo = pname; - rev = "v${version}"; + repo = "pg_ivm"; + tag = "v${version}"; hash = "sha256-Qcie7sbXcMbQkMoFIYBfttmvlYooESdSk2DyebHKPlk="; }; - meta = with lib; { + meta = { description = "Materialized views with IVM (Incremental View Maintenance) for PostgreSQL"; homepage = "https://github.com/sraoss/pg_ivm"; changelog = "https://github.com/sraoss/pg_ivm/releases/tag/v${version}"; - maintainers = with maintainers; [ ivan ]; + maintainers = with lib.maintainers; [ ivan ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; - broken = versionOlder postgresql.version "13"; + license = lib.licenses.postgresql; + broken = lib.versionOlder postgresql.version "13"; }; } From 329750763e3d9e599e0cc94580ca8cc154f384c4 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:32:53 +0100 Subject: [PATCH 29/72] postgresqlPackages.pg_libversion: modernize --- .../servers/sql/postgresql/ext/pg_libversion.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_libversion.nix b/pkgs/servers/sql/postgresql/ext/pg_libversion.nix index 2360944e555d..979a48128bb1 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_libversion.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_libversion.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, gitUpdater, + lib, + libversion, pkg-config, postgresql, - libversion, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -16,7 +16,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "repology"; repo = "postgresql-libversion"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-3nqXaBwPRUSo6wUY5YMjJ/nFFKmhgP1zFKapD+RqSDw="; }; @@ -30,11 +30,11 @@ buildPostgresqlExtension (finalAttrs: { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "PostgreSQL extension with support for version string comparison"; homepage = "https://github.com/repology/postgresql-libversion"; - license = licenses.mit; - maintainers = [ maintainers.jopejoe1 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jopejoe1 ]; platforms = postgresql.meta.platforms; }; }) From df033d0eef073b769f97268736b06631ea32eb25 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:33:01 +0100 Subject: [PATCH 30/72] postgresqlPackages.pg_net: modernize --- pkgs/servers/sql/postgresql/ext/pg_net.nix | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix index 61ee9572467e..fbc8d213a235 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -1,33 +1,33 @@ { - lib, - stdenv, - fetchFromGitHub, - curl, - postgresql, buildPostgresqlExtension, + curl, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { pname = "pg_net"; version = "0.14.0"; - buildInputs = [ curl ]; - src = fetchFromGitHub { owner = "supabase"; - repo = pname; - rev = "refs/tags/v${version}"; + repo = "pg_net"; + tag = "v${version}"; hash = "sha256-c1pxhTyrE5j6dY+M5eKAboQNofIORS+Dccz+7HKEKQI="; }; + buildInputs = [ curl ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; - meta = with lib; { + meta = { description = "Async networking for Postgres"; homepage = "https://github.com/supabase/pg_net"; changelog = "https://github.com/supabase/pg_net/releases/tag/v${version}"; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From c8acb21179f09bca51cdcee68fe6f7db676cb468 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:33:45 +0100 Subject: [PATCH 31/72] postgresqlPackages.pg_partman: modernize --- .../servers/sql/postgresql/ext/pg_partman.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index c3ffbbe2ce7d..af06311a5d3d 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -12,18 +12,18 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "pgpartman"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-i/o+JZEXnJRO17kfdTw87aca28+I8pvuFZsPMA/kf+w="; + repo = "pg_partman"; + tag = "v${version}"; + hash = "sha256-i/o+JZEXnJRO17kfdTw87aca28+I8pvuFZsPMA/kf+w="; }; - meta = with lib; { + meta = { description = "Partition management extension for PostgreSQL"; homepage = "https://github.com/pgpartman/pg_partman"; changelog = "https://github.com/pgpartman/pg_partman/blob/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ ggpeti ]; + maintainers = with lib.maintainers; [ ggpeti ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; - broken = versionOlder postgresql.version "14"; + license = lib.licenses.postgresql; + broken = lib.versionOlder postgresql.version "14"; }; } From 5c1b9628b841230012a65fe5a4f8dfe063e4728e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:34:36 +0100 Subject: [PATCH 32/72] postgresqlPackages.pg_rational: modernize --- pkgs/servers/sql/postgresql/ext/pg_rational.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/pg_rational.nix index d2131b9f8c78..a557006142ec 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_rational.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_rational.nix @@ -1,9 +1,8 @@ { - stdenv, + buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, - buildPostgresqlExtension, }: buildPostgresqlExtension rec { @@ -13,15 +12,15 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "begriffs"; repo = "pg_rational"; - rev = "v${version}"; - sha256 = "sha256-Sp5wuX2nP3KGyWw7MFa11rI1CPIKIWBt8nvBSsASIEw="; + tag = "v${version}"; + hash = "sha256-Sp5wuX2nP3KGyWw7MFa11rI1CPIKIWBt8nvBSsASIEw="; }; - meta = with lib; { + meta = { description = "Precise fractional arithmetic for PostgreSQL"; homepage = "https://github.com/begriffs/pg_rational"; - maintainers = with maintainers; [ netcrns ]; + maintainers = with lib.maintainers; [ netcrns ]; platforms = postgresql.meta.platforms; - license = licenses.mit; + license = lib.licenses.mit; }; } From 06bcba6c00ff5fc51d98d0ce52bedbd4a1e768bc Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:54:32 +0100 Subject: [PATCH 33/72] postgresqlPackages.pg_relusage: modernize --- .../sql/postgresql/ext/pg_relusage.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix index 4379dc1ffdc9..a7666c046247 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -12,16 +12,16 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "adept"; - repo = pname; - rev = "refs/tags/${version}"; - sha256 = "8hJNjQ9MaBk3J9a73l+yQMwMW/F2N8vr5PO2o+5GvYs="; + repo = "pg_relusage"; + tag = "${version}"; + hash = "sha256-8hJNjQ9MaBk3J9a73l+yQMwMW/F2N8vr5PO2o+5GvYs="; }; - meta = with lib; { + meta = { description = "pg_relusage extension for PostgreSQL: discover and log the relations used in your statements"; homepage = "https://github.com/adept/pg_relusage"; - maintainers = with maintainers; [ thenonameguy ]; + maintainers = with lib.maintainers; [ thenonameguy ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From 494501473064537488e9391b3df03b4a8769d110 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:55:49 +0100 Subject: [PATCH 34/72] postgresqlPackages.pg_repack: modernize --- pkgs/servers/sql/postgresql/ext/pg_repack.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index 388a82cb29cb..8368b2ffd672 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + gitUpdater, + lib, postgresql, postgresqlTestExtension, + stdenv, testers, - buildPostgresqlExtension, - gitUpdater, }: buildPostgresqlExtension (finalAttrs: { @@ -18,8 +18,8 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "reorg"; repo = "pg_repack"; - rev = "ver_${finalAttrs.version}"; - sha256 = "sha256-wfjiLkx+S3zVrAynisX1GdazueVJ3EOwQEPcgUQt7eA="; + tag = "ver_${finalAttrs.version}"; + hash = "sha256-wfjiLkx+S3zVrAynisX1GdazueVJ3EOwQEPcgUQt7eA="; }; passthru.updateScript = gitUpdater { @@ -36,7 +36,7 @@ buildPostgresqlExtension (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Reorganize tables in PostgreSQL databases with minimal locks"; longDescription = '' pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore @@ -45,8 +45,8 @@ buildPostgresqlExtension (finalAttrs: { with performance comparable to using CLUSTER directly. ''; homepage = "https://github.com/reorg/pg_repack"; - license = licenses.bsd3; - maintainers = with maintainers; [ danbst ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ danbst ]; inherit (postgresql.meta) platforms; mainProgram = "pg_repack"; }; From 0861a93e92e9c4f2c54cbdcbb234a4e046a9fbb1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:56:06 +0100 Subject: [PATCH 35/72] postgresqlPackages.pg_roaringbitmap: modernize --- pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix index eeade122d1e1..8ffe3ed2c13d 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix @@ -1,10 +1,10 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + lib, postgresql, postgresqlTestHook, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -14,15 +14,15 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "ChenHuajun"; repo = "pg_roaringbitmap"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-E6vqawnsRsAIajGDgJcTUWV1H8GFFboTjhmVfemUGbs="; }; - meta = with lib; { + meta = { description = "RoaringBitmap extension for PostgreSQL"; homepage = "https://github.com/ChenHuajun/pg_roaringbitmap"; changelog = "https://github.com/ChenHuajun/pg_roaringbitmap/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; inherit (postgresql.meta) platforms; }; From ea10eb7f6d9fec3f1e668aba72f1965bc4cef51c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:56:37 +0100 Subject: [PATCH 36/72] postgresqlPackages.pg_safeupdate: modernize --- .../sql/postgresql/ext/pg_safeupdate.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index 17ffa9a67203..b3cca02a3a25 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: with { @@ -13,23 +13,23 @@ with { }; "13" = { version = "1.4"; - sha256 = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; + hash = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; }; "14" = { version = "1.5"; - sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; }; "15" = { version = "1.5"; - sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; }; "16" = { version = "1.5"; - sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; }; "17" = { version = "1.5"; - sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; }; } ."${lib.versions.major postgresql.version}" @@ -41,17 +41,17 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "eradman"; - repo = pname; - rev = version; - inherit sha256; + repo = "pg-safeupdate"; + tag = version; + inherit hash; }; - meta = with lib; { + meta = { description = "Simple extension to PostgreSQL that requires criteria for UPDATE and DELETE"; homepage = "https://github.com/eradman/pg-safeupdate"; changelog = "https://github.com/eradman/pg-safeupdate/raw/${src.rev}/NEWS"; platforms = postgresql.meta.platforms; - maintainers = with maintainers; [ wolfgangwalther ]; - license = licenses.postgresql; + maintainers = with lib.maintainers; [ wolfgangwalther ]; + license = lib.licenses.postgresql; }; } From aefde28f058cbf9bd96a53bcea7ba86dc7959433 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:57:03 +0100 Subject: [PATCH 37/72] postgresqlPackages.pg_safeupdate: remove hash for v12 v12 had been removed from nixpkgs a while ago. --- pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index b3cca02a3a25..c551aca7df8f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -7,10 +7,6 @@ }: with { - "12" = { - version = "1.4"; - sha256 = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; - }; "13" = { version = "1.4"; hash = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; From 0308b7191304e1922290aa70bf2fc93869946ce6 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:57:14 +0100 Subject: [PATCH 38/72] postgresqlPackages.pg_similarity: modernize --- pkgs/servers/sql/postgresql/ext/pg_similarity.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 41b663864ba2..ab6d97637231 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -1,10 +1,10 @@ { - stdenv, - lib, + buildPostgresqlExtension, fetchFromGitHub, fetchpatch, + lib, postgresql, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension { @@ -15,7 +15,7 @@ buildPostgresqlExtension { owner = "eulerto"; repo = "pg_similarity"; rev = "b9cb0a2d501b91e33cd1ef550b05483ca3563f71"; - sha256 = "sha256-L04ANvyfzHgW7fINeJEY6T77Vojq3SI8P1TWiCRSPs0="; + hash = "sha256-L04ANvyfzHgW7fINeJEY6T77Vojq3SI8P1TWiCRSPs0="; }; patches = [ From 72ac83aaddeb64f39db043bf3fc434b667b4e54d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:57:28 +0100 Subject: [PATCH 39/72] postgresqlPackages.pg_squeeze: modernize --- pkgs/servers/sql/postgresql/ext/pg_squeeze.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix index 13bbd7a330b7..9dfef6a1322a 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix @@ -1,11 +1,11 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + lib, + nix-update-script, postgresql, postgresqlTestExtension, - buildPostgresqlExtension, - nix-update-script, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -17,7 +17,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "cybertec-postgresql"; repo = "pg_squeeze"; - rev = "REL1_7_0"; + tag = "REL1_7_0"; hash = "sha256-Kh1wSOvV5Rd1CG/na3yzbWzvaR8SJ6wmTZOnM+lbgik="; }; @@ -41,11 +41,11 @@ buildPostgresqlExtension (finalAttrs: { ''; }; - meta = with lib; { + meta = { description = "PostgreSQL extension for automatic bloat cleanup"; homepage = "https://github.com/cybertec-postgresql/pg_squeeze"; changelog = "https://github.com/cybertec-postgresql/pg_squeeze/blob/${finalAttrs.src.rev}/NEWS"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; platforms = postgresql.meta.platforms; }; From 4d8242ed1b080b785441dacfe034636d561c684e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:57:43 +0100 Subject: [PATCH 40/72] postgresqlPackages.pg_topn: modernize --- pkgs/servers/sql/postgresql/ext/pg_topn.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 3271c6ac7a68..a6ac3c5ea70e 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -13,16 +13,16 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "citusdata"; repo = "postgresql-topn"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-lP6Iil/BUv4ga+co+oBpKv1FBqFuBGfNjueEolM6png="; + tag = "v${version}"; + hash = "sha256-lP6Iil/BUv4ga+co+oBpKv1FBqFuBGfNjueEolM6png="; }; - meta = with lib; { + meta = { description = "Efficient querying of 'top values' for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-topn"; changelog = "https://github.com/citusdata/postgresql-topn/raw/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; - license = licenses.agpl3Only; + license = lib.licenses.agpl3Only; }; } From bdadf795833bfec8522589493f6b5f2ea0375ee3 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:58:07 +0100 Subject: [PATCH 41/72] postgresqlPackages.pg_uuidv7: modernize --- pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix index a11332dd6192..9f3f766d29ed 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -13,17 +13,17 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "fboulnois"; repo = "pg_uuidv7"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-lG6dCnbLALnfQc4uclqXXXfYjK/WXLV0lo5I8l1E5p4="; }; - meta = with lib; { + meta = { description = "Tiny Postgres extension to create version 7 UUIDs"; homepage = "https://github.com/fboulnois/pg_uuidv7"; changelog = "https://github.com/fboulnois/pg_uuidv7/blob/main/CHANGELOG.md"; - maintainers = with maintainers; [ gaelreyrol ]; + maintainers = with lib.maintainers; [ gaelreyrol ]; platforms = postgresql.meta.platforms; - license = licenses.mpl20; - broken = versionOlder postgresql.version "13"; + license = lib.licenses.mpl20; + broken = lib.versionOlder postgresql.version "13"; }; } From d271d2ac406f3cd3f35f15c46ca06a151043e0f6 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:58:25 +0100 Subject: [PATCH 42/72] postgresqlPackages.pgaudit: modernize --- pkgs/servers/sql/postgresql/ext/pgaudit.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index 13e5ad29ff4a..f9ca1b485eba 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -1,11 +1,11 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + lib, libkrb5, openssl, postgresql, - buildPostgresqlExtension, + stdenv, }: let @@ -46,7 +46,7 @@ buildPostgresqlExtension { src = fetchFromGitHub { owner = "pgaudit"; repo = "pgaudit"; - rev = source.version; + tag = source.version; hash = source.hash; }; @@ -59,12 +59,12 @@ buildPostgresqlExtension { enableUpdateScript = false; - meta = with lib; { + meta = { description = "Open Source PostgreSQL Audit Logging"; homepage = "https://github.com/pgaudit/pgaudit"; changelog = "https://github.com/pgaudit/pgaudit/releases/tag/${source.version}"; - maintainers = with maintainers; [ idontgetoutmuch ]; + maintainers = with lib.maintainers; [ idontgetoutmuch ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From 5279e64bb94adfe8c0824343e98ced4f17ce614a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:58:42 +0100 Subject: [PATCH 43/72] postgresqlPackages.pgaudit: remove hash for v12 v12 had been removed from nixpkgs a while ago. --- pkgs/servers/sql/postgresql/ext/pgaudit.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index f9ca1b485eba..43e76c182529 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -31,10 +31,6 @@ let version = "1.5.2"; hash = "sha256-fyf2Ym0fAAXjc28iFCGDEftPAyDLXmEgi/0DaTJJiIg="; }; - "12" = { - version = "1.4.3"; - hash = "sha256-c8/xUFIHalu2bMCs57DeylK0oW0VnQwmUCpdp+tYqk4="; - }; } .${lib.versions.major postgresql.version} or (throw "Source for pgaudit is not available for ${postgresql.version}"); From 6873ba7f2d7717f7ef56ced029b6e8db6a4e4ca2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:58:57 +0100 Subject: [PATCH 44/72] postgresqlPackages.pgjwt: modernize --- pkgs/servers/sql/postgresql/ext/pgjwt.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index 9b3afd821dbd..a21ac25e333e 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, - unstableGitUpdater, - nixosTests, - postgresqlTestExtension, buildPostgresqlExtension, + fetchFromGitHub, + lib, + nixosTests, + postgresql, + postgresqlTestExtension, + stdenv, + unstableGitUpdater, }: buildPostgresqlExtension (finalAttrs: { @@ -17,7 +17,7 @@ buildPostgresqlExtension (finalAttrs: { owner = "michelp"; repo = "pgjwt"; rev = "f3d82fd30151e754e19ce5d6a06c71c20689ce3d"; - sha256 = "sha256-nDZEDf5+sFc1HDcG2eBNQj+kGcdAYRXJseKi9oww+JU="; + hash = "sha256-nDZEDf5+sFc1HDcG2eBNQj+kGcdAYRXJseKi9oww+JU="; }; passthru.updateScript = unstableGitUpdater { }; @@ -34,13 +34,13 @@ buildPostgresqlExtension (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "PostgreSQL implementation of JSON Web Tokens"; longDescription = '' sign() and verify() functions to create and verify JSON Web Tokens. ''; - license = licenses.mit; + license = lib.licenses.mit; platforms = postgresql.meta.platforms; - maintainers = with maintainers; [ spinus ]; + maintainers = with lib.maintainers; [ spinus ]; }; }) From b1a9540b3938ab4c92e2a0f1317d53e2756a5e05 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:59:07 +0100 Subject: [PATCH 45/72] postgresqlPackages.pgmq: modernize --- pkgs/servers/sql/postgresql/ext/pgmq.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix index 375bc7fa28d4..c2f1a3559dc5 100644 --- a/pkgs/servers/sql/postgresql/ext/pgmq.nix +++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -13,7 +13,7 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "tembo-io"; repo = "pgmq"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-iFIHkqL9w7Bw1dxmmL1i0D5Xxq+ljFLf24M9vHArwvE="; }; From f29a6d41a61473c259db75e62866b9439d9ccb9a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:59:18 +0100 Subject: [PATCH 46/72] postgresqlPackages.pgroonga: modernize --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 6ea65c6a5ccd..68a3da58a1fb 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + groonga, + lib, + msgpack-c, pkg-config, postgresql, - msgpack-c, - groonga, - buildPostgresqlExtension, + stdenv, xxHash, }: @@ -17,7 +17,7 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "pgroonga"; repo = "pgroonga"; - rev = "${version}"; + tag = "${version}"; hash = "sha256-a5nNtlUiFBuuqWAjIN0gU/FaoV3VpJh+/fab8R/77dw="; }; @@ -34,7 +34,7 @@ buildPostgresqlExtension rec { "MSGPACK_PACKAGE_NAME=msgpack-c" ]; - meta = with lib; { + meta = { description = "PostgreSQL extension to use Groonga as the index"; longDescription = '' PGroonga is a PostgreSQL extension to use Groonga as the index. @@ -44,8 +44,8 @@ buildPostgresqlExtension rec { ''; homepage = "https://pgroonga.github.io/"; changelog = "https://github.com/pgroonga/pgroonga/releases/tag/${version}"; - license = licenses.postgresql; + license = lib.licenses.postgresql; platforms = postgresql.meta.platforms; - maintainers = with maintainers; [ DerTim1 ]; + maintainers = with lib.maintainers; [ DerTim1 ]; }; } From e05060a735ba5760448d2587110efe6c3952b872 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:59:27 +0100 Subject: [PATCH 47/72] postgresqlPackages.pgrouting: modernize --- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 4aef42af2579..47aadc39a81f 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, - perl, - cmake, boost, buildPostgresqlExtension, + cmake, + fetchFromGitHub, + lib, + perl, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -22,16 +22,16 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "pgRouting"; repo = "pgrouting"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-jaevnDCJ6hRQeDhdAkvMTvnnFWElMNvo9gZRW53proQ="; }; - meta = with lib; { + meta = { description = "PostgreSQL/PostGIS extension that provides geospatial routing functionality"; homepage = "https://pgrouting.org/"; changelog = "https://github.com/pgRouting/pgrouting/releases/tag/v${version}"; - maintainers = with maintainers; teams.geospatial.members ++ [ steve-chavez ]; + maintainers = with lib.maintainers; lib.teams.geospatial.members ++ [ steve-chavez ]; platforms = postgresql.meta.platforms; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } From 671cda525b853f85f61efea677f460822dddbbfe Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:59:43 +0100 Subject: [PATCH 48/72] postgresqlPackages.pgsodium: modernize --- pkgs/servers/sql/postgresql/ext/pgsodium.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgsodium.nix b/pkgs/servers/sql/postgresql/ext/pgsodium.nix index 8525fd81947a..d072c1c75b6c 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsodium.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsodium.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, - fetchFromGitHub, bash, + buildPostgresqlExtension, + fetchFromGitHub, + lib, libsodium, postgresql, postgresqlTestExtension, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -16,7 +16,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "michelp"; repo = "pgsodium"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Y8xL3PxF1GQV1JIgolMI1e8oGcUvWAgrPv84om7wKP8="; }; @@ -45,11 +45,11 @@ buildPostgresqlExtension (finalAttrs: { ''; }; - meta = with lib; { + meta = { description = "Modern cryptography for PostgreSQL using libsodium"; homepage = "https://github.com/michelp/pgsodium"; changelog = "https://github.com/michelp/pgsodium/releases/tag/v${finalAttrs.version}"; - license = licenses.postgresql; + license = lib.licenses.postgresql; maintainers = [ ]; platforms = postgresql.meta.platforms; }; From c22f751e95a704126be325fe80f2a18ae0849221 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:59:52 +0100 Subject: [PATCH 49/72] postgresqlPackages.pgsql-http: modernize --- pkgs/servers/sql/postgresql/ext/pgsql-http.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix index 151cd92173eb..3b8b744e5cee 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix @@ -1,10 +1,10 @@ { - lib, - stdenv, - fetchFromGitHub, - curl, - postgresql, buildPostgresqlExtension, + curl, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -14,19 +14,19 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "pramsey"; repo = "pgsql-http"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-Ij8BaNj2SOwDfjgLxrpLFvvPCzSahXyyckRPGmcqKtE="; }; buildInputs = [ curl ]; nativeBuildInputs = [ curl ]; - meta = with lib; { + meta = { description = "HTTP client for PostgreSQL, retrieve a web page from inside the database"; homepage = "https://github.com/pramsey/pgsql-http"; changelog = "https://github.com/pramsey/pgsql-http/releases/tag/v${version}"; maintainers = [ ]; platforms = postgresql.meta.platforms; - license = licenses.mit; + license = lib.licenses.mit; }; } From b2daf5353cb7fa6b41c9bb3afbd7059f3a3d3bf0 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:00:00 +0100 Subject: [PATCH 50/72] postgresqlPackages.pgtap: modernize --- pkgs/servers/sql/postgresql/ext/pgtap.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 0dd670a0b4b3..3e0907eaef3b 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, buildPostgresqlExtension, fetchFromGitHub, + lib, perl, perlPackages, postgresql, postgresqlTestHook, + stdenv, which, }: @@ -17,8 +17,8 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "theory"; repo = "pgtap"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-YgvfLGF7pLVcCKD66NnWAydDxtoYHH1DpLiYTEKHJ0E="; + tag = "v${finalAttrs.version}"; + hash = "sha256-YgvfLGF7pLVcCKD66NnWAydDxtoYHH1DpLiYTEKHJ0E="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ buildPostgresqlExtension (finalAttrs: { installPhase = "touch $out"; }; - meta = with lib; { + meta = { description = "Unit testing framework for PostgreSQL"; longDescription = '' pgTAP is a unit testing framework for PostgreSQL written in PL/pgSQL and PL/SQL. @@ -62,9 +62,9 @@ buildPostgresqlExtension (finalAttrs: { as well as the ability to integrate with other TAP-emitting test frameworks. It can also be used in the xUnit testing style. ''; - maintainers = with maintainers; [ willibutz ]; + maintainers = with lib.maintainers; [ willibutz ]; homepage = "https://pgtap.org"; inherit (postgresql.meta) platforms; - license = licenses.mit; + license = lib.licenses.mit; }; }) From 9e3ad80ed5c042530f9ef4f855e51ed7ce809a68 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:00:08 +0100 Subject: [PATCH 51/72] postgresqlPackages.pgvector: modernize --- pkgs/servers/sql/postgresql/ext/pgvector.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index 3eb06fc9b06c..45986b31cbb9 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -13,15 +13,15 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "pgvector"; repo = "pgvector"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-JsZV+I4eRMypXTjGmjCtMBXDVpqTIPHQa28ogXncE/Q="; }; - meta = with lib; { + meta = { description = "Open-source vector similarity search for PostgreSQL"; homepage = "https://github.com/pgvector/pgvector"; changelog = "https://github.com/pgvector/pgvector/raw/v${version}/CHANGELOG.md"; - license = licenses.postgresql; + license = lib.licenses.postgresql; platforms = postgresql.meta.platforms; maintainers = [ ]; }; From d3a7181b5edc03185b582236e545d3aeb6e6bcd2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:00:21 +0100 Subject: [PATCH 52/72] postgresqlPackages.plpgsql_check: modernize --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 4ca7244ba407..e660dc5ee614 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -1,10 +1,10 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + lib, postgresql, postgresqlTestExtension, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -14,7 +14,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "okbob"; repo = "plpgsql_check"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JF0aTYakoHMRdiWcA70mYFvzTiwMhOJZfqRj+6JC6n0="; }; @@ -23,12 +23,12 @@ buildPostgresqlExtension (finalAttrs: { sql = "CREATE EXTENSION plpgsql_check;"; }; - meta = with lib; { + meta = { description = "Linter tool for language PL/pgSQL"; homepage = "https://github.com/okbob/plpgsql_check"; changelog = "https://github.com/okbob/plpgsql_check/releases/tag/v${finalAttrs.version}"; platforms = postgresql.meta.platforms; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; }) From e3960931e47aa0c04bcba9256575f54b0e348e5f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:00:28 +0100 Subject: [PATCH 53/72] postgresqlPackages.plr: modernize --- pkgs/servers/sql/postgresql/ext/plr.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix index c1148bf92c39..b55812c3f3ce 100644 --- a/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -1,11 +1,11 @@ { - lib, - stdenv, - fetchFromGitHub, - pkg-config, R, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + pkg-config, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -15,8 +15,8 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "postgres-plr"; repo = "plr"; - rev = "REL8_4_7"; - sha256 = "sha256-PdvFEmtKfLT/xfaf6obomPR5hKC9F+wqpfi1heBphRk="; + tag = "REL8_4_7"; + hash = "sha256-PdvFEmtKfLT/xfaf6obomPR5hKC9F+wqpfi1heBphRk="; }; nativeBuildInputs = [ pkg-config ]; @@ -24,12 +24,12 @@ buildPostgresqlExtension rec { makeFlags = [ "USE_PGXS=1" ]; - meta = with lib; { + meta = { description = "PL/R - R Procedural Language for PostgreSQL"; homepage = "https://github.com/postgres-plr/plr"; changelog = "https://github.com/postgres-plr/plr/blob/${src.rev}/changelog.md"; - maintainers = with maintainers; [ qoelet ]; + maintainers = with lib.maintainers; [ qoelet ]; platforms = postgresql.meta.platforms; - license = licenses.gpl2Only; + license = lib.licenses.gpl2Only; }; } From 8f6d6a274c41bf01e1ee55325c0b94ea21533a76 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:00:42 +0100 Subject: [PATCH 54/72] postgresqlPackages.postgis: modernize --- pkgs/servers/sql/postgresql/ext/postgis.nix | 59 +++++++++++---------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 556bfd030de7..9a4e46fc2680 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -1,33 +1,34 @@ { - fetchFromGitHub, - lib, - stdenv, - perl, - libxml2, - postgresql, - postgresqlTestHook, - geos, - proj, - gdalMinimal, - json_c, - pkg-config, - file, - protobufc, - libiconv, - libxslt, - docbook5, - cunit, - pcre2, - postgresqlTestExtension, - jitSupport, - llvm, - buildPostgresqlExtension, autoconf, automake, + buildPostgresqlExtension, + cunit, + docbook5, + fetchFromGitHub, + file, + gdalMinimal, + geos, + jitSupport, + json_c, + lib, + libiconv, libtool, + libxml2, + libxslt, + llvm, + pcre2, + perl, + pkg-config, + postgresql, + postgresqlTestExtension, + postgresqlTestHook, + proj, + protobufc, + stdenv, which, - sfcgal, + withSfcgal ? false, + sfcgal, }: let @@ -45,7 +46,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "postgis"; repo = "postgis"; - rev = "${finalAttrs.version}"; + tag = "${finalAttrs.version}"; hash = "sha256-1kOLtG6AMavbWQ1lHG2ABuvIcyTYhgcbjuVmqMR4X+g="; }; @@ -60,6 +61,7 @@ buildPostgresqlExtension (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv ++ lib.optional withSfcgal sfcgal; + nativeBuildInputs = [ autoconf automake @@ -70,6 +72,7 @@ buildPostgresqlExtension (finalAttrs: { protobufc which ] ++ lib.optional jitSupport llvm; + dontDisableStatic = true; nativeCheckInputs = [ @@ -158,12 +161,12 @@ buildPostgresqlExtension (finalAttrs: { ''; }; - meta = with lib; { + meta = { description = "Geographic Objects for PostgreSQL"; homepage = "https://postgis.net/"; changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${finalAttrs.version}/NEWS"; - license = licenses.gpl2Plus; - maintainers = with maintainers; teams.geospatial.members ++ [ marcweber ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; lib.teams.geospatial.members ++ [ marcweber ]; inherit (postgresql.meta) platforms; }; }) From f95649327f16f9ecddafc8578dfd289e1e524a86 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:00:53 +0100 Subject: [PATCH 55/72] postgresqlPackages.repmgr: modernize --- pkgs/servers/sql/postgresql/ext/repmgr.nix | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index a80ac369b7d4..39087deb9599 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, - flex, - curl, - json_c, buildPostgresqlExtension, + curl, + fetchFromGitHub, + flex, + json_c, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -16,8 +16,8 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "EnterpriseDB"; repo = "repmgr"; - rev = "v${version}"; - sha256 = "sha256-8G2CzzkWTKEglpUt1Gr7d/DuHJvCIEjsbYDMl3Zt3cs="; + tag = "v${version}"; + hash = "sha256-8G2CzzkWTKEglpUt1Gr7d/DuHJvCIEjsbYDMl3Zt3cs="; }; nativeBuildInputs = [ flex ]; @@ -27,11 +27,11 @@ buildPostgresqlExtension rec { json_c ]; - meta = with lib; { + meta = { homepage = "https://repmgr.org/"; description = "Replication manager for PostgreSQL cluster"; - license = licenses.postgresql; + license = lib.licenses.postgresql; platforms = postgresql.meta.platforms; - maintainers = with maintainers; [ zimbatm ]; + maintainers = with lib.maintainers; [ zimbatm ]; }; } From ab69634d94ce8c8ed592ca87991e0b0961b17575 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:01:00 +0100 Subject: [PATCH 56/72] postgresqlPackages.rum: modernize --- pkgs/servers/sql/postgresql/ext/rum.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix index f681efd5b9df..71db60cd5406 100644 --- a/pkgs/servers/sql/postgresql/ext/rum.nix +++ b/pkgs/servers/sql/postgresql/ext/rum.nix @@ -1,10 +1,10 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + lib, postgresql, postgresqlTestHook, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -14,7 +14,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "postgrespro"; repo = "rum"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-VsfpxQqRBu9bIAP+TfMRXd+B3hSjuhU2NsutocNiCt8="; }; @@ -48,11 +48,11 @@ buildPostgresqlExtension (finalAttrs: { installPhase = "touch $out"; }; - meta = with lib; { + meta = { description = "Full text search index method for PostgreSQL"; homepage = "https://github.com/postgrespro/rum"; - license = licenses.postgresql; + license = lib.licenses.postgresql; platforms = postgresql.meta.platforms; - maintainers = with maintainers; [ DeeUnderscore ]; + maintainers = with lib.maintainers; [ DeeUnderscore ]; }; }) From 87dcf8ebd095698f249840a2663cbd293b07d8e7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:01:07 +0100 Subject: [PATCH 57/72] postgresqlPackages.smlar: modernize --- pkgs/servers/sql/postgresql/ext/smlar.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix index e7b26482cd72..6906d028fb11 100644 --- a/pkgs/servers/sql/postgresql/ext/smlar.nix +++ b/pkgs/servers/sql/postgresql/ext/smlar.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchgit, - postgresql, buildPostgresqlExtension, + fetchgit, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension { @@ -18,11 +18,11 @@ buildPostgresqlExtension { makeFlags = [ "USE_PGXS=1" ]; - meta = with lib; { + meta = { description = "Compute similary of any one-dimensional arrays"; homepage = "http://sigaev.ru/git/gitweb.cgi?p=smlar.git"; platforms = postgresql.meta.platforms; - license = licenses.bsd2; + license = lib.licenses.bsd2; maintainers = [ ]; # Broken with no upstream fix available. broken = lib.versionAtLeast postgresql.version "16"; From 7cf6a754321ab98d924bfa926697e3d1cbb5c06f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:01:18 +0100 Subject: [PATCH 58/72] postgresqlPackages.sqlite_fdw: modernize --- pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix b/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix index bb25a600ecef..efac33fa7759 100644 --- a/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix @@ -1,9 +1,9 @@ { - lib, - fetchFromGitHub, - sqlite, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + sqlite, }: buildPostgresqlExtension rec { @@ -13,7 +13,7 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "pgspider"; repo = "sqlite_fdw"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-zPVIFzUv6UFFHq0Zi5MeQOcvgsfZAKGkkNIGxkTJ+oo="; }; From 1acb5189176107416697d3ac9cff4444d0be9d05 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:01:29 +0100 Subject: [PATCH 59/72] postgresqlPackages.systems_stats: modernize --- pkgs/servers/sql/postgresql/ext/system_stats.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/system_stats.nix b/pkgs/servers/sql/postgresql/ext/system_stats.nix index bf2930807417..5bedbb758df6 100644 --- a/pkgs/servers/sql/postgresql/ext/system_stats.nix +++ b/pkgs/servers/sql/postgresql/ext/system_stats.nix @@ -1,9 +1,9 @@ { + buildPostgresqlExtension, fetchFromGitHub, lib, - stdenv, postgresql, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension rec { pname = "system_stats"; @@ -12,18 +12,18 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "EnterpriseDB"; repo = "system_stats"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-/xXnui0S0ZjRw7P8kMAgttHVv8T41aOhM3pM8P0OTig="; }; buildFlags = [ "PG_CFLAGS=-Wno-error=vla" ]; - meta = with lib; { - description = "A Postgres extension for exposing system metrics such as CPU, memory and disk information"; + meta = { + description = "Postgres extension for exposing system metrics such as CPU, memory and disk information"; homepage = "https://github.com/EnterpriseDB/system_stats"; changelog = "https://github.com/EnterpriseDB/system_stats/raw/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ shivaraj-bh ]; + maintainers = with lib.maintainers; [ shivaraj-bh ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From 83ed279f0e73ae867f2d4808b88661abbacbcf9b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:01:40 +0100 Subject: [PATCH 60/72] postgresqlPackages.tds_fdw: modernize --- pkgs/servers/sql/postgresql/ext/tds_fdw.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 56b9c164d74a..35e4a4811c6e 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -1,11 +1,11 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, - freetds, - unstableGitUpdater, buildPostgresqlExtension, + fetchFromGitHub, + freetds, + lib, + postgresql, + stdenv, + unstableGitUpdater, }: buildPostgresqlExtension rec { @@ -17,16 +17,16 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "tds-fdw"; repo = "tds_fdw"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-ruelOHueaHx1royLPvDM8Abd1rQD62R4KXgtHY9qqTw="; }; - meta = with lib; { + meta = { description = "PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)"; homepage = "https://github.com/tds-fdw/tds_fdw"; changelog = "https://github.com/tds-fdw/tds_fdw/releases/tag/v${version}"; - maintainers = [ maintainers.steve-chavez ]; + maintainers = with lib.maintainers; [ steve-chavez ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From a117e894b3abfc613f6b57667c897f73b3cf4d71 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:01:51 +0100 Subject: [PATCH 61/72] postgresqlPackages.temporal_tables: modernize --- .../sql/postgresql/ext/temporal_tables.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix index 03692a3ad7b6..5374607808a3 100644 --- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix +++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -13,15 +13,15 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "arkhipov"; repo = "temporal_tables"; - rev = "v${version}"; - sha256 = "sha256-7+DCSPAPhsokWDq/5IXNhd7jY6FfzxxUjlsg/VJeD3k="; + tag = "v${version}"; + hash = "sha256-7+DCSPAPhsokWDq/5IXNhd7jY6FfzxxUjlsg/VJeD3k="; }; - meta = with lib; { + meta = { description = "Temporal Tables PostgreSQL Extension"; homepage = "https://github.com/arkhipov/temporal_tables"; - maintainers = with maintainers; [ ggpeti ]; + maintainers = with lib.maintainers; [ ggpeti ]; platforms = postgresql.meta.platforms; - license = licenses.bsd2; + license = lib.licenses.bsd2; }; } From 07fff4ea84642cb616cda03bdc7be7665903a5c1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:02:06 +0100 Subject: [PATCH 62/72] postgresqlPackages.timescaledb: modernize --- .../sql/postgresql/ext/timescaledb.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 8f93c32aed78..db4cf085b1cf 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -1,7 +1,6 @@ { buildPostgresqlExtension, cmake, - enableUnfree ? true, fetchFromGitHub, lib, libkrb5, @@ -9,25 +8,27 @@ openssl, postgresql, stdenv, + + enableUnfree ? true, }: buildPostgresqlExtension rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; version = "2.18.2"; + src = fetchFromGitHub { + owner = "timescale"; + repo = "timescaledb"; + tag = version; + hash = "sha256-/PKk8/cS6jqL+mhSqFU6gybqDx3ld77RLF/uB+1XJCQ="; + }; + nativeBuildInputs = [ cmake ]; buildInputs = [ openssl libkrb5 ]; - src = fetchFromGitHub { - owner = "timescale"; - repo = "timescaledb"; - rev = version; - hash = "sha256-/PKk8/cS6jqL+mhSqFU6gybqDx3ld77RLF/uB+1XJCQ="; - }; - cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" @@ -53,13 +54,13 @@ buildPostgresqlExtension rec { passthru.tests = nixosTests.postgresql.timescaledb.passthru.override postgresql; - meta = with lib; { + meta = { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; homepage = "https://www.timescale.com/"; changelog = "https://github.com/timescale/timescaledb/blob/${version}/CHANGELOG.md"; - maintainers = [ maintainers.kirillrdy ]; + maintainers = with lib.maintainers; [ kirillrdy ]; platforms = postgresql.meta.platforms; - license = with licenses; if enableUnfree then tsl else asl20; - broken = versionOlder postgresql.version "14"; + license = with lib.licenses; if enableUnfree then tsl else asl20; + broken = lib.versionOlder postgresql.version "14"; }; } From 43ace7386f86e35a67dbb80f3c87cba69f9ae142 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:02:16 +0100 Subject: [PATCH 63/72] postgresqlPackages.timescaledb_toolkit: modernize --- .../sql/postgresql/ext/timescaledb_toolkit.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index a82c73e84337..3c294a0338a7 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -1,11 +1,11 @@ { - lib, - fetchFromGitHub, buildPgrxExtension, - postgresql, - nixosTests, cargo-pgrx_0_12_6, + fetchFromGitHub, + lib, nix-update-script, + nixosTests, + postgresql, }: (buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_12_6; }) rec { @@ -17,7 +17,7 @@ src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb-toolkit"; - rev = version; + tag = version; hash = "sha256-7yUbtWbYL4AnuUX8OXG4OVqYCY2Lf0pISSTlcFdPqog="; }; @@ -33,11 +33,11 @@ # tests take really long doCheck = false; - meta = with lib; { + meta = { description = "Provide additional tools to ease all things analytic when using TimescaleDB"; homepage = "https://github.com/timescale/timescaledb-toolkit"; - maintainers = with maintainers; [ typetetris ]; + maintainers = with lib.maintainers; [ typetetris ]; platforms = postgresql.meta.platforms; - license = licenses.tsl; + license = lib.licenses.tsl; }; } From 5018714b3183beafb38a6b6cb4a44758292be0c0 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:02:25 +0100 Subject: [PATCH 64/72] postgresqlPackages.tsja: modernize --- pkgs/servers/sql/postgresql/ext/tsja.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/tsja.nix index 15df1763e2bf..0aafc6772363 100644 --- a/pkgs/servers/sql/postgresql/ext/tsja.nix +++ b/pkgs/servers/sql/postgresql/ext/tsja.nix @@ -1,10 +1,10 @@ { - lib, fetchzip, - nixosTests, - stdenv, + lib, mecab, + nixosTests, postgresql, + stdenv, }: stdenv.mkDerivation rec { @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { passthru.tests = nixosTests.postgresql.tsja.passthru.override postgresql; - meta = with lib; { + meta = { description = "PostgreSQL extension implementing Japanese text search"; homepage = "https://www.amris.jp/tsja/index.html"; - maintainers = with maintainers; [ chayleaf ]; + maintainers = with lib.maintainers; [ chayleaf ]; # GNU-specific linker options are used - platforms = platforms.gnu; - license = licenses.gpl2Only; + platforms = lib.platforms.gnu; + license = lib.licenses.gpl2Only; }; } From d14917c317a01d85edf755b30ff36251335be7a8 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:02:35 +0100 Subject: [PATCH 65/72] postgresqlPackages.wal2json: modernize --- pkgs/servers/sql/postgresql/ext/wal2json.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix index 9562c738eb1f..2ec7d3c44e74 100644 --- a/pkgs/servers/sql/postgresql/ext/wal2json.nix +++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix @@ -1,9 +1,9 @@ { - lib, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, nixosTests, + postgresql, }: buildPostgresqlExtension rec { @@ -15,20 +15,20 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "eulerto"; repo = "wal2json"; - rev = "wal2json_2_6"; - sha256 = "sha256-+QoACPCKiFfuT2lJfSUmgfzC5MXf75KpSoc2PzPxKyM="; + tag = "wal2json_2_6"; + hash = "sha256-+QoACPCKiFfuT2lJfSUmgfzC5MXf75KpSoc2PzPxKyM="; }; makeFlags = [ "USE_PGXS=1" ]; passthru.tests = nixosTests.postgresql.wal2json.passthru.override postgresql; - meta = with lib; { + meta = { description = "PostgreSQL JSON output plugin for changeset extraction"; homepage = "https://github.com/eulerto/wal2json"; changelog = "https://github.com/eulerto/wal2json/releases/tag/${src.rev}"; - maintainers = with maintainers; [ euank ]; + maintainers = with lib.maintainers; [ euank ]; platforms = postgresql.meta.platforms; - license = licenses.bsd3; + license = lib.licenses.bsd3; }; } From e0aaaa79ea9180e008704d65e30b7b3f3b4fbfc8 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:24:13 +0100 Subject: [PATCH 66/72] postgresqlPackages.pgddl: sort arguments --- pkgs/servers/sql/postgresql/ext/pgddl.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgddl.nix b/pkgs/servers/sql/postgresql/ext/pgddl.nix index b29e78c02725..fef7a6ef27d7 100644 --- a/pkgs/servers/sql/postgresql/ext/pgddl.nix +++ b/pkgs/servers/sql/postgresql/ext/pgddl.nix @@ -1,10 +1,10 @@ { - lib, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, - postgresqlTestExtension, + fetchFromGitHub, + lib, perl, + postgresql, + postgresqlTestExtension, }: buildPostgresqlExtension (finalAttrs: { pname = "pgddl"; From 53fc911cbd36848f921c38108d803f0675525387 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:25:26 +0100 Subject: [PATCH 67/72] postgresqlPackages.pgx_ulid: sort arguments --- pkgs/servers/sql/postgresql/ext/pgx_ulid.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix index a063dd82ee46..3db15229739a 100644 --- a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix +++ b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix @@ -1,7 +1,7 @@ { - lib, buildPgrxExtension, fetchFromGitHub, + lib, nix-update-script, postgresql, util-linux, From a01c1012003c4101f566e83060dbb233d8f96aac Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:28:51 +0100 Subject: [PATCH 68/72] postgresqlPackages.pg_tle: sort arguments --- pkgs/servers/sql/postgresql/ext/pg_tle.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_tle.nix b/pkgs/servers/sql/postgresql/ext/pg_tle.nix index 299771b12769..1d7913aa2f59 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_tle.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_tle.nix @@ -1,8 +1,8 @@ { - lib, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, }: buildPostgresqlExtension rec { From 6e0738b8c275988969f1fbb4b7ad343d940563bf Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:16:47 +0100 Subject: [PATCH 69/72] postgresqlPackages: load automatically from ext/ folder No need to manually put them in the default.nix file anymore. --- pkgs/servers/sql/postgresql/ext.nix | 14 ++ pkgs/servers/sql/postgresql/ext/default.nix | 127 ------------------ .../pgvecto-rs/{default.nix => package.nix} | 0 .../ext/plv8/{default.nix => package.nix} | 0 pkgs/servers/sql/postgresql/generic.nix | 2 +- 5 files changed, 15 insertions(+), 128 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/ext.nix delete mode 100644 pkgs/servers/sql/postgresql/ext/default.nix rename pkgs/servers/sql/postgresql/ext/pgvecto-rs/{default.nix => package.nix} (100%) rename pkgs/servers/sql/postgresql/ext/plv8/{default.nix => package.nix} (100%) diff --git a/pkgs/servers/sql/postgresql/ext.nix b/pkgs/servers/sql/postgresql/ext.nix new file mode 100644 index 000000000000..5095275a423d --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext.nix @@ -0,0 +1,14 @@ +self: super: +let + inherit (self) lib config; +in +(lib.packagesFromDirectoryRecursive { + inherit (super) callPackage; + directory = ./ext; +}) +// { + timescaledb-apache = super.callPackage ./ext/timescaledb.nix { enableUnfree = false; }; +} +// lib.optionalAttrs config.allowAliases { + pg_embedding = throw "PostgreSQL extension `pg_embedding` has been removed since the project has been abandoned. Upstream's recommendation is to use pgvector instead (https://neon.tech/docs/extensions/pg_embedding#migrate-from-pg_embedding-to-pgvector)"; +} diff --git a/pkgs/servers/sql/postgresql/ext/default.nix b/pkgs/servers/sql/postgresql/ext/default.nix deleted file mode 100644 index 1c65255d056f..000000000000 --- a/pkgs/servers/sql/postgresql/ext/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -self: super: let - inherit (self) lib config; -in { - - age = super.callPackage ./age.nix { }; - - anonymizer = super.callPackage ./anonymizer.nix { }; - - apache_datasketches = super.callPackage ./apache_datasketches.nix { }; - - citus = super.callPackage ./citus.nix { }; - - h3-pg = super.callPackage ./h3-pg.nix { }; - - hypopg = super.callPackage ./hypopg.nix { }; - - jsonb_deep_sum = super.callPackage ./jsonb_deep_sum.nix { }; - - lantern = super.callPackage ./lantern.nix { }; - - periods = super.callPackage ./periods.nix { }; - - postgis = super.callPackage ./postgis.nix { }; - - pg_auto_failover = super.callPackage ./pg_auto_failover.nix { }; - - pg_byteamagic = super.callPackage ./pg_byteamagic.nix { }; - - pg_bigm = super.callPackage ./pg_bigm.nix { }; - - pg_ed25519 = super.callPackage ./pg_ed25519.nix { }; - - pg_hint_plan = super.callPackage ./pg_hint_plan.nix { }; - - pg_ivm = super.callPackage ./pg_ivm.nix { }; - - pg_libversion = super.callPackage ./pg_libversion.nix { }; - - pg_rational = super.callPackage ./pg_rational.nix { }; - - pg_repack = super.callPackage ./pg_repack.nix { }; - - pg_similarity = super.callPackage ./pg_similarity.nix { }; - - pgaudit = super.callPackage ./pgaudit.nix { }; - - pgmq = super.callPackage ./pgmq.nix { }; - - pgroonga = super.callPackage ./pgroonga.nix { }; - - pgsodium = super.callPackage ./pgsodium.nix { }; - - pgsql-http = super.callPackage ./pgsql-http.nix { }; - - pgvecto-rs = super.callPackage ./pgvecto-rs { }; - - pgvector = super.callPackage ./pgvector.nix { }; - - plpgsql_check = super.callPackage ./plpgsql_check.nix { }; - - plr = super.callPackage ./plr.nix { }; - - plv8 = super.callPackage ./plv8 { }; - - pgjwt = super.callPackage ./pgjwt.nix { }; - - cstore_fdw = super.callPackage ./cstore_fdw.nix { }; - - pg_hll = super.callPackage ./pg_hll.nix { }; - - pg_cron = super.callPackage ./pg_cron.nix { }; - - pg_tle = super.callPackage ./pg_tle.nix { }; - - pg_topn = super.callPackage ./pg_topn.nix { }; - - pg_net = super.callPackage ./pg_net.nix { }; - - pg-gvm = super.callPackage ./pg-gvm.nix { }; - - pg-semver = super.callPackage ./pg-semver.nix { }; - - pgtap = super.callPackage ./pgtap.nix { }; - - smlar = super.callPackage ./smlar.nix { }; - - system_stats = super.callPackage ./system_stats.nix { }; - - temporal_tables = super.callPackage ./temporal_tables.nix { }; - - timescaledb = super.callPackage ./timescaledb.nix { }; - timescaledb-apache = super.callPackage ./timescaledb.nix { enableUnfree = false; }; - - timescaledb_toolkit = super.callPackage ./timescaledb_toolkit.nix { }; - - tds_fdw = super.callPackage ./tds_fdw.nix { }; - - pgrouting = super.callPackage ./pgrouting.nix { }; - - pgx_ulid = super.callPackage ./pgx_ulid.nix { }; - - pg_partman = super.callPackage ./pg_partman.nix { }; - - pg_relusage = super.callPackage ./pg_relusage.nix { }; - - pg_roaringbitmap = super.callPackage ./pg_roaringbitmap.nix { }; - - pg_safeupdate = super.callPackage ./pg_safeupdate.nix { }; - - pg_squeeze = super.callPackage ./pg_squeeze.nix { }; - - pg_uuidv7 = super.callPackage ./pg_uuidv7.nix { }; - - repmgr = super.callPackage ./repmgr.nix { }; - - rum = super.callPackage ./rum.nix { }; - - sqlite_fdw = super.callPackage ./sqlite_fdw.nix { }; - - tsja = super.callPackage ./tsja.nix { }; - - wal2json = super.callPackage ./wal2json.nix { }; - - pgddl = super.callPackage ./pgddl.nix {}; -} // lib.optionalAttrs config.allowAliases { - pg_embedding = throw "PostgreSQL extension `pg_embedding` has been removed since the project has been abandoned. Upstream's recommendation is to use pgvector instead (https://neon.tech/docs/extensions/pg_embedding#migrate-from-pg_embedding-to-pgvector)"; -} diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix rename to pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/package.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/plv8/default.nix rename to pkgs/servers/sql/postgresql/ext/plv8/package.nix diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index ca157411536e..ee3e2936b8fe 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -459,7 +459,7 @@ let callPackage = newScope (scope // this.pkgs); }; in - import ./ext newSelf newSuper; + import ./ext.nix newSelf newSuper; withPackages = postgresqlWithPackages { inherit buildEnv; From 72b8186ff7bbb914573d5e52c8326b8a12e44c1f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:28:21 +0100 Subject: [PATCH 70/72] postgresqlPackages: rename buildPostgresqlExtension to postgresqlBuildExtension This is for consistency with postgresqlTestExtension and postgresqlTestHook. Everything that is passed via postgresql's generic.nix "packages scope" now is prefixed with "postgresql". --- pkgs/servers/sql/postgresql/ext/age.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/anonymizer.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/apache_datasketches.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/citus.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/cstore_fdw.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/h3-pg.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/hypopg.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/lantern.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/periods.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg-gvm.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg-semver.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_bigm.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_cron.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_ed25519.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_hll.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_ivm.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_libversion.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_partman.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_rational.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_relusage.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_repack.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_similarity.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_squeeze.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_tle.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_topn.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgaudit.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgddl.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgjwt.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgmq.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgsodium.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgsql-http.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgtap.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgvector.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/plr.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/plv8/package.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/postgis.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/repmgr.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/rum.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/smlar.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/system_stats.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/tds_fdw.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/temporal_tables.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/wal2json.nix | 4 ++-- pkgs/servers/sql/postgresql/generic.nix | 2 +- ...ldPostgresqlExtension.nix => postgresqlBuildExtension.nix} | 4 ++-- 58 files changed, 115 insertions(+), 115 deletions(-) rename pkgs/servers/sql/postgresql/{buildPostgresqlExtension.nix => postgresqlBuildExtension.nix} (98%) diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index ddd93d953313..6c8b5fbd3f57 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -1,11 +1,11 @@ { bison, - buildPostgresqlExtension, fetchFromGitHub, flex, lib, perl, postgresql, + postgresqlBuildExtension, stdenv, }: @@ -19,7 +19,7 @@ let "13" = "sha256-HR6nnWt/V2a0rD5eHHUsFIZ1y7lmvLz36URt9pPJnCw="; }; in -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "age"; version = "1.5.0-rc0"; diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix index 3fdb9e3b78b4..71e7624d2677 100644 --- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix +++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix @@ -1,16 +1,16 @@ { - buildPostgresqlExtension, jitSupport, lib, llvm, nixosTests, pg-dump-anon, postgresql, + postgresqlBuildExtension, runtimeShell, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "postgresql_anonymizer"; inherit (pg-dump-anon) version src; diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix index 142e6aa6ce3a..fa7200198277 100644 --- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix +++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix @@ -1,9 +1,9 @@ { boost186, - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, }: @@ -28,7 +28,7 @@ let }; in -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "apache_datasketches"; inherit version; diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index e42976419fb9..c28a505310bd 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -1,14 +1,14 @@ { - buildPostgresqlExtension, curl, fetchFromGitHub, lib, lz4, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "citus"; version = "13.0.2"; diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index 1d49438d08eb..d6abe6b3e8dd 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, protobufc, stdenv, }: -buildPostgresqlExtension { +postgresqlBuildExtension { pname = "cstore_fdw"; version = "1.7.0-unstable-2021-03-08"; diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix index 9f45ec8d7544..3defcde5699f 100644 --- a/pkgs/servers/sql/postgresql/ext/h3-pg.nix +++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix @@ -1,15 +1,15 @@ { - buildPostgresqlExtension, cmake, fetchFromGitHub, h3_4, lib, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "h3-pg"; version = "4.2.2"; diff --git a/pkgs/servers/sql/postgresql/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/hypopg.nix index 47931377fb67..84a47bb9dac0 100644 --- a/pkgs/servers/sql/postgresql/ext/hypopg.nix +++ b/pkgs/servers/sql/postgresql/ext/hypopg.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, gitUpdater, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "hypopg"; version = "1.4.1"; diff --git a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix index bfb69e6df0f8..fb6acd607466 100644 --- a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix +++ b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension { +postgresqlBuildExtension { pname = "jsonb_deep_sum"; version = "0-unstable-2021-12-24"; diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix index 51150b5e6ec6..3a6275c66686 100644 --- a/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -1,15 +1,15 @@ { - buildPostgresqlExtension, cmake, fetchFromGitHub, lib, openssl, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "postgresql-lantern"; version = "0.5.0"; diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix index 422c76ae668d..db170862a7ba 100644 --- a/pkgs/servers/sql/postgresql/ext/periods.nix +++ b/pkgs/servers/sql/postgresql/ext/periods.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "periods"; version = "1.2.3"; diff --git a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix index a4761bad5cd0..679374aae167 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix @@ -1,5 +1,4 @@ { - buildPostgresqlExtension, cmake, fetchFromGitHub, glib, @@ -10,9 +9,10 @@ pcre2, pkg-config, postgresql, + postgresqlBuildExtension, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pg-gvm"; version = "22.6.8"; diff --git a/pkgs/servers/sql/postgresql/ext/pg-semver.nix b/pkgs/servers/sql/postgresql/ext/pg-semver.nix index ea8d4c70a4a2..005e7f46bdbc 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-semver.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-semver.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, testers, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pg-semver"; version = "0.40.0"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index dbb723e31049..d041e3dc5863 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_auto_failover"; version = "2.1"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix index 68daf6bcb3d0..246110923737 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix @@ -1,11 +1,11 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_bigm"; version = "1.2-20240606"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix b/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix index 1fdc86a7e9a2..8de8850d04eb 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, file, lib, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pg_byteamagic"; version = "0.2.4"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 28befb93aacc..d4cbd3839d79 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_cron"; version = "1.6.5"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix index 4eb97283b5b2..cb975af46a44 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitLab, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_ed25519"; version = "0.2"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index 4b4a8c07bc89..4081d5b35f89 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -1,8 +1,8 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: @@ -33,7 +33,7 @@ let .${lib.versions.major postgresql.version} or (throw "Source for pg_hint_plan is not available for ${postgresql.version}"); in -buildPostgresqlExtension { +postgresqlBuildExtension { pname = "pg_hint_plan"; inherit (source) version; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index 4f817d799aeb..429319faa801 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_hll"; version = "2.18"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index c652d50dfe89..3ebcf0c57086 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_ivm"; version = "1.9"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_libversion.nix b/pkgs/servers/sql/postgresql/ext/pg_libversion.nix index 979a48128bb1..4b5dbd34b12c 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_libversion.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_libversion.nix @@ -1,15 +1,15 @@ { - buildPostgresqlExtension, fetchFromGitHub, gitUpdater, lib, libversion, pkg-config, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pg_libversion"; version = "2.0.1"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix index fbc8d213a235..698e76de4f50 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, curl, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_net"; version = "0.14.0"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index af06311a5d3d..6e06529be058 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_partman"; version = "5.2.4"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/pg_rational.nix index a557006142ec..add5ed477aed 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_rational.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_rational.nix @@ -1,11 +1,11 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_rational"; version = "0.0.2"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix index a7666c046247..b1195b514140 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_relusage"; version = "0.0.1"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index 8368b2ffd672..a785635d0e7d 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -1,15 +1,15 @@ { - buildPostgresqlExtension, fetchFromGitHub, gitUpdater, lib, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, testers, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pg_repack"; version = "1.5.2"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix index 8ffe3ed2c13d..8810a6710227 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, postgresqlTestHook, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pg_roaringbitmap"; version = "0.5.4"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index c551aca7df8f..8722a7ff7f31 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -1,8 +1,8 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: @@ -31,7 +31,7 @@ with { ."${lib.versions.major postgresql.version}" or (throw "pg_safeupdate: version specification for pg ${postgresql.version} missing."); -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg-safeupdate"; inherit version; diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index ab6d97637231..c0fb92f09f2f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, fetchpatch, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension { +postgresqlBuildExtension { pname = "pg_similarity"; version = "pg_similarity_1_0-unstable-2021-01-12"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix index 9dfef6a1322a..a0c88f6c66b2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix @@ -1,14 +1,14 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, nix-update-script, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pg_squeeze"; version = "${builtins.replaceStrings [ "_" ] [ "." ] ( lib.strings.removePrefix "REL" finalAttrs.src.rev diff --git a/pkgs/servers/sql/postgresql/ext/pg_tle.nix b/pkgs/servers/sql/postgresql/ext/pg_tle.nix index 1d7913aa2f59..e8c45d2a026a 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_tle.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_tle.nix @@ -1,11 +1,11 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_tle"; version = "1.4.0"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index a6ac3c5ea70e..1c14a028ce12 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_topn"; version = "2.7.0"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix index 9f3f766d29ed..157d40e6bc5c 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_uuidv7"; version = "1.6.0"; diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index 43e76c182529..6036cf42447f 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -1,10 +1,10 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, libkrb5, openssl, postgresql, + postgresqlBuildExtension, stdenv, }: @@ -35,7 +35,7 @@ let .${lib.versions.major postgresql.version} or (throw "Source for pgaudit is not available for ${postgresql.version}"); in -buildPostgresqlExtension { +postgresqlBuildExtension { pname = "pgaudit"; inherit (source) version; diff --git a/pkgs/servers/sql/postgresql/ext/pgddl.nix b/pkgs/servers/sql/postgresql/ext/pgddl.nix index fef7a6ef27d7..56b4f617df04 100644 --- a/pkgs/servers/sql/postgresql/ext/pgddl.nix +++ b/pkgs/servers/sql/postgresql/ext/pgddl.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, perl, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pgddl"; version = "0.29"; diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index a21ac25e333e..f32eaf7687ed 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -1,15 +1,15 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, nixosTests, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, unstableGitUpdater, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pgjwt"; version = "0-unstable-2023-03-02"; diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix index c2f1a3559dc5..ea301fb51c3b 100644 --- a/pkgs/servers/sql/postgresql/ext/pgmq.nix +++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pgmq"; version = "1.5.0"; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 68a3da58a1fb..cffadd4cc61f 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -1,16 +1,16 @@ { - buildPostgresqlExtension, fetchFromGitHub, groonga, lib, msgpack-c, pkg-config, postgresql, + postgresqlBuildExtension, stdenv, xxHash, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pgroonga"; version = "4.0.1"; diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 47aadc39a81f..2702bd676a42 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -1,15 +1,15 @@ { boost, - buildPostgresqlExtension, cmake, fetchFromGitHub, lib, perl, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pgrouting"; version = "3.7.3"; diff --git a/pkgs/servers/sql/postgresql/ext/pgsodium.nix b/pkgs/servers/sql/postgresql/ext/pgsodium.nix index d072c1c75b6c..d4abb4b32aee 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsodium.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsodium.nix @@ -1,15 +1,15 @@ { bash, - buildPostgresqlExtension, fetchFromGitHub, lib, libsodium, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pgsodium"; version = "3.1.9"; diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix index 3b8b744e5cee..227a1680f8ca 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, curl, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pgsql-http"; version = "1.6.3"; diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 3e0907eaef3b..55d8613adce0 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -1,16 +1,16 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, perl, perlPackages, postgresql, + postgresqlBuildExtension, postgresqlTestHook, stdenv, which, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pgtap"; version = "1.3.3"; diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index 45986b31cbb9..5741e06a7756 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pgvector"; version = "0.8.0"; diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index e660dc5ee614..8a03799cf1c6 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "plpgsql-check"; version = "2.7.15"; diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix index b55812c3f3ce..891a461040ab 100644 --- a/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -1,14 +1,14 @@ { R, - buildPostgresqlExtension, fetchFromGitHub, lib, pkg-config, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "plr"; version = "${builtins.replaceStrings [ "_" ] [ "." ] (lib.strings.removePrefix "REL" src.rev)}"; diff --git a/pkgs/servers/sql/postgresql/ext/plv8/package.nix b/pkgs/servers/sql/postgresql/ext/plv8/package.nix index 7ab270d50f04..be8935f42357 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/package.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/package.nix @@ -1,11 +1,11 @@ { - buildPostgresqlExtension, fetchFromGitHub, jitSupport, lib, nodejs_20, perl, postgresql, + postgresqlBuildExtension, stdenv, # For test coreutils, @@ -16,7 +16,7 @@ let libv8 = nodejs_20.libv8; in -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "plv8"; version = "3.2.3"; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 9a4e46fc2680..ceeebabe76d7 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -1,7 +1,6 @@ { autoconf, automake, - buildPostgresqlExtension, cunit, docbook5, fetchFromGitHub, @@ -20,6 +19,7 @@ perl, pkg-config, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, postgresqlTestHook, proj, @@ -34,7 +34,7 @@ let gdal = gdalMinimal; in -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "postgis"; version = "3.5.2"; diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index 39087deb9599..dd977bf376f1 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -1,15 +1,15 @@ { - buildPostgresqlExtension, curl, fetchFromGitHub, flex, json_c, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "repmgr"; version = "5.5.0"; diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix index 71db60cd5406..1124ab9a445a 100644 --- a/pkgs/servers/sql/postgresql/ext/rum.nix +++ b/pkgs/servers/sql/postgresql/ext/rum.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, postgresqlTestHook, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "rum"; version = "1.3.14"; diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix index 6906d028fb11..3a2b8e0f930f 100644 --- a/pkgs/servers/sql/postgresql/ext/smlar.nix +++ b/pkgs/servers/sql/postgresql/ext/smlar.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchgit, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension { +postgresqlBuildExtension { pname = "smlar-unstable"; version = "2021-11-08"; diff --git a/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix b/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix index efac33fa7759..710fb5472042 100644 --- a/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, sqlite, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "sqlite_fdw"; version = "2.5.0"; diff --git a/pkgs/servers/sql/postgresql/ext/system_stats.nix b/pkgs/servers/sql/postgresql/ext/system_stats.nix index 5bedbb758df6..88d92d4b547c 100644 --- a/pkgs/servers/sql/postgresql/ext/system_stats.nix +++ b/pkgs/servers/sql/postgresql/ext/system_stats.nix @@ -1,11 +1,11 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "system_stats"; version = "3.2"; diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 35e4a4811c6e..955131db9425 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -1,14 +1,14 @@ { - buildPostgresqlExtension, fetchFromGitHub, freetds, lib, postgresql, + postgresqlBuildExtension, stdenv, unstableGitUpdater, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "tds_fdw"; version = "2.0.4"; diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix index 5374607808a3..150f66fde899 100644 --- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix +++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "temporal_tables"; version = "1.2.2"; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index db4cf085b1cf..a9dcd5cbe07c 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -1,5 +1,4 @@ { - buildPostgresqlExtension, cmake, fetchFromGitHub, lib, @@ -7,12 +6,13 @@ nixosTests, openssl, postgresql, + postgresqlBuildExtension, stdenv, enableUnfree ? true, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; version = "2.18.2"; diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix index 2ec7d3c44e74..b40e1f5f21e2 100644 --- a/pkgs/servers/sql/postgresql/ext/wal2json.nix +++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, nixosTests, postgresql, + postgresqlBuildExtension, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "wal2json"; version = "${builtins.replaceStrings [ "_" ] [ "." ] ( lib.strings.removePrefix "wal2json_" src.rev diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index ee3e2936b8fe..0a2dee57c66a 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -452,7 +452,7 @@ let } // extraArgs ); - buildPostgresqlExtension = newSuper.callPackage ./buildPostgresqlExtension.nix { }; + postgresqlBuildExtension = newSuper.callPackage ./postgresqlBuildExtension.nix { }; }; newSelf = self // scope; newSuper = { diff --git a/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix b/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix similarity index 98% rename from pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix rename to pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix index a427b7f88053..9ea82fb80f84 100644 --- a/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix +++ b/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix @@ -66,7 +66,7 @@ args: let - buildPostgresqlExtension = + postgresqlBuildExtension = finalAttrs: { enableUpdateScript ? true, @@ -146,4 +146,4 @@ let + prevAttrs.postInstall or ""; }; in -stdenv.mkDerivation (lib.extends buildPostgresqlExtension (lib.toFunction args)) +stdenv.mkDerivation (lib.extends postgresqlBuildExtension (lib.toFunction args)) From 259b4ff913bf374dfd7029636db6b8d8c5611900 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:34:03 +0100 Subject: [PATCH 71/72] postgresql: split postgresqlTestExtension into separate file --- pkgs/servers/sql/postgresql/generic.nix | 28 +--------------- .../postgresql/postgresqlTestExtension.nix | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 27 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/postgresqlTestExtension.nix diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 0a2dee57c66a..9c487a14ea93 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -425,33 +425,7 @@ let inherit (llvmPackages) llvm; postgresql = this; stdenv = stdenv'; - postgresqlTestExtension = - { - finalPackage, - withPackages ? [ ], - ... - }@extraArgs: - stdenvNoCC.mkDerivation ( - { - name = "${finalPackage.name}-test-extension"; - dontUnpack = true; - doCheck = true; - nativeCheckInputs = [ - postgresqlTestHook - (this.withPackages (ps: [ finalPackage ] ++ (map (p: ps."${p}") withPackages))) - ]; - failureHook = "postgresqlStop"; - postgresqlTestUserOptions = "LOGIN SUPERUSER"; - passAsFile = [ "sql" ]; - checkPhase = '' - runHook preCheck - psql -a -v ON_ERROR_STOP=1 -f "$sqlPath" - runHook postCheck - ''; - installPhase = "touch $out"; - } - // extraArgs - ); + postgresqlTestExtension = newSuper.callPackage ./postgresqlTestExtension.nix { }; postgresqlBuildExtension = newSuper.callPackage ./postgresqlBuildExtension.nix { }; }; newSelf = self // scope; diff --git a/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix b/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix new file mode 100644 index 000000000000..468a89a3b2e2 --- /dev/null +++ b/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix @@ -0,0 +1,32 @@ +{ + postgresql, + postgresqlTestHook, + stdenvNoCC, +}: + +{ + finalPackage, + withPackages ? [ ], + ... +}@extraArgs: +stdenvNoCC.mkDerivation ( + { + name = "${finalPackage.name}-test-extension"; + dontUnpack = true; + doCheck = true; + nativeCheckInputs = [ + postgresqlTestHook + (postgresql.withPackages (ps: [ finalPackage ] ++ (map (p: ps."${p}") withPackages))) + ]; + failureHook = "postgresqlStop"; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + passAsFile = [ "sql" ]; + checkPhase = '' + runHook preCheck + psql -a -v ON_ERROR_STOP=1 -f "$sqlPath" + runHook postCheck + ''; + installPhase = "touch $out"; + } + // extraArgs +) From 65cee89d7e3647758604aa30447e3df6983835b8 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 17 Mar 2025 20:04:34 +0100 Subject: [PATCH 72/72] postgresqlPackages.citus: fix build on darwin The build on darwin was broken for v16 and v17 only. This was fixed upstream a while ago, but somehow the fix has not been released, yet. --- pkgs/servers/sql/postgresql/ext/citus.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index c28a505310bd..c20accfbbacd 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -1,6 +1,7 @@ { curl, fetchFromGitHub, + fetchpatch, lib, lz4, postgresql, @@ -19,6 +20,16 @@ postgresqlBuildExtension rec { hash = "sha256-SuJs6OCHKO7efQagsATgn/V9rgMyuXQIHGCEP9ME7tQ="; }; + patches = [ + # Even though this commit is on main since Sep 2023, it hasn't made its way to the release-13.0 branch, yet. + # https://github.com/citusdata/citus/pull/7221 + # Fixes build for PG 16 + 17 on darwin + (fetchpatch { + url = "https://github.com/citusdata/citus/commit/0f28a69f12418d211ffba5f7ddd222fd0c47daeb.patch"; + hash = "sha256-8JAM+PUswzbdlAZUpRApgO0eBsMbUHFdFGsdATsG88I="; + }) + ]; + buildInputs = [ curl lz4