From bbe49cb2ff5d8f519e3773f35c6d6400c5d62966 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gregor.kleen@ifi.lmu.de>
Date: Mon, 13 Sep 2021 09:23:15 +0200
Subject: [PATCH] chore(docker): fix versioning

---
 flake.nix                    | 2 +-
 nix/docker-demo/default.nix  | 5 +++--
 nix/docker-demo/version.json | 3 +++
 nix/docker-demo/version.toml | 3 ---
 4 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 nix/docker-demo/version.json
 delete mode 100644 nix/docker-demo/version.toml

diff --git a/flake.nix b/flake.nix
index 19b133a8f..73816ffc9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -106,7 +106,7 @@
             ${pkgs.skopeo}/bin/skopeo ''${@} --insecure-policy copy docker-archive://${pkgs.uniworxDemoDocker} ''${target}
           '';
       in {
-        packages = haskellFlake.packages // { inherit (pkgs) uniworx-node-dependencies uniworx-well-known uniworx-frontend; inherit (pkgs.uniworx.stack-nix.passthru) calculateMaterializedSha; };
+        packages = haskellFlake.packages // { inherit (pkgs) uniworx-node-dependencies uniworx-well-known uniworx-frontend uniworxDemoDocker; inherit (pkgs.uniworx.stack-nix.passthru) calculateMaterializedSha; };
         apps = haskellFlake.apps // { push-uniworx-demo-docker = flake-utils.lib.mkApp { drv = pushUniworxDemoDocker; }; };
         inherit (haskellFlake) checks;
         
diff --git a/nix/docker-demo/default.nix b/nix/docker-demo/default.nix
index aaaa4224b..e67e5c54e 100644
--- a/nix/docker-demo/default.nix
+++ b/nix/docker-demo/default.nix
@@ -3,8 +3,9 @@
     name = "uniworx-demo";
     tag =
       let
-        inherit (builtins.fromTOML (prev.lib.readFile ./version.toml)) semver;
-        hash = prev.lib.substring 0 8 (self.rev or prev.lib.removePrefix "sha256-" self.narHash);
+        versionJSON = builtins.fromJSON (prev.lib.readFile ./version.json);
+        semver = versionJSON.version;
+        hash = prev.lib.substring 0 8 (self.rev or (prev.lib.removePrefix "sha256-" self.narHash));
       in "${semver}+${hash}";
     created =
       let
diff --git a/nix/docker-demo/version.json b/nix/docker-demo/version.json
new file mode 100644
index 000000000..10e64e00d
--- /dev/null
+++ b/nix/docker-demo/version.json
@@ -0,0 +1,3 @@
+{
+  "version": "0.2.0"
+}
diff --git a/nix/docker-demo/version.toml b/nix/docker-demo/version.toml
deleted file mode 100644
index 6b0106c9b..000000000
--- a/nix/docker-demo/version.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-# TODO: Bump version (https://semver.org) on every semantic change
-# docker-demo should always use major version zero
-semver = "0.2.0"
\ No newline at end of file