alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
253107 commits 217 branches 121 tags 4.5 GiB
Commit graph

958 commits

Author SHA1 Message Date
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
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