mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Code Issues Wiki Activity
99755 commits 233 branches 124 tags 7 GiB
Commit graph

576 commits

Author SHA1 Message Date
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen 17e94ebc6a xorg.xcbutilcursor: Don't wipe out most meta attrs 2016-08-02 21:17:44 +03:00
Robin Gloster 63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Gabriel Ebner 5c9309c231 xorg.xorgserver: enable glamor support 2016-07-30 13:37:51 +02:00
Robin Gloster 1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Lluís Batlle i Rossell 13fc6e56fe Adding intel-gpu-tools to xorg. 2016-07-20 12:33:24 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
zimbatm 28fa4a2f03 Escape all shell arguments uniformly 2016-06-12 18:11:37 +01:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Vladimír Čunát a03ff26080 Merge #15639: xorg-server 1.17.4 -> 1.18.3 
... and fglrxCompat to maintain compatibility.
 2016-06-05 00:52:06 +02:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Vladimír Čunát 69cc0a7bc5 xf86-input-evdev: split dev output 2016-05-23 13:02:55 +02:00
Vladimír Čunát 5908d31cf4 xorg-server: major update 1.17.4 -> 1.18.3 2016-05-23 10:13:47 +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 a0f89ee509 xf86-video-intel: 2015-11-14 -> 2016-05-22 
This fixes compositing in KDE on a Intel HD Graphics 530 for me.
 2016-05-22 23:05:47 +02:00
Eelco Dolstra 600cd79f1e xkeyboard-config: 2.16 -> 2.17 2016-05-22 23:05:42 +02:00
Eelco Dolstra c7d92f9485 xf86-video-modesetting: Remove 
This driver is part of xorg-server now, so we were using an outdated
version.
 2016-05-22 23:05:30 +02:00
Vladimír Čunát ff2d137410 xorg: add fglrxCompat parameter 2016-05-22 22:16:12 +02:00
Vladimír Čunát 69ed132f82 xorg: various updates 
It would cost quite some work to split this into more commits sensibly,
and there would probably be little gain.
 2016-05-22 12:10:39 +02:00
Vladimír Čunát f4eb808554 xf86-input-synaptics: split dev output 2016-05-22 12:10:38 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Vladimír Čunát e429a4012e Merge #15360: xscreensaver: Fix xscreensaver-text 2016-05-17 09:13:59 +02:00
Alexey Lebedeff 02ce05d1cc appres: init at 1.0.4 2016-05-10 18:31:27 +03:00
Robin Gloster 9820cb1bf2 use dontBuild instead of hacks 
changes:
 * buildPhase = "true"
 * buildPhase = ":"
 2016-05-04 10:11:04 +00:00
Thomas Tuegel 668f93c719 xcb-util-cursor: multiple outputs 2016-04-25 19:04:24 -05:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Robin Gloster f519a255a5 xorg: switch off bindnow hardening for all packages 
X otherwise fails to load modules.
 2016-04-04 14:15:31 +00:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Robin Gloster 9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00: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
Vladimír Čunát d6a30fccbf xorg xf86-input-evdev: bugfix update 2.10.0 -> 2.10.1 2016-02-02 07:29:43 +01:00
Franz Pletz 936dfeb700 xorg.sessreg: Fix build on gcc-5 2016-01-30 16:36:57 +00:00
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches 
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
 2016-01-24 02:02:21 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát 620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
Domen Kožar 9e8eba48ab xorg.xorgserver: wrap Xvfb with required flags 2016-01-17 21:14:49 +01:00
Vladimír Čunát 2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Tobias Geerinckx-Rice 521f903b80 xorgVideoUnichrome: remove dead package 
Broken since 2013, upstream very dead.
 2016-01-11 00:16:01 +01:00
Vladimír Čunát b1acaffe67 Merge branch 'master' into staging 2016-01-05 10:28:58 +01:00
Vladimír Čunát 556a28908e Merge: xorg and gtk-related updates 2016-01-05 09:53:01 +01:00
Vladimír Čunát 16d0cd7c68 xorg: update tarballs list 
There've been some updates of default.nix without corresponding updates
in the tarball list. Re-generation then added lots of downgrade cruft.

The intel driver can't be added this way, but at least we get much closer.
 2016-01-04 12:03:37 +01:00
