knot-resolver: rename to knot-resolver_5 and move to by-name

This commit is contained in:
Leona Maroni
2025-12-05 18:04:31 +01:00
parent 88769ebda3
commit 49a51d1c3b
4 changed files with 6 additions and 9 deletions
+2 -2
View File
@@ -71,8 +71,8 @@ in
You can run `kresd-cli 1` and give commands interactively to kresd@1.service.
'';
};
package = lib.mkPackageOption pkgs "knot-resolver" {
example = "knot-resolver.override { extraFeatures = true; }";
package = lib.mkPackageOption pkgs "knot-resolver_5" {
example = "knot-resolver_5.override { extraFeatures = true; }";
};
extraConfig = lib.mkOption {
type = lib.types.lines;
@@ -15,7 +15,7 @@
gnutls,
lmdb,
jemalloc,
systemd,
systemdMinimal,
libcap_ng,
dns-root-data,
nghttp2, # optionals, in principle
@@ -34,7 +34,7 @@ let
lua = luajitPackages;
unwrapped = stdenv.mkDerivation rec {
pname = "knot-resolver";
pname = "knot-resolver_5";
version = "5.7.6";
src = fetchurl {
@@ -96,7 +96,7 @@ let
## the rest are optional dependencies
++ optionals stdenv.hostPlatform.isLinux [
# lib
systemd
systemdMinimal
libcap_ng
]
++ [
+1
View File
@@ -781,6 +781,7 @@ mapAliases {
kgx = throw "'kgx' has been renamed to/replaced by 'gnome-console'"; # Converted to throw 2025-10-27
khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
kmplayer = throw "'kmplayer' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
knot-resolver = warnAlias "'knot-resolver' is currently aliased to 'knot-resolver_5'. This will change with the knot-resolver 6 being declared as stable. Please explicitly use the 'knot-resolver_5' or 'knot-resolver_6' package until then." knot-resolver_5; # Added 2025-11-30
kodiGBM = throw "'kodiGBM' has been renamed to/replaced by 'kodi-gbm'"; # Converted to throw 2025-10-27
kodiPlain = throw "'kodiPlain' has been renamed to/replaced by 'kodi'"; # Converted to throw 2025-10-27
kodiPlainWayland = throw "'kodiPlainWayland' has been renamed to/replaced by 'kodi-wayland'"; # Converted to throw 2025-10-27
-4
View File
@@ -9225,10 +9225,6 @@ with pkgs;
kanidmWithSecretProvisioning_1_8
;
knot-resolver = callPackage ../servers/dns/knot-resolver {
systemd = systemdMinimal; # in closure already anyway
};
leafnode = callPackage ../servers/news/leafnode { };
leafnode1 = callPackage ../servers/news/leafnode/1.nix { };