diff options
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r-- | pkgs/tools/admin/ansible/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/admin/aws-vault/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/admin/awsweeper/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/admin/azure-cli/python-packages.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/admin/berglas/default.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/admin/certigo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/admin/clair/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/admin/eksctl/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/admin/iamy/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/admin/lego/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/admin/ssh-import-id/default.nix | 36 |
11 files changed, 85 insertions, 33 deletions
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 7dde0e4764c6..4af031118693 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -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"; diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 48a1de61cd80..3e145f732362 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -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"; diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index 661747c2fd0d..1ea54953701d 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -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; diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 2ac74a16edd1..7b43ba209c2a 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -119,6 +119,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"; diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index aaca67baa165..d088184f7a17 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -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; }; diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index 5474cb254298..89c6b8996fa3 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -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"; diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 3f4d00736ad9..a12b8abe1206 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -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; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 89c8e2866e49..c700e4f397c7 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -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; diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index e09cd2f52853..6a1ec948d907 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -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 '']; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 48daaa418bb4..0cb614c12d1f 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -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/"; diff --git a/pkgs/tools/admin/ssh-import-id/default.nix b/pkgs/tools/admin/ssh-import-id/default.nix new file mode 100644 index 000000000000..77d30e56d5fc --- /dev/null +++ b/pkgs/tools/admin/ssh-import-id/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, stdenv +, fetchgit +, requests +, makeWrapper +, extraHandlers ? [] +}: + +buildPythonPackage rec { + pname = "ssh-import-id"; + version = "5.8"; + + src = fetchgit { + url = "https://git.launchpad.net/ssh-import-id"; + rev = version; + sha256 = "0l9gya1hyf2qfidlmvg2cgfils1fp9rn5r8sihwvx4qfsfp5yaak"; + }; + + propagatedBuildInputs = [ + requests + ] ++ extraHandlers; + + nativeBuildInputs = [ + makeWrapper + ]; + + # handlers require main bin, main bin requires handlers + makeWrapperArgs = [ "--prefix" ":" "$out/bin" ]; + + meta = with stdenv.lib; { + description = "Retrieves an SSH public key and installs it locally"; + license = licenses.gpl3; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.unix; + }; +} |