JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,427 Commits 2 Branches 0 Tags 13 GiB
36e1412143
Commit Graph

3107 Commits

Author SHA1 Message Date
Vladimír Čunát
b9045a7d96 Merge branch 'x-updates' into staging 
...in preparation for a merge to master
 2014-07-22 22:28:39 +02:00
Eelco Dolstra
4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
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
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +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
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +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
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02: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
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +02: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
Eelco Dolstra
69deced59b util-linux: Update to 2.24.2 2014-06-24 14:01:54 +02: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
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
William A. Kennington III
8bb2313915 kernel: Add 3.15 2014-06-08 16:39:47 -05:00
William A. Kennington III
d91eacd720 kernel: 3.14.5 -> 3.14.6 (close #2868) 2014-06-08 09:12:05 +02:00
Vladimir Kirillov
1859dbc4a2 sysdig: update to 0.1.83 2014-06-06 17:21:00 +03:00
Austin Seipp
b43421221f kernel/grsec: updates; add mainline package for brave souls 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-05 06:06:19 -05:00
Eelco Dolstra
246edc3df2 linux: Update to 3.12.21 2014-06-05 12:54:37 +02:00
William A. Kennington III
3a0b265af9 kernel: 3.14.4 -> 3.14.5 (close #2831) 2014-06-05 10:34:40 +02:00
Ricardo M. Correia
2030328fea disk-indicator: Add package 
A program that will turn a LED into a hard disk indicator.
 2014-05-30 21:24:46 +02:00
Vladimír Čunát
872860e6de Merge #1187 into p/stdenv 
Tested building firefox, kdelibs, evince on x86_64-linux.
 2014-05-29 22:16:07 +02:00
Cillian de Róiste
a1d350287b Plymouth: update to 0.9.0, fix build, sanitize, enable systemd-integration 
NOTE: I can start the daemon and ping it, but I haven't been able to
get it to do more than that.
 2014-05-29 14:39:37 +02:00
Moritz Ulrich
29da3bce27 usermount: New Package. 
A simple tool to automatically mount removable drives using UDisks2 and
D-Bus.

https://github.com/tom5760/usermount
 2014-05-29 13:39:16 +02:00
Rob Vermaas
ce87d3e307 Merge pull request #2465 from robberer/nvidia/driver 
nvidia-x11: add nvidia-uvm module which is necessary for blender GPU support
 2014-05-28 08:30:22 +02:00
Michael Raskin
515a7e78fa Updating conspy 2014-05-28 01:33:29 +04:00
Michael Raskin
f9c05a3bad Merge pull request #2378 from wizeman/u/kernel-zram 
linux: Add support for zram
 2014-05-27 01:40:18 -07:00
Eelco Dolstra
fc70d6f712 nvidia-x11: Don't install nvidia-xconfig 
Rewriting the X11 config doesn't work on NixOS.
 2014-05-22 13:00:52 +02:00
Eelco Dolstra
5ec3a63fcb nvidia-x11: Update to 331.79 2014-05-22 13:00:51 +02:00
Luca Bruno
df95a8cc2f upower: add 0.99 version for gnome 3.12 2014-05-20 13:41:39 +02:00
Eelco Dolstra
2ee6c0c63e linux: Update to 3.12.20 2014-05-19 16:03:37 +02:00
Austin Seipp
0781563b46 lockdep: 3.14.2 -> 3.14.4 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-18 15:28:50 -05:00
Austin Seipp
ac38b32974 kernel/grsec: another optional option 
This should fix the testing kernels.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-18 08:57:10 -05:00
Austin Seipp
e64e3ad88a kernel: only use DEBUG_STACKOVERFLOW if !grsecurity 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-18 08:56:52 -05:00
Austin Seipp
80d0e31a94 kernel: allow features to be used in common-config 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-18 08:49:32 -05:00
Austin Seipp
657998dbcb kernel/common-config: Another optional option 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-17 19:44:03 -05:00
Austin Seipp
b5b434c98a kernel: make some common-config options optional for grsec 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-17 16:37:22 -05:00
Austin Seipp
4f27ad14a1 grsec: refactor grsecurity packages 
This now provides a handful of different grsecurity kernels for slightly
different 'flavors' of packages. This doesn't change the grsecurity
module to use them just yet, however.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-17 14:09:43 -05:00
Austin Seipp
cb894d4fc3 grsec: updates 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-17 14:09:09 -05:00
Austin Seipp
92abc4c610 kernel: enable AppArmor by default 
AppArmor only requires a few patches to the 3.2 and 3.4 kernels in order
to work properly (with the minor catch grsecurity -stable includes the
3.2 patches.) This adds them to the kernel builds by default, removes
features.apparmor (since it's always true) and makes it the default MAC
system.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-17 14:09:09 -05:00
Austin Seipp
3efdeef6a3 linux-3.{4,10}: update 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-17 14:09:09 -05:00
Austin Seipp
f7123982c2 apparmor: 2.8.2 -> 2.8.3 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-17 14:09:09 -05:00
Jaka Hudoklin
71b923fa74 systemd: fix python support 2014-05-17 12:13:29 +02:00
Ricardo M. Correia
1c2aacb5d8 spl: Fix compilation with grsecurity's constify plugin and kernels < 3.8 2014-05-15 13:25:47 +02:00
Eelco Dolstra
3d1d9bb7dd linux-3.12: Apply patch for CVE-2014-0196 2014-05-14 14:11:48 +02:00
Vladimír Čunát
9c8ee7a7e5 linux: minor updates, probably often fixing CVE-2014-0196 2014-05-13 20:00:21 +02:00
Eelco Dolstra
abbf643ae2 linux: Update to 3.12.19 
Backport: 14.04
 2014-05-13 13:28:14 +02:00
Luca Bruno
9e7e3978f9 shadow: Fix lastlog and faillog to find logs in /var/log 
Fixes #2575 and closes #2586.
 2014-05-13 11:32:10 +02:00
Michael Raskin
f8a62ff002 Allow no-kernel-module build of SysDig 2014-05-13 00:08:45 +04:00
Shea Levy
89238a251c Merge branch 'sysdig-0.1.82-now-with-osx' of git://github.com/proger/nixpkgs 
sysdig: updated to 0.1.82, starting to support Darwin builds (includes
luajit Darwin support)
 2014-05-12 09:34:23 -04:00
Ricky Elrod
c0a30a4b51 htop: Bump to 1.0.3 (close #2611) 
Signed-off-by: Ricky Elrod <ricky@elrod.me>
 2014-05-11 13:45:25 +02:00
Vladimir Kirillov
96903d5e48 sysdig: support builds without the kernel module, add pkgs.sysdig attr 2014-05-10 13:50:49 +03:00
Vladimir Kirillov
96373a4041 sysdig: update to 0.1.82 2014-05-10 13:50:49 +03:00
William A. Kennington III
e2672e892a keyutils: Update from 1.5.8 -> 1.5.9 2014-05-10 02:29:36 -05:00
Rickard Nilsson
5a0c8ff040 Merge pull request #2548 from proger/sysdig-0.1.81 
sysdig: update to 0.1.81
 2014-05-08 10:45:18 +02:00
Austin Seipp
130cb5d005 criu: upgrade, hopefully fix Hydra build 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-07 16:43:48 -05:00
Vladimir Kirillov
bf9612e797 sysdig: update to 0.1.81 2014-05-07 11:46:02 +03:00
Ricardo M. Correia
5b4006cddb paxctl: Update from 0.7 -> 0.8 2014-05-06 20:29:06 +02:00