refactor: rename doerg-tex → doerg-temml-worker

This commit is contained in:
2026-02-28 21:38:23 -07:00
parent 6ef81a4a45
commit 8b2fb7a010
13 changed files with 17 additions and 22 deletions

View File

@@ -0,0 +1 @@
#+title: doerg-temml-worker

View File

@@ -6,7 +6,7 @@
}: }:
buildNpmPackage { buildNpmPackage {
pname = "doerg-tex"; pname = "doerg-temml-worker";
version = "0.1.0"; version = "0.1.0";
src = ./.; src = ./.;
npmDeps = importNpmLock { npmRoot = ./.; }; npmDeps = importNpmLock { npmRoot = ./.; };

View File

@@ -1,6 +1,6 @@
{"dependencies":{"temml":"^0.13.1" {"dependencies":{"temml":"^0.13.1"
,"command-line-args":"^6.0.1" ,"command-line-args":"^6.0.1"
,"cbor-x":"^1.6.0"} ,"cbor-x":"^1.6.0"}
,"name":"doerg-tex" ,"name":"doerg-temml-worker"
,"version":"0.1.0" ,"version":"0.1.0"
,"bin":{"doerg-tex":"index.js"}} ,"bin":{"doerg-temml-worker":"index.js"}}

View File

@@ -1 +0,0 @@
#+title: doerg-tex

View File

@@ -2,7 +2,7 @@
, callPackage , callPackage
, lib , lib
, doerg-parser , doerg-parser
, doerg-tex , doerg-temml-worker
, ibm-plex-web , ibm-plex-web
, fake-git , fake-git
, our-tex ? callPackage ./our-tex.nix {} , our-tex ? callPackage ./our-tex.nix {}
@@ -27,7 +27,7 @@ let
bin-path = lib.makeBinPath [ bin-path = lib.makeBinPath [
doerg-parser doerg-parser
our-tex our-tex
doerg-tex doerg-temml-worker
]; ];
in mkCljBin' { in mkCljBin' {
name = "net.deertopia/doerg"; name = "net.deertopia/doerg";
@@ -42,13 +42,13 @@ in mkCljBin' {
]; ];
buildInputs = [ buildInputs = [
doerg-parser doerg-parser
doerg-tex doerg-temml-worker
plex plex
our-tex our-tex
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
doerg-parser doerg-parser
doerg-tex doerg-temml-worker
plex plex
our-tex our-tex
]; ];
@@ -60,9 +60,4 @@ in mkCljBin' {
wrapProgram $out/bin/doerg \ wrapProgram $out/bin/doerg \
--prefix PATH : ${bin-path} --prefix PATH : ${bin-path}
''; '';
# installPhase= ''
# runHook preInstall
# exit 1
# runHook postInstall
# '';
} }

View File

@@ -20,9 +20,9 @@
(fs/split-paths (System/getenv "XDG_DATA_DIRS"))))) (fs/split-paths (System/getenv "XDG_DATA_DIRS")))))
::latex "xelatex" ::latex "xelatex"
::dvisvgm "dvisvgm" ::dvisvgm "dvisvgm"
;; TODO: Can we automatically set this to "./doerg-tex/index.js" in ;; TODO: Can we automatically set this to "./doerg-temml-worker/index.js" in
;; a development environment? ;; a development environment?
::doerg-tex "doerg-tex"}) ::doerg-temml-worker "doerg-temml-worker"})
(def ^:dynamic *cfg* default) (def ^:dynamic *cfg* default)
@@ -32,4 +32,4 @@
(s/def ::dvisvgm ::file) (s/def ::dvisvgm ::file)
(s/def ::doerg-tex ::file) (s/def ::doerg-temml-worker ::file)

View File

@@ -17,11 +17,11 @@
(def ^:dynamic *worker*) (def ^:dynamic *worker*)
(defn worker [& {:keys [preamble]}] (defn worker [& {:keys [preamble]}]
(let [doerg-tex (::cfg/doerg-tex cfg/*cfg*)] (let [doerg-temml-worker (::cfg/doerg-temml-worker cfg/*cfg*)]
(p/process (p/process
{:shutdown p/destroy-tree {:shutdown p/destroy-tree
:err (l/log-stream :info "temml/err")} :err (l/log-stream :info "temml/err")}
doerg-tex doerg-temml-worker
"--preamble" "--preamble"
"resources/net/deertopia/doerg/prelude.tex"))) "resources/net/deertopia/doerg/prelude.tex")))

View File

@@ -32,7 +32,7 @@
_pkgs = each-system ({ pkgs, ... }: pkgs); _pkgs = each-system ({ pkgs, ... }: pkgs);
packages = each-system ({ pkgs, ... }: { packages = each-system ({ pkgs, ... }: {
inherit (pkgs) publisher doerg doerg-parser doerg-tex; inherit (pkgs) publisher doerg doerg-parser doerg-temml-worker;
default = pkgs.publisher; default = pkgs.publisher;
}); });
@@ -44,7 +44,7 @@
publisher = final.callPackage ./publisher/package.nix {}; publisher = final.callPackage ./publisher/package.nix {};
doerg = final.callPackage ./doerg/package.nix {}; doerg = final.callPackage ./doerg/package.nix {};
doerg-parser = final.callPackage ./doerg/doerg-parser {}; doerg-parser = final.callPackage ./doerg/doerg-parser {};
doerg-tex = final.callPackage ./doerg/doerg-tex {}; doerg-temml-worker = final.callPackage ./doerg/doerg-temml-worker {};
}; };
checks = each-system ({ pkgs, system, ... }: { checks = each-system ({ pkgs, system, ... }: {
@@ -59,12 +59,12 @@
inputsFrom = [ inputsFrom = [
pkgs.doerg pkgs.doerg
pkgs.doerg-parser pkgs.doerg-parser
pkgs.doerg-tex pkgs.doerg-temml-worker
]; ];
packages = with pkgs; [ packages = with pkgs; [
clojure-lsp clojure-lsp
doerg-parser doerg-parser
doerg-tex doerg-temml-worker
# wahhh ibm-plex-web is a dependency of doerg... why must # wahhh ibm-plex-web is a dependency of doerg... why must
# i specify it hereeee. # i specify it hereeee.
# ibm-plex-web # ibm-plex-web