Unverified Commit 88c78823 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #330963 from NickCao/xorg 

xorg.*: update
parents e8402fc5 1767a127

pkgs/servers/x11/xorg/default.nix

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

  appres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt, testers }: stdenv.mkDerivation (finalAttrs: {

    pname = "appres";

    version = "1.0.6";

    version = "1.0.7";

    builder = ./builder.sh;

    src = fetchurl {

      url = "mirror://xorg/individual/app/appres-1.0.6.tar.xz";

      sha256 = "02sr4f1bm3y1w24gsvjfzvbpac1kgkq27v1s68q87bd1l3i5f8lb";

      url = "mirror://xorg/individual/app/appres-1.0.7.tar.xz";

      sha256 = "17w17gqnfmpfmqgbjci1j4lnsd468k5yscxl3n6pmn4z4f4v250i";

    };

    hardeningDisable = [ "bindnow" "relro" ];

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

  xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: {

    pname = "xconsole";

    version = "1.0.8";

    version = "1.1.0";

    builder = ./builder.sh;

    src = fetchurl {

      url = "mirror://xorg/individual/app/xconsole-1.0.8.tar.xz";

      sha256 = "195vhqjrzjf4kkzmy0kx50n1bv2kj9fg7mi18mm2w3p4d3q6ljkv";

      url = "mirror://xorg/individual/app/xconsole-1.1.0.tar.xz";

      sha256 = "128i77kn5pfrcrw31p90cb97g8a5y5173admr3gpdnndr9w5jxqc";

    };

    hardeningDisable = [ "bindnow" "relro" ];

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

  xfs = callPackage ({ stdenv, pkg-config, fetchurl, libXfont2, xorgproto, xtrans, testers }: stdenv.mkDerivation (finalAttrs: {

    pname = "xfs";

    version = "1.2.1";

    version = "1.2.2";

    builder = ./builder.sh;

    src = fetchurl {

      url = "mirror://xorg/individual/app/xfs-1.2.1.tar.xz";

      sha256 = "1rn1l76z4l133491wb1klixbwb8az5cnrzwx37fb3vnpmplc72ix";

      url = "mirror://xorg/individual/app/xfs-1.2.2.tar.xz";

      sha256 = "1k4f15nrgmqkvsn48hnl1j4giwxpmcpdrnq0bq7b6hg265ix82xp";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    strictDeps = true;

pkgs/servers/x11/xorg/overrides.nix

+4 −1
Original line number Diff line number Diff line
@@ -45,7 +45,10 @@ self: super: 
      postInstallHooks+=(wrapWithXFileSearchPath)

  '')) {};



  appres = addMainProgram super.appres { };

  appres = super.appres.overrideAttrs (attrs: {

    nativeBuildInputs = attrs.nativeBuildInputs ++ [ meson ninja ];

    meta = attrs.meta // { mainProgram = "appres"; };

  });



  bdftopcf = super.bdftopcf.overrideAttrs (attrs: {

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

pkgs/servers/x11/xorg/tarballs.list

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz 
mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz

mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz

mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz

mirror://xorg/individual/app/appres-1.0.6.tar.xz

mirror://xorg/individual/app/appres-1.0.7.tar.xz

mirror://xorg/individual/app/bitmap-1.1.1.tar.xz

mirror://xorg/individual/app/editres-1.0.9.tar.xz

mirror://xorg/individual/app/fonttosfnt-1.2.3.tar.xz
@@ -28,7 +28,7 @@ mirror://xorg/individual/app/xcalc-1.1.2.tar.xz 
mirror://xorg/individual/app/xclock-1.1.1.tar.xz

mirror://xorg/individual/app/xcmsdb-1.0.6.tar.xz

mirror://xorg/individual/app/xcompmgr-1.1.9.tar.xz

mirror://xorg/individual/app/xconsole-1.0.8.tar.xz

mirror://xorg/individual/app/xconsole-1.1.0.tar.xz

mirror://xorg/individual/app/xcursorgen-1.0.8.tar.xz

mirror://xorg/individual/app/xdm-1.1.16.tar.xz

mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz
@@ -37,7 +37,7 @@ mirror://xorg/individual/app/xev-1.2.6.tar.xz 
mirror://xorg/individual/app/xeyes-1.3.0.tar.xz

mirror://xorg/individual/app/xfd-1.1.4.tar.xz

mirror://xorg/individual/app/xfontsel-1.1.1.tar.xz

mirror://xorg/individual/app/xfs-1.2.1.tar.xz

mirror://xorg/individual/app/xfs-1.2.2.tar.xz

mirror://xorg/individual/app/xfsinfo-1.0.7.tar.xz

mirror://xorg/individual/app/xgamma-1.0.7.tar.xz

mirror://xorg/individual/app/xgc-1.0.6.tar.xz