nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-15 10:12:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
503,459 Commits 200 Branches 125 Tags 9 GiB
38f69649f4
Commit Graph

1267 Commits

Author SHA1 Message Date
github-actions[bot]
b56a4e5e6e
Merge staging-next into staging 2021-09-09 00:02:15 +00:00
Sergei Trofimovich
6073831a11 imake: do not skip Linux* vendor definitions 
Initial build failure is onserved on `staging` branch:

```
$ nix-build -A transfig
...
make[1]: Entering directory '/build/transfig.3.2.4'
Imakefile.c:20:2: Include file Imake.tmpl not found
imake: Exit code 1.
  Stop.
```

This happened after 8675ca0 ("xorg.xorgcffiles: 1.0.6 -> 1.0.7")
bump which exposed an old bug in `imake.patch`. `imake.patch`
dropped by accident definiton of `LinuxRedHat` enum and changed
evaluation of the following code:

```
 #if LinuxDistribution == LinuxRedHat
 ...
 # define ProjectRoot /usr
 #endif
```

References to `/usr` were addded in d47131ed97.

Before this change `LinuxDistribution == LinuxRedHat` evaluated to true.
After this change `LinuxDistribution == LinuxRedHat` evaluates to false.

Mechanically I moved `#if 0` right after enum definitions but still
before system autodetection.

Now `transfig` builds successfully.

Closes: https://github.com/NixOS/nixpkgs/issues/135337
Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
 2021-09-06 07:46:13 +01:00
Martin Weinelt
7f732aca66 Revert "Merge remote-tracking branch 'origin/python-unstable' into staging-next" 
This reverts commit b041b2e1b2, reversing
changes made to 5b6c2380ad.
 2021-09-05 15:02:25 +02:00
Alyssa Ross
a3c3bb0de9 xorg.libXft: 2.3.3 -> 2.3.4 2021-08-25 07:27:31 +00:00
Jan Tojnar
807d3ec359 Merge branch 'staging-next' into staging 
; Conflicts:
;	pkgs/tools/misc/t1utils/default.nix
 2021-08-11 16:34:11 +02:00
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
Vladimír Čunát
8ab6ba6b1c
Merge branch 'staging-next' into staging 2021-08-06 09:14:57 +02:00
Sandro
eccbf31e05
Merge pull request #132491 from TredwellGit/xorg.libXfont2 
xorg.libXfont2: 2.0.4 -> 2.0.5
 2021-08-05 16:51:27 +02:00
Sandro
6f7ee408c9
Merge pull request #127986 from TredwellGit/generate-expr-from-tarballs.pl 
generate-expr-from-tarballs.pl: use nix-shell as script interpreter
 2021-08-05 10:10:14 +02: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
8675ca0e94 xorg.xorgcffiles: 1.0.6 -> 1.0.7 
https://lists.x.org/archives/xorg-announce/2021-August/003105.html
 2021-08-04 08:29:53 +00:00
TredwellGit
fccbcf5568 xorg.libXfont2: 2.0.4 -> 2.0.5 
https://lists.x.org/archives/xorg-announce/2021-August/003103.html
 2021-08-04 02:07:26 +00: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
Felix Buehler
a56d117bdb servers: replace name with pname&version 2021-07-26 20:15:46 +02:00
Sandro
a0fe575c2c
Merge pull request #129812 from TredwellGit/xorg.xorgserver 
xorg.xorgserver: 1.20.11 -> 1.20.12
 2021-07-15 18:20:30 +02:00
Sandro Jäckel
388a4ef423
treewide: convert all links git.archlinux.org to github.com/archlinux/svntogit-* 2021-07-14 03:35:21 +02:00
Atemu
4b4c8650a8 xorgserver: override build OS name 2021-07-13 22:41:16 +02: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
Herman Fries
3956639b58 xwayland: 21.1.1 -> 21.1.2 2021-07-09 15:06:42 +02:00
Michael Weiss
0b93eb68a2
xwayland: support cross-compilation 2021-07-03 15:48:10 +02:00
Herman Fries
46d9fddd71 xwayland: Fix build option default_font_path 2021-06-30 02:44:00 +02:00
Herman Fries
e266a62d6d xwayland: Fix build options 
Logs https://hydra.nixos.org/build/146088556/nixlog/7
show `WARNING: Unknown options: "default-font-path, xwayland-eglstream"`
The option names should contain underscores https://gitlab.freedesktop.org/xorg/xserver/-/blob/master/meson_options.txt#L9
 2021-06-30 01:21:51 +02:00
