aboutsummaryrefslogtreecommitdiff
path: root/pkgs/servers/x11 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge master into staging-nextgithub-actions[bot]2020-12-053-14/+4
|\
| * xorg.xorgserver: 1.20.9 -> 1.20.10TredwellGit2020-12-013-14/+4
| | | | | | | | | | https://lists.x.org/archives/xorg-announce/2020-December/003067.html https://lists.x.org/archives/xorg-announce/2020-December/003066.html
* | Merge #104825: xorg.libX11: 1.6.12 -> 1.7.0 (security)Vladimír Čunát2020-11-292-4/+4
|\ \
| * | xorg.libX11: 1.6.12 -> 1.7.0TredwellGit2020-11-242-4/+4
| |/ | | | | | | https://lists.x.org/archives/xorg-announce/2020-November/003065.html
* / xorg.xprop: 1.2.4 -> 1.2.5TredwellGit2020-11-242-4/+4
|/ | | | https://lists.x.org/archives/xorg-announce/2020-November/003064.html
* xorg: fix update generationTredwellGit2020-11-234-23/+14
| | | | | | Both e3d3bc66dc496f940b427443b503a67434e115b5 and 1d15641433b97eb1a45a7adec0a0e94600127dfb were done incorrectly. Also, use python3 in generate-expr-from-tarballs.pl instead of overrides.nix.
* Merge master into staging-nextFrederik Rietdijk2020-11-091-2/+2
|\
| * xorg.xf86videointel: Fix buildDanielle Lancashire2020-11-061-2/+2
| | | | | | | | | | | | | | Since c2526545844bdbb8347f9d9169a77728bf2bdd73, building xf86videointel has been broken on my system due to missing libXv. This commit explicitly includes the dependency when building the package to hopefully avoid things being broken for others.
| * Recover the complicated situation after my bad mergeVladimír Čunát2020-10-263-31/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I made a mistake merge. Reverting it in c778945806b 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: 4effe769e2b - `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 (803ca85c209) - fortunately no other commits have been pushed to staging-next yet - applying a diff on staging-next to get it into that state
* | Merge pull request #101695 from lourkeur/xkeyboard-configMatthieu Coudron2020-10-272-6/+10
|\ \ | | | | | | xkeyboard-config: 2.27 -> 2.31
| * | setxkbmap: include xkeyboard-config manpageLouis2020-10-271-1/+2
| | |
| * | xkeyboard-config: 2.27 -> 2.31Louis2020-10-241-5/+8
| | |
* | | Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"Vladimír Čunát2020-10-263-31/+24
| |/ |/| | | | | | | | | | | | | | | This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. 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).
* | Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"Vladimír Čunát2020-10-253-24/+31
| | | | | | | | | | | | | | I'm sorry; I didn't notice it contained staging commits. This reverts commit 17f5305b6c20df795c365368d2d868266519599e, reversing changes made to a8a018ddc0a8b5c3d4fa94c94b672c37356bc075.
* | Merge #101508: libraw: 0.20.0 -> 0.20.2Vladimír Čunát2020-10-253-31/+24
|\ \
| * \ Merge #100385: xorg xcb updates (into staging)Vladimír Čunát2020-10-202-8/+8
| |\ \
| | * | xorg.libxcb: 1.13.1 -> 1.14TredwellGit2020-10-132-4/+4
| | | | | | | | | | | | | | | | https://lists.x.org/archives/xorg-announce/2020-February/003039.html
| | * | xorg.xcbproto: 1.13 -> 1.14.1TredwellGit2020-10-132-4/+4
| | | | | | | | | | | | | | | | | | | | https://lists.x.org/archives/xorg-announce/2020-February/003038.html https://lists.x.org/archives/xorg-announce/2020-October/003061.html
| * | | Merge #100376: xorg.xorgproto: 2019.1 -> 2020.1 (into staging)Vladimír Čunát2020-10-202-4/+4
| |\ \ \
| | * | | xorg.xorgproto: 2019.1 -> 2020.1TredwellGit2020-10-132-4/+4
| | |/ / | | | | | | | | | | | | | | | | https://lists.x.org/archives/xorg-announce/2019-October/003029.html https://lists.x.org/archives/xorg-announce/2020-April/003042.html
| * | | Merge #100378: xorg.libXvMC: 1.0.11 -> 1.0.12 (into staging)Vladimír Čunát2020-10-202-4/+4
| |\ \ \
| | * | | xorg.libXvMC: 1.0.11 -> 1.0.12TredwellGit2020-10-132-4/+4
| | |/ / | | | | | | | | | | | | https://lists.x.org/archives/xorg-announce/2019-September/003023.html
| * | | Merge #99158: xorg.libX11: 1.6.8 -> 1.6.12 (security)Vladimír Čunát2020-10-153-11/+4
| |\ \ \
| | * | | xorg.libX11: 1.6.8 -> 1.6.12TredwellGit2020-10-133-11/+4
| | | |/ | | |/| | | | | | | | | | | | | https://lists.x.org/archives/xorg-announce/2020-August/003056.html https://lists.x.org/archives/xorg-announce/2020-July/003050.html
| * | | Merge pull request #100391 from TredwellGit/xorg.xf86inputlibinputRok Garbas2020-10-142-4/+4
| |\ \ \ | | |/ / | |/| | xorg.xf86inputlibinput: 0.28.2 -> 0.30.0
| | * | xorg.xf86inputlibinput: 0.28.2 -> 0.30.0TredwellGit2020-10-132-4/+4
| | |/ | | | | | | | | | | | | https://lists.x.org/archives/xorg-announce/2019-August/003017.html https://lists.x.org/archives/xorg-announce/2020-May/003045.html
* | | Merge pull request #98748 from TredwellGit/xorg.xorgserverAndreas Rammhold2020-10-243-4/+14
|\ \ \ | |/ / |/| | xorg.xorgserver: 1.20.8 -> 1.20.9
| * | xorg.xorgserver: 1.20.8 -> 1.20.9TredwellGit2020-09-253-4/+14
| | | | | | | | | | | | | | | https://lists.x.org/archives/xorg-announce/2020-August/003059.html https://lists.x.org/archives/xorg-announce/2020-August/003058.html
* | | Merge master into staging-nextFrederik Rietdijk2020-10-132-8/+8
|\ \ \ | |_|/ |/| |
| * | Merge pull request #98974 from Mathnerd314/video-driversWORLDofPEACE2020-10-132-8/+8
| |\ \ | | | | | | | | xf86-video-{ati,amdgpu}: 19.0.1 -> 19.1.0
| | * | xf86-video-{ati,amdgpu}: 19.0.1 -> 19.1.0Mathnerd3142020-09-272-8/+8
| | | |
* | | | Merge staging-next into stagingFrederik Rietdijk2020-10-062-6/+6
|\| | |
| * | | nixos/xwayland: add new module and allow configuring a default font pathEmilio Perez2020-10-041-2/+4
| | | | | | | | | | | | | | | | | | | | - Add option `programs.xwayland.defaultFontPath` - Modify sway to enable Xwayland
| * | | generate-expr-from-tarballs.pl: fix insecure temporary fileTredwellGit2020-09-301-4/+2
| |/ / | | | | | | | | | https://cwe.mitre.org/data/definitions/377.html
* / / xorg.xkeyboardconfig: build man pagesJonathan Ringer2020-09-291-2/+2
|/ /
* | xorg: mark fonts with proprietary licences as unfreernhmjoj2020-09-271-4/+38
| |
* | xorg.fontbitstreamtype1: generate .otf fontsrnhmjoj2020-09-271-1/+22
| |
* | generate-expr-from-tarballs.pl: quote URLs per RFC 0045 (#98751)TredwellGit2020-09-261-1/+1
|/ | | https://github.com/NixOS/rfcs/pull/45
* xorg: fix static buildSymphorien Gibol2020-07-021-15/+32
|
* Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020Matthew Bauer2020-04-131-0/+9
|\ | | | | Cross compilation fixes [april 2020]
| * libXres: enable cross-compilationMatthew Bauer2020-04-061-0/+3
| | | | | | | | | | - adds utilmacros - set null malloc flag
| * xorg.libXScrnSaver: add utilmacros and malloc 0Matthew Bauer2020-04-061-0/+6
| |
* | xorg.xorgserver: 1.20.7 -> 1.20.8Rouven Czerwinski2020-04-102-4/+4
| | | | | | | | | | | | | | | | 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.
* | treewide: Per RFC45, remove all unquoted URLsMichael Reilly2020-04-104-226/+226
|/
* Merge pull request #75163 from rnhmjoj/gohuMichele Guerini Rocco2020-02-142-0/+66
|\ | | | | gohufont: generate opentype files
| * xorg.fonttosfnt: add patch to fix uninitialized memory bugrnhmjoj2020-02-072-0/+66
| |
* | xorg.libXft: add color emoji rendering supportworldofpeace2020-02-051-0/+10
|/ | | | https://gitlab.freedesktop.org/xorg/lib/libxft/merge_requests/1
* Merge master into staging-nextFrederik Rietdijk2020-01-282-4/+4
|\
| * xorg.xorgserver: 1.20.6 -> 1.20.7 (PR #77706)Will Dietz2020-01-262-4/+4
| | | | | | | | https://lists.x.org/archives/xorg-announce/2020-January/003036.html
* | Merge staging-next into stagingFrederik Rietdijk2020-01-111-6/+9
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 02:27:31 +0000