cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
35473 commits 1 branch 0 tags 3.7 GiB
Commit graph

2654 commits

Author SHA1 Message Date
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
Rok Garbas
5d3a07f57e Merge pull request #723 from lovek323/darwin-tools 
otool and setfile: cleanup
 2013-07-07 04:49:04 -07:00
Jason "Don" O'Conal
525a6856f2 otool and setfile: cleanup 2013-07-07 18:58:29 +10:00
Rok Garbas
33d957b34b Merge branch 'libspotify' of git://github.com/lovek323/nixpkgs into lovek323-libspotify 
Conflicts:
	pkgs/top-level/all-packages.nix
 2013-07-06 13:51:31 +02:00
Vladimír Čunát
0a30727ca0 usbutils: update 006 -> 007 2013-07-06 11:55:40 +02:00
Jason "Don" O'Conal
2da7f32b25 install_name_tool: add expression 2013-07-06 19:14:45 +10: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
Eelco Dolstra
930c958771 iputils: Don't depend on both GNU TLS and OpenSSL 2013-06-04 14:57:37 +02:00
Eelco Dolstra
cb5b198b51 linux: Update to 3.2.46 2013-06-04 11:00:19 +02:00
Mathijs Kwik
91cf1716f4 linux-3.9: upgrade to 3.9.4 2013-06-04 07:50:59 +02:00
Mathijs Kwik
d7911372a8 linux-3.4: upgrade to 3.4.47 2013-06-04 07:50:59 +02:00
Mathijs Kwik
39e0eb9420 linux-3.0: upgrade to 3.0.80 2013-06-04 07:50:59 +02:00
Peter Simons
34a4d5f3f0 os-specific/linux/microcode/converter.nix: update download location for intel-microcode2ucode.c 2013-06-03 10:15:34 +02:00
Lluís Batlle i Rossell
ed4f1c947f iw: update to 3.10. 
The newer, the better.
 2013-06-02 14:32:23 +02:00
Vladimír Čunát
25471803e4 Merge master into x-updates 2013-05-29 23:25:26 +02:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Lluís Batlle i Rossell
e1cb325f82 Adding batctl, control for batman 2013-05-28 23:02:22 +02:00
Lluís Batlle i Rossell
bf0d1f58dc Adding batman-adv. 2013-05-28 22:58:25 +02:00
Domen Kozar
8ac0a0ac46 firmware-linux-nonfree: set platform as linux 2013-05-23 21:00:18 +02:00
Domen Kozar
d8d6fd7412 pam_ssh_agent_auth: fix nix eval 2013-05-23 15:24:15 +02:00
Eelco Dolstra
dad18680e5 pam_ssh_agent_auth: Update to 0.9.5 2013-05-22 11:33:01 -04:00
Eelco Dolstra
2767a01042 pam_ssh_agent_auth: Add to channel 2013-05-22 11:29:16 -04:00
Michael Raskin
da24027c25 Linux kernel: update to 3.9.3 2013-05-20 23:36:49 +04:00
Lluís Batlle i Rossell
c6df92a414 Making the linux rpi kernel not attempted to build by hydra 2013-05-20 17:43:26 +02:00
Lluís Batlle i Rossell
8b79a00c44 Adding netatop module, for atop 2013-05-20 10:13:07 +02:00
Lluís Batlle i Rossell
e459464ec1 nss_ldap: fixing crash with glibc >= 2.16 
I update it to the latest version, 265. Then I use some patches:

The nss_ldap-265-glibc-2.16.patch is the one that fixes the crash.
The crashes.patch is another one that I took from RH that said to fixes somes
crashes, but it didn't fix the crash I was seeing. But I guess it fixes
something.
 2013-05-17 10:23:37 +02:00
Vladimír Čunát
70882b980c WARNING: history from now is going to change (mesa+llvm) 
Current WIP, only tested nouveau (3D works very well).
 2013-05-16 17:16:02 +02:00
Domen Kožar
378d975b88 Merge pull request #505 from MarcWeber/submit/linux-3.8-dvb-support 
without these two settings my USB dvb-t stick doesn't work
 2013-05-16 03:16:23 -07:00
Domen Kozar
7bbe5823e8 let hydra mirror unfree firmware 2013-05-15 15:22:50 +02:00
Domen Kožar
d63523c769 Merge pull request #527 from qknight/firmware-linux-0.36-to-0.38 
updated firmware-linux from 0.36-to-0.38
 2013-05-15 06:17:45 -07:00
Eelco Dolstra
501833cf55 linux: Re-enable the memory resource controller 
We accidentally lost this in Linux >= 3.5 because the kernel options
were renamed.  (Probably an argument for not using "?" in the kernel
config...)
 2013-05-15 14:53:15 +02:00
Rob Vermaas
000fddd10e Fix hash for linux 3.2.45 2013-05-15 08:37:33 +00:00
David Guibert
880a386c57 update linux 3.2.45 2013-05-14 21:33:14 +02:00
Eelco Dolstra
07d4f26be1 nvidia-x11: Update to 319.17 2013-05-14 13:47:30 +02:00
Eelco Dolstra
a1a725d20d linux: Set AUDIT_LOGINUID_IMMUTABLE 
This prevents faking the loginuid even by root.
 2013-05-13 11:53:00 +02:00
