refactor(izumi): consolidate EMACS-ORG-FC-TN-PACKAGES

1 files changed, 71 insertions, 75 deletions

diff --git a/systems/izumi/izumi.org b/systems/izumi/izumi.org
index b712c71..6b36fb1 100644
--- a/systems/izumi/izumi.org
+++ b/systems/izumi/izumi.org
@@ -391,7 +391,77 @@
    home-profile-service-type
    (append
     (list emacs-guix emacs-nix-mode)
-    <<EMACS-ORG-FC-TN-PACKAGES>>))
+    (list
+     (let
+         ((commit* "wip-algo-tn"))
+       (package
+        (name "emacs-org-fc")
+        (version (git-version "0.1.2" "0" commit*))
+        (source
+         (origin
+  	(method git-fetch)
+  	(uri
+  	 (git-reference
+            (url "https://git.marekpasnikowski.pl/org-fc.git")
+            (commit commit*)))
+  	(file-name (git-file-name name version))
+  	(sha256 (base32 "1i8ii1garx2pdg08a12yzsd0fhwdzcpxp9m97zj8m5s275i8ccaj"))))
+        (build-system emacs-build-system)
+        (arguments
+         (list
+  	#:include #~ (cons* "\\.awk$" "\\.org$" %default-include)
+  	#:exclude #~ (cons "^test/" %default-exclude)
+  	#:tests? #t
+  	#:test-command
+  	#~
+  	(list
+  	 "emacs"
+  	 "--batch"
+  	 "-L" "."
+  	 "-L" "tests/"
+  	 "-l" "tests/org-fc-filter-test.el"
+  	 "-l" "tests/org-fc-indexer-test.el"
+  	 "-l" "tests/org-fc-review-data-test.el"
+  	 "-f" "ert-run-tests-batch-and-exit")
+  	#:phases
+  	#~
+  	(modify-phases
+  	 %standard-phases
+  	 (add-after
+            'unpack
+            'qualify-paths
+            (lambda*
+             (#:key inputs
+              #:allow-other-keys)
+             (substitute*
+              "org-fc-awk.el"
+              (("\"find ")
+               (string-append
+                "\""
+                (search-input-file inputs "/bin/find")
+                " "))
+              (("\"gawk ")
+               (string-append
+                "\""
+                (search-input-file inputs "/bin/gawk")
+                " "))
+              (("\"xargs ")
+               (string-append
+                "\""
+                (search-input-file inputs "/bin/xargs")
+                " "))))))))
+        (inputs (list findutils gawk))
+        (propagated-inputs (list emacs-hydra))
+        (home-page "https://www.leonrische.me/fc/index.html")
+        (synopsis "Spaced repetition system for Emacs Org mode")
+        (description
+         (string-append
+  	"Org-fc is a spaced-repetition system for Emacs' Org mode.\n"
+  	"It allows you to mark headlines in a file as flashcards, turning pieces of\n"
+  	"knowledge you want to learn into a question-answer test.  These cards are\n"
+  	"reviewed at regular interval.  After each review, the next review interval is\n"
+  	"calculated based on how well you remembered the contents of the card.\n"))
+        (license license:gpl3+))))))
 #+END_SRC
 
 #+NAME: HOME-FILES-SERVICE-TYPE
@@ -483,77 +553,3 @@
   (use-package-modules base emacs-xyz gawk)
 #+END_SRC
 
-#+NAME: EMACS-ORG-FC-TN-PACKAGES
-#+BEGIN_SRC scheme
-  (list
-   (let
-       ((commit* "wip-algo-tn"))
-     (package
-      (name "emacs-org-fc")
-      (version (git-version "0.1.2" "0" commit*))
-      (source
-       (origin
-        (method git-fetch)
-        (uri
-         (git-reference
-          (url "https://git.marekpasnikowski.pl/org-fc.git")
-          (commit commit*)))
-        (file-name (git-file-name name version))
-        (sha256 (base32 "1i8ii1garx2pdg08a12yzsd0fhwdzcpxp9m97zj8m5s275i8ccaj"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:include #~ (cons* "\\.awk$" "\\.org$" %default-include)
-        #:exclude #~ (cons "^test/" %default-exclude)
-        #:tests? #t
-        #:test-command
-        #~
-        (list
-         "emacs"
-         "--batch"
-         "-L" "."
-         "-L" "tests/"
-         "-l" "tests/org-fc-filter-test.el"
-         "-l" "tests/org-fc-indexer-test.el"
-         "-l" "tests/org-fc-review-data-test.el"
-         "-f" "ert-run-tests-batch-and-exit")
-        #:phases
-        #~
-        (modify-phases
-         %standard-phases
-         (add-after
-          'unpack
-          'qualify-paths
-          (lambda*
-              (#:key inputs
-               #:allow-other-keys)
-            (substitute*
-             "org-fc-awk.el"
-             (("\"find ")
-              (string-append
-               "\""
-               (search-input-file inputs "/bin/find")
-               " "))
-             (("\"gawk ")
-              (string-append
-               "\""
-               (search-input-file inputs "/bin/gawk")
-               " "))
-             (("\"xargs ")
-              (string-append
-               "\""
-               (search-input-file inputs "/bin/xargs")
-               " "))))))))
-      (inputs (list findutils gawk))
-      (propagated-inputs (list emacs-hydra))
-      (home-page "https://www.leonrische.me/fc/index.html")
-      (synopsis "Spaced repetition system for Emacs Org mode")
-      (description
-       (string-append
-        "Org-fc is a spaced-repetition system for Emacs' Org mode.\n"
-        "It allows you to mark headlines in a file as flashcards, turning pieces of\n"
-        "knowledge you want to learn into a question-answer test.  These cards are\n"
-        "reviewed at regular interval.  After each review, the next review interval is\n"
-        "calculated based on how well you remembered the contents of the card.\n"))
-      (license license:gpl3+))))
-#+END_SRC