about summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-10-16 00:03:09 +0000
committerGitHub <noreply@github.com>2023-10-16 00:03:09 +0000
commitae77d35744934bc6aa3591f39de8b492a0d5502e (patch)
treee976ed1d92b877b3f38f8e9ee49a107975b55923 /pkgs/servers/x11
parent208be569768b57da8f40a762554dfb729c204d05 (diff)
parent94c8c31bee161b6e64c3c99e8031f5532fa6a6d8 (diff)
downloadnixlib-ae77d35744934bc6aa3591f39de8b492a0d5502e.tar
nixlib-ae77d35744934bc6aa3591f39de8b492a0d5502e.tar.gz
nixlib-ae77d35744934bc6aa3591f39de8b492a0d5502e.tar.bz2
nixlib-ae77d35744934bc6aa3591f39de8b492a0d5502e.tar.lz
nixlib-ae77d35744934bc6aa3591f39de8b492a0d5502e.tar.xz
nixlib-ae77d35744934bc6aa3591f39de8b492a0d5502e.tar.zst
nixlib-ae77d35744934bc6aa3591f39de8b492a0d5502e.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r--pkgs/servers/x11/xorg/default.nix6
-rw-r--r--pkgs/servers/x11/xorg/tarballs.list2
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8b428f36c27e..b040545f5eb2 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -698,11 +698,11 @@ self: with self; {
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fonttosfnt = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation {
     pname = "fonttosfnt";
-    version = "1.2.2";
+    version = "1.2.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/app/fonttosfnt-1.2.2.tar.bz2";
-      sha256 = "0r1s43ypy0a9z6hzdq5y02s2acj965rax4flwdyylvc54ppv86qs";
+      url = "mirror://xorg/individual/app/fonttosfnt-1.2.3.tar.xz";
+      sha256 = "1bv1glfz4jqvkwx8hmv2vqilvxxl6jww3rvbzv6zbl6b83r96yma";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index d352de007a5b..a57cfd999b09 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -10,7 +10,7 @@ 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/bitmap-1.1.0.tar.xz
 mirror://xorg/individual/app/editres-1.0.8.tar.xz
-mirror://xorg/individual/app/fonttosfnt-1.2.2.tar.bz2
+mirror://xorg/individual/app/fonttosfnt-1.2.3.tar.xz
 mirror://xorg/individual/app/iceauth-1.0.9.tar.xz
 mirror://xorg/individual/app/ico-1.0.6.tar.xz
 mirror://xorg/individual/app/listres-1.0.5.tar.xz