diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-10-15 22:31:27 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-10-15 22:31:34 +0200 |
| commit | 94c8c31bee161b6e64c3c99e8031f5532fa6a6d8 (patch) | |
| tree | ed7f794f9c0f69a3cfc780e77118a6cdaf4e5560 /pkgs/servers/x11 | |
| parent | 1d9483230a9d2d9ed8e9167cdb0f982fedc60e86 (diff) | |
| parent | b78c85fff7fd91c1d326b4a07979e151b5a10411 (diff) | |
| download | nixlib-94c8c31bee161b6e64c3c99e8031f5532fa6a6d8.tar nixlib-94c8c31bee161b6e64c3c99e8031f5532fa6a6d8.tar.gz nixlib-94c8c31bee161b6e64c3c99e8031f5532fa6a6d8.tar.bz2 nixlib-94c8c31bee161b6e64c3c99e8031f5532fa6a6d8.tar.lz nixlib-94c8c31bee161b6e64c3c99e8031f5532fa6a6d8.tar.xz nixlib-94c8c31bee161b6e64c3c99e8031f5532fa6a6d8.tar.zst nixlib-94c8c31bee161b6e64c3c99e8031f5532fa6a6d8.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/numba/default.nix
Diffstat (limited to 'pkgs/servers/x11')
| -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 b81b043a3aa1..af179e4ffaec 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 a10e6b203107..e7c93e10bacb 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 |