Remove Noux test, remove prebuilt depo packages
The stdenv is not building against the Noux libc, so remove it.
This commit is contained in:
parent
55c093e0c5
commit
a50b0a7d0e
39
flake.lock
39
flake.lock
|
@ -1,42 +1,6 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"genode-depot": {
|
|
||||||
"info": {
|
|
||||||
"lastModified": 1584019323,
|
|
||||||
"narHash": "sha256-/ZWsNeLI90r77T1GHABWjY5vtYFKDCUL+Io9ljfKgMA=",
|
|
||||||
"revCount": 8
|
|
||||||
},
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"ref": "master",
|
|
||||||
"rev": "025906c2146d81fb890532c6e46dbfda4cb38ede",
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.sr.ht/~ehmry/genode-depot"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.sr.ht/~ehmry/genode-depot"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"info": {
|
|
||||||
"lastModified": 1584015812,
|
|
||||||
"narHash": "sha256-oDj4g9nL3fp3xh0jAPZSHiucDxkLXA/rO3uM8L6kE0Y="
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "a3735dcbd7b2530ae3bcf73fd91e1ca6aa9449e7",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nixpkgs",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2": {
|
|
||||||
"info": {
|
"info": {
|
||||||
"lastModified": 1588878864,
|
"lastModified": 1588878864,
|
||||||
"narHash": "sha256-0FFvF2iZosl1402T90plIYZ+QPbKUZTbuIvgWPh6l/Y="
|
"narHash": "sha256-0FFvF2iZosl1402T90plIYZ+QPbKUZTbuIvgWPh6l/Y="
|
||||||
|
@ -56,8 +20,7 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"genode-depot": "genode-depot",
|
"nixpkgs": "nixpkgs"
|
||||||
"nixpkgs": "nixpkgs_2"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -5,11 +5,9 @@
|
||||||
|
|
||||||
description = "Genode packages";
|
description = "Genode packages";
|
||||||
|
|
||||||
inputs.genode-depot.uri = "git+https://git.sr.ht/~ehmry/genode-depot";
|
|
||||||
|
|
||||||
inputs.nixpkgs.uri = "github:ehmry/nixpkgs?ref=genode";
|
inputs.nixpkgs.uri = "github:ehmry/nixpkgs?ref=genode";
|
||||||
|
|
||||||
outputs = { self, genode-depot, nixpkgs }:
|
outputs = { self, nixpkgs }:
|
||||||
let
|
let
|
||||||
localSystems = [ "x86_64-linux" ];
|
localSystems = [ "x86_64-linux" ];
|
||||||
crossSystems = [ "x86_64-genode" ];
|
crossSystems = [ "x86_64-genode" ];
|
||||||
|
@ -125,7 +123,6 @@
|
||||||
inherit self;
|
inherit self;
|
||||||
apps = self.apps.${system};
|
apps = self.apps.${system};
|
||||||
buildPackages = nixpkgsFor.${localSystem};
|
buildPackages = nixpkgsFor.${localSystem};
|
||||||
depot = genode-depot.packages.${system};
|
|
||||||
genodepkgs = self.packages.${system};
|
genodepkgs = self.packages.${system};
|
||||||
lib = self.lib.${system};
|
lib = self.lib.${system};
|
||||||
nixpkgs = nixpkgsFor.${system};
|
nixpkgs = nixpkgsFor.${system};
|
||||||
|
|
|
@ -2,8 +2,7 @@
|
||||||
|
|
||||||
let tests = call: { log = call ./log.nix { }; };
|
let tests = call: { log = call ./log.nix { }; };
|
||||||
|
|
||||||
in { self, apps, buildPackages, depot, genodepkgs, lib, nixpkgs, legacyPackages
|
in { self, apps, buildPackages, genodepkgs, lib, nixpkgs, legacyPackages }:
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
testPkgs = genodepkgs;
|
testPkgs = genodepkgs;
|
||||||
|
@ -26,28 +25,26 @@ let
|
||||||
linux =
|
linux =
|
||||||
(call: ((tests call) // { block_router = call ./block_router.nix { }; }))
|
(call: ((tests call) // { block_router = call ./block_router.nix { }; }))
|
||||||
(import ./driver-linux.nix {
|
(import ./driver-linux.nix {
|
||||||
inherit apps addManifest buildPackages depot lib nixpkgs testPkgs;
|
inherit apps addManifest buildPackages lib nixpkgs testPkgs;
|
||||||
}).callTest;
|
}).callTest;
|
||||||
|
|
||||||
nova = (call:
|
nova = (call:
|
||||||
((tests call) // {
|
((tests call) // {
|
||||||
driver_manager = call ./driver_manager.nix { };
|
driver_manager = call ./driver_manager.nix { };
|
||||||
noux = call ./noux.nix { };
|
|
||||||
posix = call ./posix.nix { };
|
posix = call ./posix.nix { };
|
||||||
vmm = call ./vmm_x86.nix { };
|
vmm = call ./vmm_x86.nix { };
|
||||||
x86 = call ./x86.nix { };
|
x86 = call ./x86.nix { };
|
||||||
} // call ./solo5 { })) (import ./driver-nova.nix {
|
} // call ./solo5 { })) (import ./driver-nova.nix {
|
||||||
inherit apps addManifest buildPackages depot lib nixpkgs testPkgs
|
inherit apps addManifest buildPackages lib nixpkgs testPkgs
|
||||||
legacyPackages;
|
legacyPackages;
|
||||||
}).callTest;
|
}).callTest;
|
||||||
|
|
||||||
hw = (call:
|
hw = (call:
|
||||||
((tests call) // {
|
((tests call) // {
|
||||||
# noux = call ./noux.nix { };
|
|
||||||
posix = call ./posix.nix { };
|
posix = call ./posix.nix { };
|
||||||
x86 = call ./x86.nix { };
|
x86 = call ./x86.nix { };
|
||||||
} // call ./solo5 { })) (import ./driver-hw.nix {
|
} // call ./solo5 { })) (import ./driver-hw.nix {
|
||||||
inherit apps addManifest buildPackages depot lib nixpkgs testPkgs
|
inherit apps addManifest buildPackages lib nixpkgs testPkgs
|
||||||
legacyPackages;
|
legacyPackages;
|
||||||
}).callTest;
|
}).callTest;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
# SPDX-License-Identifier: CC0-1.0
|
# SPDX-License-Identifier: CC0-1.0
|
||||||
|
|
||||||
{ addManifest, apps, buildPackages, depot, lib, nixpkgs, testPkgs
|
{ addManifest, apps, buildPackages, lib, nixpkgs, testPkgs, legacyPackages }:
|
||||||
, legacyPackages }:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
testDriver = with buildPackages;
|
testDriver = with buildPackages;
|
||||||
|
@ -154,6 +153,6 @@ in {
|
||||||
isNova = true;
|
isNova = true;
|
||||||
};
|
};
|
||||||
pkgs = testPkgs;
|
pkgs = testPkgs;
|
||||||
inherit nixpkgs depot buildPackages legacyPackages;
|
inherit nixpkgs buildPackages legacyPackages;
|
||||||
} // args));
|
} // args));
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# SPDX-License-Identifier: CC0-1.0
|
# SPDX-License-Identifier: CC0-1.0
|
||||||
|
|
||||||
{ addManifest, apps, buildPackages, depot, lib, nixpkgs, testPkgs }:
|
{ addManifest, apps, buildPackages, lib, nixpkgs, testPkgs }:
|
||||||
|
|
||||||
let
|
let
|
||||||
testDriver = with buildPackages;
|
testDriver = with buildPackages;
|
||||||
|
@ -119,6 +119,6 @@ in {
|
||||||
isNova = false;
|
isNova = false;
|
||||||
};
|
};
|
||||||
pkgs = testPkgs;
|
pkgs = testPkgs;
|
||||||
inherit nixpkgs depot buildPackages;
|
inherit nixpkgs buildPackages;
|
||||||
} // args));
|
} // args));
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
# SPDX-License-Identifier: CC0-1.0
|
# SPDX-License-Identifier: CC0-1.0
|
||||||
|
|
||||||
{ addManifest, apps, buildPackages, depot, lib, nixpkgs, testPkgs
|
{ addManifest, apps, buildPackages, lib, nixpkgs, testPkgs, legacyPackages }:
|
||||||
, legacyPackages }:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
testDriver = with buildPackages;
|
testDriver = with buildPackages;
|
||||||
|
@ -155,6 +154,6 @@ in {
|
||||||
isNova = true;
|
isNova = true;
|
||||||
};
|
};
|
||||||
pkgs = testPkgs;
|
pkgs = testPkgs;
|
||||||
inherit nixpkgs depot buildPackages legacyPackages;
|
inherit nixpkgs buildPackages legacyPackages;
|
||||||
} // args));
|
} // args));
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# SPDX-License-Identifier: CC0-1.0
|
# SPDX-License-Identifier: CC0-1.0
|
||||||
|
|
||||||
{ testEnv, pkgs, depot, buildPackages, ... }:
|
{ testEnv, pkgs, buildPackages, ... }:
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
|
||||||
testEnv.mkTest {
|
testEnv.mkTest {
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
-- SPDX-License-Identifier: CC0-1.0
|
|
||||||
|
|
||||||
let Test = ./test.dhall ? env:DHALL_GENODE_TEST
|
|
||||||
|
|
||||||
let Genode = Test.Genode
|
|
||||||
|
|
||||||
let Child = Genode.Init.Child
|
|
||||||
|
|
||||||
in Test::{
|
|
||||||
, children = toMap
|
|
||||||
{ noux =
|
|
||||||
Child.flat
|
|
||||||
Child.Attributes::{
|
|
||||||
, binary = "noux"
|
|
||||||
, exitPropagate = True
|
|
||||||
, resources = Genode.Init.Resources::{
|
|
||||||
, caps = 500
|
|
||||||
, ram = Genode.units.MiB 10
|
|
||||||
}
|
|
||||||
, config = Genode.Init.Config::{
|
|
||||||
, attributes = toMap
|
|
||||||
{ stdin = "/script"
|
|
||||||
, stdout = "/dev/log"
|
|
||||||
, stderr = "/dev/log"
|
|
||||||
}
|
|
||||||
, content =
|
|
||||||
[ Genode.Prelude.XML.text
|
|
||||||
''
|
|
||||||
<fstab>
|
|
||||||
<tar name="bash-minimal.tar" />
|
|
||||||
<dir name="dev"> <log/> <null/> <zero/> </dir>
|
|
||||||
<dir name="tmp"> <ram /> </dir>
|
|
||||||
<inline name="script">
|
|
||||||
echo "hello world"
|
|
||||||
</inline>
|
|
||||||
</fstab>
|
|
||||||
<start name="/bin/bash">
|
|
||||||
<env name="TERM" value="screen" />
|
|
||||||
</start>
|
|
||||||
''
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,13 +0,0 @@
|
||||||
# SPDX-License-Identifier: CC0-1.0
|
|
||||||
|
|
||||||
{ testEnv, pkgs, depot, ... }:
|
|
||||||
with pkgs;
|
|
||||||
|
|
||||||
testEnv.mkTest rec {
|
|
||||||
name = "noux";
|
|
||||||
testConfig = ./noux.dhall;
|
|
||||||
testInputs = map pkgs.genodeSources.depot [ "noux" "vfs" "libc" "posix" ]
|
|
||||||
++ (with depot; [ bash-minimal ncurses ]);
|
|
||||||
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
|
|
||||||
testScript = "run_genode_until {SOTEST SUCCESS} 40";
|
|
||||||
}
|
|
|
@ -1,6 +1,6 @@
|
||||||
# SPDX-License-Identifier: CC0-1.0
|
# SPDX-License-Identifier: CC0-1.0
|
||||||
|
|
||||||
{ testEnv, pkgs, legacyPackages, depot, ... }:
|
{ testEnv, pkgs, legacyPackages, ... }:
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
|
||||||
testEnv.mkTest rec {
|
testEnv.mkTest rec {
|
||||||
|
|
Loading…
Reference in New Issue