mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-21 00:49:27 +03:00
Merge master into staging-next
This commit is contained in:
commit
ac91cf83c1
75 changed files with 2012 additions and 1447 deletions
|
@ -7,6 +7,7 @@ let
|
|||
mkValueStringTinyproxy = with lib; v:
|
||||
if true == v then "yes"
|
||||
else if false == v then "no"
|
||||
else if types.path.check v then ''"${v}"''
|
||||
else generators.mkValueStringDefault {} v;
|
||||
mkKeyValueTinyproxy = {
|
||||
mkValueString ? mkValueStringDefault {}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue