Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into HEAD | John Ericson | 2018-11-05 |
|\ | |||
| * | linux: 4.19-rc8 -> 4.20-rc1 | Tim Steinbach | 2018-11-05 |
| | | |||
| * | Merge pull request #49628 from lopsided98/raspberrypi-wireless-firmware-update | Jörg Thalheim | 2018-11-04 |
| |\ | | | | | | | raspberrypiWirelessFirmware: 2018-05-30 -> 2018-08-20 | ||
| | * | raspberrypiWirelessFirmware: 2018-05-30 -> 2018-08-20 | Ben Wolsieffer | 2018-11-01 |
| | | | |||
| * | | linux: 4.19 -> 4.19.1 | Tim Steinbach | 2018-11-04 |
| | | | |||
| * | | linux: 4.18.16 -> 4.18.17 | Tim Steinbach | 2018-11-04 |
| | | | |||
| * | | linux: 4.14.78 -> 4.14.79 | Tim Steinbach | 2018-11-04 |
| | | | |||
* | | | Merge branch 'master' into staging | Austin Seipp | 2018-11-04 |
|\| | | |||
| * | | Merge pull request #49710 from Mic92/linux-samus | Jörg Thalheim | 2018-11-04 |
| |\ \ | | | | | | | | | linux-samus: remove | ||
| | * | | linux-samus: remove | Jörg Thalheim | 2018-11-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The package is out-of-date and has no maintainer. I don't own a chromebook device and therefore don't know if an mainline kernel could be used instead. cc @lheckemann @zohl | ||
* | | | | Merge master into staging-next | Frederik Rietdijk | 2018-11-04 |
|\| | | | |||
| * | | | systemd: apply patches from Debian | Vladimír Čunát | 2018-11-04 |
| | | | | | | | | | | | | | | | | There are some security fixes among those. | ||
| * | | | Revert "systemd: 239 -> 239.20181031" | Vladimír Čunát | 2018-11-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d1de23b8302d02d4699e884533906a3992f370b6. The changes turned out to be too intrusive, so we'll patch instead. Discussion: https://github.com/NixOS/systemd/pull/24 | ||
* | | | | Merge master into staging-next | Frederik Rietdijk | 2018-11-04 |
|\| | | | |||
| * | | | radeon-crimson: fix download | davidak | 2018-11-04 |
| | | | | |||
| * | | | Merge pull request #49707 from Mic92/linux_beagleboard | Jörg Thalheim | 2018-11-03 |
| |\ \ \ | | | | | | | | | | | linux_beagleboard: remove | ||
| | * | | | linux_beagleboard: remove | Jörg Thalheim | 2018-11-03 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The package is out-of-date and has no maintainer. It should be now possible to just mainline kernel. Support for that could be added by copying the right dtb file in our linux_rpi kernel. I do not have the hardware to test this. cc @dezgeg @dhess | ||
| * / / | nvidia-x11: 410.66 -> 410.73 | Edmund Wu | 2018-11-03 |
| |/ / | |||
| * | | Merge pull request #48496 from rvl/bpftrace | Renaud | 2018-11-03 |
| |\ \ | | | | | | | | | linuxPackages.bpftrace: init at unstable-2018-10-27 | ||
| | * | | linuxPackages.bpftrace: init at unstable-2018-10-27 | Rodney Lorrimar | 2018-10-28 |
| | | | | |||
* | | | | Merge branch 'master' into staging | Vladimír Čunát | 2018-11-02 |
|\| | | | | | | | | | | | | | | | Conflict: rename of pythondaemon -> python-daemon. | ||
| * | | | Merge pull request #49495 from dtzWill/fix/thunderbolt-cleanup | Will Dietz | 2018-11-02 |
| |\ \ \ | | | | | | | | | | | thunderbolt: cleanup | ||
| | * | | | thunderbolt: cleanup | Will Dietz | 2018-10-30 |
| | | | | | |||
| * | | | | dropwatch: init at 1.5 (#49593) | Renaud | 2018-11-02 |
| | | | | | |||
| * | | | | pmtools: remove and alias (#49596) | Renaud | 2018-11-01 |
| | |_|/ | |/| | | | | | | | | | | | | | | These are the old tools that later became part of ACPICA. It is obsolete and we already have newer acpica-tools. Alias to acpica-tools for out of tree backward-compat | ||
| * | | | Merge pull request #49529 from NixOS/package/systemd-v239.20181031 | Franz Pletz | 2018-11-01 |
| |\ \ \ | | | | | | | | | | | systemd: 239 -> 239.20181031 | ||
| | * | | | systemd: 239 -> 239.20181031 | Franz Pletz | 2018-10-31 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CVE-2018-15688 and updates latest upstream stable v239 branch. See https://github.com/NixOS/systemd/pull/24 for details. Co-authored-by: Andreas Rammhold <andreas@rammhold.de> | ||
| * / / | linux-hardkernel: 4.14.73-149 -> 4.14.78-150 (#49535) | qolii | 2018-10-31 |
| |/ / | |||
* | | | Merge pull request #48550 from joachifm/apparmor-2_13_1 | Joachim F | 2018-11-02 |
|\ \ \ | | | | | | | | | apparmor: 2.12.0 -> 2.13.1 | ||
| * | | | apparmor: 2.12.0 -> 2.13.1 | Joachim Fasting | 2018-10-22 |
| | | | | |||
* | | | | Merge pull request #49129 from obsidiansystems/linux-headers-cleanup | John Ericson | 2018-10-31 |
|\ \ \ \ | | | | | | | | | | | Linux headers: Cleanup | ||
| * | | | | linux-headers: Fix bootstrap tools reference | John Ericson | 2018-10-25 |
| | | | | | |||
| * | | | | linux-headers: Clean up with mass rebuild | Daiderd Jordan | 2018-10-25 |
| | | | | | |||
* | | | | | Merge staging-next into staging | Frederik Rietdijk | 2018-10-30 |
|\ \ \ \ \ | |||
| * \ \ \ \ | Merge master into staging-next | Frederik Rietdijk | 2018-10-30 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||
| | * | | | | upower: 0.99.8 -> 0.99.9 | Will Dietz | 2018-10-29 |
| | | | | | | |||
| | * | | | | upower: 0.99.7 -> 0.99.8 | Will Dietz | 2018-10-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 67ac9c649ffc036c49006191c64555eae2e6012f) | ||
| | * | | | | zfs{Stable,Unstable}: mark as incompatible with 4.19 | Jörg Thalheim | 2018-10-29 |
| | | | | | | |||
| | * | | | | mdadm: 4.0 -> 4.1 | Léo Gaspard | 2018-10-28 |
| | | | | | | |||
* | | | | | | Merge pull request #49371 from matthewbauer/cctools-bump | Matthew Bauer | 2018-10-28 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | cctools: bump to latest commit | ||
| * | | | | | | cctools: bump to latest commit | Matthew Bauer | 2018-10-28 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Lots of our patches are no longer needed. This simplifies things a bunch. In addition, it now includes man pages. | ||
* | | | | | | Merge remote-tracking branch 'upstream/master' into staging | Tuomas Tynkkynen | 2018-10-27 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/science/math/sage/sage-src.nix | ||
| * | | | | | goku: init 0.1.11 | Nikita Voloboev | 2018-10-27 |
| | | | | | | |||
| * | | | | | alsaTools: 1.1.6 -> 1.1.7 (#49236) | Tristan Helmich | 2018-10-27 |
| | | | | | | |||
| * | | | | | alsaUtils: 1.1.6 -> 1.1.7 (#49237) | Tristan Helmich | 2018-10-27 |
| | | | | | | |||
| * | | | | | Merge pull request #49209 from r-ryantm/auto-update/open-isns | markuskowa | 2018-10-27 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | openisns: 0.98 -> 0.99 | ||
| | * | | | | | openisns: 0.98 -> 0.99 | R. RyanTM | 2018-10-26 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/open-isns/versions | ||
| * | | | | | Merge pull request #49081 from LnL7/darwin-wxmac | Daiderd Jordan | 2018-10-27 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | wxmac: 3.0.2 -> 3.0.4 (darwin) | ||
| | * | | | | | darwin.cf-private: include headers from osx_private_sdk | Daiderd Jordan | 2018-10-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes things like CFURLGetFSRef which are not part of the swift-corelibs CoreFoundation. | ||
* | | | | | | | Merge pull request #49202 from qolii/iproute2_4_19 | Michael Bishop | 2018-10-27 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | iproute: 4.18 -> 4.19 |