Commit Graph

3256 Commits

Author SHA1 Message Date
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
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