guix_mirror_bot pushed a commit to branch master
in repository guix.

commit f2dc6937b72c70f668ddf61bcf44420afacba420
Author: Anderson Torres <[email protected]>
AuthorDate: Sun Aug 24 18:19:25 2025 -0300

    gnu: Move APL fonts to (gnu packages fonts).
    
    * gnu/packages/apl.scm (font-apl2741-unicode, font-apl333, font-apl385):
    Move from here...
    * gnu/packages/fonts.scm: ... to here.
    
    Closes: #2246
    Change-Id: Ie9d6f28d568ccdaab0f63b543e7f944b92ea685f
    Signed-off-by: 宋文武 <[email protected]>
---
 gnu/packages/apl.scm   | 82 --------------------------------------------------
 gnu/packages/fonts.scm | 80 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 82 deletions(-)

diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm
index 5d159a90ef..3312ce2fb5 100644
--- a/gnu/packages/apl.scm
+++ b/gnu/packages/apl.scm
@@ -28,12 +28,10 @@
   #:use-module (guix svn-download)
   #:use-module (guix gexp)
   #:use-module (guix packages)
-  #:use-module (guix build-system font)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages java)
   #:use-module (gnu packages maths)
@@ -86,86 +84,6 @@
 an implementation of the ISO standard 13751.")
       (license license:gpl3+))))
 
