dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge: postgresql.withPackages: support withJIT and withoutJIT (#352158)

Browse Source
This commit is contained in:
Maximilian Bosch 2024-10-31 10:35:07 +01:00 committed by GitHub
commit a34f8f6c4b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/servers/sql/postgresql/generic.nix
View File

@ -297,8 +297,7 @@ let
withPackages = postgresqlWithPackages {
inherit buildEnv;
postgresql = this;
}
this.pkgs;
};
tests = {
postgresql-wal-receiver = import ../../../../nixos/tests/postgresql-wal-receiver.nix {
@ -339,9 +338,9 @@ let
};
});
postgresqlWithPackages = { postgresql, buildEnv }: pkgs: f: buildEnv {
name = "postgresql-and-plugins-${postgresql.version}";
paths = f pkgs ++ [
postgresqlWithPackages = { postgresql, buildEnv }: f: buildEnv {
name = "${postgresql.pname}-and-plugins-${postgresql.version}";
paths = f postgresql.pkgs ++ [
postgresql
postgresql.man # in case user installs this into environment
];
@ -350,6 +349,14 @@ let
passthru.version = postgresql.version;
passthru.psqlSchema = postgresql.psqlSchema;
passthru.withJIT = postgresqlWithPackages {
inherit buildEnv;
postgresql = postgresql.withJIT;
} f;
passthru.withoutJIT = postgresqlWithPackages {
inherit buildEnv;
postgresql = postgresql.withoutJIT;
} f;
};
in