Update flake
This commit is contained in:
parent
e14f33934e
commit
7388091a3e
49
flake.lock
49
flake.lock
|
@ -15,41 +15,60 @@
|
|||
"url": "git+https://github.com/nh2/nixpkgs.git?ref=static-haskell-nix-stack-dhall-working&rev=925aac04f4ca58aceb83beef18cb7dae0715421b"
|
||||
}
|
||||
},
|
||||
"narHash": "sha256-NGbS2bymVuCQcanlBO41I6ZjSAZSLXhACK3qQU25zUs=",
|
||||
"narHash": "sha256-KJl9ZLcMcEsLSPcwcWoc0Ac74/6HKC9LkVMeLwhyhlg=",
|
||||
"originalUrl": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake",
|
||||
"url": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake&rev=256810cd5adf1ae5862eed0ffdaab4cf49f6fe67"
|
||||
"url": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake&rev=aea28adf3d10ff1982aa4ddd176d1476251b932f"
|
||||
},
|
||||
"genode": {
|
||||
"inputs": {
|
||||
"dhall-haskell": {
|
||||
"inputs": {
|
||||
"nixpkgs": {
|
||||
"inputs": {},
|
||||
"narHash": "sha256-aFixJLbJ9ubH5I6ST8k9NRjb/d7o/MAu1Qc/1Sv6eRY=",
|
||||
"originalUrl": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode",
|
||||
"url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode&rev=489c8ae221fde2b011ebfc207eb3acb6573816ce"
|
||||
"narHash": "sha256-wJg4DA700SoQbEz61448sR6BgxRa1R92K3vvCV1g+HY=",
|
||||
"originalUrl": "git+https://github.com/nixos/nixpkgs.git?ref=18.09-beta&rev=1d4de0d552ae9aa66a5b8dee5fb0650a4372d148",
|
||||
"url": "git+https://github.com/nixos/nixpkgs.git?ref=18.09-beta&rev=1d4de0d552ae9aa66a5b8dee5fb0650a4372d148"
|
||||
},
|
||||
"nixpkgsStaticLinux": {
|
||||
"inputs": {},
|
||||
"narHash": "sha256-famU3pJZ4vkElV9qc71HmyRVSvcrAhfMZ0UJKpmmKP8=",
|
||||
"originalUrl": "git+https://github.com/nh2/nixpkgs.git?ref=static-haskell-nix-stack-dhall-working",
|
||||
"url": "git+https://github.com/nh2/nixpkgs.git?ref=static-haskell-nix-stack-dhall-working&rev=925aac04f4ca58aceb83beef18cb7dae0715421b"
|
||||
}
|
||||
},
|
||||
"narHash": "sha256-7X6XqNVzCzMRqq0LV+NLdfS1h7gWi+psnRNl4mwdPCY=",
|
||||
"narHash": "sha256-KJl9ZLcMcEsLSPcwcWoc0Ac74/6HKC9LkVMeLwhyhlg=",
|
||||
"originalUrl": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake",
|
||||
"url": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake&rev=aea28adf3d10ff1982aa4ddd176d1476251b932f"
|
||||
},
|
||||
"nixpkgs": {
|
||||
"inputs": {},
|
||||
"narHash": "sha256-EqxCk6ORqq4fkewWttpvks0VycBec9X9spAZ+Pq/CEI=",
|
||||
"originalUrl": "github:ehmry/nixpkgs",
|
||||
"url": "github:ehmry/nixpkgs/cf50f3b8bdc28832249afab6bca68acad832e011"
|
||||
}
|
||||
},
|
||||
"narHash": "sha256-nQ42ujMS0QcOk0xCGzdsjZNQS2z3RuxthIRE8na5YL0=",
|
||||
"originalUrl": "git+https://gitea.c3d2.de/ehmry/genode.git",
|
||||
"url": "git+https://gitea.c3d2.de/ehmry/genode.git?ref=master&rev=32f8b603cb09bd85b8ad9092b55b4f3869da19d5"
|
||||
"url": "git+https://gitea.c3d2.de/ehmry/genode.git?ref=master&rev=8c8606b375fb913864b0e51892da51eccf97df5f"
|
||||
},
|
||||
"genode-depot": {
|
||||
"inputs": {
|
||||
"nixpkgs": {
|
||||
"inputs": {},
|
||||
"narHash": "sha256-aFixJLbJ9ubH5I6ST8k9NRjb/d7o/MAu1Qc/1Sv6eRY=",
|
||||
"originalUrl": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode",
|
||||
"url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode&rev=489c8ae221fde2b011ebfc207eb3acb6573816ce"
|
||||
"narHash": "sha256-NB+H7zK3BB//zM127FqgbG4iAfY+nS/IOyO+uGWA5Ho=",
|
||||
"originalUrl": "nixpkgs",
|
||||
"url": "github:edolstra/nixpkgs/7845bf5f4b3013df1cf036e9c9c3a55a30331db9"
|
||||
}
|
||||
},
|
||||
"narHash": "sha256-oPigZTib2kL1FVllm4xkf1l8eS9peXi1PFSdvrbYRK0=",
|
||||
"narHash": "sha256-72QPBUP9EaIPGneWDLYIb6Wo5XR/lmijobDlaX8iKHA=",
|
||||
"originalUrl": "git+https://gitea.c3d2.de/ehmry/genode-depot.git",
|
||||
"url": "git+https://gitea.c3d2.de/ehmry/genode-depot.git?ref=master&rev=a951bb013b0c053e858ccaf3672b7ab85580695d"
|
||||
"url": "git+https://gitea.c3d2.de/ehmry/genode-depot.git?ref=master&rev=4e85cc4dd28d868d28815be4c925b1bb64d19939"
|
||||
},
|
||||
"nixpkgs": {
|
||||
"inputs": {},
|
||||
"narHash": "sha256-aFixJLbJ9ubH5I6ST8k9NRjb/d7o/MAu1Qc/1Sv6eRY=",
|
||||
"originalUrl": "git+https://gitea.c3d2.de/ehmry/nixpkgs?ref=genode",
|
||||
"url": "git+https://gitea.c3d2.de/ehmry/nixpkgs?ref=genode&rev=489c8ae221fde2b011ebfc207eb3acb6573816ce"
|
||||
"narHash": "sha256-EqxCk6ORqq4fkewWttpvks0VycBec9X9spAZ+Pq/CEI=",
|
||||
"originalUrl": "github:ehmry/nixpkgs",
|
||||
"url": "github:ehmry/nixpkgs/cf50f3b8bdc28832249afab6bca68acad832e011"
|
||||
}
|
||||
},
|
||||
"version": 3
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
"git+https://github.com/dhall-lang/dhall-haskell?ref=flake";
|
||||
genode-depot.uri = "git+https://gitea.c3d2.de/ehmry/genode-depot.git";
|
||||
genode.uri = "git+https://gitea.c3d2.de/ehmry/genode.git";
|
||||
nixpkgs.uri = "git+https://gitea.c3d2.de/ehmry/nixpkgs?ref=genode";
|
||||
nixpkgs.uri = "github:ehmry/nixpkgs";
|
||||
};
|
||||
|
||||
outputs = { self, dhall-haskell, genode-depot, genode, nixpkgs }:
|
||||
|
|
|
@ -1,11 +1,15 @@
|
|||
{ system, localSystem, crossSystem, genodepkgs, nixpkgs, dhall-haskell, genode-depot }:
|
||||
|
||||
let
|
||||
thisSystem = builtins.getAttr system;
|
||||
hostPkgs = import nixpkgs {
|
||||
system = localSystem;
|
||||
overlays = [ (self: super: { inherit (dhall-haskell.packages) dhall; }) ];
|
||||
overlays = [
|
||||
(self: super: {
|
||||
inherit (builtins.getAttr localSystem dhall-haskell.packages) dhall;
|
||||
})
|
||||
];
|
||||
};
|
||||
thisSystem = builtins.getAttr system;
|
||||
testPkgs = thisSystem genodepkgs.packages;
|
||||
depot = thisSystem genode-depot.packages;
|
||||
|
||||
|
@ -132,7 +136,7 @@ in {
|
|||
strip boot/image.elf
|
||||
|
||||
# build ISO image
|
||||
cp ${testPkgs.nova}/hypervisor* boot/hypervisor
|
||||
cp ${testPkgs.NOVA}/hypervisor* boot/hypervisor
|
||||
cp ${./nova-isolinux.cfg} boot/syslinux/isolinux.cfg
|
||||
cp \
|
||||
${syslinuxDir}/isolinux.bin \
|
||||
|
|
|
@ -3,12 +3,11 @@
|
|||
# SPDX-License-Identifier: LicenseRef-Hippocratic-1.1
|
||||
|
||||
let
|
||||
tests = call: {
|
||||
tests = call:
|
||||
{
|
||||
fs_report = call ./fs_report.nix { };
|
||||
log = call ./log.nix { };
|
||||
signal = call ./signal.nix { };
|
||||
# solo5 = call ./solo5 { };
|
||||
};
|
||||
} // call ./solo5 { };
|
||||
|
||||
in { self, system, localSystem, crossSystem, genodepkgs, nixpkgs, dhall-haskell, genode-depot, lib }:
|
||||
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
let Genode = env:DHALL_GENODE ? ../dhall-genode/package.dhall
|
||||
|
||||
in λ(_ : {})
|
||||
→ Genode.Init::{
|
||||
, verbose = True
|
||||
, children =
|
||||
toMap { test-log = Genode.Init.Start::{ binary = "test-log" } }
|
||||
}
|
|
@ -1,13 +0,0 @@
|
|||
{ testEnv, pkgs, ... }:
|
||||
with pkgs;
|
||||
|
||||
testEnv.mkTest rec {
|
||||
name = "log";
|
||||
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
|
||||
|
||||
testConfig = testEnv.lib.renderDhallInit ./log.dhall "{=}";
|
||||
|
||||
bootModules.test-log = "${base}/bin/test-log";
|
||||
|
||||
testScript = "run_genode_until {Test done.} 10";
|
||||
}
|
|
@ -1,7 +1,10 @@
|
|||
let Genode = env:DHALL_GENODE
|
||||
|
||||
in λ(_ : {})
|
||||
→ { solo5 =
|
||||
→ Genode.Init::{
|
||||
, children =
|
||||
toMap
|
||||
{ solo5 =
|
||||
Genode.Init.Start::{
|
||||
, binary = "test"
|
||||
, resources = { caps = 256, ram = Genode.units.MiB 3 }
|
||||
|
@ -16,9 +19,12 @@ in λ(_ : {})
|
|||
, provides = [ "Block" ]
|
||||
, resources = { caps = 96, ram = Genode.units.MiB 9 }
|
||||
, config =
|
||||
Genode.Prelude.XML.text
|
||||
Some
|
||||
( Genode.Prelude.XML.text
|
||||
''
|
||||
<config size="8M" block_size="4096"/>
|
||||
''
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ testEnv, pkgs }:
|
||||
{ testEnv, pkgs, ... }:
|
||||
with pkgs;
|
||||
|
||||
let
|
||||
|
@ -28,7 +28,7 @@ let
|
|||
name = "blk";
|
||||
bootModules = {
|
||||
test = "${solo5.tests}/bin/solo5-test_blk";
|
||||
ram_block = "${genode-os}/bin/ram_block";
|
||||
ram_block = "${os}/bin/ram_block";
|
||||
};
|
||||
testConfig = testEnv.lib.renderDhallInit ./blk.dhall "{=}";
|
||||
}
|
||||
|
@ -69,7 +69,7 @@ let
|
|||
name = "mft_maxdevices";
|
||||
bootModules = {
|
||||
test = "${solo5.tests}/bin/solo5-test_mft_maxdevices";
|
||||
rom_block = "${genode-os}/bin/rom_block";
|
||||
rom_block = "${os}/bin/rom_block";
|
||||
};
|
||||
testConfig = testEnv.lib.renderDhallInit ./mft_maxdevices.dhall "{=}";
|
||||
}
|
||||
|
@ -79,9 +79,9 @@ let
|
|||
name = "net";
|
||||
bootModules = {
|
||||
test = "${solo5.tests}/bin/solo5-test_net";
|
||||
nic_bridge = "${genode-os}/bin/nic_bridge";
|
||||
nic_loopback = "${genode-os}/bin/nic_loopback";
|
||||
ping = "${genode-os}/bin/ping";
|
||||
nic_bridge = "${os}/bin/nic_bridge";
|
||||
nic_loopback = "${os}/bin/nic_loopback";
|
||||
ping = "${os}/bin/ping";
|
||||
};
|
||||
testConfig = testEnv.lib.renderDhallInit ./net.dhall "{=}";
|
||||
testScript = ''
|
||||
|
@ -93,10 +93,10 @@ let
|
|||
name = "net_2if";
|
||||
bootModules = {
|
||||
test = "${solo5.tests}/bin/solo5-test_net_2if";
|
||||
sequence = "${genode-os}/bin/sequence";
|
||||
nic_bridge = "${genode-os}/bin/nic_bridge";
|
||||
nic_loopback = "${genode-os}/bin/nic_loopback";
|
||||
ping = "${genode-os}/bin/ping";
|
||||
sequence = "${os}/bin/sequence";
|
||||
nic_bridge = "${os}/bin/nic_bridge";
|
||||
nic_loopback = "${os}/bin/nic_loopback";
|
||||
ping = "${os}/bin/ping";
|
||||
};
|
||||
testConfig = testEnv.lib.renderDhallInit ./net_2if.dhall "{=}";
|
||||
testScript = ''
|
||||
|
@ -151,7 +151,7 @@ let
|
|||
name = "time";
|
||||
bootModules = {
|
||||
test = "${solo5.tests}/bin/solo5-test_time";
|
||||
rtc_drv = "${genode-os}/bin/rtc_drv";
|
||||
rtc_drv = "${os}/bin/rtc_drv";
|
||||
};
|
||||
testConfig = testEnv.lib.renderDhallInit ./time.dhall "{=}";
|
||||
}
|
||||
|
|
|
@ -1,8 +1,14 @@
|
|||
let Genode = env:DHALL_GENODE
|
||||
|
||||
in λ(_ : {})
|
||||
→ { nic =
|
||||
Genode.Init.Start::{ binary = "nic_loopback", provides = [ "Nic" ] }
|
||||
→ Genode.Init::{
|
||||
, children =
|
||||
toMap
|
||||
{ nic =
|
||||
Genode.Init.Start::{
|
||||
, binary = "nic_loopback"
|
||||
, provides = [ "Nic" ]
|
||||
}
|
||||
, bridge =
|
||||
Genode.Init.Start::{
|
||||
, binary = "nic_bridge"
|
||||
|
@ -10,13 +16,15 @@ in λ(_ : {})
|
|||
, provides = [ "Nic" ]
|
||||
, routes = [ Genode.ServiceRoute.child "Nic" "nic" ]
|
||||
, config =
|
||||
Genode.Prelude.XML.text
|
||||
Some
|
||||
( Genode.Prelude.XML.text
|
||||
''
|
||||
<config mac="02:02:02:02:03:00" verbose="no">
|
||||
<policy label_prefix="solo5" ip_addr="10.0.0.2"/>
|
||||
<default-policy/>
|
||||
</config>
|
||||
''
|
||||
)
|
||||
}
|
||||
, solo5 =
|
||||
Genode.Init.Start::{
|
||||
|
@ -27,10 +35,12 @@ in λ(_ : {})
|
|||
, Genode.ServiceRoute.child "Nic" "bridge"
|
||||
]
|
||||
, config =
|
||||
Genode.Prelude.XML.text
|
||||
Some
|
||||
( Genode.Prelude.XML.text
|
||||
''
|
||||
<config><cmdline>limit</cmdline></config>
|
||||
''
|
||||
)
|
||||
}
|
||||
, ping =
|
||||
Genode.Init.Start::{
|
||||
|
@ -41,7 +51,8 @@ in λ(_ : {})
|
|||
, Genode.ServiceRoute.child "Nic" "bridge"
|
||||
]
|
||||
, config =
|
||||
Genode.Prelude.XML.text
|
||||
Some
|
||||
( Genode.Prelude.XML.text
|
||||
''
|
||||
<config interface="10.0.0.72/24"
|
||||
dst_ip="10.0.0.2"
|
||||
|
@ -49,5 +60,7 @@ in λ(_ : {})
|
|||
verbose="no"
|
||||
count="8"/>
|
||||
''
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,8 +3,14 @@ let Genode = env:DHALL_GENODE
|
|||
in λ ( _
|
||||
: {}
|
||||
)
|
||||
→ { nic =
|
||||
Genode.Init.Start::{ binary = "nic_loopback", provides = [ "Nic" ] }
|
||||
→ Genode.Init::{
|
||||
, children =
|
||||
toMap
|
||||
{ nic =
|
||||
Genode.Init.Start::{
|
||||
, binary = "nic_loopback"
|
||||
, provides = [ "Nic" ]
|
||||
}
|
||||
, bridge =
|
||||
Genode.Init.Start::{
|
||||
, binary = "nic_bridge"
|
||||
|
@ -12,7 +18,8 @@ in λ ( _
|
|||
, provides = [ "Nic" ]
|
||||
, routes = [ Genode.ServiceRoute.child "Nic" "nic" ]
|
||||
, config =
|
||||
Genode.Prelude.XML.text
|
||||
Some
|
||||
( Genode.Prelude.XML.text
|
||||
''
|
||||
<config mac="02:02:02:02:03:00" verbose="no">
|
||||
<policy label="solo5 -> service0" ip_addr="10.0.0.2"/>
|
||||
|
@ -20,6 +27,7 @@ in λ ( _
|
|||
<default-policy/>
|
||||
</config>
|
||||
''
|
||||
)
|
||||
}
|
||||
, solo5 =
|
||||
Genode.Init.Start::{
|
||||
|
@ -30,10 +38,12 @@ in λ ( _
|
|||
, Genode.ServiceRoute.child "Nic" "bridge"
|
||||
]
|
||||
, config =
|
||||
Genode.Prelude.XML.text
|
||||
Some
|
||||
( Genode.Prelude.XML.text
|
||||
''
|
||||
<config><cmdline>limit</cmdline></config>
|
||||
''
|
||||
)
|
||||
}
|
||||
, clients =
|
||||
Genode.Init.Start::{
|
||||
|
@ -44,7 +54,8 @@ in λ ( _
|
|||
, Genode.ServiceRoute.child "Nic" "bridge"
|
||||
]
|
||||
, config =
|
||||
Genode.Prelude.XML.text
|
||||
Some
|
||||
( Genode.Prelude.XML.text
|
||||
''
|
||||
<config>
|
||||
<start name="ping0">
|
||||
|
@ -57,5 +68,7 @@ in λ ( _
|
|||
</start>
|
||||
</config>
|
||||
''
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,17 +1,23 @@
|
|||
let Genode = env:DHALL_GENODE
|
||||
|
||||
in λ(_ : {})
|
||||
→ { solo5 =
|
||||
→ Genode.Init::{
|
||||
, children =
|
||||
toMap
|
||||
{ solo5 =
|
||||
Genode.Init.Start::{
|
||||
, binary = "test"
|
||||
, resources = { caps = 256, ram = Genode.units.MiB 3 }
|
||||
, routes = [ Genode.ServiceRoute.parent "Timer" ]
|
||||
, config =
|
||||
Genode.Prelude.XML.text
|
||||
Some
|
||||
( Genode.Prelude.XML.text
|
||||
''
|
||||
<config>
|
||||
<cmdline>Hello_Solo5</cmdline>
|
||||
</config>
|
||||
''
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue