Cleanup
This commit is contained in:
parent
985ae3edde
commit
a7ecaeaa36
26
flake.nix
26
flake.nix
|
@ -80,24 +80,22 @@
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
components = [ "vlsisapd" "lefdef" "bootstrap" "hurricane" ];
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
overlay = final: prev: {
|
overlay = final: prev:
|
||||||
coriolis-vlsisapd = final.callPackage (import ./nix/vlsisapd.nix { inherit version meta; }) {};
|
builtins.foldl'
|
||||||
coriolis-lefdef = final.callPackage (import ./nix/lefdef.nix { inherit version meta; }) {};
|
(acc: elem: acc // {
|
||||||
coriolis-bootstrap = final.callPackage (import ./nix/bootstrap.nix { inherit version meta; }) {};
|
"coriolis-${elem}" = final.callPackage (
|
||||||
coriolis-hurricane = final.callPackage (import ./nix/hurricane.nix { inherit version meta; }) {};
|
import "${self}/nix/${elem}.nix" { inherit version meta; }
|
||||||
};
|
) {};
|
||||||
|
}) {} components;
|
||||||
|
|
||||||
packages = forAllSystems (system:
|
packages = forAllSystems (system: builtins.foldl' (acc: elem: acc // {
|
||||||
with nixpkgsFor.${system}; {
|
${elem} = nixpkgsFor.${system}.${"coriolis-${elem}"};
|
||||||
vlsisapd = coriolis-vlsisapd;
|
}) {} components);
|
||||||
bootstrap = coriolis-bootstrap;
|
|
||||||
coloquinte = coriolis-coloquinte;
|
|
||||||
lefdef = coriolis-lefdef;
|
|
||||||
hurricane = coriolis-hurricane;
|
|
||||||
});
|
|
||||||
|
|
||||||
defaultPackage = forAllSystems (system: self.packages.${system}.coriolis);
|
defaultPackage = forAllSystems (system: self.packages.${system}.coriolis);
|
||||||
devShell = defaultPackage;
|
devShell = defaultPackage;
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{ version, meta }:
|
{ version, meta }:
|
||||||
|
|
||||||
{ lib, stdenv, python2, cmake, boost, bison, flex
|
{ lib, stdenv, python2, cmake, ninja }:
|
||||||
, libxml2, rapidjson, which, qt4, zlib, bzip2, ninja }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "coriolis-bootstrap";
|
pname = "coriolis-bootstrap";
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
{ version, meta }:
|
{ version, meta }:
|
||||||
|
|
||||||
{ lib, stdenv, python2, cmake, boost, bison, flex
|
{ lib, stdenv, python2, cmake, boost, qt4, ninja, coriolis-bootstrap }:
|
||||||
, libxml2, rapidjson, which, qt4, zlib, bzip2, ninja
|
|
||||||
, coriolis-bootstrap, coriolis-vlsisapd }:
|
|
||||||
|
|
||||||
let boostWithPython = boost.override { enablePython = true; python = python2; }; in
|
let boostWithPython = boost.override { enablePython = true; python = python2; }; in
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ version, meta }:
|
{ version, meta }:
|
||||||
|
|
||||||
{ lib, stdenv, python2, cmake, boost, bison, flex
|
{ lib, stdenv, python2, cmake, boost, bison, flex
|
||||||
, libxml2, rapidjson, which, qt4, zlib, bzip2, ninja
|
, libxml2, rapidjson, qt4, zlib, bzip2, ninja
|
||||||
, coriolis-bootstrap, coriolis-vlsisapd }:
|
, coriolis-bootstrap, coriolis-vlsisapd }:
|
||||||
|
|
||||||
let boostWithPython = boost.override { enablePython = true; python = python2; }; in
|
let boostWithPython = boost.override { enablePython = true; python = python2; }; in
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
{ version, meta }:
|
{ version, meta }:
|
||||||
|
|
||||||
{ lib, stdenv, python2, cmake, boost, bison, flex
|
{ lib, stdenv, python2, cmake, boost, bison, flex
|
||||||
, libxml2, rapidjson, which, qt4, zlib, bzip2, ninja
|
, libxml2, zlib, ninja, coriolis-bootstrap }:
|
||||||
, coriolis-bootstrap, coriolis-vlsisapd }:
|
|
||||||
|
|
||||||
let boostWithPython = boost.override { enablePython = true; python = python2; }; in
|
let boostWithPython = boost.override { enablePython = true; python = python2; }; in
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
{ version, meta }:
|
{ version, meta }:
|
||||||
|
|
||||||
{ lib, stdenv, python2, cmake, boost, bison, flex
|
{ lib, stdenv, python2, cmake, boost, bison, flex
|
||||||
, libxml2, rapidjson, which, qt4, zlib, bzip2, ninja
|
, libxml2, qt4, ninja, coriolis-bootstrap }:
|
||||||
, coriolis-bootstrap }:
|
|
||||||
|
|
||||||
let boostWithPython = boost.override { enablePython = true; python = python2; }; in
|
let boostWithPython = boost.override { enablePython = true; python = python2; }; in
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue