From 2acfa0a50a81586047024508bba2d20c275c5b27 Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 31 Dec 2025 10:15:51 +0100 Subject: [PATCH] dogdns: drop --- pkgs/by-name/do/dogdns/openssl3-support.patch | 130 ------------------ pkgs/by-name/do/dogdns/package.nix | 70 ---------- pkgs/by-name/do/dogdns/remove-date-info.patch | 11 -- pkgs/top-level/aliases.nix | 1 + 4 files changed, 1 insertion(+), 211 deletions(-) delete mode 100644 pkgs/by-name/do/dogdns/openssl3-support.patch delete mode 100644 pkgs/by-name/do/dogdns/package.nix delete mode 100644 pkgs/by-name/do/dogdns/remove-date-info.patch diff --git a/pkgs/by-name/do/dogdns/openssl3-support.patch b/pkgs/by-name/do/dogdns/openssl3-support.patch deleted file mode 100644 index f9d124420f17..000000000000 --- a/pkgs/by-name/do/dogdns/openssl3-support.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index b5fe1bb..5d1d055 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,5 +1,7 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. -+version = 4 -+ - [[package]] - name = "addr2line" - version = "0.14.1" -@@ -67,6 +69,12 @@ version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -+[[package]] -+name = "bitflags" -+version = "2.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" -+ - [[package]] - name = "bumpalo" - version = "3.7.0" -@@ -81,9 +89,12 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - - [[package]] - name = "cc" --version = "1.0.67" -+version = "1.2.23" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" -+checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766" -+dependencies = [ -+ "shlex", -+] - - [[package]] - name = "cfg-if" -@@ -390,18 +401,30 @@ checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" - - [[package]] - name = "openssl" --version = "0.10.33" -+version = "0.10.68" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577" -+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" - dependencies = [ -- "bitflags", -+ "bitflags 2.9.1", - "cfg-if", - "foreign-types", - "libc", - "once_cell", -+ "openssl-macros", - "openssl-sys", - ] - -+[[package]] -+name = "openssl-macros" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ - [[package]] - name = "openssl-probe" - version = "0.1.2" -@@ -410,20 +433,19 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" - - [[package]] - name = "openssl-src" --version = "111.15.0+1.1.1k" -+version = "300.5.0+3.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a" -+checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f" - dependencies = [ - "cc", - ] - - [[package]] - name = "openssl-sys" --version = "0.9.61" -+version = "0.9.108" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f" -+checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847" - dependencies = [ -- "autocfg", - "cc", - "libc", - "openssl-src", -@@ -534,7 +556,7 @@ version = "0.2.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" - dependencies = [ -- "bitflags", -+ "bitflags 1.2.1", - ] - - [[package]] -@@ -612,7 +634,7 @@ version = "2.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84" - dependencies = [ -- "bitflags", -+ "bitflags 1.2.1", - "core-foundation", - "core-foundation-sys", - "libc", -@@ -660,6 +682,12 @@ dependencies = [ - "serde", - ] - -+[[package]] -+name = "shlex" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -+ - [[package]] - name = "socket2" - version = "0.3.19" diff --git a/pkgs/by-name/do/dogdns/package.nix b/pkgs/by-name/do/dogdns/package.nix deleted file mode 100644 index 5601dfee0957..000000000000 --- a/pkgs/by-name/do/dogdns/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - installShellFiles, - stdenv, - pkg-config, - openssl, - just, - pandoc, -}: - -rustPlatform.buildRustPackage { - pname = "dogdns"; - version = "unstable-2021-10-07"; - - src = fetchFromGitHub { - owner = "ogham"; - repo = "dog"; - rev = "721440b12ef01a812abe5dc6ced69af6e221fad5"; - sha256 = "sha256-y3T0vXg7631FZ4bzcbQjz3Buui/DFxh9LG8BZWwynp0="; - }; - - cargoPatches = [ - # update Cargo.lock to work with openssl 3 - ./openssl3-support.patch - ]; - - cargoHash = "sha256-UY7+AhsVw/p+FDfzJWj9A6VRntceIDCWzJ5Zim8euAE="; - - patches = [ - # remove date info to make the build reproducible - # remove commit hash to avoid dependency on git and the need to keep `.git` - ./remove-date-info.patch - ]; - - nativeBuildInputs = [ - installShellFiles - just - pandoc - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; - - outputs = [ - "out" - "man" - ]; - - dontUseJustBuild = true; - dontUseJustCheck = true; - dontUseJustInstall = true; - - postBuild = '' - just man - ''; - - postInstall = '' - installShellCompletion completions/dog.{bash,fish,zsh} - installManPage ./target/man/*.1 - ''; - - meta = { - description = "Command-line DNS client"; - homepage = "https://dns.lookup.dog"; - license = lib.licenses.eupl12; - maintainers = [ lib.maintainers.matthiasbeyer ]; - mainProgram = "dog"; - }; -} diff --git a/pkgs/by-name/do/dogdns/remove-date-info.patch b/pkgs/by-name/do/dogdns/remove-date-info.patch deleted file mode 100644 index 539559a3911e..000000000000 --- a/pkgs/by-name/do/dogdns/remove-date-info.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/build.rs -+++ b/build.rs -@@ -34,7 +34,7 @@ fn main() -> io::Result<()> { - format!("{}\nv{} \\1;31m(pre-release debug build!)\\0m\n\\1;4;34m{}\\0m", tagline, version_string(), url) - } - else if is_development_version() { -- format!("{}\nv{} [{}] built on {} \\1;31m(pre-release!)\\0m\n\\1;4;34m{}\\0m", tagline, version_string(), git_hash(), build_date(), url) -+ format!("{}\nv{} [nixpkgs] \\1;31m(pre-release!)\\0m\n\\1;4;34m{}\\0m", tagline, version_string(), url) - } - else { - format!("{}\nv{}\n\\1;4;34m{}\\0m", tagline, version_string(), url) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 181e875e7708..ddb498019bb5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -532,6 +532,7 @@ mapAliases { docker_26 = throw "'docker_26' has been removed because it has been unmaintained since February 2025. Use docker_28 or newer instead."; # Added 2025-06-21 docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15 dockerfile-language-server-nodejs = warnAlias "'dockerfile-language-server-nodejs' has been renamed to 'dockerfile-language-server'" dockerfile-language-server; # Added 2025-09-12 + dogdns = throw "'dogdns' has been removed as it is unmaintained upstream and vendors insecure dependencies. Consider switching to 'doggo', a similar tool."; # Added 2025-12-31 dolphin-emu-beta = throw "'dolphin-emu-beta' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2025-10-27 dontRecurseIntoAttrs = warnAlias "dontRecurseIntoAttrs has been removed from pkgs, use `lib.dontRecurseIntoAttrs` instead" lib.dontRecurseIntoAttrs; # Added 2025-10-30 dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11