Boris Sukholitko
28463543eb
criu: upgrade to 1.3-rc2
2014-08-11 21:49:54 +03:00
Vladimir Kirillov
5011fe17df
sysdig: update to 0.1.87
2014-08-11 12:07:16 +03:00
Luca Bruno
1ee786fc3d
criu: fix build for ZHF
2014-08-10 11:50:43 +02:00
Luca Bruno
e9aadfd807
checkpolicy: mark as broken for ZHF
2014-08-09 11:42:18 +02:00
Mateusz Kowalczyk
816d971aea
Copy all so files over from nVidia blob
2014-08-09 01:57:42 +02:00
Mateusz Kowalczyk
a5ee903e60
Copy over libGLESv2 and libEGL too for nVidia blob
2014-08-09 01:07:39 +02:00
Vladimír Čunát
52d9c93abe
Merge 'staging' into master
2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618
Mark a bunch of packages as broken or not supported on Darwin
2014-08-08 17:59:02 +02:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
aszlig
4834717507
linux-kernel: Add new upstream version 3.16.
...
Also set linux_latest to it as well.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-04 02:41:54 +02:00
Michael Raskin
619c368f54
Update Sysdig system tracing tool
2014-08-03 22:29:41 +04:00
Vladimír Čunát
1b169722a3
Merge branch 'x-updates'
...
Close #3147 .
The only major update is freetype-2.5, I think (it cost lots of work).
2014-08-03 11:29:01 +02:00
William A. Kennington III
317d4253ea
kernel: 3.15.7 -> 3.15.8
2014-08-02 18:04:08 -05:00
William A. Kennington III
63cc1fd8ad
kernel: 3.14.14 -> 3.14.15
2014-08-02 18:02:15 -05:00
William A. Kennington III
eb9ee180d9
kernel: 3.12.25 -> 3.12.26
2014-08-02 18:00:46 -05:00
William A. Kennington III
89d5655670
kernel: 3.10.50 -> 3.10.51
2014-08-02 17:58:31 -05:00
William A. Kennington III
ae11e59949
kernel: 3.4.100 -> 3.4.101
2014-08-02 17:56:53 -05:00
Cillian de Róiste
c5788e6fd4
xf86_input_wacom: update from 0.23.0 to 0.25.0
2014-08-02 11:32:00 +02:00
Vladimír Čunát
6295a3ca36
Merge recent master into x-updates
...
Hydra: ?compare=1142825
Conflicts (easy):
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-08-02 05:08:07 +02:00
Bjørn Forsman
62d0a320b3
Revert "Remove obsolete jackaudio version 1."
...
This reverts commit bdb77826d9
.
Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.
Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Eelco Dolstra
b7c543136a
Move CIFS support into a separate module
2014-07-30 12:39:35 +02:00
William A. Kennington III
ff747dd24f
kernel: 3.15.5 -> 3.15.7
2014-07-29 13:17:11 -05:00
William A. Kennington III
2494e2bb09
kernel: 3.14.12 -> 3.14.14
2014-07-29 13:15:42 -05:00
William A. Kennington III
dd9a5aeade
kernel: 3.10.48 -> 3.10.50
2014-07-29 13:13:38 -05:00
William A. Kennington III
47d50bf684
kernel: 3.4.98 -> 3.4.100
2014-07-29 13:08:37 -05:00
Petr Rockai
559f423417
gnu: Fix (evaluation of the) call to forceSystem.
2014-07-28 20:46:32 +02:00
Peter Simons
bdb77826d9
Remove obsolete jackaudio version 1.
2014-07-28 20:32:52 +02:00
Peter Simons
d0ca8c237e
Fix broken license references.
2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
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