Reduction

flake.nix

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

lib/default.nix

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

packages/default.nix

@@ -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"; }; };