From c96289d4ca48791a881533ab537e39f389b4fb2e 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 | 19 ++++++++------ nix/ext/tests/http.nix | 27 +++++++++++++------- nix/ext/tests/orioledb.nix | 17 +++++++------ nix/ext/tests/pg_plan_filter.nix | 19 ++++++++------ nix/ext/tests/pg_repack.nix | 27 +++++++++++++------- nix/ext/tests/pg_safeupdate.nix | 19 ++++++++------ nix/ext/tests/pgjwt.nix | 19 ++++++++------ nix/ext/tests/pgmq.nix | 19 ++++++++------ nix/ext/tests/pgroonga.nix | 23 ++++++++++------- nix/ext/tests/pgrouting.nix | 43 +++++++++++++++++++++----------- nix/ext/tests/pgsodium.nix | 30 ++++++++++++++-------- nix/ext/tests/plpgsql_check.nix | 19 ++++++++------ nix/ext/tests/plv8.nix | 19 ++++++++------ nix/ext/tests/postgis.nix | 27 +++++++++++++------- nix/ext/tests/timescaledb.nix | 15 ++++++----- nix/ext/tests/vault.nix | 22 ++++++++++------ 17 files changed, 248 insertions(+), 146 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 fe6aa0276..e5f1eb61a 100644 --- a/nix/ext/tests/default.nix +++ b/nix/ext/tests/default.nix @@ -12,13 +12,15 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; postgresqlWithExtension = postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -33,7 +35,7 @@ let withoutJIT = pkg; installedExtensions = [ (installedExtension majorVersion) ]; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -47,12 +49,15 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.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 1477b6c4a..fe6157d8c 100644 --- a/nix/ext/tests/http.nix +++ b/nix/ext/tests/http.nix @@ -4,13 +4,15 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; postgresqlWithExtension = postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -25,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -40,9 +42,8 @@ let in pkg; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { @@ -61,12 +62,16 @@ self.inputs.nixpkgs.lib.nixos.runTest { services.postgresql = { enable = true; - package = postgresqlWithExtension self.packages.${pkgs.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.system}.postgresql_17); + package = lib.mkForce ( + postgresqlWithExtension self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17 + ); }; systemd.services.postgresql-migrate = { @@ -80,8 +85,12 @@ self.inputs.nixpkgs.lib.nixos.runTest { }; script = let - oldPostgresql = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; - newPostgresql = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_17; + oldPostgresql = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; + newPostgresql = + postgresqlWithExtension + 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 cc1b09b98..51407d221 100644 --- a/nix/ext/tests/orioledb.nix +++ b/nix/ext/tests/orioledb.nix @@ -6,22 +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.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.system}."psql_orioledb-17".exts.orioledb) ]; + installedExtensions = [ + (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" @@ -35,11 +37,12 @@ let }; in pkg; - psql_orioledb = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_orioledb-17; + psql_orioledb = + postgresqlWithExtension + 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 677c30ae3..c4ea9143a 100644 --- a/nix/ext/tests/pg_plan_filter.nix +++ b/nix/ext/tests/pg_plan_filter.nix @@ -4,13 +4,15 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; postgresqlWithExtension = postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -25,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -39,12 +41,15 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.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 c02674d74..d0c557e12 100644 --- a/nix/ext/tests/pg_repack.nix +++ b/nix/ext/tests/pg_repack.nix @@ -4,13 +4,15 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; postgresqlWithExtension = postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -25,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -40,9 +42,8 @@ let in pkg; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { @@ -61,7 +62,9 @@ self.inputs.nixpkgs.lib.nixos.runTest { services.postgresql = { enable = true; - package = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; + package = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; enableTCPIP = true; authentication = '' local all postgres peer map=postgres @@ -83,7 +86,9 @@ self.inputs.nixpkgs.lib.nixos.runTest { specialisation.postgresql17.configuration = { services.postgresql = { - package = lib.mkForce (postgresqlWithExtension self.packages.${pkgs.system}.postgresql_17); + package = lib.mkForce ( + postgresqlWithExtension self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17 + ); }; systemd.services.postgresql-migrate = { @@ -97,8 +102,12 @@ self.inputs.nixpkgs.lib.nixos.runTest { }; script = let - oldPostgresql = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; - newPostgresql = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_17; + oldPostgresql = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; + newPostgresql = + postgresqlWithExtension + 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 a4431cfa5..1bb0225ea 100644 --- a/nix/ext/tests/pg_safeupdate.nix +++ b/nix/ext/tests/pg_safeupdate.nix @@ -4,13 +4,15 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; postgresqlWithExtension = postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -25,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -39,12 +41,15 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.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 aede7e9a0..ec8df64d5 100644 --- a/nix/ext/tests/pgjwt.nix +++ b/nix/ext/tests/pgjwt.nix @@ -4,13 +4,15 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; postgresqlWithExtension = postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -25,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -39,12 +41,15 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.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 7d96e057c..99a2f672b 100644 --- a/nix/ext/tests/pgmq.nix +++ b/nix/ext/tests/pgmq.nix @@ -4,13 +4,15 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; postgresqlWithExtension = postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -25,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -39,12 +41,15 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.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 f40da3367..fe1b47447 100644 --- a/nix/ext/tests/pgroonga.nix +++ b/nix/ext/tests/pgroonga.nix @@ -4,13 +4,15 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; postgresqlWithExtension = postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -25,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -39,12 +41,15 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.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, ... }: { @@ -81,11 +86,11 @@ self.inputs.nixpkgs.lib.nixos.runTest { ]; }; systemd.services.postgresql.environment.MECAB_DICDIR = "${ - self.packages.${pkgs.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.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 3fe656977..416c21576 100644 --- a/nix/ext/tests/pgrouting.nix +++ b/nix/ext/tests/pgrouting.nix @@ -4,22 +4,25 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; postgresqlWithExtension = 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.system}."psql_${majorVersion}".exts.postgis) + (self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${majorVersion}".exts.postgis + ) ] ++ lib.optional (postgresql.isOrioleDB) ( - self.legacyPackages.${pkgs.system}."psql_orioledb-17".exts.orioledb + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_orioledb-17".exts.orioledb ); passthru = { inherit (postgresql) version psqlSchema; @@ -29,7 +32,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -44,12 +47,11 @@ let in pkg; pg_regress = pkgs.callPackage ../pg_regress.nix { - postgresql = self.packages.${pkgs.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, ... }: { @@ -71,12 +73,16 @@ self.inputs.nixpkgs.lib.nixos.runTest { services.postgresql = { enable = true; - package = postgresqlWithExtension self.packages.${pkgs.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.system}.postgresql_17); + package = lib.mkForce ( + postgresqlWithExtension self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17 + ); }; systemd.services.postgresql-migrate = { @@ -90,8 +96,12 @@ self.inputs.nixpkgs.lib.nixos.runTest { }; script = let - oldPostgresql = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; - newPostgresql = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_17; + oldPostgresql = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; + newPostgresql = + postgresqlWithExtension + 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 @@ -115,7 +125,10 @@ self.inputs.nixpkgs.lib.nixos.runTest { specialisation.orioledb17.configuration = { services.postgresql = { - package = lib.mkForce (postgresqlWithExtension self.packages.${pkgs.system}.postgresql_orioledb-17); + package = lib.mkForce ( + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_orioledb-17 + ); settings = { shared_preload_libraries = "orioledb"; default_table_access_method = "orioledb"; @@ -143,7 +156,9 @@ self.inputs.nixpkgs.lib.nixos.runTest { }; script = let - newPostgresql = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_orioledb-17; + newPostgresql = + postgresqlWithExtension + 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 8fb945eeb..4dbcf5019 100644 --- a/nix/ext/tests/pgsodium.nix +++ b/nix/ext/tests/pgsodium.nix @@ -4,19 +4,22 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; postgresqlWithExtension = 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.system}."psql_${majorVersion}".exts.hypopg) + (self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${majorVersion}".exts.hypopg + ) ]; passthru = { inherit (postgresql) version psqlSchema; @@ -26,7 +29,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -46,9 +49,8 @@ let '' ); in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { @@ -64,7 +66,9 @@ self.inputs.nixpkgs.lib.nixos.runTest { services.postgresql = { enable = true; - package = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; + package = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; settings = { "shared_preload_libraries" = pname; "pgsodium.getkey_script" = pgsodiumGetKey; @@ -73,7 +77,9 @@ self.inputs.nixpkgs.lib.nixos.runTest { specialisation.postgresql17.configuration = { services.postgresql = { - package = lib.mkForce (postgresqlWithExtension self.packages.${pkgs.system}.postgresql_17); + package = lib.mkForce ( + postgresqlWithExtension self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17 + ); }; systemd.services.postgresql-migrate = { @@ -87,8 +93,12 @@ self.inputs.nixpkgs.lib.nixos.runTest { }; script = let - oldPostgresql = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; - newPostgresql = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_17; + oldPostgresql = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; + newPostgresql = + postgresqlWithExtension + 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 422a37982..0f4175417 100644 --- a/nix/ext/tests/plpgsql_check.nix +++ b/nix/ext/tests/plpgsql_check.nix @@ -4,13 +4,15 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; postgresqlWithExtension = postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -25,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -39,12 +41,15 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.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 38c3a51b1..58bb2f962 100644 --- a/nix/ext/tests/plv8.nix +++ b/nix/ext/tests/plv8.nix @@ -5,13 +5,15 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; postgresqlWithExtension = postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -26,7 +28,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -40,11 +42,12 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.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 = { ... }: { @@ -63,7 +66,9 @@ self.inputs.nixpkgs.lib.nixos.runTest { services.postgresql = { enable = true; - package = postgresqlWithExtension self.packages.${pkgs.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 68bcbe381..9574c6c83 100644 --- a/nix/ext/tests/postgis.nix +++ b/nix/ext/tests/postgis.nix @@ -4,13 +4,15 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; postgresqlWithExtension = postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -25,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -40,9 +42,8 @@ let in pkg; in -self.inputs.nixpkgs.lib.nixos.runTest { +pkgs.testers.runNixOSTest { name = pname; - hostPkgs = pkgs; nodes.server = { config, ... }: { @@ -61,12 +62,16 @@ self.inputs.nixpkgs.lib.nixos.runTest { services.postgresql = { enable = true; - package = postgresqlWithExtension self.packages.${pkgs.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.system}.postgresql_17); + package = lib.mkForce ( + postgresqlWithExtension self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17 + ); }; systemd.services.postgresql-migrate = { @@ -80,8 +85,12 @@ self.inputs.nixpkgs.lib.nixos.runTest { }; script = let - oldPostgresql = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; - newPostgresql = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_17; + oldPostgresql = + postgresqlWithExtension + self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15; + newPostgresql = + postgresqlWithExtension + 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 16a286f15..5a29442ab 100644 --- a/nix/ext/tests/timescaledb.nix +++ b/nix/ext/tests/timescaledb.nix @@ -4,13 +4,15 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = (installedExtension "15").versions; postgresqlWithExtension = postgresql: let majorVersion = lib.versions.major postgresql.version; - pkg = pkgs.buildEnv { + pkg = pkgs.pkgsLinux.buildEnv { name = "postgresql-${majorVersion}-${pname}"; paths = [ postgresql @@ -25,7 +27,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -39,11 +41,12 @@ let }; in pkg; - psql_15 = postgresqlWithExtension self.packages.${pkgs.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 763f85f84..c15a469fa 100644 --- a/nix/ext/tests/vault.nix +++ b/nix/ext/tests/vault.nix @@ -4,19 +4,22 @@ let inherit (pkgs) lib; installedExtension = postgresMajorVersion: - self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}"; + self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${ + pname + }"; versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions; postgresqlWithExtension = 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.system}."psql_${majorVersion}".exts.pgsodium) # dependency + (self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${majorVersion}".exts.pgsodium + ) # dependency ]; passthru = { inherit (postgresql) version psqlSchema; @@ -26,7 +29,7 @@ let withJIT = pkg; withoutJIT = pkg; }; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ]; pathsToLink = [ "/" "/bin" @@ -45,12 +48,15 @@ let echo 0000000000000000000000000000000000000000000000000000000000000000 '' ); - psql_15 = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_15; - psql_17 = postgresqlWithExtension self.packages.${pkgs.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 e1bb0d6470024116cc2f5fd1e38c691a3a44b234 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 | 3 ++- nix/overlays/default.nix | 2 +- nix/packages/default.nix | 2 +- nix/postgresql/generic.nix | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nix/cargo-pgrx/mkPgrxExtension.nix b/nix/cargo-pgrx/mkPgrxExtension.nix index c7970451a..ae0e53649 100644 --- a/nix/cargo-pgrx/mkPgrxExtension.nix +++ b/nix/cargo-pgrx/mkPgrxExtension.nix @@ -4,6 +4,7 @@ pgrxVersion, makeRustPlatform, rust-bin, + stdenv, system, }: let @@ -42,7 +43,7 @@ let import (builtins.fetchTarball { url = "https://channels.nixos.org/nixos-22.11/nixexprs.tar.xz"; sha256 = "1j7h75a9hwkkm97jicky5rhvzkdwxsv5v46473rl6agvq2sj97y1"; - }) { inherit system; } + }) { inherit (stdenv.hostPlatform) system; } ); in rustPlatform.bindgenHook.overrideAttrs { diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix index a5a18d5c9..c2a6e5976 100644 --- a/nix/overlays/default.nix +++ b/nix/overlays/default.nix @@ -6,7 +6,7 @@ # want to have an arbitrary order, since it might matter. being # explicit is better. - inherit (self.packages.${final.system}) + inherit (self.packages.${final.stdenv.hostPlatform.system}) postgresql_15 postgresql_17 postgresql_orioledb-17 diff --git a/nix/packages/default.nix b/nix/packages/default.nix index a764fcd33..18bb7c5d0 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -48,7 +48,7 @@ migrate-tool = pkgs.callPackage ./migrate-tool.nix { psql_15 = self'.packages."psql_15/bin"; }; overlayfs-on-package = pkgs.callPackage ./overlayfs-on-package.nix { }; packer = pkgs.callPackage ./packer.nix { inherit inputs; }; - pg-backrest = inputs.nixpkgs.legacyPackages.${pkgs.system}.pgbackrest; + pg-backrest = inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system}.pgbackrest; pg-restore = pkgs.callPackage ./pg-restore.nix { psql_15 = self'.packages."psql_15/bin"; }; pg_prove = pkgs.perlPackages.TAPParserSourceHandlerpgTAP; pg_regress = makePgRegress activeVersion; diff --git a/nix/postgresql/generic.nix b/nix/postgresql/generic.nix index 95034e060..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 { - inherit (stdenv) 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 { - inherit (stdenv) system; + inherit (stdenv.hostPlatform) system; pkgs = self; package = this; }; From 307aa736e0e6ef7079aff3096befac4418d3d1f5 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 fdd545e0c8a36dbc53e73ae9609fb05c38d1fc46 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 e5f1eb61a..19fbf4639 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 fe6157d8c..4405a531c 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;