JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,519 Commits 2 Branches 0 Tags 12 GiB
ed9ce850fd
Commit Graph

2663 Commits

Author SHA1 Message Date
Eelco Dolstra
d774f84153 nvidia-x11: Update to 319.60 2013-10-02 16:15:14 +02:00
Eelco Dolstra
e65ff3b72a systemd: Prevent privilege escalation via polkit 
Cherry-picked from upstream.  Also applied a fix for the CPUShares
configuration option while I'm at it.

CVE-2013-4327
 2013-09-30 13:30:15 +02:00
Eelco Dolstra
02c11554d7 linux: Update to 3.4.63 2013-09-30 11:29:27 +02:00
Mathijs Kwik
9e76aa91b1 linux-3.11: upgrade to 3.11.2 2013-09-28 22:25:41 +02:00
Eelco Dolstra
8a182718ca splashutils: Remove 2013-09-26 18:03:43 +02:00
Evgeny Egorochkin
0072786c84 broadcom-sta driver: packaged 6.* branch. In theory it is supposed to supercede 5.* but we'll test and 
see.
 2013-09-26 11:44:01 +03:00
aszlig
2e89b40634
Merge pull request #1010 from offlinehacker. 
Although this is a release canidate version of kernel 3.12, there are
reasons for merging this anyway, as discussed in #1010 and #1006.

Thanks to @offlinehacker for this and the initial pull request.
 2013-09-25 14:05:33 +02:00
Jaka Hudoklin
69f30432dd kernel: add linux 3.12-rc2 2013-09-25 12:49:49 +02:00
Lluís Batlle i Rossell
d5a44b27fd One more lvm2 systemd part working. 
I didn't need it, to boot fine... but that complaint of bad path isn't in
systemd boot anymore, at least.
 2013-09-20 11:45:50 +02:00
Lluís Batlle i Rossell
8f73cdeac2 Merging the changes to get systemd with lvm2 working 2013-09-20 09:45:33 +02:00
Lluís Batlle i Rossell
c0fd88748a Making lvm2 install systemd stuff, and combine all in a single derivation. 2013-09-20 09:20:14 +02:00
Lluís Batlle i Rossell
3974fb283a Updating lvm2 to 2.02.100. 2013-09-19 14:19:10 +02:00
Mathijs Kwik
1751f77b6a linux-3.11: upgrade to 3.11.1 2013-09-18 14:37:38 +02:00
Eelco Dolstra
7d2364def4 mountall: Remove 
It's no longer used since we switched to systemd.
 2013-09-18 13:05:23 +02:00
Domen Kožar
4c8711f32d Merge pull request #980 from Krofek/master 
hostapd update: 1.0 -> 2.0
 2013-09-17 11:50:19 -07:00
Eelco Dolstra
7856ba881a linux: Enable proper blkio controller support 
Having BLK_CGROUP is not enough, you need BLK_DEV_THROTTLING or
CFQ_GROUP_IOSCHED to do anything useful.
 2013-09-17 16:00:36 +02:00
Eelco Dolstra
0b351e964e iotop: Update to 0.6 
Also, install the man page in the right place.
 2013-09-17 14:17:55 +02:00
Krofek
2b6c07f5a8 hostapd update: 1.0 -> 2.0 2013-09-16 23:06:51 +02:00
Eelco Dolstra
2d14789920 linux: Update to 3.4.62 2013-09-16 17:51:18 +02:00
Eelco Dolstra
7216b3c844 systemd: Add kexec support 2013-09-16 17:51:18 +02:00
Eelco Dolstra
9278aa436e Fix upower warning 
Namely "libgcc_s.so.1 must be installed for pthread_cancel to work".
 2013-09-16 17:50:25 +02:00
Ricardo M. Correia
342fcfc82f grsecurity: Update to 2.9.1-3.2.51-201309101928 2013-09-13 05:13:25 +02:00
Ricardo M. Correia
72f49af65b linux: Update to 3.2.51 2013-09-13 05:13:18 +02:00
Eelco Dolstra
89fa23c43d linux: Update to 3.4.61 2013-09-12 10:38:38 +02:00
Eelco Dolstra
9c49229aae kexec-tools: Update to 2.0.4 2013-09-12 10:38:37 +02:00
Aristid Breitkreuz
e70c15bb26 lm_sensors 3.3.4 update, support for many more sensors 2013-09-07 16:10:27 +02:00
Aristid Breitkreuz
d050dade3b nvidia for kernel 3.11 fixed 2013-09-06 21:46:20 +02:00
Bjørn Forsman
86c7583ab4 lttng: 2.2.x -> 2.3.0 2013-09-05 22:46:07 +02:00
Eelco Dolstra
207aa56201 linux: Update to 3.4.60 2013-09-05 11:11:02 +02:00
Eelco Dolstra
26028c2107 Install firmware in $out/lib/firmware instead of $out 2013-09-04 14:23:44 +02:00
Eelco Dolstra
8a56adee74 microcode-intel: Update to 20130808 2013-09-04 14:23:44 +02:00
Eelco Dolstra
b8bc3aa26d Remove meaningless package priority 2013-09-04 14:23:44 +02:00
Mathijs Kwik
27a810346a Revert "linux: really provide /proc/config.gz" 
This reverts commit 68ce9e91e1.

/proc/config.gz is available after "modprobe configs"
and in
/run/booted-system/kernel-modules/config
 2013-09-04 09:29:00 +02:00
Mathijs Kwik
03c9a1fb33 linux 3.11 
works fine for me, but nvidia binary driver fails once again
 2013-09-04 09:29:00 +02:00
danbst
2a798997a3 Add mirror url for AMD microcode 
www.amd64.org is often down, so provide a 2nd url to download from.
 2013-08-31 21:53:59 +02:00
Mathijs Kwik
927f32e87c linux-3.10: upgrade to 3.10.10 2013-08-31 12:09:17 +02:00
Bjørn Forsman
47b53fd084 bluez5: set meta.platforms attribute 2013-08-28 21:20:57 +02:00
Aristid Breitkreuz
6eeec159b2 make bluetoothd path compatible between bluez4 and bluez5 2013-08-28 21:20:57 +02:00
Aristid Breitkreuz
319629355c bluez5: fix python programs 2013-08-28 21:20:56 +02:00
Aristid Breitkreuz
69c57b92e8 update bluez to 5.8 2013-08-28 21:20:56 +02:00
Aristid Breitkreuz
53866352c2 nvidia driver no longer requires kernel 3.10 patch 2013-08-27 19:07:21 +02:00
Rickard Nilsson
c44d8970ea raspberrypi-kernel: Updated to latest version as of 20130826 (rev 7849605f5a) 2013-08-27 12:30:47 +02:00
Rickard Nilsson
38ba397afd raspberrypi-firmware: Update to latest version as of 20130826 (rev 3ab17ac25e) 2013-08-27 12:30:47 +02:00
Evgeny Egorochkin
c6f88edebe Merge pull request #862 from jcumming/zfs.130823 
zfs-0.6.2 and spl-0.6.2
 2013-08-27 00:31:55 -07:00
Eelco Dolstra
a1c74c5603 linux: Update to 3.4.59 2013-08-26 22:55:54 +02:00
Eelco Dolstra
97b822b3bb nvidia-x11: Update to 319.49 2013-08-26 22:55:54 +02:00
Mathijs Kwik
61021c5739 bbswitch: upgrade to 0.7 2013-08-25 14:31:05 +02:00
Jack Cummings
fc101c01a5 zfs-0.6.2 and spl-0.6.2 
Enable parallelBuilding, too.
 2013-08-23 23:20:03 -07:00
Marc Weber
57032af1ae ati-proprietary: update, make it build with linux 3.10, fix breakage. 
with contributions by Jaka Hudoklin.
 2013-08-22 13:00:23 +03:00
Mathijs Kwik
b9fff8a34b linux-3.10: upgrade to 3.10.9 2013-08-21 11:22:33 +02:00
Mathijs Kwik
273689bcbd linux-3.10: remove the btrfs send patch 
it helps, but is incomplete.
more fixes are coming, but including these would change too much
generic btrfs code, which might cause trouble for others.

so the best advice is not to use btrfs send yet and wait for 3.11 or 3.12
 2013-08-19 07:04:18 +02:00
