Commit Graph

10837 Commits

Author SHA1 Message Date
Matthieu Coudron
2207378c9e linux: clearer origin for settings configuration
adds _file so that nix may have a chance to display what file the conflictings settings come
from.
2019-09-04 17:04:16 +09:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Florian Klink
829ff8a18e
Merge pull request #67855 from flokli/kernel-net-sched
linux/kernel: enable QoS and/or fair queueing
2019-09-01 14:03:28 +02:00
Alyssa Ross
3057b03c7c
linux_latest-libre: fix build 2019-09-01 11:23:30 +00:00
Florian Klink
cb8d815b5b linux/kernel: enable QoS and/or fair queueing
This allows to set queueing disciplines different than a simple fifo,
like fq_codel, which is the default in systemd since quite some time.

NET_SCHED is already set in the kernels x86_64_defconfig, but not on
arm/aarch64, so let's set it here.
2019-09-01 02:37:09 +02:00
Dmitry Kalinkin
12e2486605
Merge pull request #67762 from eadwu/nvidia_x11/435.21
nvidia_x11: 430.40 -> 435.21
2019-08-31 18:02:29 -04:00
Frederik Rietdijk
98ef78326d Merge staging-next into staging 2019-08-31 18:07:33 +02:00
Frederik Rietdijk
96e5474329 Merge master into staging-next 2019-08-31 18:04:31 +02:00
Aaron Andersen
5858a3693e
Merge pull request #67758 from etu/init-usbtop
usbtop: init at 1.0
2019-08-31 09:48:23 -04:00
Tim Steinbach
a919868ff1
linux: Remove 5.1
The 5.1.x series is not supported anymore
2019-08-31 09:17:48 -04:00
volth
7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
Izorkin
d164d84514 nftables: 0.9.1 -> 0.9.2 2019-08-31 12:37:33 +02:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
Linus Heckemann
4b8755a43c
Merge pull request #66576 from input-output-hk/nvme-apple-ssd
kernelPatches: mac nvme t2 support
2019-08-31 08:51:49 +02:00
Dmitry Kalinkin
9ff46956f5
Merge pull request #66748 from lblasc/selinux29
selinux: 2.7 -> 2.9
2019-08-30 22:45:36 -04:00
Elis Hirwing
93a27dbe9f
usbtop: init at 1.0 2019-08-30 18:54:29 +02:00
Edmund Wu
4b67e77e15
nvidia_x11: 430.40 -> 435.21 2019-08-30 08:01:47 -04:00
Averell Dalton
366db82268 nfs-utils: 2.3.4 -> 2.4.1 2019-08-30 04:17:23 +02:00
Tim Steinbach
aa4a062382
linux: 5.2.10 -> 5.2.11 2019-08-29 12:24:23 -04:00
Tim Steinbach
da9405adb8
linux: 4.19.68 -> 4.19.69 2019-08-29 12:24:09 -04:00
Tim Steinbach
af9e10155e
linux: 4.14.140 -> 4.14.141 2019-08-29 12:23:42 -04:00
Ben Wolsieffer
b6d906732c aggregateModules: use stdenvNoCC instead of stdenv (#67579) 2019-08-28 09:48:48 -04:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Tim Steinbach
48046cf2b7
linux: 5.2.9 -> 5.2.10 2019-08-26 07:54:16 -04:00
Robin Gloster
64f6a951eb
darwin.network_cmds: pin to openssl 1.0.2 2019-08-26 01:31:10 +02:00
Tim Steinbach
465856880f
linux: 4.9.189 -> 4.9.190 2019-08-25 09:43:52 -04:00
Tim Steinbach
5c32c5ec72
linux: 4.4.189 -> 4.4.190 2019-08-25 09:43:52 -04:00
Tim Steinbach
016e37bf4b
linux: 4.19.67 -> 4.19.68 2019-08-25 09:43:51 -04:00
Tim Steinbach
44e4b2e4cf
linux: 4.14.139 -> 4.14.140 2019-08-25 09:43:51 -04:00
Vladimír Čunát
985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Mario Rodas
cf996969a0
Merge pull request #66968 from r-ryantm/auto-update/mcelog
mcelog: 162 -> 164
2019-08-25 06:57:43 -05:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Edmund Wu
c8bd9ea77d
linux_testing_bcachefs: 5.1.2019.07.13 -> 5.1.2019.08.21 2019-08-23 22:38:20 -04:00
Sarah Brofeldt
3a64303a20
Merge pull request #63539 from ivan/usbguard-nox
usbguard-nox: init at 0.7.4
2019-08-23 16:25:13 +02:00
Janne Heß
cd5376cb4b evdi: Unbreak on Linux 5.2 and lower
The changelog mentions 5.2 support:
https://github.com/DisplayLink/evdi/releases/tag/v1.6.2
2019-08-22 17:35:34 +02:00
Marek Mahut
079a37362d
Merge pull request #67176 from r-ryantm/auto-update/wpa_supplicant
wpa_supplicant: 2.8 -> 2.9
2019-08-21 21:12:52 +02:00
Marek Mahut
b76bfb28dd
Merge pull request #67135 from r-ryantm/auto-update/smemstat
smemstat: 0.02.04 -> 0.02.05
2019-08-21 08:43:11 +02:00
R. RyanTM
a5f2040b0d wpa_supplicant: 2.8 -> 2.9
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wpa_supplicant/versions
2019-08-20 23:30:06 -07:00
Jan Tojnar
e6e03ba58d libv4l: disable building Qt (#67134)
Since we added wrapQTAppHooks to qt5.mkDerivation, it pollutes the closure
of everything it touches even when package is not building with Qt support.
We had to revert to the standard deriver to avoid this.
2019-08-20 20:58:13 -04:00
R. RyanTM
47f58bb941 smemstat: 0.02.04 -> 0.02.05
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/smemstat/versions
2019-08-20 16:01:04 -07:00
Samuel Leathers
13d5fc4232
kernelPatches: mac nvme t2 support 2019-08-20 14:22:28 -04:00
Marek Mahut
fd8276ae72
Merge pull request #67023 from r-ryantm/auto-update/pscircle
pscircle: 1.3.0 -> 1.3.1
2019-08-20 20:16:15 +02:00
Robin Gloster
4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
Sarah Brofeldt
cb45126c3e
Merge pull request #67049 from r-ryantm/auto-update/powerstat
powerstat: 0.02.19 -> 0.02.20
2019-08-20 14:08:24 +02:00
R. RyanTM
64efce4f05 powerstat: 0.02.19 -> 0.02.20
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/powerstat/versions
2019-08-20 02:22:23 -07:00
R. RyanTM
646b5cee5a pscircle: 1.3.0 -> 1.3.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pscircle/versions
2019-08-19 22:17:30 -07:00