From 2dc1d4e9370144e4ef8ec84c33f05bea98feb452 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 30 Aug 2025 19:17:47 +0200 Subject: [PATCH 1/7] font-schumacher-misc: refactor, move to pkgs/by-name and rename from xorg.fontschumachermisc the package output doesn't change --- .../fo/font-schumacher-misc/package.nix | 51 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 43 +--------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/tarballs.list | 1 - 4 files changed, 55 insertions(+), 42 deletions(-) create mode 100644 pkgs/by-name/fo/font-schumacher-misc/package.nix diff --git a/pkgs/by-name/fo/font-schumacher-misc/package.nix b/pkgs/by-name/fo/font-schumacher-misc/package.nix new file mode 100644 index 000000000000..3b1534196914 --- /dev/null +++ b/pkgs/by-name/fo/font-schumacher-misc/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + font-util, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-schumacher-misc"; + version = "1.1.3"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-schumacher-misc-${finalAttrs.version}.tar.xz"; + hash = "sha256-i4SfDNseVaNMw92LD7N0Q/q7wiTVukQIVWlYEkSmgHA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + bdftopcf + font-util + mkfontscale + ]; + + buildInputs = [ font-util ]; + + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/font/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Schumacher pcf fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/schumacher-misc"; + license = lib.licenses.hpnd; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c03863a205d9..6869bec8e643 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -12,6 +12,7 @@ font-bh-type1, font-encodings, font-mutt-misc, + font-schumacher-misc, font-util, gccmakedep, ico, @@ -141,6 +142,7 @@ self: with self; { fontbhttf = font-bh-ttf; fontbhtype1 = font-bh-type1; fontmuttmisc = font-mutt-misc; + fontschumachermisc = font-schumacher-misc; fontutil = font-util; libAppleWM = libapplewm; libFS = libfs; @@ -1147,47 +1149,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontschumachermisc = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-schumacher-misc"; - version = "1.1.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz"; - sha256 = "0w40lr214n39al449fnm4k1bpyj3fjrhz2yxqd6a6m8yvc69z14b"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - bdftopcf - fontutil - mkfontscale - ]; - buildInputs = [ fontutil ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! fontscreencyrillic = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9975b4053e15..c088655e40b8 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -328,6 +328,7 @@ print OUT < Date: Sat, 30 Aug 2025 21:39:40 +0200 Subject: [PATCH 2/7] font-screen-cyrillic: refactor, move to pkgs/by-name and rename from xorg.fontscreencyrillic relevant changes: - remove some unneeded deps and configureFlags the package output doesn't change --- .../fo/font-screen-cyrillic/package.nix | 45 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 42 +---------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/tarballs.list | 1 - 4 files changed, 49 insertions(+), 41 deletions(-) create mode 100644 pkgs/by-name/fo/font-screen-cyrillic/package.nix diff --git a/pkgs/by-name/fo/font-screen-cyrillic/package.nix b/pkgs/by-name/fo/font-screen-cyrillic/package.nix new file mode 100644 index 000000000000..217fab306ea7 --- /dev/null +++ b/pkgs/by-name/fo/font-screen-cyrillic/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchurl, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-screen-cyrillic"; + version = "1.0.5"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-screen-cyrillic-${finalAttrs.version}.tar.xz"; + hash = "sha256-j3WLuM1YDH5lVIfR0Ntp0xmsrlTZMrKV2W2dm4P95cA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + bdftopcf + mkfontscale + ]; + + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/font/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Screen Cyrillic pcf font"; + homepage = "https://gitlab.freedesktop.org/xorg/font/screen-cyrillic"; + license = lib.licenses.cronyx; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6869bec8e643..30afa97e5cbf 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -13,6 +13,7 @@ font-encodings, font-mutt-misc, font-schumacher-misc, + font-screen-cyrillic, font-util, gccmakedep, ico, @@ -143,6 +144,7 @@ self: with self; { fontbhtype1 = font-bh-type1; fontmuttmisc = font-mutt-misc; fontschumachermisc = font-schumacher-misc; + fontscreencyrillic = font-screen-cyrillic; fontutil = font-util; libAppleWM = libapplewm; libFS = libfs; @@ -1149,46 +1151,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontscreencyrillic = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-screen-cyrillic"; - version = "1.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz"; - sha256 = "1h75zn1rp7bdv6av4cnrajpaq6fkd7dx1lc7aijpw32qrnw8nxcg"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - bdftopcf - mkfontscale - ]; - buildInputs = [ fontutil ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! fontsonymisc = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index c088655e40b8..a74215ae9d09 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -329,6 +329,7 @@ print OUT < Date: Sat, 30 Aug 2025 21:46:47 +0200 Subject: [PATCH 3/7] font-sony-misc: refactor, move to pkgs/by-name and rename from xorg.fontsonymisc relevant changes: - remove some unneeded deps and configureFlags the package output doesn't change --- pkgs/by-name/fo/font-sony-misc/package.nix | 45 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 42 +---------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/tarballs.list | 1 - 4 files changed, 49 insertions(+), 41 deletions(-) create mode 100644 pkgs/by-name/fo/font-sony-misc/package.nix diff --git a/pkgs/by-name/fo/font-sony-misc/package.nix b/pkgs/by-name/fo/font-sony-misc/package.nix new file mode 100644 index 000000000000..6c9341b855bf --- /dev/null +++ b/pkgs/by-name/fo/font-sony-misc/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchurl, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-sony-misc"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-sony-misc-${finalAttrs.version}.tar.xz"; + hash = "sha256-5rCfgj/MsG4L0LIGIoO2UUFTMjvYp0hunC4/VauElGs="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + bdftopcf + mkfontscale + ]; + + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/font/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Sony pcf fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/sony-misc"; + license = lib.licenses.hpnd; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 30afa97e5cbf..1a72d2cf32ad 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -14,6 +14,7 @@ font-mutt-misc, font-schumacher-misc, font-screen-cyrillic, + font-sony-misc, font-util, gccmakedep, ico, @@ -145,6 +146,7 @@ self: with self; { fontmuttmisc = font-mutt-misc; fontschumachermisc = font-schumacher-misc; fontscreencyrillic = font-screen-cyrillic; + fontsonymisc = font-sony-misc; fontutil = font-util; libAppleWM = libapplewm; libFS = libfs; @@ -1151,46 +1153,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontsonymisc = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-sony-misc"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz"; - sha256 = "0swlhjmmagrfkip4i9yq7cr56hains1j41mjs05nxc6c7y19zc76"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - bdftopcf - mkfontscale - ]; - buildInputs = [ fontutil ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! fontsunmisc = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index a74215ae9d09..c7db8fda7f05 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -330,6 +330,7 @@ print OUT < Date: Sat, 30 Aug 2025 21:52:08 +0200 Subject: [PATCH 4/7] font-sun-misc: refactor, move to pkgs/by-name and rename from xorg.fontsunmisc relevant changes: - remove some unneeded deps and configureFlags the package output doesn't change --- pkgs/by-name/fo/font-sun-misc/package.nix | 45 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 42 +---------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/tarballs.list | 1 - 4 files changed, 49 insertions(+), 41 deletions(-) create mode 100644 pkgs/by-name/fo/font-sun-misc/package.nix diff --git a/pkgs/by-name/fo/font-sun-misc/package.nix b/pkgs/by-name/fo/font-sun-misc/package.nix new file mode 100644 index 000000000000..25d701a489b0 --- /dev/null +++ b/pkgs/by-name/fo/font-sun-misc/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchurl, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-sun-misc"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-sun-misc-${finalAttrs.version}.tar.xz"; + hash = "sha256-3YTdEW2Sev+k+g+ilyez7PwPBkI4gXwKHlUqCsOE258="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + bdftopcf + mkfontscale + ]; + + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/font/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Open Look Glyph and Cursor pcf fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/sun-misc/"; + license = lib.licenses.mit; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1a72d2cf32ad..1166089e31a0 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -15,6 +15,7 @@ font-schumacher-misc, font-screen-cyrillic, font-sony-misc, + font-sun-misc, font-util, gccmakedep, ico, @@ -147,6 +148,7 @@ self: with self; { fontschumachermisc = font-schumacher-misc; fontscreencyrillic = font-screen-cyrillic; fontsonymisc = font-sony-misc; + fontsunmisc = font-sun-misc; fontutil = font-util; libAppleWM = libapplewm; libFS = libfs; @@ -1153,46 +1155,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontsunmisc = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-sun-misc"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz"; - sha256 = "17yvhk1hlajm3q57r09q8830zz7cnckrg8hgzajgyyljdl8xv16x"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - bdftopcf - mkfontscale - ]; - buildInputs = [ fontutil ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! fonttosfnt = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index c7db8fda7f05..20a0aecdc9ab 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -331,6 +331,7 @@ print OUT < Date: Sat, 30 Aug 2025 21:59:00 +0200 Subject: [PATCH 5/7] font-winitzki-cyrillic: refactor, move to pkgs/by-name and rename from xorg.fontwinitzkicyrillic relevant changes: - remove some unneeded deps and configureFlags the package output doesn't change --- .../fo/font-winitzki-cyrillic/package.nix | 45 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 42 +---------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/tarballs.list | 1 - 4 files changed, 49 insertions(+), 41 deletions(-) create mode 100644 pkgs/by-name/fo/font-winitzki-cyrillic/package.nix diff --git a/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix b/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix new file mode 100644 index 000000000000..65a6b6e97d5f --- /dev/null +++ b/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchurl, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-winitzki-cyrillic"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-winitzki-cyrillic-${finalAttrs.version}.tar.xz"; + hash = "sha256-O22CEi3BR3bjr82HeDOng04fkAxT/Bx7stZ8eBz6l6g="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + bdftopcf + mkfontscale + ]; + + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/font/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Winitzki Proof Cyrillic pcf font"; + homepage = "https://gitlab.freedesktop.org/xorg/font/winitzki-cyrillic"; + license = lib.licenses.publicDomain; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1166089e31a0..3e2ec060080f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -17,6 +17,7 @@ font-sony-misc, font-sun-misc, font-util, + font-winitzki-cyrillic, gccmakedep, ico, imake, @@ -150,6 +151,7 @@ self: with self; { fontsonymisc = font-sony-misc; fontsunmisc = font-sun-misc; fontutil = font-util; + fontwinitzkicyrillic = font-winitzki-cyrillic; libAppleWM = libapplewm; libFS = libfs; libICE = libice; @@ -1193,46 +1195,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontwinitzkicyrillic = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-winitzki-cyrillic"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz"; - sha256 = "1a4pz8f7hz6nn9xirz2k1j81ykl3lwrpi1ydmzipciy15l984v9v"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - bdftopcf - mkfontscale - ]; - buildInputs = [ fontutil ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! fontxfree86type1 = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 20a0aecdc9ab..e3f4a7197169 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -333,6 +333,7 @@ print OUT < Date: Sat, 30 Aug 2025 23:16:02 +0200 Subject: [PATCH 6/7] font-xfree86-type1: refactor, move to pkgs/by-name and rename from xorg.fontxfree86type1 relevant changes: - remove some unneeded deps and configureFlags package output doesn't change --- .../by-name/fo/font-xfree86-type1/package.nix | 41 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +----------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/tarballs.list | 1 - 4 files changed, 45 insertions(+), 39 deletions(-) create mode 100644 pkgs/by-name/fo/font-xfree86-type1/package.nix diff --git a/pkgs/by-name/fo/font-xfree86-type1/package.nix b/pkgs/by-name/fo/font-xfree86-type1/package.nix new file mode 100644 index 000000000000..acb1a3167b05 --- /dev/null +++ b/pkgs/by-name/fo/font-xfree86-type1/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchurl, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-xfree86-type1"; + version = "1.0.5"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-xfree86-type1-${finalAttrs.version}.tar.xz"; + hash = "sha256-qTwseIpeocACr3yGYs+dmCH7HfUbjSssXgAm39/qSDc="; + }; + + strictDeps = true; + + nativeBuildInputs = [ mkfontscale ]; + + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/font/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "XFree86 Cusrsor Postscript Type 1 Font"; + homepage = "https://gitlab.freedesktop.org/xorg/font/xfree86-type1"; + license = lib.licenses.x11; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 3e2ec060080f..3b669b315641 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -18,6 +18,7 @@ font-sun-misc, font-util, font-winitzki-cyrillic, + font-xfree86-type1, gccmakedep, ico, imake, @@ -152,6 +153,7 @@ self: with self; { fontsunmisc = font-sun-misc; fontutil = font-util; fontwinitzkicyrillic = font-winitzki-cyrillic; + fontxfree86type1 = font-xfree86-type1; libAppleWM = libapplewm; libFS = libfs; libICE = libice; @@ -1195,44 +1197,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontxfree86type1 = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-xfree86-type1"; - version = "1.0.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz"; - sha256 = "0ds8xbgxy9h0bqn2p38vylfzn8cqkp7n51kwmw1c18ayi9w2qg59"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - mkfontscale - ]; - buildInputs = [ fontutil ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! iceauth = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index e3f4a7197169..6631d892a848 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -334,6 +334,7 @@ print OUT < Date: Sat, 13 Sep 2025 22:34:23 +0200 Subject: [PATCH 7/7] font-{{screen,winitzki}-cyrillic,{schumacher,sony,sun}-misc,xfree86-type1}: move font from $out/lib to $out/share for font-xfree86-type1 this fixes xorg nixos module accordingly --- nixos/modules/services/x11/xserver.nix | 2 +- pkgs/by-name/fo/font-schumacher-misc/package.nix | 2 +- pkgs/by-name/fo/font-screen-cyrillic/package.nix | 2 -- pkgs/by-name/fo/font-sony-misc/package.nix | 2 -- pkgs/by-name/fo/font-sun-misc/package.nix | 2 -- pkgs/by-name/fo/font-winitzki-cyrillic/package.nix | 2 -- pkgs/by-name/fo/font-xfree86-type1/package.nix | 2 -- 7 files changed, 2 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index e90d51b19ffe..6be128f69f28 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -177,7 +177,7 @@ let { postInstall = '' alias='cursor -xfree86-cursor-medium-r-normal--0-${sizeString}-0-0-p-0-adobe-fontspecific' - echo "$alias" > $out/lib/X11/fonts/Type1/fonts.alias + echo "$alias" > $out/share/fonts/X11/Type1/fonts.alias ''; } ); diff --git a/pkgs/by-name/fo/font-schumacher-misc/package.nix b/pkgs/by-name/fo/font-schumacher-misc/package.nix index 3b1534196914..c83b593c16aa 100644 --- a/pkgs/by-name/fo/font-schumacher-misc/package.nix +++ b/pkgs/by-name/fo/font-schumacher-misc/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ font-util ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ]; passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' diff --git a/pkgs/by-name/fo/font-screen-cyrillic/package.nix b/pkgs/by-name/fo/font-screen-cyrillic/package.nix index 217fab306ea7..bea6992d9b24 100644 --- a/pkgs/by-name/fo/font-screen-cyrillic/package.nix +++ b/pkgs/by-name/fo/font-screen-cyrillic/package.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: { mkfontscale ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' #!/usr/bin/env nix-shell diff --git a/pkgs/by-name/fo/font-sony-misc/package.nix b/pkgs/by-name/fo/font-sony-misc/package.nix index 6c9341b855bf..8562279b8678 100644 --- a/pkgs/by-name/fo/font-sony-misc/package.nix +++ b/pkgs/by-name/fo/font-sony-misc/package.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: { mkfontscale ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' #!/usr/bin/env nix-shell diff --git a/pkgs/by-name/fo/font-sun-misc/package.nix b/pkgs/by-name/fo/font-sun-misc/package.nix index 25d701a489b0..bc8eb50a71c5 100644 --- a/pkgs/by-name/fo/font-sun-misc/package.nix +++ b/pkgs/by-name/fo/font-sun-misc/package.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: { mkfontscale ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' #!/usr/bin/env nix-shell diff --git a/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix b/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix index 65a6b6e97d5f..efbee8e3633e 100644 --- a/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix +++ b/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: { mkfontscale ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' #!/usr/bin/env nix-shell diff --git a/pkgs/by-name/fo/font-xfree86-type1/package.nix b/pkgs/by-name/fo/font-xfree86-type1/package.nix index acb1a3167b05..6d8e451f8594 100644 --- a/pkgs/by-name/fo/font-xfree86-type1/package.nix +++ b/pkgs/by-name/fo/font-xfree86-type1/package.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ mkfontscale ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' #!/usr/bin/env nix-shell