Move pkgs to packages

flake.nix

@@ -17,7 +17,7 @@
         let thisSystem = builtins.getAttr system;
         in rec {
 
-          packages = import ./packages.nix {
+          packages = import ./packages {
             inherit system nixpkgs;
             depot = thisSystem genode-depot.packages;
             genode = thisSystem genode.packages;

packages/default.nix

@@ -5,20 +5,17 @@
 { system, nixpkgs, depot, genode, dhallApps }:
 
 let
-  toolchainOverlay = import ./toolchain-overlay;
+  legacyPackages = builtins.getAttr system nixpkgs.legacyPackages;
-  # Overlay of toolchain patches
 
-  super = builtins.getAttr system nixpkgs.legacyPackages;
+  inherit (legacyPackages) callPackage;
 
-  inherit (super) callPackage;
+  dhallPackages = legacyPackages.dhallPackages // (callPackage ./dhall { });
-
-  dhallPackages = super.dhallPackages // (callPackage ./dhall { });
 
   genode' = with builtins;
     let
 
       mkDhallManifest = drv:
-        super.runCommand "${drv.name}.dhall" {
+        legacyPackages.runCommand "${drv.name}.dhall" {
           inherit drv;
           dhall = dhallApps.dhall.program;
         } ''
@@ -56,12 +53,12 @@ let
     in attrs;
 
 in rec {
-  inherit (super) stdenv;
+  inherit (legacyPackages) stdenv;
-  bender = super.buildPackages.callPackage ./pkgs/bender { };
+  bender = legacyPackages.buildPackages.callPackage ./bender { };
   dhallGenode = dhallPackages.genode;
   dhallPrelude = dhallPackages.prelude;
-  libc = callPackage ./pkgs/libc { inherit depot; };
+  libc = callPackage ./libc { inherit depot; };
-  nic_bus = callPackage ./pkgs/nic_bus { inherit (genode) base os; };
+  nic_bus = callPackage ./nic_bus { inherit (genode) base os; };
-  solo5 = callPackage ./pkgs/solo5 { inherit (genode) base os; };
+  solo5 = callPackage ./solo5 { inherit (genode) base os; };
-  stdcxx = callPackage ./pkgs/stdcxx { };
+  stdcxx = callPackage ./stdcxx { };
 } // genode'