1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-17 18:34:41 +00:00
Commit graph

925 commits

Author SHA1 Message Date
Frederik Rietdijk 2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Jorge Acereda 466f1d85d2 lndir: get rid of xorgproto dependency 2019-03-01 00:09:37 +01:00
Will Dietz c971e88fdc xorgserver: 1.20.3 -> 1.20.4
https://lists.x.org/archives/xorg-announce/2019-February/002957.html
2019-02-27 12:56:50 -06:00
Lengyel Balazs dffba878e1 xorg/xstdcmap: init at 1.0.4
(cherry picked from commit 6a316df988)
2019-02-24 12:39:26 +01:00
Lengyel Balazs ed508238be xorg/xfsinfo: init at 1.0.6
(cherry picked from commit 4553b42de4)
2019-02-24 12:38:21 +01:00
Will Dietz e063f54568 xorg.xf86inputlibinput: remove (?!) override of source
This is the wrong place for this and is outdated anyway,
so was forcing us to use this older version.
2019-02-23 12:05:08 -06:00
Will Dietz e961a40012 xorg: misc updates
Announcements for each are on xorg-announce@,
see:
https://lists.x.org/archives/xorg-announce/2019-February/thread.html
2019-02-23 12:01:47 -06:00
Lengyel Balazs b6167a6e63 xorg/xf86-video-apm: init at 1.3.0 2019-02-18 23:24:47 +01:00
Lengyel Balazs 38004ab4bb xorg/xf86-video-tdfx: 1.4.7 -> 1.5.0 2019-02-18 23:24:47 +01:00
Lengyel Balazs ea1ca5a4eb xorg/xf86-video-s3virge: 1.10.7 -> 1.11.0 2019-02-18 23:24:47 +01:00
Lengyel Balazs 3da970b8c9 xorg/xf86-video-chips: 1.3.4 -> 1.4.0 2019-02-18 23:24:47 +01:00
Lengyel Balazs 0e6814e11a xorg/xcursor-themes: 1.0.5 -> 1.0.6 2019-02-18 23:24:46 +01:00
Lengyel Balazs c72b449f3c xorg/xcursorgen: 1.0.6 -> 1.0.7 2019-02-18 23:24:46 +01:00
Lengyel Balazs 3117c1131b xorg/xcalc: init ad 1.0.7 2019-02-18 23:24:46 +01:00
Lengyel Balazs c6d84ce454 xorg/libXau: 1.0.8 -> 1.0.9 2019-02-18 23:24:46 +01:00
Will Dietz 91047d75e1 xorg.bitmap: 1.0.8 -> 1.0.9 (#55594)
https://lists.x.org/archives/xorg-announce/2019-February/002941.html
2019-02-14 23:16:04 +01:00
Frederik Rietdijk 7257dedd7c Merge master into staging-next 2019-02-13 12:33:29 +01:00
Will Dietz 01cd6cda25 xorg.xf86inputlibinput: 0.28.1 -> 0.28.2
https://lists.x.org/archives/xorg-announce/2019-February/002938.html
2019-02-03 21:33:03 -06:00
Vladimír Čunát 8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Daiderd Jordan 8c0cc98600
xorg.luit: fix darwin build 2019-01-22 23:11:14 +01:00
rnhmjoj bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +01:00
Vladimír Čunát 3cd97916fe
xorg xcursor-themes: fix build after #53127 2019-01-12 11:20:43 +01:00
Robin Gloster 23e49b78e5 xorg.xorgproto: add legacy support
This adds support for e.g. printproto needed for libXp

Adapted from @MP2E's patch in #48549
2019-01-04 14:38:57 +01:00
Lengyel Balazs fca792353f xorg: tarballs listed alphabetically (again) 2019-01-04 14:38:57 +01:00
Lengyel Balazs b981b8e0fe xorg/xorgserver: 1.19.6 -> 1.20.3 2019-01-04 14:38:57 +01:00
Lengyel Balazs 8851116a47 xorg/luit: 1.1.1 -> 20181211 2019-01-04 14:38:57 +01:00
Lengyel Balazs b48304439b xorg: generator script update to support tgz 2019-01-04 14:38:57 +01:00
Lengyel Balazs 50a53b2e78 xorg/xf86-video-omap: init at 0.4.5 2019-01-04 14:38:57 +01:00
Lengyel Balazs 2be77479e4 xorg/fonttosfnt: init at 1.0.5 2019-01-04 14:38:57 +01:00
Lengyel Balazs d9ea05f1a7 xorg/libXaw3d: init at 1.6.3 2019-01-04 14:38:57 +01:00
Lengyel Balazs e0a9ffc3c3 xorg/xfontsel: init at 1.0.6 2019-01-04 14:38:57 +01:00
Lengyel Balazs 7ca9622ea9 xorg/xload: init at 1.1.3 2019-01-04 14:38:57 +01:00
Lengyel Balazs cd9b4d7808 xorg/xsm: init at 1.0.4 2019-01-04 14:38:57 +01:00
Lengyel Balazs 26908f8726 xorg/transset: init at 1.0.2 2019-01-04 14:38:57 +01:00
Lengyel Balazs 69ba22d17a xorg/ico: init at 1.0.5 2019-01-04 14:38:57 +01:00
Lengyel Balazs 55affc7cdf xorg/xtrap: init at 1.0.3 2019-01-04 14:38:57 +01:00
Lengyel Balazs 48ef1f27e2 xorg/xconsole: init at 1.0.7 2019-01-04 14:38:57 +01:00
Lengyel Balazs aadee8046a xorg/oclock: init at 1.0.4 2019-01-04 14:38:57 +01:00
Lengyel Balazs 6175094478 xorg/viewres: init at 1.0.5 2019-01-04 14:38:57 +01:00
Lengyel Balazs f31d54a483 xorg/listres: init at 1.0.4 2019-01-04 14:38:57 +01:00
Lengyel Balazs cc6cf8ceee xorg/editres: init at 1.0.7 2019-01-04 14:38:57 +01:00
Lengyel Balazs 06324d9275 xorg/xf86-video-mga: 1.6.5 -> 2.0.0 2019-01-04 14:38:57 +01:00
Lengyel Balazs 44c8d99e6c xorg/xf86-video-i128: 1.3.6 -> 1.4.0 2019-01-04 14:38:57 +01:00
Lengyel Balazs b39fb3ecea xorg/libSM: 1.2.2 -> 1.2.3 2019-01-04 14:38:57 +01:00
Lengyel Balazs cacc649518 xorg/xf86-video-i740: 1.3.6 -> 1.4.0 2019-01-04 14:38:57 +01:00
Lengyel Balazs f8d909ccc8 xorg/twm: 1.0.9 -> 1.0.10 2019-01-04 14:38:57 +01:00
Lengyel Balazs 9404728994 xorg/xrefresh: 1.0.5 -> 1.0.6 2019-01-04 14:38:57 +01:00
Lengyel Balazs 2a95041a6c xorg/xwd: 1.0.6 -> 1.0.7 2019-01-04 14:38:57 +01:00
Lengyel Balazs 97eb0c724c xorg/xwininfo: 1.1.3 -> 1.1.4 2019-01-04 14:38:57 +01:00
Lengyel Balazs 92b45380eb xorg/xwud: 1.0.4 -> 1.0.5 2019-01-04 14:38:57 +01:00
Lengyel Balazs 057bc147dc xorg/xset: 1.2.3 -> 1.2.4 2019-01-04 14:38:57 +01:00
Lengyel Balazs 71648beaaa xorg/xsetroot: 1.1.0 -> 1.1.2 2019-01-04 14:38:57 +01:00
Lengyel Balazs 526d0b5a2f xorg/xrdb: 1.1.0 -> 1.1.1 2019-01-04 14:38:57 +01:00
Lengyel Balazs 12145ac403 xorg/xlsfonts: 1.0.5 - 1.0.6 2019-01-04 14:38:57 +01:00
Lengyel Balazs 373595eb77 xorg/xpr: 1.0.4 -> 1.0.5 2019-01-04 14:38:57 +01:00
Lengyel Balazs 1d356fa37b xorg/xprop: 1.2.2 -> 1.2.3 2019-01-04 14:38:57 +01:00
Lengyel Balazs 6559206ff6 xorg/xlsclients: 1.1.3 -> 1.1.4 2019-01-04 14:38:57 +01:00
Lengyel Balazs 1c8a40981e xorg/xkill: 1.0.4 -> 1.0.5 2019-01-04 14:38:57 +01:00
Lengyel Balazs f0e564c260 xorg/xf86-video-v4l: 0.2.0 -> 0.3.0 2019-01-04 14:38:57 +01:00
Lengyel Balazs 2a0c13fa14 xorg/xf86-video-vmware: 13.2.1 -> 13.3.0 2019-01-04 14:38:57 +01:00
Lengyel Balazs bbb75b1221 xorg/xf86-video-rendition: 4.2.6 -> 4.2.7 2019-01-04 14:38:57 +01:00
Lengyel Balazs 6739615ec0 xorg/xf86-video-r128: 6.10.2 -> 6.11.0 2019-01-04 14:38:57 +01:00
Lengyel Balazs 7dfdc2e3ff xorg/xf86-video-geode: 2.11.17 -> 2.11.19 2019-01-04 14:38:57 +01:00
Lengyel Balazs d9c5a888c7 xorg/xf86-video-mach: 6.9.5 -> 6.9.6 2019-01-04 14:38:57 +01:00
Lengyel Balazs 6a6a5a6dd4 xorg/xf86-video-fbdev: 0.4.4 -> 0.5.0 2019-01-04 14:38:57 +01:00
Lengyel Balazs 79a49047cb xorg/xf86-input-evdev: 2.10.5 -> 2.10.6 2019-01-04 14:38:57 +01:00
Lengyel Balazs 730f3178b4 xorg/xf86-input-mouse: 1.9.2 -> 1.9.3 2019-01-04 14:38:57 +01:00
Lengyel Balazs cf334c3e0f xorg/xf86-input-synaptics: 1.9.0 -> 1.9.1 2019-01-04 14:38:57 +01:00
Lengyel Balazs f659a6625a xorg/xfs: 1.1.4 -> 1.2.0 2019-01-04 14:38:57 +01:00
Lengyel Balazs 563dbdca4a xorg/xmessage: 1.0.4 -> 1.0.5 2019-01-04 14:38:57 +01:00
Lengyel Balazs d6fc30a319 xorg/libXxf86misc: 1.0.3 -> 1.0.4 2019-01-04 14:38:57 +01:00
Lengyel Balazs b26372961d xorg/libxshmfence: 1.2 -> 1.3 2019-01-04 14:38:57 +01:00
Lengyel Balazs 088a0b922b xorg/iceauth: 1.0.7 -> 1.0.8 2019-01-04 14:38:57 +01:00
Lengyel Balazs f20fae7fe3 xorg/libXScrnSaver: 1.2.2 -> 1.2.3 2019-01-04 14:38:57 +01:00
Lengyel Balazs 533280bac9 xorg/xcursor-themes: 1.0.4 -> 1.0.5 2019-01-04 14:38:57 +01:00
Lengyel Balazs 349a422d85 xorg/xdriinfo: 1.0.5 -> 1.0.6 2019-01-04 14:38:57 +01:00
Lengyel Balazs b3beb5d268 xorg/xbitmaps: 1.1.1 -> 1.1.2 2019-01-04 14:38:57 +01:00
Lengyel Balazs b43838632e xorg: replace old X11R7 links with individual ones for easier upgrades 2019-01-04 14:38:57 +01:00
Lengyel Balazs 3c6e5b03bb xorg/appres: 1.0.4 -> 1.0.5 2019-01-04 14:38:57 +01:00
Lengyel Balazs beaca82e48 xorg/mkfontscale: 1.1.2 -> 1.1.3 2019-01-04 14:38:57 +01:00
Lengyel Balazs 4235b0a447 xorg/libdmx: 1.1.3 -> 1.1.4 2019-01-04 14:38:57 +01:00
Lengyel Balazs 7ac2e3fb77 xorg/xf86-input-libinput: 0.28.0 -> 0.28.1 2019-01-04 14:38:57 +01:00
Lengyel Balazs 1bd651ba90 xorg/amdgpu: 1.4.0 -> 18.1.0 2019-01-04 14:38:57 +01:00
Lengyel Balazs e8a384e0ca xorg/xf86-video-chips: 1.2.7 -> 1.3.0 2019-01-04 14:38:57 +01:00
Lengyel Balazs a8bc355b06 xorg/xf86-video-neomagic: 1.2.9 -> 1.3.0 2019-01-04 14:38:57 +01:00
Lengyel Balazs f4a53ff3bc treewide/xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
Lengyel Balazs 51d6b1bdec xorg: adjust overrides to xorgproto 2019-01-04 14:38:57 +01:00
Lengyel Balazs c3db044b54 xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
Lengyel Balazs 167e609faa xorg: use https for sources without mirrors 2019-01-04 14:38:57 +01:00
Lengyel Balazs 473624ea41 xorg: move sources into single file tarballs.list 2019-01-04 14:38:57 +01:00
Jan Tojnar aead6e12f9
Merge remote-tracking branch 'upstream/master' into staging 2018-12-16 22:55:06 +01:00
Jörg Thalheim 048c48f405
libXinerama: fix cross-compilation 2018-12-13 11:39:17 +00:00
Jörg Thalheim 054b938c5c
libXt: fix cross-build 2018-12-12 08:02:19 +00:00
Jörg Thalheim 220dcada79
xorg.libXvMC: fix cross-build 2018-12-12 08:02:19 +00:00
Frederik Rietdijk 3e950d584c Merge staging-next into master 2018-12-08 16:29:21 +01:00
Will Dietz 5eff07f211 xf86videointel: 2017-10-19 -> 2018-12-03 2018-12-07 21:07:33 -06:00
Jörg Thalheim 84162175a3
Merge pull request #51180 from mayflower/xorg-cross
treewide: cross-fixes
2018-12-01 00:43:02 +00:00
Jan Tojnar c5881ec2c9
Merge remote-tracking branch 'upstream/master' into staging 2018-11-30 20:09:45 +01:00
Robin Gloster b7893a700d
xorg.libXv: fix cross 2018-11-29 03:37:57 +01:00
Matthew Bauer 613e262fc2 imake: add setup hook 2018-11-28 20:14:33 -06:00
Robin Gloster 2d0fad757a
xorg: generate python into nativeBuildInputs 2018-11-28 14:28:32 +01:00
Robin Gloster 602efddc24
xorg.libX11: fix cross 2018-11-28 14:02:01 +01:00
Will Dietz 8bbf525fd3 libx11: 1.6.6 -> 1.6.7
https://lists.x.org/archives/xorg-announce/2018-October/002921.html
2018-11-21 15:31:34 -06:00
Vladimír Čunát 9108b24253
xorg: init xf86-video-vboxvideo at 1.0.0
... and switch to it by default in virtualbox guests
2018-11-12 20:29:14 +01:00
Daiderd Jordan ecf7c9c4b4
xorg.xorgserver: add cf-private on darwin
Undefined symbols for architecture x86_64:
      "_NSDefaultRunLoopMode", referenced from:
          _X11ApplicationMain in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
          objc-class-ref in libXquartz.a(X11Controller.o)
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
          objc-class-ref in libXquartz.a(X11Controller.o)
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table29 in libxpbproxy.a(x-selection.o)
    ld: symbol(s) not found for architecture x86_64
2018-11-06 19:00:03 +01:00
Daiderd Jordan 2b76ad8fe7
xquartz: add cf-private
Undefined symbols for architecture x86_64:
      "_NSDefaultRunLoopMode", referenced from:
          _X11ApplicationMain in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
          objc-class-ref in libXquartz.a(X11Controller.o)
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
          objc-class-ref in libXquartz.a(X11Controller.o)
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table29 in libxpbproxy.a(x-selection.o)
    ld: symbol(s) not found for architecture x86_64
2018-11-06 18:54:06 +01:00
Daiderd Jordan f00a4af18f
quartz-wm: add cf-private
Undefined symbols for architecture x86_64:
      "_CFNotificationCenterAddObserver", referenced from:
          _main in main.o
      "_CFNotificationCenterGetDistributedCenter", referenced from:
          _main in main.o
      "_OBJC_CLASS_$_NSTimer", referenced from:
          objc-class-ref in main.o
          objc-class-ref in x-screen.o
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table25 in main.o
    ld: symbol(s) not found for architecture x86_64
2018-11-06 18:48:14 +01:00
Bart Bakker f565b95ca3
xorg.xf86videovmware: fix for GFX support
Fix the mesa dependency for `xorg.xf86videovmware`. Add `llvm_6` because
`mesa_noglu` has a runtime dependency on clang (see TODO in
`development/libraries/mesa`).
2018-10-27 09:57:29 +02:00
John Ericson 1147d2ed89 Merge remote-tracking branch 'upstream/master' into xorg-override 2018-10-18 12:00:37 -04:00
John Ericson 88cd633ea4 xorg: Don't use deprecated item 2018-10-18 11:54:20 -04:00
Andrew Childs fb9604c4b7 xorg: simplify argument passing into xorg and overrides 2018-10-11 15:03:06 -04:00
Andrew Childs 0e12683470 xorg: add caching to generate-expr-from-tarballs.pl 2018-10-11 13:41:27 -04:00
Andrew Childs 9454f71fef xorg: allow overriding via overrideScope 2018-10-11 13:41:27 -04:00
Andrew Childs 08049025a3 xorg: sync source lists with default.nix 2018-10-11 13:41:27 -04:00
Will Dietz f66ae2c8b2 libxcb: 1.13 -> 1.13.1 (#47450)
https://lists.freedesktop.org/archives/xcb/2018-September/011155.html
(cherry picked from commit b043a056a2cc6a4ab129ab1ce2bf7d4aa7d2ea69)
2018-09-28 10:15:59 +02:00
Will Dietz 7047d60ef4 libXinerama: 1.1.3 -> 1.1.4
https://lists.x.org/archives/xorg-announce/2018-July/002905.html
2018-09-25 20:07:31 -05:00
Vladimír Čunát 3a09a4b579
Merge branch 'master' into staging
Hydra: ?compare=1480463
2018-09-24 21:18:23 +02:00
Will Dietz a94ac965c8 libxcb: 1.12 -> 1.13 (proto too)
(cherry picked from commit 5853e62637eb2aaa1f2ccbcbf62c2a4f232a4257)
2018-09-21 13:24:47 -05:00
Will Dietz 55a5236630 xf86-input-libinput: 0.26.0 -> 0.28.0
https://cgit.freedesktop.org/xorg/driver/xf86-input-libinput/log/
2018-09-21 07:58:57 -05:00
R. RyanTM f3bc6aec00 xcbutilxrm: 1.2 -> 1.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
xcb-util-xrm
2018-09-06 07:38:41 -07:00
Vladimír Čunát cb44c3ff4c
xorg.libX11: 1.6.5 -> 1.6.6 (security)
CVE-2018-14598, CVE-2018-14599, CVE-2018-14600
https://lists.x.org/archives/xorg-announce/2018-August/002915.html
2018-08-21 19:32:13 +02:00
Vladimír Čunát ded9a4b1aa
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
Vladimír Čunát 00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Jan Malakhovski f27dda4f55 xcbutilxrm: use checkInputs 2018-08-11 09:35:25 +00:00
Pascal Wittmann 0fa1ffd17f
xlsfonts: set license in overrides 2018-08-04 16:04:51 +02:00
John Ericson db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
Pascal Wittmann 750fae6539
xlsfonts: add license
see issue #43716
2018-08-02 16:07:30 +02:00
Silvan Mosberger 5edb09c3db
Merge pull request #40625 from romildo/fix.xkeyboard-config
xkeyboard-config: enable xkb rules symlink
2018-07-28 04:37:46 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth 87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Yegor Timoshenko c9a1e46085 xkbcomp: 1.4.0 -> 1.4.2 (#43589) 2018-07-16 10:41:07 +02:00
Pascal Wittmann b85d1f638a
xeyes: 1.1.1 -> 1.1.2 2018-07-12 22:18:03 +02:00
Silvan Mosberger 5bdd9bddb5
xorg.xkeyboardconfig: 2.23.1 -> 2.24 2018-07-09 04:51:18 +02:00
Will Dietz f22cbe5c35 xbacklight: 1.2.1 -> 1.2.2 (#43101) 2018-07-06 11:27:49 +02:00
Silvan Mosberger 57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Ryan Mulligan fce8f26af6 treewide: http -> https (#42665) 2018-06-27 22:12:57 +02:00
Silvan Mosberger 02f11bca60
some overrideDerivation cleanups
These four top-level packages were the only ones that didn't have the
meta.position attribute automagically set. This commit fixes this.
2018-06-14 22:28:55 +02:00
Matthew Justin Bauer 98f2f08b4b
Merge pull request #41009 from matthewbauer/normalize-names
Add versions to packages missing it
2018-05-25 16:32:48 -05:00
Matthew Bauer 02297beade treewide: add version to packages
Lots of packages are missing versions in their name. This adds them
where appropriate. These were found with this command:

 $ nix-env -qa -f. | grep -v '\-[0-9A-Za-z.-_+]*$' | grep -v '^hook$'

See issue #41007.
2018-05-25 15:48:05 -05:00
John Ericson db4d77779c Merge remote-tracking branch 'upstream/master' into staging 2018-05-21 20:21:48 -04:00
David McFarland 456d0e280e xorg: fix missing gbm dependency for amdgpu driver 2018-05-19 17:40:04 -03:00
David McFarland 2b7fe3bf5a xorg: replace edits to generated script
- update versions in .list files to match
- move cf-files postInstall to overrides.nix
2018-05-19 17:21:40 -03:00
José Romildo Malaquias 14cbd4d17a xkeyboard-config: enable xkb rules symlink 2018-05-16 22:57:45 -03:00
John Ericson 5e17335bd7 Merge remote-tracking branch 'upstream/staging' into strictDeps 2018-05-14 23:33:03 -04:00
John Ericson 330ca731e8 treewide: Get rid of all uses of crossConfig
The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)

Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:

 - bintools-wrapper and cc-wrapper
2018-05-14 23:30:37 -04:00
John Ericson 8e891e6ed4 Merge remote-tracking branch 'upstream/master' into staging 2018-05-14 10:57:33 -04:00
Vladimír Čunát 3b6486f857
xorg.xorgserver: drop makeWrapper
It's been unused since 65da25997d.
2018-05-13 21:19:02 +02:00
Jörg Thalheim 991f8db51a xorgserver: add mesa_noglu for dri package 2018-05-13 14:42:13 +01:00
John Ericson 2c5d915200 Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging 2018-05-13 01:02:09 -04:00
Matthew Bauer c839771129 xquartz: fix build
Things done:

- use libGLU instead of mesa for darwin support
- move patches from local to github url
- fixup xquartz install

There may still be some issues at runtime. PRs welcome!

Fixes #40196
2018-05-11 23:55:59 -05:00