3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

182 commits

Author SHA1 Message Date
TredwellGit 01a6d30016 xorg.xrdb: 1.2.0 -> 1.2.1
https://lists.x.org/archives/xorg-announce/2021-August/003107.html
2021-08-10 13:25:40 +00:00
Sandro a81e601d28
Merge pull request #132485 from TredwellGit/xorg.xorgserver
xorg.xorgserver: 1.20.12 -> 1.20.13
2021-08-05 09:31:39 +02:00
Sandro fef0331b1a
Merge pull request #132489 from TredwellGit/xorg.xwd 2021-08-04 22:58:43 +02:00
Sandro 091f18e07b
Merge pull request #132487 from TredwellGit/xorg.xeyes
xorg.xeyes: 1.1.2 -> 1.2.0
2021-08-04 22:58:22 +02:00
TredwellGit 845aa1a760 xorg.xf86videoamdgpu: 19.1.0 -> 21.0.0
https://lists.x.org/archives/amd-gfx/2021-July/067146.html
2021-08-04 01:31:53 +00:00
TredwellGit a51c130827 xorg.xwd: 1.0.7 -> 1.0.8
https://lists.x.org/archives/xorg-announce/2021-August/003102.html
2021-08-03 03:35:29 +00:00
TredwellGit 273b06dd03 xorg.xeyes: 1.1.2 -> 1.2.0
https://lists.x.org/archives/xorg-announce/2021-August/003101.html
2021-08-03 03:20:16 +00:00
TredwellGit 0687032f69 xorg.xorgserver: 1.20.12 -> 1.20.13
https://lists.x.org/archives/xorg-announce/2021-July/003100.html
2021-08-03 03:09:58 +00:00
TredwellGit a888c7fb80 xorg.xorgserver: 1.20.11 -> 1.20.12
https://lists.x.org/archives/xorg-announce/2021-July/003098.html
2021-07-10 01:54:25 +00:00
Robert Schütz c1dca92daf Merge branch 'master' into staging-next 2021-06-25 10:02:10 +02:00
TredwellGit 3e73f3c7ff xorg.xf86inputlibinput: 1.0.1 -> 1.1.0
https://lists.x.org/archives/xorg-announce/2021-June/003094.html
2021-06-24 04:40:19 +00:00
Jan Tojnar e3dfa79441
Merge branch 'staging-next' into staging
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-16 19:59:05 +02:00
Jonathan Ringer d1d37feb6d
Merge branch 'master' into staging-next
Conflicts:
  pkgs/servers/x11/xorg/default.nix
