Commit Graph

1295 Commits

Author SHA1 Message Date
Vladimír Čunát
cb64b504a0
xorg.xf86videoati: drop overrides
I realized that after dropping all patches in b1e2a2c292
there's no need for this.
2023-10-28 08:21:23 +02:00
Vladimír Čunát
931c3e19ab
Merge #263725: xorg: luit, xf86-video-ati: update
...into staging-next
2023-10-28 08:13:33 +02:00
github-actions[bot]
4a5044c558
Merge master into staging-next 2023-10-27 12:01:12 +00:00
Siddhartha
b1e2a2c292 xf86-video-ati: unstable -> 22.0.0 2023-10-27 02:40:09 -04:00
Siddhartha
74b1625f42 luit: 20190106 -> 20230201 2023-10-27 02:40:09 -04:00
Siddhartha
7f6947092b xorg-server: 21.1.8 -> 21.1.9 2023-10-27 02:25:48 -04:00
github-actions[bot]
08be9a9577
Merge master into staging-next 2023-10-26 12:01:25 +00:00
Sergei Trofimovich
e22bb8a480 xwayland: 23.2.1 -> 23.2.2
Changes: https://lists.x.org/archives/xorg/2023-October/061514.html
2023-10-25 10:05:12 +01:00
github-actions[bot]
07245b90f3
Merge staging-next into staging 2023-10-18 00:02:49 +00:00
github-actions[bot]
35eee590be
Merge master into staging-next 2023-10-18 00:02:17 +00:00
John Ericson
9cb51cf21d xorg: Add meta.pkgConfigModules and test 2023-10-16 15:49:55 -04:00
Mario Rodas
b4c4fd5f96
Merge pull request #259562 from trofi/xkeyboard_config-update
xkeyboard_config: 2.39 -> 2.40
2023-10-16 08:29:16 -05:00
github-actions[bot]
ae77d35744
Merge staging-next into staging 2023-10-16 00:03:09 +00:00
Martin Weinelt
94c8c31bee
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/numba/default.nix
2023-10-15 22:31:34 +02:00
Artturi
c8c160f107
Merge pull request #258423 from trofi/xorg.fonttosfnt-update 2023-10-15 07:12:19 +03:00
Artturi
2b1084857d
Merge pull request #259845 from trofi/xorg.libXrandr-update 2023-10-15 07:11:59 +03:00
Nick Cao
974a98aaa1
xorg.libXpm: 3.5.16 -> 3.5.17
(cherry picked from commit 6a935b14c1)
(to get the security fix earlier)
2023-10-13 09:45:24 +02:00
Nick Cao
d2b483212d
xorg.libX11: 1.8.6 -> 1.8.7
(cherry picked from commit efdba2d7be)
(to get the security fix earlier)
2023-10-13 09:44:59 +02:00
Sergei Trofimovich
f9c6b6f43a xorg.libXrandr: 1.5.3 -> 1.5.4
Changes: https://www.mail-archive.com/xorg-announce@lists.x.org/msg01636.html
2023-10-08 22:09:37 +01:00
Sergei Trofimovich
6765f08294 xkeyboard_config: 2.39 -> 2.40
Changes: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/compare/xkeyboard-config-2.39...xkeyboard-config-2.40?from_project_id=891&straight=false
2023-10-07 11:31:20 +01:00
Maximilian Bosch
8bc5104a6e
treewide: refactor .attrs.sh detection
When specifying the `builder` attribute in `stdenv.mkDerivation`, this
will be effectively transformed into

    builtins.derivation {
      builder = stdenv.shell;
      args = [ "-e" builder ];
    }

This also means that `default-builder.sh` is never sourced and as a
result it's not guaranteed that `$NIX_ATTRS_SH_FILE` is set to a correct
location[1].

Also, we need to source `.attrs.sh` to source `$stdenv`. So, the
following is done now:

* If `$NIX_ATTRS_SH_FILE` points to a correct location, then use it.
  Directly using `.attrs.sh` is problematic for `nix-shell(1)` usage
  (see previous commit for more context), so prefer the environment
  variable if possible.

* Otherwise, if `.attrs.sh` exists, then use it. See [1] for when this
  can happen.

* If neither applies, it can be assumed that `__structuredAttrs` is
  turned off and thus nothing needs to be done.

[1] It's possible that it doesn't exist at all - in case of Nix 2.3 or
    it can point to a wrong location on older Nix versions with a bug in
    `__structuredAttrs`.
