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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
John Ericson
2018-09-25 14:20:27 -04:00
parent 6aa5f2db8f 6cd28a468a
commit c701d6cb21
164 changed files with 4068 additions and 2882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/typesetting/tex/texlive/combine.nix
View File

@@ -12,11 +12,9 @@ let
(bin.core.doc // { pname = "core"; tlType = "doc"; })
];
};
partition = builtins.partition or (pred: l:
{ right = builtins.filter pred l; wrong = builtins.filter (e: !(pred e)) l; });
pkgList = rec {
all = lib.filter pkgFilter (combinePkgs pkgSet);
splitBin = partition (p: p.tlType == "bin") all;
splitBin = builtins.partition (p: p.tlType == "bin") all;
bin = mkUniquePkgs splitBin.right
++ lib.optional
(lib.any (p: p.tlType == "run" && p.pname == "pdfcrop") splitBin.wrong)