-(define-public font-apl2741-unicode
-  (let ((commit "1e11efae38e5095bfe49a786b111d563e83dad03"))
-    (package
-      (name "font-apl2741-unicode")
-      (version "1668049300")
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/abrudz/APL2741.git";)
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0i1yk1x99lr2swlbq9r7dny5w70zwiwi8lpfcw4n7k7pfbw0xh7y"))))
-      (build-system trivial-build-system)
-      (native-inputs (list fontforge))
-      (arguments
-       `(#:modules ((guix build utils))
-         #:builder
-         (begin
-           (use-modules (guix build utils))
-           (let* ((source (assoc-ref %build-inputs "source"))
-                  (out (assoc-ref %outputs "out"))
-                  (dest (string-append out "/share/fonts/truetype"))
-                  (fontforge (string-append
-                              (assoc-ref %build-inputs "fontforge")
-                              "/bin/fontforge")))
-             (mkdir-p dest)
-             (invoke fontforge "-lang=ff" "-c" "Open($1); Generate($2)"
-                     (string-append source "/APL2741.sfd")
-                     (string-append dest "/APL2741.ttf"))))))
-      (synopsis "APL2741 Unicode font")
-      (home-page "https://abrudz.github.io/APL2741/";)
-      (description "APL font based on Adrian Smith's IBM Selectric APL2741
-golf-ball font.  It supports most special characters used by popular APL
-implementations, some additional mathematical and typographical symbols,
-single line drawing characters, as well as the full Unicode APL range,
-including both uppercase and lowercase underscored alphabets, as-of-yet unused
-symbols, and almost all Latin-1 accented letters.")
-      (license license:unlicense))))
-
-(define-public font-apl333
-  (package
-    (name "font-apl333")
-    ;; Version number as for apl-385, last modified 2013-04-20.
-    (version "20130420")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://apl385.com/fonts/"; "apl333.zip"))
-       (sha256
-        (base32 "0yn0ha7d14vp4ma3lxbc9kpyrn20m7brjisr6w55c9mi24w9v3a5"))))
-    (build-system font-build-system)
-    (home-page "https://apl385.com/fonts/index.htm";)
-    (synopsis "Variable-width APL font inspired by Comic Sans Serif")
-    (description
-     "Variable-width version of Adrian Smith's APL385 font developed with APL
-software vendors in the late 1980s.")
-    (license license:public-domain)))
-
-(define-public font-apl385
-  (package
-    (name "font-apl385")
-    ;; No version number or release, unzipping source and checking file times
-    ;; shows the font file was last modified on 2016-08-21.
-    (version "20160821")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://apl385.com/fonts/"; "apl385.zip"))
-       (sha256
-        (base32 "132qfsnx0v6qf8x8iy3flivv449nz42nnpkwjysmz65w6wqxpk1g"))))
-    (build-system font-build-system)
-    (home-page "https://apl385.com/fonts/index.htm";)
-    (synopsis "Monospaced APL font inspired by Comic Sans Serif")
-    (description
-     "Adrian Smith's monospaced APL font developed with APL software vendors
-in the late 1980s.")
-    (license license:public-domain)))
-
 (define-public dzaima-apl
   (package
     (name "dzaima-apl")
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index c21d7c183d..993d56713b 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -2642,6 +2642,86 @@ programming.  Iosevka is completely generated from its 
source code.")
        (sha256
         (base32 "08ijx9rbcx95yiaiwv6k25xmsi24rdy50mkmmaw94mmwv22mxdra"))))))
 
+(define-public font-apl2741-unicode
+  (let ((commit "1e11efae38e5095bfe49a786b111d563e83dad03"))
+    (package
+      (name "font-apl2741-unicode")
+      (version "1668049300")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/abrudz/APL2741.git";)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0i1yk1x99lr2swlbq9r7dny5w70zwiwi8lpfcw4n7k7pfbw0xh7y"))))
+      (build-system trivial-build-system)
+      (native-inputs (list fontforge))
+      (arguments
+       `(#:modules ((guix build utils))
+         #:builder
+         (begin
+           (use-modules (guix build utils))
+           (let* ((source (assoc-ref %build-inputs "source"))
+                  (out (assoc-ref %outputs "out"))
+                  (dest (string-append out "/share/fonts/truetype"))
+                  (fontforge (string-append
+                              (assoc-ref %build-inputs "fontforge")
+                              "/bin/fontforge")))
+             (mkdir-p dest)
+             (invoke fontforge "-lang=ff" "-c" "Open($1); Generate($2)"
+                     (string-append source "/APL2741.sfd")
+                     (string-append dest "/APL2741.ttf"))))))
+      (synopsis "APL2741 Unicode font")
+      (home-page "https://abrudz.github.io/APL2741/";)
+      (description "APL font based on Adrian Smith's IBM Selectric APL2741
+golf-ball font.  It supports most special characters used by popular APL
+implementations, some additional mathematical and typographical symbols,
+single line drawing characters, as well as the full Unicode APL range,
+including both uppercase and lowercase underscored alphabets, as-of-yet unused
+symbols, and almost all Latin-1 accented letters.")
+      (license license:unlicense))))
+
+(define-public font-apl333
+  (package
+    (name "font-apl333")
+    ;; Version number as for apl-385, last modified 2013-04-20.
+    (version "20130420")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://apl385.com/fonts/"; "apl333.zip"))
+       (sha256
+        (base32 "0yn0ha7d14vp4ma3lxbc9kpyrn20m7brjisr6w55c9mi24w9v3a5"))))
+    (build-system font-build-system)
+    (home-page "https://apl385.com/fonts/index.htm";)
+    (synopsis "Variable-width APL font inspired by Comic Sans Serif")
+    (description
+     "Variable-width version of Adrian Smith's APL385 font developed with APL
+software vendors in the late 1980s.")
+    (license license:public-domain)))
+
+(define-public font-apl385
+  (package
+    (name "font-apl385")
+    ;; No version number or release, unzipping source and checking file times
+    ;; shows the font file was last modified on 2016-08-21.
+    (version "20160821")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://apl385.com/fonts/"; "apl385.zip"))
+       (sha256
+        (base32 "132qfsnx0v6qf8x8iy3flivv449nz42nnpkwjysmz65w6wqxpk1g"))))
+    (build-system font-build-system)
+    (home-page "https://apl385.com/fonts/index.htm";)
+    (synopsis "Monospaced APL font inspired by Comic Sans Serif")
+    (description
+     "Adrian Smith's monospaced APL font developed with APL software vendors
+in the late 1980s.")
+    (license license:public-domain)))
+
 (define-public font-aporetic
   (package
     (name "font-aporetic")

Reply via email to