diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-27 00:02:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-27 00:02:55 +0000 |
| commit | 637a1f98b5589b41533783a54dcfb8142608d32d (patch) | |
| tree | cc926cf8b3c25a0ca4caa6cc9d15b4d7c95647c3 /pkgs/servers/x11/xorg | |
| parent | c103c51dd64671fe3845b0b426515f14ec36d334 (diff) | |
| parent | 2a8fae3ee59a38a31dfe388bd873772f47e00a5b (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/x11/xorg')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 66877cbaef60e..99928c18335de 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3372,11 +3372,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xprop = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { pname = "xprop"; - version = "1.2.5"; + version = "1.2.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xprop-1.2.5.tar.bz2"; - sha256 = "18ckr8g1z50zkc01hprkpm1npwbq32yqib4b3l98c95z2q1yv4lv"; + url = "mirror://xorg/individual/app/xprop-1.2.6.tar.xz"; + sha256 = "0vjqnn42gscw1z2wdj24kdwjwvd7mw58pj0nm9203k1fn4jqa2sq"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 0c936e623055d..493e253b8529a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -60,7 +60,7 @@ mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2 mirror://xorg/individual/app/xmore-1.0.3.tar.bz2 mirror://xorg/individual/app/xpr-1.0.5.tar.bz2 -mirror://xorg/individual/app/xprop-1.2.5.tar.bz2 +mirror://xorg/individual/app/xprop-1.2.6.tar.xz mirror://xorg/individual/app/xrandr-1.5.1.tar.xz mirror://xorg/individual/app/xrdb-1.2.1.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2 |