Skip to content

fix: nixos tests #2037

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

Closed
samrose wants to merge 1 commit into from
Closed

fix: nixos tests #2037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 10 additions & 9 deletions nix/ext/tests/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ self, pkgs }:
let
linuxPkgs = if pkgs.stdenv.isLinux then pkgs else pkgs.pkgsLinux;
testsDir = ./.;
testFiles = builtins.attrNames (builtins.readDir testsDir);
nixFiles = builtins.filter (
Expand All @@ -16,7 +17,7 @@ let

installedExtension =
postgresMajorVersion:
self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${
self.legacyPackages.${linuxPkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${
pname
}";
versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
Expand All @@ -25,15 +26,15 @@ let
let
majorVersion =
if postgresql.isOrioleDB then "orioledb-17" else lib.versions.major postgresql.version;
pkg = pkgs.pkgsLinux.buildEnv {
pkg = linuxPkgs.buildEnv {
name = "postgresql-${majorVersion}-${pname}";
paths = [
postgresql
postgresql.lib
(installedExtension majorVersion)
]
++ lib.optional (postgresql.isOrioleDB
) self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.psql_orioledb-17.exts.orioledb;
) self.legacyPackages.${linuxPkgs.stdenv.hostPlatform.system}.psql_orioledb-17.exts.orioledb;
passthru = {
inherit (postgresql) version psqlSchema;
lib = pkg;
Expand All @@ -42,7 +43,7 @@ let
withoutJIT = pkg;
installedExtensions = [ (installedExtension majorVersion) ];
};
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
nativeBuildInputs = [ linuxPkgs.makeWrapper ];
pathsToLink = [
"/"
"/bin"
Expand All @@ -58,13 +59,13 @@ let
pkg;
psql_15 =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_15;
psql_17 =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_17;
orioledb_17 =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_orioledb-17;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_orioledb-17;
in
pkgs.testers.runNixOSTest {
name = pname;
Expand Down Expand Up @@ -148,7 +149,7 @@ let
services.postgresql = {
package = lib.mkForce (
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_orioledb-17
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_orioledb-17
);
settings = lib.mkForce (
((installedExtension "17").defaultSettings or { })
Expand Down Expand Up @@ -186,7 +187,7 @@ let
let
newPostgresql =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_orioledb-17;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_orioledb-17;
in
''
if [[ -z "${newPostgresql.psqlSchema}" ]]; then
Expand Down
29 changes: 15 additions & 14 deletions nix/ext/tests/http.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{ self, pkgs }:
let
linuxPkgs = if pkgs.stdenv.isLinux then pkgs else pkgs.pkgsLinux;
pname = "http";
inherit (pkgs) lib;
mockServer = ../../tests/http-mock-server.py;
installedExtension =
postgresMajorVersion:
self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${
self.legacyPackages.${linuxPkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${
pname
}";
versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
Expand All @@ -14,15 +15,15 @@ let
let
majorVersion =
if postgresql.isOrioleDB then "orioledb-17" else lib.versions.major postgresql.version;
pkg = pkgs.pkgsLinux.buildEnv {
pkg = linuxPkgs.buildEnv {
name = "postgresql-${majorVersion}-${pname}";
paths = [
postgresql
postgresql.lib
(installedExtension majorVersion)
]
++ lib.optional (postgresql.isOrioleDB
) self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.psql_orioledb-17.exts.orioledb;
) self.legacyPackages.${linuxPkgs.stdenv.hostPlatform.system}.psql_orioledb-17.exts.orioledb;
passthru = {
inherit (postgresql) version psqlSchema;
installedExtensions = [ (installedExtension majorVersion) ];
Expand All @@ -31,7 +32,7 @@ let
withJIT = pkg;
withoutJIT = pkg;
};
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
nativeBuildInputs = [ linuxPkgs.makeWrapper ];
pathsToLink = [
"/"
"/bin"
Expand All @@ -47,13 +48,13 @@ let
pkg;
psql_15 =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_15;
psql_17 =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_17;
orioledb_17 =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_orioledb-17;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_orioledb-17;
in
pkgs.testers.runNixOSTest {
name = pname;
Expand All @@ -68,7 +69,7 @@ pkgs.testers.runNixOSTest {
enable = true;
package =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_15;
settings = (installedExtension "15").defaultSettings or { };
authentication = ''
local all postgres peer map=postgres
Expand Down Expand Up @@ -108,7 +109,7 @@ pkgs.testers.runNixOSTest {
mkdir -p /tmp

# Start the mock server
exec ${pkgs.pkgsLinux.python3}/bin/python3 ${mockServer}
exec ${linuxPkgs.python3}/bin/python3 ${mockServer}
'';
};

Expand All @@ -119,7 +120,7 @@ pkgs.testers.runNixOSTest {
specialisation.postgresql17.configuration = {
services.postgresql = {
package = lib.mkForce (
postgresqlWithExtension self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17
postgresqlWithExtension self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_17
);
settings = ((installedExtension "17").defaultSettings or { });
};
Expand All @@ -137,10 +138,10 @@ pkgs.testers.runNixOSTest {
let
oldPostgresql =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_15;
newPostgresql =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17;
self.packages.${linuxPkgs.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 All @@ -166,7 +167,7 @@ pkgs.testers.runNixOSTest {
services.postgresql = {
package = lib.mkForce (
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_orioledb-17
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_orioledb-17
);
settings = lib.mkForce (
((installedExtension "17").defaultSettings or { })
Expand Down Expand Up @@ -207,7 +208,7 @@ pkgs.testers.runNixOSTest {
let
newPostgresql =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_orioledb-17;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_orioledb-17;
in
''
if [[ -z "${newPostgresql.psqlSchema}" ]]; then
Expand Down
19 changes: 10 additions & 9 deletions nix/ext/tests/index_advisor.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
{ self, pkgs }:
let
linuxPkgs = if pkgs.stdenv.isLinux then pkgs else pkgs.pkgsLinux;
pname = "index_advisor";
inherit (pkgs) lib;
installedExtension =
postgresMajorVersion:
self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts.index_advisor;
self.legacyPackages.${linuxPkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts.index_advisor;
versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
postgresqlWithExtension =
postgresql:
let
majorVersion =
if postgresql.isOrioleDB then "orioledb-17" else lib.versions.major postgresql.version;
pkg = pkgs.pkgsLinux.buildEnv {
pkg = linuxPkgs.buildEnv {
name = "postgresql-${majorVersion}-${pname}";
paths = [
postgresql
postgresql.lib
(installedExtension majorVersion)
]
++ lib.optional (postgresql.isOrioleDB
) self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.psql_orioledb-17.exts.orioledb;
) self.legacyPackages.${linuxPkgs.stdenv.hostPlatform.system}.psql_orioledb-17.exts.orioledb;
passthru = {
inherit (postgresql) version psqlSchema;
installedExtensions = [ (installedExtension majorVersion) ];
Expand All @@ -28,7 +29,7 @@ let
withJIT = pkg;
withoutJIT = pkg;
};
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
nativeBuildInputs = [ linuxPkgs.makeWrapper ];
pathsToLink = [
"/"
"/bin"
Expand All @@ -44,13 +45,13 @@ let
pkg;
psql_15 =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_15;
psql_17 =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_17;
orioledb_17 =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_orioledb-17;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_orioledb-17;
in
pkgs.testers.runNixOSTest {
name = pname;
Expand Down Expand Up @@ -128,7 +129,7 @@ pkgs.testers.runNixOSTest {
services.postgresql = {
package = lib.mkForce (
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_orioledb-17
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_orioledb-17
);
settings = lib.mkForce (
((installedExtension "17").defaultSettings or { })
Expand Down Expand Up @@ -166,7 +167,7 @@ pkgs.testers.runNixOSTest {
let
newPostgresql =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_orioledb-17;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_orioledb-17;
in
''
if [[ -z "${newPostgresql.psqlSchema}" ]]; then
Expand Down
11 changes: 6 additions & 5 deletions nix/ext/tests/orioledb.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
{ self, pkgs }:
let
linuxPkgs = if pkgs.stdenv.isLinux then pkgs else pkgs.pkgsLinux;
pname = "orioledb";
inherit (pkgs) lib;
postgresqlWithExtension =
postgresql:
let
majorVersion = lib.versions.major postgresql.version;
pkg = pkgs.pkgsLinux.buildEnv {
pkg = linuxPkgs.buildEnv {
name = "postgresql-${majorVersion}-${pname}";
paths = [
postgresql
postgresql.lib
(self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_orioledb-17".exts.orioledb)
(self.legacyPackages.${linuxPkgs.stdenv.hostPlatform.system}."psql_orioledb-17".exts.orioledb)
];
passthru = {
inherit (postgresql) version psqlSchema;
installedExtensions = [
(self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_orioledb-17".exts.orioledb)
(self.legacyPackages.${linuxPkgs.stdenv.hostPlatform.system}."psql_orioledb-17".exts.orioledb)
];
lib = pkg;
withPackages = _: pkg;
withJIT = pkg;
withoutJIT = pkg;
};
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
nativeBuildInputs = [ linuxPkgs.makeWrapper ];
pathsToLink = [
"/"
"/bin"
Expand All @@ -39,7 +40,7 @@ let
pkg;
psql_orioledb =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_orioledb-17;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_orioledb-17;
in
pkgs.testers.runNixOSTest {
name = pname;
Expand Down
11 changes: 6 additions & 5 deletions nix/ext/tests/pg_plan_filter.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
{ self, pkgs }:
let
linuxPkgs = if pkgs.stdenv.isLinux then pkgs else pkgs.pkgsLinux;
pname = "plan_filter";
inherit (pkgs) lib;
installedExtension =
postgresMajorVersion:
self.legacyPackages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${
self.legacyPackages.${linuxPkgs.stdenv.hostPlatform.system}."psql_${postgresMajorVersion}".exts."${
pname
}";
versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
postgresqlWithExtension =
postgresql:
let
majorVersion = lib.versions.major postgresql.version;
pkg = pkgs.pkgsLinux.buildEnv {
pkg = linuxPkgs.buildEnv {
name = "postgresql-${majorVersion}-${pname}";
paths = [
postgresql
Expand All @@ -27,7 +28,7 @@ let
withJIT = pkg;
withoutJIT = pkg;
};
nativeBuildInputs = [ pkgs.pkgsLinux.makeWrapper ];
nativeBuildInputs = [ linuxPkgs.makeWrapper ];
pathsToLink = [
"/"
"/bin"
Expand All @@ -43,10 +44,10 @@ let
pkg;
psql_15 =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_15;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_15;
psql_17 =
postgresqlWithExtension
self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17;
self.packages.${linuxPkgs.stdenv.hostPlatform.system}.postgresql_17;
in
pkgs.testers.runNixOSTest {
name = pname;
Expand Down
Loading
Loading