Commit graph

226 commits

Author SHA1 Message Date
John Ericson
85aa5005af Introduce mapNullable into lib and use it in a few places
Also simply some configure flag logic my grep also alerted me too.
2017-04-17 17:04:04 -04:00
Victor Calvert
71d8ce6f4b nvidia: 340.101 -> 340.102 (#24694) 2017-04-16 22:08:20 +02:00
Vladimír Čunát
9ee2143912
treewide: remove unused buildEnv parameters 2017-04-16 10:29:49 +02:00
Kosyrev Serge
d860a68fd0 nvidia-x11: $bin can be empty 2017-03-19 05:29:57 +03:00
Kosyrev Serge
d18f55269c nvidia-x11: don't patch things if libsOnly requested 2017-03-19 05:29:33 +03:00
Cray Elliott
8799254eac nvidia_x11_beta: add patch to support Linux 4.10.x
thanks to bendlas for the review for pointing out a way to grab the patch remotely!
2017-03-13 00:00:26 -07:00
Cray Elliott
12083de992 nvidia_x11: 375.26 -> 375.39
nvidia_x11_beta: 378.09 -> 378.13
2017-03-12 23:54:08 -07:00
Nikolay Amiantov
22750b36fd nvidia: support application profiles
Closes #22666.
2017-02-19 19:46:01 +03:00
Nikolay Amiantov
f6eedf0867 nvidia-x11.settings: add librsvg for gtk3 2017-02-19 19:45:54 +03:00
Nikolay Amiantov
362ef377c8 nvidia_x11.settings: link dlopen'ed libraries 2017-02-19 11:53:23 +03:00
Jude Taylor
c3e3b6a19a
nvidia-x11: fix parallel building variable name 2017-02-11 14:29:37 -08:00
Frederik Rietdijk
bab37c73ac nvidia-x11: undo parallel building
In ffc498c490 -j$NIX_BUILD_JOBS was added.
Somehow this caused my machine to run many many more parallel jobs than
it was supposed to, freezing the system.

If you don't experience this, feel free to revert.
2017-02-11 15:50:22 +01:00
Nikolay Amiantov
2fd2fcf54d linuxPackages.nvidia_x11: refactor, build more from source
* Use libglvnd;
* Compile nvidia-settings, nvidia-persistenced from source;
* Generalize builder.
2017-02-08 16:57:46 +03:00
Jude Taylor
ffc498c490
nvidia_x11: add missing vulkan files 2017-01-28 19:47:25 -08:00
Nikolay Amiantov
d75a3cfb29 Merge pull request #21995 from abbradar/opencl
Fix OpenCL support
2017-01-20 12:09:17 +03:00
Nikolay Amiantov
05eee18e7a linuxPackages.nvidia_x11: fix OpenCL support
* Move OpenCL .icd file to the right place;
* Remove libOpenCL.so (we use ocl-icd instead).
2017-01-20 03:37:51 +03:00
Graham Christensen
d20d38e68d
nvidia_x11_legacy340: 340.96 -> 340.101 for CVE-2016-7382, CVE-2016-7389, CVE-2016-8826 2017-01-11 20:11:20 -05:00
Graham Christensen
9837dce6d2
nvidia_x11_legacy304: 304.131 -> 304.134 for CVE-2016-7382, CVE-2016-7389, CVE-2016-8826 2017-01-11 20:11:14 -05:00
Frederik Rietdijk
9f6bd82364 nvidia-x11: 375.20 -> 375.26 2016-12-23 10:57:28 +01:00
Frederik Rietdijk
231cd277df nvidia-x11: 367.57 -> 375.20 2016-11-26 09:31:10 +01:00
Graham Christensen
634a098940
linuxPackages.nvidia_x11: Remove us prefix from mirror
At the time of the last upgrade, the new driver wasn't available on
anything but their US mirror. Pinning to the US mirror isn't
recommended or preferable, but I did it anyway to be able to get the
upgrade out.
2016-10-16 11:08:17 -04:00
Graham Christensen
b98c0a668e
nvidia-x11: 367.35 -> 367.57 2016-10-11 19:43:58 -04:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Franz Pletz
9e7d118ea2 linuxPackages.nvidia-x11: disable pic & format hardening 2016-08-13 16:49:42 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Robin Gloster
1be4907ca2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-02 13:46:36 +00:00
Frederik Rietdijk
8eb4b3af10 nvidia-x11: fix driSupport32Bit 2016-08-02 13:03:44 +02:00
Karn Kallio
5d11dac8bb nvidia-x11: advance to 365.35 and patch kernel 4.7. 2016-08-01 10:19:57 -04:00
Robin Gloster
43ba8d295f nvidia-x11: disable pic/format hardening 2016-07-31 20:38:38 +00:00
Tobias Geerinckx-Rice
eec8d44335
nvidia_x11_legacy*: remove unused nvidia-340.76-kernel-4.0.patch 2016-06-22 03:58:55 +02:00
Graham Christensen
180417f385
nvidia-x11: 361.42 -> 361.45.11 2016-05-31 22:23:54 -05:00
Eelco Dolstra
59ef7d25c3 nvidia-x11: 358.16 -> 361.42
This fixes the segfault reported in #13942 caused by missing
libEGL.so.0 and libEGL_nvidia.so.0 symlinks.
2016-04-06 15:53:14 +02:00
Vladimír Čunát
a1de225913 Revert "nvidia: 358.16 -> 361.28" to fix #13942
This reverts commit e0fe8cf204.
Befor updating we need to fixup problems related to GLVND transition.
2016-03-16 20:08:41 +01:00
Vladimír Čunát
17b83a88c3 nvidia-x11*: use mirror-agnostic URLs 2016-03-10 15:56:53 +01:00
Graham Christensen
fed36719f6 nvidia_x11_legacy304: 304.125 -> 304.131
Thanks to the great commit message in 6257425dab
(thank you edwtjo) I was able to go back and find out the patch which
was causing build failures is no longer necessary after upgrading
this legacy driver.
2016-03-09 19:41:04 -06:00
Svein Ove Aas
e0fe8cf204 nvidia: major update 358.16 -> 361.28
Beta also gets updated, but even upstream it's older than stable.
vcunat generalized parallel make. Close #12719.
2016-03-07 23:14:44 +01:00
Tobias Geerinckx-Rice
a90196d4cd nvidia_x11_legacy304: fix evaluation
nvidia-340.76-kernel-4.0.patch was removed from nvidia_x11_legacy340
54d342add8 but is still needed for 304.

I think. CC @vcunat.
2016-03-06 01:05:44 +01:00
Vladimír Čunát
54d342add8 nvidia_x11_legacy340: update 340.76 -> 340.94
Fixes #13658.
2016-03-05 22:19:14 +01:00
Nikolay Amiantov
6563fa6125 nvidia_x11: move vdpau libraries to lib/vdpau 2016-01-26 04:30:26 +03:00
Svein Ove Aas
805d453bc2 nvidia: branch update 352.63 -> 358.16 (close #12272)
Tested & reviewed by vcunat:
- the patch seems not needed anymore,
- reflects changes in their build system
  ftp://download.nvidia.com/XFree86/packaging/linux/new-kbuild-for-355/README
2016-01-14 12:32:53 +01:00
William A. Kennington III
8d01a4a4e4 nvidia: 352.55 -> 352.63 2015-11-17 21:13:41 -08:00
Eelco Dolstra
db19779965 nvidia-x11: Update to 352.55 2015-10-30 11:06:36 +01:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
1464a4de57 nvidia-x11: don't install libvdpau* that we have already
Besides being redundant to inject libvdpau via LD_LIBRARY_PATH,
currently the drivers come with a vulnerable version.
https://devtalk.nvidia.com/default/topic/873035
2015-09-01 13:27:12 +02:00
William A. Kennington III
5056267761 nvidia: Add 4.2 patch 2015-08-31 00:08:33 -07:00
William A. Kennington III
dc506110c1 nvidia: 352.30 -> 352.41 2015-08-30 10:57:16 -07:00
Eelco Dolstra
e4610f2965 buildEnv: Support package priorities like nix-env
This gets rid of a bunch of collision warnings.
2015-08-25 00:40:40 +02:00
Vladimír Čunát
e2e21ef320 nvidia-x11-legacy{340,304}: fix build with linux-3.18
Close #9218.
It's our default kernel (now and for the upcoming release).
- 304 won't build with 4.1,
- 173 didn't even build with 3.14 due to other issues (3.12 is OK ATM)
- all legacy drivers are up-to-date with upstream releases.
2015-08-13 14:11:06 +02:00
Vladimír Čunát
374210aece nvidia-x11: maintenance update
Strange as it is, nvidia seems to drop UVM kernel module on 32-bit.
Basic driver usage shows no problems for me.
2015-07-30 15:35:02 +02:00
Spencer Janssen
ebe67d3c85 nvidia-x11: add a symlink for libGLESv2.so.2 (close #9024)
nvidia's EGL stack looks for libGLESv2.so.2 at runtime (confirmed by
watching strace), however builder.sh only provides a libGLESv2.so.1
symlink.

@vcunat ported to legacy_340; older ones don't produce GLES.
2015-07-28 12:43:58 +02:00
Vladimír Čunát
ff219393ca nvidia_x11_beta: fix build by syncing with default
/cc author @wkennington.
2015-07-28 12:41:13 +02:00
Eelco Dolstra
165406e1af nvidia-x11: Remove runtime dependency on linux.dev 2015-07-26 22:45:39 +02:00
Edward Tjörnhammar
6257425dab linuxPackages.nvidia_x11_legacy340: fix cr4 references
Patch was copied from here:
https://devtalk.nvidia.com/default/topic/813458/linux-4-0-rc1-346-47-build-error-_cr4-functions-fix/

Reference to kernel change, also noted in the forum post:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/arch/x86/include/asm/paravirt.h?id=1e02ce4cccdcb9688386e5b8d2c9fa4660b45389
2015-07-03 09:32:14 +02:00
William A. Kennington III
1bb39e282d nvidia-x11: 346 -> 352.21 2015-06-18 21:45:51 -07:00
William A. Kennington III
6ffd44c4c3 nvidia: 346.47 -> 346.59 2015-04-07 13:24:55 -07:00
William A. Kennington III
c0cb4e1ef7 nixos/nvidia: Add a temporary hack to support kernel 4.0 2015-04-03 21:53:34 -07:00
William A. Kennington III
18c9619021 nvidia: Add beta driver 2015-04-03 21:53:12 -07:00
Eelco Dolstra
06dfa19b99 nvidia-x11: Use GTK 2
Otherwise we end up with multiple versions of GTK in the system
closure. Also, GTK 3 is not well integrated in NixOS yet (e.g. it
doesn't respect KDE's colour scheme).
2015-03-02 00:23:43 +01:00
Eelco Dolstra
38b53b8e7d nvidia-x11: Update to 346.47 2015-03-02 00:23:43 +01:00
Vladimír Čunát
3009cc116e nvidia_x11: fix missing xorg lib symlinks; refactor
The builder structure should be now easier to understand
and easier to avoid such problems in future.
Fixes #6546.
2015-02-24 13:17:56 +01:00
Vladimír Čunát
7bf2021349 nvidia_x11: reintroduce libXv for nvidia-settings
It was dropped in 77986803a6.
2015-02-21 17:28:02 +01:00
Vladimír Čunát
77986803a6 nvidia_x11: fix nvidia-settings after the major update
The GUI would no longer find libs it needed.
Now it's gtk3 by default, so we don't support gtk2 version for simplicity.
ldd finds no missing libs after this commit.
2015-02-21 16:07:53 +01:00
Eelco Dolstra
fb72208bcf nvidia-x11: Update to 340.76 2015-02-16 11:49:17 +01:00
William A. Kennington III
eeb5319a43 nvidia_x11: 343.36 -> 346.35 2015-02-09 21:41:47 -08:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
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