Merge pull request #255446 from purcell/postgresql-16
postgresql_16: init at 16.0
This commit is contained in:
commit
46423a1a75
|
@ -98,7 +98,8 @@ let
|
|||
++ lib.optionals jitSupport [ "--with-llvm" ];
|
||||
|
||||
patches = [
|
||||
./patches/disable-resolve_symlinks.patch
|
||||
(if atLeast "16" then ./patches/disable-normalize_exec_path.patch
|
||||
else ./patches/disable-resolve_symlinks.patch)
|
||||
./patches/less-is-more.patch
|
||||
./patches/hardcode-pgxs-path.patch
|
||||
./patches/specify_pkglibdir_at_runtime.patch
|
||||
|
@ -357,6 +358,15 @@ let
|
|||
thisAttr = "postgresql_15";
|
||||
inherit self;
|
||||
};
|
||||
|
||||
postgresql_16 = self.callPackage generic {
|
||||
version = "16.0";
|
||||
psqlSchema = "16";
|
||||
hash = "sha256-356CPrIjMEROHUjlLMZRNaZSpv2zzjJePwhUkzn1G5k=";
|
||||
this = self.postgresql_16;
|
||||
thisAttr = "postgresql_16";
|
||||
inherit self;
|
||||
};
|
||||
};
|
||||
|
||||
in self:
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
--- a/src/common/exec.c
|
||||
+++ b/src/common/exec.c
|
||||
@@ -238,6 +238,9 @@
|
||||
static int
|
||||
normalize_exec_path(char *path)
|
||||
{
|
||||
+ // On NixOS we *want* stuff relative to symlinks.
|
||||
+ return 0;
|
||||
+
|
||||
/*
|
||||
* We used to do a lot of work ourselves here, but now we just let
|
||||
* realpath(3) do all the heavy lifting.
|
|
@ -27296,12 +27296,14 @@ with pkgs;
|
|||
postgresql_13
|
||||
postgresql_14
|
||||
postgresql_15
|
||||
postgresql_16
|
||||
|
||||
postgresql_11_jit
|
||||
postgresql_12_jit
|
||||
postgresql_13_jit
|
||||
postgresql_14_jit
|
||||
postgresql_15_jit
|
||||
postgresql_16_jit
|
||||
;
|
||||
postgresql = postgresql_14.override { this = postgresql; };
|
||||
postgresql_jit = postgresql_14_jit.override { this = postgresql_jit; };
|
||||
|
@ -27311,11 +27313,13 @@ with pkgs;
|
|||
postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs;
|
||||
postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs;
|
||||
postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs;
|
||||
postgresql16Packages = recurseIntoAttrs postgresql_16.pkgs;
|
||||
postgresql11JitPackages = recurseIntoAttrs postgresql_11_jit.pkgs;
|
||||
postgresql12JitPackages = recurseIntoAttrs postgresql_12_jit.pkgs;
|
||||
postgresql13JitPackages = recurseIntoAttrs postgresql_13_jit.pkgs;
|
||||
postgresql14JitPackages = recurseIntoAttrs postgresql_14_jit.pkgs;
|
||||
postgresql15JitPackages = recurseIntoAttrs postgresql_15_jit.pkgs;
|
||||
postgresql16JitPackages = recurseIntoAttrs postgresql_16_jit.pkgs;
|
||||
postgresql14Packages = postgresqlPackages;
|
||||
|
||||
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
|
||||
|
|
Loading…
Reference in a new issue