Skip to content

feat: enable nixosTest on aarch64 darwin #1989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jfroche wants to merge 4 commits into
base: update-nixpkgs
Choose a base branch
from
+259 −267
Open

feat: enable nixosTest on aarch64 darwin #1989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c96289d
feat: enable nixosTest on aarch64 darwin
jfroche Dec 22, 2025
e1bb0d6
chore: reduce warnings related to system
jfroche Dec 22, 2025
307aa73
fix: remove redundant postgresqlWithExtension wrapper in extension tests
jfroche Dec 22, 2025
fdd545e
fix: remove port forwarding from test configurations
jfroche Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion nix/cargo-pgrx/mkPgrxExtension.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
pgrxVersion,
makeRustPlatform,
rust-bin,
stdenv,
system,
}:
let
Expand Down Expand Up @@ -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 {
Expand Down
30 changes: 14 additions & 16 deletions nix/checks.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; });
};
}
28 changes: 12 additions & 16 deletions nix/ext/tests/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -33,7 +35,7 @@ let
withoutJIT = pkg;
installedExtensions = [ (installedExtension majorVersion) ];
};
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
pathsToLink = [
"/"
"/bin"
Expand All @@ -47,24 +49,18 @@ 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, ... }:
{
virtualisation = {
forwardPorts = [
{
from = "host";
host.port = 13022;
guest.port = 22;
}
];
};
services.openssh = {
enable = true;
};
Expand Down
36 changes: 18 additions & 18 deletions nix/ext/tests/http.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,7 +27,7 @@ let
withJIT = pkg;
withoutJIT = pkg;
};
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
pathsToLink = [
"/"
"/bin"
Expand All @@ -40,33 +42,27 @@ let
in
pkg;
in
self.inputs.nixpkgs.lib.nixos.runTest {
pkgs.testers.runNixOSTest {
name = pname;
hostPkgs = pkgs;
nodes.server =
{ config, ... }:
{
virtualisation = {
forwardPorts = [
{
from = "host";
host.port = 13022;
guest.port = 22;
}
];
};
services.openssh = {
enable = true;
};

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 = {
Expand All @@ -80,8 +76,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
Expand Down
26 changes: 10 additions & 16 deletions nix/ext/tests/orioledb.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -35,23 +37,15 @@ 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 =
{ ... }:
{
virtualisation = {
forwardPorts = [
{
from = "host";
host.port = 13022;
guest.port = 22;
}
];
};
services.openssh = {
enable = true;
};
Expand Down
21 changes: 13 additions & 8 deletions nix/ext/tests/pg_plan_filter.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,7 +27,7 @@ let
withJIT = pkg;
withoutJIT = pkg;
};
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
pathsToLink = [
"/"
"/bin"
Expand All @@ -39,18 +41,21 @@ 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, ... }:
{
services.postgresql = {
enable = true;
package = (postgresqlWithExtension psql_15);
package = psql_15;
settings = (installedExtension "15").defaultSettings or { };
};

Expand Down
36 changes: 18 additions & 18 deletions nix/ext/tests/pg_repack.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,7 +27,7 @@ let
withJIT = pkg;
withoutJIT = pkg;
};
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
pathsToLink = [
"/"
"/bin"
Expand All @@ -40,28 +42,20 @@ let
in
pkg;
in
self.inputs.nixpkgs.lib.nixos.runTest {
pkgs.testers.runNixOSTest {
name = pname;
hostPkgs = pkgs;
nodes.server =
{ config, ... }:
{
virtualisation = {
forwardPorts = [
{
from = "host";
host.port = 13022;
guest.port = 22;
}
];
};
services.openssh = {
enable = true;
};

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
Expand All @@ -83,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 = {
Expand All @@ -97,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
Expand Down
Loading
Loading