Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 9e762daa7386
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 734fdd9916cb
Choose a head ref
  • 8 commits
  • 5 files changed
  • 2 contributors

Commits on Mar 12, 2019

  1. texlive: move fastUnique from default.nix to combine.nix 

    (cherry picked from commit a1505f3)
    @veprbl @xeji
    veprbl authored and xeji committed Mar 12, 2019
    Copy the full SHA
    cdefec4 View commit details
    Browse the repository at this point in the history

  2. texlive/combine.nix: s/mkUniquePkgs/mkUniqueOutPaths/ 

    (cherry picked from commit 658d83a)
    @veprbl @xeji
    veprbl authored and xeji committed Mar 12, 2019
    Copy the full SHA
    2f5520c View commit details
    Browse the repository at this point in the history

  3. texlive/combine.nix: clarify implementation of mkUniqueOutPaths 

    mkUniqueOutPaths used to produce empty paths for dummy packages, this
version strips those out. This does not affect `pkgList.bin` at all, but
`pkgList.nonbin` is affected, so this is not exactly a refactoring. It
should not harm to have a cleaner `paths`.

Also, original comment said "here we deal with those dummy packages
needed for hyphenation filtering". This doesn't seem to be true, the
packages that were really filtered are actually metapackages that
represent collections. I also could not find any dummy packages even in
the originally committed version.

(cherry picked from commit 3036421)
    @veprbl @xeji
    veprbl authored and xeji committed Mar 12, 2019
    Copy the full SHA
    0b2d415 View commit details
    Browse the repository at this point in the history

  4. texlive/combine.nix: fix bugs in languages filter 

    Initial language.{dat,def} configuration files provided by
`texlive.hyphen-base` may declare languages that were not part of the
combined packages. Those are filtered out by a sed script that had few
problems:

1) The sed script was generated from a list of potentially non-unique
packages. Every repetition of a select and print clause would produce a
copy of a language declaration in the output file. This became a problem
for update to the 2018-final, the fmtutil would crash from too much
German hyphenation.
2) The select clauses were ambiguous: both '^% from hyphen' and
'^% from hyphen-welsh' will match a line 'from hyphen-welsh'.

(cherry picked from commit 8f35ef7)
    @veprbl @xeji
    veprbl authored and xeji committed Mar 12, 2019
    Copy the full SHA
    6e8c731 View commit details
    Browse the repository at this point in the history

  5. texlive: 2018 -> 2018-final 

    (cherry picked from commit 40f55d6)
    @veprbl @xeji
    veprbl authored and xeji committed Mar 12, 2019
    Copy the full SHA
    ab77cf4 View commit details
    Browse the repository at this point in the history

  6. biber: 2.11 -> 2.12 

    Biber 2.12 is for biblatex 3.12.

(cherry picked from commit 1046761)
    @xeji
    Robert Schütz authored and xeji committed Mar 12, 2019
    Copy the full SHA
    70ef58d View commit details
    Browse the repository at this point in the history

  7. biber: use texlive.biber for src 

    (cherry picked from commit 4e103fb)
    @veprbl @xeji
    veprbl authored and xeji committed Mar 12, 2019
    Copy the full SHA
    20f5e2a View commit details
    Browse the repository at this point in the history

  8. texlive: add tug.org as a mirror for 2018-final 

    (cherry picked from commit 2eeb7a9)
    @veprbl @xeji
    veprbl authored and xeji committed Mar 12, 2019
    Copy the full SHA
    734fdd9 View commit details
    Browse the repository at this point in the history