From 51d632bcd15c9e57345cc7ee7d4bd55b326b028c Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 29 May 2022 22:19:32 +0200 Subject: [PATCH] packages/kerberized-{bind,dig,dnsutils}: drop as included upstream --- modules/autopatch/default.nix | 4 ---- packages/patched-derivations.nix | 7 ------- 2 files changed, 11 deletions(-) diff --git a/modules/autopatch/default.nix b/modules/autopatch/default.nix index dadb80c..b7970d0 100644 --- a/modules/autopatch/default.nix +++ b/modules/autopatch/default.nix @@ -17,10 +17,6 @@ jre_headless = patched.jre17_standard; - } // lib.optionalAttrs config.krb5.enable { - bind = patched.kerberized-bind; - dnsutils = patched.kerberized-dnsutils; - dig = patched.kerberized-dig; }) ) ]; diff --git a/packages/patched-derivations.nix b/packages/patched-derivations.nix index f2736a0..cb87b77 100644 --- a/packages/patched-derivations.nix +++ b/packages/patched-derivations.nix @@ -1,13 +1,6 @@ let tools = import ./lib/tools.nix; in with tools; super: rec { - kerberized-bind = super.bind.overrideAttrs (attrs: { - configureFlags = attrs.configureFlags ++ [ "--with-gssapi=${super.krb5.dev}" ]; - buildInputs = attrs.buildInputs ++ [ super.krb5 ]; - }); - kerberized-dnsutils = kerberized-bind.dnsutils; - kerberized-dig = kerberized-bind.dnsutils; - hydra = (patch super.hydra-unstable "patches/base/hydra").override { nix = super.nix_2_4; }; lain-ipfs = patch-rename (super.ipfs_latest or super.ipfs) "lain-ipfs" "patches/base/ipfs";