2021-06-15 19:32:36 -07:00
Naïm Favier f49c857a1d
fonttosfnt: 1.2.1 -> 1.2.2
https://lists.x.org/archives/xorg-announce/2021-June/003093.html
2021-06-15 10:06:13 +02:00
Sandro 5b80702b19
Merge pull request #122792 from TredwellGit/xorg.libXfixes 2021-06-14 20:02:40 +02:00
TredwellGit b1370dea54 xkeyboard_config: 2.31 -> 2.33
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/tags/xkeyboard-config-2.33
2021-06-09 13:33:26 +00:00
TredwellGit e46a6ab222 xorg.libX11: 1.7.1 -> 1.7.2
https://lists.x.org/archives/xorg-announce/2021-June/003092.html
2021-06-06 19:19:44 +00:00
TredwellGit fa8d1b336d xorg.libX11: 1.7.0 -> 1.7.1
https://lists.x.org/archives/xorg-announce/2021-May/003089.html
https://lists.x.org/archives/xorg-announce/2021-May/003088.html
2021-05-19 04:10:17 +00:00
TredwellGit 8c4b268d27 xorg.libXfixes: 5.0.3 -> 6.0.0
https://lists.x.org/archives/xorg-announce/2021-May/003086.html
2021-05-15 11:48:57 +00:00
TredwellGit 3b7fd1ad3f xorg.xorgproto: 2021.3 -> 2021.4
https://lists.x.org/archives/xorg-announce/2021-April/003085.html
2021-05-15 11:48:57 +00:00
TredwellGit 286c1918da xorg.xf86inputlibinput: 1.0.0 -> 1.0.1
https://lists.x.org/archives/xorg-announce/2021-April/003083.html
2021-04-18 21:34:28 +00:00
TredwellGit c7fba6a472 xorg.xorgserver: 1.20.10 -> 1.20.11
https://lists.x.org/archives/xorg-announce/2021-April/003081.html
https://lists.x.org/archives/xorg-announce/2021-April/003080.html
2021-04-13 14:42:09 +00:00
Jan Tojnar 714ef27ffe Merge branch 'master' into staging-next 2021-04-07 05:32:57 +02:00
TredwellGit 551f1dac03 xorg.xf86inputlibinput: 0.30.0 -> 1.0.0
https://lists.x.org/archives/xorg-announce/2021-April/003079.html
2021-04-06 22:34:14 +00:00
TredwellGit 584f82352e xorg.libXres: 1.2.0 -> 1.2.1
https://lists.x.org/archives/xorg-announce/2021-March/003078.html
2021-04-01 00:40:23 +00:00
TredwellGit c0172b1885 xorg.libXaw: 1.0.13 -> 1.0.14
https://lists.x.org/archives/xorg-announce/2021-March/003077.html
2021-03-28 02:27:04 +00:00
Sandro 0cfe88d88f
Merge pull request #114601 from TredwellGit/xorg.xorgproto
xorg.xorgproto: 2020.1 -> 2021.3
2021-03-21 05:32:19 +01:00
TredwellGit 8d351c013d xorg.xkbcomp: 1.4.4 -> 1.4.5
https://lists.x.org/archives/xorg-announce/2021-March/003075.html
2021-03-18 03:23:00 +00:00
Sandro 448b953d56
Merge pull request #111403 from TredwellGit/xorg.libXt
xorg.libXt: 1.2.0 -> 1.2.1
2021-03-06 05:55:39 +01:00
TredwellGit f00fde643e xorg.utilmacros: 1.19.2 -> 1.19.3
https://lists.x.org/archives/xorg-announce/2021-January/003069.html
2021-03-05 19:04:19 +00:00
TredwellGit 38462b44c6 xorg.xorgproto: 2020.1 -> 2021.3
https://lists.x.org/archives/xorg-announce/2021-February/003072.html
https://lists.x.org/archives/xorg-announce/2021-February/003073.html
2021-02-27 22:41:20 +00:00
TredwellGit f296c4f81f xorg.libXt: 1.2.0 -> 1.2.1
https://lists.x.org/archives/xorg-announce/2021-January/003070.html
2021-01-31 07:12:32 +00:00
TredwellGit ba5dedbbd0 xorg.xf86videonouveau: 1.0.16 -> 1.0.17
https://lists.freedesktop.org/archives/nouveau/2021-January/037766.html
2021-01-24 07:33:12 +00:00
Jan Tojnar 0ea0dacc20
Merge branch 'staging-next' into staging 2021-01-07 13:06:41 +01:00
Jan Tojnar f19eb635b4
Merge branch 'master' into staging-next
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
Sandro 8529423aa3
Merge pull request #108442 from TredwellGit/xorg.xf86videovesa 2021-01-06 01:26:47 +01:00
Michele Guerini Rocco 5748022aa3
Merge pull request #107117 from TredwellGit/xorg.fonttosfnt
xorg.fonttosfnt: 1.0.5 -> 1.2.1
2021-01-05 09:40:37 +01:00
TredwellGit 730976960a xorg.xf86videonouveau: 1.0.15 -> 1.0.16
https://lists.freedesktop.org/archives/nouveau/2019-January/032053.html
2021-01-05 03:24:56 +00:00
TredwellGit 45c86b688c xorg.xf86videovesa: 2.4.0 -> 2.5.0
https://lists.x.org/archives/xorg-announce/2020-September/003060.html
2021-01-05 03:21:15 +00:00
TredwellGit 8121c9badb xorg.xkbcomp: 1.4.2 -> 1.4.4
https://lists.x.org/archives/xorg-announce/2020-February/003037.html
https://lists.x.org/archives/xorg-announce/2020-November/003063.html
2021-01-04 18:07:56 +01:00
TredwellGit ad86bc75eb xorg.fonttosfnt: 1.0.5 -> 1.2.1
https://lists.x.org/archives/xorg-announce/2020-January/003035.html
https://lists.x.org/archives/xorg-announce/2020-October/003062.html
https://lists.x.org/archives/xorg-announce/2020-December/003068.html
2020-12-17 19:59:37 +00:00
TredwellGit 88fcd687d0 xorg.xrandr: 1.5.0 -> 1.5.1
https://lists.x.org/archives/xorg-announce/2019-August/003018.html
2020-12-08 05:20:24 +01:00
github-actions[bot] 4763e8b8fd
Merge master into staging-next 2020-12-05 00:38:01 +00:00
TredwellGit 0309973b82 xorg.xorgserver: 1.20.9 -> 1.20.10
https://lists.x.org/archives/xorg-announce/2020-December/003067.html
https://lists.x.org/archives/xorg-announce/2020-December/003066.html
2020-12-01 23:47:01 +00:00
Vladimír Čunát 48b3694562
Merge #104825: xorg.libX11: 1.6.12 -> 1.7.0 (security) 2020-11-29 09:55:14 +01:00
TredwellGit 95e815b5ff xorg.libX11: 1.6.12 -> 1.7.0
https://lists.x.org/archives/xorg-announce/2020-November/003065.html
2020-11-24 23:54:22 +00:00
TredwellGit 233849a14d xorg.xprop: 1.2.4 -> 1.2.5
https://lists.x.org/archives/xorg-announce/2020-November/003064.html
2020-11-24 23:42:45 +00:00
TredwellGit fc03fe100a xorg: fix update generation
Both e3d3bc66dc and 1d15641433 were done incorrectly.

Also, use python3 in generate-expr-from-tarballs.pl instead of overrides.nix.
2020-11-23 13:30:25 -08: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