Robert Schütz
c1dca92daf Merge branch 'master' into staging-next 2021-06-25 10:02:10 +02:00
TredwellGit
f6ea60666c generate-expr-from-tarballs.pl: use nix-shell as script interpreter 2021-06-24 06:49:43 +00: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
Naïm Favier
ba602382e1
xorg: regenerate default.nix 2021-06-22 14:10:56 +02:00
github-actions[bot]
9c8cef37d2
Merge master into staging-next 2021-06-20 12:04:37 +00:00
Michele Guerini Rocco
57d4300e33
Merge pull request #126756 from Atemu/fix/xorg-bigelow-holmes-font-license 
xorg: fix Bigelow & Holmes fonts license
 2021-06-20 11:54:23 +02: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
413994ab1c
xorg: fix bad merge conflict 2021-06-15 19:43:00 -07: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
Jan Tojnar
91171e2955
Merge branch 'master' into staging-next 
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
 2021-06-15 11:19:41 +02: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
Felix Buehler
6c48964a0d xorg: change generator "name" to "pname" & "version" 2021-06-14 22:20:35 +02:00
Sandro
5b80702b19
Merge pull request #122792 from TredwellGit/xorg.libXfixes 2021-06-14 20:02:40 +02:00
Atemu
41fe4148a1 xorg: fix Bigelow & Holmes fonts license 2021-06-13 16:15:34 +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
Louis Bettens
a0c4e9863b generate-exprs-from-tarballs.pl: clearly broadcast auto-generation 2021-06-09 15:14:45 +02: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
Silvan Mosberger
5f7f084ab7 xorg.xorgdocs: Make man pages discoverable by manpages 2021-05-04 23:11:32 +02:00
Martin Weinelt
8b3e8d917d
Merge pull request #115552 from Emantor/topic/xwayland_bump 
xwayland: 1.20.10 -> 21.1.1
 2021-04-27 13:31:08 +02:00
Rouven Czerwinski
c7ddfc0760 xwayland: 1.20.10 -> 21.1.1 
The new xwayland release uses meson exclusively, switch the derivation
over to meson. See [1] for further reasoning. Also turn xwayland into
its own derivation instead of using the override infrastructure.

[1]: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/582

Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
 2021-04-27 08:43:48 +02:00
github-actions[bot]
b95da5efb6
Merge master into staging-next 2021-04-22 18:14:27 +00:00
Jörg Thalheim
eab5c73a13
Merge pull request #120064 from pennae/startx-dbus 
xinit: don't unset DBUS_SESSION_BUS_ADDRESS in startx
 2021-04-22 15:52:08 +01:00
pennae
fc0a5b577e xinit: don't unset DBUS_SESSION_BUS_ADDRESS in startx 
upstream startx unsets DBUS_SESSION_BUS_ADDRESS, which in turn breaks
applications run under the startx display manager. arch has shipped this
patch for years as well.

(with review changes from @Mic92)
 2021-04-22 13:03:41 +02:00
github-actions[bot]
a28d31ed86
Merge master into staging-next 2021-04-19 00:15:22 +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
Vladimír Čunát
d2eb7a7887
Merge branch 'staging' into staging-next 
A few conflicts but relatively clear ones (I think).
 2021-04-14 10:08:25 +02: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
Gabriel Ebner
acbfd3f7c0 mesa: add driversdev output and test that dev doesn't depend on drivers 
OpenGL applications should not depend on the Mesa drivers, since these
are supposed to be loaded at runtime from /run/opengl-driver using the
glvnd library.  Furthermore, the drivers output has a large closure
since it depends on LLVM.

The only dependency from dev to drivers came from the xatracker
pkg-config file.  This commit moves this file into a new
output called driversdev.
 2021-04-09 09:26:12 +02: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
github-actions[bot]
74200a7126
Merge master into staging-next 2021-04-03 00:14:57 +00:00
Sandro
0e04d7db6c
Merge pull request #116945 from SuperSandro2000/xlibs-related 2021-04-02 21:41:46 +02: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
github-actions[bot]
d466353dd5
Merge staging-next into staging 2021-03-30 12:06:28 +00:00
github-actions[bot]
c9e9ff786b
Merge master into staging-next 2021-03-30 12:06:24 +00:00
Ivan Kozik
ac032f85c6 xorg.xf86videovmware: build with llvm instead of llvm_6 
I don't see issues when it is built with llvm.
 2021-03-29 17:35:35 +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
