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

texlive: add comments, whitespace cleanup

Browse Source 
Fixes #34490.  The FIXME has been long obsolete.
This commit is contained in:
Vladimír Čunát 2018-02-01 15:55:52 +01:00
parent 42b9b8f7c8
commit ec99a3de1b
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/typesetting/tex/texlive/default.nix
View File

@ -37,8 +37,10 @@ let
/* # beware: the URL below changes contents continuously /* # beware: the URL below changes contents continuously
curl http://mirror.ctan.org/tex-archive/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz \ curl http://mirror.ctan.org/tex-archive/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz \
| xzcat | uniq -u | sed -rn -f ./tl2nix.sed > ./pkgs.nix */ | xzcat | uniq -u | sed -rn -f ./tl2nix.sed > ./pkgs.nix */
orig = import ./pkgs.nix tl; # XXX XXX XXX FIXME: the file is probably too big now XXX XXX XXX XXX XXX XXX orig = import ./pkgs.nix tl;
removeSelfDep = lib.mapAttrs (n: p: if p ? deps then p // { deps = lib.filterAttrs (dn: _: n != dn) p.deps; } else p); removeSelfDep = lib.mapAttrs
(n: p: if p ? deps then p // { deps = lib.filterAttrs (dn: _: n != dn) p.deps; }
else p);
clean = removeSelfDep (orig // { clean = removeSelfDep (orig // {
# overrides of texlive.tlpdb # overrides of texlive.tlpdb
@ -112,6 +114,10 @@ let
urls = args.urls or (if args ? url then [ args.url ] else urls = args.urls or (if args ? url then [ args.url ] else
map (up: "${up}/${urlName}.tar.xz") urlPrefixes map (up: "${up}/${urlName}.tar.xz") urlPrefixes
); );
# Upstream refuses to distribute stable tarballs, so we host snapshots on IPFS.
# Common packages should get served from the binary cache anyway.
# See discussions, e.g. https://github.com/NixOS/nixpkgs/issues/24683
urlPrefixes = args.urlPrefixes or [ urlPrefixes = args.urlPrefixes or [
http://146.185.144.154/texlive-2017 http://146.185.144.154/texlive-2017
# IPFS GW is second, as it doesn't have a good time-outing behavior # IPFS GW is second, as it doesn't have a good time-outing behavior