aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/tools/admin
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/admin')
-rw-r--r--nixpkgs/pkgs/tools/admin/acme.sh/default.nix4
-rw-r--r--nixpkgs/pkgs/tools/admin/ansible/default.nix20
-rw-r--r--nixpkgs/pkgs/tools/admin/azure-cli/default.nix4
-rw-r--r--nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix4
-rw-r--r--nixpkgs/pkgs/tools/admin/eksctl/default.nix6
-rw-r--r--nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix5
-rw-r--r--nixpkgs/pkgs/tools/admin/lego/default.nix10
-rw-r--r--nixpkgs/pkgs/tools/admin/nomachine-client/default.nix8
-rw-r--r--nixpkgs/pkgs/tools/admin/procs/default.nix18
-rw-r--r--nixpkgs/pkgs/tools/admin/sewer/default.nix5
-rw-r--r--nixpkgs/pkgs/tools/admin/vncdo/default.nix8
11 files changed, 49 insertions, 43 deletions
diff --git a/nixpkgs/pkgs/tools/admin/acme.sh/default.nix b/nixpkgs/pkgs/tools/admin/acme.sh/default.nix
index cdf58bc0215..25a92f1117b 100644
--- a/nixpkgs/pkgs/tools/admin/acme.sh/default.nix
+++ b/nixpkgs/pkgs/tools/admin/acme.sh/default.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }:
stdenv.mkDerivation rec {
pname = "acme.sh";
- version = "2.8.3";
+ version = "2.8.5";
src = fetchFromGitHub {
owner = "Neilpang";
repo = "acme.sh";
rev = version;
- sha256 = "0j9wn61jd107fq9ww79399s7adql0vf897s0xavlvv6chq8a6ajj";
+ sha256 = "0yxhfdb0jz0wn10ka6c79qvcx07656vsaxmjls8qgcfgc472ymhs";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/nixpkgs/pkgs/tools/admin/ansible/default.nix b/nixpkgs/pkgs/tools/admin/ansible/default.nix
index 5b724fb0bf9..7dde0e4764c 100644
--- a/nixpkgs/pkgs/tools/admin/ansible/default.nix
+++ b/nixpkgs/pkgs/tools/admin/ansible/default.nix
@@ -1,11 +1,21 @@
{ python3Packages, fetchurl }:
-{
- ansible = with python3Packages; toPythonApplication ansible;
+rec {
+ ansible = ansible_2_8;
- ansible_2_8 = with python3Packages; toPythonApplication ansible;
+ ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible;
- ansible_2_7 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
+ ansible_2_8 = with python3Packages; toPythonApplication (python3Packages.ansible.overrideAttrs(old: rec {
+ pname = "ansible";
+ version = "2.8.7";
+
+ src = fetchurl {
+ url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
+ sha256 = "0iy90kqxs52nspfkhj1y7z4zf017jfm5qhdb01d8d4jd5g53k0l2";
+ };
+ }));
+
+ ansible_2_7 = with python3Packages; toPythonApplication (ansible.overrideAttrs(old: rec {
pname = "ansible";
version = "2.7.15";
@@ -15,7 +25,7 @@
};
}));
- ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
+ ansible_2_6 = with python3Packages; toPythonApplication (ansible.overrideAttrs(old: rec {
pname = "ansible";
version = "2.6.20";
diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix
index 1a492c41aee..cc793f8300d 100644
--- a/nixpkgs/pkgs/tools/admin/azure-cli/default.nix
+++ b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix
@@ -1,12 +1,12 @@
{ stdenv, lib, python, fetchFromGitHub, installShellFiles }:
let
- version = "2.0.79";
+ version = "2.0.80";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
- sha256 = "0fzpq5fnqxkjghsjk4hi3jng5lgywpvj3fzb5sb7nb7ymvkvhad2";
+ sha256 = "05j74cfxjpi3w79w0i5av3h2m81bavbsc581vvh773ixivndds1k";
};
# put packages that needs to be overriden in the py package scope
diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix
index ac0e633cb96..290800e4226 100644
--- a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -207,8 +207,8 @@ let
azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.52.0" "zip"
"0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn";
- azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "7.0.0" "zip"
- "01f17fb1myskj72zarc67i1sxfvk66lid9zn12gwjrz2vqc6npkz";
+ azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "7.1.0" "zip"
+ "03yjvw1dwkwsadsv60i625mr9zpdryy7ywvh7p8fg60djszh1p5l";
azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.2.0" "zip"
"1bcq6fcgrsvmk6q7v8mxzn1180jm2qijdqkqbv1m117zp1wj5gxj";
diff --git a/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix
index e5fcf3933eb..89c8e2866e4 100644
--- a/nixpkgs/pkgs/tools/admin/eksctl/default.nix
+++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.11.1";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "197lf6cb1maam1yxy29wgp4dkakaavmwqvq2d9i4qxhscalrdra5";
+ sha256 = "13kxilsy0fdzg1phzcsxfg53flzx3xk6c5jyygggajp45aysbyra";
};
- modSha256 = "04ba3dyfwlf0m6kn7yp7qyp3h2qdwp17y1f9pa79y3c6sd2nadk2";
+ modSha256 = "0g5alqhwna9sd6dp50waqa87af2z3n5pj5mwnb9i2y65g2kclaha";
subPackages = [ "cmd/eksctl" ];
diff --git a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix
index 5e02c8e3483..5bcc25ea989 100644
--- a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -7,7 +7,7 @@
# 3) used by `google-cloud-sdk` only on GCE guests
#
-{ stdenv, lib, fetchurl, makeWrapper, python, with-gce ? false }:
+{ stdenv, lib, fetchurl, makeWrapper, python, openssl, with-gce ? false }:
let
pythonEnv = python.withPackages (p: with p; [
@@ -56,7 +56,8 @@ in stdenv.mkDerivation rec {
binaryPath="$out/bin/$program"
wrapProgram "$programPath" \
--set CLOUDSDK_PYTHON "${pythonEnv}/bin/python" \
- --prefix PYTHONPATH : "${pythonEnv}/${python.sitePackages}"
+ --prefix PYTHONPATH : "${pythonEnv}/${python.sitePackages}" \
+ --prefix PATH : "${openssl.bin}/bin"
mkdir -p $out/bin
ln -s $programPath $binaryPath
diff --git a/nixpkgs/pkgs/tools/admin/lego/default.nix b/nixpkgs/pkgs/tools/admin/lego/default.nix
index fa7c3876a28..48daaa418bb 100644
--- a/nixpkgs/pkgs/tools/admin/lego/default.nix
+++ b/nixpkgs/pkgs/tools/admin/lego/default.nix
@@ -2,18 +2,22 @@
buildGoModule rec {
pname = "lego";
- version = "3.2.0";
+ version = "3.3.0";
src = fetchFromGitHub {
owner = "go-acme";
repo = pname;
rev = "v${version}";
- sha256 = "1djvwyjg30f9bj61pf3y2k2w055pj39v0sif4rjqg8cz0j382a2z";
+ sha256 = "135zz5gp5vqqwmz3701n5xfvz9yxzm4m53q3dbj9vfc8xkcxn44n";
};
- modSha256 = "0k3p11cji3p4nzr8aia8hp01wyx1qfx84259dwbfwg1b32ln8rkc";
+ modSha256 = "0jirpfd427317px0fd630bmi3li6zc5vihydwmwbj0qsfvhn4qm4";
subPackages = [ "cmd/lego" ];
+ buildFlagsArray = [
+ "-ldflags=-X main.version=${version}"
+ ];
+
meta = with lib; {
description = "Let's Encrypt client and ACME library written in Go";
license = licenses.mit;
diff --git a/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix b/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix
index e8efc7d9cfe..9e93b5f2f75 100644
--- a/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix
+++ b/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix
@@ -1,8 +1,8 @@
{ stdenv, file, fetchurl, makeWrapper,
autoPatchelfHook, jsoncpp, libpulseaudio }:
let
- versionMajor = "6.8";
- versionMinor = "1";
+ versionMajor = "6.9";
+ versionMinor = "2";
versionBuild_x86_64 = "1";
versionBuild_i686 = "1";
in
@@ -14,12 +14,12 @@ in
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz";
- sha256 = "07330sxqjmzdn8kwxn9r49j28lsbp7mmrsxcyl8r32c3g355wskl";
+ sha256 = "1z2pcfkzicjma4lxrj4qx43xyml993v7qyjd7k8xy8hw85fwnzii";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz";
- sha256 = "03b2648nzmc2amgrqflsxihx5yjp7rz906g655az4j2hl7y0b0bs";
+ sha256 = "03421s0k91c02ga9k6bdvixw71brlgi13q82cinnfayg3fhb0rb6";
}
else
throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";
diff --git a/nixpkgs/pkgs/tools/admin/procs/default.nix b/nixpkgs/pkgs/tools/admin/procs/default.nix
index 20e9c8b3d47..b1faa129f34 100644
--- a/nixpkgs/pkgs/tools/admin/procs/default.nix
+++ b/nixpkgs/pkgs/tools/admin/procs/default.nix
@@ -1,30 +1,20 @@
-{ stdenv, fetchFromGitHub, rustPlatform, fetchpatch
-, Security
-}:
+{ stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
pname = "procs";
- version = "0.8.16";
+ version = "0.9.2";
src = fetchFromGitHub {
owner = "dalance";
repo = pname;
rev = "v${version}";
- sha256 = "0l4n3gr1sc7wfa21p8yh7idaii0mnfpyqp4cg7f9l4345isy94vq";
+ sha256 = "09n22vyqhqkk9qq91q44l8fi0ks0xyyhsxfsp9pdlnpng9s7hcdg";
};
- cargoSha256 = "03c63dlzvag341n6la1s61ccri1avlprd91m11z9zzjhi9b46kcr";
+ cargoSha256 = "135h7aikwy26p30g4734w08bfab73n49bhljssw516wd62xbdk64";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
- patches = [
- # Fix tests on darwin. Remove with the next release
- (fetchpatch {
- url = "https://github.com/dalance/procs/commit/bb554e247b5b339bc00fa5dd2e771b0d7cb09cd5.patch";
- sha256 = "1szvvifa4pdbgdsmdj5f0zq6qzf1lh6wwc6ipawblfzwmg7d9wvk";
- })
- ];
-
meta = with stdenv.lib; {
description = "A modern replacement for ps written in Rust";
homepage = "https://github.com/dalance/procs";
diff --git a/nixpkgs/pkgs/tools/admin/sewer/default.nix b/nixpkgs/pkgs/tools/admin/sewer/default.nix
index 59edaff5f94..776ba89e48c 100644
--- a/nixpkgs/pkgs/tools/admin/sewer/default.nix
+++ b/nixpkgs/pkgs/tools/admin/sewer/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "sewer";
- version = "0.7.0";
+ version = "0.7.9";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "16j4npqj3fdj3g2z7nqb0cvvxd85xk20g9c43f3q8a1k5psf1fmq";
+ sha256 = "c083223d8aa66d4fc6801452d291a98540d1ee41557ce3e1754c62e73f7c9738";
};
propagatedBuildInputs = with python3Packages; [ pyopenssl requests tldextract ];
@@ -16,6 +16,5 @@ python3Packages.buildPythonApplication rec {
description = "ACME client";
license = licenses.mit;
maintainers = with maintainers; [ kevincox ];
- platforms = platforms.linux;
};
}
diff --git a/nixpkgs/pkgs/tools/admin/vncdo/default.nix b/nixpkgs/pkgs/tools/admin/vncdo/default.nix
index a126a430e52..3dd7a45aa2b 100644
--- a/nixpkgs/pkgs/tools/admin/vncdo/default.nix
+++ b/nixpkgs/pkgs/tools/admin/vncdo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub
-, pythonPackages
+, python2Packages
}:
-pythonPackages.buildPythonPackage {
+python2Packages.buildPythonPackage {
pname = "vncdo";
version = "0.11.2";
@@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage {
sha256 = "0k03b09ipsz8vp362x7sx7z68mxgqw9qzvkii2f8j9vx2y79rjsh";
};
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
pillow
twisted
pexpect
@@ -20,6 +20,8 @@ pythonPackages.buildPythonPackage {
ptyprocess
];
+ doCheck = false;
+
meta = with stdenv.lib; {
homepage = https://github.com/sibson/vncdotool;
description = "A command line VNC client and python library";
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 22:41:39 +0000