mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity
23043 commits 329 branches 124 tags 6.7 GiB
Commit graph

2144 commits

Author SHA1 Message Date
Eelco Dolstra b4aa7cd475 systemd: Drop bogus dependency on udev 2012-08-10 18:54:10 -04:00
Eelco Dolstra 1966010ec7 systemd: Update to 188 2012-08-10 18:54:09 -04:00
Lluís Batlle i Rossell 691d069af9 perf: make it take the linux patches 
Otherwise the previous patch I added does not get used for perf.
 2012-08-10 10:03:53 +02:00
Lluís Batlle i Rossell 734bb84f09 linux-3.5: fix perf build with a patch from the perf mailing list 2012-08-10 09:41:43 +02:00
Mathijs Kwik cbb2c3abf2 linux-3.5: upgrade to 3.5.1 2012-08-10 08:27:09 +02:00
Shea Levy 21a200d6b2 linux/manual-config: Fix depmod step, remove false comment 2012-08-07 06:36:50 -04:00
Eelco Dolstra d6cc420fd7 linux: Update to 3.2.26 2012-08-06 09:57:21 -04:00
Mathijs Kwik e8afe3c1c8 add package dstat 2012-08-05 15:10:26 +02:00
Mathijs Kwik aed4ee4025 sysstat: upgrade to 10.1.1 2012-08-05 15:10:25 +02:00
Mathijs Kwik fb99c24d7c kernel-3.5: add aufs3 patch 2012-08-05 01:55:31 +02:00
Michael Raskin b244629571 acpi-call: force example script to be executable 2012-08-03 16:49:57 +04:00
Shea Levy 1935f7e5b8 linux/manual-config: Add informative comment 2012-08-03 08:33:31 -04:00
Michael Raskin f82c864a4b acpi-call: update and fix kernel version handling 2012-08-03 16:20:24 +04:00
Shea Levy 1b7264d349 linux/manual-config.nix: When stripping, use xargs -r in case CONFIG_MODULES=y but no modules are actually installed 2012-08-01 23:32:02 -04:00
Shea Levy 4aba2bb3f5 linux/manual-config: Use kernelPatches like generic.nix, not a plain patches list 2012-08-01 23:02:17 -04:00
Shea Levy fd330e9315 linux/manual-config: Install the kernel with the name given in stdenv.platform.kernelTarget 2012-08-01 15:39:49 -04:00
Shea Levy ad49d92899 linux/manual-config: When installing firmware, create the firmware directory prior to make *_install. 
It is probably a kernel build system bug that this is necessary, but it's not really a big deal either.
 2012-08-01 11:56:12 -04:00
Shea Levy 3f4fd55c63 linux/manual-config: Remove unnecessary quotation 2012-08-01 11:26:30 -04:00
Shea Levy 443b9bc936 linux/kernel/manual-config: use isDisabled instead of isNo in case FIRMWARE_IN_KERNEL is left unspecified 2012-08-01 11:21:32 -04:00
Shea Levy 3dbfca0d7f linux/manual-config: Change from 'features' to 'config' and fix build when firmware is installed. 
Instead of manually adding which 'features' a kernel has based on its config here, just generate a nixexpr representation of the whole config and let places that need it (e.g. NixOS modules) decide how to map config options to features.

Note that if your kernel requires firmware whose hex file sits directly in ${src}/firmware rather than in a subdirectory thereof, you may need this patch for now: https://lkml.org/lkml/2012/7/31/724
 2012-08-01 06:18:03 -04:00
Mathijs Kwik b5d4e8a17a linux-3.4: upgrade to 3.4.7 2012-07-31 10:26:18 +02:00
Eelco Dolstra 5d4916871c libcgroup: Update to 0.38 2012-07-30 13:48:19 -04:00
Shea Levy da4c64026a linux/kernel/manual-config: Greatly simplify config parser 2012-07-29 15:54:31 -04:00
Shea Levy 298b5ccdab linux/kernel/manual-config: Only import from derivation when explicitly asked to 2012-07-29 13:26:39 -04:00
Shea Levy f0694a3151 linux/kernel/manual-config: Do all of the config file parsing in the imported-from derivation 2012-07-29 13:24:05 -04:00
Shea Levy 6585646d41 linux/kernel/manual-config: Add meta 2012-07-29 04:59:38 -04:00
Shea Levy 46fa5ab105 linux/kernel/manual-config: Relink the symlink from the build directory to the source directory after the source directory is moved 2012-07-29 04:56:56 -04:00
Shea Levy f7b6f01da1 linux/kernel/manual-config: Cleanup 2012-07-29 04:52:34 -04:00
Shea Levy 98341e0bda linux/kernel/manual-config: Use the kernel's make install 2012-07-29 04:48:50 -04:00
Shea Levy a9a7085684 linux/kernel/manual-config: Allow manually specifying features, cleanup 2012-07-29 04:31:40 -04:00
Shea Levy 6bb20c7ba2 linux/kernel/manual-config: Strip modules after install 2012-07-29 04:23:28 -04:00
Shea Levy 6b18ab5365 linux/kernel/manual-config: Remove useless INSTALL_MOD_STRIP variable 2012-07-29 04:07:43 -04:00
Shea Levy 6e3b17feec linux/kernel/manual-config: Run depmod after build 2012-07-29 04:01:40 -04:00
Shea Levy 4f713d27f7 kmod: Bump to version 9 2012-07-29 03:57:50 -04:00
Shea Levy 48b5e8eee7 linux/kernel/manual-config: Build in a separate directory and move the build and source trees into $out 2012-07-29 03:49:52 -04:00
Shea Levy e42a6c5f46 linux/kernel/manual-config: Move the build directory to $out instead of symlinking it 2012-07-29 03:27:09 -04:00
Shea Levy a36456ca25 linux/kernel-manual-config: Simplify the lines.nix runCommand now that I know how to escape properly 2012-07-29 03:09:44 -04:00
Shea Levy 5a9d9f4f45 linux/kernel/manual-config: Properly escape makeFlagsArray and installFlagsArray 2012-07-29 02:57:58 -04:00
Shea Levy 471b4bc9bb MODLIB needs to be passed directly to make 2012-07-29 02:49:31 -04:00
Shea Levy aa40e0ff59 linux/kernel/manual-config: The default 'make install' tries to do something with LILO, so install the kernel manually 2012-07-29 01:57:59 -04:00
Shea Levy dfa750732d linux/kernel/manual-config: Properly set env vars referencing $out 2012-07-29 01:34:27 -04:00
Shea Levy ff728a6365 The kernel build needs hostname and perl 2012-07-29 01:29:56 -04:00
Shea Levy bf7467cbb1 Add first attempt at linux/kernel/manual-config. 
The goal of this function is to make it possible to build a kernel with a user provided .config.
As a secondary goal, it will extract NixOS-relevant features from the config automatically.
As a tertiary goal, the build will aim to be simpler than the current generic kernel builder.sh.

