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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-01-28 10:48:36 +01:00
parent 6f1095b0ba dce0ca29d9
commit cdff57e1fc
887 changed files with 18829 additions and 16536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/admin/acme.sh/default.nix
View File

@@ -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 ];

20
pkgs/tools/admin/ansible/default.nix
View File

@@ -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";

8
pkgs/tools/admin/nomachine-client/default.nix
View File

@@ -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}";

18
pkgs/tools/admin/procs/default.nix
View File

@@ -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";

5
pkgs/tools/admin/sewer/default.nix
View File

@@ -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;
};
}

8
pkgs/tools/admin/vncdo/default.nix
View File

@@ -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";