From be4883e2181a7f9e1513be091ea573f9f2411c81 Mon Sep 17 00:00:00 2001 From: Joerie de Gram Date: Sat, 11 Dec 2021 20:02:15 +0100 Subject: [PATCH 01/13] zap: 2.11.0 -> 2.11.1 Fixes CVE-2021-44228 #150288 --- pkgs/tools/networking/zap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 69c5f165b276..8fdf8a38f317 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zap"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz"; - sha256 = "sha256-wr64T3+ps5r2V72z4NDbqWQlJX6kjg6LIu7szY1VaB4="; + sha256 = "0b1qqrjm4m76djy0az9hnz3rqpz1qkql4faqmi7gkx33b1p6d0sz"; }; buildInputs = [ jre ]; From e6217908a39e5d61366141913798d9fa59974bf6 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 11 Dec 2021 22:43:02 +0100 Subject: [PATCH 02/13] nixos/glusterfs: remove syslog.target from services --- nixos/modules/services/network-filesystems/glusterfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index bc8be05ca8cb..38be098de5d9 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -187,7 +187,7 @@ in wantedBy = [ "multi-user.target" ]; - after = [ "syslog.target" "network.target" ]; + after = [ "network.target" ]; preStart = '' install -m 0755 -d /var/log/glusterfs From 50a74117b6acc19e09b1ddafd32ed0f196be5fed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Dec 2021 21:51:10 +0000 Subject: [PATCH 03/13] cargo-cache: 0.6.3 -> 0.7.0 --- pkgs/development/tools/rust/cargo-cache/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index 12d9bd6bb036..62c9f9b97e55 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cache"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "matthiaskrgr"; repo = pname; rev = version; - sha256 = "sha256-y6rvdY9511XScxLWPrH9aUFgSmRYmGqKE56MPBTH9OM="; + sha256 = "sha256-MPU+hmYfmWftVEkdT/sZx9ESgCPTb7m4lEnYf5bOSYU="; }; - cargoSha256 = "sha256-H6MBAXrKu4hZwx3lGHN6YMuYzeb21Zq0tVlF/lsQmLI="; + cargoSha256 = "sha256-6Ffgg5/B1IFnTlSjzhAsnhxz8jBcgk01RIkwgLqlsvc="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From 0fe8586f433bf411cbcd2a4997ac23b05d8b9776 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 11 Dec 2021 23:13:36 +0100 Subject: [PATCH 04/13] glusterfs: 9.4 -> 10.0 --- pkgs/tools/filesystems/glusterfs/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 90148cbf2a45..b0524e9bc68a 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,8 +1,8 @@ -{lib, stdenv, fetchFromGitHub, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline, +{lib, stdenv, fetchFromGitHub, fuse, bison, flex, openssl, python3, ncurses, readline, autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite, liburcu, liburing, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, - rsync, glibc, rpcsvc-proto, libtirpc + rsync, glibc, rpcsvc-proto, libtirpc, gperftools }: let # NOTE: On each glusterfs release, it should be checked if gluster added @@ -14,9 +14,9 @@ let # can help with finding new Python scripts. buildInputs = [ - fuse bison flex_2_5_35 openssl ncurses readline + fuse bison flex openssl ncurses readline autoconf automake libtool pkg-config zlib libaio libxml2 - acl sqlite liburcu attr makeWrapper util-linux libtirpc + acl sqlite liburcu attr makeWrapper util-linux libtirpc gperftools liburing (python3.withPackages (pkgs: [ pkgs.flask @@ -55,13 +55,13 @@ let ]; in stdenv.mkDerivation rec { pname = "glusterfs"; - version = "9.4"; + version = "10.0"; src = fetchFromGitHub { owner = "gluster"; repo = pname; rev = "v${version}"; - sha256 = "0ybs0dm7jskmfnmbg5fj8wi2aapbrwn4gbrx8ix6d8dzcl3pv78k"; + sha256 = "sha256-n6HdXs5kLbEI8Gaw2KBtO3i8hhadb+MsshUve/DOYg0="; }; inherit buildInputs propagatedBuildInputs; From 445638d3ecdc239e62d78cfee776a01753d03e11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Dec 2021 23:43:31 +0100 Subject: [PATCH 05/13] gdu: 5.12.0 -> 5.12.1 --- pkgs/tools/system/gdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index e70e82261595..a771e3967c80 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.12.0"; + version = "5.12.1"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GcipzV6TgJLXY5RgzFssaInBFIFORKr6wcZB6fD16OY="; + sha256 = "sha256-pXHMNyebUkHEZvUWtDkyp5Fqk07GA5sd+254fls8PjU="; }; vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac"; From 6fab6f5665ffcd9afe70178dd7ea4ec0167bdb7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Dec 2021 23:50:31 +0100 Subject: [PATCH 06/13] dnsrecon: 0.10.1 -> 1.0.0 --- pkgs/tools/security/dnsrecon/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 6fa2041de3c0..e3fe955eb9f1 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -5,19 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "0.10.1"; + version = "1.0.0"; + format = "other"; src = fetchFromGitHub { owner = "darkoperator"; repo = pname; rev = version; - sha256 = "1ysf8wx287psfk89r0i2vgnrjvxdj44s6nhf6sva59jbwvr9lghy"; + sha256 = "sha256-VRO5ugr/+iZh+hh3tVs/JNAr7GXao/HK43O3FlkbcSM="; }; - format = "other"; - - pythonPath = with python3.pkgs; [ - dnspython netaddr lxml + propagatedBuildInputs = with python3.pkgs; [ + dnspython + netaddr + lxml ]; postPatch = '' @@ -36,11 +37,11 @@ python3.pkgs.buildPythonApplication rec { runHook postInstall ''; + meta = with lib; { - description = "DNS Enumeration Script"; + description = "DNS Enumeration script"; homepage = "https://github.com/darkoperator/dnsrecon"; license = licenses.gpl2Only; - platforms = platforms.all; maintainers = with maintainers; [ c0bw3b fab ]; }; } From cda7cc96039ce70b3bf1896f08c1b5a5a422a92b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Dec 2021 23:30:26 +0000 Subject: [PATCH 07/13] armadillo: 10.6.2 -> 10.7.4 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 6e9f67a9a33c..839a59edfe74 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.6.2"; + version = "10.7.4"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-KoA9b4921AfbnBXtw4lJZSOMjliflMyQeoNz7pRXKKg="; + sha256 = "sha256-LBsyxbJZsF40vC3N4cq1ic/LtYF5xyqTxdquoeOVBlI="; }; nativeBuildInputs = [ cmake ]; From 212182edf594a3374b89a117e4893db95a6a6723 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 04:51:30 +0000 Subject: [PATCH 08/13] python38Packages.deezer-python: 4.2.0 -> 4.2.1 --- pkgs/development/python-modules/deezer-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index ee47645ddc73..cb3afb644252 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "4.2.0"; + version = "4.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "0wljf3ri8jcg4df6m61k8s5nm9rncwa8c46pfv901bc737kyslpl"; + sha256 = "0gl0l7x9zqfkz3l4jfz8rb956lqj3vx1aghric36izwzl6wyj6h5"; }; nativeBuildInputs = [ From 31fd88293b0b04d75f3872907d686d737bb376af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 05:46:19 +0000 Subject: [PATCH 09/13] xsnow: 3.3.2 -> 3.3.6 --- pkgs/games/xsnow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index 416dc319aa1e..ee7cbd8fb48d 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xsnow"; - version = "3.3.2"; + version = "3.3.6"; src = fetchurl { url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz"; - sha256 = "sha256-S9pyoDehOUr6Q/PjqH3/tkiyYpn6kHkYnuOQ3FhL44I="; + sha256 = "sha256-rTJO1btS1VBHatj9Yr2R6vZBUPQtCB1Aa6AD6IzwuLg="; }; nativeBuildInputs = [ pkg-config ]; From e06f742bebd4e125bc6f2426cc5b2c51a2b7b42a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 06:12:38 +0000 Subject: [PATCH 10/13] cinnamon.xviewer: 3.2.1 -> 3.2.2 --- pkgs/desktops/cinnamon/xviewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index 7b89ab2d5ab8..e8fb0f1f5c99 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-9SUpJ76s3gf1852xnJh3Sz6SeuKhcGHtv+woiXztCS4="; + sha256 = "sha256-FFRms4yh7TQ/O3ee7igeIslimSWLhue3BE1xCrJ3NQ4="; }; nativeBuildInputs = [ From f552127eb37b00c58b5271f3e0c16d9c2fa12b85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 09:29:14 +0000 Subject: [PATCH 11/13] python38Packages.casbin: 1.13.0 -> 1.15.0 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index ed78e73db71f..944136840f63 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.13.0"; + version = "1.15.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "1qraxp0nij5412pvz9lvysb38px551arl29q06pd0z6rg1d8gdkx"; + sha256 = "05jg8qm0ix02qvcjqcfalp15j22hzlf9wfdnhrll57bnwgk4kkf8"; }; propagatedBuildInputs = [ From c4dbe8fe65a04a282585811665caec1361e5fe51 Mon Sep 17 00:00:00 2001 From: Andreas Schmid Date: Sat, 11 Dec 2021 18:24:32 +0100 Subject: [PATCH 12/13] colima: init at 0.2.2 `colima` is a very easy usable replacement for Docker Desktop on MacOS. Signed-off-by: Andreas Schmid --- .../virtualization/colima/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/virtualization/colima/default.nix diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix new file mode 100644 index 000000000000..92e190168cf1 --- /dev/null +++ b/pkgs/applications/virtualization/colima/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, lima +, makeWrapper +}: + +buildGoModule rec { + pname = "colima"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "abiosoft"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-vWNkYsT2XF+oMOQ3pb1+/a207js8B+EmVanRQrYE/2A="; + }; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; + + vendorSha256 = "sha256-F1ym88JrJWzsBg89Y1ufH4oefIRBwTGOw72BrjtpvBw="; + + postInstall = '' + wrapProgram $out/bin/colima \ + --prefix PATH : ${lib.makeBinPath [ lima ]} + + installShellCompletion --cmd colima \ + --bash <($out/bin/colima completion bash) \ + --fish <($out/bin/colima completion fish) \ + --zsh <($out/bin/colima completion zsh) + ''; + + meta = with lib; { + description = "Container runtimes on MacOS with minimal setup"; + homepage = "https://github.com/abiosoft/colima"; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ aaschmid ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab718ee80159..8b40f026c9d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32479,6 +32479,8 @@ with pkgs; idsk = callPackage ../tools/filesystems/idsk { }; + colima = callPackage ../applications/virtualization/colima {}; + lima = callPackage ../applications/virtualization/lima {}; logtop = callPackage ../tools/misc/logtop { }; From 91c6a97243711446471fc8a576cb9d21f516641f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 12 Dec 2021 12:13:03 +1000 Subject: [PATCH 13/13] kubernetes: disable rbac tests timed out on hydra --- nixos/tests/kubernetes/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/tests/kubernetes/default.nix b/nixos/tests/kubernetes/default.nix index 90b73c68a76d..97931234fcc7 100644 --- a/nixos/tests/kubernetes/default.nix +++ b/nixos/tests/kubernetes/default.nix @@ -10,6 +10,8 @@ in { dns-single-node = dns.singlenode.test; dns-multi-node = dns.multinode.test; - rbac-single-node = rbac.singlenode.test; - rbac-multi-node = rbac.multinode.test; + # timed out: https://hydra.nixos.org/build/160710933 + #rbac-single-node = rbac.singlenode.test; + # timed out: https://hydra.nixos.org/build/160711286 + #rbac-multi-node = rbac.multinode.test; }