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

Merge pull request #116335 from SuperSandro2000/move-aliases.nix

Browse Source
This commit is contained in:
Sandro
2021-04-05 04:07:15 +02:00
committed by GitHub
parent 7ffdeb358b f9bcee4ed5
commit 7c932296e0
237 changed files with 1074 additions and 515 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/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' "$@"
'') ]