Cray Elliott
08f66013ae
change optionalString to optional in bluez5, fixes evalutation
2014-11-08 20:47:34 -08:00
Cray Elliott
e47c1c1829
add enableWiimote to bluez5 options
2014-11-08 20:44:12 -08:00
Ricardo M. Correia
5701e40681
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.23-201410312212 -> 3.0-3.14.23-201411062033
test: 3.0-3.17.2-201410312213 -> 3.0-3.17.2-201411062034
2014-11-09 02:47:54 +01:00
ambrop7@gmail.com
45aeaf6938
Add conntrack-tools and missing dependencies.
2014-11-09 00:28:21 +01:00
Arseniy Seroka
417216aa57
Revert "Add conntrack-tools and missing dependencies."
2014-11-09 02:12:04 +03:00
ambrop7@gmail.com
085b5ec48c
Add conntrack-tools and missing dependencies.
2014-11-08 23:06:09 +01:00
Luca Bruno
83221f3886
Merge branch 'master' into staging
...
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
lethalman
27b79a0469
Merge pull request #4780 from ambrop72/kernel-ppp-filter
...
kernel: Enable PPP_FILTER by default.
2014-11-08 12:41:13 +01:00
William A. Kennington III
d88c5eed1d
kernel: Add more supported features
2014-11-08 02:44:19 -08:00
Domen Kožar
a0696b4536
linux_3_12: fix hash
2014-11-07 12:39:04 +01:00
Eelco Dolstra
1d5147dd17
linux: Update to 3.12.32
2014-11-06 15:12:01 +01:00
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
Conflicts:
nixos/tests/gnome3_10.nix (auto-solved)
pkgs/applications/video/aegisub/default.nix
pkgs/development/libraries/boost/1.55.nix
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
Eelco Dolstra
884ff252fd
systemd: Update to 217
2014-11-04 15:43:12 +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
ambrop7@gmail.com
fc533f0e84
kernel: Enable PPP_FILTER by default.
...
pppd will try to use it to improve efficiency and complain if it's not available
(but is is not mandatory).
2014-11-02 15:10:09 +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
Franz Pletz
2c321bf296
Add support for global LXC config files
2014-10-18 05:02:39 +02: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
Bjørn Forsman
391c2778d4
lttng: update to latest (2.4.1 -> 2.5.0)
...
- This unbreaks lttng linux kernel modules[1]
- lttng-tools has grown a dependency on libxml2
[1]: Build tested (for default NixOS Linux kernel) and run tested with
lttng-sessiond (it successfully loads kernel modules).
2014-10-13 22:16:32 +02:00
Shea Levy
1a7c1615bf
Update broadcom-sta and fix for new kernels
2014-10-13 13:37:56 -04:00
Longrin Wischnewski
6e7de2155b
change md5sum to sha256sum for a few packages
2014-10-12 16:13:21 +02:00
Michael Raskin
299abee9ab
Update wpa_supplicant
2014-10-12 12:34:16 +04:00
Michael Raskin
1602f9b90a
Update hostapd
2014-10-12 12:34:16 +04:00
Aristid Breitkreuz
cc484f31d2
Merge pull request #4402 from NixOS/udisks-1.0.5
...
udisks: update from 1.0.4 to 1.0.5
2014-10-11 14:06:16 +02:00
Domen Kožar
2e8c67d300
kernelPackages_3_17.{netatop,betman-adv}: disable
2014-10-10 21:35:26 +02:00
Shea Levy
af4455d853
Merge branch 'master' of github.com:ip1981/nixpkgs
...
Fixes for atool & sysstat
2014-10-10 11:40:00 -04:00
Austin Seipp
df4c8d85ae
lockdep: 3.16.1 -> 3.17
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 16:59:14 -05:00
Igor Pashev
c5f4d996fc
Fixed buidling sysstat
...
https://github.com/NixOS/nixpkgs/issues/4441
2014-10-09 21:59:53 +04:00
Eelco Dolstra
666cf992f0
Revert "mdadm: update from 3.3 to 3.3.2"
...
This reverts commit 1faf6106c3
. It
causes the size of the initrd to explode from ~6 MB to 19 MB:
http://hydra.nixos.org/build/15728196
The reason is that mdadm now contains a self-reference:
$ strings ./result/sbin/mdadm | grep /nix/store
...
ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="%s", ENV{ID_PATH}=="%s", RUN+="/nix/store/y1ap6va0av6jhxf7ddnr8vdwxd7b44gd-mdadm-3.3.2/sbin/mdadm --incremental $env{DEVNAME}"
ACTION=="add", SUBSYSTEM=="block", ENV{ID_PATH}=="%s", RUN+="/nix/store/y1ap6va0av6jhxf7ddnr8vdwxd7b44gd-mdadm-3.3.2/sbin/mdadm --incremental $env{DEVNAME}"
/nix/store/y1ap6va0av6jhxf7ddnr8vdwxd7b44gd-mdadm-3.3.2/sbin/mdmon
(Previously, it referred to /sbin/mdadm.) This causes mdadm, glibc and
linux-headers to be added to the initrd.
2014-10-09 18:34:37 +02:00
Aristid Breitkreuz
43a5282d08
procps: update from 3.3.9 to 3.3.10
2014-10-07 23:41:21 +02:00
Aristid Breitkreuz
30f5230b8b
lxc: update from 1.0.3 to 1.0.6
2014-10-07 22:51:54 +02:00
Aristid Breitkreuz
1faf6106c3
mdadm: update from 3.3 to 3.3.2
2014-10-07 21:50:40 +02:00
Ricardo M. Correia
c615793317
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.19-201409282024 -> 3.0-3.14.20-201410062037
test: 3.0-3.16.3-201409282025 -> 3.0-3.16.4-201410062041
2014-10-07 16:55:49 +02:00
Ricardo M. Correia
ebfb506036
spl: Backport compatibility patches for newer kernels
2014-10-07 16:52:14 +02:00
Eelco Dolstra
a85dcf4a00
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/libav/default.nix
pkgs/shells/bash/bash-4.2-patches.nix
pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Eelco Dolstra
4b2ce84872
linux-headers: Bump to 3.12.6
...
(Why 3.12.6? It's the last version that provided a .bz2 tarball ;-)
2014-10-06 23:58:26 +02:00
Aristid Breitkreuz
776af364f3
udisks: update from 1.0.4 to 1.0.5
2014-10-06 22:23:00 +02:00
Aristid Breitkreuz
5b1a616d87
bluez5: update from 5.23 to 5.24
2014-10-06 21:50:59 +02:00
Aristid Breitkreuz
6bdba69702
cifs_utils: update from 6.3 to 6.4
2014-10-06 21:49:44 +02:00
Michael Raskin
2d3b4575a7
Try to fix acpi_call for 3.17
2014-10-06 12:15:46 +04:00
William A. Kennington III
5b80f24b9d
kernel: 3.16.3 -> 3.16.4
2014-10-05 21:34:31 -07:00
William A. Kennington III
c2a301731a
kernel: 3.14.19 -> 3.14.20
2014-10-05 21:34:18 -07:00
William A. Kennington III
4a2ecb2c62
kernel: 3.12.28 -> 3.12.29
2014-10-05 21:34:04 -07:00
William A. Kennington III
c4c28e36e6
kernel: 3.10.55 -> 3.10.56
2014-10-05 21:33:50 -07:00
Michael Raskin
4397ec5cab
Add Linux 3.17
2014-10-06 02:43:58 +04:00
Michael Raskin
e5c90ad374
Update firejail
2014-10-06 02:43:57 +04:00
Michael Raskin
42baf049c5
Update sysdig
2014-10-06 02:43:57 +04:00
Michael Raskin
517a5dbc18
Only update via external upstream information: nead to specify version format
2014-10-06 02:43:57 +04:00
Daniel Peebles
aa7839c145
Clean up command-line tools a bit to allow us to use an impure
...
hdiutil (for an upcoming bootstrapped stdenv for darwin!)
Closes #4382
2014-10-04 20:21:15 +01:00
Nathaniel Baxter
ab8ef63ff4
alsa: Add multilib plugin support via "libs" entry in asound config.
...
alsa: Remove unused $ALSA_PLUGIN_DIRS support.
2014-10-04 14:48:58 +02:00
aszlig
499c51016e
dmraid: Fix install target in lib/Makefile.in.
...
The dmraid shared object file is created with a soname that contains a
version. Unfortunately, the install target in the Makefile does not
properly match on files ending with .so and so does not install it with
the version suffix.
Previously we only had a static library, which doesn't do much trouble
if the version is missing, but with the dynamic library the ELF file
depending on libdmraid uses the version, while the library itself isn't
present with that suffix.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-03 01:14:53 +02:00
Daniel Peebles
c55c435ade
Add Apple command-line tools
...
Closes #4365
2014-10-02 06:50:09 +01:00
Shea Levy
516be15130
Merge branch 'mac-purity' of git://github.com/copumpkin/nixpkgs
...
Let’s compile the Mac OS X SecurityTool ourselves
copumpkin:
This allows us to compile SecurityTool ourselves. There are several more
Apple opensource projects that can be compiled this way that I'll slowly
add.
Remaining sources of impurity:
Reference to absolute path to Xcode. This should be integrated with the
xcode derivation (and the iOS wrapper chain that exists under mobile
development) but it's not obvious how to do that yet.
Absolute reference to xcodebuild.
Adding this should make it possible for #3629 to work reasonably
cleanly.
2014-09-30 21:28:07 -04:00
Cillian de Róiste
990f6406e5
xf86_input_wacom: update from 0.26.0 to 0.26.1
2014-09-30 20:39:47 +02:00