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: b7c795d58871
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c395d6250788
Choose a head ref
  • 3 commits
  • 10 files changed
  • 1 contributor

Commits on Nov 30, 2018

  1. Merge branch 'release-18.09' into staging-18.09

    @vcunat
    vcunat committed Nov 30, 2018
    Copy the full SHA
    57081c2 View commit details
    Browse the repository at this point in the history

  2. Re-revert "Merge staging-18.09 into release-18.09" 

    This reverts commit 3d63c05.
This should fix #51281 (after merged to release-18.09),
but we would better re-check for similar problems.
    @vcunat
    vcunat committed Nov 30, 2018
    Copy the full SHA
    420db06 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2018

  1. Merge branch 'staging-18.09' into release-18.09 

    On x86_64-linux this looks good, only R fails tests on Hydra,
but I've been unable to reproduce that failure locally,
so let me not delay the CVE fixes.
    @vcunat
    vcunat committed Dec 3, 2018
    Copy the full SHA
    c395d62 View commit details
    Browse the repository at this point in the history