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: 333fca1becc2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c3e75dd8b718
Choose a head ref
  • 8 commits
  • 4 files changed
  • 5 contributors

Commits on Jun 6, 2018

  1. haskellPackages.http-link-header: disable tests 

    The test

  Network.HTTP.Link, writeLinkHeader → parseLinkHeader, roundtrips successfully

seems to flap, as I cannot reproduce the failure locally, but it occured on
Hydra [0]. Also upstream is aware of the problem [1].

[0] https://hydra.nixos.org/build/75041105
[1] sjshuck/http-link-header#7
    @erictapen
    erictapen committed Jun 6, 2018
    Copy the full SHA
    b374896 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2018

  1. Merge pull request #41592 from erictapen/nixos-1803-http-link-header-… 

    …disable-tests

[nixos-18.03] haskellPackages.http-link-header: disable tests
    @peti
    peti committed Jun 7, 2018
    Copy the full SHA
    1d66f56 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2018

  1. firefox-bin: 60.0.1 -> 60.0.2

    @taku0
    taku0 committed Jun 8, 2018
    Copy the full SHA
    b8d6a31 View commit details
    Browse the repository at this point in the history

  2. nss: 3.36.1 -> 3.36.4

    @taku0
    taku0 committed Jun 8, 2018
    Copy the full SHA
    2d00b47 View commit details
    Browse the repository at this point in the history

  3. firefox: 60.0.1 -> 60.0.2

    @taku0
    taku0 committed Jun 8, 2018
    Copy the full SHA
    aec9cd0 View commit details
    Browse the repository at this point in the history

  4. firefox-esr: 52.8.0esr -> 52.8.1esr, 60.0.1esr -> 60.0.2esr

    @taku0
    taku0 committed Jun 8, 2018
    Copy the full SHA
    d741c1a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #41697 from taku0/firefox-60.0.2-staging-18.03 

    firefox, firefox-bin: 60.0.1 -> 60.0.2, firefox-esr: 52.8.0esr -> 52.8.1esr, 60.0.1esr -> 60.0.2esr [Critical security fix] [staging-18.03]
    @xeji
    xeji committed Jun 8, 2018
    Copy the full SHA
    1fbc655 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

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

    @vcunat
    vcunat committed Jun 11, 2018
    Copy the full SHA
    c3e75dd View commit details
    Browse the repository at this point in the history