nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-21.11 into staging-21.11

Browse Source
This commit is contained in:
github-actions[bot]
2022-06-07 00:12:27 +00:00
committed by GitHub
parent 6061f9e76f 743e26042d
commit 655a4dcc91
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/cluster/argocd/default.nix
View File

@@ -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 ];

3
pkgs/development/python-modules/black/default.nix
View File

@@ -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 = [