swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-11-06 02:06:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
124065 commits 5 branches 0 tags 31 GiB
Commit graph

256 commits

Author SHA1 Message Date
Shea Levy 8b9b9fad31 Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"" 
Revert a revert of a merge that shouldn't have been in master but was intentionally in staging.

Next time I'll do this right after the revert instead of so far down the line...

This reverts commit 9adad8612b.
 2016-08-24 07:35:30 -04:00
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
rnhmjoj 7d0f05f22c
mesa: 11.2.2 -> 12.0.1 2016-08-13 03:46:47 +02:00
Vladimír Čunát 50f909cf93 mesa: have vdpau drivers in lib/vdpau again 
This was done by @abbradar 364f297bb2 but I lost that change by accident
when doing large closure-size merges 39ebb01d.
Fortunately it seems to have caused no problems, likely because
${mesa_drivers}/lib gets into $LD_LIBRARY_PATH.
 2016-08-07 12:14:16 +02:00
Vladimír Čunát 73e1242172 mesa: vdpau symlinks, broken after 1a52fdc 
Fixes #17559.
Using *relative* symlinks doesn't break when moving the files.
 2016-08-07 11:33:20 +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
Eelco Dolstra 1a52fdc3c6 mesa: Use symlinks instead of hard links for the DRI/vdpau drivers 
This reduces the size of the drivers output from 193 MiB to 44 MiB.

@vcunat
 2016-05-22 23:05:10 +02:00
Vladimír Čunát 61f63d5ddc mesa: feature update 11.1.3 -> 11.2.2 2016-05-22 12:10:39 +02:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Vladimír Čunát aa711c58bf mesa: maintenance update 11.1.2 -> 11.1.3 
There's also 11.2.1, but I don't have time to test ATM,
and such a change might be risky without any testing.
 2016-04-20 16:39:49 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Vladimír Čunát f4cb39c3d3 mesa: maintenance update 11.1.1 -> 11.1.2 2016-03-28 14:02:36 +02:00
Vladimír Čunát 09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Vladimír Čunát e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Tomas Hlavaty 976895c0d0 mesa: remove broken dependency on libdrm_intel on armv7l-linux 
does this work for other arm systems or should it be applied for
system.isArm?
 2016-02-14 23:45:32 +01: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
Nikolay Amiantov de26cac3cb mesa: 11.0.8 -> 11.1.1 2016-01-26 14:27:49 +03:00
Nikolay Amiantov 364f297bb2 mesa: leave vdpau libraries in lib/vdpau 2016-01-26 04:30:26 +03:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Vladimír Čunát 08dd527cc7 Merge branch 'staging' 
http://hydra.nixos.org/eval/1234895
The mass errors on Hydra seem transient; I verified ghc on i686-linux.
Only darwin jobs are queued ATM. There's a libpng security update
included in this merge, so I don't want to wait too long.
 2015-12-29 17:14:35 +01:00
Yann Hodique bc6e050f21 mesa: add download url (close #11942) 
vcunat refactored a bit (too long line, etc.) and reordered the URLs.
 2015-12-29 14:23:41 +01:00
Vladimír Čunát a6b34b3bfd mesa: maintenance updates 11.0.5 -> 11.0.8 2015-12-21 14:28:49 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
William A. Kennington III 0ba740d26b mesa: 11.0.4 -> 11.0.5 2015-11-11 15:45:15 -08:00
William A. Kennington III 00c9039141 mesa: 11.0.3 -> 11.0.4 2015-10-30 18:07:41 -07:00
Vladimír Čunát f4fb1d7753 mesa: maintenance update 11.0.2 -> 11.0.3 2015-10-15 20:52:30 +02:00
Vladimír Čunát 7434b8c29f mesa: fixup with multiple outputs 2015-10-04 10:03:55 +02:00
Vladimír Čunát b44d846990 udev: complete rework 
- systemd puts all into one output now (except for man),
  because I wasn't able to fix all systemd/udev refernces
  for NixOS to work well
- libudev is now by default *copied* into another path,
  which is what most packages will use as build input :-)
- pkgs.udev = [ libudev.out libudev.dev ]; because there are too many
  references that just put `udev` into build inputs (to rewrite them all),
  also this made "${udev}/foo" fail at *evaluation* time
  so it's easier to catch and change to something more specific
 2015-10-04 10:03:53 +02:00
