From 16a7ae0d64d1f622ac127128fe2b8e921caa823d Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Wed, 24 Jun 2020 22:08:20 -0400 Subject: [PATCH 1/4] corerad: 0.2.6 -> 0.2.7 Signed-off-by: Matt Layher --- pkgs/tools/networking/corerad/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index bbdb98ae495..1a29e5305e3 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "corerad"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "16rwydvqkzi0jlgwpl3d4f8zd35y4lv4h5xa30ybqmwwp1k5ymf0"; + sha256 = "073hjbwra8ihh11ha5ajqq2r98cc5li4k0xs4p4s055q197zj3aa"; }; - vendorSha256 = "1431fvi9b0id3zhgkxhiampc5avvp998lncyd5l2gn5py3qz6sdl"; + vendorSha256 = "19hp8xqr50v8h9vblihalvkb9ll8c0v4p071j9j1zkbjhnb07rca"; buildFlagsArray = '' -ldflags= - -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1591474872 + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1593050100 -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} ''; From 09f0d65317f1789b2f74eda1891427efccd90e04 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Wed, 24 Jun 2020 22:09:20 -0400 Subject: [PATCH 2/4] nixos/corerad: set systemd unit Type=notify Signed-off-by: Matt Layher --- nixos/modules/services/networking/corerad.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/corerad.nix b/nixos/modules/services/networking/corerad.nix index 5d73c0a0d77..1c414c53a98 100644 --- a/nixos/modules/services/networking/corerad.nix +++ b/nixos/modules/services/networking/corerad.nix @@ -77,6 +77,8 @@ in { AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW"; NoNewPrivileges = true; DynamicUser = true; + Type = "notify"; + NotifyAccess = "main"; ExecStart = "${getBin cfg.package}/bin/corerad -c=${cfg.configFile}"; Restart = "on-failure"; }; From 10f75b2fed07f417bc7051c725ddba3a9293aba8 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Wed, 24 Jun 2020 22:49:27 -0400 Subject: [PATCH 3/4] corerad: add NixOS module test as passthru test Signed-off-by: Matt Layher --- pkgs/tools/networking/corerad/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 1a29e5305e3..85a03e3611b 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "corerad"; @@ -19,6 +19,10 @@ buildGoModule rec { -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} ''; + passthru.tests = { + inherit (nixosTests) corerad; + }; + meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/corerad"; description = "CoreRAD extensible and observable IPv6 NDP RA daemon"; From 477cf953befbed96cff392f5550db58852e3ca21 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Wed, 24 Jun 2020 23:51:22 -0400 Subject: [PATCH 4/4] corerad: set linkTimestamp from file in repository root Signed-off-by: Matt Layher --- pkgs/tools/networking/corerad/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 85a03e3611b..2b1e94d2c19 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -13,10 +13,16 @@ buildGoModule rec { vendorSha256 = "19hp8xqr50v8h9vblihalvkb9ll8c0v4p071j9j1zkbjhnb07rca"; - buildFlagsArray = '' - -ldflags= - -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1593050100 - -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} + # 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 + # repository. + preBuild = '' + buildFlagsArray=( + -ldflags=" + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=$(<.gittagtime) + -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} + " + ) ''; passthru.tests = {