Commit Graph

2315 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
Michael Raskin
3b5b1be3cf Linux 3.8.1 2013-03-02 20:16:08 +04:00
Shea Levy
0bdd926a32 linux/manual-config: put build and source trees into a separate 'dev' output.
This makes it possible to still build out-of-tree modules without making a system using this kernel depend on the full source and build tree at runtime.

Note that references to the source tree are removed from kernel modules after build.
Ideally, this would be accomplished by modifying the Makefile that puts the reference there in the first place, but I haven't tracked that down yet.
2013-03-02 09:54:08 -05:00
Shea Levy
b90b62e33b linux/manual-config: Move configfile symlinking to configurePhase.
It makes more semantic sense there than in unpackPhase, as that symlink is _how_ we configure the kernel
2013-03-02 07:55:07 -05:00
Shea Levy
8ce1295ad3 linux/manual-config: ignore nulls.
There's no need to set the postFixup env var at all if we're not modular.
2013-03-02 07:51:12 -05: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
Vladimír Čunát
de70e3739d SELinux fixes and updates to 2012-09-24 2013-02-24 13:25:53 +01:00
Lluís Batlle i Rossell
17d289498f linux: Typo: CFG80211_WEXT 2013-02-24 12:07:14 +01:00
Vladimír Čunát
f6b28fad73 add libcap_ng 2013-02-24 11:19:35 +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
Marc Weber
5784fa5f79 for whatever reason -DKBD* was ignored. systmed has --with-kbd-* options which work 2013-02-04 12:07:37 +01:00
Eelco Dolstra
9670631c75 nvidia-x11: Update to 310.32 2013-02-04 12:06:56 +01:00
Vladimír Čunát
db63a24ac0 powertop: fix and update 2013-02-02 11:07:14 +01:00
Jack Cummings
c6d9e073b0 zfs-0.6.0-rc14, spl-0.6.0-rc14 2013-02-01 19:52:57 -08:00
Lluís Batlle i Rossell
86839c4a6d iwlwifi-2030-ucode: url change 2013-01-31 17:01:13 +01:00
Eelco Dolstra
bc4064af73 wpa_supplicant: Fix config generation
‘echo ${extraConfig}’ doesn't do the right thing if extraConfig
contains newlines.  This broke NixOS because CONFIG_DEBUG_SYSLOG=y
wasn't processed.
2013-01-30 15:17:38 +01:00
Peter Simons
e4d79d21aa Merge pull request #290 from vcunat/vlada/wpa-notg
wpa_supplicant: refactor settings, readline support (on by default)
2013-01-30 02:27:46 -08:00
Lluís Batlle i Rossell
45de66b2b1 Update the raspberry pi kernel to one newer. 2013-01-29 20:17:32 +01:00
Vladimír Čunát
0072c44255 wpa_supplicant: refactor settings, readline support (on by default) 2013-01-29 17:37:20 +01:00
Eelco Dolstra
97c5ab3a6d linux-2.6.32-xen: Remove
Hasn't built in a long time and is obsolete anyway.
2013-01-29 12:43:53 +01:00
Eelco Dolstra
8cc94dc652 ov511: Remove
This is very obsolete (last updated for Linux 2.6.0-test4).
2013-01-28 18:31:18 +01:00
Eelco Dolstra
24420373f4 modutils: Remove
This package is long obsolete.
2013-01-28 18:31:18 +01:00
Eelco Dolstra
e0afec2edc pwdutils: Remove
This package no longer builds and is obsolete (use ‘shadow’ instead).
2013-01-28 17:58:43 +01:00
Eelco Dolstra
c8aed4202d eject: Remove
This command is part of util-linux now.
2013-01-28 17:25:59 +01:00
Eelco Dolstra
ce83f79a65 util-linux: Update to 2.22.2
This update is essential because coreutils no longer provides ‘su’.
Also enable ‘last’ and some other commands so that we can get rid of
sysvtools.
2013-01-28 17:19:03 +01:00
Eelco Dolstra
5200c92aa0 libxcrypt: Remove 2013-01-28 17:19:03 +01:00
Eelco Dolstra
25a875195d syslinux: Update to 4.06 and fix build
http://hydra.nixos.org/build/3890519
2013-01-28 17:19:02 +01:00
Eelco Dolstra
b40ca97f00 pam_unix2: Remove
It no longer builds and NixOS doesn't use it anymore.
2013-01-28 17:19:02 +01:00
Eelco Dolstra
67de843bce ebtables: Update to 2.0.10-4 and fix build
http://hydra.nixos.org/build/3891670
2013-01-28 17:19:01 +01:00
Shea Levy
2afdaf0e82 Linux 3.7.5 2013-01-28 00:12:35 -05:00
Shea Levy
4bf80b462d Linux 3.4.28 2013-01-28 00:12:24 -05:00
Aristid Breitkreuz
4534699938 add alsa oss emulation 2013-01-28 02:49:49 +01:00
viric
111a6c23f8 Merge pull request #245 from maggesi/blcr-update
Update BLCR to version 0.8.5 Beta 3.
2013-01-27 12:40:54 -08:00
viric
39fa2f72ab Merge pull request #253 from rickynils/fscache
linux 3.2-3.7: enable NFS_FSCACHE and CIFS_FSCACHE
2013-01-27 12:39:25 -08:00
Lluís Batlle i Rossell
a87fba9619 Adding the firmware files for raspberrypi 2013-01-27 17:49:02 +00:00
Lluís Batlle i Rossell
3b26ba7019 Merge remote-tracking branch 'central/master' into stdenv-updates
Conflicts:
	pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