Vladimír Čunát f361938b21 Merge staging into closure-size 
This makes gcc5 the default builder, etc.
 2015-10-03 15:23:13 +02: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
William A. Kennington III cfba54975e mesa: 10.6.8 -> 11.0.2 2015-09-30 16:18:36 -07:00
Vladimír Čunát b868ec950d mesa: maintenance update 10.6.7 -> 10.6.8 2015-09-20 15:57:33 +02:00
Vladimír Čunát baf20fbcab mesa: maintenance update 10.6.6 -> 10.6.7 2015-09-13 10:51:20 +02:00
Vladimír Čunát f67ddbaa6f mesa: maintenance update 10.6.5 -> 10.6.6 2015-09-06 09:59:31 +02:00
Vladimír Čunát c250748a54 mesa: maintenance update 10.6.4 -> 10.6.5 
Currently we have lots of failures on the branch,
most of them look unreproducible, and Hydra is idling.
 2015-08-22 15:12:22 +02:00
Vladimír Čunát 9bafea0f6d mesa: maintenance update 10.6.3 -> 10.6.4 2015-08-12 09:33:58 +02:00
Vladimír Čunát cf5f43162b mesa: maintenance update 2015-07-28 19:16:19 +02:00
Vladimír Čunát 06510fab8c mesa: get rid of llvm dependency in $out, /cc #8990 
- libXvMC* should be found fine in $drivers
- for d3d state tracker, I don't know how it works,
  but it's a non-critical thing and maybe no nixers use it yet
 2015-07-26 11:55:18 +02:00
Vladimír Čunát dcea851434 mesa: tweak the patch after 7fe69244af 
In particular, do not try dlopening libudev by a non-absolute path.
/cc @wkennington.
 2015-07-19 13:31:07 +02:00
William A. Kennington III 7fe69244af mesa: Fix dlopen patch 2015-07-17 18:33:19 -07:00
William A. Kennington III 440954ab88 mesa: 10.6.1 -> 10.6.2 2015-07-17 14:16:26 -07:00
William A. Kennington III 642eb4ca05 mesa: 10.5.8 -> 10.6.1 2015-07-06 17:22:06 -07:00
Vladimír Čunát d8c91a6d27 mesa: maintenance update 2015-06-22 18:04:44 +02:00
Eduard Bachmakov e837e025ea mesa: minor update to 10.5.7 
Picked from #8369.
 2015-06-19 09:20:38 +02:00
Eelco Dolstra d21b6702a3 mesa: Reduce dependency bloat 
In particular, don't depend on clang. It's really bad to have a core
package like Mesa pull in multiple C compilers.
 2015-06-11 02:17:00 +02:00
Eelco Dolstra 4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging 
Conflicts:
	pkgs/development/libraries/wayland/default.nix
 2015-06-11 00:23:03 +02:00
William A. Kennington III 9d6555dc0a Merge branch 'master.upstream' into staging.upstream 2015-06-06 12:04:42 -07:00
Eelco Dolstra 98a4eabd99 Revert "qemu: 2.2.2 -> 2.3.0" 
This reverts commit 19c259161b.
 2015-06-04 14:54:48 +02:00
Eelco Dolstra 553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9 
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
 2015-06-01 20:08:43 +02:00
Vladimír Čunát cbb365f722 mesa: maintenance update 2015-05-26 20:06:49 +02:00
William A. Kennington III 308cdd483d mesa: 10.5.4 -> 10.5.6 2015-05-26 01:36:35 -07:00
William A. Kennington III 19c259161b qemu: 2.2.2 -> 2.3.0 2015-05-20 18:30:22 -07:00
Eelco Dolstra 1fc19adf2c mesa: Remove gallium references 
These files no longer exist. The resulting failures were hidden by

@vcunat
 2015-05-13 18:17:26 +02:00
Vladimír Čunát 375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
William A. Kennington III 5dd8538812 mesa: 10.5.3 -> 10.5.4 2015-04-25 18:41:18 -07:00
Vladimír Čunát 92b968863a mesa: fix libudev path 2015-04-19 00:48:25 +02:00
Vladimír Čunát 3c793aca79 mesa: dependency cleanup (not using output changes) 
- drop python build-time dependency; announcement:
 > Unlike mesa 10.5.2, the build process should finally be python/mako free :-)
