⚠ This page is served via a proxy. Original site: https://github.com
This service does not collect credentials or authentication data.
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: develop
Choose a base branch
from
+183 −262
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
97e5bb6
feat: enable nixosTest on aarch64 darwin
jfroche Dec 22, 2025
fff0095
chore: reduce warnings related to system
jfroche Dec 22, 2025
6067025
fix: remove redundant postgresqlWithExtension wrapper in extension tests
jfroche Dec 22, 2025
6953768
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
2 changes: 1 addition & 1 deletion nix/cargo-pgrx/mkPgrxExtension.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
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; });
};
}
24 changes: 9 additions & 15 deletions nix/ext/tests/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -35,7 +35,7 @@ let
withoutJIT = pkg;
installedExtensions = [ (installedExtension majorVersion) ];
};
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
pathsToLink = [
"/"
"/bin"
Expand All @@ -49,24 +49,18 @@ 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, ... }:
{
virtualisation = {
forwardPorts = [
{
from = "host";
host.port = 13022;
guest.port = 22;
}
];
};
services.openssh = {
enable = true;
};
Expand Down
22 changes: 6 additions & 16 deletions nix/ext/tests/http.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,7 +27,7 @@ let
withJIT = pkg;
withoutJIT = pkg;
};
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
pathsToLink = [
"/"
"/bin"
Expand All @@ -42,21 +42,11 @@ 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;
};
Expand All @@ -69,7 +59,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
);
};

Expand All @@ -86,10 +76,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
Expand Down
22 changes: 6 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,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"
Expand All @@ -39,23 +39,13 @@ 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 =
{ ... }:
{
virtualisation = {
forwardPorts = [
{
from = "host";
host.port = 13022;
guest.port = 22;
}
];
};
services.openssh = {
enable = true;
};
Expand Down
19 changes: 11 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,15 +4,15 @@ 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;
postgresqlWithExtension =
postgresql:
let
majorVersion = lib.versions.major postgresql.version;
pkg = pkgs.buildEnv {
pkg = pkgs.pkgsLinux.buildEnv {
name = "postgresql-${majorVersion}-${pname}";
paths = [
postgresql
Expand All @@ -27,7 +27,7 @@ let
withJIT = pkg;
withoutJIT = pkg;
};
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
pathsToLink = [
"/"
"/bin"
Expand All @@ -41,18 +41,21 @@ 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, ... }:
{
services.postgresql = {
enable = true;
package = (postgresqlWithExtension psql_15);
package = psql_15;
settings = (installedExtension "15").defaultSettings or { };
};

Expand Down
28 changes: 10 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,15 +4,15 @@ 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;
postgresqlWithExtension =
postgresql:
let
majorVersion = lib.versions.major postgresql.version;
pkg = pkgs.buildEnv {
pkg = pkgs.pkgsLinux.buildEnv {
name = "postgresql-${majorVersion}-${pname}";
paths = [
postgresql
Expand All @@ -27,7 +27,7 @@ let
withJIT = pkg;
withoutJIT = pkg;
};
nativeBuildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
pathsToLink = [
"/"
"/bin"
Expand All @@ -42,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.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
Expand All @@ -86,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
);
};

Expand All @@ -103,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
Expand Down
Loading
Loading