From 0b41d796098da2b3d35edc6e9cdb042a8acb2a15 Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Thu, 6 Feb 2020 23:57:09 +0000
Subject: [PATCH] lojban tools

---
 default.nix             |  5 ++++-
 docker/minica.nix       | 22 ++++++++++++++++++++++
 pkgs/johaus/default.nix | 21 +++++++++++++++++++++
 pkgs/jvozba/default.nix | 21 +++++++++++++++++++++
 4 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 docker/minica.nix
 create mode 100644 pkgs/johaus/default.nix
 create mode 100644 pkgs/jvozba/default.nix

diff --git a/default.nix b/default.nix
index fcbcc26..604dd6b 100644
--- a/default.nix
+++ b/default.nix
@@ -11,9 +11,12 @@ let
     MoonPlus = callPackage ./pkgs/moonplus { };
     minica = callPackage ./pkgs/minica { };
 
+    # lojban
+    johaus = callPackage ./pkgs/johaus { };
+    jvozba = callPackage ./pkgs/jvozba { };
+
     # x
     appsluggr = x.appsluggr;
-    johaus = x.johaus;
     license = x.license;
     mainsanow = x.mainsanow;
     prefix = x.prefix;
diff --git a/docker/minica.nix b/docker/minica.nix
new file mode 100644
index 0000000..9b46c78
--- /dev/null
+++ b/docker/minica.nix
@@ -0,0 +1,22 @@
+{ system ? builtins.currentSystem }:
+
+let
+  pkgs = import <nixpkgs> { inherit system; };
+
+  callPackage = pkgs.lib.callPackageWith pkgs;
+
+  minica = callPackage ../pkgs/minica { };
+
+  dockerImage = pkg:
+    pkgs.dockerTools.buildImage {
+      name = pkg.name;
+      tag = "latest";
+
+      contents = [ pkg ];
+
+      config = {
+        Cmd = [ "/bin/${pkg.name}" ];
+      };
+    };
+
+in dockerImage minica
diff --git a/pkgs/johaus/default.nix b/pkgs/johaus/default.nix
new file mode 100644
index 0000000..7ce785e
--- /dev/null
+++ b/pkgs/johaus/default.nix
@@ -0,0 +1,21 @@
+{ pkgs ? import <nixpkgs> { } }:
+let
+  version = "1.1.0";
+
+  repo = pkgs.fetchFromGitHub {
+    owner = "Xe";
+    repo = "johaus";
+    rev = "v${version}";
+    hash = "sha256:0nwcfv40mhiyp2zzzsxg0j7717asdmhshg40dbnkwmqwhiqikdnb";
+  };
+
+  out = pkgs.buildGoModule {
+    pname = "johaus";
+    version = version;
+    src = repo;
+    modSha256 = "sha256:1s3yj3b5zs9cqss2p2qdsk5yxmwna53nnk62zf78j6whan2kqags";
+
+    subPackages = [ "." ];
+  };
+
+in out
diff --git a/pkgs/jvozba/default.nix b/pkgs/jvozba/default.nix
new file mode 100644
index 0000000..8cda846
--- /dev/null
+++ b/pkgs/jvozba/default.nix
@@ -0,0 +1,21 @@
+{ pkgs ? import <nixpkgs> { } }:
+let
+  version = "0.1.1";
+
+  repo = pkgs.fetchFromGitHub {
+    owner = "Xe";
+    repo = "jvozba";
+    rev = "v${version}";
+    hash = "sha256:07zra87h0lgi4r3hsh8q08pzrxdnvlfa1zm8yj0vv4iysrk3y3x2";
+  };
+
+  out = pkgs.buildGoModule {
+    pname = "jvozba";
+    version = version;
+    src = repo;
+    modSha256 = "sha256:0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
+
+    subPackages = [ "cmd/..." ];
+  };
+
+in out