From 49b4209526c365846cb57f2dc0368db97282329c Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 16 Jan 2020 17:19:42 +0100 Subject: [PATCH] Move pkgs to packages --- flake.nix | 2 +- {pkgs => packages}/bender/default.nix | 0 packages.nix => packages/default.nix | 23 +++++++++----------- {dhall => packages/dhall}/default.nix | 0 {dhall => packages/dhall}/genode.nix | 0 {dhall => packages/dhall}/prelude-11.0.0.nix | 0 {dhall => packages/dhall}/prelude-9.0.0.nix | 0 {pkgs => packages}/libc/default.nix | 0 {pkgs => packages}/libc/libc.pc | 0 {pkgs => packages}/libc/libm.pc | 0 {pkgs => packages}/nic_bus/default.nix | 0 {pkgs => packages}/solo5/default.nix | 0 {pkgs => packages}/solo5/genode.patch | 0 {pkgs => packages}/stdcxx/default.nix | 0 {pkgs => packages}/stdcxx/stdcxx.pc | 0 15 files changed, 11 insertions(+), 14 deletions(-) rename {pkgs => packages}/bender/default.nix (100%) rename packages.nix => packages/default.nix (74%) rename {dhall => packages/dhall}/default.nix (100%) rename {dhall => packages/dhall}/genode.nix (100%) rename {dhall => packages/dhall}/prelude-11.0.0.nix (100%) rename {dhall => packages/dhall}/prelude-9.0.0.nix (100%) rename {pkgs => packages}/libc/default.nix (100%) rename {pkgs => packages}/libc/libc.pc (100%) rename {pkgs => packages}/libc/libm.pc (100%) rename {pkgs => packages}/nic_bus/default.nix (100%) rename {pkgs => packages}/solo5/default.nix (100%) rename {pkgs => packages}/solo5/genode.patch (100%) rename {pkgs => packages}/stdcxx/default.nix (100%) rename {pkgs => packages}/stdcxx/stdcxx.pc (100%) diff --git a/flake.nix b/flake.nix index 5059ad6..9240684 100644 --- a/flake.nix +++ b/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; diff --git a/pkgs/bender/default.nix b/packages/bender/default.nix similarity index 100% rename from pkgs/bender/default.nix rename to packages/bender/default.nix diff --git a/packages.nix b/packages/default.nix similarity index 74% rename from packages.nix rename to packages/default.nix index 70e7884..9f591d3 100644 --- a/packages.nix +++ b/packages/default.nix @@ -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' diff --git a/dhall/default.nix b/packages/dhall/default.nix similarity index 100% rename from dhall/default.nix rename to packages/dhall/default.nix diff --git a/dhall/genode.nix b/packages/dhall/genode.nix similarity index 100% rename from dhall/genode.nix rename to packages/dhall/genode.nix diff --git a/dhall/prelude-11.0.0.nix b/packages/dhall/prelude-11.0.0.nix similarity index 100% rename from dhall/prelude-11.0.0.nix rename to packages/dhall/prelude-11.0.0.nix diff --git a/dhall/prelude-9.0.0.nix b/packages/dhall/prelude-9.0.0.nix similarity index 100% rename from dhall/prelude-9.0.0.nix rename to packages/dhall/prelude-9.0.0.nix diff --git a/pkgs/libc/default.nix b/packages/libc/default.nix similarity index 100% rename from pkgs/libc/default.nix rename to packages/libc/default.nix diff --git a/pkgs/libc/libc.pc b/packages/libc/libc.pc similarity index 100% rename from pkgs/libc/libc.pc rename to packages/libc/libc.pc diff --git a/pkgs/libc/libm.pc b/packages/libc/libm.pc similarity index 100% rename from pkgs/libc/libm.pc rename to packages/libc/libm.pc diff --git a/pkgs/nic_bus/default.nix b/packages/nic_bus/default.nix similarity index 100% rename from pkgs/nic_bus/default.nix rename to packages/nic_bus/default.nix diff --git a/pkgs/solo5/default.nix b/packages/solo5/default.nix similarity index 100% rename from pkgs/solo5/default.nix rename to packages/solo5/default.nix diff --git a/pkgs/solo5/genode.patch b/packages/solo5/genode.patch similarity index 100% rename from pkgs/solo5/genode.patch rename to packages/solo5/genode.patch diff --git a/pkgs/stdcxx/default.nix b/packages/stdcxx/default.nix similarity index 100% rename from pkgs/stdcxx/default.nix rename to packages/stdcxx/default.nix diff --git a/pkgs/stdcxx/stdcxx.pc b/packages/stdcxx/stdcxx.pc similarity index 100% rename from pkgs/stdcxx/stdcxx.pc rename to packages/stdcxx/stdcxx.pc