Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f2ddbba1d85f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 44358ff94b31
Choose a head ref
  • 14 commits
  • 8 files changed
  • 11 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

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 authored Jun 7, 2018
    Copy the full SHA
    1d66f56 View commit details

Commits on Jun 8, 2018

  1. firefox-bin: 60.0.1 -> 60.0.2

    @taku0
    taku0 committed Jun 8, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b8d6a31 View commit details

  2. nss: 3.36.1 -> 3.36.4

    @taku0
    taku0 committed Jun 8, 2018
    Copy the full SHA
    2d00b47 View commit details

  3. firefox: 60.0.1 -> 60.0.2

    @taku0
    taku0 committed Jun 8, 2018
    Copy the full SHA
    aec9cd0 View commit details

  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

  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 authored Jun 8, 2018
    Copy the full SHA
    1fbc655 View commit details

Commits on Jun 11, 2018

  1. nixos/tomcat: fix eval error introduced by #40657 

    (cherry picked from commit 93cbb9b)
    @xeji
    xeji committed Jun 11, 2018
    Copy the full SHA
    19d0402 View commit details

  2. zfs: Fix "zfs-sync" for modern systemd 

    (cherry picked from commit deb6c6e)
    @Baughn @Mic92
    Baughn authored and Mic92 committed Jun 11, 2018
    Copy the full SHA
    cc1b088 View commit details

  3. firefox-bin: 60.0.1 -> 60.0.2 critical security update 

    (cherry picked from commit 3df3e15)
    @tokudan
    tokudan committed Jun 11, 2018
    Copy the full SHA
    1461461 View commit details

  4. ntp: fix a missed syscall in seccomp 

    ntpd uses openat to adjust the drift file, which it only does after a few hours of uptime

(cherry picked from commit f115afa)
    @cleverca22 @Mic92
    cleverca22 authored and Mic92 committed Jun 11, 2018
    Copy the full SHA
    333fca1 View commit details

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

    @vcunat
    vcunat committed Jun 11, 2018
    Copy the full SHA
    c3e75dd View commit details

  6. Merge pull request #41830 from tokudan/ff-bin6002-sec-1803 

    firefox-bin: 60.0.1 -> 60.0.2 critical security update
    @adisbladis
    adisbladis authored Jun 11, 2018
    Copy the full SHA
    338b407 View commit details

  7. docker: Ensure references to go are removed from docker-containerd (#… 

    …41849)

(cherry picked from commit c80e0fb)
    @srhb @xeji
    srhb authored and xeji committed Jun 11, 2018
    Copy the full SHA
    44358ff View commit details
Loading