3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

70 commits

Author SHA1 Message Date
Vladimír Čunát 25351012b2 nvidia: fix problems with -glsi and glx
..by generalizing the build script.
Obsoletes #3699, and it should finally fix problems around 816d971a.
2014-08-20 23:37:41 +02:00
Cray Elliott 477eb18d18 nvidia-x11: update to 340.32 (close #3365)
Also close #3634.
2014-08-19 21:03:52 +02:00
Eelco Dolstra 6c0002ec8d nvidia-x11: Update to 340.24 2014-07-15 19:53:39 +02:00
Eelco Dolstra 5ec3a63fcb nvidia-x11: Update to 331.79 2014-05-22 13:00:51 +02:00
Lluís Batlle i Rossell 8ef1d4ecdb Making nvidia build with linux 3.14. Patch not needed anymore. 2014-04-23 16:06:15 +02:00
Eelco Dolstra 660d38e838 nvidia-x11: Update to 331.67 2014-04-18 21:50:00 +02:00
Mathijs Kwik 5a3fa7f88f nvidia-x11: patch for kernel 3.14 support 2014-04-11 23:40:16 +02:00
ambrop7@gmail.com bc2984d77d nvidia-x11: Fix build with kernel 3.13. 2014-03-29 23:35:14 +01:00
Eelco Dolstra 98c3caed93 nvidia-x11: Update to 331.49 2014-03-28 16:43:56 +01:00
Vladimír Čunát 57240400cb nvidia driver: allow building on Hydra, maintain
The stuff is unfree, but distribution in any form *is* encouraged, c.f.
http://metadata.ftp-master.debian.org/changelogs//non-free/n/nvidia-graphics-drivers/nvidia-graphics-drivers_319.82-1_copyright
2014-02-16 10:07:31 +01:00
Vladimír Čunát 180e5ca0db nvidia driver: fix eval with older kernels (e.g. 3.10) 2014-02-16 09:53:15 +01:00
Karn Kallio b2f9e1d4f7 nvidia-x11: bump version and add patch for kernel 3.13 2014-02-12 11:08:28 +01:00
Shea Levy a589bfae17 Update and fix kernel packages to new kernel build
In most cases, this just meant changing kernelDev (now removed from
linuxPackagesFor) to kernel.dev. Some packages needed more work (though
whether that was because of my changes or because they were already
broken, I'm not sure). Specifics:

* psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that
  were already there
* blcr builds on 3.4 but not 3.10, as noted in comments that were
  already there
* open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on
  3.4 or 3.10 on this branch or on master, so they're marked broken
* A version-specific kernelHeaders package was added

The following packages were removed:

* atheros/madwifi is superceded by official ath*k modules
* aufs is no longer used by any of our kernels
* broadcom-sta v6 (which was already packaged) replaces broadcom-sta
* exmap has not been updated since 2011 and doesn't build
* iscis-target has not been updated since 2010 and doesn't build
* iwlwifi is part of mainline now and doesn't build
* nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build

Everything not specifically mentioned above builds successfully on 3.10.
I haven't yet tested on 3.4, but will before opening a pull request.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-04 21:17:04 -05:00
William A. Kennington III 0eeb78d74c nvidia: Update to version 331.20
We no longer need the patches applied for the previous version so they
are removed.
2013-11-16 17:10:45 +01:00
Eelco Dolstra a2cbc77e4f Only show/build a package on the platforms listed in meta.platforms
The function ‘mkDerivation’ now checks whether the current platform
type is included in a package's meta.platform field.  If not, it
throws an exception:

  $ nix-build -A linux --argstr system x86_64-darwin
  error: user-thrown exception: the package ‘linux-3.10.15’ is not supported on ‘x86_64-darwin’

These packages also no longer show up in ‘nix-env -qa’ output.  This
means, for instance, that the number of packages shown on
x86_64-freebsd has dropped from 9268 to 4764.

Since meta.platforms was also used to prevent Hydra from building some
packages, there now is a new attribute meta.hydraPlatforms listing the
platforms on which Hydra should build the package (which defaults to
meta.platforms).
2013-11-05 00:06:10 +01:00
Eelco Dolstra d774f84153 nvidia-x11: Update to 319.60 2013-10-02 16:15:14 +02:00
Aristid Breitkreuz d050dade3b nvidia for kernel 3.11 fixed 2013-09-06 21:46:20 +02:00
Aristid Breitkreuz 53866352c2 nvidia driver no longer requires kernel 3.10 patch 2013-08-27 19:07:21 +02:00
Eelco Dolstra 97b822b3bb nvidia-x11: Update to 319.49 2013-08-26 22:55:54 +02:00
Evgeny Egorochkin 1adc88661d nvidia_x11: recover the lost patch 2013-08-13 05:30:10 +03:00
Eelco Dolstra 329a705005 nvidia-x11: Fix the library-only build
Also, introduce a function ‘versionAtLeast’ which is probably more
natural than ‘versionOlder’.
2013-07-17 11:14:26 +02:00
Eelco Dolstra 9f347eba61 nvidia-x11: Fix building on older kernels
The 3.10 patch breaks building on 3.4 at least.
2013-07-17 11:10:21 +02:00
Mathijs Kwik c382681b1b nvidia binary driver: patch for linux 3.10 2013-07-15 17:25:14 +02:00
Eelco Dolstra 3e70cde4de nvidia-x11: Update to 319.32 2013-07-09 11:19:02 +02:00
Eelco Dolstra 07d4f26be1 nvidia-x11: Update to 319.17 2013-05-14 13:47:30 +02:00
Vladimír Čunát 07bee4ac0a nvidia_x11: update to short-lived, with security update 2013-04-04 14:31:47 +02: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
Karn Kallio f921baec94 nvidia-x11: fix build with the latest Linux kernel 2013-02-06 10:46:25 +01:00
Eelco Dolstra 9670631c75 nvidia-x11: Update to 310.32 2013-02-04 12:06:56 +01:00
Eelco Dolstra e31cd88d9e nvidia-x11: Update to 310.19 2012-11-23 11:11:01 +01:00
Eelco Dolstra 7268c1c008 nvidia-x11: Update to 304.60 2012-10-26 11:08:29 +02:00
Eelco Dolstra 2947f91371 nvidia-x11: Update to 304.51 2012-10-18 10:10:49 -04:00
Eelco Dolstra c843abc1bc nvidia-x11: Update to 304.43 2012-09-13 11:36:34 -04:00
Eelco Dolstra 22b545c325 nvidia-x11: Update to 304.37 2012-08-22 15:59:26 -04:00
Eelco Dolstra 84b4a086dd nvidia-x11: Update to 304.22
Now with glorious Xrandr 1.2/1.3 support! No more need to
nvidia-settings!
2012-07-26 18:59:33 -04:00
Lluís Batlle i Rossell a1d64b8082 Updating the nvidia 295 driver, so it builds with linux 3.4.
svn path=/nixpkgs/trunk/; revision=34211
2012-05-22 18:12:46 +00:00
Mathijs Kwik 9b5ca91497 nvidia driver: upgraded to 295.40
svn path=/nixpkgs/trunk/; revision=33776
2012-04-13 14:53:59 +00:00
Yury G. Kudryashov 68fe867e19 Get rid of most references to gtkLibs
svn path=/nixpkgs/trunk/; revision=33088
2012-03-14 21:57:32 +00:00
Evgeny Egorochkin 9da23d5840 NVidia proprietary driver: version bump
svn path=/nixpkgs/trunk/; revision=32618
2012-02-27 10:55:52 +00:00
Eelco Dolstra 0d124624e8 * NVIDIA driver updated to 290.10.
svn path=/nixpkgs/trunk/; revision=30550
2011-11-24 18:14:28 +00:00
Eelco Dolstra 5ab3c2abf2 * NVIDIA driver updated to 285.05.09.
svn path=/nixpkgs/trunk/; revision=29688
2011-10-06 11:07:25 +00:00
Lluís Batlle i Rossell c5a60206e7 Fixing the nvidia x86_64 driver url
svn path=/nixpkgs/trunk/; revision=28139
2011-08-03 09:47:03 +00:00
Lluís Batlle i Rossell 4f20b609fb Updating the nvidia drivers (I experience hangs from time to time, maybe this will solve that)
svn path=/nixpkgs/trunk/; revision=28138
2011-08-03 09:47:00 +00:00
Eelco Dolstra ab623804a7 * NVIDIA X11 driver updated to 275.09.07.
svn path=/nixpkgs/trunk/; revision=27517
2011-06-22 17:57:16 +00:00
Eelco Dolstra a8a7677d54 * NVIDIA driver updated to 270.41.06.
svn path=/nixpkgs/trunk/; revision=26985
2011-04-27 08:17:28 +00:00
Eelco Dolstra 4846d687ed * nvidia-settings requires gdk-pixbuf.
svn path=/nixpkgs/branches/x-updates/; revision=26203
2011-03-08 09:15:02 +00:00
Eelco Dolstra b813854488 * NVIDIA driver updated to 260.19.44.
svn path=/nixpkgs/branches/x-updates/; revision=26199
2011-03-07 16:51:54 +00:00
Eelco Dolstra b899921afe * nvidia-x11: updated to 260.19.36.
svn path=/nixpkgs/trunk/; revision=25764
2011-02-02 15:30:30 +00:00