From 205ee073b053fc4d87d5adf2ebd44ebbef7bca4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 20 Jun 2023 08:33:21 +0200 Subject: [PATCH] Revert "texlive.combine: expose licensing information of combined packages" This reverts commit fa7428470abdfea7a4e1e1 from PR #238456 Evaluation on Hydra.nixos.org was crashing because of this PR merge, most likely because this computation of licenses for sets like texlive.combined.scheme-full (thousands of packages) was too expensive. --- pkgs/tools/typesetting/tex/texlive/combine.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 906ccb4eedfe..008b519cd830 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -17,12 +17,6 @@ let pkgList = rec { combined = combinePkgs (lib.attrValues pkgSet); all = lib.filter pkgFilter combined; - licenses = let - concatLicenses = lib.foldl (acc: el: if builtins.elem el acc then acc else acc ++ [ el ]); - in lib.foldl - (acc: pkg: - concatLicenses acc (lib.toList (pkg.meta.license or []))) - [] all; splitBin = builtins.partition (p: p.tlType == "bin") all; bin = splitBin.right ++ lib.optional @@ -90,7 +84,6 @@ let in (buildEnv { inherit name; - meta.license = pkgList.licenses; ignoreCollisions = false;