From 1c9fe6e0cb531017fc059bb95a4b9672daccb2fa Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gregor.kleen@ifi.lmu.de>
Date: Mon, 13 Sep 2021 10:40:52 +0200
Subject: [PATCH] chore(docker): remove semver metadata

---
 nix/docker-demo/default.nix | 7 +------
 shell.nix                   | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/nix/docker-demo/default.nix b/nix/docker-demo/default.nix
index e67e5c54e..317d7205d 100644
--- a/nix/docker-demo/default.nix
+++ b/nix/docker-demo/default.nix
@@ -1,12 +1,7 @@
 { self }: final: prev: {
   uniworxDemoDocker = prev.dockerTools.buildImage {
     name = "uniworx-demo";
-    tag =
-      let
-        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}";
+    tag = (builtins.fromJSON (prev.lib.readFile ./version.json)).version;
     created =
       let
         fromDate = builtins.readFile (prev.runCommand "date" { nativeBuildInputs = with final; [ coreutils ]; } ''
diff --git a/shell.nix b/shell.nix
index 2ab614f6a..0d5fe3975 100644
--- a/shell.nix
+++ b/shell.nix
@@ -260,5 +260,5 @@ let
   '';
 in pkgs.mkShell {
   name = "uni2work";
-  nativeBuildInputs = [develop inDevelop killallUni2work diffRunning] ++ (with pkgs; [ nodejs-14_x postgresql_12 openldap google-chrome exiftool memcached minio minio-client gup ]) ++ (with pkgs.haskellPackages; [ stack yesod-bin hlint cabal-install weeder profiteur ]);
+  nativeBuildInputs = [develop inDevelop killallUni2work diffRunning] ++ (with pkgs; [ nodejs-14_x postgresql_12 openldap google-chrome exiftool memcached minio minio-client gup skopeo ]) ++ (with pkgs.haskellPackages; [ stack yesod-bin hlint cabal-install weeder profiteur ]);
 }