Commit graph

2481 commits

Author SHA1 Message Date
Eelco Dolstra f5052a8679 Fix extraBuildNativeInputs reference 2013-03-07 19:41:40 +01:00
Eelco Dolstra 674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Michael Raskin 3d28751740 Linux 3.9-rc1: set correct modDirVersion 2013-03-07 09:12:49 +04:00
Michael Raskin b72134dc11 Linux: Add 3.9-rc1 as lowPrio (it has a regression fix 3.8.2 lacks) 2013-03-06 23:59:49 +04:00
Peter Simons ad31fcad52 cifs-utils: revert back to version 5.6
The updated version 5.9 couldn't mount any of my shares:

  Status code returned 0xc000006d NT_STATUS_LOGON_FAILURE
  CIFS VFS: Send error in SessSetup = -13
  CIFS VFS: cifs_mount failed w/return code = -13

Apparently, this is a known problem in Windows Vista that needs to be
fixed on the server side. :-(
2013-03-05 12:14:00 +01:00
Peter Simons 7e99044638 cifs-utils: hard-code path '/run/current-system/sw/bin/systemd-ask-password' to fix issue #353 some more
It turns out that mount.cifs is run in a shell environment that doesn't have
$PATH. To find that program, we must commit to some location. The path I used will
work fine on NixOS, but of course it won't work on other Linux distributions. I'm
not sure whether that's an important issue or not.
2013-03-05 11:46:01 +01:00
Peter Simons 8437673c91 cifs-utils: update to version 5.9 2013-03-05 11:26:09 +01:00
Peter Simons 599cc3ec0a cifs-utils: remove hard-coded path to 'systemd-ask-password' to close issue #353 2013-03-05 11:25:53 +01:00
Mathijs Kwik 6338743942 bbswitch: upgrade to 0.5 - add linux 3.8 compatibility patch 2013-03-04 22:40:33 +01:00
Mathijs Kwik 060ba43e8f linux-3.8: upgrade to 3.8.2 2013-03-04 22:40:33 +01:00
Mathijs Kwik c7c6592f6f linux-3.7: upgrade to 3.7.10 2013-03-04 22:40:23 +01:00
Mathijs Kwik 01c5d2d702 linux-3.4: upgrade to 3.4.35 2013-03-04 22:40:23 +01:00
Mathijs Kwik 04e883e496 linux-3.0: upgrade to 3.0.68 2013-03-04 22:40:22 +01:00
Mathijs Kwik 91c327fb28 qemu-kvm: string concatenation fix 2013-03-04 22:40:22 +01:00
Cillian de Róiste bcc9c80b85 Tidy up: use the web interface for the git repo as the homepage
There have been no important updates to this driver, but it should be
included in X11R7.8
2013-03-03 19:40:17 +01:00
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 e5b51648b1 Move "darwin-native-x11-and-opengl" package into the "os-specific" hierarchy. 2013-01-30 14:53:04 +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
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra 1d174fb974 linux-pam: Fix URL 2013-01-15 18:53:13 +01:00
Eelco Dolstra 7cf3713187 cpufrequtils: Fix URL 2013-01-15 18:53:12 +01:00
Eelco Dolstra 634aa5020d module-init-tools: Fix URL 2013-01-15 18:53:12 +01:00
Eelco Dolstra 45b0bcbc69 v86d: Fix URL 2013-01-15 18:53:12 +01:00
Eelco Dolstra eeda226b02 Merge branch 'master' into systemd 2013-01-15 12:11:07 +01:00
Eelco Dolstra f286cc65b1 Fix bad URLs lacking a scheme 2013-01-14 18:26:46 +01:00
Eelco Dolstra 7fd42a8380 Get rid of the "sf" alias for "sourceforge" 2013-01-14 12:00:32 +01:00
Vladimír Čunát e2521650b4 Update acpi, fix homepage, download from sourceforge. 2013-01-14 11:38:40 +01:00
David Guibert 0f2874dd08 nvidia96: update to support new X ABI 2013-01-13 17:38:56 +01:00
Evgeny Egorochkin 4dc4d10123 nvidia-legacy304: fix build 2013-01-13 16:18:27 +02:00
Mathijs Kwik 2d56a2cc15 linux-3.7: upgrade to 3.7.2 2013-01-13 14:30:55 +01:00
Mathijs Kwik 91d4d56703 linux-3.4: upgrade to 3.4.25 2013-01-13 14:30:55 +01:00
Mathijs Kwik cf546347e5 linux-3.0: upgrade to 3.0.58 2013-01-13 14:30:55 +01:00
Cillian de Róiste 778540797d iwlwifi: fix URL: firmware has moved from http://intellinuxwireless.org to http://wireless.kernel.org
I've only updated the firmware URLs for the firmware I could install without changing the sha256
2013-01-13 12:15:27 +01:00
Peter Simons 4ca4f1564f Merge pull request #254 from jcumming/x86info.130109
X86info.130109
2013-01-12 06:09:32 -08:00
Jack Cummings 0cfd455a67 Update x86info description. Add Homepage. 2013-01-11 09:25:32 -08:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Peter Simons abd6be85e1 lxc: update to version 0.8.0 2013-01-11 15:02:21 +01:00
Jack Cummings 42859e49ed Merge remote-tracking branch 'upstream/master' into x86info.130109 2013-01-10 21:35:13 -08:00
aszlig 86f293a1e5
xf86-video-nouveau: Add pixman to buildInputs.
Well, either this build is only broken on my system or noone actually uses
nouveau? Even when looking into the source tree it seems to require pixman, so I
suppose it didn't work for anyone prior to this commit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-01-10 03:29:44 +01:00
Jack Cummings 2fd4313f6c x86info-1.30 2013-01-09 11:49:41 -08:00
Rickard Nilsson 97d6292deb linux 3.2-3.7: enable NFS_FSCACHE and CIFS_FSCACHE
NFS_FSCACHE and CIFS_FSCACHE are required to enable the local cache support for
NFS and CIFS (the 'fsc' mount option). The reasoning for enabling it from 3.2
and forward is that at least Ubuntu 12.04 (linux 3.2) has it turned on. Could
probably be enabled for earlier kernels too.
2013-01-09 18:14:54 +01:00
Marco Maggesi 4c1e931cd4 Update BLCR to version 0.8.5 Beta 3.
This version extends support to kernels up to version 3.7.1.
According to the authors, despite the "beta" in the version name, this
version should be considered "stable" on non exotic architecture.
2013-01-09 14:56:58 +01:00
Eelco Dolstra 3a51aec945 Merge remote-tracking branch 'origin/master' into systemd 2013-01-08 18:47:23 +01:00
Eelco Dolstra 5a79974c81 systemd: Remove some plymouth calls 2013-01-08 18:41:21 +01:00
Eelco Dolstra cdb2f64a35 systemd: Get rescue.service and emergency.service to work 2013-01-08 18:11:56 +01:00
Eelco Dolstra 1909f9547d Merge remote-tracking branch 'origin/master' into systemd 2013-01-08 17:06:43 +01:00
Eelco Dolstra 30201193ea systemd: Generate patches from my systemd Git repo 2013-01-08 17:06:08 +01:00
Eelco Dolstra d906239fe3 systemd: Update to 197 2013-01-08 17:06:08 +01:00
Eelco Dolstra 5391395e68 cryptsetup: Update to 1.5.1 2013-01-08 17:06:08 +01:00
Rickard Nilsson eda055ded2 nvidia-x11: Install missing libs.
Several libs from the Nvidia distribution was not
copied to the nix store during installation. Therefore,
OpenCL was not working, for example.

The various nvidia-legacy packages are probably also
missing libs, this commit does not touch them, though.
2013-01-08 09:29:19 +01:00
Eelco Dolstra c6c1bc6b0f Merge branch 'master' into systemd 2013-01-07 00:34:25 +01:00
David Guibert c7f30ac377 update atop 2013-01-06 17:51:54 +01:00
Lluís Batlle i Rossell 11eb687e57 Fixing nettools with headers >=3.6 (no more strip)
I remove the strip (Metricom radio) support
2013-01-05 21:52:44 +00:00
Peter Simons 9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
Eelco Dolstra 99897218f4 linux: Update to 3.2.36 2013-01-04 14:19:00 +01:00
Rickard Nilsson db292a74c0 Merge remote-tracking branch 'upstream/master' into systemd
Conflicts:
	pkgs/tools/networking/network-manager/default.nix
2013-01-03 13:44:47 +01:00
Rickard Nilsson 2278d43eab wpa_supplicant: Install systemd service files 2013-01-03 12:47:00 +01:00
Rickard Nilsson bafdf87367 wpa_supplicant: Update to 1.1 2013-01-01 17:15:20 +01:00
Rickard Nilsson fe128bf31e wpa_supplicant: Update to 1.1 2013-01-01 17:13:33 +01:00
Lluís Batlle i Rossell a8dedfc1d0 Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-29 09:05:13 +00:00
Eelco Dolstra 01acc493ca Merge branch 'stdenv-updates' of github.com:NixOS/nixpkgs into stdenv-updates 2012-12-29 02:02:33 +01:00
Eelco Dolstra 0a0c7a352d linux-headers: Update to 3.7 2012-12-29 01:12:31 +01:00
Lluís Batlle i Rossell 67aa9243f0 Merge branch 'stdenv-updates' into pi-stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial.
2012-12-28 23:30:53 +01:00
Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Lluís Batlle i Rossell 719ba63004 Merge branch 'stdenv-updates' into pi-stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.6/default.nix
	pkgs/development/compilers/gcc/4.7/default.nix

The 4.7 had some weird parameters added in crossAttrs; I've removed
them, but I don't understand where they come from.
2012-12-28 20:14:01 +00:00
Eelco Dolstra 88b11196c1 Clean up redundant "if condition then true else false" 2012-12-28 19:57:47 +01:00
Eelco Dolstra 84779a6f7d Remove unnecessary parentheses around if conditions
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra e2d505b24e More renames 2012-12-28 19:42:10 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra 5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Lluís Batlle i Rossell ab2520c383 Adding linux-3.6-rpi
I picked the change from
7b4d69eeff
2012-12-27 21:29:56 +00:00
Eelco Dolstra 99f7c4e324 Merge branch 'master' into systemd 2012-12-27 01:28:25 +01:00
Jack Cummings c73e542634 zfs-0.6.0-rc13, spl-0.6.0-rc13 2012-12-21 16:30:19 -08:00
Lluís Batlle i Rossell 03cadda7ea v4l-utils: updating. They didn't build in the new stdenv. 2012-12-21 11:58:31 +01:00
Shea Levy 9247552a91 Linux 3.7.1 2012-12-17 17:45:01 -05:00
Shea Levy baa5ebfbdf Linux 3.0.57 2012-12-17 17:43:02 -05:00
Shea Levy 55196223c7 Linux 3.4.24 2012-12-17 17:42:38 -05:00
Shea Levy cc12516cf0 Linux 3.6.11 2012-12-17 17:33:44 -05:00
Shea Levy 2fc426577b Unmaintain aufs 2012-12-17 17:16:48 -05:00
Eelco Dolstra 3644f9124a pam_ssh_agent_auth: Allow multiple authorized keys files
We need this because of https://github.com/NixOS/nixos/pull/52.
2012-12-17 21:11:10 +01:00
Eelco Dolstra f8cf626b5e pam_ssh_agent_auth: Update to 0.9.4 2012-12-17 21:11:10 +01:00
Lluís Batlle i Rossell faf821e501 Adding USB cameras to linux 3.7
Details changed since the 3.6 config to get this enabled.
2012-12-17 11:52:47 +01:00
Shea Levy 88e43775fd fuse 2.9.2 2012-12-16 16:25:24 -05:00
Lluís Batlle i Rossell 5a475f7250 utillinux: fixing mount/umount, for our case of /etc/mtab symlinking to /proc/mounts
In systemd, without this patch, 'mount' for 'user' fstab devices works, but
umount does not; it says to require root.
All gets normal with this patch.
2012-12-16 15:43:47 +01:00
aszlig 639edcb829
manual-kernel: Fix handling spaces in readConfig.
The previos version did a for loop over the output of set, which spits out _all_
defined variables and their contents. This not only is dangerous if there is a
variable starting with CONFIG_ but also can't handle whitespace, as the IFS is
set to any (horizontal _and_ vertical) whitespace by default.

So, imagine (actually don't imagine, something like this is the case in a lot of
kernel configuration files) you have the following variable:

CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi ..."

A loop with for and the default IFS would result in the following variable
pieces:

0: CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi
1: -fcall-saved-rsi
2: ..."

This obviously leads to the problem that this config variable is being cut off
at the first whitespace.

Another downside of this approach is that set not only returns variables but
functions as well. This could lead to quite a lot of unexpected behaviour and
confusion.

So the new approach doesn't source the kernel configuration anymore but uses
`read` to parse the file line-by line, setting IFS to '=', thus splitting all
configuration lines into key/value pairs.

Using parameter expansion, we ensure that we only read lines starting with
"CONFIG_". This particularily has the advantage of not being bash-specific,
should we choose to change to a different default shell someday.

Now, after we got a correct "CONFIG_" line, we're using a temporary variable to
split off the first quote from the result. Particularily the reason behind this
is shell compatibility again, as ${${foo#"}%"} only works in Bash, Zsh and
whatnot but not in plain SH.

And within the next line we obviously insert the no_firstquote variable without
it's last quote removed.

But, what about escaping?

First of all, if we'd just eval the $val variable, we would correctly unescape
the value, but this has the downside that variables within the content would be
expanded, for example look at this:

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

Well, obviously this is a bad example at the Nix sense, but just to show that
variables within kernel configuration entries aren't impossible.

And second, which would have been a show stopper if \" would be within $val: It
simply would end up being an invalid Nix expression, because \" would end up as
a ploin " within a double quoted string.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-13 22:54:57 +01:00
Mathijs Kwik caf561d41a aufs3: upgrade to 1210 release, add linux-3.7 support 2012-12-13 14:00:28 +01:00
Eelco Dolstra b11e1305b5 udisks: Hack to work with the latest udev
We should probably update to udisks2, but I'm not sure if it's
compatible at the D-Bus interface level.

http://hydra.nixos.org/build/3488623
2012-12-13 13:14:58 +01:00
Eelco Dolstra 726b1bebbc Remove udev 173 2012-12-13 11:42:00 +01:00
Eelco Dolstra f364619e22 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-12 17:01:20 +01:00
Eelco Dolstra 6a176c79cf Merge remote-tracking branch 'origin/master' into systemd 2012-12-12 16:09:19 +01:00
Shea Levy 9ddd1cc78b Linux 3.7
Kernel configuration succeeds, I'll let hydra test the build
2012-12-11 11:57:04 -05:00
Rickard Nilsson 6d8109555e Add legacy version 304.64 of the Nvidia driver
The current 310.x version of the Nivida driver has dropped support
for some cards (for example 6200LE).
2012-12-11 11:33:40 +01:00
Shea Levy ce5ba30f64 Linux 3.6.10 2012-12-10 19:26:36 -05:00
Shea Levy ed994dcbe2 Linux 3.4.23 2012-12-10 19:26:20 -05:00
Shea Levy 81a856c878 Linux 3.0.56 2012-12-10 19:25:00 -05:00
Eelco Dolstra 179df95090 Merge remote-tracking branch 'origin/master' into systemd 2012-12-10 12:39:14 +01:00
Eelco Dolstra 88ca46bfa0 linux: Update to 3.2 2012-12-07 13:24:40 +01:00
Jack Cummings 462b2b5d7f ztest: fix hardcoded paths 2012-12-04 14:08:34 -08:00
Eelco Dolstra 5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Mathijs Kwik fe070086fb linux-3.6: upgrade to 3.6.9 2012-12-04 12:02:36 +01:00
Mathijs Kwik 38740214cb linux-3.4: upgrade to 3.4.21 2012-12-04 12:02:36 +01:00
Mathijs Kwik 47362f67ea linux-3.0: upgrade to 3.0.54 2012-12-04 12:02:36 +01:00