Move pkgs to packages
This commit is contained in:
parent
2b486eb4e0
commit
49b4209526
|
@ -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;
|
||||
|
|
|
@ -5,20 +5,17 @@
|
|||
{ system, nixpkgs, depot, genode, dhallApps }:
|
||||
|
||||
let
|
||||
toolchainOverlay = import ./toolchain-overlay;
|
||||
# Overlay of toolchain patches
|
||||
legacyPackages = builtins.getAttr system nixpkgs.legacyPackages;
|
||||
|
||||
super = builtins.getAttr system nixpkgs.legacyPackages;
|
||||
inherit (legacyPackages) callPackage;
|
||||
|
||||
inherit (super) callPackage;
|
||||
|
||||
dhallPackages = super.dhallPackages // (callPackage ./dhall { });
|
||||
dhallPackages = legacyPackages.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;
|
||||
bender = super.buildPackages.callPackage ./pkgs/bender { };
|
||||
inherit (legacyPackages) stdenv;
|
||||
bender = legacyPackages.buildPackages.callPackage ./bender { };
|
||||
dhallGenode = dhallPackages.genode;
|
||||
dhallPrelude = dhallPackages.prelude;
|
||||
libc = callPackage ./pkgs/libc { inherit depot; };
|
||||
nic_bus = callPackage ./pkgs/nic_bus { inherit (genode) base os; };
|
||||
solo5 = callPackage ./pkgs/solo5 { inherit (genode) base os; };
|
||||
stdcxx = callPackage ./pkgs/stdcxx { };
|
||||
libc = callPackage ./libc { inherit depot; };
|
||||
nic_bus = callPackage ./nic_bus { inherit (genode) base os; };
|
||||
solo5 = callPackage ./solo5 { inherit (genode) base os; };
|
||||
stdcxx = callPackage ./stdcxx { };
|
||||
} // genode'
|
Loading…
Reference in New Issue