Commit Graph

1156 Commits

Author SHA1 Message Date
Matthieu Coudron
e3d3bc66dc
Merge pull request #101695 from lourkeur/xkeyboard-config
xkeyboard-config: 2.27 -> 2.31
2020-10-27 15:11:04 +01:00
Louis
3f381d579d setxkbmap: include xkeyboard-config manpage 2020-10-27 13:59:14 +01:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Louis
3cf12aa9c6 xkeyboard-config: 2.27 -> 2.31 2020-10-24 20:22:31 +02:00
Andreas Rammhold
f0af7d27b8
Merge pull request #98748 from TredwellGit/xorg.xorgserver
xorg.xorgserver: 1.20.8 -> 1.20.9
2020-10-24 00:44:52 +02:00
Vladimír Čunát
2324085f9f
Merge #100385: xorg xcb updates (into staging) 2020-10-20 12:09:58 +02:00
Vladimír Čunát
744f449aa4
Merge #100376: xorg.xorgproto: 2019.1 -> 2020.1 (into staging) 2020-10-20 12:07:12 +02:00
Vladimír Čunát
b4d8c62423
Merge #100378: xorg.libXvMC: 1.0.11 -> 1.0.12 (into staging) 2020-10-20 12:05:30 +02:00
Vladimír Čunát
b623690daf
Merge #99158: xorg.libX11: 1.6.8 -> 1.6.12 (security) 2020-10-15 07:55:16 +02:00
Rok Garbas
ec49d7a686
Merge pull request #100391 from TredwellGit/xorg.xf86inputlibinput
xorg.xf86inputlibinput: 0.28.2 -> 0.30.0
2020-10-14 14:17:12 +02:00
TredwellGit
3e079834a9 xorg.libX11: 1.6.8 -> 1.6.12
https://lists.x.org/archives/xorg-announce/2020-August/003056.html
https://lists.x.org/archives/xorg-announce/2020-July/003050.html
2020-10-13 22:47:33 -04:00
Frederik Rietdijk
9e1943edc0 Merge master into staging-next 2020-10-13 19:34:34 +02:00
WORLDofPEACE
a1c5bd00ab
Merge pull request #98974 from Mathnerd314/video-drivers
xf86-video-{ati,amdgpu}: 19.0.1 -> 19.1.0
2020-10-13 07:07:03 -04:00
TredwellGit
dd6a204464 xorg.xf86inputlibinput: 0.28.2 -> 0.30.0
https://lists.x.org/archives/xorg-announce/2019-August/003017.html
https://lists.x.org/archives/xorg-announce/2020-May/003045.html
2020-10-13 07:34:17 +00:00
TredwellGit
3a23e46d6e xorg.libxcb: 1.13.1 -> 1.14
https://lists.x.org/archives/xorg-announce/2020-February/003039.html
2020-10-13 06:25:31 +00:00
TredwellGit
9601605ede xorg.xcbproto: 1.13 -> 1.14.1
https://lists.x.org/archives/xorg-announce/2020-February/003038.html
https://lists.x.org/archives/xorg-announce/2020-October/003061.html
2020-10-13 06:17:20 +00:00
TredwellGit
55eba47ef6 xorg.libXvMC: 1.0.11 -> 1.0.12
https://lists.x.org/archives/xorg-announce/2019-September/003023.html
2020-10-13 05:15:01 +00:00
TredwellGit
9c4f4aa099 xorg.xorgproto: 2019.1 -> 2020.1
https://lists.x.org/archives/xorg-announce/2019-October/003029.html
https://lists.x.org/archives/xorg-announce/2020-April/003042.html
2020-10-13 05:02:44 +00:00
Frederik Rietdijk
692d219a93 Merge staging-next into staging 2020-10-06 10:25:58 +02:00
Emilio Perez
52f028f2d9 nixos/xwayland: add new module and allow configuring a default font path
- Add option `programs.xwayland.defaultFontPath`
- Modify sway to enable Xwayland
2020-10-04 14:56:30 +01:00
TredwellGit
5235437533 generate-expr-from-tarballs.pl: fix insecure temporary file
https://cwe.mitre.org/data/definitions/377.html
2020-09-30 09:21:55 +00:00
Jonathan Ringer
f2de9ca370 xorg.xkeyboardconfig: build man pages 2020-09-29 08:10:27 -07:00
Mathnerd314
ed054f7815 xf86-video-{ati,amdgpu}: 19.0.1 -> 19.1.0 2020-09-27 15:57:35 -06:00
rnhmjoj
c45160366b
xorg: mark fonts with proprietary licences as unfree 2020-09-27 11:29:06 +02:00
rnhmjoj
8cadf94a4d
xorg.fontbitstreamtype1: generate .otf fonts 2020-09-27 11:29:05 +02:00
TredwellGit
99f235b345
generate-expr-from-tarballs.pl: quote URLs per RFC 0045 (#98751)
https://github.com/NixOS/rfcs/pull/45
2020-09-26 11:11:39 +00:00
TredwellGit
4ebe8eeb50 xorg.xorgserver: 1.20.8 -> 1.20.9
https://lists.x.org/archives/xorg-announce/2020-August/003059.html
https://lists.x.org/archives/xorg-announce/2020-August/003058.html
2020-09-25 12:44:20 +00:00
Symphorien Gibol
80ba806339 xorg: fix static build 2020-07-02 00:20:06 +02:00
Matthew Bauer
e520d6af29
Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020
Cross compilation fixes [april 2020]
2020-04-13 16:48:38 -04:00
Rouven Czerwinski
ce4b26a8fe xorg.xorgserver: 1.20.7 -> 1.20.8
https://lists.x.org/archives/xorg-announce/2020-March/003041.html

This release contains a fix for XWayland which removes a buffer swap
race between XWayland and the compositor. This resulted in flickering in
previous versions.
2020-04-10 20:07:11 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Matthew Bauer
24f8bad37c libXres: enable cross-compilation
- adds utilmacros
- set null malloc flag
2020-04-06 16:36:27 -04:00
Matthew Bauer
777a2b4c56 xorg.libXScrnSaver: add utilmacros and malloc 0 2020-04-06 16:36:21 -04:00
Michele Guerini Rocco
f8c3e15771
Merge pull request #75163 from rnhmjoj/gohu
gohufont: generate opentype files
2020-02-14 00:46:05 +01:00
rnhmjoj
1cc11b98f1
xorg.fonttosfnt: add patch to fix uninitialized memory bug 2020-02-07 18:20:47 +01:00
worldofpeace
cf83cfbd4c xorg.libXft: add color emoji rendering support
https://gitlab.freedesktop.org/xorg/lib/libxft/merge_requests/1
2020-02-05 10:38:54 +01:00
Frederik Rietdijk
dce0ca29d9 Merge master into staging-next 2020-01-28 10:46:13 +01:00
Will Dietz
7ece448aa9
xorg.xorgserver: 1.20.6 -> 1.20.7 (PR #77706)
https://lists.x.org/archives/xorg-announce/2020-January/003036.html
2020-01-26 19:08:30 +01:00
Frederik Rietdijk
263bc67bda Merge staging-next into staging 2020-01-11 09:33:08 +01:00
Silvan Mosberger
1b28e47ae1
xorg.xf86-video-intel: 2018-12-03 -> 2019-12-09 (#75852)
xorg.xf86-video-intel: 2018-12-03 -> 2019-12-09
2020-01-09 03:44:32 +01:00
Will Dietz
2124eeca9c
xorg.libXpm: 3.5.12 -> 3.5.13
Don't set `src` in override (?!), or name.
2020-01-06 17:40:23 -06:00
Frederik Rietdijk
6d059becd3 Merge gcc-9 into staging (#68029) 2019-12-30 16:38:38 +01:00
Robin Gloster
7def878f1e
xorg.*: *Flags are lists 2019-12-30 11:13:41 +01:00
Franz Pletz
77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9 2019-12-26 14:17:36 +01:00
Silvan Mosberger
9888686702
xorg.xf86-video-intel: 2018-12-03 -> 2019-12-09 2019-12-18 04:15:07 +01:00
Jan Tojnar
0216e8bb9c
xorg.libxcb: do not depend on python2 2019-12-15 01:50:36 +01:00
Jan Tojnar
eb1d315cd8
xorg.xcbproto: do not depend on python2 2019-12-15 01:50:34 +01:00
adisbladis
ebf783544d
Merge pull request #74145 from eadwu/xorgserver/1.20.6
xorg.xorgserver: 1.20.5 -> 1.20.6
2019-11-28 11:00:59 +00:00
worldofpeace
1b5df99e7a
Merge pull request #70295 from worldofpeace/mutter-eglstreams
Mutter eglstreams
2019-11-27 05:29:58 +00:00
Edmund Wu
7c0a26d176
xorg.xorgserver: 1.20.5 -> 1.20.6 2019-11-25 08:21:44 -05:00
John Ericson
d0d5136cce Merge remote-tracking branch 'upstream/master' into wrapper-pname-support 2019-11-24 17:25:07 +00:00
John Ericson
9b090ccbca treewide: Get rid of most parseDrvName without breaking compat
That is because this commit should be merged to both master and
release-19.09.
2019-11-24 17:22:28 +00:00
Tor Hedin Brønner
cfe4ede98b xorg.xwayland: add eglstream support 2019-11-19 15:34:39 -05:00
adisbladis
a6929e9ff3
xorg.xorgserver: Fix build with mesa 19.2.3 2019-11-09 10:34:50 +00:00
Franz Pletz
baa5a73ba1
xorg.xf86videoomap: fix build with gcc9 2019-11-03 14:43:38 +01:00
John Ericson
b7f4bda282 treewide: *Phase(s)? variables are optional
If these aren't defined, the stdenv defaults are used in the `*Phase`
case, or no extra phases are done, in the `*Phases` case.
2019-11-01 14:44:44 -04:00
John Ericson
1290e532ea treewide: Make more dont* variables OK to be undefined in setup hooks 2019-11-01 14:44:44 -04:00
Jan Tojnar
e2e3861d6b
Merge branch 'staging-next' into staging 2019-10-12 00:51:55 +02:00
Jan Tojnar
6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
Linus Heckemann
5aa4b19946 treewide: mark some broken packages as broken
Refs:
e675498026
1e9cc5b984
793a2fe1e8
c19cf65261
f6544d618f
2019-10-08 17:14:26 +02:00
Frederik Rietdijk
a0c34f54cc Merge master into staging-next 2019-10-08 11:56:52 +02:00
Will Dietz
58c11983a1
Merge pull request #68075 from dtzWill/update/setxkbmap-1.3.2
setxkbmap: 1.3.1 -> 1.3.2
2019-10-07 18:18:33 -05:00
Will Dietz
9419ed60f4
Merge pull request #68069 from dtzWill/update/libxt-1.2.0
xorg.libXt: 1.1.5 -> 1.2.0
2019-10-07 18:16:18 -05:00
Will Dietz
439bc5204f
Merge pull request #68071 from dtzWill/update/xorg-2019
xorgproto: 2018.4 -> 2019.1
2019-10-07 18:15:27 -05:00
Will Dietz
f5692937ce
setxkbmap: 1.3.1 -> 1.3.2
https://lists.x.org/archives/xorg-announce/2019-July/003007.html
2019-10-07 18:14:00 -05:00
Will Dietz
2f1111afa1
Merge pull request #68077 from dtzWill/update/x-misc-utils-2019
xorg.{xbacklight,xlock,libICE}: bump
2019-10-07 18:12:26 -05:00
Samuel Dionne-Riel
85f97f2d01 libX11: adds upstream patch to fix cross-compilation
With this patch applied, cross-compilation of a system image for ARM
platforms works as it did previously.

See their commit for more explanation:

 * https://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=0327c427d62f671eced067c6d9b69f4e216a8cac
2019-09-27 21:06:21 -04:00
Will Dietz
c63dba2025
xorg.libXfont2: 2.0.3 -> 2.0.4
https://lists.x.org/archives/xorg-announce/2019-September/003022.html
2019-09-16 10:02:41 -05:00
Linus Heckemann
c8c04bc96c
Merge pull request #68310 from rnhmjoj/xkb
services.xserver.extraLayouts fixes
2019-09-09 10:19:58 +02:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Daniel Șerbănescu
e2fca8b1db
nixos/xserver: refactor/fix xml tags for keyboard layout overrides
With the current XML tags there is an issue when building with a custom keyboard.
The description of the new keyboard layout will be missing in the built file: xkeyboard-config-2.27/share/X11/xkb/rules/evdev.lst
2019-09-08 15:16:16 +02:00
Will Dietz
3263254cfb xorg.xinput: 1.6.2 -> 1.6.3
https://lists.x.org/archives/xorg-announce/2019-July/003013.html
2019-09-06 22:00:33 +02:00
Will Dietz
ae5df9705c libXi: 1.7.9 -> 1.7.10 2019-09-06 19:35:32 +02:00
Will Dietz
8d3d7ce3e5 libX11: 1.6.7 -> 1.6.8 2019-09-06 19:34:52 +02:00
Will Dietz
10f023e306
Merge pull request #68070 from dtzWill/update/sessreg-1.1.2
sessreg: 1.1.1 -> 1.1.2
2019-09-04 21:05:41 -05:00
Will Dietz
d40a27b1a8
xorg.{xbacklight,xlock,libICE}: bump 2019-09-03 20:05:28 -05:00
Will Dietz
cdb4ee8078
encodings: 1.0.4 -> 1.0.5 2019-09-03 20:00:36 -05:00
Will Dietz
1bbceb88fe
xorgproto: 2018.4 -> 2019.1
https://lists.x.org/archives/xorg-announce/2019-June/003000.html

> This release boasts a bunch of cleanup work and a few new keysyms. No
functional changes to any of the protocols.
2019-09-03 19:55:59 -05:00
Will Dietz
86a112585a
sessreg: 1.1.1 -> 1.1.2 2019-09-03 19:54:41 -05:00
Will Dietz
1cd0c20922
xorg.libXt: 1.1.5 -> 1.2.0
https://lists.x.org/archives/xorg-announce/2019-June/003002.html
2019-09-03 19:51:53 -05:00
Will Dietz
29c120c065
Merge pull request #66973 from dtzWill/update/xauth-1.1
xauth: 1.0.10 -> 1.1
2019-09-03 18:25:06 -05:00
Will Dietz
1343b61796 xorg.libpciaccess: 0.14 -> 0.16
https://lists.x.org/archives/xorg-announce/2019-July/003014.html
2019-08-31 12:36:53 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Robin Gloster
279bd6fcd9
xorg.xf86videosis: 0.10.9 -> 0.11.0
fixes build
2019-08-26 22:12:43 +02:00
Will Dietz
edd3e17785
xauth: 1.0.10 -> 1.1
https://lists.x.org/archives/xorg-announce/2019-July/003005.html
2019-08-19 16:33:59 -05:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Daniel Schaefer
e3329f9e85 xorg.libXTrap: init at 1.0.1
Fixes build of xorg.xtrap
2019-08-02 18:49:45 +02:00
Daniel Schaefer
c2466ced95 pkgs/servers/x11/xorg: Git-ignore download-cache
It's generated when updating using generate-expr-from-tarballs.pl
2019-08-02 18:48:33 +02:00
rnhmjoj
171d5c9200
nixos/xserver: add option to install custom xkb layouts 2019-07-26 18:08:04 +02:00
Daiderd Jordan
35b7c60c0c
xorg-xorgserver: remove cf-private 2019-07-03 22:20:19 +02:00
Daiderd Jordan
40d34bb19f
xquartz: remove cf-private 2019-07-03 22:20:18 +02:00
Will Dietz
d41bc0ff56 xkeyboardconfig: drop no-longer-applying esperanto patch 2019-07-03 08:52:51 +02:00
Will Dietz
97d1f95d9d xorg.xkeyboardconfig: 2.24 -> 2.27
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/tags/xkeyboard-config-2.27
2019-07-03 08:52:51 +02:00
Frederik Rietdijk
f120248daf Merge staging-next into staging 2019-06-18 11:07:56 +02:00
Matthew Bauer
4d6f65b81f
Merge pull request #62167 from matthewbauer/alias-libgl
Add libGL* aliases
2019-06-17 15:18:29 -04:00
Matthew Bauer
263f5891b6 treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa
Just use mesa for these to be more clear. Move these to aliases.nix
2019-06-17 14:43:18 -04:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Will Dietz
813799a6cb
xorg.xcalc: 1.0.7 -> 1.1.0
xcalc: ensure "app-defaults" resources are installed+found, works now
2019-06-12 00:00:10 -05:00
Will Dietz
962d49aec8
xorg.xorgserver: 1.20.4 -> 1.20.5
https://lists.x.org/archives/xorg-announce/2019-May/002993.html
2019-06-04 01:03:39 -05:00
Robin Gloster
4a246cea28
xorg.*: fix cross m4 handling 2019-05-07 18:14:12 +02:00
Robin Gloster
abb10fe7ae
xorg.libXi: fix cross 2019-05-07 18:14:11 +02:00
Pierre Bourdon
c689a3bad9 xkeyboard-config: intltool should be a nativeBuildInput (#59048) 2019-04-06 12:35:12 +00:00
Will Dietz
1aa5dc968f
Merge pull request #57778 from dtzWill/update/xorg-misc-2019-03
xorg: batch of updates, bump luit
2019-03-27 08:34:38 -05:00
Will Dietz
16d5cb1b00 xcompmgr: 1.1.7 -> 1.1.8
https://lists.x.org/archives/xorg-announce/2019-March/002989.html
2019-03-24 21:37:28 -05:00
Wael M. Nasreddine
5af0780492
Merge remote-tracking branch 'origin/master' into staging
* origin/master: (693 commits)
  buildGoModule: use go_1_12 instead of go_1_11 (#58103)
  gitAndTools.lab: 0.15.2 -> 0.15.3 (#58091)
  signal-desktop: 1.22.0 -> 1.23.0
  added missing semicolon to documentation
  terminus_font_ttf: 4.46.0 -> 4.47.0
  buildGoModule: remove SSL env vars in favor of cacert in buildInputs (#58071)
  dav1d: init at 0.2.1
  dropbox-cli: 2018.11.28 -> 2019.02.14
  atlassian-confluence: 6.14.1 -> 6.14.2
  maintainers: update email for dywedir
  python.pkgs.hglib: use patch to specify hg path (#57926)
  chkrootkit: 0.52 -> 0.53
  radare2-cutter: 1.7.2 -> 1.8.0
  autorandr: 1.7 -> 1.8
  pythonPackages.pyhepmc: fix build
  llvm-polly/clang-polly: use latest llvm
  apulse: 0.1.11.1 -> 0.1.12, cleanup
  factorio: experimental 0.17.14 → 0.17.16 (#58000)
  sequeler: 0.6.7 -> 0.6.8
  nasc: 0.5.1 -> 0.5.2
  ...
2019-03-21 21:01:25 -07:00
Will Dietz
c489789f61 xorg.mkfontscale: 1.2.0 -> 1.2.1
https://lists.x.org/archives/xorg-announce/2019-March/002988.html
2019-03-21 06:50:18 -05:00
Will Dietz
84fb329ec1 xorg.xf86video{ati,amdgpu}: 19.0.0 -> 19.0.1
https://lists.x.org/archives/xorg-announce/2019-March/002986.html
https://lists.x.org/archives/xorg-announce/2019-March/002987.html
2019-03-19 20:20:31 -05:00
Will Dietz
1be6087b1f xf86inputsynaptics: deps handled now
And drop `mtdev`, which appears to have been added unnecessarily.
2019-03-18 23:48:07 -05:00
Will Dietz
8d31888648 xorg: simplify overrides now handled automatically, GL -> libGL 2019-03-18 23:45:42 -05:00
Will Dietz
108ab954ed xorg: font utilities should be nativeBuildInputs
They provide programs executed by the builder.
2019-03-18 23:45:42 -05:00
Will Dietz
9e39ab6753 generate-expr-from-tarballs.pl: more detection, detect gettext usage 2019-03-18 23:45:42 -05:00
Will Dietz
29f4526a5a xorg: detect deps on libxkbfile from ${XKBMODULE} 2019-03-18 23:45:42 -05:00
Will Dietz
061f6562f0 xorg/default.nix: regen! 2019-03-18 23:45:42 -05:00
Will Dietz
c01c821f48 generate-exprs-from-tarballs.pl: support few more deps automatically 2019-03-18 23:31:01 -05:00
Will Dietz
79592e99a6 xorg/tarballs.list: +{xfd,xmore} -mkfontdir 2019-03-18 23:30:47 -05:00
Will Dietz
0e44d14dff xorg.mkfontdir: replace with mkfontscale, which now includes mkfontdir
See:
https://lists.x.org/archives/xorg-announce/2019-March/002960.html
2019-03-18 22:57:50 -05:00
Will Dietz
542908cc35 xorg: batch of updates, bump luit
Announcements with details of changes
can be found on the mailing list,
and since IIRC these are all from
this month they all are listed here:

https://lists.x.org/archives/xorg-announce/2019-March/thread.html

-----

Grab luit from mirror because our fetcher's
default behavior doesn't get along with
invisible-island's FTP server apparently (?).

Or perhaps server is problematic, not sure.

Example URL:
ftp://ftp.invisible-island.net/luit/luit-20190106.tgz
* Using curl or wget:
  "Server denied you to change to the given directory"
  (or so)
* Using curl with `--ftp-mode nocwd`: success

curl's manpage suggests this is less-compliant behavior
used for speed, offering a third option that's more
likely to work but not quite as fast.
So it seems like the more compliant behavior is
rejected but the fast behavior is accepted.
Dunno, hopefully it'll be on a content-addressed
server soon enough so it doesn't matter as much :).

Hash used here matches manually-fetched from official URL
as well as from the mirror.
2019-03-17 00:39:31 -05:00
xeji
e3357a1b5a
xorg.xload: fix build (#57665)
add missing dependency gettext
2019-03-15 16:45:10 +01:00
Vladimír Čunát
bf47162c26
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1508887
2019-03-10 08:04:21 +01:00
Josef Kemetmüller
680e9f1d91 xorg.editres: fix build (#56979) 2019-03-07 23:01:46 +01:00
Josef Kemetmüller
22160302cf xorg.oclock: Fix build (#56978) 2019-03-07 22:59:06 +01:00
Frederik Rietdijk
5d7ab31949 Merge master into staging-next 2019-03-05 08:32:52 +01:00
Will Dietz
6e3582c9fd xinit: 1.4.0 -> 1.4.1 (#56800)
https://lists.x.org/archives/xorg-announce/2019-March/002962.html
2019-03-04 13:34:46 +01:00
Will Dietz
9809a541b2 xdm: 1.1.11 -> 1.1.12 (#56755)
https://lists.x.org/archives/xorg-announce/2019-March/002959.html
2019-03-04 13:09:29 +01:00
Vladimír Čunát
dfa45dfb86
Merge #56516: lndir: get rid of xorgproto dependency
... into staging.
2019-03-01 19:09:54 +01:00
Frederik Rietdijk
205e0fc5bd Merge staging-next into staging 2019-03-01 09:22:21 +01:00
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