diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
| commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
| tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/servers/x11/xorg/tarballs.list | |
| parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
| parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
| download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip | |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/servers/x11/xorg/tarballs.list')
| -rw-r--r-- | nixpkgs/pkgs/servers/x11/xorg/tarballs.list | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list index 0f6ab40ed906..b24dc504288e 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list +++ b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list @@ -187,8 +187,8 @@ 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-6.0.0.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.4.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/libXfont2-2.0.5.tar.bz2 +mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2 @@ -217,5 +217,5 @@ mirror://xorg/individual/util/imake-1.0.8.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 -mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 +mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2 mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz |