mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
postgresql: 17 -> 18 (#523786)
This commit is contained in:
commit
9dc0880d08
4 changed files with 13 additions and 16 deletions
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- Create the first release note entry in this section!
|
||||
- The default PostgreSQL version for new NixOS installations (i.e. with `system.stateVersion >= 26.11`) is v18.
|
||||
|
||||
## New Modules {#sec-release-26.11-new-modules}
|
||||
|
||||
|
|
|
|||
|
|
@ -204,7 +204,9 @@ in
|
|||
type = types.package;
|
||||
example = literalExpression "pkgs.postgresql_15";
|
||||
defaultText = literalExpression ''
|
||||
if versionAtLeast config.system.stateVersion "25.11" then
|
||||
if versionAtLeast config.system.stateVersion "26.11" then
|
||||
pkgs.postgresql_18
|
||||
else if versionAtLeast config.system.stateVersion "25.11" then
|
||||
pkgs.postgresql_17
|
||||
else if versionAtLeast config.system.stateVersion "24.11" then
|
||||
pkgs.postgresql_16
|
||||
|
|
@ -657,7 +659,9 @@ in
|
|||
'';
|
||||
base =
|
||||
# XXX Don't forget to keep `defaultText` of `services.postgresql.package` up to date!
|
||||
if versionAtLeast config.system.stateVersion "25.11" then
|
||||
if versionAtLeast config.system.stateVersion "26.11" then
|
||||
pkgs.postgresql_18
|
||||
else if versionAtLeast config.system.stateVersion "25.11" then
|
||||
pkgs.postgresql_17
|
||||
else if versionAtLeast config.system.stateVersion "24.11" then
|
||||
pkgs.postgresql_16
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pgcopydb";
|
||||
version = "0.17";
|
||||
version = "0.17-unstable-2026-05-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dimitri";
|
||||
repo = "pgcopydb";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-g5MC4F0BYgTimpJZDX+PepFLXv1QuH7XGlzV66xM11M=";
|
||||
rev = "984269274ccdaf0d297ed82db635e6746be55b75";
|
||||
hash = "sha256-qTtziRdsge4YtQTTfWQ5KD8SQn2HYnj3rDMcrbI56SY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -31,18 +31,11 @@ clangStdenv.mkDerivation (finalAttrs: {
|
|||
postgresql.pg_config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = postgresql.buildInputs ++ [
|
||||
boehmgc
|
||||
libkrb5
|
||||
openssl
|
||||
postgresql
|
||||
readline
|
||||
sqlite
|
||||
zlib
|
||||
python3Packages.sphinxHook
|
||||
]
|
||||
++ lib.optionals clangStdenv.hostPlatform.isLinux [
|
||||
pam
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -7904,8 +7904,8 @@ with pkgs;
|
|||
postgresql_17_jit
|
||||
postgresql_18_jit
|
||||
;
|
||||
postgresql = postgresql_17;
|
||||
postgresql_jit = postgresql_17_jit;
|
||||
postgresql = postgresql_18;
|
||||
postgresql_jit = postgresql_18_jit;
|
||||
postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
|
||||
postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs;
|
||||
postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue