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: 29660a208552
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: d26e830997dd
Choose a head ref
  • 14 commits
  • 10 files changed
  • 8 contributors

Commits on Sep 26, 2018

  1. linux: 4.4.157 -> 4.4.158 

    (cherry picked from commit 656ca22)
    @NeQuissimus
    NeQuissimus committed Sep 26, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    starcraft66 Tristan
    GPG key ID: 86886FC44C72EAA1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a4cedc0 View commit details

  2. linux: 4.9.128 -> 4.9.129 

    (cherry picked from commit 8e4d980)
    @NeQuissimus
    NeQuissimus committed Sep 26, 2018
    Copy the full SHA
    1c7a432 View commit details

  3. linux: 4.14.71 -> 4.14.72 

    (cherry picked from commit 61452c8)
    @NeQuissimus
    NeQuissimus committed Sep 26, 2018
    Copy the full SHA
    74680cf View commit details

  4. linux: 4.18.9 -> 4.18.10 

    (cherry picked from commit 24c31d4)
    @NeQuissimus
    NeQuissimus committed Sep 26, 2018
    Copy the full SHA
    a3b7cd1 View commit details

  5. stdenv: partial revert of f2bb59e 

    /cc @Ericson2314

PR was NixOS/nixpkgs#46857

This line broke MacOS cross compilation. paxctl cannot be built on
macOS. Maybe it can be fixed, but no reason to break things
unnecessarily.

Regardless, you definitely need to be more careful about backporting.
I think it’s fine to move fast and break things on master but
with release-18.09 we should be more careful. Something like more
automated testing for cross compilation would also be
helpful (hopefully even making it block).

(cherry picked from commit f9c4075)
    @matthewbauer @Ericson2314
    matthewbauer authored and Ericson2314 committed Sep 26, 2018
    Copy the full SHA
    607063f View commit details

  6. Merge commit '607063f61be3b19a2da054776b360d9c5b03038a' into release-… 

    …18.09

This gets the partial revert on the common ancestor of master and
release-18.09, easier further devlopment.
    @Ericson2314
    Ericson2314 committed Sep 26, 2018
    Copy the full SHA
    e06de91 View commit details

  7. add stites to maintainers list 

    (cherry picked from commit 82f9808)
    @rycee
    stites authored and rycee committed Sep 26, 2018
    Copy the full SHA
    e861f31 View commit details

  8. noti: init at 3.1.0 

    (cherry picked from commit f1c30cf)
    @rycee
    stites authored and rycee committed Sep 26, 2018
    Copy the full SHA
    e835796 View commit details

  9. noti: fix darwin build 

    (cherry picked from commit 4c56eb8)
    @marsam @rycee
    marsam authored and rycee committed Sep 26, 2018
    Copy the full SHA
    583a321 View commit details

  10. Merge pull request #47396 from rycee/backport/noti 

    Backport the noti package to 18.09
    @xeji
    xeji authored Sep 26, 2018
    Copy the full SHA
    e5eabcc View commit details

  11. paxctl: Fix cross and Darwin builds

    @Ericson2314
    Ericson2314 committed Sep 26, 2018
    Copy the full SHA
    a3fd298 View commit details

  12. Revert "stdenv: partial revert of f2bb59e" 

    This reverts commit 607063f.
    @Ericson2314
    Ericson2314 committed Sep 26, 2018
    Copy the full SHA
    f49ca01 View commit details

  13. Merge pull request #47401 from obsidiansystems/paxctl-darwin-no-mass-… 

    …rebuild

 paxctl: Fix darwin and cross without mass-rebuild for 18.09
    @Ericson2314
    Ericson2314 authored Sep 26, 2018
    Copy the full SHA
    3b5c708 View commit details

  14. vlc: 3.0.3 -> 3.0.4 (#47406) 

    (cherry picked from commit 26ce265)

Didn't build, invalid url for vlc-qt5.11.patch.
    @coreyoconnor @xeji
    coreyoconnor authored and xeji committed Sep 26, 2018
    Copy the full SHA
    d26e830 View commit details
Loading