diff options
| author | Steve Purcell <steve@sanityinc.com> | 2023-09-16 11:03:10 +0200 |
|---|---|---|
| committer | Steve Purcell <steve@sanityinc.com> | 2023-09-16 18:19:06 +0200 |
| commit | ae5b96f3ab6aabb60809ab78c2c99f8dd51ee678 (patch) | |
| tree | 10884c3e15aa4f7707992f727c93a33895765755 /pkgs/servers/sql/postgresql | |
| parent | 7874b2433ebb10c1493632cd3e61b36eb80c8ab6 (diff) | |
postgresql_16: init at 16.0
Diffstat (limited to 'pkgs/servers/sql/postgresql')
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/patches/disable-normalize_exec_path.patch | 12 |
2 files changed, 23 insertions, 1 deletions
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 0074c6fd6f0ad..a94712556a719 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -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: diff --git a/pkgs/servers/sql/postgresql/patches/disable-normalize_exec_path.patch b/pkgs/servers/sql/postgresql/patches/disable-normalize_exec_path.patch new file mode 100644 index 0000000000000..349fd4203348a --- /dev/null +++ b/pkgs/servers/sql/postgresql/patches/disable-normalize_exec_path.patch @@ -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. |