From ecce7d87aa83b0475371bf95a70046faa3406d55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 00:50:38 +0000 Subject: [PATCH 1/7] samba: 4.15.1 -> 4.15.2 (cherry picked from commit 39d9d22eec7504a90bffb5438552525ee63cea53) --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 47d2c4b4d409..2001ae005271 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -45,11 +45,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.15.1"; + version = "4.15.2"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-oYEfu0EQ1klp9sEI+NFh4sPiDd9HVSmj0yvZS7dFnwA="; + sha256 = "sha256-YoHXxqjEn3mQqfJJpmeEs1GA/iSVV+8RR82KbRZqIRM="; }; outputs = [ "out" "dev" "man" ]; From 7210e7ba343d07b0824d0338d06195cfdbaf4730 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 14:40:15 +0000 Subject: [PATCH 2/7] samba: 4.15.2 -> 4.15.3 (cherry picked from commit 886235de96e2bdd5d29bd1b7bff9f7358c7ff329) --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 2001ae005271..f70c33156c3a 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -45,11 +45,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.15.2"; + version = "4.15.3"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-YoHXxqjEn3mQqfJJpmeEs1GA/iSVV+8RR82KbRZqIRM="; + sha256 = "sha256-UZOZQEORVQNFhGdo6k3Q/n/LBOIMK4kbXusC5VVBN9s="; }; outputs = [ "out" "dev" "man" ]; From 579045162b7c8fa57184d2c4175801b511f371b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 10:05:11 +0000 Subject: [PATCH 3/7] phoronix-test-suite: 10.2.2 -> 10.6.1 (cherry picked from commit 713096b520169c4031552161db46c6fda1a99042) --- pkgs/tools/misc/phoronix-test-suite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index f0f20d4b3a7b..e0375e2349e3 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.2.2"; + version = "10.6.1"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-g5hUmsn01Msopxzmi/G4LcZISXMD2wFqreaHMkFzF1Y="; + sha256 = "sha256-ixDMd9/tO793yVvIE60n5gytfDAmcuA631/ZON9v6LA="; }; buildInputs = [ php ]; From aaef22612f7413397908ba171fc54fe8c6fc5bc5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Jan 2022 07:04:38 -0800 Subject: [PATCH 4/7] phoronix-test-suite: 10.6.1 -> 10.8.0 Fix CVE-2022-0157 (cherry picked from commit 9ef985aa84f1c2b1da55a8a3ab341182c79c34eb) --- pkgs/tools/misc/phoronix-test-suite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index e0375e2349e3..edf61ddf6b40 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.6.1"; + version = "10.8.0"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-ixDMd9/tO793yVvIE60n5gytfDAmcuA631/ZON9v6LA="; + sha256 = "sha256-HvyMkafW2QdSlizWkOsv9U8VSN9Y9Z3F1jt1PwF9nuo="; }; buildInputs = [ php ]; From b4c00b506181146a3afe97cb5992e498ad2eeed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 24 Jan 2022 15:51:36 +0100 Subject: [PATCH 5/7] libreswan: Fix ExecStopPost paths (cherry picked from commit 3fb41650985708c483cc1470a7a3122c36b71405) --- pkgs/tools/networking/libreswan/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 6062b1ecfff5..4df0471bbd8d 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -14,6 +14,7 @@ , curl , nspr , bash +, runtimeShell , iproute2 , iptables , procps @@ -71,8 +72,9 @@ stdenv.mkDerivation rec { prePatch = '' # Correct iproute2 and iptables path - sed -e 's|/sbin/ip|${iproute2}/bin/ip|' \ + sed -e 's|/sbin/ip|${iproute2}/bin/ip|g' \ -e 's|/sbin/\(ip6\?tables\)|${iptables}/bin/\1|' \ + -e 's|/bin/bash|${runtimeShell}|g' \ -i initsystems/systemd/ipsec.service.in \ programs/barf/barf.in \ programs/verify/verify.in From 2d3f43bd97ab69825c768eed7f34b88f873a7466 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Mon, 24 Jan 2022 02:13:00 +0100 Subject: [PATCH 6/7] nixos/nginx: Add defaultListenAddresses option Lets you specify the default listen address if none are listed in the vhost configuration. Useful for hosts with more than one ip (cherry picked from commit ab7e6995ac9df61ceac5188a0ec499e4eb3a825b) --- .../services/web-servers/nginx/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 96e45cfc4f77..6416400ce431 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -245,12 +245,9 @@ let defaultListen = if vhost.listen != [] then vhost.listen else - let addrs = if vhost.listenAddresses != [] then vhost.listenAddresses else ( - [ "0.0.0.0" ] ++ optional enableIPv6 "[::0]" - ); - in - optionals (hasSSL || vhost.rejectSSL) (map (addr: { inherit addr; port = 443; ssl = true; }) addrs) - ++ optionals (!onlySSL) (map (addr: { inherit addr; port = 80; ssl = false; }) addrs); + let addrs = if vhost.listenAddresses != [] then vhost.listenAddresses else cfg.defaultListenAddresses; + in optionals (hasSSL || vhost.rejectSSL) (map (addr: { inherit addr; port = 443; ssl = true; }) addrs) + ++ optionals (!onlySSL) (map (addr: { inherit addr; port = 80; ssl = false; }) addrs); hostListen = if vhost.forceSSL @@ -427,6 +424,16 @@ in "; }; + defaultListenAddresses = mkOption { + type = types.listOf types.str; + default = [ "0.0.0.0" ] ++ optional enableIPv6 "[::0]"; + defaultText = literalExpression ''[ "0.0.0.0" ] ++ lib.optional config.networking.enableIPv6 "[::0]"''; + example = literalExpression ''[ "10.0.0.12" "[2002:a00:1::]" ]''; + description = " + If vhosts do not specify listenAddresses, use these addresses by default. + "; + }; + package = mkOption { default = pkgs.nginxStable; defaultText = literalExpression "pkgs.nginxStable"; From 003c9cad16fe1b7fba47faaca20783263f9c4818 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Jan 2022 15:35:04 +0100 Subject: [PATCH 7/7] irods: Don't use builtins.nixVersion The value of builtins.nixVersion should never be used except to bail out if it's too old. It causes the evaluation result to depend on the version of Nix, so e.g. the binary cache doesn't work. (cherry picked from commit 5762b8c8a5bfd7fdc7a8e8eaf95d41f687882b08) --- pkgs/tools/filesystems/irods/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index 87bb2b9051ce..fa80e024e3db 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -17,7 +17,7 @@ "-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=${cppzmq}" "-DIRODS_EXTERNALS_FULLPATH_CATCH2=${catch2}" "-DIRODS_LINUX_DISTRIBUTION_NAME=nix" - "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=${builtins.nixVersion}" + "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=1.0" "-DCPACK_GENERATOR=TGZ" "-DCMAKE_CXX_FLAGS=-I${lib.getDev libcxx}/include/c++/v1" ];