diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-10-12 00:51:55 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-12 00:51:55 +0200 |
commit | e2e3861d6b57a53fd7774a7c31d0295bbd256930 (patch) | |
tree | f0f8fb922a439ae239d522ac79bd40d80efd234f /pkgs/servers/x11 | |
parent | a7c52c451e541514fe324bec2916758c031d3af8 (diff) | |
parent | 6c8aed6391a5e9f69cb59792aed58c5f33650275 (diff) | |
download | nixpkgs-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar nixpkgs-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.gz nixpkgs-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.bz2 nixpkgs-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.lz nixpkgs-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.xz nixpkgs-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.zst nixpkgs-e2e3861d6b57a53fd7774a7c31d0295bbd256930.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 12 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 87a8cfcd38e..8ad6867a890 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -872,11 +872,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXfont2 = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { - name = "libXfont2-2.0.3"; + name = "libXfont2-2.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2; - sha256 = "0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf"; + url = mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2; + sha256 = "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1288,11 +1288,11 @@ lib.makeScope newScope (self: with self; { }) {}; setxkbmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { - name = "setxkbmap-1.3.1"; + name = "setxkbmap-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2; - sha256 = "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9"; + url = mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2; + sha256 = "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 4dc96ddd91b..e6a94daee10 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -375,6 +375,8 @@ self: super: xf86videoglide = super.xf86videoglide.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videoi128 = super.xf86videoi128.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videonewport = super.xf86videonewport.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); + xf86videos3virge = super.xf86videos3virge.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); + xf86videosavage = super.xf86videosavage.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videotga = super.xf86videotga.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videov4l = super.xf86videov4l.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videovoodoo = super.xf86videovoodoo.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 1eab19bdf37..9f4621316fc 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -20,7 +20,7 @@ mirror://xorg/individual/app/listres-1.0.4.tar.bz2 mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2 mirror://xorg/individual/app/oclock-1.0.4.tar.bz2 mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2 -mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 +mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 mirror://xorg/individual/app/transset-1.0.2.tar.bz2 mirror://xorg/individual/app/twm-1.0.10.tar.bz2 @@ -188,7 +188,7 @@ mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 -mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2 +mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 |