cleanup apps

flake.nix

@@ -122,22 +122,14 @@
 
       apps =
         # Utilities accessible via "nix run"
-        let
-          apps' = forAllCrossSystems ({ system, localSystem, crossSystem }:
+        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; };
 
       nixosModules =
         # Modules for composing Genode and NixOS
@@ -145,9 +137,7 @@
 
       checks =
         # Checks for continous testing
-        let
-
-          checks' = forAllCrossSystems ({ system, localSystem, crossSystem }:
+        forAllCrossSystems ({ system, localSystem, crossSystem }:
           let
             nixos = nixpkgs.lib.nixosSystem {
               system = localSystem;
@@ -204,11 +194,8 @@
                       memorySize = 1024;
                       useBootLoader = true;
                       qemu = {
-                          options = [
-                            "-machine q35"
-                            "-cpu phenom"
-                            "-serial mon:stdio"
-                          ];
+                        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}"
@@ -248,10 +235,6 @@
             in nixos.config.system.build.vm;
 
           });
-        in {
-          aarch64-linux = checks'.aarch64-linux-aarch64-genode;
-          x86_64-linux = checks'.x86_64-linux-x86_64-genode;
-        };
 
     };
 }

packages/genodelabs/gcc-port.patch

@@ -0,0 +1,22 @@
+commit 30d76a7231701e20e82ee025a36541e3bbc7276a
+Author: Emery Hemingway <ehmry@posteo.net>
+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