Browse Source

Move pkgs to packages

20.02
Emery Hemingway 2 years ago
parent
commit
49b4209526
  1. 2
      flake.nix
  2. 0
      packages/bender/default.nix
  3. 23
      packages/default.nix
  4. 0
      packages/dhall/default.nix
  5. 0
      packages/dhall/genode.nix
  6. 0
      packages/dhall/prelude-11.0.0.nix
  7. 0
      packages/dhall/prelude-9.0.0.nix
  8. 0
      packages/libc/default.nix
  9. 0
      packages/libc/libc.pc
  10. 0
      packages/libc/libm.pc
  11. 0
      packages/nic_bus/default.nix
  12. 0
      packages/solo5/default.nix
  13. 0
      packages/solo5/genode.patch
  14. 0
      packages/stdcxx/default.nix
  15. 0
      packages/stdcxx/stdcxx.pc

2
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;

0
pkgs/bender/default.nix → packages/bender/default.nix

23
packages.nix → 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'

0
dhall/default.nix → packages/dhall/default.nix

0
dhall/genode.nix → packages/dhall/genode.nix

0
dhall/prelude-11.0.0.nix → packages/dhall/prelude-11.0.0.nix

0
dhall/prelude-9.0.0.nix → packages/dhall/prelude-9.0.0.nix

0
pkgs/libc/default.nix → packages/libc/default.nix

0
pkgs/libc/libc.pc → packages/libc/libc.pc

0
pkgs/libc/libm.pc → packages/libc/libm.pc

0
pkgs/nic_bus/default.nix → packages/nic_bus/default.nix

0
pkgs/solo5/default.nix → packages/solo5/default.nix

0
pkgs/solo5/genode.patch → packages/solo5/genode.patch

0
pkgs/stdcxx/default.nix → packages/stdcxx/default.nix

0
pkgs/stdcxx/stdcxx.pc → packages/stdcxx/stdcxx.pc

Loading…
Cancel
Save