diff --git a/packages/default.nix b/packages/default.nix index 5e8c7ee..66bc04e 100644 --- a/packages/default.nix +++ b/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"; diff --git a/packages/syndicate_test/default.nix b/packages/syndicate_test/default.nix new file mode 100644 index 0000000..8c005cd --- /dev/null +++ b/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"; +} diff --git a/tests/syndicate/src/test.nim b/packages/syndicate_test/src/syndicate_test.nim similarity index 100% rename from tests/syndicate/src/test.nim rename to packages/syndicate_test/src/syndicate_test.nim diff --git a/packages/syndicate_test/src/syndicate_test.nimble b/packages/syndicate_test/src/syndicate_test.nimble new file mode 100644 index 0000000..aa35685 --- /dev/null +++ b/packages/syndicate_test/src/syndicate_test.nimble @@ -0,0 +1 @@ +bin = @["syndicate_test.nim"] diff --git a/tests/default.nix b/tests/default.nix index d585d04..6123adf 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -16,7 +16,7 @@ let ./hello.nix ./log.nix ./nim.nix - ./syndicate + ./syndicate.nix ./tor.nix ./usb.nix ./vmm_x86.nix diff --git a/tests/syndicate/default.nix b/tests/syndicate.nix similarity index 77% rename from tests/syndicate/default.nix rename to tests/syndicate.nix index 504949c..f676817 100644 --- a/tests/syndicate/default.nix +++ b/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 diff --git a/tests/syndicate/src/test.nimble b/tests/syndicate/src/test.nimble deleted file mode 100644 index b098e1c..0000000 --- a/tests/syndicate/src/test.nimble +++ /dev/null @@ -1 +0,0 @@ -bin = @["test.nim"]