From 4edea15a6faf28083227ef23d6580f967b56a852 Mon Sep 17 00:00:00 2001 From: Daniel Noland Date: Mon, 4 Nov 2024 12:28:01 -0700 Subject: [PATCH 1/4] add openjdk back into docs --- default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/default.nix b/default.nix index 2ddcf79..cb85cbc 100644 --- a/default.nix +++ b/default.nix @@ -245,6 +245,7 @@ mdbook-katex mdbook-mermaid mdbook-plantuml + openjdk # needed for mdbook-plantuml to work (runtime exe dep) plantuml # needed for mdbook-plantuml to work (runtime exe dep) tmpdir ]); From 0b0d227eab258d862e9eb0db2127cda75057d107 Mon Sep 17 00:00:00 2001 From: Daniel Noland Date: Mon, 4 Nov 2024 13:31:08 -0700 Subject: [PATCH 2/4] add openjdk back into docs --- default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/default.nix b/default.nix index cb85cbc..a4fd2b7 100644 --- a/default.nix +++ b/default.nix @@ -240,6 +240,7 @@ docEnvPackageList = (with toolchainPkgs; [ (callPackage ./nix/mdbook-alerts {}) + bash coreutils mdbook mdbook-katex From baacbf4c8a87cac598539c58d9431de85529f4cf Mon Sep 17 00:00:00 2001 From: Daniel Noland Date: Mon, 4 Nov 2024 13:34:27 -0700 Subject: [PATCH 3/4] add openjdk back into docs --- default.nix | 1 + nix/plantuml-wrapper/default.nix | 0 nix/plantuml-wrapper/src/bin/plantuml | 0 nix/shell-fixup/default.nix | 1 + 4 files changed, 2 insertions(+) create mode 100644 nix/plantuml-wrapper/default.nix create mode 100644 nix/plantuml-wrapper/src/bin/plantuml diff --git a/default.nix b/default.nix index a4fd2b7..1156f3f 100644 --- a/default.nix +++ b/default.nix @@ -240,6 +240,7 @@ docEnvPackageList = (with toolchainPkgs; [ (callPackage ./nix/mdbook-alerts {}) + (callPackage ./nix/plantuml-wrapper {}) bash coreutils mdbook diff --git a/nix/plantuml-wrapper/default.nix b/nix/plantuml-wrapper/default.nix new file mode 100644 index 0000000..e69de29 diff --git a/nix/plantuml-wrapper/src/bin/plantuml b/nix/plantuml-wrapper/src/bin/plantuml new file mode 100644 index 0000000..e69de29 diff --git a/nix/shell-fixup/default.nix b/nix/shell-fixup/default.nix index bde82ad..898af1f 100644 --- a/nix/shell-fixup/default.nix +++ b/nix/shell-fixup/default.nix @@ -5,6 +5,7 @@ version = "0.0.1"; src = ./src; installPhase = '' + chmod +x $src/bin/plantuml cp -a $src $out ''; From 2617aafa043cdfb9faee3a1db33eb01b3d938c03 Mon Sep 17 00:00:00 2001 From: Daniel Noland Date: Mon, 4 Nov 2024 13:35:53 -0700 Subject: [PATCH 4/4] add openjdk back into docs --- nix/plantuml-wrapper/default.nix | 11 +++++++++++ nix/plantuml-wrapper/src/bin/plantuml | 3 +++ nix/shell-fixup/default.nix | 1 - 3 files changed, 14 insertions(+), 1 deletion(-) mode change 100644 => 100755 nix/plantuml-wrapper/src/bin/plantuml diff --git a/nix/plantuml-wrapper/default.nix b/nix/plantuml-wrapper/default.nix index e69de29..5fb0e73 100644 --- a/nix/plantuml-wrapper/default.nix +++ b/nix/plantuml-wrapper/default.nix @@ -0,0 +1,11 @@ +{ + stdenv, +}: stdenv.mkDerivation { + pname = "dataplane-plantuml-wrapper"; + version = "0.0.1"; + src = ./src; + installPhase = '' + cp -a $src $out + ''; + +} diff --git a/nix/plantuml-wrapper/src/bin/plantuml b/nix/plantuml-wrapper/src/bin/plantuml old mode 100644 new mode 100755 index e69de29..3f8cc1e --- a/nix/plantuml-wrapper/src/bin/plantuml +++ b/nix/plantuml-wrapper/src/bin/plantuml @@ -0,0 +1,3 @@ +#!/bin/bash + +exec /lib/openjdk/bin/java -jar /lib/plantuml.jar "$@" diff --git a/nix/shell-fixup/default.nix b/nix/shell-fixup/default.nix index 898af1f..bde82ad 100644 --- a/nix/shell-fixup/default.nix +++ b/nix/shell-fixup/default.nix @@ -5,7 +5,6 @@ version = "0.0.1"; src = ./src; installPhase = '' - chmod +x $src/bin/plantuml cp -a $src $out '';