Shea Levy
9adad8612b
Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
...
Was meant to go into staging, sorry
This reverts commit 57b2d1e9b0
, reversing
changes made to 760b2b9048
.
2016-08-15 19:05:52 -04:00
Vladimír Čunát
344c672bb5
libdrm: 2.4.68 -> 2.4.70
2016-08-14 15:20:19 +02:00
Vladimír Čunát
1c253e7729
libdrm: 2.4.66 -> 2.4.68
2016-05-22 12:10:39 +02:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Vladimír Čunát
5bdb1c9cd1
libdrm: update 2.4.65 -> 2.4.66
2016-01-04 11:47:40 +01:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát
c8f462b80b
libdrm: update 2.4.64 -> 2.4.65
2015-09-20 10:23:39 +02:00
William A. Kennington III
7af1960345
libdrm: 2.4.62 -> 2.4.64
2015-08-18 11:27:01 -07:00
William A. Kennington III
33ff74ced6
libdrm: Remove valgrind as a dependency
...
cc @vcunat
2015-07-19 12:04:55 -07:00
Vladimír Čunát
6437b2108d
libdrm: update and add valgrind dependency
...
I couldn't find an easy way around this new build-time dependency,
unfortunately. It creates some new mass-rebuild chains...
2015-07-19 11:26:10 +02:00
Vladimír Čunát
d35bd55ab7
libdrm: small update
2015-05-26 20:06:49 +02:00
Vladimír Čunát
bf414c9d4f
Merge 'staging' into closure-size
...
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
William A. Kennington III
51444621cd
libdrm: Enable freedreno
2015-03-28 13:51:38 -07:00
William A. Kennington III
b17cf394bd
libdrm: 2.4.59 -> 2.4.60
2015-03-26 12:34:05 -07:00
Vladimír Čunát
c4ac05d47e
libdrm: update
2015-03-09 15:55:22 +01:00
Vladimír Čunát
afe28673c9
libdrm: update
2014-10-19 20:11:02 +02:00
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Vladimír Čunát
9fcd3c2825
libdrm: update
2014-08-02 04:43:11 +02:00
John Wiegley
b896b49827
libdrm: allow to build on any unix
2014-06-07 20:17:47 +00:00
Vladimír Čunát
f91a594748
libdrm: minor update 2.4.52 -> .54
...
Including support for AMD Mullins chips.
2014-05-06 18:43:01 +02:00
Vladimír Čunát
9b905b97cb
libdrm: minor update 2.4.50 -> .52
2014-01-28 12:06:22 +01:00
Vladimír Čunát
8dc05a8fc9
libdrm: bump 2.4.49 -> .50
...
Mainly, it fixes a critical bug for Radeon Southern Islands GPUs.
2013-12-10 10:41:35 +01:00
Vladimír Čunát
0d4d1097cb
libdrm: minor update 2.4.48 -> .49
2013-11-23 10:18:15 +01:00
Vladimír Čunát
6dc30df086
libdrm: minor update 2.4.46 -> .48
2013-11-17 13:41:10 +01:00
Mathijs Kwik
1a55c4b89f
Merge remote-tracking branch 'official/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/libpng/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/tools/typesetting/tex/texlive/default.nix
pkgs/top-level/all-packages.nix
2013-09-11 10:53:31 +02:00
Vladimír Čunát
f0c59e322d
libdrm: minor update
...
Builds. I found no kind of news/changelog docs, hopefully nothing important.
2013-08-27 21:10:43 +02:00
Eelco Dolstra
4a3ababb74
libdrm: Use multiple outputs
2013-08-23 10:01:31 +02:00
Vladimír Čunát
afdc7fdfb6
fix evaluation on non-Linux, should fix tarball
2013-06-17 22:06:36 +02:00
Vladimír Čunát
70882b980c
WARNING: history from now is going to change (mesa+llvm)
...
Current WIP, only tested nouveau (3D works very well).
2013-05-16 17:16:02 +02:00
Vladimír Čunát
aa06b2b427
libdrm: update because of mesa-9.1
2013-02-23 12:07:19 +01:00
Vladimír Čunát
0d72174dbd
Merge branch stdenv-updates into x-updates
...
x-updates is supposed to merge after stdenv-updates, so let's test it
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Arseniy Alekseyev
099ccef982
Updated Mesa to 9.0.2
...
Also updated libdrm to 2.4.40 (not 2.4.41 because they have broken tars for that)
Removed the Mesa patch for sis video on mips64el-linux because sis is not
supported in Mesa anyway (since version 8)
2013-01-28 17:32:08 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Shea Levy
c514ee974a
Merge remote-tracking branch 'upstream/master' into x-updates
...
mountall conflict was trivial
Conflicts:
pkgs/os-specific/linux/mountall/default.nix
2012-07-14 14:24:27 -04:00
Peter Simons
281494cd51
libdrm: enable support for experimental radeon API
...
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 16:53:52 +02:00
Eelco Dolstra
c5e63c593f
* Go back to a slightly older libdrm version, otherwise Mesa's Nouveau
...
driver fails to build (because libdrm removed some header files on
which it depends).
svn path=/nixpkgs/branches/x-updates/; revision=34144
2012-05-16 21:56:03 +00:00
Eelco Dolstra
3fb08e0150
* Remove obsolete flag.
...
svn path=/nixpkgs/branches/x-updates/; revision=34141
2012-05-16 20:48:30 +00:00
Eelco Dolstra
340afa4008
* libdrm updated to 2.4.34. Drop the Cairo dependency because it's
...
only used for tests (which we don't run anyway), and it will cause a
cyclic dependency problem if we enable OpenGL support in Cairo.
svn path=/nixpkgs/branches/x-updates/; revision=34132
2012-05-15 22:12:27 +00:00
Yury G. Kudryashov
ee0822153a
Upgrade libdrm and mesa to the latest versions
...
svn path=/nixpkgs/trunk/; revision=31598
2012-01-16 17:48:33 +00:00
Peter Simons
4e5092d0c6
Revert "libdrm: updated to version 2.4.29"
...
This reverts commit ebe85f30fa075507313fc9dfa6ceb96501c6e332.
svn path=/nixpkgs/trunk/; revision=31537
2012-01-14 12:13:53 +00:00
Peter Simons
736b039b3f
libdrm: updated to version 2.4.29
...
svn path=/nixpkgs/trunk/; revision=31534
2012-01-14 12:09:15 +00:00
Shea Levy
e309c50e7e
Get libdrm to compile on darwin
...
The added patch uses mach_absolute_time() to get a nanosecond-resolution monotonic clock on darwin systems (See http://developer.apple.com/library/mac/#qa/qa1398/_index.html for an understanding of the added code). In addition, the patch changes one use of clock_gettime to gettimeofday since only resolution of a second is needed at that point. This code compiles on darwin, but the resulting library is not yet tested.
svn path=/nixpkgs/trunk/; revision=28879
2011-08-29 18:55:37 +00:00
Eelco Dolstra
c3e68778ae
* libdrm updated to 2.4.24.
...
svn path=/nixpkgs/branches/x-updates/; revision=26185
2011-03-07 11:22:40 +00:00
Eelco Dolstra
e9c3b7b55a
* libdrm 2.4.23.
...
svn path=/nixpkgs/branches/x-updates/; revision=25814
2011-02-08 14:15:53 +00:00
Eelco Dolstra
40c9c60211
* libdrm updated to 2.4.22.
...
svn path=/nixpkgs/trunk/; revision=24256
2010-10-12 22:12:54 +00:00
Eelco Dolstra
65d9c03c9a
* libdrm updated to 2.4.21.
...
svn path=/nixpkgs/branches/x-updates/; revision=22642
2010-07-18 21:54:57 +00:00
Eelco Dolstra
3687bc9e39
* libdrm updated to 2.4.18 ("motivated by a fix for a bug in the intel
...
support which was causing dramatic failures with at least version
2.10 of the xf86-video-intel driver").
svn path=/nixpkgs/trunk/; revision=20073
2010-02-17 09:56:04 +00:00
Lluís Batlle i Rossell
9183f21f7e
Merging from trunk.
...
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Eelco Dolstra
f189022d13
* Updated mesa to 7.6.1.
...
* Removed mesa-headers as it's not used anymore.
svn path=/nixpkgs/trunk/; revision=19389
2010-01-13 12:43:17 +00:00
Lluís Batlle i Rossell
ca5d91aa60
Made more libraries cross compile. fontconfig, libxcb, bzip2, libdrm, zlib...
...
I was trying to cross compile SDL. Many dependencies work, but I ended seeing
libX11 not ready for cross compilation. Other xorg libraries cross-compile
well. libX11 may need a small patch. The problem is the usual "configure test
cannot be run in cross compilation", so the configure script halts.
I made the pkgconfig expression always return buildDrv, as I think it rarely
will be needed as buildInput. So to avoid rewriting all its mentions to use
it as buildNativeInput, I prefered this small change.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18500
2009-11-21 10:44:22 +00:00