Merge branch 'master' into staging

This commit is contained in:
Orivej Desh
2020-03-23 00:53:16 +00:00
802 changed files with 31592 additions and 15462 deletions
+3 -3
View File
@@ -5,7 +5,7 @@ rec {
ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible;
ansible_2_8 = with python3Packages; toPythonApplication (python3Packages.ansible.overrideAttrs(old: rec {
ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
pname = "ansible";
version = "2.8.7";
@@ -15,7 +15,7 @@ rec {
};
}));
ansible_2_7 = with python3Packages; toPythonApplication (ansible.overrideAttrs(old: rec {
ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
pname = "ansible";
version = "2.7.15";
@@ -25,7 +25,7 @@ rec {
};
}));
ansible_2_6 = with python3Packages; toPythonApplication (ansible.overrideAttrs(old: rec {
ansible_2_6 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
pname = "ansible";
version = "2.6.20";
+4 -2
View File
@@ -1,4 +1,4 @@
{ buildGoModule, lib, fetchFromGitHub }:
{ buildGoModule, stdenv, fetchFromGitHub, Security }:
buildGoModule rec {
pname = "aws-vault";
version = "5.3.2";
@@ -13,13 +13,15 @@ buildGoModule rec {
modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9";
subPackages = [ "." ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
# set the version. see: aws-vault's Makefile
buildFlagsArray = ''
-ldflags=
-X main.Version=v${version}
'';
meta = with lib; {
meta = with stdenv.lib; {
description =
"A vault for securely storing and accessing AWS credentials in development environments";
homepage = "https://github.com/99designs/aws-vault";
+4 -2
View File
@@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
buildGoModule rec {
pname = "awsweeper";
@@ -13,7 +13,9 @@ buildGoModule rec {
modSha256 = "14yvf0svh7xqpc2y7xr94pc6r7d3iv2nsr8qs3f5q29hdc5hv3fs";
meta = with lib; {
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "A tool to clean out your AWS account";
homepage = "https://github.com/cloudetc/awsweeper/";
license = licenses.mpl20;
@@ -114,6 +114,9 @@ let
azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip"
"1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g";
azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "1.9.0" "zip"
"0v91hl936wp9sl3bc31svf6kdxwa57qh6ih9rrv43dnb2000km6r";
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip"
"13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd";
+10 -9
View File
@@ -1,22 +1,23 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
buildGoModule rec {
name = "berglas-${version}";
version = "0.5.0";
pname = "berglas";
version = "0.5.1";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "berglas";
rev = "v0.5.0";
sha256 = "1y5w2czipwj069w4zxnyb9xqv5mx0yjjramykf3vm3q478bk3rm7";
repo = pname;
rev = "v${version}";
sha256 = "0y393g36h35zzqyf5b10j6qq2jhvz83j17cmasnv6wbyrb3vnn0n";
};
modSha256 = "0y4ajii3pv25s4gjazf6fl0b9wax17cmwhbmiybqhp61annca7kr";
modSha256 = "0m2bqx102lf6nihdjbl8a08xcwi80rawvh91j1cav0njm9w5vmmm";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "A tool for managing secrets on Google Cloud";
homepage = https://github.com/GoogleCloudPlatform/berglas;
homepage = "https://github.com/GoogleCloudPlatform/berglas";
license = licenses.asl20;
platforms = platforms.unix;
};
+3 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
buildGoModule rec {
pname = "certigo";
@@ -13,6 +13,8 @@ buildGoModule rec {
modSha256 = "1i5n5yh6nvv2i2nm60vqy1gngj8p5w6ma5fcwmp7bl4jxjrzbi83";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "A utility to examine and validate certificates in a variety of formats";
homepage = "https://github.com/square/certigo";
+5 -3
View File
@@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz }:
{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz, Security }:
buildGoModule rec {
pname = "clair";
@@ -13,14 +13,16 @@ buildGoModule rec {
modSha256 = "0rgkrid58kji39nlmiii95r8shbzr6dwalj5m7qwxy5w1rcaljr5";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/clair \
--prefix PATH : "${lib.makeBinPath [ rpm xz ]}"
--prefix PATH : "${stdenv.lib.makeBinPath [ rpm xz ]}"
'';
meta = with lib; {
meta = with stdenv.lib; {
description = "Vulnerability Static Analysis for Containers";
homepage = "https://github.com/quay/clair";
license = licenses.asl20;
+7 -5
View File
@@ -1,17 +1,19 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
buildGoModule rec {
pname = "eksctl";
version = "0.13.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "13kxilsy0fdzg1phzcsxfg53flzx3xk6c5jyygggajp45aysbyra";
sha256 = "1193i30k2m7cibn79xw51i2lxg90f5i97h8sbjiv0hr9g502r2qf";
};
modSha256 = "0g5alqhwna9sd6dp50waqa87af2z3n5pj5mwnb9i2y65g2kclaha";
modSha256 = "0f8dlcp3q84fa5dnnzx4347ngb1raw1mxkcqpz2s3zq6d1kv0nvf";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "cmd/eksctl" ];
@@ -25,7 +27,7 @@ buildGoModule rec {
$out/bin/eksctl completion zsh > "$out/share/zsh/site-functions/_eksctl"
'';
meta = with lib; {
meta = with stdenv.lib; {
description = "A CLI for Amazon EKS";
homepage = "https://github.com/weaveworks/eksctl";
license = licenses.asl20;
+3 -3
View File
@@ -1,11 +1,9 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
buildGoModule rec {
pname = "iamy";
version = "2.3.2";
goPackagePath = "github.com/99designs/iamy";
src = fetchFromGitHub {
owner = "99designs";
repo = "iamy";
@@ -15,6 +13,8 @@ buildGoModule rec {
modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = [''-ldflags=
-X main.Version=v${version} -s -w
''];
+7 -5
View File
@@ -1,24 +1,26 @@
{ lib, fetchFromGitHub, buildGoModule }:
{ stdenv, fetchFromGitHub, buildGoModule, Security }:
buildGoModule rec {
pname = "lego";
version = "3.3.0";
version = "3.5.0";
src = fetchFromGitHub {
owner = "go-acme";
repo = pname;
rev = "v${version}";
sha256 = "135zz5gp5vqqwmz3701n5xfvz9yxzm4m53q3dbj9vfc8xkcxn44n";
sha256 = "08mh2q426gmhcaz578lw08jbxfqb7qm37cd00ap937dymi1zs9qw";
};
modSha256 = "0jirpfd427317px0fd630bmi3li6zc5vihydwmwbj0qsfvhn4qm4";
modSha256 = "10n8pcbmzlnk63gzsjb1xnmjwxfhxsqx8ffpcbwdzq9fc5yvjiii";
subPackages = [ "cmd/lego" ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = [
"-ldflags=-X main.version=${version}"
];
meta = with lib; {
meta = with stdenv.lib; {
description = "Let's Encrypt client and ACME library written in Go";
license = licenses.mit;
homepage = "https://go-acme.github.io/lego/";