diff options
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/default.nix b/default.nix index 287ec0a..13f5953 100644 --- a/default.nix +++ b/default.nix @@ -13,7 +13,7 @@ let forstio = (import ((builtins.fetchTarball { url = "https://git.keldu.de/forstio-forstio/snapshot/dev.tar.gz"; - sha256 = "sha256:1mbak3ksppkij0325p6gz8mibbss0gfj4w85fs4f1jkz8wpdbkgq"; + sha256 = "sha256:1za6a9379s1i4wb1lpj6bxd6brs6ivk3zvs3pjys4wmhpsji6csj"; }) + "/default.nix"){ inherit stdenv; inherit clang-tools; @@ -21,48 +21,51 @@ let }).forstio; pname = "kel-lbm"; - version = "0.0.2"; + version = "0.0.3"; in rec { - lbm = pkgs.callPackage ./.nix/derivation.nix { - inherit forstio; - inherit stdenv; - inherit clang-tools; + kel-lbm = { + core = pkgs.callPackage ./lib/core/.nix/derivation.nix { + inherit forstio stdenv clang-tools; + }; + sycl = pkgs.callPackage ./lib/sycl/.nix/derivation.nix { + inherit forstio stdenv clang-tools kel-lbm adaptive-cpp; + }; }; examples = { cavity_2d_gpu = pkgs.callPackage ./examples/cavity_2d_gpu/.nix/derivation.nix { inherit pname version stdenv forstio adaptive-cpp; - kel-lbm = lbm; + inherit kel-lbm; }; cavity_2d = pkgs.callPackage ./examples/cavity_2d/.nix/derivation.nix { inherit pname version stdenv forstio; - kel-lbm = lbm; + inherit kel-lbm; }; poiseulle_particles_channel_2d = pkgs.callPackage ./examples/poiseulle_particles_channel_2d/.nix/derivation.nix { inherit pname version stdenv forstio; - kel-lbm = lbm; + inherit kel-lbm; }; meta_2d = pkgs.callPackage ./examples/meta_2d/.nix/derivation.nix { inherit pname version stdenv forstio; - kel-lbm = lbm; + inherit kel-lbm; }; planetary_3d = pkgs.callPackage ./examples/planetary_3d/.nix/derivation.nix { inherit pname version stdenv forstio adaptive-cpp; - kel-lbm = lbm; + inherit kel-lbm; }; poiseulle_2d = pkgs.callPackage ./examples/poiseulle_3d/.nix/derivation.nix { inherit pname version stdenv forstio; - kel-lbm = lbm; + inherit kel-lbm; }; poiseulle_3d = pkgs.callPackage ./examples/poiseulle_3d/.nix/derivation.nix { inherit pname version stdenv forstio adaptive-cpp; - kel-lbm = lbm; + inherit kel-lbm; }; }; |