From 3821fa47216362b1f3cff233fb522d32a48dec81 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 5 Jun 2022 12:11:50 +0200 Subject: [PATCH 1/2] argocd: 2.1.6 -> 2.1.15 Fixes CVE-2022-29165, CVE-2022-24904, CVE-2022-24905, CVE-2022-1025 and CVE-2022-24348. https://github.com/argoproj/argo-cd/releases/tag/v2.1.15 https://github.com/argoproj/argo-cd/releases/tag/v2.1.14 https://github.com/argoproj/argo-cd/releases/tag/v2.1.13 https://github.com/argoproj/argo-cd/releases/tag/v2.1.12 https://github.com/argoproj/argo-cd/releases/tag/v2.1.11 https://github.com/argoproj/argo-cd/releases/tag/v2.1.10 https://github.com/argoproj/argo-cd/releases/tag/v2.1.9 https://github.com/argoproj/argo-cd/releases/tag/v2.1.8 https://github.com/argoproj/argo-cd/releases/tag/v2.1.7 --- pkgs/applications/networking/cluster/argocd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 38b6467857b8..3466cc3ffabc 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "argocd"; - version = "2.1.6"; - commit = "a346cf933e10d872eae26bff8e58c5e7ac40db25"; + version = "2.1.15"; + commit = "52f917a18165416baa418822daae36c5f011e91f"; tag = "v${version}"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "sha256-8DeVO7Wr1bFZXTp2kaEPizDwNU5ZsA1fykccaDUivh8="; + sha256 = "sha256-23Jq/J4rsMImpIODiB9dS79LcbotSFZK+VSfG+AIDP4="; }; - vendorSha256 = "sha256-N45yRlBGZ/c9ve2YPcWA26pylV8hzxjPh6evKtkgnoc="; + vendorSha256 = "sha256-CkLHnrfEfPZtJp8XbyvgFgSNO88DVzF3cizfRbprR5g="; nativeBuildInputs = [ packr makeWrapper installShellFiles ]; From fd7ddfc4f5e14af1922b8f7134e1546443086edc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 5 Jun 2022 17:59:27 +0200 Subject: [PATCH 2/2] python3Packages.black: disable test on aarch64-linux This test reproducibly triggers the max open files limit on our aarch64 hydra builders. Disable it for now to make tests work again but this can't be the final solution. https://hydra.nixos.org/build/179001754 (cherry picked from commit 3fcf9f18ddfdbf108b371637410821b6f388ef67) --- pkgs/development/python-modules/black/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index ea4fb0b4a74d..366a107572d2 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -57,6 +57,9 @@ buildPythonPackage rec { # Fail on Hydra, see https://github.com/NixOS/nixpkgs/pull/130785 "test_bpo_2142_workaround" "test_skip_magic_trailing_comma" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # exceeds max open files on hydra builders + "test_blackd_supported_version" ]; propagatedBuildInputs = [