From 82dc05c26db339c935fe5bf604518e8cee36c10e Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 6 Nov 2024 17:07:39 +0800 Subject: [PATCH 1/3] hickory-dns: nixfmt --- pkgs/by-name/hi/hickory-dns/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index cf6226089097..3f7baed6e978 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -1,8 +1,9 @@ -{ lib -, fetchFromGitHub -, openssl -, pkg-config -, rustPlatform +{ + lib, + fetchFromGitHub, + openssl, + pkg-config, + rustPlatform, }: rustPlatform.buildRustPackage rec { @@ -28,7 +29,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://hickory-dns.org/"; maintainers = with maintainers; [ colinsane ]; platforms = platforms.linux; - license = with licenses; [ asl20 mit ]; + license = with licenses; [ + asl20 + mit + ]; mainProgram = "hickory-dns"; }; } From 319f3c98a7f9df80f42db2c4ab1ba38d5867b7f3 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 6 Nov 2024 17:08:24 +0800 Subject: [PATCH 2/3] hickory-dns: add passthru.updateScript --- pkgs/by-name/hi/hickory-dns/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index 3f7baed6e978..b7c331f78181 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -4,6 +4,7 @@ openssl, pkg-config, rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -24,12 +25,14 @@ rustPlatform.buildRustPackage rec { # tests expect internet connectivity to query real nameservers like 8.8.8.8 doCheck = false; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Rust based DNS client, server, and resolver"; homepage = "https://hickory-dns.org/"; - maintainers = with maintainers; [ colinsane ]; - platforms = platforms.linux; - license = with licenses; [ + maintainers = with lib.maintainers; [ colinsane ]; + platforms = lib.platforms.linux; + license = with lib.licenses; [ asl20 mit ]; From 28623f8163ac1e1ff8fa527bd7b9d1bce46b8b1c Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 6 Nov 2024 17:18:02 +0800 Subject: [PATCH 3/3] hickory-dns: 0.24.0 -> 0.25.0-alpha.2 --- pkgs/by-name/hi/hickory-dns/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index b7c331f78181..3c53faa42521 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -9,15 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "hickory-dns"; - version = "0.24.1"; + version = "0.25.0-alpha.2"; src = fetchFromGitHub { owner = "hickory-dns"; repo = "hickory-dns"; - rev = "v${version}"; - hash = "sha256-szq21RuRmkhAfHlzhGQYpwjiIRkavFCPETOt+6TxhP4="; + rev = "refs/tags/v${version}"; + hash = "sha256-bEVApMM6/I3nF1lyRhd+7YtZuSAwiozRkMorRLhLOBY="; }; - cargoHash = "sha256-LcMjHHEuDlhSfDXGIrSMXewraSxEgRw2g2DOoH4i5RU="; + + cargoHash = "sha256-Rq4l1iV70nlhBaJ02hc+dmNZ/Q7qrHoF0Kp0MTmu22A="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ];