Commit graph

48 commits

Author SHA1 Message Date
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
Eelco Dolstra 9248dc1a14 Remove unfree ATI drivers package from the channel
Urghhhhh...
2013-01-17 22:05:59 +01:00
Marc Weber 2e7847cd12 making ati dirvers compile again
See comments on the nixos patch
2012-10-07 18:03:06 +02:00
Peter Simons 09bb4b0292 ati-drivers: update download URL
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 16:53:52 +02:00
Yury G. Kudryashov 313a029f16 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
Eelco Dolstra b23126fcc3 * Include the kernel version in kernel-specific packages so that they
can be distinguished in nix-env -qa output.

svn path=/nixpkgs/trunk/; revision=32352
2012-02-17 14:32:28 +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
Evgeny Egorochkin db4b283fd1 ati-drivers: version bump. Patch by: Cillian de Róiste.
svn path=/nixpkgs/trunk/; revision=24896
2010-11-28 09:17:42 +00:00
Evgeny Egorochkin 3748bba126 ati-drivers: version bump and fix name/version. Patch by Cillian de Róiste.
svn path=/nixpkgs/trunk/; revision=24479
2010-10-26 00:35:38 +00:00
Ludovic Courtès be4bd94e35 ati-drivers: Comment out broken assertion.
svn path=/nixpkgs/trunk/; revision=23227
2010-08-18 14:45:13 +00:00
Yury G. Kudryashov 5e846002d6 ati-drivers: restrict "platforms" to x86_64-linux
svn path=/nixpkgs/trunk/; revision=21967
2010-05-25 11:27:18 +00:00
Marc Weber 26e718ba23 move assertions so that buildign the NixOS manual doesn't fail
svn path=/nixpkgs/trunk/; revision=21855
2010-05-19 10:01:07 +00:00
Marc Weber 6361b3a682 adding ati-drivers There is still much to be done, see http://thread.gmane.org/gmane.linux.distributions.nixos/4145
svn path=/nixpkgs/trunk/; revision=21848
2010-05-18 19:36:55 +00:00