add nix run

Makefile

@@ -10,7 +10,4 @@ build:
 	cd calendar && make build-js
 
 clean:
-	rm nixos.qcow2
-
-run:
-	QEMU_NET_OPTS="hostfwd=tcp::8080-:80,hostfwd=tcp::1433-:143,hostfwd=tcp::5877-:587" nixos-shell vm-nextcloud.nix
+	rm nixos.qcow2

README.md

@@ -4,13 +4,13 @@ Build test environment
 git clone https://github.com/onny/nixos-nextcloud-testumgebung.git
 cd nixos-nextcloud-testumgebung
 nix develop
-make
+make build
 ```
 
 Run virtual machine
 
 ```
-make run
+nix run
 ```
 
 Requires NixOS :)

flake.nix

@@ -6,16 +6,24 @@
   outputs = { self, nixpkgs }:
     let
       pkgs = import nixpkgs { system = "x86_64-linux"; };
+      start =
+        pkgs.writeShellScriptBin "start" ''
+          set -e
+          export QEMU_NET_OPTS="hostfwd=tcp::8080-:80,hostfwd=tcp::1433-:143,hostfwd=tcp::5877-:587"
+          ${pkgs.nixos-shell}/bin/nixos-shell vm-nextcloud.nix
+        '';
     in
     {
       devShells.x86_64-linux.default = pkgs.mkShell {
         packages = with pkgs; [
           phpPackages.composer
-          phpPackages.phpunit
+          phpunit
           nixos-shell
           nodejs
         ];
       };
+      packages = { inherit start; };
+      defaultPackage = start;
     };
 }
 

server

@@ -1 +1 @@
-Subproject commit 6e77eaa618820ca61fadaa3bbc8950efad3602ce
+Subproject commit 95eeba83b6570b3cf7cbb79aea42222f7d3e03f4