philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

2259 commits

Author SHA1 Message Date
Vladimír Čunát d7abc31f5a fix the last master merge, sorry for the problems 
Now I carefully re-merged all the conflicts and tested some builds.
Hopefully it's all OK now.
 2013-03-02 22:34:37 +01:00
Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates 
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
 2013-03-02 10:41:53 +01:00
aszlig 94fe64b3eb
manual-kernel: Add bc to buildNativeInputs. 
As timeconst.pl was replaced by a bc script in the merge window for kernel 3.9,
we also need bc during build time, for more information about the reasons,
please have a look at the following commit:

torvalds/linux@70730bca13

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-02-28 18:57:03 +01:00
aszlig d5f85c20f2
xf86-input-wacom: Update to new version 0.19.0. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-02-28 01:16:49 +01:00
Eelco Dolstra bf8f39ff9b linux: Update to 3.2.39 
CVE-2013-0228
 2013-02-27 14:47:40 +01:00
Peter Simons b6d0d176f2 qemu-kvm: enable regression test suite 2013-02-27 14:34:49 +01:00
Peter Simons 2d375c3f5f qemu-kvm: provide a proper path to the python interpreter 2013-02-27 14:34:49 +01:00
Peter Simons 97a2eb24d4 qemu-kvm: re-use 'patchShebangs' function to fix script paths 2013-02-27 14:34:49 +01:00
Peter Simons d336909d9f qemu-kvm: enable documentation build 
... and rename the 'postPatch' hook to 'patchPhase'.
 2013-02-27 14:34:48 +01:00
Peter Simons 5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Lluís Batlle i Rossell 17d289498f linux: Typo: CFG80211_WEXT 2013-02-24 12:07:14 +01:00
Lluís Batlle i Rossell 0961084afb linux 3.7, 3.8: Enabling CFG80211_WEXT (for ipw2200) 
My computer with a ipw2200 nic needs that, to have the
ipw2200 driver.
 2013-02-23 15:40:20 +01:00
Vladimír Čunát bc4e786187 alsa-lib: fix a stdint.h problem 2013-02-23 12:59:28 +01:00
Shea Levy afe3758b1b Remove myself from kernel maintainers. 
I use manual config now.
 2013-02-21 12:39:25 -05:00
Shea Levy 6a1c64a469 Unmaintain v86d. 
I don't use it any more, and don't even remember what it was for
 2013-02-21 12:39:25 -05:00
Shea Levy 30e1158101 kmod: Update to kmod-12 2013-02-21 11:28:52 -05:00
Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
 2013-02-21 11:13:30 -05:00
David Guibert 059c30bf9d add kernel 3.8 2013-02-21 08:53:16 +01:00
Shea Levy aacca1902c Merge branch 'upstream-master' into stdenv-updates 2013-02-19 10:09:39 -05:00
Shea Levy a4d5e4a9e2 Linux 3.7.9 2013-02-18 11:35:22 -05:00
Shea Levy 0e4c3a1fc9 Linux 3.4.32 2013-02-18 11:34:42 -05:00
Shea Levy f4a51bbdd6 Linux 3.0.65 2013-02-18 11:34:19 -05:00
Shea Levy c42d77aa35 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
Vladimír Čunát 8493b51da1 x86info: fix 2013-02-16 21:29:55 +01:00
Cillian de Róiste baf4e9309a iwlwifi-4965 fix download url 2013-02-16 19:30:56 +01:00
Shea Levy 0489661dd1 qemu-kvm/fix-librt-check.patch: Replace with fix from upstream qemu.git 2013-02-15 11:33:59 -05:00
Shea Levy 8d245dc3d9 qemu-kvm: Fix check for librt 2013-02-15 11:07:27 -05:00
Eelco Dolstra a25b27a7f8 buildNativeInputs -> nativeBuildInputs 2013-02-15 13:38:07 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Vladimír Čunát 290aa4ea44 Merge pull request #307 from maggesi/blcr-updates 
BLCR to version 0.8.5
 2013-02-14 12:44:15 -08:00
Shea Levy af26af6fc7 Remove EOL'd Linux 3.6 2013-02-14 14:33:42 -05:00
Shea Levy 0ad870eb5e Remove EOL'd Linux 3.5 2013-02-14 14:32:44 -05:00
Shea Levy c23084906b Remove EOL'd Linux 3.3 2013-02-14 14:30:31 -05:00
Shea Levy 0178a3b7b1 Remove EOL'd Linux 3.1 2013-02-14 14:28:53 -05:00
Shea Levy ca59489e2b Linux 3.7.8 2013-02-14 14:25:19 -05:00
Shea Levy e531913aca Linux 3.4.31 2013-02-14 14:25:11 -05:00
Shea Levy 2d23eb3a19 Linux 3.0.64 2013-02-14 14:24:57 -05:00
Lluís Batlle i Rossell 00251af191 SUNRPC_DEBUG doesn't work on linux 3.3 
It's as if the option isn't there.

http://hydra.nixos.org/build/4015233
 2013-02-14 20:08:08 +01:00
Shea Levy 3a8631201e Linux 3.4.30 2013-02-11 12:57:40 -05:00
Shea Levy 45e877f706 Linux 3.0.63 2013-02-11 12:53:43 -05:00
Shea Levy 170b0c9e2e Linux 3.7.7 2013-02-11 12:34:14 -05:00
Eelco Dolstra 76a5e89a1c linux: Update to 3.2.38 2013-02-11 15:34:30 +01:00
Marco Maggesi 03bf520849 Update BLCR to version 0.8.5 2013-02-08 12:42:31 +01:00
Lluís Batlle i Rossell c4216ed1a0 linux kernel: enabling SUNRPC_DEBUG 
Much easier debugging of nfs issues.

If I understand correctly, it was enabled in 3.2 and below; I enable it for
next kernels.
 2013-02-07 16:21:03 +01:00
Karn Kallio f921baec94 nvidia-x11: fix build with the latest Linux kernel 2013-02-06 10:46:25 +01:00
David Guibert bb03e66785 Merge pull request #294 from jcumming/zfs.130201 
zfs-0.6.0-rc14. spl-0.6.0-rc14
 2013-02-05 14:00:11 -08:00
Eelco Dolstra 1c23150eb0 Port my nss_myhostname patches to systemd 2013-02-04 15:49:20 +01:00
Shea Levy 5336c82882 Linux 3.7.6 2013-02-04 06:58:19 -05:00
Shea Levy 249b3ea5ef Linux 3.4.29 2013-02-04 06:58:07 -05:00
Shea Levy c32435381e Linux 3.0.62 2013-02-04 06:57:46 -05:00