From d0b64d08545b406ba2d6fb5dabf43a8d4fac4ba1 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 24 May 2026 15:15:12 +0300 Subject: [PATCH] flake: don't throw on invalid systems Signed-off-by: NotAShelf Change-Id: I054d83838ef0aba0d2a233b7da3802f06a6a6964 --- flake.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 838b181..d4c2e64 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,6 @@ perSystem = { system, - inputs', config, pkgs, lib, @@ -72,11 +71,14 @@ "nil" ]; - mappedPkgs = listToAttrs (map (input: { + mappedPkgs = listToAttrs (builtins.concatMap (input: let + pkg = ((inputs.${input}.packages or {}).${system} or {}).default or null; + in + lib.optional (pkg != null) { name = input; - value = inputs'.${input}.packages.default or (builtins.throw "Input ${input} does not provide a default package"); + value = pkg; }) - fromInputs); + fromInputs); in base // mappedPkgs; @@ -87,10 +89,12 @@ runtimeInputs = [ config.packages.alejandra-custom pkgs.fd + pkgs.deno ]; text = '' fd "$@" -t f -e nix -x alejandra -q '{}' + fd "$@" -t f -e md -x deno fmt '{}' ''; };