cleanup apps
This commit is contained in:
parent
a5f0c3bc3a
commit
1735376f48
25
flake.nix
25
flake.nix
|
@ -122,22 +122,14 @@
|
||||||
|
|
||||||
apps =
|
apps =
|
||||||
# Utilities accessible via "nix run"
|
# Utilities accessible via "nix run"
|
||||||
let
|
forAllCrossSystems ({ system, localSystem, crossSystem }:
|
||||||
apps' = forAllCrossSystems ({ system, localSystem, crossSystem }:
|
|
||||||
import ./apps {
|
import ./apps {
|
||||||
inherit system;
|
inherit system;
|
||||||
self = self.apps.${system};
|
self = self.apps.${system};
|
||||||
nixpkgs = nixpkgsFor.${system};
|
nixpkgs = nixpkgsFor.${system};
|
||||||
nixpkgsLocal = nixpkgsFor.${localSystem};
|
nixpkgsLocal = nixpkgsFor.${localSystem};
|
||||||
packages = self.packages.${system};
|
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 =
|
nixosModules =
|
||||||
# Modules for composing Genode and NixOS
|
# Modules for composing Genode and NixOS
|
||||||
|
@ -145,9 +137,7 @@
|
||||||
|
|
||||||
checks =
|
checks =
|
||||||
# Checks for continous testing
|
# Checks for continous testing
|
||||||
let
|
forAllCrossSystems ({ system, localSystem, crossSystem }:
|
||||||
|
|
||||||
checks' = forAllCrossSystems ({ system, localSystem, crossSystem }:
|
|
||||||
let
|
let
|
||||||
nixos = nixpkgs.lib.nixosSystem {
|
nixos = nixpkgs.lib.nixosSystem {
|
||||||
system = localSystem;
|
system = localSystem;
|
||||||
|
@ -204,11 +194,8 @@
|
||||||
memorySize = 1024;
|
memorySize = 1024;
|
||||||
useBootLoader = true;
|
useBootLoader = true;
|
||||||
qemu = {
|
qemu = {
|
||||||
options = [
|
options =
|
||||||
"-machine q35"
|
[ "-machine q35" "-cpu phenom" "-serial mon:stdio" ];
|
||||||
"-cpu phenom"
|
|
||||||
"-serial mon:stdio"
|
|
||||||
];
|
|
||||||
networkingOptions = [
|
networkingOptions = [
|
||||||
"-net nic,netdev=user.0,model=e1000"
|
"-net nic,netdev=user.0,model=e1000"
|
||||||
"-netdev user,id=user.0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
|
"-netdev user,id=user.0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
|
||||||
|
@ -248,10 +235,6 @@
|
||||||
in nixos.config.system.build.vm;
|
in nixos.config.system.build.vm;
|
||||||
|
|
||||||
});
|
});
|
||||||
in {
|
|
||||||
aarch64-linux = checks'.aarch64-linux-aarch64-genode;
|
|
||||||
x86_64-linux = checks'.x86_64-linux-x86_64-genode;
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue