From 1ecc11d078ecbc499dfec4bbba05be32809ad857 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Thu, 16 Jan 2020 17:38:23 +0100
Subject: [PATCH] Add sotest-producer package

---
 packages/default.nix                 | 18 ++++++++-----
 packages/sotest-producer/default.nix | 39 ++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 packages/sotest-producer/default.nix

diff --git a/packages/default.nix b/packages/default.nix
index d2e6bee..e2c1ae1 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -1,12 +1,8 @@
-# SPDX-FileCopyrightText: Emery Hemingway
-#
-# SPDX-License-Identifier: LicenseRef-Hippocratic-1.1
+# SPDX-License-Identifier: CC0-1.0
 
-{ system, nixpkgs, depot, dhallApps }:
+{ system, legacyPackages, depot, dhallApps }:
 
 let
-  legacyPackages = builtins.getAttr system nixpkgs.legacyPackages;
-
   inherit (legacyPackages) callPackage;
 
   dhallPackages = legacyPackages.dhallPackages // (callPackage ./dhall { });
@@ -39,6 +35,8 @@ let
       $dhall < manifest.tmp > $out
     '';
 
+  addManifest = drv: { manifest = mkDhallManifest drv; } // drv;
+
 in rec {
 
   inherit (legacyPackages) stdenv;
@@ -60,7 +58,13 @@ in rec {
 
   nic_bus = callPackage ./nic_bus { inherit (genode) base os; };
 
-  solo5 = callPackage ./solo5 { inherit (genode) base os; };
+  solo5 = let drv = callPackage ./solo5 { inherit (genode) base os; };
+  in addManifest drv // { tests = addManifest drv.tests; };
+
+  sotest-producer = addManifest (callPackage ./sotest-producer {
+    stdenv = genode.stdenvGcc;
+    inherit genode;
+  });
 
   stdcxx = callPackage ./stdcxx { };
 
diff --git a/packages/sotest-producer/default.nix b/packages/sotest-producer/default.nix
new file mode 100644
index 0000000..d18e8ef
--- /dev/null
+++ b/packages/sotest-producer/default.nix
@@ -0,0 +1,39 @@
+# SPDX-License-Identifier: CC0-1.0
+
+{ stdenv, fetchgit, buildPackages, genode }:
+
+stdenv.mkDerivation rec {
+  pname = "sotest-producer";
+  version = "0.1.0";
+
+  nativeBuildInputs = with buildPackages; [ tup pkgconfig ];
+  buildInputs = with genode; [ base os ];
+
+  src = fetchgit {
+    url = "https://gitea.c3d2.de/ehmry/genode-sotest-producer.git";
+    rev = "v" + version;
+    sha256 = "0sqwjrfcjbzig5d9caxviy67z5shkycyzjjhhxm6xniwq7m7s6dg";
+  };
+
+  configurePhase = ''
+    # Scan repository and generate script
+    tup init
+    tup generate buildPhase.sh
+  '';
+
+  buildPhase = ''
+    pushd .
+    set -v
+    source buildPhase.sh
+    set +v
+    popd
+  '';
+
+  installPhase = "cp -r out $out";
+
+  meta = with stdenv.lib; {
+    license = "LicenseRef-Genode.txt";
+    maintainers = [ maintainers.ehmry ];
+  };
+
+}