alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
70183 commits 217 branches 121 tags 4.5 GiB
Commit graph

431 commits

Author SHA1 Message Date
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
William A. Kennington III 8dc7073546 Merge branch 'master.upstream' into staging.upstream 2015-09-15 12:04:41 -07:00
Mathnerd314 eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Benjamin Saunders a6f6c0eeeb libxcb: add xinput support (close #9835) 2015-09-13 10:51:21 +02:00
Vladimír Čunát 8ab4c20998 xorg.{libXi,libxcb}: maintenance update 2015-09-13 10:51:21 +02:00
Domen Kožar 66214fba8d Xorg: apply patch to fix X crashes 
(cherry picked from commit dc0fe8ebf4)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-09-04 18:47:40 +02:00
Tuomas Tynkkynen 6b866a37fc xrdb: Use mcpp as the preprocessor 
Close #9501, fixes #9480.

By default, xrdb uses GCC as the preprocessor at runtime for X resource files.
However, gcc is a large dependency, so replace it with mcpp, a much smaller
preprocessor (currently under a megabyte on i686).

Arch Linux already does this as well, so this should be relatively safe:
https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/xorg-xrdb
 2015-08-29 08:29:59 +02:00
William A. Kennington III 2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
Max Zerzouri 807a0e4609 xorg-server: fix XKB_BINDIR usage (close #8993) 
Previously, XKB_BINDIR was read inside a loop over the program
arguments, so was only read if it had arguments that weren't matched by
the first some number of checks.
 2015-08-18 10:14:11 +02:00
Charles Strahan f178817aee xquartz: 1.14.6 -> 1.17.2 
closes #9126
 2015-08-05 13:57:02 -05:00
William A. Kennington III 09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
John Wiegley 23562aad59 Revert "emacs: Update Mac Port Emacs to 24.5-mac-5.9" 
This reverts commit 5c896e5511, which was
a set of local changes unrelated to the commit title.
 2015-07-30 16:21:39 -07:00
William A. Kennington III aaef42ab8c Merge branch 'master.upstream' into staging.upstream 2015-07-29 10:23:08 -07:00
John Wiegley 5c896e5511 emacs: Update Mac Port Emacs to 24.5-mac-5.9 2015-07-28 20:08:53 -07:00
Vladimír Čunát 2600e00ca9 xorg.xproto: maintenance update 2015-07-28 19:13:50 +02:00
Eelco Dolstra e1f78bf677 More docs/manpages in separate outputs 2015-07-27 00:27:54 +02:00
Vladimír Čunát a2f16fdcff Merge branch 'staging' 2015-07-24 15:12:28 +02:00
William A. Kennington III d8991a7b3b xf86-video-intel: 2.99.917 -> 2015-07-22 2015-07-22 13:14:27 -07:00
Vladimír Čunát 1be2acd131 xkeyboard-config: updates 
Also drop Esperanto patch for now, as it doesn't apply anymore
and there are some Esperanto variants inside. Discussed:
https://github.com/NixOS/nixpkgs/commit/fa5a583098
 2015-07-19 13:33:04 +02:00
Vladimír Čunát 00dfcfb76a xorg: driver updates 
Also fixup tarball list after e4316b8c17,
and drop a patch integrated in the update.
 2015-07-19 13:33:03 +02:00
Vladimír Čunát e6ca18e9bf xwayland: fix build 
Maybe it was just covered by #7524 until now.
/cc #5061 and @echo-oddly.
 2015-06-27 11:40:04 +02:00
William A. Kennington III 8e19ac8d7c Merge branch 'master.upstream' into staging.upstream 2015-06-17 11:57:40 -07:00
William A. Kennington III 8310045b14 Add missing patch 2015-06-16 23:56:15 -07:00
William A. Kennington III 061887e38a xf86-video-intel: Kernel 4.0 match 2015-06-16 23:37:05 -07:00
William A. Kennington III e4316b8c17 xorg-server: 1.16.4 -> 1.17.2 2015-06-16 23:36:11 -07:00
William A. Kennington III 57ee8d6131 xorgserver: Add gcc5 compat patch 2015-06-16 14:21:54 -07: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 edeab75913 xcompmgr: generate along with xorg stuff 
Also a minor update.
/cc maintainer @astsmtl.
 2015-05-26 20:06:53 +02:00
Vladimír Čunát 0e270def52 xorg.x11perf: larger update 
Seems to run fine.
 2015-05-26 20:06:52 +02:00
Vladimír Čunát 471a2a7ee7 xorg {xorg-docs,kbproto}: minor updates 2015-05-26 20:06:52 +02:00
Vladimír Čunát e5fa9ab0fd xlsfonts: generate along with xorg stuff 
Also a minor update.
/cc maintainer @viric.
 2015-05-26 20:06:51 +02:00
Vladimír Čunát 688b4ca5db xorg: add xmag and xgc apps 
Tested very briefly.
 2015-05-26 20:06:51 +02:00
Vladimír Čunát 1a13909173 xorg: minor updates of apps 2015-05-26 20:06:50 +02:00
Vladimír Čunát 6bddcbda8a xorg: maintenance updates of libs 2015-05-26 20:06:50 +02:00
Vladimír Čunát 3287103b00 xorg: add libXpresent and xcb-util-errors 2015-05-26 20:06:48 +02:00
Vladimír Čunát 34c9d898da xorg: update randr 2015-05-24 23:28:41 +02:00
Vladimír Čunát 3c5b83262b xorg: update cirrus and libinput drivers 2015-05-24 23:26:07 +02:00
Vladimír Čunát 3115d18c53 xorg: update drivers that seem useless 2015-05-24 23:10:52 +02:00
Eelco Dolstra e8e0995bd0 Fix inputproto and probably other packages 
"grep Requires" failed on *.pc files that had no Requires fields, due
to pipefail. But this error was previously masked by #7524.
 2015-05-13 18:17:25 +02:00
Eric Seidel 662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang} 
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
 2015-05-11 14:44:50 -07:00
Vladimír Čunát 375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +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
Vladimír Čunát 3dba642c33 xorg: add xf86-input-libinput and xf86-video-i740 2015-04-18 07:11:55 +02:00
Vladimír Čunát 4b6b03e2ce xcb-util-cursor: autogenerate as other xorg pkgs 
HEAD version still needed on darwin, reportedly:
https://github.com/vcunat/nixpkgs/commit/0c915b8812#commitcomment-10615086
 2015-04-18 07:08:45 +02:00
Vladimír Čunát 4f0dae99f9 xorg misc maintenance updates 2015-04-18 07:08:16 +02:00