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: 2a17d7ca3018
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 78ac53ba6031
Choose a head ref
  • 4 commits
  • 9 files changed
  • 2 contributors

Commits on May 5, 2018

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

    @vcunat
    vcunat committed May 5, 2018
    Configuration menu
    Copy the full SHA
    e877435 View commit details
    Browse the repository at this point in the history

  2. utillinux: patch CVE-2018-7738 (upstream) 

    On nixpkgs master/staging we have 2.32 - that includes this patch.
https://nvd.nist.gov/vuln/detail/CVE-2018-7738 claims 2.32-rc1 fixes
this and upstream master hasn't changed umount completion except for
this patch, so it has to be it. /cc #38994.
    @vcunat
    vcunat committed May 5, 2018
    Configuration menu
    Copy the full SHA
    7979cb5 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2018

  1. Merge #39979: llvm5: 5.0.1 -> 5.0.2 

    (cherry picked from commit 8994bf5)
    @LnL7 @vcunat
    LnL7 authored and vcunat committed May 6, 2018
    Configuration menu
    Copy the full SHA
    ff510fd View commit details
    Browse the repository at this point in the history

Commits on May 8, 2018

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

    @vcunat
    vcunat committed May 8, 2018
    2 Configuration menu
    Copy the full SHA
    78ac53b View commit details
    Browse the repository at this point in the history