2023-10-04 18:36:57 +02:00
Nick Cao
31a4c3f2e2
Merge pull request #258841 from NickCao/x11-security
xorg.libX11: 1.8.6 -> 1.8.7, xorg.libXpm: 3.5.16 -> 3.5.17
2023-10-04 09:24:16 -04:00
github-actions[bot]
0f2514516b
Merge master into staging-next 2023-10-04 06:00:56 +00:00
Artturi
d1c9180c6d
Merge pull request #258425 from NickCao/xf86videosiliconmotion 2023-10-04 05:19:08 +03:00
Martin Weinelt
e29e5077fc
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/podcastparser/default.nix
2023-10-03 21:13:27 +02:00
Nick Cao
6a935b14c1
xorg.libXpm: 3.5.16 -> 3.5.17 2023-10-03 13:43:11 -04:00
Nick Cao
efdba2d7be
xorg.libX11: 1.8.6 -> 1.8.7 2023-10-03 13:42:15 -04:00
Alyssa Ross
b369092b3b xorg.libxcvt.meta.homepage: init 2023-10-03 12:05:52 +00:00
Alyssa Ross
d8469ef08c pkgsStatic.xorg.libxcvt: mark unsupported
Uses shared_library in Meson.
2023-10-03 12:05:52 +00:00
Nick Cao
6eb49b7201
xorg.xf86videosiliconmotion: 1.7.9 -> 1.7.10 2023-10-01 11:32:39 -04:00
Sergei Trofimovich
bfe7106506 xorg.fonttosfnt: 1.2.2 -> 1.2.3
Changes: https://www.spinics.net/lists/xorg/msg61060.html
2023-10-01 16:18:00 +01:00
Alyssa Ross
d4a1009f5a
Merge remote-tracking branch 'origin/master' into staging-next 2023-10-01 13:53:00 +00:00
K900
c018561f54 nixos/amdgpu-pro: remove nixpkgs.config usage
A new X.org ABI is exceptionally unlikely at this point, and we can
add an assertion if it ever happens.
2023-09-26 18:02:00 +03:00
github-actions[bot]
035c6df194
Merge staging-next into staging 2023-09-24 00:03:26 +00:00
Sergei Trofimovich
de359db4b9 xwayland: added withLibunwind to guard libunwind dependency 2023-09-23 16:43:51 -03:00
Sergei Trofimovich
0966f1d593 xwayland: 23.2.0 -> 23.2.1
While at it added trivial updater.

Changes: https://www.spinics.net/lists/xorg/msg61058.html
2023-09-23 16:43:51 -03:00
Nick Cao
4c24a3a4f0
Merge pull request #254448 from NickCao/x11
xorg.*: update to latest version
2023-09-19 10:08:14 -04:00
Nick Cao
909ecad386
xorg.xcbproto: 1.15.2 -> 1.16.0 2023-09-14 11:11:22 -04:00
Nick Cao
83714adfd5
xorg.libxcb: 1.15 -> 1.16 2023-09-14 11:11:21 -04:00
Nick Cao
cd0e3964e8
xorg.fontutil: 1.4.0 -> 1.4.1 2023-09-14 11:11:20 -04:00
Nick Cao
0cc3376650
xorg.xf86inputlibinput: 1.3.0 -> 1.4.0 2023-09-14 11:11:19 -04:00
Nick Cao
69e3784e03
xorg.libpthreadstubs: 0.4 -> 0.5 2023-09-14 11:11:18 -04:00
arcnmx
6be969daf1 xorg: add meta.mainProgram to various utilities
See #246386
2023-09-11 10:00:22 -07:00
github-actions[bot]
2296693f8e
Merge staging-next into staging 2023-08-29 18:01:29 +00:00
Luiz Ferraz
dfd1342013
xorg.xrandr: Add mainProgram metadata
Fix warning described in https://github.com/NixOS/nixpkgs/issues/249169
2023-08-29 10:23:34 -03:00
Artturin
6ea1c15e35 xorg.libpthreadstubs: add windows to platforms 2023-08-28 01:57:38 +03:00
Artturin
13dd91e301 xorg.libxcb: fix mingw cross
`pkgsCross.mingwW64.xorg.libxcb`
2023-08-27 22:25:49 +03:00
Artturin
783e4dcba8 xorg.xorgproto: Fix windows cross
`pkgsCross.mingwW64.xorg.xorgproto`

https://aur.archlinux.org/packages/mingw-w64-xorgproto
2023-08-27 22:25:48 +03:00
K900
a1cf878699 xwayland: 23.1.2 -> 23.2.0 2023-08-16 13:51:59 +03:00
maralorn
de7882fd41
xorg.libXtst: add meta.pkgConfigModules annotation 2023-08-08 16:00:38 +02:00