Vladimír Čunát 62bb0329ae xorg.xf86*{libinput,nouveau}: minor driver updates 2016-01-04 12:00:28 +01:00
Vladimír Čunát cba685ba45 xorg.xorgcffiles: update 1.0.5 -> 1.0.6 (probably unused) 2016-01-04 11:58:30 +01:00
Vladimír Čunát 9714056914 xorg: small but mass-rebuild updates 2016-01-04 11:57:11 +01:00
Vladimír Čunát a6812c1ca5 xorg.xf86videorendition: init at 4.2.6 2016-01-04 11:54:10 +01:00
Vladimír Čunát 88dff78662 xorg.libXfont2: init at 2.0.1 2016-01-04 11:52:51 +01:00
Vladimír Čunát b559020e27 xorgReplacements: remove this ancient cruft 2016-01-04 10:31:58 +01: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
Bjørn Forsman a5b68eb4f6 xorg: add meta.platforms 
Add it to the generator script (generate-expr-from-tarballs.pl) and then
add the updated generated file (pkgs/servers/x11/xorg/default.nix) after
performing the steps outlined in the generator script.

NOTE: People seem to have updated .../default.nix manually (even though
it has a "THIS IS A GENERATED FILE.  DO NOT EDIT!" header), so I had to
skip some changes to not downgrade several packages.
 2015-12-30 12:50:54 +01:00
Jude Taylor 848064cef6 remove old patches and attributes from xorgserver 2015-12-16 12:03:29 -08:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +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 baf30718ca Merge branch 'master.upstream' into staging.upstream 2015-11-18 02:36:33 -08:00
William A. Kennington III f9f3b47c72 xkbcomp: 1.3.0 -> 1.3.1 2015-11-18 02:36:18 -08:00
William A. Kennington III 4da7935a8e xinput: 1.6.1 -> 1.6.2 2015-11-18 02:36:18 -08:00
William A. Kennington III b52f2f6401 xorg-server: 1.18.0 -> 1.17.4 
There were lots of issues with the proprietary nvidia driver on 352.63
and we don't yet have a proprietary AMD driver.
 2015-11-18 02:34:26 -08:00
William A. Kennington III ee153a619a xorg: Fix hashes 2015-11-17 21:25:15 -08:00
William A. Kennington III 2e595e32f6 xf86-video-ati: 7.5.0 -> 7.6.1 2015-11-17 21:15:30 -08:00
William A. Kennington III 2792b9228c xf86-input-synaptics: 1.8.2 -> 1.8.3 2015-11-17 21:15:04 -08:00
William A. Kennington III 7a2283b08e xf86-input-libinput: 0.14.0 -> 0.15.0 2015-11-17 21:14:46 -08:00
William A. Kennington III 5b3bbd1ac1 xf86-input-evdev: 2.9.2 -> 2.10.0 2015-11-17 21:14:18 -08:00
William A. Kennington III 020f6cfadc xorg-server: 1.17.2 -> 1.18.0 2015-11-17 21:11:53 -08:00
aszlig d81fc427da
xf86-video-intel: 2015-11-13 -> 2015-11-14 
Fixes quite an annoying and reproducable memory leak when I was using
multiple heads. This is the fix in question:

http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=2d26643cab33a32847afaf13b50d326d09d58bf7

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-11-17 14:46:52 +01:00
William A. Kennington III 9579c9ec7f Merge commit 'cb21b77' into master.upstream 
This is a partial merge of staging for builds which are working
 2015-11-13 15:53:10 -08:00
William A. Kennington III 64f31fbc35 xf86-video-intel: 2015-11-10 -> 2015-11-13 2015-11-13 10:37:27 -08:00
William A. Kennington III bf985091d5 xf86-video-intel: 2015-07-22 -> 2015-11-10 2015-11-10 18:27:46 -08:00
William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Lluís Batlle i Rossell 61c6597246 Bringing back eo symbols for xkb 
I port the patch for esperanto symbols removed in
1be2acd1317aadc8e1a08d17312e524fb5fc2a4300 to the current
xkeyboardconfig.

(cherry picked from commit 4a830de032)
 2015-10-29 13:32:35 +01:00
Jude Taylor c749714170 clean up xquartz arguments 2015-10-28 13:56:13 -07:00
Vladimír Čunát 787f322540 $docdev fixups: mostly to avoid empty output 
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
 2015-10-28 18:58:06 +01:00
Vladimír Čunát e153b68fce xorg-server: avoid runtime references to xorgserver-dev 2015-10-28 10:22:58 +01:00
Tuomas Tynkkynen db81e22148 treewide: Mass-replace 'xorgserver}/bin' with correct output 
vcunat added one fix in xdummy.
 2015-10-28 10:17:12 +01:00
Tuomas Tynkkynen c7e3ee4153 libXvMC: Split into multiple outputs 2015-10-28 10:17:11 +01:00
Vladimír Čunát 06eba7d320 xorg: remove $man where it was only man3 
Now man3 is deleted if not specified otherwise,
and I don't really see a reason for X libs to produce them.
(This fixes failures due to not producing $man outputs.)

The $doc outputs are also development docs (all probably),
but I left those for now.
 2015-10-28 10:17:07 +01:00
