Commit graph

252 commits

Author SHA1 Message Date
Tuomas Tynkkynen 9fe81b5ac2 nvidia-x11: Attempt to fix library-only build
1fb0d3d158 (commitcomment-26554956)
2017-12-30 18:44:45 +02:00
Franz Pletz 1fb0d3d158
Fix some instances of #33166 correctly 2017-12-29 22:35:32 +01:00
Christoph Hrdinka d1bfa7ee08
nvidia-x11: add libelf to buildInputs
Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
2017-12-28 13:28:39 +01:00
Mateusz Kowalczyk 34b0c1c417 nvidia-settings: Make sure binary can find libXv.so 2017-12-17 15:34:51 +00:00
Elis Hirwing 9a3a4f3125
nvidia-x11: 387.22 -> 387.34 2017-12-13 23:01:17 +01:00
Vladimír Čunát e9550f290c
nvidia_x11_legacy340: add another patch
I *suspect* that NV_VM_OPERATIONS_STRUCT_HAS_FAULT isn't detected
in our case for some reason, so this patch doesn't make a difference.
In any case, the patch seems unlikely to make anything worse.
2017-11-30 12:06:27 +01:00
Vladimír Čunát b934716782
nvidia_x11_legacy304: fix build with kernel 4.14
/cc #31640.
2017-11-30 09:51:17 +01:00
Vladimír Čunát 1e4d675c4e
nvidia_x11_legacy304: 304.135 -> 304.137
This now builds with kernel 4.13; Debian has only the typo patch there.
Curiously, .settings still fails to link on x86_64-linux but works
on i686-linux, just as with .135.
2017-11-30 09:50:22 +01:00
Vladimír Čunát 6aa3f54f8d
nvidia_x11_legacy340: patch to support kernel 4.14
/cc #31640.
2017-11-29 23:26:00 +01:00
Vladimír Čunát 2dfbc5f8ed
nvidia_x11_legacy340: 340.102 -> 340.104
Fixes #32169: build with kernel 4.13.
Unfortunately, 4.13 is going away very soon and for 4.14 doesn't build.

I only tested building it, but these minor bumps should be safe.
2017-11-29 19:04:48 +01:00
Cray Elliott 2517cea040 nvidia-x11-stable: 384.90 -> 387.22 2017-11-21 19:15:37 -08:00
Cray Elliott 56d1a14419 nvidia-x11: 384.69 -> 384.90 2017-09-28 00:01:37 -07:00
Jan Solanti 4ec3d311cb nvidia-x11: generate nvidia_icd.json from template 2017-09-26 21:53:44 +02:00
Cray Elliott 6df5f88aca nvidia-x11: 375.66 -> 384.69 2017-09-05 16:12:31 -07:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Charles Strahan 3b1c4fce4f psensor: init at 1.2.0
psensor is a graphical hardware monitoring application for Linux
2017-06-13 18:51:36 -04:00
Nikolay Amiantov 7b41780a0e linuxPackages.nvidia_x11: move patches to specific versions 2017-05-31 16:52:03 +03:00
Vladimír Čunát 0c4b91505e
nvidia_x11_legacy304: apply patches from Debian
The drivers would build but probably wouldn't work without them.
See #26250.
2017-05-31 10:48:54 +02:00
Vladimír Čunát af58f8de55
nvidia_x11_legacy304: 304.134 -> 304.135 2017-05-31 10:02:56 +02:00
Cray Elliott 4f51a1ef32 nvidia-x11: add dbus as a dependency to settings
for the latest beta release, the nvidia-settings binary will not compile
without dbus/dbus.h
2017-05-12 01:30:28 -07:00
Vladimír Čunát 165a6548ad
nvidia_x11_legacy340: fix patch URL to fix #25721
Using fixed-commit URLs and fetchpatch is just more robust.
2017-05-12 10:13:26 +02:00
Cray Elliott 11b8cfb506 nvidia_x11_beta: 378.13 -> 381.22
also remove nvidia 4.10 kernel patch as it is no longer needed
2017-05-11 17:53:19 -07:00
Linus Heckemann 89ce83688c nvidia-x11: fix linux 4.10 patch URL 2017-05-11 17:29:57 -07:00
Linus Heckemann 995d41c091 nvidia stable: 375.39 -> 375.66 2017-05-11 17:29:57 -07:00
zraexy 563fa2c034 nvidia-x11: switch download urls to https 2017-04-29 13:19:04 -08:00
John Ericson 37e5e71fdf Merge pull request #24974 from Ericson2314/mapNullable
Introduce `mapNullable` into lib and use it in a few places
2017-04-17 17:12:14 -04:00
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