BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
52841 commits 1 branch 0 tags 3.8 GiB
Commit graph

3377 commits

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