From 4fabadccb42e2e2027b649333668fbc6becf1383 Mon Sep 17 00:00:00 2001 From: Ryan Lahfa Date: Sat, 7 Dec 2024 15:30:42 +0100 Subject: [PATCH] feat(scripts/): use our own colmena In the future, we should not have to do this. Signed-off-by: Ryan Lahfa --- default.nix | 2 +- scripts/default.nix | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index c70bcce..475d980 100644 --- a/default.nix +++ b/default.nix @@ -89,7 +89,7 @@ let ) (builtins.readDir ./workflows); }; - scripts = import ./scripts { inherit pkgs; }; + scripts = import ./scripts { inherit pkgs sources; }; in { diff --git a/scripts/default.nix b/scripts/default.nix index d7844ab..f5245fa 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -1,11 +1,15 @@ -{ pkgs }: +{ sources, pkgs }: let + # TODO: move this into a proper overlay of `pkgs` so that we don't need to track this for every and any package. + colmena = pkgs.callPackage ../lib/colmena { + colmena = pkgs.callPackage "${sources.colmena}/package.nix" { }; + }; + inherit (pkgs.lib) mapAttrs; inherit (pkgs) writeShellApplication - colmena jq nvd ;