github-actions[bot]
6e4d2d1f10
Merge master into staging-next
2021-11-10 00:01:31 +00:00
Thiago Franco de Moraes
a6cf43d820
xwayland: 21.1.2 -> 21.1.3
2021-11-09 17:32:55 -03:00
Sandro
e6e53f66dc
Merge pull request #141086 from TredwellGit/xorg.xf86inputlibinput
2021-10-27 20:34:08 +02:00
Sandro
a583a5b6db
Merge pull request #140475 from TredwellGit/xorg.libXi
2021-10-27 20:33:09 +02:00
github-actions[bot]
ba32b28e59
Merge master into staging-next
2021-10-20 18:01:18 +00:00
Julien Moutinho
6e46232ca2
xorg.xinit: fix cross-compiling
2021-10-20 18:33:17 +02:00
github-actions[bot]
aac35c22db
Merge staging-next into staging
2021-10-10 18:01:41 +00:00
Sergei Trofimovich
fc6631d3e7
xorg.xev: 1.2.3 -> 1.2.4
2021-10-10 10:32:50 +01:00
TredwellGit
ed148c2890
xorg.xf86inputlibinput: 1.1.0 -> 1.2.0
...
https://lists.x.org/archives/xorg-announce/2021-September/003110.html
2021-10-09 09:34:20 +00:00
TredwellGit
3251722dcd
xorg.libXi: 1.7.10 -> 1.8
...
https://lists.x.org/archives/xorg-announce/2021-September/003109.html
2021-10-04 11:42:18 +00:00
TredwellGit
3e1d4f321e
xorg.xorgproto: 2021.4 -> 2021.5
...
https://lists.x.org/archives/xorg-announce/2021-September/003108.html
2021-09-19 08:18:40 +00:00
github-actions[bot]
a21275cdae
Merge master into staging-next
2021-09-17 18:01:14 +00:00
oxalica
6076184227
xorg.xf86*: fix include dir
...
`installFlags` do not work since .pc files are generated during
configure phase. We need to override them with configure flags.
2021-09-16 00:42:24 +08:00
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