diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-10-15 01:34:36 +0200 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-10-15 01:34:36 +0200 |
commit | adf4e67dd414babe715e17eaf5dfbc8d63a06cae (patch) | |
tree | 53a5e209186782fc1127b778bab773be9d7d6a57 /pkgs/tools/typesetting | |
parent | 850a9bf3f2c65c98452640162262e7a807f7609f (diff) | |
parent | c3c77ae81271cce85e0117a1dd316fdcf94be74b (diff) | |
download | nixpkgs-adf4e67dd414babe715e17eaf5dfbc8d63a06cae.tar nixpkgs-adf4e67dd414babe715e17eaf5dfbc8d63a06cae.tar.gz nixpkgs-adf4e67dd414babe715e17eaf5dfbc8d63a06cae.tar.bz2 nixpkgs-adf4e67dd414babe715e17eaf5dfbc8d63a06cae.tar.lz nixpkgs-adf4e67dd414babe715e17eaf5dfbc8d63a06cae.tar.xz nixpkgs-adf4e67dd414babe715e17eaf5dfbc8d63a06cae.tar.zst nixpkgs-adf4e67dd414babe715e17eaf5dfbc8d63a06cae.zip |
Merge remote-tracking branch 'origin/staging' into staging-next
Diffstat (limited to 'pkgs/tools/typesetting')
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/combine.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 1367d651a09..9569ec88854 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -33,9 +33,9 @@ let ++ lib.optional (lib.any pkgNeedsRuby splitBin.wrong) ruby; }; - uniqueStrings = list: lib.sort (a: b: a < b) (lib.unique list); + sortedUniqueStrings = list: lib.sort (a: b: a < b) (lib.unique list); - mkUniqueOutPaths = pkgs: uniqueStrings + mkUniqueOutPaths = pkgs: lib.unique (map (p: p.outPath) (builtins.filter lib.isDerivation pkgs)); in (buildEnv { @@ -124,9 +124,9 @@ in (buildEnv { # now filter hyphenation patterns and formats (let hyphens = lib.filter (p: p.hasHyphens or false && p.tlType == "run") pkgList.splitBin.wrong; - hyphenPNames = uniqueStrings (map (p: p.pname) hyphens); + hyphenPNames = sortedUniqueStrings (map (p: p.pname) hyphens); formats = lib.filter (p: p.hasFormats or false && p.tlType == "run") pkgList.splitBin.wrong; - formatPNames = uniqueStrings (map (p: p.pname) formats); + formatPNames = sortedUniqueStrings (map (p: p.pname) formats); # sed expression that prints the lines in /start/,/end/ except for /end/ section = start: end: "/${start}/,/${end}/{ /${start}/p; /${end}/!p; };\n"; script = |