Commit Graph

176 Commits

Author SHA1 Message Date
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
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