Bjørn Forsman
68ce9e91e1 linux: really provide /proc/config.gz 
Currently there is no /proc/config.gz, even though the configuration
indicates it. This fixes it.
 2013-08-16 23:12:07 +02:00
Eelco Dolstra
5cb688eb52 linux: Update to 3.4.58 2013-08-16 12:05:42 +02:00
Mathijs Kwik
b85984d840 linux-3.10: upgrade to 3.10.7 2013-08-15 14:06:27 +02:00
Eelco Dolstra
f69eb63a1b firmware-linux-nonfree: Install copyright notices 
Most of the firmwares require that redistribution in binary form
reproduces the copyright notice.
 2013-08-14 04:01:04 +02:00
Eelco Dolstra
d0617613dd firmware-linux-nonfree: Update to 0.40 2013-08-14 04:01:04 +02:00
Eelco Dolstra
b3642c3673 Move the AMD microcode to the microcode directory 2013-08-14 03:26:04 +02:00
Eelco Dolstra
5c208844e9 Remove more duplicate firmware 2013-08-14 03:24:58 +02:00
Eelco Dolstra
4d7d5ba69c Delete the Intel firmware packages 
The Debian firmware package (firmwareLinuxNonfree) contains all of
these so there is no reason to keep them.
 2013-08-14 02:32:12 +02:00
Lluís Batlle i Rossell
1f2ecd08cc Updating netatop to 0.3 (linux 3.10) 2013-08-13 09:55:49 +02:00
Evgeny Egorochkin
1adc88661d nvidia_x11: recover the lost patch 2013-08-13 05:30:10 +03:00
Domen Kožar
01b483f692 Revert "upower: 0.9.19 -> 0.9.21" 
This reverts commit d10d50132a.

xfce doesn't support this version api yet
 2013-08-12 18:14:42 +02:00
Evgeny Egorochkin
339e1d94c6 Turning off PAE support which makes kernel unbootable on older hardware causes CRASH_DUMP option to 
disappear, so make it optional.
 2013-08-12 05:32:11 +03:00
Evgeny Egorochkin
27dcd771c3 Merge pull request #802 from wizeman/kernel_update 
Kernel update
 2013-08-11 15:08:45 -07:00