Lluís Batlle i Rossell
8319a5599d alsautils: Adding libsamplerate, to be able to use alsaloop 2013-01-25 09:18:50 +01:00
Eelco Dolstra
337d2f43d0 pm-utils: Set meta.platforms 2013-01-24 12:52:00 +01:00
Eelco Dolstra
ed0fde7eb5 pm-utils: Remove some powersave hooks
In particular, this should unbreak nix.readOnlyStore.
2013-01-24 12:51:59 +01:00
Eelco Dolstra
7db0642961 upower: Update to 0.9.19 2013-01-24 12:51:59 +01:00
Eelco Dolstra
5ebaaeb7f3 procps-ng: Add
This will replace procps eventually.
2013-01-23 17:12:20 +01:00
Eelco Dolstra
0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Lluis Batlle
b8b7268029 systemd: porting patches for arm for udev.
Related to our glibc version, probably fixed in newer glibcs like
in stdenv-updates.
2013-01-22 23:17:31 +01:00
Eelco Dolstra
331e7ac221 Merge remote-tracking branch 'origin/master' into systemd 2013-01-21 13:01:00 +01:00
Lluís Batlle i Rossell
9c2bc27eb2 Fixing mcelog, so it puts the proper files in share/doc
It was running "cp mce.pdf $out/share/doc", which created the file 'doc'.
Then buildEnv complained that 'share/doc' exists.
2013-01-20 18:52:58 +01:00
Rickard Nilsson
1886d1db6a Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-01-20 16:53:21 +01:00
Peter Simons
ced57493ee v4l-utils: update to version 0.9.3
This update fixes the build of the SANE back and front-ends.
2013-01-20 16:23:28 +01:00
Rickard Nilsson
4b9df608e2 v4l: Fix building of ir-keytable 2013-01-20 00:39:13 +01:00
Eelco Dolstra
9da086c08d Merge remote-tracking branch 'origin/master' into systemd 2013-01-19 00:05:50 +01:00
David Guibert
bc8a6e6c19 new download host for zfsonlinux.org: spl/zfs 2013-01-18 08:31:25 +01:00
David Guibert
d54c8c4b83 update kernels: 3.0.59, 3.4.26 and 3.7.3 2013-01-18 08:31:25 +01:00
Eelco Dolstra
d8e722985b Add config option ‘allowUnfree’
If set to false, mkDerivation will throw an exception if a package has
an unfree license.  ‘release-lib.nix’ uses this to enforce that we
don't build unfree packages as part of the Nixpkgs channel.  Since
this is set through Nixpkgs' ‘config’ argument, it's more finegrained
than $HYDRA_DISALLOW_UNFREE.
2013-01-17 23:41:37 +01:00
Eelco Dolstra
9248dc1a14 Remove unfree ATI drivers package from the channel
Urghhhhh...
2013-01-17 22:05:59 +01:00
Eelco Dolstra
8faee15126 linux: Update to 3.2.37 2013-01-17 17:21:31 +01:00