1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-23 07:26:54 +00:00
Commit graph

62 commits

Author SHA1 Message Date
Anders Kaseorg 3cd8ce3bce treewide: Fix unsafe concatenation of $LD_LIBRARY_PATH
Naive concatenation of $LD_LIBRARY_PATH can result in an empty
colon-delimited segment; this tells glibc to load libraries from the
current directory, which is definitely wrong, and may be a security
vulnerability if the current directory is untrusted.  (See #67234, for
example.)  Fix this throughout the tree.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-01-15 09:47:03 +01:00
Fabian Möller a03b7ebaa6 ati_drivers_x11: fix libGL and libGLU paths 2019-11-26 18:01:02 +01:00
adisbladis c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Jascha Geerds ffedc3e4a9 misc: Remove myself from list of maintainers
Unfortunately I don't have the time anymore to maintain those
packages.
2019-03-12 23:50:52 +01:00
Lengyel Balazs f4a53ff3bc treewide/xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
Craig Younkins 8b12b17df3
treewide: Fix broken Gmane URLs 2018-12-25 22:34:55 -05:00
davidak 6e05256704 radeon-crimson: fix download 2018-11-04 08:35:44 +01:00
John Ericson 2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Matt McHenry 166464b5ad patch ati-drivers for kernel 4.9
uses patch from https://github.com/imageguy/fglrx-for-Fedora/blob/master/fglrx_kernel_4.9.diff
2017-02-11 12:57:53 +02:00
Matt McHenry f0bdca82c0 linuxPackages.ati_drivers_x11: patch for kernel 4.7+ (#19810) 2016-11-28 19:56:50 +01:00
Vladimír Čunát 12a45a8496 Merge #18237: ati_drivers_x11: patch for kernel 4.6 2016-09-17 01:29:27 +02:00
Matt McHenry 7bc91ffe41 patch ati-drivers for kernel 4.6
this uses the patch from
https://github.com/manjaro/packages-extra/commit/ddae91f2 to account
for https://github.com/torvalds/linux/commit/d4edcf0d and the patch
from https://www.virtualbox.org/ticket/15298 to account for
https://github.com/torvalds/linux/commit/09cbfeaf
2016-09-03 21:29:52 -04:00
Franz Pletz f5c9f99877 linuxPackages.ati_drivers_x11: disable pic & format hardening 2016-08-13 16:06:57 +02:00
Vladimír Čunát 0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Edward Tjörnhammar f7aed7a00d
ati-drivers: migrate some patches from gentoo ati-drivers
https://anaongit.gentoo.org/git/repo/gentoo.git @ 52dac7bdbb16f2353b15137165b69056034d7ad0
and parents for further source information.
2016-05-20 13:14:31 +02:00
Tuomas Tynkkynen 51ca347278 treewide: Make explicit that 'dev' output of libXxf86vm is used 2016-05-19 10:04:40 +02:00
Edward Tjörnhammar 046ee5ac3f
ati-drivers: 15.7 -> 15.12
Also addresses breakage due to the multiple-outputs merge.
2016-05-12 17:25:36 +02:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Tuomas Tynkkynen 1894615f64 treewide: Mass replace 'xorg.libXrender}/lib' to refer the 'out' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen 474f921bac treewide: Mass replace 'xorg.libXrandr}/lib' to refer the 'out' output 2016-01-24 10:03:37 +02:00
Tuomas Tynkkynen 5a6a8213eb treewide: Mass replace 'xorg.libXinerama}/lib' to refer the 'out' output 2016-01-24 10:03:37 +02:00
Tuomas Tynkkynen 40ef23e7ed treewide: Mass replace 'xorg.libXext}/lib' to refer the 'out' output 2016-01-24 10:03:37 +02:00
Tuomas Tynkkynen 5d52f55426 treewide: Mass replace 'xorg.libX11}/lib' to refer the 'out' output 2016-01-24 10:03:37 +02:00
Tony White 722c616b8f ati-drivers: Restore opengl & direct rendering
- Removed a collision in the nix store
- Removed dependency on qt
- Fixed opengl and direct rendering by correcting some link paths
- Some code refactored in builder.sh
- Comments added/modified

This pull request fixes #11740 and I recommend that it be considered
as a hotfix for the stable channel due to the fact that opengl
and direct rendering are broken there too.
2016-01-20 19:51:52 +00: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
Daniel Fox Franke d7443ffb89 Only use underscored versions of read_cr4 and write_cr4 in 3.18 and above.
I'm not sure precisely in what micro-version the API change was made, so
the check for 3.18.0 and above may not be quite correct. But it's at
least sufficient for every version currently included in NixOS.
2015-08-03 21:42:08 -04:00
Daniel Fox Franke 17fb7ac352 ati-drivers: give the patch file a more sensible name
It makes several API fixes for several kernel versions so stop trying to
enumerate them all in the filename.
2015-08-03 00:46:29 -04:00
Daniel Fox Franke 6f2db8fe44 ati-drivers: Fixes for kernel 4.1.
* IRQF_DISABLED was already a no-op in recent kernels, has now been
  removed.
* strnicmp is renamed to strncasecmp.
2015-08-03 00:36:30 -04:00
Daniel Fox Franke 1d3207b27b ati-drivers: update to Catalyst 15.7 and fix build with recent kernels 2015-08-03 00:14:36 -04:00
Eric Seidel f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08: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
Jascha Geerds b15311027f ati-driver: Fix support for linux kernel 3.17 2014-12-10 21:30:31 +01:00
Jascha Geerds 3525f7135f ati-driver: Bump version to 14.12 2014-12-10 21:12:54 +01:00
Jascha Geerds d071a25dec ati-driver: Fix "Catalyst Control Center" 2014-10-15 00:37:39 +02:00
Nathaniel Baxter 61e29cff68 ati_unfree: Cleanup whitespace in builder.sh 2014-09-20 22:45:21 +10:00
Nathaniel Baxter 6ae760b311 ati_unfree: Patch ati binary libs to use /run/opengl-driver-*/lib/dri . 2014-09-20 22:34:51 +10:00
Nathaniel Baxter 45f4b8b3ad ati_unfree: Towards using ati unfree 32bit binary libs 2014-09-07 12:40:40 +10:00
Nathaniel Baxter c16874c4c0 ati_unfree: Create a nixos module for the ati_unfree x11 driver and
blacklist the radeon driver when ati_unfree is installed.
2014-09-07 12:40:32 +10:00
Nathaniel Baxter 9a48f9d1b6 ati-drivers: bump version to 14.4 2014-09-07 12:40:24 +10:00
Cillian de Róiste 00b1461e4f ATI-driver: the hash has changed, reported by: @ikervagyok 2014-02-10 16:42:02 +01:00
Jaka Hudoklin e0000f8ad1 ati-drivers: update to 13.12 (close #1569)
This update is mostly effort from @MarcWeber and @vcunat, now tested on real
hardware making sure it works with multiple GPUs and opencl.
2014-01-23 12:11:28 +01:00
Shea Levy 139f8949e6 Merge branch 'merge-kernel-builds' into upstream-master
This is a second attempt at unifying the generic and manual-config
kernel builds (see #412 for the last time).

The set of working kernel packages is a superset of those that work on
master, and as the only objection last time was the size of the $dev
closure and now both $out and $dev combined are 20M smaller than $out on
master (see message for ac2035287f), this
should be unobjectionable.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 07:13:19 -05: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
Domen Kožar 38fcedcd5f Merge pull request #1380 from offlinehacker/pkgs/ati-drivers/fix_download
ati-drivers: fix download
2014-01-03 03:40:36 -08:00
Jaka Hudoklin 220c3b5ba4 ati-drivers: fix download 2013-12-14 00:59:54 +01:00
Jaka Hudoklin 3c677fde65 ati-drivers: fix aticonfig segmentation fault
Fix aticonfig tool by setting libXinerama to LD_LIBRARY_PATH
2013-12-13 09:34:04 +01:00
Eelco Dolstra c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Marc Weber 57032af1ae ati-proprietary: update, make it build with linux 3.10, fix breakage.
with contributions by Jaka Hudoklin.
2013-08-22 13:00:23 +03: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