JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
265,770 Commits 2 Branches 0 Tags 13 GiB
d3b3fa80a9
Commit Graph

318 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Lluís Batlle i Rossell
57dcac2d2a nvidia-legacy-173: updating to build with linux 3.6 2012-10-17 22:08:31 +02: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
02e6a689be nvidia-legacy-173: Updating to 173.14.35 
I also add gdk_pixbuf; otherwise nvidia-settings does not start.
 2012-07-26 23:02:29 +02:00
Lluís Batlle i Rossell
972006aa43 Making nvidia 96.x build on linux 3.4. I took patches from AUR. 
svn path=/nixpkgs/trunk/; revision=34552
 2012-06-18 18:15:26 +00: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
Shea Levy
a74565238a Linux 3.3 puts some of its headers in include/generated 
svn path=/nixpkgs/trunk/; revision=33282
 2012-03-20 00:02:24 +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
Yury G. Kudryashov
0210e20b5a svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
 2012-03-01 07:04:39 +00:00
Evgeny Egorochkin
9da23d5840 NVidia proprietary driver: version bump 
svn path=/nixpkgs/trunk/; revision=32618
 2012-02-27 10:55:52 +00:00
Lluís Batlle i Rossell
91b809a1ec Updating the nvidia drivers for legacy 173 
svn path=/nixpkgs/trunk/; revision=32575
 2012-02-26 11:55:41 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Lluís Batlle i Rossell
6db6983bc2 Updating nvidia legacy 96.x, so it builds with the linux 3.1 kernel. 
svn path=/nixpkgs/trunk/; revision=31047
 2011-12-22 22:35:57 +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
Lluís Batlle i Rossell
c286f9acb6 Making the nvidia installer install the file libcuda.so. 'boinc' wants this file. 
svn path=/nixpkgs/trunk/; revision=29711
 2011-10-07 19:01:09 +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
3e3eac2e30 * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26303
 2011-03-14 18:26:46 +00:00
Lluís Batlle i Rossell
d6ec023293 Updating nvidia legacy96 driver 
svn path=/nixpkgs/trunk/; revision=26267
 2011-03-10 23:27:14 +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
Eelco Dolstra
9d617d90d0 * Put libvdpau_nvidia.so in a place where libvdpau can find it. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25298
 2010-12-27 19:22:30 +00:00
Eelco Dolstra
e1a0b9472b * NVIDIA X11 driver updated to 260.19.29. 
svn path=/nixpkgs/trunk/; revision=25223
 2010-12-21 12:17:47 +00:00
Eelco Dolstra
b555e4d8d6 * NVIDIA drivers updated to 260.19.21. 
svn path=/nixpkgs/trunk/; revision=25037
 2010-12-08 19:20:01 +00:00
Lluís Batlle i Rossell
02e4b5ffa4 Adding another nvidia legacy driver. (they have one more, '71'). 
I use their major numbers to distinguish.
They seem to do so in http://www.nvidia.com/object/unix.html .

svn path=/nixpkgs/trunk/; revision=23411
 2010-08-24 21:56:47 +00:00
Lluís Batlle i Rossell
d5d2458003 Fixing the nvidia legacy driver builder. The legacy driver needs the old builder script. 
svn path=/nixpkgs/trunk/; revision=23404
 2010-08-24 17:40:00 +00:00
Lluís Batlle i Rossell
232ee1bd17 Updating nvidia legacy drivers 
svn path=/nixpkgs/trunk/; revision=23403
 2010-08-24 17:37:12 +00:00
Lluís Batlle i Rossell
4d8eea0c6b Updating the nvidia drivers 
svn path=/nixpkgs/trunk/; revision=23385
 2010-08-24 08:31:32 +00:00
Eelco Dolstra
5a7e3c70ce * NVIDIA driver: updated to 256.35. Unfortunately the unpacked driver 
now has a flat directory structure (i.e. usr/lib, usr/share etc. are
  gone), which makes installing everything in the right location
  rather more tedious.

svn path=/nixpkgs/trunk/; revision=22628
 2010-07-18 20:21:18 +00:00
Eelco Dolstra
a6d63f4fab * nvidia_x11: added a flag to build only the libraries. This is 
useful on x86_64-linux to support i686 binaries: there we need the
  NVIDIA OpenGL libraries, but not the kernel module or the
  nvidia-settings program (which just cause a lot of unnecessary and
  large dependencies).

svn path=/nixpkgs/trunk/; revision=22061
 2010-05-30 21:56:56 +00:00
