From 21a41f54d0042ae2625d73a2f569c222bf6ec5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Fri, 1 Dec 2023 19:18:13 +0100 Subject: [PATCH] Remove hacky flake schemas alternative That was causing issues, and now we have a better solution: https://github.com/NixOS/nix/pull/8892 --- flake.nix | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index dd6dea7..e6ad4a3 100644 --- a/flake.nix +++ b/flake.nix @@ -41,28 +41,17 @@ in { packages = eachSystem (pkgs: - concatMapAttrs - (k: v: - if isFunction v then - { - ${k} = { - type = "derivation"; - name = "derivation-function"; - __functor = _: v; - }; - } - else { ${k} = v; }) - { - inherit (pkgs) clj-builder deps-lock mk-deps-cache - mkCljBin mkCljLib mkGraalBin customJdk - cljHooks - mkBabashka bbTasksFromFile; + { + inherit (pkgs) clj-builder deps-lock mk-deps-cache + mkCljBin mkCljLib mkGraalBin customJdk + cljHooks + mkBabashka bbTasksFromFile; - babashka = pkgs.mkBabashka { }; - babashka-unwrapped = pkgs.mkBabashka { wrap = false; }; + babashka = pkgs.mkBabashka { }; + babashka-unwrapped = pkgs.mkBabashka { wrap = false; }; - docs = pkgs.callPackage ./extra-pkgs/docs { inherit pkgs; }; - }); + docs = pkgs.callPackage ./extra-pkgs/docs { inherit pkgs; }; + }); devShells = eachSystem (pkgs: { default =