Commit graph

357 commits

Author SHA1 Message Date
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 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
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
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
Jonathan Ringer f2de9ca370 xorg.xkeyboardconfig: build man pages 2020-09-29 08:10:27 -07: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 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
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 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
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
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
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:
e6754980264fe927320d5ff2dbd24ca4fac9a160
1e9cc5b9844ef603fe160e9f671178f96200774f
793a2fe1e8bb886ca2096c5904e1193dc3268b6d
c19cf65261639f749012454932a532aa7c681e4b
f6544d618f30fae0bc4798c4387a8c7c9c047a7c
2019-10-08 17:14:26 +02: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
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
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00: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
Will Dietz d41bc0ff56 xkeyboardconfig: drop no-longer-applying esperanto patch 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
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
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 1be6087b1f xf86inputsynaptics: deps handled now
And drop `mtdev`, which appears to have been added unnecessarily.
2019-03-18 23:48:07 -05:00