Make the syndicate test a proper package

packages/default.nix

@@ -52,6 +52,8 @@ in upstream // (with final; {
     portInputs = with genodeSources.ports; [ libc libssh openssl zlib ];
   };
 
+  syndicate_test = nimPackages.callPackage ./syndicate_test { };
+
   worldSources = prev.fetchFromGitHub {
     owner = "genodelabs";
     repo = "genode-world";

packages/syndicate_test/default.nix

@@ -0,0 +1,11 @@
+{ buildNimPackage, genode, npeg, preserves, syndicate }:
+
+buildNimPackage {
+  pname = "syndicate_test";
+  version = "unstable";
+  nimDefines.posix = { };
+  src = ./src;
+  propagatedBuildInputs = [ genode npeg preserves syndicate ];
+  nimBinOnly = true;
+  meta.mainProgram = "syndicate_test";
+}

packages/syndicate_test/src/syndicate_test.nimble

@@ -0,0 +1 @@
+bin = @["syndicate_test.nim"]

tests/default.nix

@@ -16,7 +16,7 @@ let
         ./hello.nix
         ./log.nix
         ./nim.nix
-        ./syndicate
+        ./syndicate.nix
         ./tor.nix
         ./usb.nix
         ./vmm_x86.nix

tests/syndicate.nix

@@ -3,16 +3,7 @@
   machine = { pkgs, ... }: {
     genode.init.verbose = true;
     genode.init.children.syndicate_service = {
-      package = with pkgs.nimPackages;
-        buildNimPackage rec {
-          pname = "syndicate";
-          version = "unstable";
-          nimDefines.posix = { };
-          src = ./src;
-          propagatedBuildInputs = [ genode npeg preserves syndicate ];
-          nimBinOnly = true;
-          meta.mainProgram = "test";
-        };
+      package = pkgs.genodePackages.syndicate_test;
       extraInputs = with pkgs.genodePackages; [ libc stdcxx ];
       configFile = builtins.toFile "nim.dhall" ''
         let Sigil = env:DHALL_SIGIL

tests/syndicate/src/test.nimble

@@ -1 +0,0 @@
-bin = @["test.nim"]