Skip to content

Commit ea70bdf

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 f47ecd2 commit ea70bdf

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

nix/ext/tests/pg_stat_monitor.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ 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."${pname}";
3636
versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
3737
postgresqlWithExtension =
3838
postgresql:
3939
let
4040
majorVersion = lib.versions.major postgresql.version;
41-
pkg = pkgs.buildEnv {
41+
pkg = pkgs.pkgsLinux.buildEnv {
4242
name = "postgresql-${majorVersion}-${pname}";
4343
paths = [
4444
postgresql
@@ -53,7 +53,7 @@ let
5353
withJIT = pkg;
5454
withoutJIT = pkg;
5555
};
56-
nativeBuildInputs = [ pkgs.makeWrapper ];
56+
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
5757
pathsToLink = [
5858
"/"
5959
"/bin"
@@ -67,8 +67,8 @@ let
6767
};
6868
in
6969
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;
70+
psql_15 = postgresqlWithExtension self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15;
71+
psql_17 = postgresqlWithExtension self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17;
7272
in
7373
pkgs.testers.runNixOSTest {
7474
name = pname;

0 commit comments

Comments
 (0)