From 27ba2136a0df7fb44ad4af9c583423d2b1e91afa Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 17 Jan 2026 03:06:55 +0100 Subject: [PATCH] {krb5,heimdal}: move to pkgs/by-name this shouldn't create any rebuilds --- .../he/heimdal}/0001-Define-HAVE_DB_185_H.patch | 0 .../he/heimdal}/0001-Include-db.h-for-nbdb-compat-mode.patch | 0 .../he/heimdal}/0001-Link-tests-with-libresolv.patch | 0 .../kerberos/heimdal.nix => by-name/he/heimdal/package.nix} | 0 .../kerberos/krb5.nix => by-name/kr/krb5/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 5 ----- 6 files changed, 2 insertions(+), 7 deletions(-) rename pkgs/{development/libraries/kerberos => by-name/he/heimdal}/0001-Define-HAVE_DB_185_H.patch (100%) rename pkgs/{development/libraries/kerberos => by-name/he/heimdal}/0001-Include-db.h-for-nbdb-compat-mode.patch (100%) rename pkgs/{development/libraries/kerberos => by-name/he/heimdal}/0001-Link-tests-with-libresolv.patch (100%) rename pkgs/{development/libraries/kerberos/heimdal.nix => by-name/he/heimdal/package.nix} (100%) rename pkgs/{development/libraries/kerberos/krb5.nix => by-name/kr/krb5/package.nix} (98%) diff --git a/pkgs/development/libraries/kerberos/0001-Define-HAVE_DB_185_H.patch b/pkgs/by-name/he/heimdal/0001-Define-HAVE_DB_185_H.patch similarity index 100% rename from pkgs/development/libraries/kerberos/0001-Define-HAVE_DB_185_H.patch rename to pkgs/by-name/he/heimdal/0001-Define-HAVE_DB_185_H.patch diff --git a/pkgs/development/libraries/kerberos/0001-Include-db.h-for-nbdb-compat-mode.patch b/pkgs/by-name/he/heimdal/0001-Include-db.h-for-nbdb-compat-mode.patch similarity index 100% rename from pkgs/development/libraries/kerberos/0001-Include-db.h-for-nbdb-compat-mode.patch rename to pkgs/by-name/he/heimdal/0001-Include-db.h-for-nbdb-compat-mode.patch diff --git a/pkgs/development/libraries/kerberos/0001-Link-tests-with-libresolv.patch b/pkgs/by-name/he/heimdal/0001-Link-tests-with-libresolv.patch similarity index 100% rename from pkgs/development/libraries/kerberos/0001-Link-tests-with-libresolv.patch rename to pkgs/by-name/he/heimdal/0001-Link-tests-with-libresolv.patch diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/by-name/he/heimdal/package.nix similarity index 100% rename from pkgs/development/libraries/kerberos/heimdal.nix rename to pkgs/by-name/he/heimdal/package.nix diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/by-name/kr/krb5/package.nix similarity index 98% rename from pkgs/development/libraries/kerberos/krb5.nix rename to pkgs/by-name/kr/krb5/package.nix index 3891c13bb5b8..c4f6ac9b8ac9 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/by-name/kr/krb5/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, fetchpatch, - bootstrap_cmds, + darwin, byacc, # can also use bison, but byacc has fewer dependencies keyutils, openssl, @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { pkg-config ] # Provides the mig command used by the build scripts - ++ lib.optional stdenv.hostPlatform.isDarwin bootstrap_cmds; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.bootstrap_cmds; buildInputs = [ openssl diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89123821970c..5bc82192bba4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7016,8 +7016,6 @@ with pkgs; hamlib = hamlib_3; - heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; - harfbuzzFull = harfbuzz.override { withGraphite2 = true; withIcu = true; @@ -7128,9 +7126,6 @@ with pkgs; gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3; }; - krb5 = callPackage ../development/libraries/kerberos/krb5.nix { - inherit (buildPackages.darwin) bootstrap_cmds; - }; libkrb5 = krb5; # TODO(de11n) Try to make krb5 reuse libkrb5 as a dependency l-smash = callPackage ../development/libraries/l-smash {