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

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-30 12:02:20 +00:00 committed by GitHub
commit eddb3c9d5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/networking/bird.nix
View File

@ -10,8 +10,8 @@ let
birdBin = if variant == "bird6" then "bird6" else "bird"; birdBin = if variant == "bird6" then "bird6" else "bird";
birdc = if variant == "bird6" then "birdc6" else "birdc"; birdc = if variant == "bird6" then "birdc6" else "birdc";
descr = descr =
{ bird = "1.9.x with IPv4 suport"; { bird = "1.6.x with IPv4 support";
bird6 = "1.9.x with IPv6 suport"; bird6 = "1.6.x with IPv6 support";
bird2 = "2.x"; bird2 = "2.x";
}.${variant}; }.${variant};
in { in {

4
pkgs/tools/security/vault/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests { stdenv, lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests
, makeWrapper , makeWrapper
, gawk , gawk
, glibc , glibc
@ -26,7 +26,7 @@ buildGoPackage rec {
postInstall = '' postInstall = ''
echo "complete -C $out/bin/vault vault" > vault.bash echo "complete -C $out/bin/vault vault" > vault.bash
installShellCompletion vault.bash installShellCompletion vault.bash
'' + lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/vault \ wrapProgram $out/bin/vault \
--prefix PATH ${lib.makeBinPath [ gawk glibc ]} --prefix PATH ${lib.makeBinPath [ gawk glibc ]}
''; '';

4
pkgs/tools/security/vault/vault-bin.nix
View File

@ -40,10 +40,10 @@ in stdenv.mkDerivation {
mkdir -p $out/bin $out/share/bash-completion/completions mkdir -p $out/bin $out/share/bash-completion/completions
mv vault $out/bin mv vault $out/bin
echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
'' + lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/vault \ wrapProgram $out/bin/vault \
--prefix PATH ${lib.makeBinPath [ gawk glibc ]} --prefix PATH ${lib.makeBinPath [ gawk glibc ]}
'' + ''
runHook postInstall runHook postInstall
''; '';