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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2020-05-18 21:09:27 +02:00
parent ade7faea72 567f0a3df1
commit 7f40cfd97b
501 changed files with 11984 additions and 6526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,37 +1,27 @@
{ python3Packages, fetchurl }:
rec {
ansible = ansible_2_8;
ansible = ansible_2_9;
ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible;
ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
pname = "ansible";
version = "2.8.11";
version = "2.8.12";
src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "14f1m4jjkicadaz4d1dm8xhj53kdwksf0znmqzaz1fb0dj5slv0m";
sha256 = "091id1da3hlnmf0hwvrhv2r0mnyna3mc6s7rwdg5kll7yfiy4k1a";
};
}));
ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
pname = "ansible";
version = "2.7.17";
version = "2.7.18";
src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "1k2cz4w3r3an37305f40vi93wqixapls9y6ggkf75nbs7z27knwz";
};
}));
ansible_2_6 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
pname = "ansible";
version = "2.6.20";
src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "02ra9q2mifyawn0719y78wrbqzik73aymlzwi90fq71jgyfvkkqn";
sha256 = "0sgshaaqyjq3i035yi5hivmrrwrq05hxrbjrv1w3hfzmvljn41d1";
};
}));
}

4
pkgs/tools/admin/aws-vault/default.nix
View File

@@ -10,7 +10,7 @@ buildGoModule rec {
sha256 = "04dyibcaijv5011laycf39m4gvprvvsn5zkxslyih1kqd170w3wg";
};
modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9";
vendorSha256 = "0jlraq480llamns6yw8yjkzxsndyqiyzy120djni8sw5h0bz65j7";
subPackages = [ "." ];
# set the version. see: aws-vault's Makefile
@@ -26,4 +26,4 @@ buildGoModule rec {
license = licenses.mit;
maintainers = with maintainers; [ zimbatm ];
};
}
}

10
pkgs/tools/admin/awsweeper/default.nix
View File

@@ -1,9 +1,15 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchurl, fetchFromGitHub }:
buildGoModule rec {
pname = "awsweeper";
version = "0.7.0";
# Requires go generate to be run with mockgen, but doesn't check in the results.
patches = fetchurl {
url = "https://raw.githubusercontent.com/c00w/patches/master/awskeeper.patch";
sha256 = "0dz553ffxc37m2iwygrbhxf7pm91hxdriic8a1gjf8q3nyn13npl";
};
src = fetchFromGitHub {
owner = "cloudetc";
repo = pname;
@@ -11,7 +17,7 @@ buildGoModule rec {
sha256 = "1ybrrpnp6rh7rcwihww43cvhfhzzyy51rdk1hwy9ljpkg37k4y28";
};
modSha256 = "07zz6wf9cq3wylihi9fx0rd85iybnq5z5c9gqw1lhpvqcrad4491";
vendorSha256 = "0hnpb1xp135z2qpn1b6xad59739hffhs8dfpr3n5drmrvajpn4xp";
meta = with lib; {
description = "A tool to clean out your AWS account";

4
pkgs/tools/admin/berglas/default.nix
View File

@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0y393g36h35zzqyf5b10j6qq2jhvz83j17cmasnv6wbyrb3vnn0n";
};
modSha256 = "0m2bqx102lf6nihdjbl8a08xcwi80rawvh91j1cav0njm9w5vmmm";
vendorSha256 = null;
meta = with stdenv.lib; {
description = "A tool for managing secrets on Google Cloud";
@@ -19,4 +19,4 @@ buildGoModule rec {
license = licenses.asl20;
platforms = platforms.unix;
};
}
}

4
pkgs/tools/admin/certigo/default.nix
View File

@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0siwbxxzknmbsjy23d0lvh591ngabqhr2g8mip0siwa7c1y7ivv4";
};
modSha256 = "1i5n5yh6nvv2i2nm60vqy1gngj8p5w6ma5fcwmp7bl4jxjrzbi83";
vendorSha256 = "1l6ajfl04rfbssvijgd5jrppmqc5svfrswdx01x007lr8rvdfd94";
meta = with stdenv.lib; {
description = "A utility to examine and validate certificates in a variety of formats";
@@ -19,4 +19,4 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
};
}
}

4
pkgs/tools/admin/clair/default.nix
View File

@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "14dh9iv2g138rivvfk135m3l90kk6c1ln1iqxhbi7s99h1jixbqw";
};
modSha256 = "0rgkrid58kji39nlmiii95r8shbzr6dwalj5m7qwxy5w1rcaljr5";
vendorSha256 = "0x31n50vd8660z816as6kms5dkv87b0mhblccpkvd9cbvcv2n37a";
nativeBuildInputs = [ makeWrapper ];
@@ -26,4 +26,4 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ marsam ];
};
}
}

