diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-04-12 07:06:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-04-12 07:06:54 +0200 |
| commit | 24d4f2cd52fc44f375e60ab4c90e159193689d72 (patch) | |
| tree | 113c1984373abdd81ca189e25fa76396a55706bc /pkgs/servers/sql | |
| parent | 4cfc319ea877f057cb7ad0c455c6af52e72bc557 (diff) | |
| parent | 993400aeecf5ce185586dded2cebccebd628ec93 (diff) | |
Merge branch 'staging' into staging-next
Conflicts (tried to quickly resolve somehow, checked eval): pkgs/development/python-modules/apsw/default.nix pkgs/development/python-modules/mido/default.nix pkgs/development/python-modules/pytest-bdd/default.nix pkgs/development/python-modules/sparse/default.nix
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/postgresql/ext/citus.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_bigm.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index b5e8cfbeebcce..c51aa7946f5e9 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - # "Our soft policy for Postgres version compatibilty is to support Citus' + # "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 "14"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix index dcd23a0949bb0..bf3b9d34cc4e6 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; patches = [ - # Fix compatiblity with PostgreSQL 16. Remove with the next release. + # Fix compatibility with PostgreSQL 16. Remove with the next release. (fetchpatch { url = "https://github.com/pgbigm/pg_bigm/commit/2a9d783c52a1d7a2eb414da6f091f6035da76edf.patch"; hash = "sha256-LuMpSUPnT8cPChQfA9sJEKP4aGpsbN5crfTKLnDzMN8="; |