From 989ef10dbf024815cb7f302c2c21dce6533818f2 Mon Sep 17 00:00:00 2001 From: Astro Date: Sat, 17 Sep 2022 01:27:35 +0200 Subject: [PATCH] dacbert, glotzbert, rpi-netboot: add bevy_julia --- flake.lock | 27 +++++++++++++++++++++++++++ flake.nix | 11 ++++++++++- hosts/dacbert/default.nix | 1 + hosts/glotzbert/default.nix | 1 + hosts/rpi-netboot/default.nix | 1 + overlay/default.nix | 2 ++ 6 files changed, 42 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 5a287ff5..c7d761d2 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,32 @@ "url": "https://gitea.nek0.eu/nek0/affection" } }, + "bevy-julia": { + "inputs": { + "naersk": [ + "naersk" + ], + "nixpkgs": [ + "nixos" + ], + "rust-overlay": [ + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1663370480, + "narHash": "sha256-fCC/ukecfQZx8M3gNgQ2LCJAXWFIW3uXF7X19oSAVJc=", + "owner": "matelab", + "repo": "bevy_julia", + "rev": "6ced0d32cd785d206acdf97f0bde7fb50583b4e5", + "type": "github" + }, + "original": { + "owner": "matelab", + "repo": "bevy_julia", + "type": "github" + } + }, "bevy-mandelbrot": { "inputs": { "naersk": [ @@ -589,6 +615,7 @@ "root": { "inputs": { "affection-src": "affection-src", + "bevy-julia": "bevy-julia", "bevy-mandelbrot": "bevy-mandelbrot", "eris": "eris", "fenix": "fenix", diff --git a/flake.nix b/flake.nix index 2400518b..ffd55457 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,15 @@ rust-overlay.follows = "rust-overlay"; }; }; + bevy-julia = { + url = "github:matelab/bevy_julia"; + inputs = { + nixpkgs.follows = "nixos"; + naersk.follows = "naersk"; + naersk.inputs.nixpkgs.follows = "nixpkgs"; + rust-overlay.follows = "rust-overlay"; + }; + }; eris = { url = "git+https://codeberg.org/eris/nix-eris"; inputs.nixpkgs.follows = "nixos"; @@ -190,7 +199,7 @@ in { overlay = import ./overlay { inherit nixos-unstable; - inherit (inputs) tracer bevy-mandelbrot; + inherit (inputs) tracer bevy-mandelbrot bevy-julia; }; legacyPackages = lib.attrsets.mapAttrs (system: pkgs: diff --git a/hosts/dacbert/default.nix b/hosts/dacbert/default.nix index 16173a5f..e013c409 100644 --- a/hosts/dacbert/default.nix +++ b/hosts/dacbert/default.nix @@ -96,6 +96,7 @@ pavucontrol glxinfo tracer-game + bevy_julia bevy_mandelbrot allcolors ]; diff --git a/hosts/glotzbert/default.nix b/hosts/glotzbert/default.nix index 2a22b92e..d0313255 100644 --- a/hosts/glotzbert/default.nix +++ b/hosts/glotzbert/default.nix @@ -48,6 +48,7 @@ mpv kodi tracer-game + bevy_julia bevy_mandelbrot allcolors ]; diff --git a/hosts/rpi-netboot/default.nix b/hosts/rpi-netboot/default.nix index 1b8e4c83..09114c8f 100644 --- a/hosts/rpi-netboot/default.nix +++ b/hosts/rpi-netboot/default.nix @@ -67,6 +67,7 @@ pavucontrol glxinfo tracer-game + bevy_julia bevy_mandelbrot allcolors ]; diff --git a/overlay/default.nix b/overlay/default.nix index dac06977..7b033108 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -1,5 +1,6 @@ { nixos-unstable , tracer +, bevy-julia , bevy-mandelbrot }: @@ -40,6 +41,7 @@ with final; { }) ]; }; + inherit (bevy-julia.packages.${system}) bevy_julia; inherit (bevy-mandelbrot.packages.${system}) bevy_mandelbrot; bmxd = callPackage ./bmxd.nix { };