From 1735376f481949ba16ba197b676d3bcca030c885 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 15 Aug 2020 19:54:01 +0200 Subject: [PATCH] cleanup apps --- flake.nix | 179 +++++++++++++---------------- packages/genodelabs/gcc-port.patch | 22 ++++ 2 files changed, 103 insertions(+), 98 deletions(-) create mode 100644 packages/genodelabs/gcc-port.patch diff --git a/flake.nix b/flake.nix index 2b2818d..c8a9523 100644 --- a/flake.nix +++ b/flake.nix @@ -122,22 +122,14 @@ apps = # Utilities accessible via "nix run" - let - apps' = forAllCrossSystems ({ system, localSystem, crossSystem }: - import ./apps { - inherit system; - self = self.apps.${system}; - nixpkgs = nixpkgsFor.${system}; - nixpkgsLocal = nixpkgsFor.${localSystem}; - packages = self.packages.${system}; - } // { - nixosModule = { - type = "app"; - program = - "${self.checks.${localSystem}.nixosGuest}/bin/run-nixos-vm"; - }; - }); - in apps' // { x86_64-linux = apps'.x86_64-linux-x86_64-genode; }; + forAllCrossSystems ({ system, localSystem, crossSystem }: + import ./apps { + inherit system; + self = self.apps.${system}; + nixpkgs = nixpkgsFor.${system}; + nixpkgsLocal = nixpkgsFor.${localSystem}; + packages = self.packages.${system}; + }); nixosModules = # Modules for composing Genode and NixOS @@ -145,10 +137,51 @@ checks = # Checks for continous testing - let + forAllCrossSystems ({ system, localSystem, crossSystem }: + let + nixos = nixpkgs.lib.nixosSystem { + system = localSystem; + modules = [ + self.nixosModules.genodeHost + ({ modulesPath, ... }: { + imports = [ "${modulesPath}/virtualisation/qemu-vm.nix" ]; + boot.loader.grub.extraEntriesBeforeNixOS = true; + virtualisation = { + cores = 2; + memorySize = 1024; + useBootLoader = true; + qemu = { + options = + [ "-machine q35" "-cpu phenom" "-serial mon:stdio" ]; + networkingOptions = [ + "-net nic,netdev=user.0,model=e1000" + "-netdev user,id=user.0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" + ]; + }; + }; + }) + ]; + }; + in import ./tests { + inherit self; + apps = self.apps.${system}; + localPackages = nixpkgsFor.${localSystem}; + genodepkgs = self.packages.${system}; + lib = self.lib.${system}; + nixpkgs = nixpkgsFor.${system}; + legacyPackages = self.legacyPackages.${system}; + } // { - checks' = forAllCrossSystems ({ system, localSystem, crossSystem }: - let + ports = nixpkgsFor.${localSystem}.symlinkJoin { + name = "ports"; + paths = (builtins.attrValues + self.packages.${system}.genodeSources.ports); + }; + + nixosModule = nixos.config.system.build.vm; + nixosXML = nixos.config.system.build.genode.xml; + + nixosGuest = let nixos = nixpkgs.lib.nixosSystem { system = localSystem; modules = [ @@ -169,89 +202,39 @@ ]; }; }; + genode.guests = { + flakeCheck = { + config = { config, lib, pkgs, ... }: { + networking.firewall.allowedTCPPorts = [ 80 ]; + services.mingetty.autologinUser = + lib.mkDefault "root"; + services.nginx.enable = true; + services.openssh.permitRootLogin = + lib.mkDefault "yes"; + services.sshd.enable = true; + users.users.root.password = "nixos"; + virtualbox.memorySize = 128; + }; + }; + azimuth = { + bootFormat = "vdi"; + config = { config, lib, pkgs, ... }: { + services.cage = { + enable = true; + program = "${pkgs.azimuth}/bin/tor-azimuth"; + }; + users.users.demo.isNormalUser = true; + virtualbox.memorySize = 1024; + }; + }; + }; + }) ]; }; - in import ./tests { - inherit self; - apps = self.apps.${system}; - localPackages = nixpkgsFor.${localSystem}; - genodepkgs = self.packages.${system}; - lib = self.lib.${system}; - nixpkgs = nixpkgsFor.${system}; - legacyPackages = self.legacyPackages.${system}; - } // { + in nixos.config.system.build.vm; - ports = nixpkgsFor.${localSystem}.symlinkJoin { - name = "ports"; - paths = (builtins.attrValues - self.packages.${system}.genodeSources.ports); - }; - - nixosModule = nixos.config.system.build.vm; - nixosXML = nixos.config.system.build.genode.xml; - - nixosGuest = let - nixos = nixpkgs.lib.nixosSystem { - system = localSystem; - modules = [ - self.nixosModules.genodeHost - ({ modulesPath, ... }: { - imports = [ "${modulesPath}/virtualisation/qemu-vm.nix" ]; - boot.loader.grub.extraEntriesBeforeNixOS = true; - virtualisation = { - cores = 2; - memorySize = 1024; - useBootLoader = true; - qemu = { - options = [ - "-machine q35" - "-cpu phenom" - "-serial mon:stdio" - ]; - networkingOptions = [ - "-net nic,netdev=user.0,model=e1000" - "-netdev user,id=user.0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" - ]; - }; - }; - genode.guests = { - flakeCheck = { - config = { config, lib, pkgs, ... }: { - networking.firewall.allowedTCPPorts = [ 80 ]; - services.mingetty.autologinUser = - lib.mkDefault "root"; - services.nginx.enable = true; - services.openssh.permitRootLogin = - lib.mkDefault "yes"; - services.sshd.enable = true; - users.users.root.password = "nixos"; - virtualbox.memorySize = 128; - }; - }; - azimuth = { - bootFormat = "vdi"; - config = { config, lib, pkgs, ... }: { - services.cage = { - enable = true; - program = "${pkgs.azimuth}/bin/tor-azimuth"; - }; - users.users.demo.isNormalUser = true; - virtualbox.memorySize = 1024; - }; - }; - }; - - }) - ]; - }; - in nixos.config.system.build.vm; - - }); - in { - aarch64-linux = checks'.aarch64-linux-aarch64-genode; - x86_64-linux = checks'.x86_64-linux-x86_64-genode; - }; + }); }; } diff --git a/packages/genodelabs/gcc-port.patch b/packages/genodelabs/gcc-port.patch new file mode 100644 index 0000000..69ee4dc --- /dev/null +++ b/packages/genodelabs/gcc-port.patch @@ -0,0 +1,22 @@ +commit 30d76a7231701e20e82ee025a36541e3bbc7276a +Author: Emery Hemingway +Date: Sat Aug 15 17:19:10 2020 +0200 + + gcc.port: remove check_tool tests + +diff --git a/repos/ports/ports/gcc.port b/repos/ports/ports/gcc.port +index 5a6c6bb683..39fecd2fee 100644 +--- a/repos/ports/ports/gcc.port ++++ b/repos/ports/ports/gcc.port +@@ -14,11 +14,6 @@ PATCH_OPT := -p1 -d ${DIR(gcc)} + + HASH_INPUT += $(REP_DIR)/${DIR(gcc)}/patches/series + +-AUTOCONF := autoconf2.64 +- +-$(call check_tool,$(AUTOCONF)) +-$(call check_tool,autogen) +- + default: _patch + @# + @# Re-generate configure scripts