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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-04-06 16:25:41 +02:00
parent 52cd3538ff c04a14edd6
commit 70babe5bcf
485 changed files with 4663 additions and 2031 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/admin/acme.sh/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }:
{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }:
stdenv.mkDerivation rec {
pname = "acme.sh";
version = "2.8.8";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
openssl
curl
dnsutils
(if stdenv.isLinux then iproute else unixtools.netstat)
(if stdenv.isLinux then iproute2 else unixtools.netstat)
]
}"
'';
pkgs/tools/admin/exoscale-cli/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
version = "1.27.0";
version = "1.27.1";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-bKciwcYGETwVdUS4qdByHLWKt16PpBtTvW/dvuclIpA=";
sha256 = "sha256-YaW7rTeVz2Mbnmp6ORsnALlyVxGnf8K73LXN/fmJMLk=";
};
goPackagePath = "github.com/exoscale/cli";
pkgs/tools/admin/fioctl/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fioctl";
version = "0.14.1";
version = "0.15";
src = fetchFromGitHub {
owner = "foundriesio";
repo = "fioctl";
rev = "v${version}";
sha256 = "1jbj2w2s78wcnrwyr80jyc11ipjysv5aab3486kphx8ysvvgcwfs";
sha256 = "0gmh32h9j6wpkdxxg7vj158lsaxq30x7hjsc9gwpip3bff278hw4";
};
vendorSha256 = "1a3x6cv18f0n01f4ac1kprzmby8dphygnwsdl98pmzs3gqqnh284";
vendorSha256 = "170z5a1iwwcpz890nficqnz7rr7yzdxr5jx9pa7s31z17lr8kbz9";
runVend = true;
pkgs/tools/admin/lxd/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl
, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
, squashfsTools, iproute, iptables, ebtables, iptables-nftables-compat, libcap
, squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap
, libco-canonical, dqlite, raft-canonical, sqlite-replication, udev
, writeShellScriptBin, apparmor-profiles, apparmor-parser
, criu
@@ -48,7 +48,7 @@ buildGoPackage rec {
wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath (
networkPkgs
++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute bash criu ]
++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu ]
++ [ (writeShellScriptBin "apparmor_parser" ''
exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@"
'') ]