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

Merge remote-tracking branch 'hydra/master' into x-updates

Browse Source 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
This commit is contained in:
Vladimír Čunát
2013-06-08 15:41:39 +00:00
parent ba6c764a51 8c4a613f3a
commit 7db886fdb9
60 changed files with 1231 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/lib/licenses.nix
View File

@@ -199,6 +199,8 @@
unfreeRedistributable = "unfree-redistributable";
unfreeRedistributableFirmware = "unfree-redistributable-firmware";
zlib = {
shortName = "zlib";
fullName = "zlib license";

8
pkgs/lib/options.nix
View File

@@ -165,6 +165,14 @@ rec {
// optionalAttrs (opt1 ? extraConfigs || opt2 ? extraConfigs) {
extraConfigs = opt1.extraConfigs or [] ++ opt2.extraConfigs or [];
}
// optionalAttrs (opt1 ? extraArgs || opt2 ? extraArgs) {
extraArgs = opt1.extraArgs or {} // opt2.extraArgs or {};
}
// optionalAttrs (opt1 ? individualExtraArgs || opt2 ? individualExtraArgs) {
individualExtraArgs = zipAttrsWith (name: values:
if length values == 1 then head values else (head values // (head (tail values)))
) [ (opt1.individualExtraArgs or {}) (opt2.individualExtraArgs or {}) ];
}
)) {} opts;