diff --git a/doerg/doerg-temml-worker/README.org b/doerg/doerg-temml-worker/README.org new file mode 100644 index 0000000..c2d5bd4 --- /dev/null +++ b/doerg/doerg-temml-worker/README.org @@ -0,0 +1 @@ +#+title: doerg-temml-worker diff --git a/doerg/doerg-tex/default.nix b/doerg/doerg-temml-worker/default.nix similarity index 88% rename from doerg/doerg-tex/default.nix rename to doerg/doerg-temml-worker/default.nix index 998402d..94783fe 100644 --- a/doerg/doerg-tex/default.nix +++ b/doerg/doerg-temml-worker/default.nix @@ -6,7 +6,7 @@ }: buildNpmPackage { - pname = "doerg-tex"; + pname = "doerg-temml-worker"; version = "0.1.0"; src = ./.; npmDeps = importNpmLock { npmRoot = ./.; }; diff --git a/doerg/doerg-tex/deps.edn b/doerg/doerg-temml-worker/deps.edn similarity index 100% rename from doerg/doerg-tex/deps.edn rename to doerg/doerg-temml-worker/deps.edn diff --git a/doerg/doerg-tex/deserialise.clj b/doerg/doerg-temml-worker/deserialise.clj similarity index 100% rename from doerg/doerg-tex/deserialise.clj rename to doerg/doerg-temml-worker/deserialise.clj diff --git a/doerg/doerg-tex/index.js b/doerg/doerg-temml-worker/index.js similarity index 100% rename from doerg/doerg-tex/index.js rename to doerg/doerg-temml-worker/index.js diff --git a/doerg/doerg-tex/package-lock.json b/doerg/doerg-temml-worker/package-lock.json similarity index 100% rename from doerg/doerg-tex/package-lock.json rename to doerg/doerg-temml-worker/package-lock.json diff --git a/doerg/doerg-tex/package.json b/doerg/doerg-temml-worker/package.json similarity index 60% rename from doerg/doerg-tex/package.json rename to doerg/doerg-temml-worker/package.json index 4fb091d..f07b9be 100644 --- a/doerg/doerg-tex/package.json +++ b/doerg/doerg-temml-worker/package.json @@ -1,6 +1,6 @@ {"dependencies":{"temml":"^0.13.1" ,"command-line-args":"^6.0.1" ,"cbor-x":"^1.6.0"} -,"name":"doerg-tex" +,"name":"doerg-temml-worker" ,"version":"0.1.0" -,"bin":{"doerg-tex":"index.js"}} +,"bin":{"doerg-temml-worker":"index.js"}} diff --git a/doerg/doerg-tex/serialise.clj b/doerg/doerg-temml-worker/serialise.clj similarity index 100% rename from doerg/doerg-tex/serialise.clj rename to doerg/doerg-temml-worker/serialise.clj diff --git a/doerg/doerg-tex/README.org b/doerg/doerg-tex/README.org deleted file mode 100644 index cd36387..0000000 --- a/doerg/doerg-tex/README.org +++ /dev/null @@ -1 +0,0 @@ -#+title: doerg-tex diff --git a/doerg/package.nix b/doerg/package.nix index b0909fd..171e5e5 100644 --- a/doerg/package.nix +++ b/doerg/package.nix @@ -2,7 +2,7 @@ , callPackage , lib , doerg-parser -, doerg-tex +, doerg-temml-worker , ibm-plex-web , fake-git , our-tex ? callPackage ./our-tex.nix {} @@ -27,7 +27,7 @@ let bin-path = lib.makeBinPath [ doerg-parser our-tex - doerg-tex + doerg-temml-worker ]; in mkCljBin' { name = "net.deertopia/doerg"; @@ -42,13 +42,13 @@ in mkCljBin' { ]; buildInputs = [ doerg-parser - doerg-tex + doerg-temml-worker plex our-tex ]; nativeCheckInputs = [ doerg-parser - doerg-tex + doerg-temml-worker plex our-tex ]; @@ -60,9 +60,4 @@ in mkCljBin' { wrapProgram $out/bin/doerg \ --prefix PATH : ${bin-path} ''; - # installPhase= '' - # runHook preInstall - # exit 1 - # runHook postInstall - # ''; } diff --git a/doerg/src/net/deertopia/doerg/config.clj b/doerg/src/net/deertopia/doerg/config.clj index 2cee006..628c1a7 100644 --- a/doerg/src/net/deertopia/doerg/config.clj +++ b/doerg/src/net/deertopia/doerg/config.clj @@ -20,9 +20,9 @@ (fs/split-paths (System/getenv "XDG_DATA_DIRS"))))) ::latex "xelatex" ::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? - ::doerg-tex "doerg-tex"}) + ::doerg-temml-worker "doerg-temml-worker"}) (def ^:dynamic *cfg* default) @@ -32,4 +32,4 @@ (s/def ::dvisvgm ::file) -(s/def ::doerg-tex ::file) +(s/def ::doerg-temml-worker ::file) diff --git a/doerg/src/net/deertopia/doerg/tex/temml.clj b/doerg/src/net/deertopia/doerg/tex/temml.clj index b82b113..18aacdf 100644 --- a/doerg/src/net/deertopia/doerg/tex/temml.clj +++ b/doerg/src/net/deertopia/doerg/tex/temml.clj @@ -17,11 +17,11 @@ (def ^:dynamic *worker*) (defn worker [& {:keys [preamble]}] - (let [doerg-tex (::cfg/doerg-tex cfg/*cfg*)] + (let [doerg-temml-worker (::cfg/doerg-temml-worker cfg/*cfg*)] (p/process {:shutdown p/destroy-tree :err (l/log-stream :info "temml/err")} - doerg-tex + doerg-temml-worker "--preamble" "resources/net/deertopia/doerg/prelude.tex"))) diff --git a/flake.nix b/flake.nix index 64a4af4..facf0a4 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ _pkgs = each-system ({ pkgs, ... }: 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; }); @@ -44,7 +44,7 @@ publisher = final.callPackage ./publisher/package.nix {}; doerg = final.callPackage ./doerg/package.nix {}; 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, ... }: { @@ -59,12 +59,12 @@ inputsFrom = [ pkgs.doerg pkgs.doerg-parser - pkgs.doerg-tex + pkgs.doerg-temml-worker ]; packages = with pkgs; [ clojure-lsp doerg-parser - doerg-tex + doerg-temml-worker # wahhh ibm-plex-web is a dependency of doerg... why must # i specify it hereeee. # ibm-plex-web