Eelco Dolstra
ad48452ee1 * NVIDIA drivers updated to 195.36.24. 
svn path=/nixpkgs/trunk/; revision=21856
 2010-05-19 10:35:44 +00:00
Eelco Dolstra
3b2d0133f3 * Patch the `nvidia-settings.desktop' file to make it work on KDE. 
svn path=/nixpkgs/trunk/; revision=21628
 2010-05-06 16:58:04 +00:00
Eelco Dolstra
8a4805ba22 * Updated nvidia-x11 to 195.36.15. 
svn path=/nixpkgs/trunk/; revision=21209
 2010-04-21 14:47:13 +00:00
Lluís Batlle i Rossell
e37d850227 Updating the nvidia legacy drivers, so they build with linux 2.6.33 
svn path=/nixpkgs/trunk/; revision=20943
 2010-04-04 18:01:36 +00:00
Eelco Dolstra
53cdaca17e * NVidia driver: revert to 190.53 because 195.36.08 has been withdrawn 
due to a fan speed issue (reported by James Cook).

svn path=/nixpkgs/trunk/; revision=20468
 2010-03-08 08:16:16 +00:00
Eelco Dolstra
8ba2b6a933 * Latest NVIDIA driver. 
svn path=/nixpkgs/trunk/; revision=20352
 2010-03-03 14:06:14 +00:00
Lluís Batlle i Rossell
3e1a06bae1 Updating the nvidia drivers to the latest version. 
I added 'perl' as their buildInputs to get them built.
I don't know if it is something new from nvidia, but I imagine it may be
introduced in 2.6.31, for any module building.

svn path=/nixpkgs/trunk/; revision=19029
 2009-12-18 11:36:36 +00:00
Lluís Batlle i Rossell
3881f13ad6 Updating the nvidia legacy drivers. Without this update, the drivers 
did not work with xorg-server-1.7

svn path=/nixpkgs/trunk/; revision=18574
 2009-11-23 21:40:51 +00:00
Eelco Dolstra
35593f5cd5 * NVIDIA X11 driver updated to 190.42. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18023
 2009-10-29 13:47:44 +00:00
Lluís Batlle i Rossell
854293fc7b Adding the nvidia legacy drivers (I still use a geForce 4 AGP) 
svn path=/nixpkgs/trunk/; revision=17284
 2009-09-19 22:09:08 +00:00
Eelco Dolstra
e8931adcf3 * Latest NVIDIA driver. This one isn't broken on laptops. 
svn path=/nixpkgs/trunk/; revision=16858
 2009-08-26 09:01:05 +00:00
Eelco Dolstra
a82d1e3d63 * Revert the NVIDIA driver to the previous version. The new one 
doesn't work (black screen on startup).

svn path=/nixpkgs/trunk/; revision=16588
 2009-08-05 08:54:13 +00:00
Eelco Dolstra
8abae778b8 * Latest NVIDIA driver. 
svn path=/nixpkgs/trunk/; revision=16558
 2009-08-03 12:18:50 +00:00
Eelco Dolstra
49d141ed01 * Work around a bizarre bug that causes nvidia-settings to be able to 
find libXrandr when invoked as "nvidia-settings", but not when
  invoked by absolute path
  (e.g. "/var/run/current-system/sw/bin/nvidia-settings").  Adding it
  to libGL's RUNPATH fixes this.  Strangely, libGL doesn't even
  contain a reference to libXrandr.

svn path=/nixpkgs/trunk/; revision=15971
 2009-06-16 12:51:35 +00:00
Eelco Dolstra
47eb07cfeb * Latest NVIDIA driver. 
svn path=/nixpkgs/trunk/; revision=15944
 2009-06-12 12:56:03 +00:00
Eelco Dolstra
2d8003ff6d * NVIDIA X11 driver updated to 180.60. 
svn path=/nixpkgs/trunk/; revision=15818
 2009-06-02 09:47:48 +00:00
Eelco Dolstra
3ae548a124 * Latest NVIDIA driver. 
svn path=/nixpkgs/trunk/; revision=15339
 2009-04-27 18:28:09 +00:00
Eelco Dolstra
1807907e6d * The NVIDIA driver looks for libXrandr, so it's probably 
best to provide it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15193
 2009-04-20 16:54:16 +00:00
Eelco Dolstra
0b931eae66 * nvidia / nvidiaDrivers -> nvidia-x11. 
svn path=/nixpkgs/trunk/; revision=14787
 2009-03-30 14:54:06 +00:00