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
Paul Colomiets
fb948c4f28
Upgrade shadow package
2014-08-01 21:19:21 +03: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
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
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
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
Vladimír Čunát
1796a939d4
b43-fwcutter: update 015 -> 018
2014-05-06 18:43:01 +02:00
Eelco Dolstra
24cbe874d6
systemd-journal-flush: Require /var/log/journal rather than all filesystems
...
Backport: 14.04
2014-05-05 16:47:43 +02:00
Eelco Dolstra
014fe1a3c3
sysinit.target: Don't depend on systemd-tmpfiles-setup.service
...
systemd-tmpfiles-setup.service pulls in local-fs.target, which
interferes with NixOps' send-keys feature (since sshd.service depends
indirectly on sysinit.target). Since in NixOS we don't use
systemd-tmpfiles for creating files (that's done by activation scripts
and preStart scripts), it's not a problem to start it a bit later.
Backport: 14.04
2014-05-05 16:47:02 +02:00
Vladimír Čunát
07aaea85d4
pam: upstream patch to fix CVE-2014-2583
2014-05-03 21:30:48 +02:00
robberer
9683c6e806
add nvidia-uvm module which is necessary for blender GPU support
2014-05-01 16:37:14 +02:00
Eelco Dolstra
cb45ecad34
systemd: Look for fsck.* in the right place
...
Fixes #2464 .
2014-05-01 14:32:58 +02:00
Austin Seipp
7faaa9e6da
lockdep: 3.14 -> 3.14.2
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-28 17:34:35 -05:00
Bjørn Forsman
6859853045
psmisc: (from upstream) Typo in fuser makes -M on all the time
2014-04-27 20:19:31 +02:00
Austin Seipp
92f7781f00
kernel/grsecurity: stable/longterm/testing updates
...
kernels:
- longterm: 3.4.87 -> 3.4.88
- longterm: 3.10.37 -> 3.10.38
- stable: 3.13.10 -> 3.13.11
- stable: 3.14.1 -> 3.14.2
grsecurity:
- test: 3.0-3.14.1-201404241722 -> 3.0-3.14.2-201404270907
NOTE: technically the 3.13 stable kernel is now EOL. However, it will
become the long-term grsecurity stable kernel, and will have ongoing
support from Canonical.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-27 08:41:42 -05:00
Ricardo M. Correia
efae8ce543
grsecurity: Update all patches
...
stable: 3.0-3.2.57-201404182109 -> 3.0-3.2.57-201404241714
test: 3.0-3.14.1-201404201132 -> 3.0-3.14.1-201404241722
vserver: 3.0-3.2.57-vs2.3.2.16-201404182110 -> 3.0-3.2.57-vs2.3.2.16-201404241715
2014-04-25 04:41:58 +02:00
Ricardo M. Correia
f0e3775f2e
linux: Add support for zram
2014-04-24 23:47:08 +02:00
Vladimír Čunát
116d52c6df
linux-3.12: bump .17 -> .18
2014-04-24 20:02:34 +02:00
Lluís Batlle i Rossell
8ef1d4ecdb
Making nvidia build with linux 3.14. Patch not needed anymore.
2014-04-23 16:06:15 +02:00
Ricardo M. Correia
419a71e1e5
spl, zfs: Add git versions, based on recent commits
...
Upstream has not been tagging new versions for a long time, but we need
compatibility with newer kernels. The 0.6.2 versions already have a bunch of
backported compatibility patches, but 3.14 kernels need even more.
Also, the git versions have fixed a bunch of crashes and other bugs, so perhaps
we should just bite the bullet and just use recent git versions (as sometimes
upstream recommends, when people run into bugs).
This adds a new "boot.zfs.useGit" boolean option, so that a user can
easily opt into using the git versions.
2014-04-23 01:42:52 +02:00
Eelco Dolstra
fb3629df49
systemd: Re-allow Restart=yes with Type=oneshot
2014-04-22 23:53:21 +02:00
Rickard Nilsson
5db9287b7c
rtkit: Update from 0.10 to 0.11
2014-04-21 23:22:10 +02:00
Ricardo M. Correia
5d5ca7b260
grsecurity: Update all patches
...
stable: 3.0-3.2.57-201404131252 -> 3.0-3.2.57-201404182109
test: 3.0-3.13.10-201404141717 -> 3.0-3.14.1-201404201132
vserver: 3.0-3.2.57-vs2.3.2.16-201404131253 -> 3.0-3.2.57-vs2.3.2.16-201404182110
2014-04-21 18:46:41 +02:00
aszlig
625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
...
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.
The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.
Conflicts:
pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
Eelco Dolstra
4e8c2f0ff9
Merge branch 'systemd-update'
2014-04-20 19:31:01 +02:00
Eelco Dolstra
660d38e838
nvidia-x11: Update to 331.67
2014-04-18 21:50:00 +02:00
Eelco Dolstra
5da309fcaa
linux: Enable SND_DYNAMIC_MINORS
...
This is necessary if you get:
kernel: Too many HDMI devices
kernel: Consider building the kernel with CONFIG_SND_DYNAMIC_MINORS=y
2014-04-18 21:50:00 +02:00
Eelco Dolstra
890d0cc3a5
firmware-linux-nonfree: Update to 0.41
2014-04-18 15:34:10 +02:00
Eelco Dolstra
7ea51b1c6c
Enable kmod-static-nodes.service
...
This creates static device nodes such as /dev/fuse or
/dev/snd/seq. The kernel modules for these devices will be loaded on
demand when the device node is opened.
2014-04-17 14:35:05 +02:00
Eelco Dolstra
9594421617
kmod: Respect $MODULE_DIR in ‘kmod static-nodes’
2014-04-17 13:52:30 +02:00
Eelco Dolstra
51a1e0a4a9
kmod: Update to 17
2014-04-17 13:46:48 +02:00
Eelco Dolstra
3f01caa89f
linux: Enable transparent hugepages
2014-04-16 22:40:07 +02:00
Eelco Dolstra
2503e7e0c8
systemd: Apply patch to make container logins work again
2014-04-16 18:15:48 +02:00
Eelco Dolstra
c21ef84810
linux-pam: Update to 1.1.8
2014-04-16 16:44:05 +02:00
Eelco Dolstra
7438b95437
util-linux: Update to 2.24.1
2014-04-16 16:31:58 +02:00
Eelco Dolstra
c81565f6cf
Remove hack for using upstream getty units
...
Also, enable the container-getty@ unit so that "machinectl login"
works.
2014-04-16 16:11:17 +02:00
Eelco Dolstra
19d4e40dfc
systemd: Build on i686-linux
2014-04-16 15:25:37 +02:00
Eelco Dolstra
0ac322c7a0
systemd-nspawn: Fix starting NixOS containers
2014-04-16 11:34:34 +02:00
William A. Kennington III
171a58bcd6
cpupower: Add package to replace cpufrequtils
2014-04-16 01:09:57 +02:00
Eelco Dolstra
ee9c068b0c
systemd: Update to 212
...
Note that systemd no longer depends on dbus, so we're rid of the
cyclic dependency problem between systemd and dbus.
This commit incorporates from wkennington's systemd branch
(203dcff45002a63f6be75c65f1017021318cc839,
1f842558a95947261ece66f707bfa24faf5a9d88).
2014-04-16 00:59:26 +02:00
Eelco Dolstra
07cb7451d9
lvm2: Update to 2.02.106
2014-04-15 18:02:07 +02:00
Eelco Dolstra
a37edbbb63
linux-headers: Add 3.14
2014-04-15 16:59:19 +02:00
Eelco Dolstra
0fc9f65ff2
linux-headers-2.6.28: Remove, no longer used
2014-04-15 16:50:29 +02:00
Peter Simons
e572b5c104
Merge pull request #2253 from jwiegley/watch
...
Add a recipe for installing "watch" from procps (#2227 )
2014-04-15 16:12:27 +02:00
Austin Seipp
ba2f861f05
kernel: stable/longterm updates
...
- stable: 3.14 -> 3.14.1
- longterm: 3.10.36 -> 3.10.37
- longterm: 3.4.86 -> 3.4.86
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-14 19:46:39 -05:00
Ricardo M. Correia
1b113178ee
grsecurity: Update test patch from 3.0-3.13.9-201404131254 -> 3.0-3.13.10-201404141717
2014-04-15 00:16:29 +02:00
Ricardo M. Correia
3a1c9a2945
linux: Update to 3.13.10
2014-04-15 00:16:29 +02:00
Eelco Dolstra
73b4b287bb
linux: Don't use underscores in the timestamp
2014-04-14 21:06:04 +02:00
John Wiegley
7a59054dce
Add a recipe for installing "watch" from procps ( #2227 )
2014-04-14 09:10:10 -05:00
Bjørn Forsman
1296372681
cifs-utils: update 6.2 -> 6.3
...
January 9, 2014: Release 6.3:
* fixes for various bugs turned up by Coverity
* clean unused cruft out of upcall binary
* add new pam_cifscreds PAM module for establishing NTLM creds on login
* https://lists.samba.org/archive/samba-technical/2014-January/097124.html
2014-04-13 22:56:21 +02:00
Bjørn Forsman
5e50b35a26
bluez5: remove unneeded libusb dependency
...
bluez >= 5.9 does not depend on libusb[1].
[1] http://www.bluez.org/release-of-bluez-5-9/
2014-04-13 22:46:47 +02:00
Austin Seipp
788d9a13fb
grsecurity: stable/vserver/testing updates
...
- stable: 201404111812 -> 201404131252
- vserver: vs2.3.2.16-201404111814 -> vs2.3.2.16-201404131253
- testing: 201404111815 -> 201404131254
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-13 13:11:17 -05:00
Michael Raskin
e86e76e560
Adding sysdig system call tracer for Linux
2014-04-13 20:49:37 +04:00
Bjørn Forsman
d1f875c6af
lttng project: update from 2.3.0 to 2.4.1
...
(And update liburcu to 0.8.4 according to release notes for lttng 2.4.x.)
In addition to new features and bug fixes, version 2.4.x is needed to build
against Linux 3.12 (our new stable kernel).
2014-04-13 10:47:16 +02:00
Austin Seipp
172dc1336f
nixos: add grsecurity module ( #1875 )
...
This module implements a significant refactoring in grsecurity
configuration for NixOS, making it far more usable by default and much
easier to configure.
- New security.grsecurity NixOS attributes.
- All grsec kernels supported
- Allows default 'auto' grsec configuration, or custom config
- Supports custom kernel options through kernelExtraConfig
- Defaults to high-security - user must choose kernel, server/desktop
mode, and any virtualisation software. That's all.
- kptr_restrict is fixed under grsecurity (it's unwriteable)
- grsecurity patch creation is now significantly abstracted
- only need revision, version, and SHA1
- kernel version requirements are asserted for sanity
- built kernels can have the uname specify the exact grsec version
for development or bug reports. Off by default (requires
`security.grsecurity.config.verboseVersion = true;`)
- grsecurity sysctl support
- By default, disabled.
- For people who enable it, NixOS deploys a 'grsec-lock' systemd
service which runs at startup. You are expected to configure sysctl
through NixOS like you regularly would, which will occur before the
service is started. As a result, changing sysctl settings requires
a reboot.
- New default group: 'grsecurity'
- Root is a member by default
- GRKERNSEC_PROC_GID is implicitly set to the 'grsecurity' GID,
making it possible to easily add users to this group for /proc
access
- AppArmor is now automatically enabled where it wasn't before, despite
implying features.apparmor = true
The most trivial example of enabling grsecurity in your kernel is by
specifying:
security.grsecurity.enable = true;
security.grsecurity.testing = true; # testing 3.13 kernel
security.grsecurity.config.system = "desktop"; # or "server"
This specifies absolutely no virtualisation support. In general, you
probably at least want KVM host support, which is a little more work.
So:
security.grsecurity.enable = true;
security.grsecurity.stable = true; # enable stable 3.2 kernel
security.grsecurity.config = {
system = "server";
priority = "security";
virtualisationConfig = "host";
virtualisationSoftware = "kvm";
hardwareVirtualisation = true;
}
This module has primarily been tested on Hetzner EX40 & VQ7 servers
using NixOps.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-11 22:43:51 -05:00
Austin Seipp
acbf28145c
nixos: make several kernel common-config options optional
...
Realistically, common-config is useful, but there are a lot of things in
there that are non-optionally specified that aren't always useful. For
example, when deploying grsecurity, I don't want the bluetooth,
wireless, or input joystick/extra filesystem stack (XFS, etc), nor the
staging drivers tree.
The problem is that if you specify this in your own kernel config in the
grsecurity module, by saying 'BT n' to turn off bluetooth,
common-config turns on 'BT_HCIUART_BCSP y', which then becomes unused
and errors out.
This is really just an arbitrary picking at the moment, but it should be
OK.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-11 22:39:29 -05:00
Mathijs Kwik
5a3fa7f88f
nvidia-x11: patch for kernel 3.14 support
2014-04-11 23:40:16 +02:00
Peter Simons
3c7f5870e3
Merge pull request #2197 from offlinehacker/pkgs/lxc/rootfs_fix
...
lxc: set rootfs path somewhere outside /nix/store
2014-04-10 12:34:08 +02:00
Mathijs Kwik
4219eb430d
intel-microcode: upgrade to 20140122
2014-04-10 11:57:20 +02:00
Jaka Hudoklin
c7e94de91f
lxc: set rootfs path somewhere outside /nix/store
...
This commit fixes lxc to eventually work
2014-04-10 11:46:06 +02:00
Ricardo M. Correia
5dfc6584a5
grsecurity: Update stable patch from 3.0-3.2.56-201404062126 -> 3.0-3.2.57-201404091758
2014-04-10 00:37:33 +02:00
Ricardo M. Correia
c50abd0e13
linux: Update to 3.2.57
2014-04-10 00:37:33 +02:00
Peter Simons
2cc462eb11
lxc: update from 1.0.1 to 1.0.3
2014-04-09 12:41:10 +02:00
Peter Simons
30aa995a42
busybox: update from 1.21.1 to 1.22.1
2014-04-09 12:41:10 +02:00
Austin Seipp
3ff158289a
lockdep: refactor into non-kernel package
...
Lockdep doesn't *really* require the kernel package - just the kernel
sources. It's really a user-space tool just compiled from some portable
code within the kernel, nothing more.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-08 19:21:55 -05:00
Eelco Dolstra
2ba552fb2e
Revert "Fix services.udisks.enable."
...
This reverts commit 02a30bea44
,
necessary after reverting to udisks 1.0.4.
http://hydra.nixos.org/build/10194840
2014-04-08 13:28:24 +02:00
Austin Seipp
05ec851050
kernel: longterm updates
...
- longterm: 3.4.85 -> 3.4.86
- longterm: 3.10.35 -> 3.10.36
- longterm: 3.12.15 -> 3.12.17
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-07 13:56:50 -05:00
Austin Seipp
4dc15c087a
musl: version 1.0.0
...
NB: This currently doesn't add a working musl-wrapper around musl-gcc to
allow it to work properly (musl has its own dynamic linker as well as
libc too which must be accounted for). But at the moment it builds fine,
and I plan on working more on it in the future. So lets get it
integrated and building on Hydra.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-07 10:31:31 -05:00
Ricardo M. Correia
807fad571a
grsecurity: Update stable and test patches
...
stable: 3.0-3.2.56-201404012135 -> 3.0-3.2.56-201404062126
test: 3.0-3.13.8-201404011912 -> 3.0-3.13.9-201404062127
2014-04-07 15:31:12 +02:00
Ricardo M. Correia
c494289c12
linux: Update to 3.13.9
2014-04-07 15:31:12 +02:00
Eelco Dolstra
59ea2d7ba5
Apply patch for CVE-2014-0004 to udisks-1.0.4
...
(cherry picked from commit 3b1f989961
)
2014-04-07 13:22:12 +02:00
Eelco Dolstra
fa6b9baea9
Revert "udisks1: bump to fix CVE-2014-0004"
...
This reverts commit 0194a44d63
because
it breaks udisks on 13.10 (e.g. running "udisks --enumerate" will
print "Unit udisks.service failed to load").
(cherry picked from commit d7daf1a47f
)
2014-04-07 13:22:12 +02:00
Shea Levy
9949d0255e
Merge branch 'make-the-kernel-build-repeatable' of git://github.com/alexanderkjeldaas/nixpkgs
...
Make the kernel build and initrd generation binary repeatable (#2128 )
2014-04-06 17:02:16 -04:00
Austin Seipp
ef903555fd
gradm: learn of all accesses for /nix/store
...
This is necessary for gradm's learning mode to work, as otherwise the
/nix/store directory is marked hidden, which causes the kernel to reject
the linker loading ld-linux.so
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-06 21:51:35 +02:00
Austin Seipp
784062214c
gradm: fix gradm_pam path
...
We alredy rewrote /sbin/gradm, which technically matches
/sbin/gradm_pam, so this ends up working exactly as we want. Otherwise
we rewrite twice and gradm can't execute the PAM module with '-p'
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-06 21:51:26 +02:00
Shea Levy
d35619429a
Merge branch 'cache.su' of git://github.com/wkennington/nixpkgs
...
su: Make the su package a provider of only the su binary
Fixes #1877
2014-04-05 18:49:30 -04:00
William A. Kennington III
28ab3acb58
su: Make the su package a provider of only the su binary
...
Additionally, provide su with the base system and remove su from the
util-linux package as it is now provided by shadow.
2014-04-05 16:01:52 -05:00
Alexander Kjeldaas
4aeb10b09a
Make cpufrequtils compilation pure.
2014-04-05 09:08:05 +02:00
Alexander Kjeldaas
c69eb7c2c1
Remove timestamp from the kernel.
2014-04-05 08:40:55 +02:00