1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-06 20:44:13 +00:00
Commit graph

111 commits

Author SHA1 Message Date
Shea Levy 05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Vladimír Čunát 3d9bbdb794 nvidia_x11: document the updating policy
CC #5070.
2014-12-24 00:49:59 +01:00
Vladimír Čunát fd9d8edc51 nvidia_x11: add 343 branch as the default (close #5070)
It's just a plain copy of the 340 expressions (only hash and version changed).
2014-12-24 00:06:46 +01:00
Vladimír Čunát 5a4feadd58 nvidia_x11: maintenance+security updates
It's supposed to fix GLX problems CVE-2014-8298, see:
http://nvidia.custhelp.com/app/answers/detail/a_id/3610

Tested building all atop 14.12, and running 340.* there.
2014-12-23 23:37:24 +01:00
Vladimír Čunát d39c6ceffc nvidia_x11: current long-lived becomes a new legacy
CC: #5070.
2014-11-24 22:39:00 +01:00
Eduard Bachmakov bba575ff7a nvidia_x11: update to 340.58
Picked from #5070.
2014-11-24 22:39:00 +01:00
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
Vladimír Čunát 2015aecd44 Revert "Copy all so files over from nVidia blob"
This reverts commit 816d971aea.
See discussion on https://github.com/Fuuzetsu/nixpkgs/commit/816d971ae
2014-08-20 02:22:29 +02:00
Cray Elliott 477eb18d18 nvidia-x11: update to 340.32 (close #3365)
Also close #3634.
2014-08-19 21:03:52 +02:00
Mateusz Kowalczyk 816d971aea Copy all so files over from nVidia blob 2014-08-09 01:57:42 +02:00
Mateusz Kowalczyk a5ee903e60 Copy over libGLESv2 and libEGL too for nVidia blob 2014-08-09 01:07:39 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra 6c0002ec8d nvidia-x11: Update to 340.24 2014-07-15 19:53:39 +02:00
Cray Elliott a1a9f3f14a nvidia legacy 304xx driver updated to .123 point release
among other things, fixes compilation with Linux 3.14
2014-07-14 14:50:01 +02:00
Rob Vermaas ce87d3e307 Merge pull request #2465 from robberer/nvidia/driver
nvidia-x11: add nvidia-uvm module which is necessary for blender GPU support
2014-05-28 08:30:22 +02:00
Eelco Dolstra fc70d6f712 nvidia-x11: Don't install nvidia-xconfig
Rewriting the X11 config doesn't work on NixOS.
2014-05-22 13:00:52 +02:00
Eelco Dolstra 5ec3a63fcb nvidia-x11: Update to 331.79 2014-05-22 13:00:51 +02:00
robberer 9683c6e806 add nvidia-uvm module which is necessary for blender GPU support 2014-05-01 16:37:14 +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
Lluís Batlle i Rossell 05b94c04cf Updating nvidia legacy 304 to 304.117 2013-12-18 11:24:53 +01: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
Aristid Breitkreuz 147a6ae62f nvidia: also install useful nvidia-smi tool 2013-07-21 19:32:54 +02: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
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