2
pkgs/tools/admin/eksctl/default.nix
View File

@@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0xlr7hsncih4nzydi6sphp7j7k82cbhmi7jb0sd954i8kzl3sc1q";
};
modSha256 = "0iw5za1fc9hsbc3fhhj3l276064vfdjqsad9c3c54y7b9rjgcqrv";
vendorSha256 = "14d9hl01z7ixp1wa8kp1zs0z1p3pvz6hkp49z582nqllpb2xjmkx";
subPackages = [ "cmd/eksctl" ];

4
pkgs/tools/admin/iamy/default.nix
View File

@@ -13,7 +13,7 @@ buildGoModule rec {
sha256 = "1fypc6yjnhlpk7zhb2lvah2ikh2zji9sll55rqjbr3i4j02h484z";
};
modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl";
vendorSha256 = "0c4g1zr0wl118g41hqri0vwvfin39yvgs214w3spw8ggjcj6bzph";
buildFlagsArray = [''-ldflags=
-X main.Version=v${version} -s -w
@@ -25,4 +25,4 @@ buildGoModule rec {
license = licenses.mit;
maintainers = with maintainers; [ suvash ];
};
}
}

2
pkgs/tools/admin/lego/default.nix
View File

@@ -11,7 +11,7 @@ buildGoModule rec {
hash = "sha256-hjH1TBw6GHYNI9JSBOzdyEtJmp8NhlwNYydGZwsjAg0=";
};
modSha256 = "sha256-+PJRaDdZqVO6D9SXojlr8JXn++pL18HOHFdaiUEalw8=";
vendorSha256 = "14453iiya6algkympyvwm03qgjcwk79z8bbrij7qhnp52qfrbmrp";
subPackages = [ "cmd/lego" ];
buildFlagsArray = [

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

@@ -1,29 +1,35 @@
{ stdenv, file, fetchurl, makeWrapper,
autoPatchelfHook, jsoncpp, libpulseaudio }:
let
versionMajor = "6.9";
versionMinor = "2";
versionMajor = "6.10";
versionMinor = "12";
versionBuild_x86_64 = "1";
versionBuild_i686 = "1";
in
stdenv.mkDerivation rec {
pname = "nomachine-client";
version = "${versionMajor}.${versionMinor}";
src =
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 = "1z2pcfkzicjma4lxrj4qx43xyml993v7qyjd7k8xy8hw85fwnzii";
urls = [
"https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"
"https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"
];
sha256 = "17yb377ry7i7cmkb72xmhyqkfggv1ygqlz55ymvmrs7psbh7ql01";
}
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 = "03421s0k91c02ga9k6bdvixw71brlgi13q82cinnfayg3fhb0rb6";
urls = [
"https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"
"https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"
];
sha256 = "0k6dspmwdkm0zf0c2zqlqy0jya8qgsg90wwv9wa12fn4chp66gqg";
}
else
throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";
postUnpack = ''
mv $(find . -type f -name nxclient.tar.gz) .
mv $(find . -type f -name nxplayer.tar.gz) .
@@ -32,7 +38,7 @@ in
tar xf nxplayer.tar.gz
rm $(find . -maxdepth 1 -type f)
'';
nativeBuildInputs = [ file makeWrapper autoPatchelfHook ];
buildInputs = [ jsoncpp libpulseaudio ];
@@ -50,7 +56,7 @@ in
cp "$i"/* "$out/share/icons/hicolor/$(basename $i)/apps/"
fi
done
mkdir $out/share/applications
cp share/applnk/player/xdg/*.desktop $out/share/applications/
cp share/applnk/client/xdg-mime/*.desktop $out/share/applications/
@@ -62,7 +68,7 @@ in
substituteInPlace "$i" --replace /usr/NX/bin $out/bin
done
'';
postFixup = ''
makeWrapper $out/bin/nxplayer.bin $out/bin/nxplayer --set NX_SYSTEM $out/NX
makeWrapper $out/bin/nxclient.bin $out/bin/nxclient --set NX_SYSTEM $out/NX
@@ -71,7 +77,7 @@ in
# have a DT_NEEDED entry for it.
patchelf --add-needed libpulse.so.0 $out/NX/lib/libnxcau.so
'';
dontBuild = true;
dontStrip = true;
@@ -87,4 +93,4 @@ in
platforms = [ "x86_64-linux" "i686-linux" ];
};
}