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
2020-08-11 10:26:35 +02:00
parent 19699d691c eac5ef8aa9
commit f707715136
533 changed files with 8751 additions and 1547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/admin/aws-vault/default.nix
+3
View File
@@ -11,6 +11,9 @@ buildGoModule rec {
};
vendorSha256 = "0jlraq480llamns6yw8yjkzxsndyqiyzy120djni8sw5h0bz65j7";
doCheck = false;
subPackages = [ "." ];
# set the version. see: aws-vault's Makefile
pkgs/tools/admin/awscli2/default.nix
+9 -7
View File
@@ -8,12 +8,12 @@ let
py = python3.override {
packageOverrides = self: super: {
botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {
version = "2.0.0dev30";
version = "2.0.0dev40";
src = fetchFromGitHub {
owner = "boto";
repo = "botocore";
rev = "7967b9c5fb027c9962e0876f0110425da88b88f2";
sha256 = "18yn5l1f4nr1pih392qkyidnj7z10bd2cv7yx4qrl7asxxraspr9";
rev = "6b3f96c5e985597053850f0c2761d503d4c18bfe";
sha256 = "1ffx86m3b592kj331800qbcz5f532z8kzf1wmd04i4bfiqvqn4h8";
};
});
prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec {
@@ -29,19 +29,20 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.0.26"; # N.B: if you change this, change botocore to a matching version too
version = "2.0.36"; # N.B: if you change this, change botocore to a matching version too
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
hash = "sha256:1ysmr17gbcj6vs9ywzwgvd9caxwxgg9bnfvvkyks4fii34ji5qq8";
hash = "sha256:05c9lss7jg7bwaij1nxwg50grah68zamcixy8jiw3hpc1vdighql";
};
postPatch = ''
substituteInPlace setup.py --replace ",<0.16" ""
substituteInPlace setup.py --replace "cryptography>=2.8.0,<=2.9.0" "cryptography>=2.8.0"
substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10"
substituteInPlace setup.py --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml>=0.15.0"
substituteInPlace setup.py --replace "wcwidth<0.2.0" "wcwidth"
substituteInPlace setup.py --replace "cryptography>=2.8.0,<=2.9.0" "cryptography>=2.8.0,<2.10"
'';
# No tests included
@@ -52,6 +53,7 @@ with py.pkgs; buildPythonApplication rec {
botocore
colorama
cryptography
distro
docutils
groff
less
pkgs/tools/admin/awsweeper/default.nix
+2
View File
@@ -19,6 +19,8 @@ buildGoModule rec {
vendorSha256 = "0hnpb1xp135z2qpn1b6xad59739hffhs8dfpr3n5drmrvajpn4xp";
doCheck = false;
meta = with lib; {
description = "A tool to clean out your AWS account";
homepage = "https://github.com/cloudetc/awsweeper/";
pkgs/tools/admin/azure-cli/default.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ stdenv, lib, python, fetchFromGitHub, installShellFiles }:
let
version = "2.9.0";
version = "2.10.1";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
sha256 = "0szx2q11b8gk8b300z2zdd9h1jm0dmfzql4f818mar7z5x0li9z3";
sha256 = "03mard9cyffn109c1p0hrdi4cjxbwyk98677qrira9yvy6rw04bg";
};
# put packages that needs to be overriden in the py package scope
pkgs/tools/admin/azure-cli/python-packages.nix
+14 -14
View File
@@ -136,11 +136,11 @@ let
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip"
"13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd";
azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.0.0" "zip"
"0ic3409m5bn5szdzldbcv7xc4i9qd44xmlinjhr42ds2ylw3k6mx";
azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.1.0" "zip"
"1pgxl2gzc1dm7akcqm6fl0y35sb3jdgcz6d7k6vsq93gb3gzrrwv";
azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.4.0" "zip"
"1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5";
azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.5.0" "zip"
"1nh626jg459p9f96glv74dph3vmpybm5cs8rrj1s65kn3m8jf591";
azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.2.0" "zip"
"1khk9jdfx7706xsqpwrnfsplv6p6wracvpyk9ki8zhc7p83kal4k";
@@ -184,8 +184,8 @@ let
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
"1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.8.0" "zip"
"0vbg5mpahrnnnbj80flgzxxiffic94wsc9srm4ir85y2j5rprpv7";
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.11.0" "zip"
"0193y0w5lcrayf8g0sxaj57w52kixdk3x5b8kga5is4pdjq7c6k2";
azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip"
"1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p";
@@ -238,14 +238,14 @@ let
azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.2.0" "zip"
"1r5ww9ndya6sifafrbp4cr5iyyaww2ns7wrbqm6hc6aqxcpf30qq";
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.1.0rc1" "zip"
"00q5723gvc57kg2w1iyhfchp018skwd89ibrw23p7ngm2bb76g45";
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip"
"0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm";
azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc14" "zip"
"0w9hnxvk5pcsa21g3xrr089rfwgldghrbj8akzvh0gchqlzfjg6j";
azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.10.0" "zip"
"0r3l55mhd00zx8sw13d7i9l7r214946s1y3wxcswxad7q5660zfm";
azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.11.0" "zip"
"05jhn66d4sl1qi6w34rqd8wl500jndismiwhdmzzmprdvn1zxqf6";
azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "2.0.1" "zip"
"1wsfkprdrn22mwm24y2zlcms8ppp7jwq3s86r3ymbl29pbaxca8r";
@@ -262,8 +262,8 @@ let
azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip"
"1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2";
azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.5.1" "zip"
"18xfq3n2i1bnai417p3q67f4bikxjcqyg6yp4f06kipx8cz4zfbn";
azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.6.0" "zip"
"004q3d2kj1i1cx3sad1544n3pkindfm255sw19gdlhbw61wn5l5i";
azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec {
version = "0.60.0";
@@ -342,12 +342,12 @@ let
});
knack = super.knack.overridePythonAttrs(oldAttrs: rec {
version = "0.7.1";
version = "0.7.2";
src = super.fetchPypi {
inherit (oldAttrs) pname;
inherit version;
sha256 = "1z50vf0q7kzg3cq9cr24j43ri6wc76dhhklyc9lpvgjf2r061vzw";
sha256 = "1jh81xyri7wb7vqa049imf6dfy3nc501bq3p0miaka8ffvvaxinz";
};
});
pkgs/tools/admin/berglas/default.nix
+2
View File
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = null;
doCheck = false;
meta = with stdenv.lib; {
description = "A tool for managing secrets on Google Cloud";
homepage = "https://github.com/GoogleCloudPlatform/berglas";
pkgs/tools/admin/certigo/default.nix
+2
View File
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "1l6ajfl04rfbssvijgd5jrppmqc5svfrswdx01x007lr8rvdfd94";
doCheck = false;
meta = with stdenv.lib; {
description = "A utility to examine and validate certificates in a variety of formats";
homepage = "https://github.com/square/certigo";
pkgs/tools/admin/clair/default.nix
+2
View File
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "0x31n50vd8660z816as6kms5dkv87b0mhblccpkvd9cbvcv2n37a";
doCheck = false;
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
pkgs/tools/admin/eksctl/default.nix
+2
View File
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "1msid4857wsh4qp1f7nyrmpzjv3sklh49cl7a9c1a3qr9m99w4yb";
doCheck = false;
subPackages = [ "cmd/eksctl" ];
buildFlags = [ "-tags netgo" "-tags release" ];
pkgs/tools/admin/exoscale-cli/default.nix
+6 -5
View File
@@ -1,18 +1,19 @@
{ stdenv, buildGo114Package, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGo114Package rec {
buildGoPackage rec {
pname = "exoscale-cli";
version = "1.15.0";
version = "1.16.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "00cyxy4lidpdf1vvji1nbdlixqxzzpj91gwf0kkdqpr17v562h9m";
sha256 = "0w0lgc3db9r1knd7hp98ycxfbfxbpfrb0vf4vxcqxlvlkjcrvg1z";
};
goPackagePath = "github.com/exoscale/cli";
buildFlags = "-ldflags=-X=main.version=${version}";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ];
# ensures only the cli binary is built and we don't clutter bin/ with submodules
subPackages = [ "." ];
pkgs/tools/admin/iamy/default.nix
+2
View File
@@ -15,6 +15,8 @@ buildGoModule rec {
vendorSha256 = "0c4g1zr0wl118g41hqri0vwvfin39yvgs214w3spw8ggjcj6bzph";
doCheck = false;
buildFlagsArray = [''-ldflags=
-X main.Version=v${version} -s -w
''];
pkgs/tools/admin/lego/default.nix
+3
View File
@@ -12,6 +12,9 @@ buildGoModule rec {
};
vendorSha256 = "14453iiya6algkympyvwm03qgjcwk79z8bbrij7qhnp52qfrbmrp";
doCheck = false;
subPackages = [ "cmd/lego" ];
buildFlagsArray = [