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: a35ecf097358
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 73c0c699ebad
Choose a head ref
  • 6 commits
  • 19 files changed
  • 3 contributors

Commits on Jan 23, 2019

  1. icu63: init at 63.1 

    (cherry picked from commit 70b8ab6)
    @alyssais @andir
    alyssais authored and andir committed Jan 23, 2019
    Copy the full SHA
    335f87f View commit details
    Browse the repository at this point in the history

  2. nss: 3.40.1 -> 3.41 

    (cherry picked from commit fdc6caf)
    @alyssais @andir
    alyssais authored and andir committed Jan 23, 2019
    Copy the full SHA
    577aa81 View commit details
    Browse the repository at this point in the history

  3. rust_1_31: init at 1.31 

    This removes the 1.29 backport and replaces it with the 1.31 version
from master.
    @andir
    andir committed Jan 23, 2019
    Copy the full SHA
    ae83566 View commit details
    Browse the repository at this point in the history

  4. rustc: fix build with unbundled jemalloc and llvm on darwin 

    jemalloc with stripped prefix would cause segfaults in free:
#49557 (comment)

This commit has been adjusted from the one on master to only carry the
relevant changes (the new optional `stripPrefix`) flag while still
keeping the other flags that were removed on master since they are no
loner supported by the version used there.

(cherry picked from commit 973eca7)
    @symphorien @andir
    symphorien authored and andir committed Jan 23, 2019
    Copy the full SHA
    5a0116e View commit details
    Browse the repository at this point in the history

  5. firefoxPackages: support building with firefox 65 

    Firefox >=65 will depend on icu >=63. All the older firefox versions
(and derived packages) seem to work fine with this change.

Also the system path environment patch will fail to apply since there
was a trivial whitespace change in the source file. By adding `-l` to
patch we can avoid having to track two patches that do basically the
same. Having patchFlags per file without resorting to pre-/postPatch
would be nicer but there doesn't seem to be a facility for that right
now.

(cherry picked from commit e37b765e7897c015153552d4e33a8571ab9c5457)
    @andir
    andir committed Jan 23, 2019
    Copy the full SHA
    e76e890 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2019

  1. Merge pull request #54505 from andir/18.09/firefox65 

    [18.09] firefox 65
    @andir
    andir committed Jan 26, 2019
    Copy the full SHA
    73c0c69 View commit details
    Browse the repository at this point in the history