cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
46267 commits 1 branch 0 tags 3.7 GiB
Commit graph

3141 commits

Author SHA1 Message Date
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-07-28 11:30:49 +02:00
Eelco Dolstra
0852d9e364 linux: Update to 3.12.25 2014-07-24 18:14:53 +02:00
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2' 
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
 2014-07-23 20:22:14 +02:00
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