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

Merge staging into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-05-01 09:28:45 +02:00
parent 2d00e8621e 1825ecc5ed
commit 00bbfccecf
176 changed files with 644 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/admin/docker-credential-helpers/default.nix
View File

@@ -32,11 +32,11 @@ buildGoPackage rec {
installPhase =
if stdenv.isDarwin
then ''
install -Dm755 -t $bin/bin bin/docker-credential-osxkeychain
install -Dm755 -t $out/bin bin/docker-credential-osxkeychain
''
else ''
install -Dm755 -t $bin/bin bin/docker-credential-pass
install -Dm755 -t $bin/bin bin/docker-credential-secretservice
install -Dm755 -t $out/bin bin/docker-credential-pass
install -Dm755 -t $out/bin bin/docker-credential-secretservice
'';
meta = with stdenv.lib; {

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

@@ -31,9 +31,9 @@ buildGoPackage rec {
postInstall = ''
# test binaries, code generation
rm $bin/bin/{deps,macaroon-identity,generate}
rm $out/bin/{deps,macaroon-identity,generate}
wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [
wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [
acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash criu
(writeShellScriptBin "apparmor_parser" ''
exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@"