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