David Guibert
0e98cd4a65 update linux versions 2013-05-12 20:28:45 +02:00
Mathijs Kwik
e18f4eb50f apparmor patch: should have a name, broke nixpkgs tarball 2013-05-12 13:11:49 +02:00
Evgeny Egorochkin
1ee86005b9 Apparmor: minor cleanup 2013-05-11 21:14:35 +03:00
Joachim Schiele
f6e15f0d69 updated firmware-linux from 0.36-to-0.38 2013-05-11 16:56:28 +00:00
Evgeny Egorochkin
8d7e1a79cc AppArmor: add a sample patched kernel. 2013-05-11 08:50:34 +03:00
Evgeny Egorochkin
a9459797e2 AppArmor: fix silent build breakage. 2013-05-11 08:50:33 +03:00
Evgeny Egorochkin
0ef509b1e0 Apparmor: update to 2.8.1 2013-05-10 16:36:11 +03:00
Eelco Dolstra
e083d32d22 sysklogd: Don't remove /dev/log when syslogd exits 
This messes up systemd-journald.
 2013-05-09 16:28:36 +02:00
Vladimír Čunát
369defb7c1 sysvtools: fix symlink when withoutInitTools = false 2013-05-09 15:15:04 +02:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Mathijs Kwik
1264fafe98 linux-3.4: upgrade to 3.4.44 2013-05-08 22:33:05 +02:00
Mathijs Kwik
7d2f148c53 linux-3.0: upgrade to 3.0.77 2013-05-08 22:33:05 +02:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates 
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
 2013-05-08 13:46:46 +02:00
Michael Raskin
14d87f3a9e Update Linux versions 2013-05-08 10:52:46 +04:00
Eelco Dolstra
2e77679b0b systemd: Start ctrl-alt-del.target irreversibly 
This fixes hangs during EC2 reboots (which are implemented by sending
a ctrl-alt-del to the instance).
 2013-05-07 14:34:48 +02:00
Eelco Dolstra
0dfb9ecc35 systemd: Update to 203 2013-05-07 14:34:48 +02:00
Marc Weber
b5e6e1b78c without these two settings my USB dvb-t stick doesn't work 2013-05-06 05:15:34 +02:00
Phreedom
c3f34e54a1 Merge pull request #381 from ierton/bluez5 
bluez5: add experimental expression for bluez5
 2013-05-03 10:54:39 -07:00
Vladimír Čunát
8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Mathijs Kwik
d8489d37ed linux-3.9: upgrade to 3.9.0 2013-04-30 09:27:02 +02:00
Mathijs Kwik
b18c7b5891 linux-3.8: upgrade to 3.8.10 2013-04-30 09:27:02 +02:00
David Guibert
008bb6935c update kernels 3.0, 3.2, 3.4, 3.8 and 3.9-rc 2013-04-26 09:12:35 +02:00
Bjørn Forsman
7894a6fa27 systemd: patch hardcoded "/bin/cat" in systemd-cat 
Without this patch, systemd-cat doesn't work here:

$ echo "hello world" | systemd-cat
Failed to execute process: No such file or directory
 2013-04-24 23:46:09 +02:00
Vladimír Čunát
fe1bd1a73c tarball: move assertion in systemd 
Now the assertion doesn't trigger on systemd.headers
which is needed for dbus.libs.

This should fix the tarball job (I don't have enough RAM to test it).
 2013-04-24 09:03:30 +00:00
Vladimír Čunát
bde20f3e88 Merge branch 'master' into x-updates 
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
 2013-04-24 06:29:09 +00:00
Eelco Dolstra
cddad771c5 Revert "experimental/shadow" 
This reverts commit 788e760b51.  NixOS
doesn't even have an /etc/skel.  And if we had, 1) NixOS has the
ability to create regular files rather than symlinks in /etc
(environment.etc.<file>.mode = ...), so files in /etc/skel that should
be copied as regular files can be supported; and 2) we may actually
*want* to copy a symlink.

Also, typos in file names.  Bleh.
 2013-04-23 13:04:17 +02:00
Michael Raskin
0aad0af30a Merge pull request #459 from MarcWeber/submit/shadow 
make useradd -m create ~/.bashrc as file, not as symlink pointing to the store
 2013-04-22 22:33:20 -07:00
cillianderoiste
96e8703be0 Merge pull request #460 from cillianderoiste/plymouth 
It works enough to display bootsplash animations in an xorg session and a VT.

I haven't figured out how to run it successfully from the initrd yet and I'm also not happy with the postInstall mess, but I'd rather merge it now than let it get lost. It seems like it should be possible for a user to activate it by using boot.initrd.extraUtilsCommands and boot.initrd.postMountCommands
 2013-04-20 08:07:30 -07:00
David Guibert
81b78fe31a Merge pull request #451 from jcumming/zfs.130328 
zfs-0.6.1. spl-0.6.1
 2013-04-20 06:27:19 -07:00
Vladimír Čunát
e8823c9e5e Merge pull request #441 from ierton/udisks2-xfce 
udisks2 for xfce
 2013-04-20 01:37:14 -07:00
Mathijs Kwik
61b65080d9 linux-3.0: upgrade to 3.0.74 2013-04-19 14:53:00 +02:00
Mathijs Kwik
384de84023 linux-3.4: upgrade to 3.4.41 2013-04-19 14:53:00 +02:00
Michael Raskin
181fb52b14 Update Linux 3.8 2013-04-18 19:22:54 +04:00