1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 18:12:46 +00:00
Commit graph

2477 commits

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