- drop other (seemingly) unneeded deps, such as bison and flex
- make $out not depend on llvm, again
- various fixes and refactoring
 2015-04-18 23:11:06 +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 dc84c2dcee mesa: Cleanup output hack 2015-04-14 21:38:47 -07:00
William A. Kennington III a916e97eef mesa: 10.5.2 -> 10.5.3 2015-04-13 22:06:04 -07:00
William A. Kennington III 1e47ac93aa mesa: Disable opencl temporarily 2015-04-06 23:08:12 -07:00
William A. Kennington III 49ffc37b1c mesa: 1.5.1 -> 1.5.2 2015-03-29 19:06:46 -07:00
William A. Kennington III 7a77553d97 mesa: 10.4.5 -> 10.5.1 2015-03-28 13:57:03 -07:00
Eduard Bachmakov aa564bbac5 mesa: big update, and related improvements (close #6367) 
* Remove upstreamed patch
* EGL driver dirs are no longer a thing, see mesa commit
  407450eb84f5a1b466a2eff19b85cdee7ac15dfb
  Patching runtime search dir in sources instead (by vcunat).
* static-gallium patch dropped as it causes visibility issues with
  nouveau
* rtti patch dropped as it the relevant configuration has been removed
  upstream; properly fixed by an LLVM flag now
* Checks disabled. This is known and solved upstream. Checks will be
  re-enabled in a future commit when updating to a version containing
  the fixes
* Use llvm-3.5 now (by vcunat).
 2015-03-09 15:55:24 +01:00
Charles Strahan 70a4fd863d mesa: add mirror 2015-01-24 17:26:15 -05:00
Vladimír Čunát 5c01205bf7 mesa: use upstream patch to fix doCheck again 2014-11-25 01:03:29 +01:00
Vladimír Čunát bb2fba1125 Revert "mesa: Don't depend on Wayland" 
This reverts commit 7ff232e958.
See discussion at the original commit.

CC: #4999, #5001, #5061, #5071.
 2014-11-24 22:10:06 +01:00
Vladimír Čunát a767210542 mesa: fix LLVM runtime dependency (close #4853) 2014-11-10 18:22:46 +01:00
Eelco Dolstra 7ff232e958 mesa: Don't depend on Wayland 
NixOS currently does not have any Wayland support, so it's kinda
pointless ATM to make everything depend on it.
 2014-11-06 11:02:02 +01:00
Vladimír Čunát 4fa5fffe56 mesa: bugfix update 
I'm still having some problems with 10.3.1 compilation.
 2014-10-19 19:31:58 +02:00
Vladimír Čunát e90e423a26 mesa: maintenance update 2014-09-13 21:06:49 +02:00
Vladimír Čunát 381dcb1d98 various packages fixed 2014-08-30 23:30:31 +02:00
Vladimír Čunát ead8f2ba0a mesa: bugfix update 2014-08-21 15:13:20 +02:00
Vladimír Čunát aa0da0e1a8 mesa: bugfix update 
Squashed this one as well, as mesa bugfixes tend to be very reliable.
 2014-08-04 20:33:39 +02:00
Vladimír Čunát 14953d7bc9 mesa: maintenance update 10.2.3 -> .4 2014-07-20 08:40:25 +02:00
Vladimír Čunát 9a00938334 mesa: bugfix update 2014-07-09 20:47:47 +02:00
Vladimír Čunát e80ec957f0 mesa: feature update 10.1.5 -> 10.2.2 2014-06-26 18:33:20 +02:00
Vladimír Čunát e4dc3f8ae3 mesa: fix libGL searching for libudev 
Close #2784, #2731.

I don't have a clue if using our libudev is always correct on non-nixos,
or if using /run/current-system/sw/lib/libudev would be better...
 2014-06-11 07:46:15 +02:00
Vladimír Čunát 9c7dc50159 mesa: maintenance update 10.1.4 -> .5 2014-06-11 06:46:25 +02:00
Vladimír Čunát 872860e6de Merge #1187 into p/stdenv 
Tested building firefox, kdelibs, evince on x86_64-linux.
 2014-05-29 22:16:07 +02:00
Vladimír Čunát d55184a8f1 mesa: maintenance update 10.1.3 -> .4 2014-05-22 21:28:38 +02:00
Vladimír Čunát 0c142b2a18 mesa: small bugfix update 10.1.2 -> .3 
Mainly fixes performance regression for vmware.
 2014-05-15 21:02:28 +02:00
Ricardo M. Correia 92cc5b8c0c mesa-noglu: Add support for grsecurity 2014-05-15 13:25:48 +02:00
Vladimír Čunát 6335d5bd3f mesa: bugfix update 10.1.1 -> .2 
Contains many driver fixes.
 2014-05-06 18:43:01 +02:00
Vladimír Čunát 85c6634eb5 mesa: major update 10.0.4 -> 10.1.1 2014-04-19 13:18:41 +02:00
Vladimír Čunát 8340454544 mesa: have all output on /run/opengl-driver{,-32} 
Fixes #2242 in a different way (cleaner, I hope).
 2014-04-14 21:38:23 +02:00
Vladimír Čunát 685d5a02a2 mesa: disable tests again 
Still affected by https://bugs.freedesktop.org/show_bug.cgi?id=67672
 2014-04-03 09:13:54 +02:00
Vladimír Čunát 7b6225c3a4 mesa: try enabling tests again 
I know this doesn't really belong into this branch, but rebuilding time
is expensive (and I forgot in x-updates).

Tests do work locally for me, but we might hit that mentioned bug again.
 2014-04-02 21:37:27 +02:00
Vladimír Čunát 97f1a251ed mesa: add symlinks from $out/lib/*.so to $drivers/lib 
This is mainly in order for libGL to be present in /run/opengl-drivers{,-32}.
Now even with mesa drivers pkgs will use your current nixos libGL
instead of the one it was built against.

Thanks to @iElectric for suggesting this change.
 2014-03-23 20:36:37 +01:00
Vladimír Čunát ad8adf12a4 mesa: major update to 10.0.4, seems to work finally 2014-03-21 10:34:19 +01:00
Vladimír Čunát fcaa782b6a mesa: revert to 9.2.* until the driver problems are fixed 
I was unable to make the gallium drivers not to miss some LLVM RTTI stuff.
9.* don't build with llvm-3.4.
 2014-02-02 10:00:56 +01:00
Vladimír Čunát 120be16479 llvm: propagate ncurses 
Cf. discussion at https://github.com/NixOS/nixpkgs/commit/4eefe1a7
 2014-01-28 12:47:51 +01:00
Vladimír Čunát 3555484493 mesa cleanup: remove patches, clean description 
werror-wundef.patch came from #1082, but now no longer applied,
and it seems no longer necessary, as both qt5 and qtCreator build.
@bbenoist: was the patch useful for anything else?
 2014-01-28 11:39:43 +01:00
Vladimír Čunát 4eefe1a779 mesa: fix build by adding ncurses 
After stdenv merge it seems needed, and drivers remain linked against it.

Tests still don't link.
 2014-01-24 11:17:22 +01:00
Vladimír Čunát 4caef493be Revert "mesa: try enabling checkPhase again" 
I'm getting something like https://bugs.freedesktop.org/show_bug.cgi?id=52136

This reverts commit 5674fb556b.
 2014-01-24 00:41:07 +01:00
Vladimír Čunát 5674fb556b mesa: try enabling checkPhase again 2014-01-23 23:02:46 +01:00
Vladimír Čunát 7e0b78f7b2 Merge master into x-updates 
Conflicts (re-created on master, preserved):
	pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
 2014-01-23 22:52:18 +01:00
Vladimír Čunát 1cb146f3e1 Merge master into x-updates 
Llvm refactorings from ae0c9b626f included.
Mesa is the only package using llvm_34 ATM.

Conflicts:
	pkgs/development/compilers/llvm/default.nix
 2014-01-13 22:00:31 +01:00
Vladimír Čunát 8db8ccb408 mesa: bugfix update 10.0.1 -> .2 2014-01-11 19:15:58 +01:00
Vladimír Čunát 8f0656c2f7 mesa: update to 10.0.1, always enable R600 
A few TODOs are pending, but of relatively low importance.
 2013-12-30 21:38:46 +01:00