Unfortunately, that simplicity is offset by the complexity of the feature extraction, especially since nix segfaults when trying to split the file into lines (so an import from a derivation is used)
 2012-07-29 01:23:51 -04:00
Eelco Dolstra 84b4a086dd nvidia-x11: Update to 304.22 
Now with glorious Xrandr 1.2/1.3 support! No more need to
nvidia-settings!
 2012-07-26 18:59:33 -04:00
Lluís Batlle i Rossell 02e6a689be nvidia-legacy-173: Updating to 173.14.35 
I also add gdk_pixbuf; otherwise nvidia-settings does not start.
 2012-07-26 23:02:29 +02:00
Eelco Dolstra 1b0abce6de linux: Update to 3.2.24 2012-07-26 11:32:53 -04:00
Eelco Dolstra b044cac2fc sysvinit: Don't install mountpoint and wall 
These are already provided by util-linux.
 2012-07-25 23:18:40 -04:00
Eelco Dolstra 60a63886f0 shadow: Don't install ‘groups’ 
Coreutils already provides this command.
 2012-07-25 23:18:40 -04:00
Eelco Dolstra 732ea6382a shadow: Update to 4.1.5.1 
Fixes CVE-2005-4890 and CVE-2011-0721.
 2012-07-25 23:18:40 -04:00
Eelco Dolstra 830aa1a2f0 ipw2100-fw: Drop runtime dependency on binutils etc. 2012-07-25 14:31:58 -04:00
Eelco Dolstra 0d5f1fd833 upower: Update to 0.9.17 2012-07-24 22:45:26 -04:00
Eelco Dolstra ddb5bd38bb kbd: Update to 1.15.3 2012-07-24 22:33:39 -04:00
Eelco Dolstra 99413d3e3c kbd: Hard-code the path to gzip/bzip2 
This is necessary for systemd-vconsole-setup.service in systemd.
 2012-07-24 22:33:39 -04:00
