diff options
author | Will Dietz <w@wdtz.org> | 2019-10-07 18:01:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-07 18:01:15 -0500 |
commit | 917200c7287c2c5bae3eeef18d2c6208743e1388 (patch) | |
tree | e9372239a5619e95db7c12f13310427fed9e56c4 | |
parent | f7dfe59ced1c85b639143eb623f68ae0f659d2b9 (diff) | |
parent | c63dba2025280215767773b2aac94d93427f086e (diff) | |
download | nixpkgs-917200c7287c2c5bae3eeef18d2c6208743e1388.tar nixpkgs-917200c7287c2c5bae3eeef18d2c6208743e1388.tar.gz nixpkgs-917200c7287c2c5bae3eeef18d2c6208743e1388.tar.bz2 nixpkgs-917200c7287c2c5bae3eeef18d2c6208743e1388.tar.lz nixpkgs-917200c7287c2c5bae3eeef18d2c6208743e1388.tar.xz nixpkgs-917200c7287c2c5bae3eeef18d2c6208743e1388.tar.zst nixpkgs-917200c7287c2c5bae3eeef18d2c6208743e1388.zip |
Merge pull request #68912 from dtzWill/update/libxfont2-2.0.4
xorg.libXfont2: 2.0.3 -> 2.0.4
-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 e752f3ad834..ba203f57e48 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 ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 05b035197c1..ed6b38c7dfc 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -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 |