Bjørn Forsman
81db5cfe0a lttng-modules: don't use licenses.mit because it breaks hydra evaluation 
Hydra has these evaluation errors:
  at `nixpkgs.linuxPackages.lttngModules.i686-linux' [nixosSrc = ..., nixpkgs = ..., officialRelease = false]:
  value is an attribute set while a string was expected

because licenses.mit is an attribute set and not a string.

TODO: Licenses in pkgs/lib/licenses.nix are a mix of attr sets and
strings, this needs to be standardized.
 2013-08-11 20:35:44 +02:00
Bjørn Forsman
70ea99cfa8 lttng-modules: new package 
Add linux kernel modules needed to do kernel tracing with LTTng.

To make them available to lttng in NixOS, add this to configuration.nix:

  boot.extraModulePackages = [ pkgs.linuxPackages.lttngModules ];
 2013-08-10 14:47:55 +02:00
Mathijs Kwik
59025453e7 linux-3.10: backport a fix for "btrfs send" 
It has been submitted for inclusion in mainline, so it will probably
make it into 3.11 (or 3.12 as 3.11 is fairly close to release).

It is very local, only affecting people who use the "send" feature.
Without it, send is unstable/unsafe to use incrementally.

It can probably be applied to 3.9 and 3.8 as well, but as I only
tested it against 3.10, so I didn't bother.
 2013-08-10 13:53:17 +02:00
Eelco Dolstra
9845e6ec5c Kernel module aggregator: Use kmod instead of module-init-tools 2013-08-09 18:48:52 +02:00
Eelco Dolstra
d9a4706f73 linux: Use kmod instead of module-init-tools 2013-08-09 18:48:51 +02:00
Domen Kožar
d10d50132a upower: 0.9.19 -> 0.9.21 2013-08-07 14:25:17 +02:00
Eelco Dolstra
912146d764 linux: Update to 3.4.56, 3.10.5 2013-08-06 12:40:48 +02:00
Eelco Dolstra
3a4ef26397 Remove Linux 3.8 (EOL) 2013-08-06 12:39:50 +02:00
Ricardo M. Correia
36c2711f8b linux: update grsecurity patch 2013-08-06 02:21:00 +00:00
Ricardo M. Correia
97056a0620 linux: properly parse config choice when it's new 2013-08-06 02:20:48 +00:00
Ricardo M. Correia
2208c360ac linux: Update to 3.2.50 2013-08-05 18:19:48 +00:00
Eelco Dolstra
f155a35d7d Move kernelExtraConfig to common-config.nix (for x86) 
It's bad to have the kernel config scattered across two places.  (This
should also be done for the other architectures.)

Also, restore Xen and KVM guest support in Linux 3.10.
 2013-08-01 14:35:31 +02:00
Eelco Dolstra
14ca9c0bf1 linux: Include "NixOS" in "uname -v" 2013-08-01 01:40:41 +02:00
Eelco Dolstra
d1de0e2d6d linux: Enable detection of hung tasks 2013-08-01 01:40:41 +02:00
Eelco Dolstra
f2f00c56e4 linux: Enable stack protector 
This may prevent exploitation of buffer overflows.
 2013-08-01 01:40:41 +02:00
Eelco Dolstra
c564d012f8 Style fix 2013-08-01 01:40:41 +02:00
Eelco Dolstra
b976e00ff2 linux: Remove obsolete AUFS 3.7 patch 2013-08-01 01:40:40 +02:00
Eelco Dolstra
ff99631753 linux: Remove CIFS timeout patch 
We longer use CIFS in the VM tests so we don't need this anymore.
 2013-08-01 01:40:40 +02:00
Eelco Dolstra
956d71f843 linux: Remove some unused patches 2013-08-01 01:40:40 +02:00
Eelco Dolstra
bc8186be1e linux: Disable /dev/kmem 
See e.g.
  https://wiki.ubuntu.com/Security/Features#A.2BAC8-dev.2BAC8-kmem_disabled
 2013-08-01 01:40:40 +02:00
Eelco Dolstra
e1a7be4294 iwlwifi4965ucodeV1: Remove 
This is verrrry obsolete.
 2013-08-01 01:40:40 +02:00
Eelco Dolstra
7ce325f3e0 Unify the Linux kernel configurations 
Having N different copies of the NixOS kernel configuration is bad
because these copies tend to diverge.  For instance, our 3.10 config
lacked some modules that were enabled in older configs, probably
because the 3.10 config had been copied off an earlier version of some
older kernel config.

So now there is a single kernel config in common-config.nix.  It has a
few conditionals to deal with new/removed kernel options, but
otherwise it's pretty straightforward.

Also, a lot of cut&paste boilerplate between the kernel Nix
expressions is gone (such as preConfigure).
 2013-08-01 01:40:40 +02:00
Eelco Dolstra
dccbdcf520 linux: Don't put the kernel version in meta 2013-08-01 01:40:40 +02:00
Eelco Dolstra
00e311e438 qemu-kvm: Remove 
But install a qemu-kvm wrapper in qemu.
 2013-07-31 14:53:34 +02:00
Eelco Dolstra
394dc5da78 batman-adv: Disambiguate kernel versions 2013-07-30 16:52:12 +02:00
Eelco Dolstra
3c462ded97 linux: Update to 3.2.49, 3.4.55 2013-07-30 16:52:12 +02:00
Shea Levy
2e57a16219 Linux 3.10.4 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-07-28 20:16:16 -04:00
Mathijs Kwik
ac91adf4e3 linux-3.10: upgrade to 3.10.3 2013-07-26 07:18:39 +02:00
Eelco Dolstra
1386036457 linux: Update to 3.4.54 2013-07-23 22:35:49 +02:00
Vladimír Čunát
fb37586d77 Merge pull request #721 from vcunat/p/hw-utils 
pci and usb utils update
 2013-07-23 06:48:08 -07:00
Rob Vermaas
af2a127551 Add linux 3.2.48 with grsecurity patches 2013-07-22 21:44:31 +02:00
Ricardo M. Correia
22689567ed apparmor: Update to kernel 3.4 series (the current default) 2013-07-22 18:03:26 +02:00
Peter Simons
b52621a5fe ipsec-tools: update to version 0.8.1 2013-07-22 16:29:16 +02:00
Aristid Breitkreuz
147a6ae62f nvidia: also install useful nvidia-smi tool 2013-07-21 19:32:54 +02:00
Aristid Breitkreuz
38a2056f70 fix bug in perf-linux installation, oops 2013-07-21 19:25:05 +02:00
Bjørn Forsman
181dc4032d Remove the old KQEMU accelerator module 
KQEMU was a linux kernel module for accelerating the QEMU virtual
machine on x86 hardware. Since QEMU 0.11 (and up), there is no support
for KQEMU any more, the focus is now on KVM.

http://wiki.qemu.org/KQemu/Doc
 2013-07-18 10:57:32 +02:00
Eelco Dolstra
329a705005 nvidia-x11: Fix the library-only build 
Also, introduce a function ‘versionAtLeast’ which is probably more
natural than ‘versionOlder’.
 2013-07-17 11:14:26 +02:00
Eelco Dolstra
9f347eba61 nvidia-x11: Fix building on older kernels 
The 3.10 patch breaks building on 3.4 at least.
 2013-07-17 11:10:21 +02:00
Eelco Dolstra
4cc4ed6d2d linux-3.7: Remove 
It's EOL.
 2013-07-16 13:45:23 +02:00
Mathijs Kwik
c382681b1b nvidia binary driver: patch for linux 3.10 2013-07-15 17:25:14 +02:00
Mathijs Kwik
5dbe2627a2 linux-3.9: upgrade to 3.9.10 (EOL) 2013-07-15 17:25:13 +02:00
Eelco Dolstra
66b2ff1074 linux: Update to 3.4.53 2013-07-15 14:33:27 +02:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin
cea107c07f More mirror:// URL fixes 2013-07-14 03:31:12 +03:00
Evgeny Egorochkin
d0b4c8bfaa gktspell: version bump to 2.0.16 because the old one has disappeared 2013-07-14 03:09:34 +03:00
Evgeny Egorochkin
aa85b80459 Change package urls to use mirror://sourceforge 2013-07-14 02:35:26 +03:00
Evgeny Egorochkin
e01d16f7d4 pam_console: fix version to match tarball 2013-07-14 02:08:51 +03:00
Shea Levy
e820a54431 Linux 3.10.1 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-07-13 15:15:50 -04:00
Eelco Dolstra
3e70cde4de nvidia-x11: Update to 319.32 2013-07-09 11:19:02 +02:00
Mathijs Kwik
ad8a3b86ab linux-3.10: forward-port 9p speedup from 3.9 2013-07-07 22:50:12 +02:00
Mathijs Kwik
f43003237a linux-3.9: upgrade to 3.9.9 2013-07-07 22:46:47 +02:00
Vladimír Čunát
0a30727ca0 usbutils: update 006 -> 007 2013-07-06 11:55:40 +02:00
Michael Raskin
7853c0c60a Update acpi-call for Linux 3.10 compatibility 2013-07-05 18:43:21 +04:00
Eelco Dolstra
0e386d0c13 VM builds: Use 9p/virtfs instead of CIFS 
9p (with caching enabled) is much faster than CIFS and doesn't require
Samba or virtual networking.  For instance, building GNU Hello with
CIFS takes ~323s on my laptop, but with 9p it takes 54s.

More measurements will be needed to see if "cache=fscache" is really
faster than "cache=loose" (the former seems to be a little bit
faster).
 2013-07-05 00:17:04 +02:00
Aristid Breitkreuz
c222c31745 do not patch non-existent bash_completion for old kernels 2013-07-04 20:13:52 +02:00
Aristid Breitkreuz
f925c5ae7f fix bash completion for perf 2013-07-04 20:13:52 +02:00
Vladimír Čunát
4a0952d2fa fix bad "licence" names 
Mostly what I merged from @lovek323.
Such errors can be easily checked by
  nix-env -f . -qa \* --meta --xml --drv-path --show-trace >/dev/null
 2013-07-04 18:16:34 +02:00
Eelco Dolstra
ebe81d17d7 linux: Update to 3.2.48, 3.4.51 2013-07-02 14:40:08 +02:00
Shea Levy
61fef700ee On linux-3.10, build in #! script support 
Starting with 3.10, #! script handling can be built modularly (or not
at all). By default the nixpkgs builder sets everything modular, but
since our initird init is a #! script this creates a chicken-and-egg
problem on NixOS.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-07-01 14:53:56 -04:00
Mathijs Kwik
fc8c97f5d9 linux-3.9: upgrade to 3.9.8 2013-07-01 07:52:14 +02:00
Shea Levy
0d8025c612 Linux 3.10 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-30 20:55:21 -04:00
aszlig
08a9a9b020
radeon-juniper: Update to new JUNIPER_rlc.bin. 
Kinda icky to not have archives available here, but I got an error during VM
tests because of an sha256sum mismatch, hence the update. Maybe Hydra has cached
this?

And yes, I checked twice, it wasn't a broken download - there really *is* a new
upstream version available.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-28 04:26:09 +02:00
Vladimír Čunát
38a59aa953 maintainers: change my attrname to be uniform 2013-06-27 20:43:56 +02:00
Rickard Nilsson
4800a33b88 Linux 3.4: Doesn't support CONFIG_RC_DEVICES option 2013-06-27 12:13:27 +02:00
Rickard Nilsson
489040bf58 Linux 3.2: Doesn't support CONFIG_RC_DEVICES option 2013-06-25 22:17:13 +02:00
Rickard Nilsson
b7ccfc258a Linux 3.2-3.9: Add CONFIG_RC_DEVICES=y, to enable IR devices that can be used by lirc/devinput 2013-06-25 20:13:11 +02:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org 
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
 2013-06-25 14:12:16 +02:00
aszlig
b785a7192e
cryptsetup: Allow to build with Python support. 
This again is only optional to avoid too much dependencies when bootstrapping
small systems or when constrained to RAM disks of lower size. It is needed for
blivet as well, which will override the option in its dependency list.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-24 10:33:18 +02:00
aszlig
b574d0146f
libselinux: Add option to enable Python support. 
The reason this is optional is because we might want to use it for bootstrapping
in some constellations. And we really don't want whole lot of dependencies in
those situations.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-24 10:33:17 +02:00
Mathijs Kwik
c913054748 linux-3.2: upgrade to 3.2.47 2013-06-23 17:00:06 +02:00
Shea Levy
a3bf1ca3b1 Linux 3.9.7 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-06-21 17:21:03 -04:00
Vladimír Čunát
2cfbe7b292 wpa_supplicant: update 1.1 -> 2.0 
It works fine for me, GUI as well.
 2013-06-20 19:13:29 +02:00
Domen Kozar
d7be74adc0 acpid: build on linux 2013-06-18 22:48:34 +02:00
Vladimír Čunát
afdc7fdfb6 fix evaluation on non-Linux, should fix tarball 2013-06-17 22:06:36 +02:00
Vladimír Čunát
c72ed04892 Merge 'master' and 'stdenv-fixes' into x-updates 
Final stabilization phase before merging into master.

Conflicts (glibc-2.13):
	pkgs/top-level/all-packages.nix
 2013-06-16 10:13:51 +02:00
Aristid Breitkreuz
c63f00c337 linux 3.9.6 2013-06-15 19:32:20 +02:00
Michael Raskin
81b7f5fe63 Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04:00
Lluís Batlle i Rossell
7346eb64bf Adding comment about psmouse-alps. 2013-06-13 23:25:52 +02:00
Michael Raskin
19530856ed Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-13 17:12:43 +04:00
Lluís Batlle i Rossell
4970ec637e Adding psmouse-alps, a touchpad kernel driver. 
Some laptops use these new touchpads, and this driver is
supposed to provide proper support for them.
 2013-06-12 22:55:58 +02:00
Michael Raskin
1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Mathijs Kwik
fc5946ac4b linux-3.9: upgrade to 3.9.5 2013-06-10 08:36:04 +02:00
Vladimír Čunát
7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
 2013-06-08 15:41:39 +00:00
Domen Kozar
b6f7f05b35 adding unfree-redistributable-firmware 2013-06-05 22:44:17 +02:00
Vladimír Čunát
7af694700c Merge branch 'master' into x-updates 
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
 2013-06-05 12:59:47 +02:00