JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
260,724 Commits 2 Branches 0 Tags 13 GiB
a7a83fb545
Commit Graph

543 Commits

Author SHA1 Message Date
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
Frederik Rietdijk
20f001c01e Merge master into staging-next 2020-11-09 14:33:52 +01:00
Danielle Lancashire
f7e691ac7e xorg.xf86videointel: Fix build 
Since c252654584, 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.
 2020-11-06 15:01:43 +01:00
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
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
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
Mathnerd314
ed054f7815 xf86-video-{ati,amdgpu}: 19.0.1 -> 19.1.0 2020-09-27 15:57:35 -06: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
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
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
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
Edmund Wu
7c0a26d176
xorg.xorgserver: 1.20.5 -> 1.20.6 2019-11-25 08:21:44 -05:00
adisbladis
a6929e9ff3
xorg.xorgserver: Fix build with mesa 19.2.3 2019-11-09 10:34:50 +00:00
Jan Tojnar
e2e3861d6b
Merge branch 'staging-next' into staging 2019-10-12 00:51:55 +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
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
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