3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2468 commits

Author SHA1 Message Date
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
Michael Raskin 873fa411b0 Update Linux 3.9rc 2013-04-18 19:22:54 +04:00
Vladimír Čunát ec736312d4 Merge branch 'master' into x-updates
Conflicts:
	pkgs/development/compilers/vala/default.nix (it's different version)
	pkgs/development/libraries/cairo/default.nix (trivial)
2013-04-17 18:26:28 +02:00
Cillian de Róiste 34b7ddafa8 Plymouth: works quite well with the X11 renderer and from a VT
I haven't figured out how to get it into the initrd correctly yet.
2013-04-15 20:15:47 +02:00
Peter Simons 8fee4ad060 lxc: update to version 0.9.0 2013-04-15 11:15:55 +02:00
Mathijs Kwik 56afb97e87 linux-3.8: upgrade to 3.8.7 2013-04-14 00:35:39 +02:00
Mathijs Kwik e20d9d0a97 linux-3.4: upgrade to 3.4.40 2013-04-14 00:35:39 +02:00
Mathijs Kwik 407f07e7e6 linux-3.0: upgrade to 3.0.73 2013-04-14 00:35:39 +02:00
Vladimír Čunát 17ae1617dc Merge branch 'master' into x-updates
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
2013-04-13 12:21:31 +02:00
Eelco Dolstra 4adad458e7 Remove the "proprietary" license
We already had "unfree".
2013-04-12 14:37:50 +02:00
Eelco Dolstra 4a429f5276 systemd: Update to 201
Fixes NixOS/nixos#135 and NixOS/nixos#126.
2013-04-12 14:33:41 +02:00
Mathijs Kwik 7ab70b3a41 linux-3.2: upgrade to 3.2.43 2013-04-12 11:40:33 +02:00
Cillian de Róiste 562cb3f460 Add Plymouth: WIP 2013-04-12 01:58:38 +02:00
Vladimír Čunát 8249695b61 Merge branch 'master' into x-updates
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Vladimír Čunát 774afb7ff2 qemu_kvm: disable tests that meddle with system time 2013-04-11 18:58:46 +02:00
Marc Weber 788e760b51 experimental/shadow
For /etc/skel/* files put file contents into user directories rather than
"symlinks". This way users can edit their .bashrc files.

This small patch works fine with the multi-shell-support topic branch found on
my github page which rewrites .bashrc and similar files to source /etc/ files.
Thus users can opt-out or set options - still following system updates.

Signed-off-by: Marc Weber <marco-oweber@gmx.de>
2013-04-11 16:24:11 +02:00
Peter Simons 9608d80c73 iproute: don't compile with -Werror
lnstat.c:169:30: error: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to provide an explicit length? [-Werror=sizeof-pointer-memaccess]
     memset(th.hdr[i], 0, sizeof(th.hdr[i]));
                                ^
  cc1: all warnings being treated as errors
  make[1]: *** [lnstat.o] Error 1
2013-04-07 23:33:20 +02:00
Mathijs Kwik a99ea7a0ee linux-3.0: update to 3.0.72 2013-04-06 20:45:30 +02:00
Mathijs Kwik 4eff34e602 linux-3.4: upgrade to 3.4.39 2013-04-06 20:45:29 +02:00
Mathijs Kwik 8092bc2dd7 linux-3.8: upgrade to 3.8.6 2013-04-06 20:39:36 +02:00
Jack Cummings 4c37edd6f3 Don't need NIX_CFLAGS_COMPILE in spl build anymore, consolodate zfs patches. 2013-04-06 00:06:27 -07:00
Jack Cummings d1cb67a629 spl-0.6.1, zfs-0.6.1 2013-04-06 00:01:02 -07:00
Cillian de Róiste c7be8b8afb Update Radeon Firmware
It was changed on 04.02
2013-04-05 16:50:23 +02:00
Lluís Batlle i Rossell 410d1a073e qemu-kvm: fix USB passthrough with a patch
I saw the same symptoms as https://bugs.launchpad.net/qemu/+bug/1033727 ,
and the patch there proposed fixes my case.
2013-04-05 10:45:04 +02:00
Mathijs Kwik 4154fbfabd linux-3.9: upgrade to 3.9-rc4 2013-04-04 22:18:07 +02:00
Mathijs Kwik 6ef9c6b1fc linux-3.8: upgrade to 3.8.5 2013-04-04 22:18:07 +02:00
Mathijs Kwik d0c6308da7 linux-3.4: upgrade to 3.4.38 2013-04-04 22:18:07 +02:00
Mathijs Kwik 37de48e43d linux-3.0: upgrade to 3.0.71 2013-04-04 22:18:06 +02:00
Vladimír Čunát dec718acb6 systemd: minor update, changes for dbus split
New version with upstreamed changes from @edolstra :-)
2013-04-04 22:00:58 +02:00
Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Vladimír Čunát 07bee4ac0a nvidia_x11: update to short-lived, with security update 2013-04-04 14:31:47 +02:00
Sergey Mironov b1386e4a09 fix udisks2 paths 2013-04-04 12:02:53 +04:00
Vladimír Čunát 7ce97cc443 udisks: split to udisks1 (stays default) and udisks2 2013-04-04 12:02:53 +04:00
Eelco Dolstra e657e1b57e systemd: Update to 200 2013-03-31 16:16:07 +02:00
Lluís Batlle i Rossell bee99995d9 linux: update to 3.8.5 2013-03-31 09:27:40 +02:00