From 97e5bb6cba906a6da0da076968cfd5b33932a71c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Mon, 22 Dec 2025 11:29:33 +0100 Subject: [PATCH 1/4] feat: enable nixosTest on aarch64 darwin Build nixosTest using a local aarch64 linux builder and run nixosTest qemu VM in aarch64 darwin. This keeps the tests fast as they don't require nested virtualisation. For example, you can run the nixos test for the http extension on your aarch64 macOS with: ```shell nix build .\#checks.aarch64-darwin.ext-http ``` --- nix/checks.nix | 30 ++++++++++++++---------------- nix/ext/tests/default.nix | 15 +++++++++------ nix/ext/tests/http.nix | 13 ++++++------- nix/ext/tests/orioledb.nix | 13 ++++++------- nix/ext/tests/pg_plan_filter.nix | 17 ++++++++++------- nix/ext/tests/pg_repack.nix | 19 ++++++++++--------- nix/ext/tests/pg_safeupdate.nix | 17 ++++++++++------- nix/ext/tests/pgjwt.nix | 17 ++++++++++------- nix/ext/tests/pgmq.nix | 17 ++++++++++------- nix/ext/tests/pgroonga.nix | 21 ++++++++++++--------- nix/ext/tests/pgrouting.nix | 31 +++++++++++++++++-------------- nix/ext/tests/pgsodium.nix | 22 ++++++++++++---------- nix/ext/tests/plpgsql_check.nix | 17 ++++++++++------- nix/ext/tests/plv8.nix | 17 ++++++++++------- nix/ext/tests/postgis.nix | 19 ++++++++++--------- nix/ext/tests/timescaledb.nix | 13 +++++++------ nix/ext/tests/vault.nix | 20 ++++++++++++-------- 17 files changed, 175 insertions(+), 143 deletions(-) diff --git a/nix/checks.nix b/nix/checks.nix index 7370aee9b..a7c635fea 100644 --- a/nix/checks.nix +++ b/nix/checks.nix @@ -398,22 +398,20 @@ supascan ; } - // pkgs.lib.optionalAttrs (pkgs.stdenv.isLinux) ( - { - inherit (self'.packages) - postgresql_15_debug - postgresql_15_src - postgresql_orioledb-17_debug - postgresql_orioledb-17_src - postgresql_17_debug - postgresql_17_src - ; - } - // (import ./ext/tests { - inherit self; - inherit pkgs; - }) - ) + // (import ./ext/tests { + inherit self; + inherit pkgs; + }) + // pkgs.lib.optionalAttrs (pkgs.stdenv.isLinux) ({ + inherit (self'.packages) + postgresql_15_debug + postgresql_15_src + postgresql_orioledb-17_debug + postgresql_orioledb-17_src + postgresql_17_debug + postgresql_17_src + ; + }) // pkgs.lib.optionalAttrs (system == "x86_64-linux") ({ devShell = self'.devShells.default; }); }; } diff --git a/nix/ext/tests/default.nix b/nix/ext/tests/default.nix index cf4518f60..b87c44439 100644 --- a/nix/ext/tests/default.nix +++ b/nix/ext/tests/default.nix @@ -20,7 +20,7 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -35,7 +35,7 @@ let withoutJIT = pkg; installedExtensions = [ (installedExtension majorVersion) ]; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -49,12 +49,15 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17; + psql_15 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; + psql_17 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17; in - self.inputs.nixpkgs.lib.nixos.runTest { + pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { diff --git a/nix/ext/tests/http.nix b/nix/ext/tests/http.nix index fab6a0d20..256f39b47 100644 --- a/nix/ext/tests/http.nix +++ b/nix/ext/tests/http.nix @@ -12,7 +12,7 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -27,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -42,9 +42,8 @@ let in pkg; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { @@ -69,7 +68,7 @@ self.inputs.nixpkgs.lib.nixos.runTest { specialisation.postgresql17.configuration = { services.postgresql = { package = lib.mkForce ( - postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17 + postgresqlWithExtension self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17 ); }; @@ -86,10 +85,10 @@ self.inputs.nixpkgs.lib.nixos.runTest { let oldPostgresql = postgresqlWithExtension - self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; newPostgresql = postgresqlWithExtension - self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17; + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17; oldDataDir = "${builtins.dirOf config.services.postgresql.dataDir}/${oldPostgresql.psqlSchema}"; newDataDir = "${builtins.dirOf config.services.postgresql.dataDir}/${newPostgresql.psqlSchema}"; in diff --git a/nix/ext/tests/orioledb.nix b/nix/ext/tests/orioledb.nix index de50710b5..51407d221 100644 --- a/nix/ext/tests/orioledb.nix +++ b/nix/ext/tests/orioledb.nix @@ -6,24 +6,24 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql postgresql.lib - (self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_orioledb-17".exts.orioledb) + (self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_orioledb-17".exts.orioledb) ]; passthru = { inherit (postgresql) version psqlSchema; installedExtensions = [ - (self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_orioledb-17".exts.orioledb) + (self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_orioledb-17".exts.orioledb) ]; lib = pkg; withPackages = _: pkg; withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -39,11 +39,10 @@ let pkg; psql_orioledb = postgresqlWithExtension - self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_orioledb-17; + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_orioledb-17; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { ... }: { diff --git a/nix/ext/tests/pg_plan_filter.nix b/nix/ext/tests/pg_plan_filter.nix index f8d1c9ca6..c4ea9143a 100644 --- a/nix/ext/tests/pg_plan_filter.nix +++ b/nix/ext/tests/pg_plan_filter.nix @@ -4,7 +4,7 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ pname }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; @@ -12,7 +12,7 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -27,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -41,12 +41,15 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17; + psql_15 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; + psql_17 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { diff --git a/nix/ext/tests/pg_repack.nix b/nix/ext/tests/pg_repack.nix index 7a1605838..d0c557e12 100644 --- a/nix/ext/tests/pg_repack.nix +++ b/nix/ext/tests/pg_repack.nix @@ -4,7 +4,7 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ pname }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; @@ -12,7 +12,7 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -27,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -42,9 +42,8 @@ let in pkg; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { @@ -63,7 +62,9 @@ self.inputs.nixpkgs.lib.nixos.runTest { services.postgresql = { enable = true; - package = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; + package = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; enableTCPIP = true; authentication = '' local all postgres peer map=postgres @@ -86,7 +87,7 @@ self.inputs.nixpkgs.lib.nixos.runTest { specialisation.postgresql17.configuration = { services.postgresql = { package = lib.mkForce ( - postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17 + postgresqlWithExtension self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17 ); }; @@ -103,10 +104,10 @@ self.inputs.nixpkgs.lib.nixos.runTest { let oldPostgresql = postgresqlWithExtension - self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; newPostgresql = postgresqlWithExtension - self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17; + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17; oldDataDir = "${builtins.dirOf config.services.postgresql.dataDir}/${oldPostgresql.psqlSchema}"; newDataDir = "${builtins.dirOf config.services.postgresql.dataDir}/${newPostgresql.psqlSchema}"; in diff --git a/nix/ext/tests/pg_safeupdate.nix b/nix/ext/tests/pg_safeupdate.nix index 4f168f8b0..1bb0225ea 100644 --- a/nix/ext/tests/pg_safeupdate.nix +++ b/nix/ext/tests/pg_safeupdate.nix @@ -4,7 +4,7 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ pname }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; @@ -12,7 +12,7 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -27,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -41,12 +41,15 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17; + psql_15 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; + psql_17 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { diff --git a/nix/ext/tests/pgjwt.nix b/nix/ext/tests/pgjwt.nix index 2f0cc9efc..ec8df64d5 100644 --- a/nix/ext/tests/pgjwt.nix +++ b/nix/ext/tests/pgjwt.nix @@ -4,7 +4,7 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ pname }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; @@ -12,7 +12,7 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -27,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -41,12 +41,15 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17; + psql_15 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; + psql_17 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { diff --git a/nix/ext/tests/pgmq.nix b/nix/ext/tests/pgmq.nix index 3e2dc7f91..99a2f672b 100644 --- a/nix/ext/tests/pgmq.nix +++ b/nix/ext/tests/pgmq.nix @@ -4,7 +4,7 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ pname }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; @@ -12,7 +12,7 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -27,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -41,12 +41,15 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17; + psql_15 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; + psql_17 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = "timescaledb"; - hostPkgs = pkgs; nodes.server = { config, ... }: { diff --git a/nix/ext/tests/pgroonga.nix b/nix/ext/tests/pgroonga.nix index 4316d4a72..fe1b47447 100644 --- a/nix/ext/tests/pgroonga.nix +++ b/nix/ext/tests/pgroonga.nix @@ -4,7 +4,7 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ pname }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; @@ -12,7 +12,7 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -27,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -41,12 +41,15 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17; + psql_15 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; + psql_17 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { @@ -83,11 +86,11 @@ self.inputs.nixpkgs.lib.nixos.runTest { ]; }; systemd.services.postgresql.environment.MECAB_DICDIR = "${ - self.packages.${pkgs.stdenv.hostPlatform.system}.mecab-naist-jdic + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.mecab-naist-jdic }/lib/mecab/dic/naist-jdic"; systemd.services.postgresql.environment.MECAB_CONFIG = "${pkgs.mecab}/bin/mecab-config"; systemd.services.postgresql.environment.GRN_PLUGINS_DIR = "${ - self.packages.${pkgs.stdenv.hostPlatform.system}.supabase-groonga + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.supabase-groonga }/lib/groonga/plugins"; specialisation.postgresql17.configuration = { diff --git a/nix/ext/tests/pgrouting.nix b/nix/ext/tests/pgrouting.nix index 15fac76c5..416c21576 100644 --- a/nix/ext/tests/pgrouting.nix +++ b/nix/ext/tests/pgrouting.nix @@ -4,7 +4,7 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ pname }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; @@ -12,16 +12,17 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql postgresql.lib (installedExtension majorVersion) - (self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${majorVersion}".exts.postgis) + (self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${majorVersion}".exts.postgis + ) ] ++ lib.optional (postgresql.isOrioleDB) ( - self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_orioledb-17".exts.orioledb + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_orioledb-17".exts.orioledb ); passthru = { inherit (postgresql) version psqlSchema; @@ -31,7 +32,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -46,12 +47,11 @@ let in pkg; pg_regress = pkgs.callPackage ../pg_regress.nix { - postgresql = self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; + postgresql = self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; }; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { @@ -73,13 +73,15 @@ self.inputs.nixpkgs.lib.nixos.runTest { services.postgresql = { enable = true; - package = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; + package = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; }; specialisation.postgresql17.configuration = { services.postgresql = { package = lib.mkForce ( - postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17 + postgresqlWithExtension self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17 ); }; @@ -96,10 +98,10 @@ self.inputs.nixpkgs.lib.nixos.runTest { let oldPostgresql = postgresqlWithExtension - self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; newPostgresql = postgresqlWithExtension - self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17; + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17; oldDataDir = "${builtins.dirOf config.services.postgresql.dataDir}/${oldPostgresql.psqlSchema}"; newDataDir = "${builtins.dirOf config.services.postgresql.dataDir}/${newPostgresql.psqlSchema}"; in @@ -124,7 +126,8 @@ self.inputs.nixpkgs.lib.nixos.runTest { specialisation.orioledb17.configuration = { services.postgresql = { package = lib.mkForce ( - postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_orioledb-17 + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_orioledb-17 ); settings = { shared_preload_libraries = "orioledb"; @@ -155,7 +158,7 @@ self.inputs.nixpkgs.lib.nixos.runTest { let newPostgresql = postgresqlWithExtension - self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_orioledb-17; + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_orioledb-17; in '' set -x diff --git a/nix/ext/tests/pgsodium.nix b/nix/ext/tests/pgsodium.nix index 00a2bf44f..4dbcf5019 100644 --- a/nix/ext/tests/pgsodium.nix +++ b/nix/ext/tests/pgsodium.nix @@ -4,7 +4,7 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ pname }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; @@ -12,13 +12,14 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql postgresql.lib (installedExtension majorVersion) - (self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${majorVersion}".exts.hypopg) + (self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${majorVersion}".exts.hypopg + ) ]; passthru = { inherit (postgresql) version psqlSchema; @@ -28,7 +29,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -48,9 +49,8 @@ let '' ); in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { @@ -66,7 +66,9 @@ self.inputs.nixpkgs.lib.nixos.runTest { services.postgresql = { enable = true; - package = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; + package = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; settings = { "shared_preload_libraries" = pname; "pgsodium.getkey_script" = pgsodiumGetKey; @@ -76,7 +78,7 @@ self.inputs.nixpkgs.lib.nixos.runTest { specialisation.postgresql17.configuration = { services.postgresql = { package = lib.mkForce ( - postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17 + postgresqlWithExtension self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17 ); }; @@ -93,10 +95,10 @@ self.inputs.nixpkgs.lib.nixos.runTest { let oldPostgresql = postgresqlWithExtension - self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; newPostgresql = postgresqlWithExtension - self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17; + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17; oldDataDir = "${builtins.dirOf config.services.postgresql.dataDir}/${oldPostgresql.psqlSchema}"; newDataDir = "${builtins.dirOf config.services.postgresql.dataDir}/${newPostgresql.psqlSchema}"; in diff --git a/nix/ext/tests/plpgsql_check.nix b/nix/ext/tests/plpgsql_check.nix index 3beac0c72..0f4175417 100644 --- a/nix/ext/tests/plpgsql_check.nix +++ b/nix/ext/tests/plpgsql_check.nix @@ -4,7 +4,7 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ pname }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; @@ -12,7 +12,7 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -27,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -41,12 +41,15 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17; + psql_15 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; + psql_17 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { diff --git a/nix/ext/tests/plv8.nix b/nix/ext/tests/plv8.nix index 91d7d29d1..58bb2f962 100644 --- a/nix/ext/tests/plv8.nix +++ b/nix/ext/tests/plv8.nix @@ -5,7 +5,7 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ pname }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; @@ -13,7 +13,7 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -28,7 +28,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -42,11 +42,12 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; + psql_15 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { ... }: { @@ -65,7 +66,9 @@ self.inputs.nixpkgs.lib.nixos.runTest { services.postgresql = { enable = true; - package = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; + package = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; authentication = '' local all postgres peer map=postgres local all all peer map=root diff --git a/nix/ext/tests/postgis.nix b/nix/ext/tests/postgis.nix index 7599ab7c9..9574c6c83 100644 --- a/nix/ext/tests/postgis.nix +++ b/nix/ext/tests/postgis.nix @@ -4,7 +4,7 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ pname }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; @@ -12,7 +12,7 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -27,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -42,9 +42,8 @@ let in pkg; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { @@ -63,13 +62,15 @@ self.inputs.nixpkgs.lib.nixos.runTest { services.postgresql = { enable = true; - package = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; + package = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; }; specialisation.postgresql17.configuration = { services.postgresql = { package = lib.mkForce ( - postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17 + postgresqlWithExtension self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17 ); }; @@ -86,10 +87,10 @@ self.inputs.nixpkgs.lib.nixos.runTest { let oldPostgresql = postgresqlWithExtension - self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; newPostgresql = postgresqlWithExtension - self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17; + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17; oldDataDir = "${builtins.dirOf config.services.postgresql.dataDir}/${oldPostgresql.psqlSchema}"; newDataDir = "${builtins.dirOf config.services.postgresql.dataDir}/${newPostgresql.psqlSchema}"; in diff --git a/nix/ext/tests/timescaledb.nix b/nix/ext/tests/timescaledb.nix index a98d1f5eb..5a29442ab 100644 --- a/nix/ext/tests/timescaledb.nix +++ b/nix/ext/tests/timescaledb.nix @@ -4,7 +4,7 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ pname }"; versions = (installedExtension "15").versions; @@ -12,7 +12,7 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -27,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -41,11 +41,12 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; + psql_15 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = "timescaledb"; - hostPkgs = pkgs; nodes.server = { ... }: { diff --git a/nix/ext/tests/vault.nix b/nix/ext/tests/vault.nix index 42fafacab..c15a469fa 100644 --- a/nix/ext/tests/vault.nix +++ b/nix/ext/tests/vault.nix @@ -4,7 +4,7 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ pname }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; @@ -12,13 +12,14 @@ let postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql postgresql.lib (installedExtension majorVersion) - (self.legacyPackages.${pkgs.stdenv.hostPlatform.system}."psql_${majorVersion}".exts.pgsodium) # dependency + (self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${majorVersion}".exts.pgsodium + ) # dependency ]; passthru = { inherit (postgresql) version psqlSchema; @@ -28,7 +29,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -47,12 +48,15 @@ let echo 0000000000000000000000000000000000000000000000000000000000000000 '' ); - psql_15 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.stdenv.hostPlatform.system}.postgresql_17; + psql_15 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; + psql_17 = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { From fff0095f40c38f1f39b7f588f85ea388761b6a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Mon, 22 Dec 2025 11:29:33 +0100 Subject: [PATCH 2/4] chore: reduce warnings related to system Current system value has been moved into `pkgs.stdenv.hostPlatform` by https://github.com/NixOS/nixpkgs/pull/456527 --- nix/cargo-pgrx/mkPgrxExtension.nix | 2 +- nix/postgresql/generic.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/cargo-pgrx/mkPgrxExtension.nix b/nix/cargo-pgrx/mkPgrxExtension.nix index 0bf99e3de..cee5eae1a 100644 --- a/nix/cargo-pgrx/mkPgrxExtension.nix +++ b/nix/cargo-pgrx/mkPgrxExtension.nix @@ -42,7 +42,7 @@ let import (builtins.fetchTarball { url = "https://channels.nixos.org/nixos-22.11/nixexprs.tar.xz"; sha256 = "1j7h75a9hwkkm97jicky5rhvzkdwxsv5v46473rl6agvq2sj97y1"; - }) { system = stdenv.hostPlatform.system; } + }) { inherit (stdenv.hostPlatform) system; } ); in rustPlatform.bindgenHook.overrideAttrs { diff --git a/nix/postgresql/generic.nix b/nix/postgresql/generic.nix index a99ecad6d..6eaf873ae 100644 --- a/nix/postgresql/generic.nix +++ b/nix/postgresql/generic.nix @@ -322,7 +322,7 @@ let tests = { postgresql-wal-receiver = import ../../../../nixos/tests/postgresql-wal-receiver.nix { - system = stdenv.hostPlatform.system; + inherit (stdenv.hostPlatform) system; pkgs = self; package = this; }; @@ -330,7 +330,7 @@ let } // lib.optionalAttrs jitSupport { postgresql-jit = import ../../../../nixos/tests/postgresql-jit.nix { - system = stdenv.hostPlatform.system; + inherit (stdenv.hostPlatform) system; pkgs = self; package = this; }; From 6067025aecdaa2f82cb830283c2c75f2a4c9856c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Mon, 22 Dec 2025 17:00:33 +0100 Subject: [PATCH 3/4] fix: remove redundant postgresqlWithExtension wrapper in extension tests The tests were unnecessarily wrapping psql_15 with postgresqlWithExtension when psql_15 already includes the extensions. --- nix/ext/tests/pg_plan_filter.nix | 2 +- nix/ext/tests/pg_safeupdate.nix | 2 +- nix/ext/tests/pgmq.nix | 4 ++-- nix/ext/tests/timescaledb.nix | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nix/ext/tests/pg_plan_filter.nix b/nix/ext/tests/pg_plan_filter.nix index c4ea9143a..30e1170e0 100644 --- a/nix/ext/tests/pg_plan_filter.nix +++ b/nix/ext/tests/pg_plan_filter.nix @@ -55,7 +55,7 @@ pkgs.testers.runNixOSTest { { services.postgresql = { enable = true; - package = (postgresqlWithExtension psql_15); + package = psql_15; settings = (installedExtension "15").defaultSettings or { }; }; diff --git a/nix/ext/tests/pg_safeupdate.nix b/nix/ext/tests/pg_safeupdate.nix index 1bb0225ea..83c2b080b 100644 --- a/nix/ext/tests/pg_safeupdate.nix +++ b/nix/ext/tests/pg_safeupdate.nix @@ -55,7 +55,7 @@ pkgs.testers.runNixOSTest { { services.postgresql = { enable = true; - package = (postgresqlWithExtension psql_15); + package = psql_15; settings = (installedExtension "15").defaultSettings or { }; }; diff --git a/nix/ext/tests/pgmq.nix b/nix/ext/tests/pgmq.nix index 99a2f672b..eac0c350d 100644 --- a/nix/ext/tests/pgmq.nix +++ b/nix/ext/tests/pgmq.nix @@ -49,13 +49,13 @@ let self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17; in pkgs.testers.runNixOSTest { - name = "timescaledb"; + name = "pgmq"; nodes.server = { config, ... }: { services.postgresql = { enable = true; - package = (postgresqlWithExtension psql_15); + package = psql_15; authentication = '' local all postgres peer map=postgres local all all peer map=root diff --git a/nix/ext/tests/timescaledb.nix b/nix/ext/tests/timescaledb.nix index 5a29442ab..285ad39ce 100644 --- a/nix/ext/tests/timescaledb.nix +++ b/nix/ext/tests/timescaledb.nix @@ -52,7 +52,7 @@ pkgs.testers.runNixOSTest { { services.postgresql = { enable = true; - package = (postgresqlWithExtension psql_15); + package = psql_15; authentication = '' local all postgres peer map=postgres local all all peer map=root From 695376843a847727a3416a8c55a35dbd627dcad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Mon, 22 Dec 2025 18:06:59 +0100 Subject: [PATCH 4/4] fix: remove port forwarding from test configurations This cause problem starting nixos tests on darwin hosts. --- nix/ext/tests/default.nix | 9 --------- nix/ext/tests/http.nix | 9 --------- nix/ext/tests/orioledb.nix | 9 --------- nix/ext/tests/pg_repack.nix | 9 --------- nix/ext/tests/pgjwt.nix | 10 ---------- nix/ext/tests/pgroonga.nix | 9 --------- nix/ext/tests/pgrouting.nix | 9 --------- nix/ext/tests/pgsodium.nix | 10 ---------- nix/ext/tests/plpgsql_check.nix | 9 --------- nix/ext/tests/plv8.nix | 9 --------- nix/ext/tests/postgis.nix | 9 --------- nix/ext/tests/vault.nix | 10 ---------- 12 files changed, 111 deletions(-) diff --git a/nix/ext/tests/default.nix b/nix/ext/tests/default.nix index b87c44439..77f8a7bda 100644 --- a/nix/ext/tests/default.nix +++ b/nix/ext/tests/default.nix @@ -61,15 +61,6 @@ let nodes.server = { config, ... }: { - virtualisation = { - forwardPorts = [ - { - from = "host"; - host.port = 13022; - guest.port = 22; - } - ]; - }; services.openssh = { enable = true; }; diff --git a/nix/ext/tests/http.nix b/nix/ext/tests/http.nix index 256f39b47..d5b0149ba 100644 --- a/nix/ext/tests/http.nix +++ b/nix/ext/tests/http.nix @@ -47,15 +47,6 @@ pkgs.testers.runNixOSTest { nodes.server = { config, ... }: { - virtualisation = { - forwardPorts = [ - { - from = "host"; - host.port = 13022; - guest.port = 22; - } - ]; - }; services.openssh = { enable = true; }; diff --git a/nix/ext/tests/orioledb.nix b/nix/ext/tests/orioledb.nix index 51407d221..bb1a3125f 100644 --- a/nix/ext/tests/orioledb.nix +++ b/nix/ext/tests/orioledb.nix @@ -46,15 +46,6 @@ pkgs.testers.runNixOSTest { nodes.server = { ... }: { - virtualisation = { - forwardPorts = [ - { - from = "host"; - host.port = 13022; - guest.port = 22; - } - ]; - }; services.openssh = { enable = true; }; diff --git a/nix/ext/tests/pg_repack.nix b/nix/ext/tests/pg_repack.nix index d0c557e12..af200f83f 100644 --- a/nix/ext/tests/pg_repack.nix +++ b/nix/ext/tests/pg_repack.nix @@ -47,15 +47,6 @@ pkgs.testers.runNixOSTest { nodes.server = { config, ... }: { - virtualisation = { - forwardPorts = [ - { - from = "host"; - host.port = 13022; - guest.port = 22; - } - ]; - }; services.openssh = { enable = true; }; diff --git a/nix/ext/tests/pgjwt.nix b/nix/ext/tests/pgjwt.nix index ec8df64d5..39fcd18f6 100644 --- a/nix/ext/tests/pgjwt.nix +++ b/nix/ext/tests/pgjwt.nix @@ -53,16 +53,6 @@ pkgs.testers.runNixOSTest { nodes.server = { config, ... }: { - virtualisation = { - forwardPorts = [ - { - from = "host"; - host.port = 13022; - guest.port = 22; - } - ]; - }; - services.postgresql = { enable = true; package = psql_15; diff --git a/nix/ext/tests/pgroonga.nix b/nix/ext/tests/pgroonga.nix index fe1b47447..3a7a0e78e 100644 --- a/nix/ext/tests/pgroonga.nix +++ b/nix/ext/tests/pgroonga.nix @@ -53,15 +53,6 @@ pkgs.testers.runNixOSTest { nodes.server = { config, ... }: { - virtualisation = { - forwardPorts = [ - { - from = "host"; - host.port = 13022; - guest.port = 22; - } - ]; - }; services.openssh = { enable = true; }; diff --git a/nix/ext/tests/pgrouting.nix b/nix/ext/tests/pgrouting.nix index 416c21576..7a53dbf6b 100644 --- a/nix/ext/tests/pgrouting.nix +++ b/nix/ext/tests/pgrouting.nix @@ -55,15 +55,6 @@ pkgs.testers.runNixOSTest { nodes.server = { config, ... }: { - virtualisation = { - forwardPorts = [ - { - from = "host"; - host.port = 13022; - guest.port = 22; - } - ]; - }; services.openssh = { enable = true; }; diff --git a/nix/ext/tests/pgsodium.nix b/nix/ext/tests/pgsodium.nix index 4dbcf5019..4d2962803 100644 --- a/nix/ext/tests/pgsodium.nix +++ b/nix/ext/tests/pgsodium.nix @@ -54,16 +54,6 @@ pkgs.testers.runNixOSTest { nodes.server = { config, ... }: { - virtualisation = { - forwardPorts = [ - { - from = "host"; - host.port = 13022; - guest.port = 22; - } - ]; - }; - services.postgresql = { enable = true; package = diff --git a/nix/ext/tests/plpgsql_check.nix b/nix/ext/tests/plpgsql_check.nix index 0f4175417..e4b381fee 100644 --- a/nix/ext/tests/plpgsql_check.nix +++ b/nix/ext/tests/plpgsql_check.nix @@ -53,15 +53,6 @@ pkgs.testers.runNixOSTest { nodes.server = { config, ... }: { - virtualisation = { - forwardPorts = [ - { - from = "host"; - host.port = 13022; - guest.port = 22; - } - ]; - }; services.openssh = { enable = true; }; diff --git a/nix/ext/tests/plv8.nix b/nix/ext/tests/plv8.nix index 58bb2f962..381cbcae4 100644 --- a/nix/ext/tests/plv8.nix +++ b/nix/ext/tests/plv8.nix @@ -51,15 +51,6 @@ pkgs.testers.runNixOSTest { nodes.server = { ... }: { - virtualisation = { - forwardPorts = [ - { - from = "host"; - host.port = 13022; - guest.port = 22; - } - ]; - }; services.openssh = { enable = true; }; diff --git a/nix/ext/tests/postgis.nix b/nix/ext/tests/postgis.nix index 9574c6c83..bc168c506 100644 --- a/nix/ext/tests/postgis.nix +++ b/nix/ext/tests/postgis.nix @@ -47,15 +47,6 @@ pkgs.testers.runNixOSTest { nodes.server = { config, ... }: { - virtualisation = { - forwardPorts = [ - { - from = "host"; - host.port = 13022; - guest.port = 22; - } - ]; - }; services.openssh = { enable = true; }; diff --git a/nix/ext/tests/vault.nix b/nix/ext/tests/vault.nix index c15a469fa..28ad6b629 100644 --- a/nix/ext/tests/vault.nix +++ b/nix/ext/tests/vault.nix @@ -60,16 +60,6 @@ pkgs.testers.runNixOSTest { nodes.server = { config, ... }: { - virtualisation = { - forwardPorts = [ - { - from = "host"; - host.port = 13022; - guest.port = 22; - } - ]; - }; - services.postgresql = { enable = true; package = psql_15;