Commit graph

2351 commits

Author SHA1 Message Date
Peter Simons
438e23b45b htop: update to version 1.0.2 2013-03-25 00:01:56 +01:00
Peter Simons
41020224ad nvidia-x11: use the brand-new 'unfree-redistributable' license for this package 2013-03-24 22:47:12 +01:00
Shea Levy
4fa4ab3a6e Partially revert my recent kernelPackages changes
First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)

Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)

The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-24 07:45:00 -04:00
Peter Simons
c0e0604c4d nvidia-x11: change meta.license from "unfree" to "proprietary"
I'm not entirely sure what the appropriate license attribute for this
package is. The license [1] says:

 | 2.1.2 Linux/FreeBSD Exception. Notwithstanding the foregoing terms of
 | Section 2.1.1, SOFTWARE designed exclusively for use on the Linux or
 | FreeBSD operating systems, or other operating systems derived from
 | the source code to these operating systems, may be copied and
 | redistributed, provided that the binary files thereof are not
 | modified in any way (except for unzipping of compressed files).

It sounds to me like this gives NixOS the right to re-distribute the
files (because we don't modify them). The 'proprietary' license sort-of
fits that. On the other hand, we seem to assume that proprietary
software cannot be redistributed, which doesn't apply here.

[1] http://www.nvidia.com/content/DriverDownload-March2009/licence.php?lang=us
2013-03-23 15:58:15 +01:00
Evgeny Egorochkin
48a871ffb7 Update nvidia legacy 304 driver so that it compiles with new kernels 2013-03-22 17:01:32 +02:00
Mathijs Kwik
011fc66a7c bbswitch: upgrade to 0.6 2013-03-22 00:00:05 +01:00
Mathijs Kwik
1f43786616 linux-3.0: upgrade to 3.0.70 2013-03-22 00:00:05 +01:00
Mathijs Kwik
7560812cfa linux-3.2: upgrade to 3.2.41 2013-03-22 00:00:05 +01:00
Mathijs Kwik
b7bb81bc1f linux-3.4: upgrade to 3.4.37 2013-03-22 00:00:05 +01:00
Mathijs Kwik
42d29c2afb linux-3.8: upgrade to 3.8.4 2013-03-22 00:00:04 +01:00
Michael Raskin
2d2123b8d7 Update Linux 3.9-rc to rc3 2013-03-19 13:34:57 +04:00
Michael Raskin
c306d2f899 Fix references to ifconfig and route 2013-03-19 13:21:04 +04:00
Lluís Batlle i Rossell
0236cc5d88 iputils: build and install the manpages 2013-03-18 15:07:20 +01:00
Lluís Batlle i Rossell
1e1b6ee733 iputils: update 20101006 to 20121221
Still without manpages! I don't know where to get SGML tools.
2013-03-18 12:21:47 +01:00
Michael Raskin
6922ec9258 Linux-3.9-rc2 2013-03-16 16:27:19 +04:00
Michael Raskin
b5b4a4a5cf Linux 3.8: update to 3.8.3 2013-03-16 10:51:03 +04:00
Jack Cummings
3ac299934d enable 802.11n by default. 2013-03-11 02:31:51 -07:00
Shea Levy
5e434ef318 Merge branch 'p/selinux' of git://github.com/vcunat/nixpkgs
This branch adds libcap-ng and updates SELinux. It doesn't seem like
anyone is actually using SELinux from nixpkgs, but everything compiles
and looks right.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:00:16 -05:00
Jack Cummings
7fcfcb2614 linux-firmware.git moved, and so did the intel wireless firmware urls. 2013-03-08 07:40:47 -08:00
Eelco Dolstra
262c21ed46 Enable __ignoreNulls globally 2013-03-07 19:42:01 +01:00
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