diff --git a/.gitignore b/.gitignore index 0d20b6487..60f51c838 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.pyc +/result diff --git a/default.nix b/default.nix index 926e059ab..72b45bedb 100644 --- a/default.nix +++ b/default.nix @@ -17,6 +17,11 @@ pkgs.python3.pkgs.buildPythonPackage rec { psutil ]; + propagatedBuildInputs = [ + pkgs.file + pkgs.qemu + ]; + create_bridge = ./vmrunner/bin/create_bridge.sh; passthru = { diff --git a/flake.lock b/flake.lock new file mode 100644 index 000000000..721737901 --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1748026580, + "narHash": "sha256-rWtXrcIzU5wm/C8F9LWvUfBGu5U5E7cFzPYT1pHIJaQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "11cb3517b3af6af300dd6c055aeda73c9bf52c48", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 000000000..6bc15a6bc --- /dev/null +++ b/flake.nix @@ -0,0 +1,33 @@ +{ + description = "A convenience wrapper around qemu for IncludeOS integration tests"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/25.05"; + }; + + outputs = { self, nixpkgs }: + let + system = "x86_64-linux"; + pkgs = import nixpkgs { inherit system; }; + vmrunner = pkgs.callPackage ./default.nix {}; + in { + packages.${system}.default = vmrunner; + + devShells.${system}.default = import ./shell.nix { inherit pkgs; }; + + apps.${system}.default = { + type = "app"; + program = "${vmrunner}/bin/boot"; + }; + + lib.${system}.mkBoot = chainloader: pkgs.symlinkJoin { + name = "boot-with-chainloader"; + paths = [ vmrunner ]; + buildInputs = [ pkgs.makeWrapper ]; + postBuild = '' + wrapProgram $out/bin/boot \ + --set INCLUDEOS_CHAINLOADER ${chainloader}/bin/ + ''; + }; + }; +}