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"; }; diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index bbdb98ae495..2b1e94d2c19 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -1,24 +1,34 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: 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.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 = { + inherit (nixosTests) corerad; + }; + meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/corerad"; description = "CoreRAD extensible and observable IPv6 NDP RA daemon";