From fee40ecec28fa451a1552bbcd6f522781ddbb266 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 5 Apr 2025 22:15:48 +0200 Subject: [PATCH 1/2] postgresql: add outputCheck for llvmPackages.llvm.lib This should not leak into the out/lib outputs to keep the closure size small. --- pkgs/servers/sql/postgresql/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 6130db6abb40..4e27f9ea3c70 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -188,6 +188,7 @@ let disallowedRequisites = [ stdenv'.cc llvmPackages.llvm.out + llvmPackages.llvm.lib ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs)); }; @@ -201,6 +202,7 @@ let disallowedRequisites = [ stdenv'.cc llvmPackages.llvm.out + llvmPackages.llvm.lib ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs)); }; From 42e727127fac4a5981d2bddc4984d5aaf7d4560d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 12 Apr 2025 17:31:12 +0200 Subject: [PATCH 2/2] postgresqlJitPackages: move to aliases Those are the same as postgresqlPackages now and we don't want them to show up in CI's rebuild numbers. --- pkgs/top-level/aliases.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4575c28d68b2..12b2b220ef31 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1405,6 +1405,14 @@ mapAliases { postgresql12Packages = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14 postgresql12JitPackages = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14 + # Ever since building with JIT by default, those are the same. + postgresqlJitPackages = postgresqlPackages; # Added 2025-04-12 + postgresql13JitPackages = postgresql13Packages; # Added 2025-04-12 + postgresql14JitPackages = postgresql14Packages; # Added 2025-04-12 + postgresql15JitPackages = postgresql15Packages; # Added 2025-04-12 + postgresql16JitPackages = postgresql16Packages; # Added 2025-04-12 + postgresql17JitPackages = postgresql17Packages; # Added 2025-04-12 + # pinentry was using multiple outputs, this emulates the old interface for i.e. home-manager # soon: throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'"; pinentry = pinentry-all // { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1efad028867e..c54236e4bf00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12451,17 +12451,11 @@ with pkgs; postgresql = postgresql_17; postgresql_jit = postgresql_17_jit; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; - postgresqlJitPackages = recurseIntoAttrs postgresql_jit.pkgs; postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs; postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs; postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs; postgresql16Packages = recurseIntoAttrs postgresql_16.pkgs; postgresql17Packages = recurseIntoAttrs postgresql_17.pkgs; - postgresql13JitPackages = recurseIntoAttrs postgresql_13_jit.pkgs; - postgresql14JitPackages = recurseIntoAttrs postgresql_14_jit.pkgs; - postgresql15JitPackages = recurseIntoAttrs postgresql_15_jit.pkgs; - postgresql16JitPackages = recurseIntoAttrs postgresql_16_jit.pkgs; - postgresql17JitPackages = recurseIntoAttrs postgresql_17_jit.pkgs; postgres-websockets = haskellPackages.postgres-websockets.bin; postgrest = haskellPackages.postgrest.bin;