Unverified Commit 931c3e19 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #263725: xorg: luit, xf86-video-ati: update 

...into staging-next
parents 81ed2302 b1e2a2c2

pkgs/servers/x11/xorg/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -1919,11 +1919,11 @@ self: with self; { 
  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  luit = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: {

    pname = "luit";

    version = "20190106";

    version = "20230201";

    builder = ./builder.sh;

    src = fetchurl {

      url = "https://invisible-mirror.net/archives/luit/luit-20190106.tgz";

      sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b";

      url = "https://invisible-mirror.net/archives/luit/luit-20230201.tgz";

      sha256 = "0vy5fqp26pnrdn0hmgnmar6m2y06syrz188jqh03vqkyphfqsapf";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    strictDeps = true;
@@ -2859,11 +2859,11 @@ self: with self; { 
  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: {

    pname = "xf86-video-ati";

    version = "5eba006e4129e8015b822f9e1d2f1e613e252cda";

    version = "22.0.0";

    builder = ./builder.sh;

    src = fetchurl {

      url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/archive/5eba006e4129e8015b822f9e1d2f1e613e252cda/xf86-video-ati-5eba006e4129e8015b822f9e1d2f1e613e252cda.tar.bz2";

      sha256 = "0gmymk8207fd9rjliq05l2gvx220h432rj3h75hv2ylr3k9vmp2b";

      url = "mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz";

      sha256 = "0vdznwx78alhbb05paw2xd65hcsila2kqflwwnbpq8pnsdbbpj68";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    strictDeps = true;

pkgs/servers/x11/xorg/overrides.nix

+0 −6
Original line number Diff line number Diff line
@@ -573,12 +573,6 @@ self: super: 
  xf86videoati = super.xf86videoati.overrideAttrs (attrs: {

    nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ];

    buildInputs =  attrs.buildInputs ++ [ xorg.utilmacros ];

    patches = [

      (fetchpatch {

        url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/e0511968d04b42abf11bc0ffb387f143582bc144.patch";

        sha256 = "sha256-79nqKuJRgMYXDEMB8IWxdmbxtI/m+Oca1wSLYeGMuEk=";

      })

    ];

  });



  xf86videonouveau = super.xf86videonouveau.overrideAttrs (attrs: {

pkgs/servers/x11/xorg/tarballs.list

+2 −2
Original line number Diff line number Diff line 
https://invisible-mirror.net/archives/luit/luit-20190106.tgz

https://invisible-mirror.net/archives/luit/luit-20230201.tgz

mirror://xorg/individual/xcb/libpthread-stubs-0.5.tar.xz

mirror://xorg/individual/xcb/xcb-util-0.4.1.tar.xz

mirror://xorg/individual/xcb/xcb-util-cursor-0.1.4.tar.xz
@@ -89,7 +89,7 @@ mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz 
mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2

mirror://xorg/individual/driver/xf86-video-ark-0.7.6.tar.xz

mirror://xorg/individual/driver/xf86-video-ast-1.1.6.tar.xz

https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/archive/5eba006e4129e8015b822f9e1d2f1e613e252cda/xf86-video-ati-5eba006e4129e8015b822f9e1d2f1e613e252cda.tar.bz2

mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz

mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2

mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz

mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz