From 06f6a156af6a30023deeeefc4bb30395873881d6 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Tue, 8 Oct 2024 06:09:38 -0700 Subject: [PATCH 1/4] corerad: 1.3.0 -> 1.3.1 Release notes posted at https://github.com/mdlayher/corerad/releases/tag/v1.3.1 --- pkgs/tools/networking/corerad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 4caad92fc489..fd6fee9a2a7c 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "corerad"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - hash = "sha256-vIKmE9Lq8We7BTMUHIgnOU370ZnNW7YG75WALWdG+4A="; + hash = "sha256-tVK4chDV26vpuTaqVWe498j8ijZN2OOhe97LLE+xK9Y="; }; - vendorHash = "sha256-dsqFleXpL8yAcdigqxJsk/Sxvp9OTqbGK3xDEiHkM8A="; + vendorHash = "sha256-cmfRN7mU99TBtYmCsuHzliYqdfUHzDOFvKbnTZJqhLg="; # Since the tarball pulled from GitHub doesn't contain git tag information, # we fetch the expected tag's timestamp from a file in the root of the From 4e6315a94441bb105c77e162781ec9d585bbe642 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Tue, 8 Oct 2024 06:11:43 -0700 Subject: [PATCH 2/4] corerad: add updateScript --- pkgs/tools/networking/corerad/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index fd6fee9a2a7c..b0a65f59189c 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests, gitUpdater }: buildGoModule rec { pname = "corerad"; @@ -21,8 +21,11 @@ buildGoModule rec { ldflags+=" -X github.com/mdlayher/corerad/internal/build.linkTimestamp=$(<.gittagtime)" ''; - passthru.tests = { - inherit (nixosTests) corerad; + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests = { + inherit (nixosTests) corerad; + }; }; meta = with lib; { From 664765284f883f4f7e38197f1312dc535ce0f702 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Tue, 8 Oct 2024 06:15:33 -0700 Subject: [PATCH 3/4] corerad: move to pkgs/by-name --- .../corerad/default.nix => by-name/co/corerad/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/networking/corerad/default.nix => by-name/co/corerad/package.nix} (100%) diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/by-name/co/corerad/package.nix similarity index 100% rename from pkgs/tools/networking/corerad/default.nix rename to pkgs/by-name/co/corerad/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 787f20384e3c..0901cf3c9535 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25566,8 +25566,6 @@ with pkgs; coredns = callPackage ../servers/dns/coredns { }; - corerad = callPackage ../tools/networking/corerad { }; - cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; cpupower-gui = python3Packages.callPackage ../os-specific/linux/cpupower-gui { From dc0278581562cbcf8fc38e40a2c6e2887c5fa29e Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Tue, 8 Oct 2024 06:15:59 -0700 Subject: [PATCH 4/4] corerad: nixfmt --- pkgs/by-name/co/corerad/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/corerad/package.nix b/pkgs/by-name/co/corerad/package.nix index b0a65f59189c..462cd493e830 100644 --- a/pkgs/by-name/co/corerad/package.nix +++ b/pkgs/by-name/co/corerad/package.nix @@ -1,4 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests, gitUpdater }: +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, + gitUpdater, +}: buildGoModule rec { pname = "corerad"; @@ -32,7 +38,10 @@ buildGoModule rec { homepage = "https://github.com/mdlayher/corerad"; description = "Extensible and observable IPv6 NDP RA daemon"; license = licenses.asl20; - maintainers = with maintainers; [ mdlayher jmbaur ]; + maintainers = with maintainers; [ + mdlayher + jmbaur + ]; platforms = platforms.linux; mainProgram = "corerad"; };