Shea Levy 8c9bef04a6 linux-3.5: Enable XEN_DOM0 support 2012-07-24 02:26:04 +00:00
Shea Levy 053f641d16 Add linux-3.5 2012-07-22 11:33:00 -04:00
Eelco Dolstra 2547e0e96a systemd: Use an interface version, just like we have for Upstart 2012-07-22 01:18:01 -04:00
Eelco Dolstra 44cf3d5808 systemd: Update to 187 2012-07-20 10:44:19 -04:00
Mathijs Kwik f3b43a268d linux-3.4: update to 3.4.6 2012-07-20 13:37:46 +02:00
Eelco Dolstra bfc2de46d1 sysklogd: Support systemd socket-based activation 
Syslogd cannot open /dev/log directly but must receive syslog messages
from systemd (http://www.freedesktop.org/wiki/Software/systemd/syslog).
The patch adds support for that.
 2012-07-19 12:46:39 -04:00
Eelco Dolstra 28a76a96be libcap: Update to 2.22 
Systemd requires the recent CAP_SYSLOG capability.
 2012-07-19 10:26:44 -04:00
Vladimír Čunát 196f5cb265 Fix broadcom_sta for linux-3.4 and clean nix source. 
Idea from Kevin Quick, implementation from Gentoo. Also cleaned and
added a minor license patch from Gentoo. Builds for many x86_64 kernels.
 2012-07-19 11:42:40 +02:00
Shea Levy 4497344e49 Merge branch 'master' into x-updates 2012-07-18 23:24:10 -04:00
Cillian de Róiste 70298ba42c Fix style: The meta.description field should be capitalised (niksnut) 2012-07-18 23:35:20 +02:00
Cillian de Róiste 933205acaf Add the sha256 for xf86-video-nested 2012-07-18 23:04:00 +02:00
Cillian de Róiste 8ebb309320 Pin xf86-video-nested to a revision that works with Xorg 7.6 2012-07-18 22:52:43 +02:00
Cillian de Róiste 6efd9b24d3 Add xf86-video-nested 
This does not yet compile. I had a working version from an obsolete github repo, but then found the upstream repo. Perhaps it needs a newer Xorg.
 2012-07-18 22:52:16 +02:00
Eelco Dolstra 26fa2425c6 Fix dmraid build 
http://hydra.nixos.org/build/2842473
 2012-07-18 09:25:58 -04:00
Shea Levy d04cbc85cf linux-3.4: Update to 3.4.5 2012-07-16 20:26:27 -04:00
Shea Levy 1e4e0c18b8 xf86-input-wacom: Update to 0.16.0 2012-07-15 23:03:23 -04:00
Cillian de Róiste 039b709041 Fix the hardcoded /usr/local path in the debug ffado-diag, diagnostic script 2012-07-15 11:51:49 +02:00
Eelco Dolstra dc5ba23ab4 linux: Update to 3.2.23 2012-07-14 17:41:52 -04:00
Shea Levy a47ba7a6f7 xf86-input-mtrack: Update, use pixman 2012-07-14 16:32:20 -04:00
Shea Levy c514ee974a Merge remote-tracking branch 'upstream/master' into x-updates 
mountall conflict was trivial

Conflicts:
	pkgs/os-specific/linux/mountall/default.nix
 2012-07-14 14:24:27 -04:00
Shea Levy 6bf409999f linux-3.4: Add the improved transaction scheduler for USB 2.0 
This is needed for new Apple trackpads
 2012-07-14 12:17:28 -04:00
Shea Levy 685acc6ef8 Linux 3.4: Enable options to make b43 work with bcm4331 2012-07-13 22:48:43 -04:00
Shea Levy 1a1ee54241 The word is spelled 'licenses', not 'lisences' 2012-07-13 20:58:58 -04:00
Shea Levy 5330b4a343 Add b43-firmware-5.100.138 
Placed into a versioned nix file because kernels older than 3.2 need an older version.
 2012-07-13 18:31:09 -04:00
Shea Levy 9d387d616d Add b43-firmware-cutter 2012-07-13 18:00:00 -04:00
Peter Simons cfb08fc600 mountall: strip trailing whitespace 2012-07-10 22:26:27 +02:00
Eelco Dolstra 0b07259865 linux: Update to 3.2.22 2012-07-10 09:18:12 -04:00
Eelco Dolstra 9abd2194ce Revert "qemu-kvm: update to 1.1.0" 
This reverts commit df645c22cc.

KVM 1.1.0 breaks several VM builds.  The NixOS installer tests hang:

  http://hydra.nixos.org/build/2763935

but worse, some builds give random failures indicating corruption:

  http://hydra.nixos.org/build/2776221
  http://hydra.nixos.org/build/2776180
  http://hydra.nixos.org/build/2769347
  http://hydra.nixos.org/build/2769337
 2012-07-08 18:42:55 -04:00
Eelco Dolstra 1afb3b58e1 systemd: Update to 186 2012-07-05 17:31:38 -04:00
Eelco Dolstra df645c22cc qemu-kvm: update to 1.1.0 2012-07-05 12:55:50 -04:00
Shea Levy 015e7594d0 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2012-07-02 11:27:25 -04:00
Peter Simons 82b2588e35 Linux no-xsave.patch: commit patch into Nixpkgs since fetchurl no longer works 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 16:53:53 +02:00
Peter Simons 09bb4b0292 ati-drivers: update download URL 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 16:53:52 +02:00
Peter Simons c64e1c214f psmisc: update to version 22.19 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 16:53:52 +02:00
Eelco Dolstra b5949d2509 busybox: Update to 1.20.1 2012-06-28 14:05:56 -04:00
Peter Simons aa5b45fc3e amd-ucode: add AMD processor microcode patch version 2012-01-17 
Enable by adding "hardware.firmware = [ pkgs.amdUcode ];" to configuration.nix.
 2012-06-28 19:54:24 +02:00
Lluís Batlle i Rossell 876ff45fd5 linux perf: Allowing perf to build with its gtk interface. 
Disabled by default, it can be enabled using overrides.
 2012-06-27 22:23:15 +02:00
Shea Levy 8cc0edaeba Merge branch 'master' into stdenv-updates 
ssp is disabled for glibc-2.13 unconditionally
 2012-06-27 13:48:22 -04:00
Mathijs Kwik f97a277efc linux kernel: 3.4.2 -> 3.4.4 2012-06-24 10:03:09 +02:00
Eelco Dolstra d3cdacab03 klibc: Fix URL 
P.S. the only reason we need klibc is because of the "nfsmount"
program in the initrd.  But I'm pretty sure we can use Busybox's mount
command there.
 2012-06-22 12:02:12 -04:00
Eelco Dolstra 023e8f2fb9 * Linux 3.2.21. 
svn path=/nixpkgs/trunk/; revision=34570
 2012-06-20 12:42:56 +00:00
Eelco Dolstra 1c5f4b8b45 * Fix the gid for /dev/pts/ ttys. 
svn path=/nixpkgs/trunk/; revision=34566
 2012-06-19 19:58:49 +00:00
Eelco Dolstra 6551b822af * Enable devtmpfs since recent udev (systemd) versions need it. 
svn path=/nixpkgs/trunk/; revision=34565
 2012-06-19 19:10:54 +00:00
Eelco Dolstra 1582276602 * Drop some old obsolete kernels and unused patches. 
svn path=/nixpkgs/trunk/; revision=34558
 2012-06-19 15:56:17 +00:00
Eelco Dolstra cf6db2bbac * "powermanagement" is not a word. 
svn path=/nixpkgs/trunk/; revision=34557
 2012-06-19 15:01:49 +00:00
Lluís Batlle i Rossell 972006aa43 Making nvidia 96.x build on linux 3.4. I took patches from AUR. 
svn path=/nixpkgs/trunk/; revision=34552
 2012-06-18 18:15:26 +00:00
Lluís Batlle i Rossell a5c2318d08 Fixing the mips patch for sigill fpu cases. 
svn path=/nixpkgs/trunk/; revision=34527
 2012-06-16 15:37:04 +00:00
Lluís Batlle i Rossell 3874e5812d Adding two kernel patches for mips, that make the life easier on loongson2f 
(less sigill, less sigbus). Related to bad handling of FPU instructions.

I apply them only to linux 3.4, although I think they can apply to many older kernels too.


svn path=/nixpkgs/trunk/; revision=34522
 2012-06-16 10:49:03 +00:00
Eelco Dolstra 404c21de2f * kmod: look in /etc/modprobe.d. 
svn path=/nixpkgs/trunk/; revision=34521
 2012-06-15 18:12:25 +00:00
Eelco Dolstra 9e76f38ee2 * kmod updated to version 8. Disabled the xz and zlib dependencies 
because they're inconvenient in the initrd.  Put modprobe etc. in
  $out/sbin.

svn path=/nixpkgs/trunk/; revision=34520
 2012-06-15 17:58:42 +00:00
Eelco Dolstra d9df48bd36 * Copy some things from the udev package. 
svn path=/nixpkgs/trunk/; revision=34519
 2012-06-15 17:06:06 +00:00
Eelco Dolstra 44210695c8 * systemd: fix path to loadkeys/setfont, and add SysV compatibility 
links (reboot/shutdown/etc.).

svn path=/nixpkgs/trunk/; revision=34515
 2012-06-14 22:10:52 +00:00
Eelco Dolstra 4cfe058218 * Linux 3.2.20. 
svn path=/nixpkgs/trunk/; revision=34486
 2012-06-12 22:27:55 +00:00
Mathijs Kwik 3d4ab75229 linux kernel headers: copy generated headers as well 
as they are referenced from other kernel headers, this seems like the
best thing to do. Ubuntu seems to do so too.

Fixes issues with nvidia's binary driver and bbswitch on kernels > 3.3

svn path=/nixpkgs/trunk/; revision=34469
 2012-06-11 17:41:11 +00:00
Mathijs Kwik 46beccef20 linux kernel aufs (needed for livecd): added to 3.4 
upgraded 3.3 version to stable

svn path=/nixpkgs/trunk/; revision=34468
 2012-06-11 17:41:05 +00:00
Eelco Dolstra d63bcce038 * Added pam_ssh_agent_auth, a PAM module for authentication through 
the SSH agent.

svn path=/nixpkgs/trunk/; revision=34462
 2012-06-11 16:45:54 +00:00
Florian Friesdorf a44af6bbc1 powertop-2.0 
svn path=/nixpkgs/trunk/; revision=34451
 2012-06-11 10:28:21 +00:00
Lluís Batlle i Rossell 1697485678 Updating linux 3.4.1 to 3.4.2 
svn path=/nixpkgs/trunk/; revision=34423
 2012-06-10 15:24:28 +00:00
Lluís Batlle i Rossell 9ebd661fb8 Updating linux 3.4 to 3.4.1 
svn path=/nixpkgs/trunk/; revision=34411
 2012-06-09 20:25:48 +00:00
Eelco Dolstra dd6ab8d7bf * Linux 3.2.19. 
svn path=/nixpkgs/trunk/; revision=34382
 2012-06-08 13:11:38 +00:00
Arie Middelkoop 3c74283d03 Committing some outstanding modifications that I cannot make into smaller chunks anymore. 
* added briss: a pdf cropper
* added compton, an improved fork of xcompmgr
* added myself to the maintainers list
* minor version bumps: xcompmgr, upower


svn path=/nixpkgs/trunk/; revision=34380
 2012-06-08 10:16:46 +00:00
Eelco Dolstra e9a003e3a2 * Updated systemd to 185 (which I overlooked because of the version 
jump).  This contains the merged udev.

svn path=/nixpkgs/trunk/; revision=34371
 2012-06-06 16:07:30 +00:00
Lluís Batlle i Rossell 0332f87a0b Adding windows jom; it does not build for me still, but it's close to it. 
I think it's better to share it though. I wrote a comment about the expression
not building.


svn path=/nixpkgs/trunk/; revision=34365
 2012-06-05 21:24:27 +00:00
Eelco Dolstra 1d828ffaab * systemd: use units in /etc rather than $out/etc. Also fix 
references to mount/umount.

svn path=/nixpkgs/trunk/; revision=34332
 2012-06-04 03:21:12 +00:00
Eelco Dolstra fd0a9f6bae * util-linux updated to 2.21.2. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=34280
 2012-05-29 17:11:55 +00:00
Lluís Batlle i Rossell 472808c5f9 Adding mesa and libaio to qemu-kvm. As for libaio, I think it runs much better for IO for me. 
svn path=/nixpkgs/trunk/; revision=34254
 2012-05-28 09:13:30 +00:00
Lluís Batlle i Rossell 383b76df79 Fixing mingw-w64 builds. I can build simple C++ programs with gccCrossStageFinal. 
I also add tests for hydra; let's see if it builds far.


svn path=/nixpkgs/trunk/; revision=34232
 2012-05-24 22:07:23 +00:00
Lluís Batlle i Rossell 1402a2ebc3 Fixing the paths of uclibc libpthread 
svn path=/nixpkgs/trunk/; revision=34229
 2012-05-24 21:44:34 +00:00
Lluís Batlle i Rossell 3729f9ce5e Trying to add a few bits of mingw-w64. To be tested. 
svn path=/nixpkgs/trunk/; revision=34228
 2012-05-24 21:23:23 +00:00
Lluís Batlle i Rossell 37fce10f9b Adding native threads support unconditionally to uclibc, 
or gcc fails to build (lack of pthread.h).

Let's see if this breaks anything; I'm changing this to make comtrend.nix work
(kernel 2.4).


svn path=/nixpkgs/trunk/; revision=34227
 2012-05-24 19:16:00 +00:00
Lluís Batlle i Rossell d5a5a30ae0 Adding UCLIBC_SUSV4_LEGACY, otherwise we get this building gcc: 
armv5tel-unknown-linux-gnueabi/libstdc++-v3/include/cstdio:133:11: error: '::tmpnam' has not been declared

http://hydra.nixos.org/build/2644907


svn path=/nixpkgs/trunk/; revision=34226
 2012-05-24 19:12:36 +00:00
Lluís Batlle i Rossell 70074d2b98 Updating uclibc. This fixes some cross builds. 
svn path=/nixpkgs/trunk/; revision=34223
 2012-05-24 17:25:03 +00:00
Lluís Batlle i Rossell a1d64b8082 Updating the nvidia 295 driver, so it builds with linux 3.4. 
svn path=/nixpkgs/trunk/; revision=34211
 2012-05-22 18:12:46 +00:00
Lluís Batlle i Rossell 8805bf1ba5 'perf' wants flex and bison, since linux 3.4. 
svn path=/nixpkgs/trunk/; revision=34210
 2012-05-22 17:32:23 +00:00
Lluís Batlle i Rossell 5c393a469b Adding linux 3.4. 
svn path=/nixpkgs/trunk/; revision=34209
 2012-05-22 15:29:51 +00:00
Lluís Batlle i Rossell 7962af0fe5 Updating libv4l (part of v4l-utils). I moved v4l-utils to stdenv.mkDerivation style, 
and it's used to build either libv4l or the utils (with qt4).


svn path=/nixpkgs/trunk/; revision=34208
 2012-05-22 14:30:12 +00:00
Eelco Dolstra 4ac1552b15 * Added systemd. 
svn path=/nixpkgs/trunk/; revision=34200
 2012-05-21 20:48:19 +00:00
Eelco Dolstra 690051abbc * Linux 3.2.18. 
svn path=/nixpkgs/trunk/; revision=34198
 2012-05-21 18:14:47 +00:00
Eelco Dolstra 41840af689 * Add a setup hook ‘autoreconfHook’ to simplify packages that need to 
run autoreconf:

    buildInputs = [ autoreconfHook ];

  is essentially equivalent to

    buildInputs = [ autoconf automake libtool ];
    preConfigure = "autoreconf -i";

svn path=/nixpkgs/branches/x-updates/; revision=34181
 2012-05-19 02:52:36 +00:00
Eelco Dolstra 76c0be09f8 * Updated usbutils to 005. (Upstream decided to restart numbering 
versions from 001.  Urgh.)

svn path=/nixpkgs/branches/x-updates/; revision=34180
 2012-05-19 00:44:30 +00:00
Eelco Dolstra ca74fa40db * Updated the USB IDs. 
svn path=/nixpkgs/branches/x-updates/; revision=34179
 2012-05-19 00:14:33 +00:00
Marco Maggesi d61fb6e4ca BLCR fix arsert to include kernel versions 2.6.38.x 
svn path=/nixpkgs/trunk/; revision=34134
 2012-05-16 08:44:20 +00:00
Marco Maggesi ebb486baf8 Typo 
svn path=/nixpkgs/trunk/; revision=34100
 2012-05-15 06:52:38 +00:00
Marco Maggesi 4d90c6b835 Add assertion: BLCR do not build on recent kernels 
svn path=/nixpkgs/trunk/; revision=34098
 2012-05-15 06:28:14 +00:00
Eelco Dolstra 7a6887fc8a * Cryptsetup updated to 1.4.2. 
svn path=/nixpkgs/trunk/; revision=34090
 2012-05-14 20:27:55 +00:00
Eelco Dolstra da01b6db17 * Linux 3.2.17. 
svn path=/nixpkgs/trunk/; revision=34073
 2012-05-12 19:55:39 +00:00
Eelco Dolstra 42ac6a45aa * FUSE updated to 2.8.7. 
svn path=/nixpkgs/trunk/; revision=34072
 2012-05-12 19:46:07 +00:00
Shea Levy b64a1dac46 Linux 3.3.6 
svn path=/nixpkgs/trunk/; revision=34070
 2012-05-12 17:50:19 +00:00
Eelco Dolstra 196c30de9b * Linux 3.0.31. 
svn path=/nixpkgs/trunk/; revision=34036
 2012-05-09 21:49:39 +00:00
Mathijs Kwik 5ff5c38cb6 bbswitch: upgraded to 0.4.2 
svn path=/nixpkgs/trunk/; revision=34025
 2012-05-09 10:01:38 +00:00
Lluís Batlle i Rossell b713e291a4 The jujuutils are meant for a recent kernel, more recent than our linuxHeaders. 
Therefore I add recent linuxHeaders for it.

It's quite a hack to build it mixed with 2.6.35 headers and 3.3.5, but it builds at least.


svn path=/nixpkgs/trunk/; revision=34021
 2012-05-08 16:38:21 +00:00
Lluís Batlle i Rossell 671857995d Adding jujuutils. 
svn path=/nixpkgs/trunk/; revision=34020
 2012-05-08 15:31:21 +00:00
Shea Levy 829e78f78f Linux 3.3.5 
svn path=/nixpkgs/trunk/; revision=34011
 2012-05-07 22:24:35 +00:00
Shea Levy 497a4afe72 We no longer need the bootstub config patch 
svn path=/nixpkgs/trunk/; revision=33987
 2012-05-05 14:26:20 +00:00
Shea Levy 242e54dab6 Linux 3.3.4 (not compile tested, sorry 
svn path=/nixpkgs/trunk/; revision=33956
 2012-04-30 17:31:39 +00:00
Eelco Dolstra 7716976345 * Linux 3.2.16. 
svn path=/nixpkgs/trunk/; revision=33908
 2012-04-24 13:54:33 +00:00
Ludovic Courtès 04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'. 
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
 2012-04-23 15:47:31 +00:00
Shea Levy 50a0b839af Linux 3.3.3 
This incorporates the btrfs fix, so remove that patch. Also, I will test
that this builds after committing, and fix it if it fails

svn path=/nixpkgs/trunk/; revision=33885
 2012-04-23 00:12:47 +00:00
Eelco Dolstra d0300a2776 * Switch to QEMU/KVM 1.0.1. 
svn path=/nixpkgs/trunk/; revision=33878
 2012-04-22 16:30:27 +00:00
Eelco Dolstra f92ee1a13d * QEMU/KVM 1.0.1. Will make this the default if it looks stable. 
svn path=/nixpkgs/trunk/; revision=33847
 2012-04-19 18:39:58 +00:00
Eelco Dolstra 6a01fe514e * Fix PAM. It accidentally lost xcrypt support in r33798. 
svn path=/nixpkgs/trunk/; revision=33845
 2012-04-19 15:15:39 +00:00
Ludovic Courtès 40675e46bd GNU Hurd: Use preConfigure' to autoreconf' only. 
svn path=/nixpkgs/trunk/; revision=33835
 2012-04-18 18:42:44 +00:00
Ludovic Courtès 61bb81195f GNU Hurd: Restructure for easier overriding, and easier avoided rebuilds. 
svn path=/nixpkgs/trunk/; revision=33834
 2012-04-18 17:22:10 +00:00
Nicolas Pierron 82b308bf11 Add armv7l support. 
svn path=/nixpkgs/trunk/; revision=33798
 2012-04-15 23:41:25 +00:00
Eelco Dolstra 73d98c07c2 * Linux 3.2.15. 
svn path=/nixpkgs/trunk/; revision=33794
 2012-04-15 16:23:08 +00:00
Eelco Dolstra 641576e0cc * Fix alsa-utils. http://hydra.nixos.org/eval/603729 
svn path=/nixpkgs/trunk/; revision=33782
 2012-04-14 11:46:45 +00:00
Lluís Batlle i Rossell 8ebd53f45f Updating linux to 3.3.2 
svn path=/nixpkgs/trunk/; revision=33779
 2012-04-13 18:09:27 +00:00
Mathijs Kwik 100b95e57e alsa upgraded to 1.0.25 
svn path=/nixpkgs/trunk/; revision=33777
 2012-04-13 14:54:02 +00:00
Mathijs Kwik 9b5ca91497 nvidia driver: upgraded to 295.40 
svn path=/nixpkgs/trunk/; revision=33776
 2012-04-13 14:53:59 +00:00
Lluís Batlle i Rossell b35d2c6b89 Adding a patch for linux 3.3 for btrfs regarding ENOSPC. 
This should solve the problem I had, where I could not boot either 3.3 or 3.3.1
in my system, as I got ENOSPC all the time.


svn path=/nixpkgs/trunk/; revision=33714
 2012-04-09 21:02:17 +00:00
Lluís Batlle i Rossell 5dfcf18801 Adding a minimal FTRACE to the 3.2 and 3.3 linux kernels, that should not 
affect the kernel performance, but allow more tracing.


svn path=/nixpkgs/trunk/; revision=33713
 2012-04-09 21:01:00 +00:00
Cillian de Roiste e1155499ad Reverting to revision 1995, this is what AVLinux uses, and works well with jackdbus too 
svn path=/nixpkgs/trunk/; revision=33670
 2012-04-08 11:10:11 +00:00
Cillian de Roiste 285af645e6 Adding extra requirements, fixing some of the ffado utilities 
svn path=/nixpkgs/trunk/; revision=33664
 2012-04-07 23:57:30 +00:00
Ludovic Courtès e24eab9b87 GNU: Use `callPackage'. 
svn path=/nixpkgs/trunk/; revision=33649
 2012-04-06 13:18:58 +00:00
Cillian de Roiste bbd76bc29a Adding ffado, Linux Firewire audio drivers 
svn path=/nixpkgs/trunk/; revision=33634
 2012-04-05 21:53:42 +00:00
Eelco Dolstra 8e160830c1 * Doh. 
svn path=/nixpkgs/trunk/; revision=33620
 2012-04-05 13:09:30 +00:00
Eelco Dolstra 9a1080d7ea * Enable NUMA. On our 48-core machines this cut the duration of a 
kernel build from 12m27s to 4m42s.

svn path=/nixpkgs/trunk/; revision=33616
 2012-04-05 12:26:13 +00:00
Eelco Dolstra 7d2b8fe48f * Upstart 1.5. 
svn path=/nixpkgs/trunk/; revision=33615
 2012-04-05 12:24:08 +00:00
Ludovic Courtès dd822c7ece GNU: Fix stale references. 
svn path=/nixpkgs/trunk/; revision=33595
 2012-04-04 21:24:09 +00:00
Ludovic Courtès 3226d8b91d GNU: Avoid `__overrides' altogether, by using a non-recursive attrset. 
Thanks to Eelco for the suggestion.

svn path=/nixpkgs/trunk/; revision=33587
 2012-04-04 20:25:51 +00:00
Ludovic Courtès 1663ca3344 GNU: Use overrides' instead of __overrides' for the argument itself. 
svn path=/nixpkgs/trunk/; revision=33585
 2012-04-04 20:05:48 +00:00
Ludovic Courtès e0ca8e74ff GNU: Add an `__overrides' parameter. 
svn path=/nixpkgs/trunk/; revision=33584
 2012-04-04 19:50:15 +00:00
Shea Levy f3f8040aaf kmod: Create compat program symlinks 
svn path=/nixpkgs/trunk/; revision=33579
 2012-04-04 19:28:33 +00:00
Shea Levy 4d0fdc5e6b kmod: respect MODULE_DIR 
svn path=/nixpkgs/trunk/; revision=33578
 2012-04-04 19:24:07 +00:00
Eelco Dolstra 23957ac824 * Updated htop to 1.0.1. 
svn path=/nixpkgs/trunk/; revision=33566
 2012-04-04 14:46:17 +00:00
Shea Levy 8cd391b130 Whoops, don't need modDirVersion for 3.3.1 
svn path=/nixpkgs/trunk/; revision=33547
 2012-04-02 20:18:52 +00:00
Shea Levy 8585f4000b Linux 3.3.1 
svn path=/nixpkgs/trunk/; revision=33546
 2012-04-02 20:15:19 +00:00
Lluís Batlle i Rossell 3153e80659 Adding tp_smapi. 
Patch by Rok Garbas, who also adds himself as a maintainer.


svn path=/nixpkgs/trunk/; revision=33495
 2012-03-31 13:40:34 +00:00
Yury G. Kudryashov 0ad6c091e7 pam_usb: drop hal dependency 
It doesn't use hal, though many functions are named *_hal_*. All d-bus calls
actually ask UDisks.

svn path=/nixpkgs/trunk/; revision=33476
 2012-03-29 18:02:10 +00:00
Shea Levy 343fb0be1e Add kmod, the replacement for the now-defunct module-init-tools 
The kmod tools appear to take a flag to name the location of the modules
directory, so we may not need to migrate our module-init-tools patches

svn path=/nixpkgs/trunk/; revision=33413
 2012-03-25 20:05:36 +00:00
Lluís Batlle i Rossell 61d475d2e0 nfs-utils PAGE_SIZE patch. 
Otherwise it fails on ARM.

Patch by Rickard Nilsson.


svn path=/nixpkgs/trunk/; revision=33329
 2012-03-21 11:56:33 +00:00
Lluís Batlle i Rossell 28027d4771 Aestethic changes suggested by Eelco, and trying to fix 
the problem on rpc.statd, that looks at /etc/netconfig.

Problem: http://hydra.nixos.org/build/2310686/log/raw


svn path=/nixpkgs/trunk/; revision=33322
 2012-03-21 09:18:40 +00:00
Lluís Batlle i Rossell b2d61a850d Enabling nfsv4 and nfsv41 in nfsUtils (or at least I think so). 
svn path=/nixpkgs/trunk/; revision=33315
 2012-03-20 23:17:45 +00:00
Shea Levy bdc3de6a4d Pommed: find the 'eject' command in /var/setuid-wrappers:/home/shlevy/.nix-profile/bin:/home/shlevy/.nix-profile/sbin:/home/shlevy/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec 
svn path=/nixpkgs/trunk/; revision=33302
 2012-03-20 18:28:32 +00:00
Shea Levy 8d1d247e02 Add nouveau xorg video driver 
svn path=/nixpkgs/trunk/; revision=33300
 2012-03-20 16:29:22 +00:00
Eelco Dolstra 995a44a897 * Fix a race condition in mountall: the USR1 signal handler must be 
installed before we daemonise, otherwise another job might send 
  USR1 to mountall before the handler is installed, killing it.

svn path=/nixpkgs/trunk/; revision=33289
 2012-03-20 10:25:11 +00:00
Eelco Dolstra 42b97b78b0 * Mountall updated to 2.35. 
svn path=/nixpkgs/trunk/; revision=33287
 2012-03-20 10:00:04 +00:00
Shea Levy f272acd501 Add a module for the pommed tool for Apple laptop keyboards. 
svn path=/nixpkgs/trunk/; revision=33286
 2012-03-20 04:41:13 +00:00
Shea Levy 836532a54b Whoops, forgot meta 
svn path=/nixpkgs/trunk/; revision=33284
 2012-03-20 01:51:03 +00:00
Shea Levy 6fe5413cb7 xf86-input-multitouch seems to be abandoned, update it with the mtrack fork 
svn path=/nixpkgs/trunk/; revision=33283
 2012-03-20 01:48:09 +00:00
Shea Levy a74565238a Linux 3.3 puts some of its headers in include/generated 
svn path=/nixpkgs/trunk/; revision=33282
 2012-03-20 00:02:24 +00:00
Eelco Dolstra 2199d375a2 * Updated lvm2 to 2.02.95. 
svn path=/nixpkgs/trunk/; revision=33277
 2012-03-19 19:34:34 +00:00
Eelco Dolstra 6b4cd6673a * Add a utility function "versionOlder" to compare two version 
strings.

svn path=/nixpkgs/trunk/; revision=33267
 2012-03-19 18:04:47 +00:00
Shea Levy 47574d25f6 Fix some broken firmware URLS. Hope the Fedora project wouldn't host non-free firmware... 
svn path=/nixpkgs/trunk/; revision=33265
 2012-03-19 17:40:23 +00:00
Shea Levy 1e8dfa4e2c Linux 3.3 release 
svn path=/nixpkgs/trunk/; revision=33260
 2012-03-19 15:36:40 +00:00
Mathijs Kwik d329b66b73 bbswitch: use the modDirVersion instead of version 
svn path=/nixpkgs/trunk/; revision=33244
 2012-03-18 23:13:41 +00:00
Shea Levy dfcd4dd559 Add a kernel patch for the efi boot stub to read a config file when booted without arguments, and base removable media booting off of that patch 
The patch is currently being discussed on LKML and hopefully will be included
in mainline in some form in the future. Note that booting from the livecd has
to do a lot of work before anything is output to the console, so if the drive
is still busy don't assume the boot has hanged

svn path=/nixpkgs/trunk/; revision=33235
 2012-03-18 17:14:52 +00:00
Lluís Batlle i Rossell a544da22fc Adding latencytop. 
svn path=/nixpkgs/trunk/; revision=33233
 2012-03-18 11:45:53 +00:00
Lluís Batlle i Rossell ef1437585d Adding kexectools. 
svn path=/nixpkgs/trunk/; revision=33175
 2012-03-16 21:17:13 +00:00
Eelco Dolstra b2f0319bc2 * nfs-utils updated to 1.2.5. 
svn path=/nixpkgs/trunk/; revision=33158
 2012-03-16 13:55:10 +00:00
Eelco Dolstra a3b099d279 * Latest 3.0.x, 3.1.x and 3.2.x kernels. 
svn path=/nixpkgs/trunk/; revision=33151
 2012-03-16 12:08:41 +00:00
Shea Levy 0845f6618c Add an 'efiBootStub' kernel feature to be used by NixOS 
svn path=/nixpkgs/trunk/; revision=33137
 2012-03-16 02:45:47 +00:00
Eelco Dolstra 8a5e005bee * dmidecode updated to 2.11. 
svn path=/nixpkgs/trunk/; revision=33132
 2012-03-16 01:46:39 +00:00
Yury G. Kudryashov 049e676403 Remove qc-usb 
This directory was added in 2006, and was never called by nix-expressions
outside of qc-usb/.

svn path=/nixpkgs/trunk/; revision=33125
 2012-03-15 20:46:36 +00:00
Ludovic Courtès 90b8995e04 GNU MIG: Add a raw' version, without forceSystem'. 
svn path=/nixpkgs/trunk/; revision=33124
 2012-03-15 20:28:07 +00:00
Ludovic Courtès 2e0ae13f68 GNU MIG: When cross-compiling, patch shebang correctly. 
svn path=/nixpkgs/trunk/; revision=33123
 2012-03-15 20:28:03 +00:00
Ludovic Courtès 9e2e08ba47 unionfs: Mark MIG as a native build input. 
svn path=/nixpkgs/trunk/; revision=33122
 2012-03-15 20:27:58 +00:00
Ludovic Courtès 97bd4b7b00 GNU MIG: Use `forceSystem' instead of the custom hack. 
svn path=/nixpkgs/trunk/; revision=33121
 2012-03-15 20:27:53 +00:00
Ludovic Courtès e4f5ebb348 GNU MIG: Make it clear that the inputs are native. 
svn path=/nixpkgs/trunk/; revision=33120
 2012-03-15 20:27:49 +00:00
Ludovic Courtès 5d066bdbce GNU: SMBFS: Update. 
svn path=/nixpkgs/trunk/; revision=33118
 2012-03-15 20:27:35 +00:00
Yury G. Kudryashov fe1115caf4 Make nixpkgs ready for gst_all attrset removal 
svn path=/nixpkgs/trunk/; revision=33092
 2012-03-14 22:44:52 +00:00
Yury G. Kudryashov 68fe867e19 Get rid of most references to gtkLibs 
svn path=/nixpkgs/trunk/; revision=33088
 2012-03-14 21:57:32 +00:00
Ludovic Courtès 30c215a83a GNU: Add unionfs. 
svn path=/nixpkgs/trunk/; revision=33054
 2012-03-13 23:19:02 +00:00
Shea Levy 76832793f2 Linux 3.3-rc7 
svn path=/nixpkgs/trunk/; revision=33007
 2012-03-12 02:19:05 +00:00
Mathijs Kwik bd068d386e completely removed gw6c. use gogoclient. 
svn path=/nixpkgs/trunk/; revision=32989
 2012-03-11 14:35:36 +00:00
Yury G. Kudryashov 464f6f42f6 iwlwifi-5000 v5 ucode 
svn path=/nixpkgs/trunk/; revision=32982
 2012-03-11 14:07:23 +00:00
Lluís Batlle i Rossell eddf9e24c7 Allowing mount to call /var/setuid-wrappers in preference. mount.cifs may require this, 
as it does not support the 'user' option in fstab.


svn path=/nixpkgs/trunk/; revision=32975
 2012-03-10 19:02:07 +00:00
Ludovic Courtès 313191412d GNU: SMBFS: Update. 
svn path=/nixpkgs/trunk/; revision=32968
 2012-03-10 10:51:21 +00:00
Eelco Dolstra 6bc6c61f01 * hdparm updated to 9.39. 
svn path=/nixpkgs/trunk/; revision=32963
 2012-03-09 19:24:54 +00:00
Ludovic Courtès 330a4e656a util-linux: Use Linux-specific header on Linux only. 
svn path=/nixpkgs/trunk/; revision=32867
 2012-03-07 22:15:42 +00:00
Ludovic Courtès 191fbf40bd GNU Mach: Update. 
svn path=/nixpkgs/trunk/; revision=32861
 2012-03-07 21:53:37 +00:00
Ludovic Courtès 3666a7c149 util-linux: Allow cross-compilation. 
svn path=/nixpkgs/trunk/; revision=32851
 2012-03-07 13:45:06 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
 2012-03-05 10:00:23 +00:00
Eelco Dolstra 15e5aead3d * Upstart 1.4. Of particular interest is the "log" stanza to redirect 
a job's stdout/stderr to a file, and "setuid" / "setgid" to execute
  a job as a different user/group.

svn path=/nixpkgs/trunk/; revision=32744
 2012-03-02 14:46:58 +00:00
Ludovic Courtès bb08271aa6 SMBFS: Disable byte-range locking in Samba's TDB. 
svn path=/nixpkgs/trunk/; revision=32732
 2012-03-01 23:07:56 +00:00
Yury G. Kudryashov 1ef47d19ce udisks: avoid autoreconf 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32720
 2012-03-01 15:09:53 +00:00
Yury G. Kudryashov 0210e20b5a svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
 2012-03-01 07:04:39 +00:00
Evgeny Egorochkin cf8d3fa4b9 Apparmor: packaged 
svn path=/nixpkgs/trunk/; revision=32695
 2012-02-29 13:30:10 +00:00
Peter Simons 10e512f2b8 gogoclient: ipv6 tunnel 
svn path=/nixpkgs/trunk/; revision=32668
 2012-02-28 00:10:05 +00:00
Ludovic Courtès c67edd454c QEMU-KVM 1.0 (tentative). 
svn path=/nixpkgs/trunk/; revision=32637
 2012-02-27 23:25:54 +00:00
Ludovic Courtès e3a27acfdb QEMU-KVM: Use `smbd' from $PATH. 
svn path=/nixpkgs/trunk/; revision=32634
 2012-02-27 21:54:33 +00:00
Evgeny Egorochkin 9da23d5840 NVidia proprietary driver: version bump 
svn path=/nixpkgs/trunk/; revision=32618
 2012-02-27 10:55:52 +00:00
Lluís Batlle i Rossell 91b809a1ec Updating the nvidia drivers for legacy 173 
svn path=/nixpkgs/trunk/; revision=32575
 2012-02-26 11:55:41 +00:00
Shea Levy ea195b2507 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
 2012-02-25 19:57:34 +00:00
Eelco Dolstra f0197c653e * Backport a fix to qemu-kvm to prevent "qemu-img convert" from 
creating corrupt VirtualBox images.
  (https://bugs.launchpad.net/qemu/+bug/919242)

svn path=/nixpkgs/trunk/; revision=32560
 2012-02-25 17:34:21 +00:00
Arie Middelkoop 6b10ace1ca mcelog: a tool to access the machine check exceptions logged by the kernel. 
The kernel indicated that machine check exceptions were logged, but did not tell what kind of exceptions.
In my case, this is usually the processor being throttled because it gets too hot (laptop...), but it
may also be more severe problems. Anyway, with this tool you can access these logs.

svn path=/nixpkgs/trunk/; revision=32547
 2012-02-24 20:20:59 +00:00
Arie Middelkoop 1b2d50c14f rfkill udev package. 
svn path=/nixpkgs/trunk/; revision=32532
 2012-02-24 01:35:59 +00:00
Arie Middelkoop ed813f3955 Let 'bbswitch' and 'acpi-call' use the attribute kernel.version instead of a nasty 'ls' to determine the kernel version. 
svn path=/nixpkgs/trunk/; revision=32531
 2012-02-24 00:17:09 +00:00
Yury G. Kudryashov 38e3d7bc86 svn merge ^/nixpkgs/trunk 
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
 2012-02-23 20:06:21 +00:00
Peter Simons 1ee7c4250f linux-3.2.nix: updated to version 3.2.7 
svn path=/nixpkgs/trunk/; revision=32517
 2012-02-23 18:07:09 +00:00
Ludovic Courtès 3f523771bc Add SMBFS for GNU/Hurd. 
svn path=/nixpkgs/trunk/; revision=32499
 2012-02-23 00:01:29 +00:00
Peter Simons 846a12f954 fixed download urls after kernel-depending packages had their names changed 
svn path=/nixpkgs/trunk/; revision=32484
 2012-02-22 20:29:22 +00:00
Peter Simons 9db6840814 linux kernel 3.2 : added aufs patches 
svn path=/nixpkgs/trunk/; revision=32483
 2012-02-22 20:29:18 +00:00
Florian Friesdorf 77a8ea6fbd merge powertop kernel config into default kernel config 
svn path=/nixpkgs/trunk/; revision=32472
 2012-02-22 12:12:00 +00:00
Eelco Dolstra e64443baf1 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
 2012-02-21 23:29:21 +00:00
Eelco Dolstra 9c33ae3f2b * Fix ugly wpa_supplicant expression. 
svn path=/nixpkgs/trunk/; revision=32427
 2012-02-20 14:26:01 +00:00
Yury G. Kudryashov 313a029f16 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
 2012-02-19 11:16:24 +00:00