Eelco Dolstra
0518ccf5af
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0
Turn more licenses into lib.licenses style
...
Should eval cleanly, as far as -A tarball tells me.
Relevant: issue #2999 , issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát
52404a868d
Merge recent master into staging
...
Nixpkgs Hydra: ?compare=1157272
TODO: port e22889064f
2014-11-05 15:00:44 +01:00
Vladimír Čunát
66ae2a5322
Revert "syslinux: disable parallel building"
...
The change fixed nothing. I'm sorry, I confused the platforms when testing.
The actual problem was fixed by peti.
This reverts commit e682e8018c
2014-11-05 13:24:01 +01:00
Rob Vermaas
c4ab4ce59b
sysklogd: update from 1.5 to 1.5.1, potentially fixes CVE-2014-3634, CVE-2014-3683
2014-11-04 10:18:52 +01:00
Aristid Breitkreuz
b320aad351
Merge pull request #4770 from titanous/linux-testing
...
linux: Update testing 3.17-rc2 -> 3.18-rc3
2014-11-03 20:18:12 +01:00
Jonathan Rudenberg
a97452a000
linux: Update testing 3.17-rc2 -> 3.18-rc3
2014-11-03 14:14:53 -05:00
Mateusz Kowalczyk
219ddb65e1
audit: update from 2.4 to 2.4.1
2014-11-03 17:11:45 +00:00
Evgeny Egorochkin
ab59ef2c52
syslinux: update from 6.02 to 6.03
2014-11-03 12:58:07 +02:00
Vladimír Čunát
e682e8018c
syslinux: disable parallel building
...
It started breaking on master and staging,
e.g. http://hydra.nixos.org/build/16663521 .
Related: #3007 .
2014-11-03 10:32:05 +01:00
Michael Raskin
f3b947bfeb
Update Firejail
2014-11-02 23:51:58 +03:00
Michael Raskin
79254bba65
Update SysDig
2014-11-02 23:51:58 +03:00
Peter Simons
a9c53037fa
Merge remote-tracking branch 'origin/master' into staging.
2014-11-02 16:15:53 +01:00
Ricardo M. Correia
268c72b92b
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.22-201410250026 -> 3.0-3.14.23-201410312212
test: 3.0-3.17.1-201410281754 -> 3.0-3.17.2-201410312213
2014-11-01 17:25:22 +01:00
Alexander Kjeldaas
85972fb58d
Document likely breakage when people update the kernel.
2014-11-01 09:35:20 +01:00
Peter Simons
b11060d8db
Merge remote-tracking branch 'origin/master' into staging.
2014-10-31 11:14:24 +01:00
William A. Kennington III
0467a79129
kernel: 3.16.6 -> 3.16.7
2014-10-30 14:39:17 -07:00
William A. Kennington III
5b37f998fd
kernel: 3.14.22 -> 3.14.23
2014-10-30 14:38:41 -07:00
William A. Kennington III
3ff30fa254
kernel: 3.10.58 -> 3.10.59
2014-10-30 14:38:10 -07:00
William A. Kennington III
6e91f53d87
kernel: Add update script
2014-10-30 14:37:22 -07:00
Shea Levy
659db7e5b2
linux-3.17: bump
2014-10-30 13:09:18 -04:00
Ricardo M. Correia
a9170c0dba
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.22-201410192047 -> 3.0-3.14.22-201410250026
test: 3.0-3.17.1-201410192051 -> 3.0-3.17.1-201410281754
2014-10-30 12:47:36 +01:00
Cillian de Róiste
bdf010ba65
xf86_input_wacom: update from 0.26.1 to 0.26.99.1
2014-10-28 21:44:45 +01:00
Eelco Dolstra
bac50c5c1f
linux: Update to 3.12.31
2014-10-27 11:21:18 +01:00
Eelco Dolstra
f4be4f5e54
Merge remote-tracking branch 'origin/master' into staging
2014-10-24 12:24:13 +02:00
lethalman
2c0cc6cedc
Merge pull request #4587 from uzska/master
...
Added line SCSI_SAS_ATA y on line 62
2014-10-24 09:39:40 +02:00
Vladimír Čunát
2cf17b0802
Merge recent master into staging
...
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Domen Kožar
efea92de19
fixes #1933
2014-10-23 00:14:09 +02:00
Aristid Breitkreuz
0ab9b14e17
make top less red
2014-10-22 21:21:01 +02:00
Ricardo M. Correia
f59afe3994
pax-utils: Update from 0.8.1 -> 0.9.1
2014-10-22 16:47:09 +02:00
Alexander Kjeldaas
005bb796e6
Updated grsec.
2014-10-22 02:18:41 +02:00
Domen Kožar
3514fad7cd
lttng-modules: disable on 3.12 kernel
2014-10-21 21:46:34 +02:00
Domen Kožar
f86ef02678
lttng-modules: update to 2.6.0-rc1
2014-10-21 21:24:02 +02:00
Jaka Hudoklin
ea04d4a77c
Merge pull request #4529 from geerds/ati-driver
...
ati-driver: Fix "Catalyst Control Center"
2014-10-21 01:30:13 +02:00
Eelco Dolstra
38ed4d4d0f
linux: Enable FW_LOADER_USER_HELPER_FALLBACK
...
We don't really need this anymore, except that our docs say that you
can put firmware in /root/test-firmware, which doesn't work via
/sys/module/firmware_class/parameters/path.
2014-10-20 13:25:00 +02:00
William A. Kennington III
bcc687649b
iproute: Remove stale patch
2014-10-19 17:53:41 -07:00
William A. Kennington III
664909d31b
iproute2: 3.16.0 -> 3.17.0
2014-10-19 15:50:48 -07:00
uzska
0fa57137cf
Added line SCSI_SAS_ATA y on line 62
...
This kernel change will make the nixOS live cd detect the hard drive upon boot.
2014-10-17 13:31:08 -07:00
William A. Kennington III
13b9917298
kernel: Fix missing ;
2014-10-16 13:58:18 -07:00
William A. Kennington III
1962fd80f6
kernel: 3.4.103 -> 3.4.104
2014-10-16 13:56:14 -07:00
William A. Kennington III
fdb4e34459
kernel: 3.2.62 -> 3.2.63
2014-10-16 13:56:10 -07:00
William A. Kennington III
0a82ce360d
kernel: 3.17 -> 3.17.1
2014-10-16 13:56:06 -07:00
William A. Kennington III
b8ee248137
kernel: 3.16.4 -> 3.16.6
2014-10-16 13:56:01 -07:00
William A. Kennington III
287ce68d38
kernel: 3.14.20 -> 3.14.22
2014-10-16 13:55:55 -07:00
William A. Kennington III
8c138fd489
kernel: 3.12.29 -> 3.12.30
2014-10-16 13:55:50 -07:00
William A. Kennington III
242070abfc
kernel: 3.10.56 -> 3.10.58
2014-10-16 13:55:38 -07:00
Eelco Dolstra
09dc132e04
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Jascha Geerds
d071a25dec
ati-driver: Fix "Catalyst Control Center"
2014-10-15 00:37:39 +02:00
Bjørn Forsman
b9b193e4a3
lttng-modules: use proper version number
...
And note why we're not using the latest stable release (because of
support for linux >= 3.16).
2014-10-14 21:12:23 +02:00
Domen Kožar
9db2312a50
lttng-modules: fix on kernel 3.2, 3.16, 3.17
2014-10-14 13:48:55 +02:00
