Commit Graph

3130 Commits

Author SHA1 Message Date
Vladimír Čunát
16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Bjørn Forsman
28cb0f58c4 linux: only enable CONFIG_NFS_SWAP for v3.6+ kernels
Linux v3.6 is the earliest version with CONFIG_NFS_SWAP support. This
change unbreaks NixOS tests for older kernels.
2014-07-16 12:13:06 +02:00
Vladimír Čunát
18de3952b8 wpa_supplicant: update 2.1 -> 2.2, drop a patch
Fixes #3238.
2014-07-16 10:30:38 +02:00
Eelco Dolstra
6c0002ec8d nvidia-x11: Update to 340.24 2014-07-15 19:53:39 +02:00
Ricardo M. Correia
85e444f4f8 linux: Enable NFSv4.1, v4.2 clients and swap on NFS
I'm only enabling for kernels >= 3.11 to be conservative, because clients and
servers automatically negotiate and use the highest mutually supported version
by default, but only in kernel 3.11 server NFSv4.1 support actually became RFC
compliant.

I'm also adding support for swap on NFS, which is enabled by default on
Ubuntu kernels.
2014-07-15 15:07:25 +02:00
Cray Elliott
a1a9f3f14a nvidia legacy 304xx driver updated to .123 point release
among other things, fixes compilation with Linux 3.14
2014-07-14 14:50:01 +02:00
aszlig
e07e3a7591
conky: Link against GCC runtime library.
This is needed for Conky to shut down cleanly, because it relies on
pthread_cancel() to work.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-14 09:35:24 +02:00
Vladimír Čunát
eb659e89b4 linux_*: update, including CVE-2014-4699 (most likely)
CC #3196. No updates yet on 3.2 and 3.12 branches.
2014-07-09 22:54:08 +02:00
Vladimír Čunát
5979d428b4 Merge recent master into x-updates
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
Eelco Dolstra
1596c3a012 linux: Update to 3.12.24
CVE-2014-4508, CVE-2014-0206.
2014-07-07 18:21:34 +02:00
Michael Raskin
5e066f9741 Update acpi_call 2014-07-04 21:30:11 +04:00
Ricardo M. Correia
b50074929e grsecurity: Update stable and test patches
stable: 3.0-3.14.9-201406262057 -> 3.0-3.14.10-201407012152
test:   3.0-3.15.2-201406262058 -> 3.0-3.15.3-201407012153
2014-07-03 11:37:19 +02:00
Ricardo M. Correia
d4243e2a00 linux: Update to 3.14.10 2014-07-03 11:35:28 +02:00
Vladimír Čunát
aceb30cd93 Merge master into x-updates
Adds the mass-rebuilding python update.
2014-07-02 22:54:41 +02:00
Ricardo M. Correia
80709b141c zfs.git: Fix vdev_id error when plugging in a disk (#3161) 2014-07-02 17:23:35 +02:00
Ricardo M. Correia
7e20124875 zfs: Fix vdev_id error when plugging in a disk (#3161) 2014-07-02 16:34:46 +02:00
Michael Raskin
e303e18608 Update Linux 3.15 to 3.15.3 2014-07-01 14:28:52 +04:00
Michael Raskin
285e112357 Allow search of updates for atop 2014-07-01 12:11:08 +04:00
Oliver Charles
200e3535dc Merge pull request #3141 from cstrahan/iomelt
iomelt: new package
2014-07-01 08:46:12 +01:00
Charles Strahan
25b53cddb4 iomelt: new package
This adds the IOMelt pacakge, "a simple yet effective way to benchmark disk IO
in Linux systems."
2014-06-30 23:50:38 -04:00
Michael Raskin
efb0c56db4 Update linux_testing and enable parallel build of Linux kernel 2014-06-30 10:52:33 +04:00
Michael Raskin
5a8a92c01a Merge pull request #3007 from wkennington/master.syslinux
syslinux: Update 4.07 -> 6.02
2014-06-30 10:29:28 +04:00
Michael Raskin
dcf5e85c2f Merge pull request #2595 from wkennington/master.ecryptfs
ecryptfs: Update from 82 -> 104
2014-06-30 09:26:24 +04:00
Michael Raskin
0ecfc6cb49 Merge pull request #2213 from thoughtpolice/kernel-config
nixos: make several kernel common-config options optional
2014-06-30 09:01:08 +04:00
Austin Seipp
dd56bfbd00 kernel/grsec: updates
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-27 00:52:12 -05:00
Vladimír Čunát
dfd80a1b7e Merge recent master into x-updates
Hydra eval: 1131611
2014-06-26 22:05:15 +02:00
Vladimír Čunát
7998a598b6 linux-3.13: remove, as it's vulnerable
CC #3090.
2014-06-26 11:50:15 +02:00
Vladimír Čunát
7f97fafe4f linux-3.12: security update .22 ->.23, CVE-2014-0206
CC #3090.
2014-06-26 11:33:00 +02:00
William A. Kennington III
aac54c6699 syslinux: Update 4.07 -> 6.02 2014-06-24 16:10:13 -05:00
Shea Levy
ee8ea41d58 Fix broadcom-sta on linux >= 3.15
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-3.15.patch?view=markup
2014-06-24 09:25:25 -04:00
Ricardo M. Correia
9e1ec18624 zfs, zfs.git: Update to 0.6.3 2014-06-23 15:52:21 +02:00
Ricardo M. Correia
b5b8b5247a spl, spl.git: Update to 0.6.3 2014-06-23 15:52:20 +02:00
Austin Seipp
0399c5ee24 grsecurity: update stable/testing kernels, refactoring
This updates the new stable kernel to 3.14, and the new testing kernel
to 3.15.

This also removes the vserver kernel, since it's probably not nearly as
used.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-22 22:29:10 -05:00
Austin Seipp
125c2b9468 gradm: 3.0-201401291757 -> 3.0-201405281853
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-22 20:26:24 -05:00
Michael Raskin
c68e3418fb Update 3.16-rc to -rc2: -rc1 has problems with mounting BtrFS, will test -rc2 2014-06-22 19:45:07 +04:00
Austin Seipp
b8ede68b25 kernel/grsec: updates
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-21 22:13:49 -05:00
Vladimír Čunát
a4042c373b alsa{Oss,Utils}: update to 1.0.28
I somehow forgot to update these other parts.
2014-06-20 10:12:43 +02:00
Vladimír Čunát
3ec2cea214 Merge master into x-updates
Conflicts (auto-solved):
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-06-20 00:24:38 +02:00
Vladimír Čunát
36e79e3b90 upower: pull patches used in Ubuntu/trusty (fix #2884) 2014-06-19 20:51:30 +02:00
Vladimír Čunát
1a1c83fa77 alsa{Lib,Plugins}: update to 1.28.0
Dropped unrecognized option, patch no longer applying, fixed licenses.
2014-06-19 20:24:23 +02:00
Rok Garbas
870a8a0833 alsa-plugins: upgrade to 1.0.28
adding libogg as dependency should fix the build
2014-06-19 16:06:03 +01:00
Michael Raskin
8297a26746 Create an option to build 3.16-rc1 which carries a new Wireless driver; make USB_DEBUG optional as it seems to be planned to disappear in 3.16. 2014-06-18 00:23:48 +02:00
Mathijs Kwik
5bc69209b1 linux-3.15: upgrade to 3.15.1 2014-06-17 08:17:38 +02:00
Vladimír Čunát
9757785295 Merge recent master 2014-06-15 17:55:35 +02:00
Eelco Dolstra
27c72f337b linux: Update to 3.12.22
Fixes CVE-2014-3153 (local privilege escalation via futex()).
2014-06-13 17:44:02 +02:00
Vladimír Čunát
de12094b0e Merge recent master 2014-06-12 09:15:11 +02:00
Joel Taylor
58971f7b14 add htop fork for darwin (close #2690)
@vcunat made it a single conditional attribute.

Conflicts (trivial):
	lib/maintainers.nix
2014-06-11 20:36:10 +02:00
Vladimír Čunát
f2352f7ecf Merge recent master 2014-06-10 20:14:08 +02:00
Domen Kožar
7334e38af5 Merge pull request #2678 from offlinehacker/pkgs/systemd/fix_python
systemd: fix python support
2014-06-09 23:09:32 +02:00
Vladimír Čunát
5a98b9f514 Merge recent master into p/stdenv
Merged just before the pypi update, as it seems to cause problems on Hydra.
2014-06-09 19:07:31 +02:00