Unverified Commit abb9a152 authored by xeji's avatar xeji Committed by GitHub
Browse files

Merge pull request #56252 from dtzWill/update/xorg-misc-2019-02-23 

xorg: update misc packages, fix xf86inputlibinput to use proper version
parents 0aec9d4b e063f545

pkgs/servers/x11/xorg/default.nix

+24 −24
Original line number Diff line number Diff line
@@ -1106,11 +1106,11 @@ lib.makeScope newScope (self: with self; { 
  }) {};



  libfontenc = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, zlib }: stdenv.mkDerivation {

    name = "libfontenc-1.1.3";

    name = "libfontenc-1.1.4";

    builder = ./builder.sh;

    src = fetchurl {

      url = mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2;

      sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h";

      url = mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2;

      sha256 = "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    nativeBuildInputs = [ pkgconfig ];
@@ -1535,11 +1535,11 @@ lib.makeScope newScope (self: with self; { 
  }) {};



  xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation {

    name = "xclock-1.0.7";

    name = "xclock-1.0.8";

    builder = ./builder.sh;

    src = fetchurl {

      url = mirror://xorg/individual/app/xclock-1.0.7.tar.bz2;

      sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3";

      url = mirror://xorg/individual/app/xclock-1.0.8.tar.bz2;

      sha256 = "0m92zhamh15my9f2rqa14q41d6k2cn468azm3g7g3w9n7942024k";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    nativeBuildInputs = [ pkgconfig ];
@@ -1652,11 +1652,11 @@ lib.makeScope newScope (self: with self; { 
  }) {};



  xev = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation {

    name = "xev-1.2.2";

    name = "xev-1.2.3";

    builder = ./builder.sh;

    src = fetchurl {

      url = mirror://xorg/individual/app/xev-1.2.2.tar.bz2;

      sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr";

      url = mirror://xorg/individual/app/xev-1.2.3.tar.bz2;

      sha256 = "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    nativeBuildInputs = [ pkgconfig ];
@@ -2406,11 +2406,11 @@ lib.makeScope newScope (self: with self; { 
  }) {};



  xhost = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation {

    name = "xhost-1.0.7";

    name = "xhost-1.0.8";

    builder = ./builder.sh;

    src = fetchurl {

      url = mirror://xorg/individual/app/xhost-1.0.7.tar.bz2;

      sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk";

      url = mirror://xorg/individual/app/xhost-1.0.8.tar.bz2;

      sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    nativeBuildInputs = [ pkgconfig ];
@@ -2536,11 +2536,11 @@ lib.makeScope newScope (self: with self; { 
  }) {};



  xlsatoms = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation {

    name = "xlsatoms-1.1.2";

    name = "xlsatoms-1.1.3";

    builder = ./builder.sh;

    src = fetchurl {

      url = mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2;

      sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7";

      url = mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2;

      sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    nativeBuildInputs = [ pkgconfig ];
@@ -2601,11 +2601,11 @@ lib.makeScope newScope (self: with self; { 
  }) {};



  xmodmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {

    name = "xmodmap-1.0.9";

    name = "xmodmap-1.0.10";

    builder = ./builder.sh;

    src = fetchurl {

      url = mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2;

      sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p";

      url = mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2;

      sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    nativeBuildInputs = [ pkgconfig ];
@@ -2718,11 +2718,11 @@ lib.makeScope newScope (self: with self; { 
  }) {};



  xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation {

    name = "xrdb-1.1.1";

    name = "xrdb-1.2.0";

    builder = ./builder.sh;

    src = fetchurl {

      url = mirror://xorg/individual/app/xrdb-1.1.1.tar.bz2;

      sha256 = "1dqp486nd5sagbg572kl0k839nwvpqnb7jvppyb7jj5vrpkss8rd";

      url = mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2;

      sha256 = "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    nativeBuildInputs = [ pkgconfig ];
@@ -2809,11 +2809,11 @@ lib.makeScope newScope (self: with self; { 
  }) {};



  xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation {

    name = "xvinfo-1.1.3";

    name = "xvinfo-1.1.4";

    builder = ./builder.sh;

    src = fetchurl {

      url = mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2;

      sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz";

      url = mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2;

      sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    nativeBuildInputs = [ pkgconfig ];

pkgs/servers/x11/xorg/overrides.nix

+0 −5
Original line number Diff line number Diff line
@@ -342,11 +342,6 @@ self: super: 
  });



  xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: rec {

    name = "xf86-input-libinput-0.28.0";

    src = fetchurl {

      url = "mirror://xorg/individual/driver/${name}.tar.bz2";

      sha256 = "189h8vl0005yizwrs4d0sng6j8lwkd3xi1zwqg8qavn2bw34v691";

    };

    outputs = [ "out" "dev" ];

    buildInputs = attrs.buildInputs ++ [ libinput ];

    installFlags = "sdkdir=\${dev}/include/xorg";

pkgs/servers/x11/xorg/tarballs.list

+8 −8
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 
mirror://xorg/individual/app/xauth-1.0.10.tar.bz2

mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2

mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2

mirror://xorg/individual/app/xclock-1.0.7.tar.bz2

mirror://xorg/individual/app/xclock-1.0.8.tar.bz2

mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2

mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2

mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2
@@ -38,13 +38,13 @@ mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2 
mirror://xorg/individual/app/xdm-1.1.11.tar.bz2

mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2

mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2

mirror://xorg/individual/app/xev-1.2.2.tar.bz2

mirror://xorg/individual/app/xev-1.2.3.tar.bz2

mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2

mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2

mirror://xorg/individual/app/xfs-1.2.0.tar.bz2

mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2

mirror://xorg/individual/app/xgc-1.0.5.tar.bz2

mirror://xorg/individual/app/xhost-1.0.7.tar.bz2

mirror://xorg/individual/app/xhost-1.0.8.tar.bz2

mirror://xorg/individual/app/xinit-1.4.0.tar.bz2

mirror://xorg/individual/app/xinput-1.6.2.tar.bz2

mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2
@@ -53,22 +53,22 @@ mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2 
mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2

mirror://xorg/individual/app/xkill-1.0.5.tar.bz2

mirror://xorg/individual/app/xload-1.1.3.tar.bz2

mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2

mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2

mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2

mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2

mirror://xorg/individual/app/xmag-1.0.6.tar.bz2

mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2

mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2

mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2

mirror://xorg/individual/app/xpr-1.0.5.tar.bz2

mirror://xorg/individual/app/xprop-1.2.3.tar.bz2

mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2

mirror://xorg/individual/app/xrdb-1.1.1.tar.bz2

mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2

mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2

mirror://xorg/individual/app/xset-1.2.4.tar.bz2

mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2

mirror://xorg/individual/app/xsm-1.0.4.tar.bz2

mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2

mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2

mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2

mirror://xorg/individual/app/xwd-1.0.7.tar.bz2

mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2

mirror://xorg/individual/app/xwud-1.0.5.tar.bz2
@@ -168,7 +168,7 @@ mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2 
mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2

mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2

mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2

mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2

mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2

mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2

mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2

mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2