From dec961382c44dce1aa70d15431ce468cf681fb76 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 23 Mar 2025 16:55:00 +0100 Subject: [PATCH] postgresqlTestHook: mark as broken for darwin Due to: https://github.com/NixOS/nix/issues/12548 https://git.lix.systems/lix-project/lix/issues/691 --- pkgs/by-name/po/postgresqlTestHook/package.nix | 8 +++++++- pkgs/tools/admin/pgadmin/default.nix | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/postgresqlTestHook/package.nix b/pkgs/by-name/po/postgresqlTestHook/package.nix index e9e77b0bbe6f..89da82df502e 100644 --- a/pkgs/by-name/po/postgresqlTestHook/package.nix +++ b/pkgs/by-name/po/postgresqlTestHook/package.nix @@ -1,8 +1,14 @@ -{ callPackage, makeSetupHook }: +{ + callPackage, + makeSetupHook, + stdenv, +}: makeSetupHook { name = "postgresql-test-hook"; passthru.tests = { simple = callPackage ./test.nix { }; }; + # See comment in postgresql's generic.nix doInstallCheck section. + meta.broken = stdenv.hostPlatform.isDarwin; } ./postgresql-test-hook.sh diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index ff81bde603f5..f011182a154e 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -219,7 +219,7 @@ pythonPackages.buildPythonApplication rec { ]; # sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495 - doCheck = postgresql.doCheck; + doCheck = !postgresqlTestHook.meta.broken; checkPhase = '' runHook preCheck