|
|
|
@ -1,16 +1,16 @@
|
|
|
|
|
# SPDX-License-Identifier: CC0-1.0
|
|
|
|
|
|
|
|
|
|
{ system, legacyPackages, localPackages, depot, apps }:
|
|
|
|
|
{ nixpkgs }:
|
|
|
|
|
|
|
|
|
|
let
|
|
|
|
|
inherit (legacyPackages) callPackage;
|
|
|
|
|
dhallPackages = localPackages.callPackage ./dhall { };
|
|
|
|
|
inherit (nixpkgs) callPackage;
|
|
|
|
|
dhallPackages = nixpkgs.buildPackages.callPackage ./dhall { };
|
|
|
|
|
|
|
|
|
|
genodeLabs = import ./genodelabs { nixpkgs = legacyPackages; };
|
|
|
|
|
genodeLabs = import ./genodelabs { inherit nixpkgs; };
|
|
|
|
|
inherit (genodeLabs) buildUpstream;
|
|
|
|
|
|
|
|
|
|
buildWorld = let
|
|
|
|
|
genodeWorld = legacyPackages.fetchFromGitHub {
|
|
|
|
|
genodeWorld = nixpkgs.fetchFromGitHub {
|
|
|
|
|
owner = "genodelabs";
|
|
|
|
|
repo = "genode-world";
|
|
|
|
|
rev = "0ed545e55a90c39df23a86eb733961de71d56241";
|
|
|
|
@ -25,7 +25,7 @@ let
|
|
|
|
|
genodeTupRules = ./Tuprules.tup;
|
|
|
|
|
|
|
|
|
|
in rec {
|
|
|
|
|
inherit (legacyPackages) stdenv;
|
|
|
|
|
inherit (nixpkgs) stdenv;
|
|
|
|
|
inherit (genodeLabs) genodeSources; # toolchain;
|
|
|
|
|
|
|
|
|
|
base-hw-pc = buildUpstream {
|
|
|
|
@ -51,7 +51,7 @@ in rec {
|
|
|
|
|
mv $out/ld-linux.lib.so $out/lib/ld.lib.so
|
|
|
|
|
mv $out/linux_timer_drv $out/timer_drv
|
|
|
|
|
'';
|
|
|
|
|
HOST_INC_DIR = legacyPackages.buildPackages.glibc.dev + "/include";
|
|
|
|
|
HOST_INC_DIR = nixpkgs.buildPackages.glibc.dev + "/include";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
base-nova = buildUpstream {
|
|
|
|
@ -74,10 +74,10 @@ in rec {
|
|
|
|
|
portInputs = with genodeSources.ports; [ libc libssh openssl zlib ];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
bender = legacyPackages.buildPackages.callPackage ./bender { };
|
|
|
|
|
bender = nixpkgs.buildPackages.callPackage ./bender { };
|
|
|
|
|
|
|
|
|
|
block_router = let
|
|
|
|
|
src = legacyPackages.fetchgit {
|
|
|
|
|
src = nixpkgs.fetchgit {
|
|
|
|
|
url = "https://git.sr.ht/~ehmry/block_router";
|
|
|
|
|
rev = "dd78a4824bbc28c5760fda55e9d5dd23cbee8ecf";
|
|
|
|
|
sha256 = "1444nfgbgqggmyhjh81aac3mwixh7h6m1qmk8ikinf8gnl9mbngx";
|
|
|
|
@ -92,7 +92,7 @@ in rec {
|
|
|
|
|
|
|
|
|
|
dhallGenode = dhallPackages.genode;
|
|
|
|
|
|
|
|
|
|
NOVA = legacyPackages.callPackage ./NOVA { };
|
|
|
|
|
NOVA = callPackage ./NOVA { };
|
|
|
|
|
|
|
|
|
|
solo5 = let drv = callPackage ./solo5 { };
|
|
|
|
|
in drv // { tests = drv.tests // { pname = "solo5-tests"; }; };
|
|
|
|
|