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: a04cf8fdb7f0
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: cca57171707e
Choose a head ref
  • 19 commits
  • 9 files changed
  • 9 contributors

Commits on Aug 24, 2018

  1. Merge pull request #1 from NixOS/master

    Get Master
    sjau authored Aug 24, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    Copy the full SHA
    17f152a View commit details
  2. Flexget: 2.14.9 -> 2.14.18

    hyper_ch committed Aug 24, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5a4bdba View commit details
  3. Flexget: 2.14.9 -> 2.14.18

    hyper_ch committed Aug 24, 2018
    Copy the full SHA
    ea1b4c7 View commit details
  4. Plex: 1.13.4 -> 1.13.5

    hyper_ch committed Aug 24, 2018
    Copy the full SHA
    c10d616 View commit details

Commits on Aug 26, 2018

  1. tokei: 7.0.3 -> 8.0.0

    dywedir committed Aug 26, 2018
    Copy the full SHA
    0905ed8 View commit details
  2. ceph: fix build, 12.2.2 -> 12.2.7

    Since 772eef9, Boost
    doesn't support by python by default, which broke ceph.
    
    Also bump to 12.2.7, the latest release of ceph 12.
    xeji committed Aug 26, 2018
    Copy the full SHA
    cd8bcb5 View commit details
  3. Merge pull request #45641 from dywedir/tokei

    tokei: 7.0.3 -> 8.0.0
    Mic92 authored Aug 26, 2018
    Copy the full SHA
    99dc074 View commit details
  4. nixos/tests/netdata: fix non-deterministic failure

    The test sporadically failed on hydra when a request was made
    before the service was actually listening on its port.
    Explicitly wait for the port to open.
    xeji committed Aug 26, 2018
    Copy the full SHA
    a44469d View commit details
  5. qtwebengine: Fix inputs on aarch64

    A mistake in the previous commit meant that ffmpeg wasn't added to the
    propagatedBuildInputs on aarch64.
    Thra11 committed Aug 26, 2018
    Copy the full SHA
    ec334d3 View commit details
  6. nixos/tests/networking: fix routes tests

    The output format of `ip route` changed, it now explicitly
    shows "proto static" for static routes.
    xeji committed Aug 26, 2018
    Copy the full SHA
    f021702 View commit details
  7. nixos/tests/networking: fix "virtual" tests

    `ip route` now displays extended tun attributes, so the expected
    output of this test changed.
    
    Upstream change: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=118eda77d6602616bc523a17ee45171e879d1818
    xeji committed Aug 26, 2018
    Copy the full SHA
    3f8756c View commit details
  8. subsurface: 4.7.5 -> 4.8.1 (#45640)

    Currently build is broken due to some invalid use of incomplete type 'class QHeaderView':
    https://hydra.nixos.org/build/76951177/nixlog/2
    
    CC: @bkchr
    flokli authored and xeji committed Aug 26, 2018
    Copy the full SHA
    a3099c9 View commit details
  9. Merge pull request #45649 from xeji/p/networking-tests

    nixos/tests/networking: fix routes and virtual tests
    Mic92 authored Aug 26, 2018
    Copy the full SHA
    b1aa9cb View commit details
  10. Merge pull request #45648 from Thra11/qtwebengine-aarch64-2

    qtwebengine: Fix inputs on aarch64
    Mic92 authored Aug 26, 2018
    Copy the full SHA
    20ae968 View commit details
  11. Merge pull request #45647 from xeji/p/netdata-test

    nixos/tests/netdata: fix non-deterministic failure
    Mic92 authored Aug 26, 2018
    Copy the full SHA
    b7d7e20 View commit details
  12. Merge pull request #45645 from xeji/p/ceph

    ceph: fix build, 12.2.2 -> 12.2.7
    Mic92 authored Aug 26, 2018
    Copy the full SHA
    110b7b2 View commit details
  13. Merge pull request #45568 from sjau/master

    Flexget: 2.14.9 -> 2.14.18
    Mic92 authored Aug 26, 2018
    Copy the full SHA
    3d97ddc View commit details
  14. xkbd: init at 0.8.18

    Bignaux Ronan committed Aug 26, 2018
    Copy the full SHA
    63257c8 View commit details
  15. Merge pull request #45623 from bignaux/xkbd

    xkbd: init at 0.8.18
    grahamc authored Aug 26, 2018
    Copy the full SHA
    cca5717 View commit details
Loading