Jude Taylor 5469e9c581 fix xquartz build 2015-10-26 18:37:05 -07:00
Jude Taylor cf12f3e4d2 patch out system include in libAppleWM 2015-10-26 17:13:29 -07:00
Jude Taylor 2e29399993 update packages with new cf-private compatibility 2015-10-26 17:13:29 -07:00
Vladimír Čunát 4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Vladimír Čunát 2755d2b241 xorg: adjust generator to work with other archive types 
In the end I didn't utilize it, but it shouldn't hurt.
 2015-10-19 10:08:16 +02:00
Vladimír Čunát b6059b2c6a xorg: add three missing video drivers - chips, s3virge, xgi 
Only building was tested.
 2015-10-19 10:06:48 +02:00
Vladimír Čunát ff94673659 xorg.xf86-video-sis: minor update 0.10.7 -> 0.10.8 2015-10-19 09:39:32 +02:00
Vladimír Čunát 801a843bdb xorg.xorg-server: use the generated expression 
... to avoid future surprises. Also add libunwind to deps.
I don't know why libxshmfence is no longer detected.
 2015-10-19 09:35:07 +02:00
Vladimír Čunát 15f27723b3 xorg.xf86-input-libinput: update 0.12.0 -> 0.14.0 2015-10-19 09:20:13 +02:00
Robert Irelan 678c81b74d xorg.xf86-video-ast: 0.98.0 -> 1.1.5 (close #10451) 
Fix failure of 0.98.0 to compile with NixOS 15.09 (due to referencing a
symbol `IOADDRESS` that has been removed from X.org drivers).
 2015-10-19 09:06:33 +02:00
Vladimír Čunát e25da7e5c8 xorg: split outputs of various libs 2015-10-14 14:27:07 +02:00
Vladimír Čunát fa6ddd7fa6 xorg.{libICE,libSM}: split dev and doc outputs 2015-10-13 20:19:01 +02:00
Vladimír Čunát 783c40eb68 dbus: split into multiple outputs and fix referrers 2015-10-13 20:19:01 +02:00
Vladimír Čunát 47305626ab xorg{xcb-util-keysyms,libxkbfile}: split the dev output 2015-10-13 20:18:59 +02:00
Vladimír Čunát e4f38fb050 xorg.xcb-util: split into multiple outputs 
I see no references likely to break.
 2015-10-05 16:00:55 +02:00
Vladimír Čunát f8c211fd2b fontconfig: split into multiple outputs 
Fixed all 'fontconfig}' references as well, hopefully, ugh!
 2015-10-05 12:23:56 +02:00
Vladimír Čunát 32b31398eb xorg.libXt: re-split into multiple outputs 
Fixed all 'libXt}' references, too.
 2015-10-05 11:23:34 +02:00
Tuomas Tynkkynen 753cfbe09b libXmu: Split into multiple outputs 
We need to override BITMAPDIR, since the default:
    -DBITMAPDIR=\"$(includedir)/X11/bitmaps\"
would cause cycles between the outputs. Setting it to a nonexistent path
doesn't affect the code logic, since the corresponding single-output
directory $out/include/X11/bitmaps doesn't exist either.

(cherry picked from commit 15007c88108d9c6a3bc82b22eff53175bbddf75e)
 2015-10-03 16:36:21 +02:00
Tuomas Tynkkynen 0100b27069 imake: Add uberhack to workaround broken 'gcc -x c' 
Our cc-wrapper is broken whenever the '-x' flag is used:
'gcc -x c foo.c -o bar' doesn't work the same way as 'gcc foo.c -o bar'
does. (Try both with NIX_DEBUG=1.)

What happens is that passing '-x' causes linker-related flags (such as
-Wl,-dynamic-linker) not to be added, just like if '-c' is passed.
The bug happens outside the multiple-outputs branch as well, but it
doesn't break imake there. It only breaks in multiple-outputs because
linking without -Wl,-dynamic-linker produces a binary with an invalid
ELF interpreter path. (Which arguably, is a bug in its own.)
 2015-10-03 14:08:51 +02:00
Tuomas Tynkkynen 947542be6d libxft: Fix reference to incorrect output 2015-10-03 14:08:50 +02:00
Tuomas Tynkkynen f72376fd20 x11: Remove conflicting outputs produced by auto merge 2015-10-03 13:39:33 +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
Jude Taylor 4f9ef9bbfb give xquartz impure deps to make it build 2015-09-28 14:45:45 -07:00
Jude Taylor 76a6539829 work on making xquartz buildable in a pure environment 2015-09-22 16:27:51 -07:00
Jude Taylor d78936131a preparation for being able to build xquartz 2015-09-17 16:11:18 -07:00