public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2021-01-10 15:50:49 +01:00
parent add2d89082 9f8b7cb4a8
commit 0c42bb5027
57 changed files with 2595 additions and 1404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/conftest/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "conftest";
version = "0.22.0";
version = "0.23.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "conftest";
rev = "v${version}";
sha256 = "1mjfb39h6z8dbrqxlvrvnzid7la6wj709kx7dva4126i84cmpyf1";
sha256 = "sha256-mSiZjpsFZfkM522f1WcJgBexiBS0o3uf1g94pjhgGVU=";
};
vendorSha256 = "08c4brwvjp9f7cpzywxns6dkhl3jzq9ckyvphm2jnm2kxmkawbbn";
vendorSha256 = "sha256-iCIuEvwkbfBZ858yZZyVf5om6YLsGKRvzFmYzJBrRf4=";
doCheck = false;

9
pkgs/development/tools/misc/cflow/default.nix
View File

@@ -45,13 +45,6 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.vrthra ];
/* On Darwin, build fails with:
Undefined symbols:
"_argp_program_version", referenced from:
_argp_program_version$non_lazy_ptr in libcflow.a(argp-parse.o)
ld: symbol(s) not found
*/
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
};
}