Sandro Jäckel
21c17bf758
xorg.xf86videoopenchrome: fix build 2021-03-19 17:33:30 +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
Sandro
ad97ca4e51
Merge pull request #110912 from siraben/stdenv-lib-inherit 
treewide: remove inherited stdenv.lib
 2021-01-27 10:28:55 +01:00
Ben Siraphob
3bbad8b041 treewide: remove inherited stdenv.lib 2021-01-27 12:44:43 +07:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description 
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
 2021-01-24 19:56:59 +07: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
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix 
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
 2021-01-19 01:16:25 -08:00
Jan Tojnar
c0d2951fa6
Merge branch 'master' into staging-next 2021-01-15 17:46:46 +01:00
Ben Siraphob
872973d7d1 pkgs/servers: stdenv.lib -> lib 2021-01-15 14:24:03 +07:00
Jan Tojnar
2b9372b2ca
Merge branch 'master' into staging-next 2021-01-11 13:36:42 +01:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib; 
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
 2021-01-11 10:38:22 +01:00
github-actions[bot]
bd9e17e21f
Merge staging-next into staging 2021-01-10 18:41:46 +00:00
github-actions[bot]
76394e4624
Merge master into staging-next 2021-01-10 18:41:43 +00:00
Profpatsch
66c01cf6f1 x11/xorg: run generator to apply change to stdenv.lib -> lib 2021-01-10 17:45:48 +01:00
Profpatsch
8ec2c88110 x11/xorg: stdenv.lib -> lib in meta generator 
The library does not depend on stdenv, that stdenv exposes lib is
an artifact of the ancient origins of nixpkgs.

I didn’t run the generator since it takes quite a while, but it should
be automatically done the next time somebody updates a package.
 2021-01-10 17:45:48 +01: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
Sandro
f52c8d5705
Merge pull request #108443 from TredwellGit/xorg.xf86videonouveau 
xorg.xf86videonouveau: 1.0.15 -> 1.0.16
 2021-01-05 22:23: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
John Ericson
5c2965145f treewide: Inline more of the static overlay 
Picking up where #107238 left off. I think I'll have gotten all the easy
stuff with this.
 2021-01-03 21:46:14 +00: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
Timo Kaufmann
d6dba0d7c1
Merge pull request #100774 from Atemu/startx-improvements 
Startx improvements
 2020-12-13 18:28:21 +01:00
Atemu
d3113a62b8 nixos/startx: send Xorg log to the default location 
This partially reverts bf3d3dd19b.

I don't know why we weren't getting a default logfile back then but Xorg
definitely provides one now ($XDG_DATA_HOME for regular users and /var/log for
root, see `man Xorg`)
 2020-12-13 06:15:33 +01:00
Atemu
a5ea1b6fb3 xorgserver: set log-dir to /var/log instead of the Nix store 
Xorg creates the log-dir in its output path because X crashes if it can't write
to its logfile. On a regular distro, this dir would be installed into the root
to prevent that from happening but with Nix, it sits in the read-only Nix store.
Ironically, when Xorg tries to write here, it fails and crashes.

To make Xorg log to /var/log, we have to stop the build script from trying to
create the log-dir as the sandbox doesn't (and shouldn't) have access to /var.

This creates a runtime dependency on /var when running as root but that should
exist on any Linux system (on NixOS, journald always creates /var/log).

Previously, the startx displayManager required some workarounds for logfiles
which are obsolete now.

patchPhase -> postPatch because overriding the patchPhase prevents patches from
being applied
 2020-12-13 06:15:32 +01:00
Atemu
338939d464 xinit: use the system xserverrc 
Previously it'd try to use the one under its output path which is read-only of
course
 2020-12-13 06:15:32 +01: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
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
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
adisbladis
ebf783544d
Merge pull request #74145 from eadwu/xorgserver/1.20.6 
xorg.xorgserver: 1.20.5 -> 1.20.6
 2019-11-28 11:00:59 +00:00
worldofpeace
1b5df99e7a
Merge pull request #70295 from worldofpeace/mutter-eglstreams 
Mutter eglstreams
 2019-11-27 05:29:58 +00: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
Tor Hedin Brønner
cfe4ede98b xorg.xwayland: add eglstream support 2019-11-19 15:34:39 -05: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
John Ericson
b7f4bda282 treewide: *Phase(s)? variables are optional 
If these aren't defined, the stdenv defaults are used in the `*Phase`
case, or no extra phases are done, in the `*Phases` case.
 2019-11-01 14:44:44 -04:00
