From 256af6d0396c9e50f2d17d593d9dba41d435a2b9 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 24 Sep 2018 16:22:10 -0400 Subject: [PATCH] texlive/combine.nix: drop nix1 support (#47294) Since 7d1968c0e38 ('Nix minimal version: 1.11 -> 2.0') nixpkgs now require nix 2.0+ --- pkgs/tools/typesetting/tex/texlive/combine.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 41ec8ad5269..8a01ac74414 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -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)