Skip to content

Commit 21c7206

Browse files
committed
fix(pg_stat_monitor): use pkgs.pkgsLinux consistently for all package references
The pg_stat_monitor test was mixing pkgs.system and pkgs.stdenv.hostPlatform.system which resolved to Darwin packages on macOS, but the test requires Linux packages for NixOS VMs. Changed to consistently use pkgs.pkgsLinux.stdenv.hostPlatform.system and pkgs.pkgsLinux.buildEnv/makeWrapper throughout, matching the pattern used in pgmq.nix and pgsodium.nix.
1 parent 5467a02 commit 21c7206

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

nix/ext/tests/pg_stat_monitor.nix

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,15 @@ let
3232
inherit (pkgs) lib;
3333
installedExtension =
3434
postgresMajorVersion:
35-
self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
35+
self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${
36+
pname
37+
}";
3638
versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
3739
postgresqlWithExtension =
3840
postgresql:
3941
let
4042
majorVersion = lib.versions.major postgresql.version;
41-
pkg = pkgs.buildEnv {
43+
pkg = pkgs.pkgsLinux.buildEnv {
4244
name = "postgresql-${majorVersion}-${pname}";
4345
paths = [
4446
postgresql
@@ -53,7 +55,7 @@ let
5355
withJIT = pkg;
5456
withoutJIT = pkg;
5557
};
56-
nativeBuildInputs = [ pkgs.makeWrapper ];
58+
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
5759
pathsToLink = [
5860
"/"
5961
"/bin"
@@ -67,8 +69,12 @@ let
6769
};
6870
in
6971
pkg;
70-
psql_15 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15;
71-
psql_17 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17;
72+
psql_15 =
73+
postgresqlWithExtension
74+
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15;
75+
psql_17 =
76+
postgresqlWithExtension
77+
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17;
7278
in
7379
pkgs.testers.runNixOSTest {
7480
name = pname;

0 commit comments

Comments
 (0)