John Ericson
1290e532ea treewide: Make more dont* variables OK to be undefined in setup hooks 2019-11-01 14:44:44 -04:00
Jan Tojnar
e2e3861d6b
Merge branch 'staging-next' into staging 2019-10-12 00:51:55 +02: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:
e675498026
1e9cc5b984
793a2fe1e8
c19cf65261
f6544d618f
 2019-10-08 17:14:26 +02:00
Frederik Rietdijk
a0c34f54cc Merge master into staging-next 2019-10-08 11:56:52 +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
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
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
Linus Heckemann
c8c04bc96c
Merge pull request #68310 from rnhmjoj/xkb 
services.xserver.extraLayouts fixes
 2019-09-09 10:19:58 +02:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00: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
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
Will Dietz
86a112585a
sessreg: 1.1.1 -> 1.1.2 2019-09-03 19:54:41 -05:00
Will Dietz
1cd0c20922
xorg.libXt: 1.1.5 -> 1.2.0 
https://lists.x.org/archives/xorg-announce/2019-June/003002.html
 2019-09-03 19:51:53 -05:00
Will Dietz
29c120c065
Merge pull request #66973 from dtzWill/update/xauth-1.1 
xauth: 1.0.10 -> 1.1
 2019-09-03 18:25:06 -05:00
Will Dietz
1343b61796 xorg.libpciaccess: 0.14 -> 0.16 
https://lists.x.org/archives/xorg-announce/2019-July/003014.html
 2019-08-31 12:36:53 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Robin Gloster
279bd6fcd9
xorg.xf86videosis: 0.10.9 -> 0.11.0 
fixes build
 2019-08-26 22:12:43 +02:00
Will Dietz
edd3e17785
xauth: 1.0.10 -> 1.1 
https://lists.x.org/archives/xorg-announce/2019-July/003005.html
 2019-08-19 16:33:59 -05:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585) 
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
 2019-08-15 13:41:18 +01:00
Daniel Schaefer
e3329f9e85 xorg.libXTrap: init at 1.0.1 
Fixes build of xorg.xtrap
 2019-08-02 18:49:45 +02:00
Daniel Schaefer
c2466ced95 pkgs/servers/x11/xorg: Git-ignore download-cache 
It's generated when updating using generate-expr-from-tarballs.pl
 2019-08-02 18:48:33 +02: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
Daiderd Jordan
40d34bb19f
xquartz: remove cf-private 2019-07-03 22:20:18 +02:00
Will Dietz
d41bc0ff56 xkeyboardconfig: drop no-longer-applying esperanto patch 2019-07-03 08:52:51 +02:00
Will Dietz
97d1f95d9d xorg.xkeyboardconfig: 2.24 -> 2.27 
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/tags/xkeyboard-config-2.27
 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
Will Dietz
962d49aec8
xorg.xorgserver: 1.20.4 -> 1.20.5 
https://lists.x.org/archives/xorg-announce/2019-May/002993.html
 2019-06-04 01:03:39 -05:00
Robin Gloster
4a246cea28
xorg.*: fix cross m4 handling 2019-05-07 18:14:12 +02: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
Will Dietz
16d5cb1b00 xcompmgr: 1.1.7 -> 1.1.8 
https://lists.x.org/archives/xorg-announce/2019-March/002989.html
 2019-03-24 21:37:28 -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
84fb329ec1 xorg.xf86video{ati,amdgpu}: 19.0.0 -> 19.0.1 
https://lists.x.org/archives/xorg-announce/2019-March/002986.html
https://lists.x.org/archives/xorg-announce/2019-March/002987.html
 2019-03-19 20:20:31 -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
Will Dietz
8d31888648 xorg: simplify overrides now handled automatically, GL -> libGL 2019-03-18 23:45:42 -05:00
Will Dietz
108ab954ed xorg: font utilities should be nativeBuildInputs 
They provide programs executed by the builder.
 2019-03-18 23:45:42 -05:00
