Merge staging-next into staging
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
import ./generic.nix {
|
||||
version = "19beta1";
|
||||
rev = "refs/tags/REL_19_BETA1";
|
||||
hash = "sha256-thvbttX8wwGLf5tMJRHl86Xv8OgINzahoqB/AzAdtMI=";
|
||||
muslPatches = {
|
||||
dont-use-locale-a = {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e";
|
||||
hash = "sha256-6zjz3OpMx4qTETdezwZxSJPPdOvhCNu9nXvAaU9SwH8=";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -14,6 +14,7 @@ let
|
||||
postgresql_16 = ./16.nix;
|
||||
postgresql_17 = ./17.nix;
|
||||
postgresql_18 = ./18.nix;
|
||||
postgresql_19 = ./19.nix;
|
||||
};
|
||||
|
||||
mkAttributes =
|
||||
|
||||
@@ -347,7 +347,9 @@ let
|
||||
++ lib.optionals tclSupport [ "--with-tcl" ]
|
||||
++ lib.optionals selinuxSupport [ "--with-selinux" ]
|
||||
++ lib.optionals nlsSupport [ "--enable-nls" ]
|
||||
++ lib.optionals bonjourSupport [ "--with-bonjour" ];
|
||||
++ lib.optionals bonjourSupport [ "--with-bonjour" ]
|
||||
# Configure needs a little help to find `nm` when cross-compiling.
|
||||
++ lib.optionals (atLeast "19") [ "NM=${stdenv'.cc}/bin/${stdenv'.cc.targetPrefix}nm" ];
|
||||
|
||||
patches = [
|
||||
(
|
||||
|
||||
Reference in New Issue
Block a user