From 2cdec00dd200991b2f4c517695896d6159fe3bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Nov 2020 13:46:28 +0100 Subject: [PATCH 1/7] nixos/tinc: add reload command --- nixos/modules/services/networking/tinc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 725bd9bf940..b4b544a2413 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -168,6 +168,7 @@ in Type = "simple"; Restart = "always"; RestartSec = "3"; + ExecReload = mkIf (versionAtLeast (getVersion data.package) "1.1pre") "${data.package}/bin/tinc -n ${network} reload"; ExecStart = "${data.package}/bin/tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}"; }; preStart = '' From f341fd2fe081402d1f4d18f4a11f9f383db921ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 12 Dec 2020 07:38:39 +0100 Subject: [PATCH 2/7] tinc: add myself as maintainer --- pkgs/tools/networking/tinc/pre.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 85cdd19702f..a49ab43e55e 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { homepage="http://www.tinc-vpn.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz lassulus ]; + maintainers = with maintainers; [ fpletz lassulus mic92 ]; }; } From a65f621ce293597f7a3a99004cea9701588c6d18 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 12 Dec 2020 08:51:10 +0000 Subject: [PATCH 3/7] kubernetes-helm: 3.4.1 -> 3.4.2 --- pkgs/applications/networking/cluster/helm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 86d1fd1383c..1cb7a257ecc 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "helm"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "13w0s11319qg9mmmxc24mlj0hrp0r529p3ny4gfzsl0vn3qzd6i2"; + sha256 = "17bb0f2w0qn6zq5isskckwqlscqig2d6pra3f7mfwilnckg1lj9s"; }; - vendorSha256 = "0x3dcvnrl7cs8faaiq9ybfgg0lkac5ppf61i724cja270nmpmazl"; + vendorSha256 = "0ycp0i26rf3c96i4nqcbh7rb6i6lk62hljcsgsjyggq3pj3gpb4x"; doCheck = false; From 00d0fe5bf82897407891f91241fa6788e37e462c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 12 Dec 2020 10:13:12 +0100 Subject: [PATCH 4/7] monero: 0.17.1.5 -> 0.17.1.6 --- pkgs/applications/blockchains/monero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 2978d65e2ef..51dedba969b 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.5"; + version = "0.17.1.6"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0yy9n2qng02j314h8fh5n0mcy6vpdks0yk4d8ifn8hj03f3g2c8b"; + sha256 = "0b6zyr3mzqvcxf48i2g45gr649x6nhppik5598jsvg0z7i2hxb9q"; fetchSubmodules = true; }; From 76bab4e9a7da6cf11000bb897641abce364b4446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 12 Dec 2020 12:01:05 +0100 Subject: [PATCH 5/7] intel-gmmlib: remove myself as maintainer I currently do not have any Intel GPUs hooked up to displays, so it is hard to verify changes. --- pkgs/development/libraries/intel-gmmlib/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 8d9a323fa49..30d572853cf 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation rec { license = licenses.mit; description = "Intel Graphics Memory Management Library"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ danieldk ]; }; } From aa38540423e82e819b048f932eefc78ac6e6a0c2 Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Sat, 12 Dec 2020 15:23:04 +0000 Subject: [PATCH 6/7] nixos/sd-image: explicit reference to the gawk package The `awk` command is not installed in the standard env. So this command fails if the `awk` command is not installed by some external module. --- nixos/modules/installer/cd-dvd/sd-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index c8c5a46dfb8..b811ae07eb0 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -223,7 +223,7 @@ in # Figure out device names for the boot device and root filesystem. rootPart=$(${pkgs.util-linux}/bin/findmnt -n -o SOURCE /) bootDevice=$(lsblk -npo PKNAME $rootPart) - partNum=$(lsblk -npo MAJ:MIN $rootPart | awk -F: '{print $2}') + partNum=$(lsblk -npo MAJ:MIN $rootPart | ${pkgs.gawk}/bin/awk -F: '{print $2}') # Resize the root partition and the filesystem to fit the disk echo ",+," | sfdisk -N$partNum --no-reread $bootDevice From 540ada8419f75d1f5cf3ac4adde16f0a46832255 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 12 Dec 2020 16:57:19 +0100 Subject: [PATCH 7/7] html-proofer: 3.17.4 -> 3.18.0 --- pkgs/tools/misc/html-proofer/Gemfile.lock | 2 +- pkgs/tools/misc/html-proofer/gemset.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index 9c42a2c0a9f..01b135dbf87 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -6,7 +6,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) ffi (1.13.1) - html-proofer (3.17.4) + html-proofer (3.18.0) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index d4c9a5367db..13f3aed7337 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wjwr7c19dr7rai44ypqghbakgav91h9swg88cddn7rxf7a6vl3b"; + sha256 = "1icjr9hg8gk1dsy9gnhffkamh4d8yfkmqa4kfzdpbnvr50qvfmwz"; type = "gem"; }; - version = "3.17.4"; + version = "3.18.0"; }; mercenary = { groups = ["default"];