From 1fddafc81450ea1d448fa22d93646d0005e4a8a2 Mon Sep 17 00:00:00 2001 From: Las Safin Date: Fri, 3 Sep 2021 13:31:29 +0000 Subject: [PATCH] Add combined --- flake.nix | 15 ++++++++++++--- nix/combined.nix | 27 +++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 nix/combined.nix diff --git a/flake.nix b/flake.nix index a3485272..65698764 100644 --- a/flake.nix +++ b/flake.nix @@ -66,6 +66,7 @@ "equinox" "knik" "ispd" "karakaze" "nimbus" "metis" "mauka" "solstice" "stratus1" "documentation" "unittests" "alliance-check-toolkit" + "combined" ]; commonArgs = { inherit version meta generic; alliance-src = alliance-check-toolkit; }; @@ -82,9 +83,17 @@ ) {}); }) {} components; - packages = forAllSystems (system: builtins.foldl' (acc: elem: acc // { - ${elem} = nixpkgsFor.${system}.${"coriolis-${elem}"}; - }) {} components); + packages = forAllSystems (system: + let pkgs = nixpkgsFor.${system}; in + builtins.foldl' (acc: elem: acc // { + ${elem} = pkgs.${"coriolis-${elem}"}; + }) {} components + // { + test = pkgs.python2.buildEnv.override { + extraLibs = [ pkgs.coriolis-unicorn pkgs.coriolis-cumulus ]; + }; + } + ); defaultPackage = forAllSystems (system: self.packages.${system}.unicorn); diff --git a/nix/combined.nix b/nix/combined.nix new file mode 100644 index 00000000..9d3a038a --- /dev/null +++ b/nix/combined.nix @@ -0,0 +1,27 @@ +{ version, meta, ... }: + +{ buildEnv +, coriolis-vlsisapd, coriolis-hurricane, coriolis-crlcore +, coriolis-anabatic, coriolis-katana, coriolis-bora +, coriolis-katabatic, coriolis-kite, coriolis-tutorial +, coriolis-unicorn, coriolis-oroshi, coriolis-cumulus +, coriolis-lefdef, coriolis-coloquinte, coriolis-flute +, coriolis-equinox, coriolis-knik, coriolis-karakaze +, coriolis-solstice, coriolis-stratus1, coriolis-etesian +}: + +buildEnv { + name = "coriolis-combined-${version}"; + + paths = [ + coriolis-hurricane coriolis-crlcore coriolis-flute + coriolis-etesian coriolis-anabatic coriolis-katana + coriolis-bora coriolis-katabatic coriolis-kite + coriolis-tutorial coriolis-unicorn coriolis-oroshi + coriolis-cumulus coriolis-lefdef coriolis-vlsisapd + coriolis-coloquinte coriolis-equinox coriolis-knik + coriolis-karakaze coriolis-solstice coriolis-stratus1 + ]; + + inherit meta; +}