ehmry/genodepkgs
ehmry
/
genodepkgs
2
0
Fork 0
Code Releases Activity

Reduction

This commit is contained in:
Ehmry - 2020-03-27 12:35:41 +05:30
parent 04d1588044
commit e0742fef4e
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flake.nix
View File

@ -62,7 +62,6 @@
inherit system localSystem crossSystem; inherit system localSystem crossSystem;
apps = self.apps.${system}; apps = self.apps.${system};
nixpkgs = nixpkgsFor.${system}; nixpkgs = nixpkgsFor.${system};
genode-depot = genode-depot.packages.${system};
genodepkgs = self; genodepkgs = self;
})); }));
@ -71,13 +70,7 @@
# pass thru Nixpkgs # pass thru Nixpkgs
packages = forAllCrossSystems ({ system, localSystem, crossSystem }: packages = forAllCrossSystems ({ system, localSystem, crossSystem }:
import ./packages { import ./packages { nixpkgs = nixpkgsFor.${system}; });
inherit system;
legacyPackages = self.legacyPackages.${system};
apps = self.apps.${system};
localPackages = nixpkgs.legacyPackages.${localSystem};
depot = genode-depot.packages.${system};
});
devShell = forAllLocalSystems (system: devShell = forAllLocalSystems (system:
let let

3
lib/default.nix
View File

@ -1,12 +1,11 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
{ system, localSystem, crossSystem, genodepkgs, nixpkgs, genode-depot, apps }: { system, localSystem, crossSystem, genodepkgs, nixpkgs, apps }:
let let
thisSystem = builtins.getAttr system; thisSystem = builtins.getAttr system;
hostPkgs = nixpkgs.legacyPackages.${localSystem}; hostPkgs = nixpkgs.legacyPackages.${localSystem};
testPkgs = thisSystem genodepkgs.packages; testPkgs = thisSystem genodepkgs.packages;
depot = thisSystem genode-depot.packages;
in { in {
dhallText = name: source: dhallText = name: source:

20
packages/default.nix
View File

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