Will Dietz
9e39ab6753 generate-expr-from-tarballs.pl: more detection, detect gettext usage 2019-03-18 23:45:42 -05:00
Will Dietz
29f4526a5a xorg: detect deps on libxkbfile from ${XKBMODULE} 2019-03-18 23:45:42 -05:00
Will Dietz
061f6562f0 xorg/default.nix: regen! 2019-03-18 23:45:42 -05:00
Will Dietz
c01c821f48 generate-exprs-from-tarballs.pl: support few more deps automatically 2019-03-18 23:31:01 -05:00
Will Dietz
79592e99a6 xorg/tarballs.list: +{xfd,xmore} -mkfontdir 2019-03-18 23:30:47 -05:00
Will Dietz
0e44d14dff xorg.mkfontdir: replace with mkfontscale, which now includes mkfontdir 
See:
https://lists.x.org/archives/xorg-announce/2019-March/002960.html
 2019-03-18 22:57:50 -05:00
Will Dietz
542908cc35 xorg: batch of updates, bump luit 
Announcements with details of changes
can be found on the mailing list,
and since IIRC these are all from
this month they all are listed here:

https://lists.x.org/archives/xorg-announce/2019-March/thread.html

-----

Grab luit from mirror because our fetcher's
default behavior doesn't get along with
invisible-island's FTP server apparently (?).

Or perhaps server is problematic, not sure.

Example URL:
ftp://ftp.invisible-island.net/luit/luit-20190106.tgz
* Using curl or wget:
  "Server denied you to change to the given directory"
  (or so)
* Using curl with `--ftp-mode nocwd`: success

curl's manpage suggests this is less-compliant behavior
used for speed, offering a third option that's more
likely to work but not quite as fast.
So it seems like the more compliant behavior is
rejected but the fast behavior is accepted.
Dunno, hopefully it'll be on a content-addressed
server soon enough so it doesn't matter as much :).

Hash used here matches manually-fetched from official URL
as well as from the mirror.
 2019-03-17 00:39:31 -05:00
xeji
e3357a1b5a
xorg.xload: fix build (#57665) 
add missing dependency gettext
 2019-03-15 16:45:10 +01:00
Vladimír Čunát
bf47162c26
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1508887
 2019-03-10 08:04:21 +01:00
Josef Kemetmüller
680e9f1d91 xorg.editres: fix build (#56979) 2019-03-07 23:01:46 +01:00
Josef Kemetmüller
22160302cf xorg.oclock: Fix build (#56978) 2019-03-07 22:59:06 +01:00
Frederik Rietdijk
5d7ab31949 Merge master into staging-next 2019-03-05 08:32:52 +01:00
Will Dietz
6e3582c9fd xinit: 1.4.0 -> 1.4.1 (#56800) 
https://lists.x.org/archives/xorg-announce/2019-March/002962.html
 2019-03-04 13:34:46 +01:00
Will Dietz
9809a541b2 xdm: 1.1.11 -> 1.1.12 (#56755) 
https://lists.x.org/archives/xorg-announce/2019-March/002959.html
 2019-03-04 13:09:29 +01:00
Vladimír Čunát
dfa45dfb86
Merge #56516: lndir: get rid of xorgproto dependency 
... into staging.
 2019-03-01 19:09:54 +01:00
Frederik Rietdijk
205e0fc5bd Merge staging-next into staging 2019-03-01 09:22:21 +01:00
Frederik Rietdijk
2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Jorge Acereda
466f1d85d2 lndir: get rid of xorgproto dependency 2019-03-01 00:09:37 +01:00
Will Dietz
c971e88fdc xorgserver: 1.20.3 -> 1.20.4 
https://lists.x.org/archives/xorg-announce/2019-February/002957.html
 2019-02-27 12:56:50 -06:00
Lengyel Balazs
dffba878e1 xorg/xstdcmap: init at 1.0.4 
(cherry picked from commit 6a316df988)
 2019-02-24 12:39:26 +01:00
Lengyel Balazs
ed508238be xorg/xfsinfo: init at 1.0.6 
(cherry picked from commit 4553b42de4)
 2019-02-24 12:38:21 +01:00
Will Dietz
e063f54568 xorg.xf86inputlibinput: remove (?!) override of source 
This is the wrong place for this and is outdated anyway,
so was forcing us to use this older version.
 2019-02-23 12:05:08 -06:00
Will Dietz
e961a40012 xorg: misc updates 
Announcements for each are on xorg-announce@,
see:
https://lists.x.org/archives/xorg-announce/2019-February/thread.html
 2019-02-23 12:01:47 -06:00
Lengyel Balazs
b6167a6e63 xorg/xf86-video-apm: init at 1.3.0 2019-02-18 23:24:47 +01:00