Commit Graph

3736 Commits

Author SHA1 Message Date
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
Eelco Dolstra
ac8e5cd145 uclibc: Update to the latest prerelease
This resolves a segfault in busybox.
2014-10-29 14:55:04 +01:00
Eelco Dolstra
41a479b15f busybox: Optionally use uclibc 2014-10-29 14:44:56 +01:00
Eelco Dolstra
c77b30e3fb uclibc: Fix building against recent kernel headers 2014-10-29 14:18:00 +01:00
Eelco Dolstra
3b2177b769 busybox: Allow running from within the Nix store
This enables running the busybox program directly from the Nix store
(i.e. as /nix/store/<hash>-busybox). We need this for the stdenv
bootstrap.
2014-10-29 13:43:00 +01:00
Eelco Dolstra
423e923182 busybox: Enable building a minimal configuration
This starts with "make allnoconfig" rather than "make defconfig",
making it easier to turn on only the needed features.

Also, fix broken .config generation (the presence of "#" lines
confused parseconfig).
2014-10-29 13:43:00 +01:00
Eelco Dolstra
5cc92eb0d8 Remove obsolete useDietLibC stdenv adapter 2014-10-29 13:43:00 +01:00
Eelco Dolstra
937e1280c0 Rename badly named linuxHeaders_3_7 (it's actually 3.12) 2014-10-29 13:43:00 +01:00
Eelco Dolstra
5b50f0cbc5 busybox: Remove unused patch 2014-10-29 13:42:59 +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
Bjørn Forsman
f96684c71a nfs-utils: add missing python dependency
nfsiostat is written in python.

python is already in the closure of nfs-utils, so this adds no cost.
2014-09-30 18:40:35 +02:00
Mateusz Kowalczyk
a345f5cb20 hdparm: fix expression 2014-09-30 11:26:23 +01:00
Mateusz Kowalczyk
397b0de1c1 hdparm: update from 9.43 to 9.45 2014-09-30 10:39:30 +01:00
Mateusz Kowalczyk
5ca2d7fa03 bluez5: update from 5.22 to 5.23 2014-09-30 10:29:08 +01:00
Mateusz Kowalczyk
f78171792c audit: update from 2.3.2 to 2.4 2014-09-30 10:27:18 +01:00
Dmitry V
3eef950762 seturgent: new package
Closes #4329
2014-09-30 09:53:52 +01:00
Daniel Peebles
58ea86bd87 Let’s compile the Mac OS X SecurityTool ourselves 2014-09-30 01:14:14 -04:00
Pascal Wittmann
f214d5394c linuxconsoletools: update from 1.4.6 to 1.4.7 2014-09-29 20:49:03 +02:00
Ricardo M. Correia
bbdc35d4dd grsecurity: Update stable and test patches
stable: 3.0-3.14.19-201409180900 -> 3.0-3.14.19-201409282024
test:   3.0-3.16.3-201409180901  -> 3.0-3.16.3-201409282025
2014-09-29 14:44:20 +02:00
William A. Kennington III
d084245e74 iproute: Fix regressions introduced in 3.16.0
3.16.0 introduced a regression where vlan and veth devices could not be
created due to a check in the code for existing devices. This applies
the upstream patch which fixes the issue.

Additionally, this corrects the nixos network-interfaces task which now
needs to specify the name parameter when adding links.
2014-09-26 00:45:38 -07:00
Ricardo M. Correia
cf61fa8013 grsecurity: Update stable and test patches
stable: 3.0-3.14.18-201409060013 -> 3.0-3.14.19-201409180900
test:   3.0-3.16.2-201409060014  -> 3.0-3.16.3-201409180901
2014-09-25 23:37:26 +02:00
Michael Raskin
4e92bee51d Update LVM2 2014-09-24 13:39:08 +04:00
Michael Raskin
af5d18edb5 Update atop 2014-09-24 13:32:46 +04:00
Michael Raskin
ea12fb639b Update Firejail 2014-09-24 13:32:46 +04:00
Eelco Dolstra
0bc83f656a iproute2: Update to 3.16.0 2014-09-23 12:07:29 +02:00
Eelco Dolstra
cae28df8fa sysstat: Update to 11.0.1 and install systemd units 2014-09-23 11:51:46 +02:00
Mateusz Kowalczyk
1ffe41b34f Merge branch 'dev/ati-drivers' of https://github.com/nathanielbaxter/nixpkgs 2014-09-22 01:27:00 +01:00
Nixpkgs Monitor
60933879e1 acpid: update from 2.0.22 to 2.0.23 2014-09-21 18:22:16 +01:00
Nathaniel Baxter
61e29cff68 ati_unfree: Cleanup whitespace in builder.sh 2014-09-20 22:45:21 +10:00
Nathaniel Baxter
6ae760b311 ati_unfree: Patch ati binary libs to use /run/opengl-driver-*/lib/dri . 2014-09-20 22:34:51 +10:00
William A. Kennington III
df12cc6ad0 kernel: 3.16.2 -> 3.16.3 2014-09-19 16:28:45 -07:00
William A. Kennington III
a235f6fc70 kernel: 3.14.18 -> 3.14.19 2014-09-19 16:28:32 -07:00
William A. Kennington III
03f044bb5a kernel: 3.10.54 -> 3.10.55 2014-09-19 16:28:20 -07:00
Eelco Dolstra
91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Rob Vermaas
f7f9580545 Merge pull request #4092 from ts468/pam_mount
New packages: pam_mount and libHX
2014-09-17 13:15:22 +02:00
Shea Levy
e2331b52cd util-linux: bump 2014-09-16 11:53:20 -04:00
Cillian de Róiste
f19dec0404 xf86_input_wacom: update from 0.25.99.1 to 0.26.0 2014-09-15 21:53:43 +02:00
Shea Levy
f904ca14a2 kmod: bump 2014-09-15 12:07:00 -04:00
Thomas Strobel
7e4c24af7a Fix description in pam_mount and libHX. Add tstrobel as maintainer. 2014-09-15 12:30:19 +02:00
Thomas Strobel
6366509e54 Merge branch 'upstream' into pam_mount
Conflicts:
	pkgs/top-level/all-packages.nix
2014-09-15 12:15:11 +02:00
Thomas Strobel
66dbde4002 New packages: pam_mount and libHX
Add pam_mount package. Integration into NixOS is still missing.
2014-09-15 11:55:23 +02:00
Vladimír Čunát
d957b4bd78 Merge recent master into staging
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
Alexander Kjeldaas
bee22ab79e libgcrypt, libgpg-error, busybox: improve determinism 2014-09-13 15:04:43 +02:00
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Eelco Dolstra
9a6484b255 smem: Add package
This is a memory reporting tool that accounts for shared memory.
2014-09-11 22:20:02 +02:00
William A. Kennington III
9b6f329813 iw: 3.14 -> 3.15 2014-09-09 21:29:43 -07:00
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát
1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Eelco Dolstra
19b1fafe5f linux: Update to 3.12.28 2014-09-08 15:49:27 +02:00
Ricardo M. Correia
238a84ac78 grsecurity: Update stable and test patches
stable: 3.0-3.14.17-201408260041 -> 3.0-3.14.18-201409060013
test:   3.0-3.15.10-201408212335 -> 3.0-3.16.2-201409060014
2014-09-08 15:16:38 +02:00
Ricardo M. Correia
c155ae31ee Merge pull request #3992 from wkennington/master.kernel
Kernel Updates
2014-09-08 15:15:54 +02:00
Ricardo M. Correia
99d0c10a0b paxctl: Update from 0.8 -> 0.9 2014-09-08 15:14:48 +02:00
Ricardo M. Correia
d5df399a4b gradm: Update from 3.0-201405281853 -> 3.0-201408301734 2014-09-08 15:14:11 +02:00
Eelco Dolstra
152ae27aac Merge remote-tracking branch 'origin/systemd-216' into staging 2014-09-08 13:53:33 +02:00
Eelco Dolstra
585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Nathaniel Baxter
45f4b8b3ad ati_unfree: Towards using ati unfree 32bit binary libs 2014-09-07 12:40:40 +10:00
Nathaniel Baxter
c16874c4c0 ati_unfree: Create a nixos module for the ati_unfree x11 driver and
blacklist the radeon driver when ati_unfree is installed.
2014-09-07 12:40:32 +10:00
Nathaniel Baxter
9a48f9d1b6 ati-drivers: bump version to 14.4 2014-09-07 12:40:24 +10:00
William A. Kennington III
844aef5bcf kernel: 3.16.1 -> 3.16.2 2014-09-06 18:10:13 -07:00
William A. Kennington III
ed7ce2bd81 kernel: 3.14.17 -> 3.14.18 2014-09-06 18:10:01 -07:00
William A. Kennington III
d3f80b36ba kernel: 3.10.53 -> 3.10.54 2014-09-06 18:09:48 -07:00
Shea Levy
f4ebb3ebac klibc: bump 2014-09-05 19:09:00 -04:00
Michael Raskin
bf1493401b Update BATMAN module 2014-09-05 00:24:34 +04:00
Eelco Dolstra
3d821c068a Merge remote-tracking branch 'origin/master' into systemd-216 2014-09-02 14:43:27 +02:00
Peter Simons
1c0d15b90e Merge branch 'origin/master' into staging.
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
Michael Raskin
416b20fbd5 Don't specify Perl version 2014-09-02 03:04:17 +04:00
Michael Raskin
d33a20ef4a Merge pull request #3869 from pmahoney/skarnet
skarnet.org UNIX utilities
2014-09-02 02:15:22 +04:00
Chris Farmiloe
76a4de68c1 formatting/retab 2014-09-02 01:48:50 +04:00
Chris Farmiloe
8ef11bb0ee add openvswitch package + basic nixos module to enable it 2014-09-02 01:48:50 +04:00
Vladimir Kirillov
e15aa51f2f sysdig: cheat nix into not capturing linux-dev as a runtime dependency 2014-09-01 21:28:14 +03:00
Michael Raskin
d9b13c1eb1 Make dmeventd support in lvm2 optional; use it for dmraid 2014-09-01 02:06:41 +04:00
Michael Raskin
5f22bc48cd Update dmraid 2014-08-31 21:16:07 +04:00
Michael Raskin
eecfa6d657 Enable dmeventd 2014-08-31 21:15:57 +04:00
Michael Raskin
eb66d3654f Update and adopt LVM2. 2014-08-31 21:08:56 +04:00
Michael Raskin
8fe8cb204e Update conspy; note the project move to SF.net 2014-08-31 20:18:53 +04:00
Michael Raskin
bddcee7747 Update Firejail 2014-08-31 18:20:06 +04:00
Michael Raskin
b28d7974fb Update SysDig 2014-08-31 18:20:06 +04:00
Eelco Dolstra
4b7f1a9be3 lttng-modules: Mark as broken
These do not build for any kernel:

  http://hydra.nixos.org/eval/1149989?filter=lttng&compare=1149981
2014-08-30 23:14:17 +02:00
Vladimír Čunát
e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Patrick Mahoney
b5f33dc133 s6-linux-utils: new package
s6-linux-utils is a set of minimalistic Linux-specific system utilities.
2014-08-30 00:12:38 -05:00
Mateusz Kowalczyk
badb705a5c libaio: update to 0.3.110 2014-08-29 13:45:04 +01:00
Daniel Peebles
0bb14e4fea Disable NFC on 3.17 or above
This should only be temporary, but there's a bug in the 3.17 rc1 and rc2 that leads to cyclic module dependencies and a segfault during the build process.
2014-08-29 01:49:32 -04:00
Daniel Peebles
1eb08ee693 Add patch to fix 3.17 build breakage (also submitted to lkml, but not yet merged) 2014-08-28 22:45:32 -04:00
Michael Raskin
1fd14fa415 Merge pull request #3100 from tailhook/new-shadow
Upgrade "shadow" to 4.2.1
2014-08-29 00:42:57 +04:00
Austin Seipp
2dc2699ca4 linux/grsec: updates
3.15.10 is EOL soon, but grsecurity/unstable hasn't moved to 3.16.x yet.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-27 15:14:19 -05:00
William A. Kennington III
39b1e2fffc nftables: Add derivation 2014-08-25 14:55:15 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Cillian de Róiste
df88d89332 FFADO: fix build on i686 2014-08-24 19:50:22 +02:00
Cillian de Róiste
4203cdec22 xf86_input_wacom: update from 0.25.0 to 0.25.99.1 2014-08-24 15:19:08 +02:00
Cillian de Róiste
93106b319b ffado: update from 2.1.0 to 2.2.1 2014-08-24 15:11:22 +02:00
Eelco Dolstra
891657b634 systemd: Drop unnecessary dependency 2014-08-24 10:04:55 +02:00
Eelco Dolstra
84fa62b4f3 systemd: Build manpages 2014-08-24 09:59:26 +02:00
Eelco Dolstra
c23bf4ec74 systemd: Update to 216 2014-08-23 23:28:03 +02:00
Eelco Dolstra
ce6b86cc68 Fix various evaluation problems
http://hydra.nixos.org/build/13616685
2014-08-22 11:57:40 +02:00
Luca Bruno
dcf17d3d5d policycoreutils: fix build on i686 for ZHF 2014-08-21 17:29:51 +02:00
Vladimír Čunát
d4e9fd2a90 Merge recent master into staging
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
Vladimír Čunát
25351012b2 nvidia: fix problems with -glsi and glx
..by generalizing the build script.
Obsoletes #3699, and it should finally fix problems around 816d971a.
2014-08-20 23:37:41 +02:00
Austin Seipp
36e1412143 musl: 1.0.0 -> 1.1.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:55:02 -05:00
Austin Seipp
87393f2f2b lockdep: 3.14.4 -> 3.16.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:46:28 -05:00
Vladimír Čunát
2015aecd44 Revert "Copy all so files over from nVidia blob"
This reverts commit 816d971aea.
See discussion on https://github.com/Fuuzetsu/nixpkgs/commit/816d971ae
2014-08-20 02:22:29 +02:00
Cray Elliott
477eb18d18 nvidia-x11: update to 340.32 (close #3365)
Also close #3634.
2014-08-19 21:03:52 +02:00
Eelco Dolstra
e4752d7877 linux: Enable ACLs in ext3
http://hydra.nixos.org/build/13462892
2014-08-18 14:33:09 +02:00
Michael Raskin
fba7d7c4b8 Add Firejail cheap-sandbox-building package 2014-08-18 02:18:33 +04:00
William A. Kennington III
5dfcfefec2 firmware-linux-nonfree: 0.41 -> 0.43 2014-08-17 19:40:59 +02:00
Thomas Strobel
fecd0095ca Upgrade: Intel microcodes -> 20160624 2014-08-17 00:11:43 +02:00
Eelco Dolstra
97d6afafaa systemd: Fix uninitialised memory issue in veth setup
This caused containers to randomly fail, in particular if the machine
name was 8 characters.
2014-08-15 04:07:45 +02:00
Luca Bruno
b83aceaecb Merge branch 'master' into staging 2014-08-14 23:09:59 +02:00
William A. Kennington III
83b2d409ff kernel: 3.2.60 -> 3.2.62 2014-08-14 12:48:06 -05:00
William A. Kennington III
b07f77b2fb kernel: 3.4.101 -> 3.4.103 2014-08-14 12:46:53 -05:00
William A. Kennington III
ca68015291 kernel: 3.10.51 -> 3.10.53 2014-08-14 12:45:14 -05:00
William A. Kennington III
f143df3a09 kernel 3.14.15 -> 3.14.17 2014-08-14 12:44:25 -05:00
William A. Kennington III
ca0aa7e8d1 kernel: 3.15.8 -> 3.15.10 2014-08-14 12:43:41 -05:00
William A. Kennington III
e9ae222199 kernel: 3.16 -> 3.16.1 2014-08-14 12:42:53 -05:00
Vladimír Čunát
a4e1c7df08 selinux: update to 2014-05-06
Sadly, policycoreutils still fails on i686-linux.
2014-08-14 17:59:00 +02:00
Thomas Strobel
0b2b06f9a9 Upgrade: powertop: 2.5 -> 2.6.1 2014-08-14 12:54:21 +02:00
Eelco Dolstra
ab402dc1a4 systemd: Apply a patch that improves systemd-nspawn startup notification
Systemd-nspawn now sends startup notification *after* it has forked
the container init process and performed initialisation (such as
creating veth network interfaces).
2014-08-13 00:47:24 +02:00
Moritz Ulrich
a163d484fc ldm: Bump to 0.5.
We don't build docs because it would pull in git and perl as deps.
2014-08-12 13:52:48 +02:00
Domen Kožar
cb2242a2c2 bluez: 5.16 -> 5.22 2014-08-12 12:23:07 +02:00
Eelco Dolstra
38567ddc80 systemd: Apply backport fixes
In particular, added a few patches that improve systemd-nspawn
container behaviour.
2014-08-12 03:08:22 +02:00
Michael Raskin
c346d22647 Fix checkpolicy build; no idea how to test it 2014-08-12 04:07:29 +04:00
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
Eelco Dolstra
9f822e5477 stdenv: Move paxmark function to paxctl's setup hook 2014-08-09 12:44:50 +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
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