From 9c34345ee3eec87b0df74daa065b5f9109595b55 Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Fri, 25 Oct 2024 13:47:50 -0400
Subject: [PATCH] feat: merge wrapped packages into root

---
 flake.lock               | 18 ++++++++++++++++++
 flake.nix                |  4 ++++
 outputs.nix              |  4 ++--
 wrappers/default.nix     |  6 ++++--
 wrappers/nf-generate.nix |  1 +
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 78fdbb71..0e02b9a6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,6 +70,23 @@
         "type": "github"
       }
     },
+    "ci": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1726101086,
+        "narHash": "sha256-veBakX/c/GfwzLtp62bcEm6Coype+03Hz8Aydi2b9xg=",
+        "owner": "arcnmx",
+        "repo": "ci",
+        "rev": "154533df13bc059400186a9d52e000363f0a3cb2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "arcnmx",
+        "ref": "v0.7",
+        "repo": "ci",
+        "type": "github"
+      }
+    },
     "crane": {
       "inputs": {
         "flake-compat": [
@@ -538,6 +555,7 @@
         "arcexprs": "arcexprs",
         "base16": "base16",
         "base16-data": "base16-data",
+        "ci": "ci",
         "darwin": "darwin",
         "deploy-rs": "deploy-rs",
         "empty": "empty",
diff --git a/flake.nix b/flake.nix
index 8e8c9d3d..998bf625 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,10 @@
         flake-compat.follows = "flake-compat";
       };
     };
+    ci = {
+      url = "github:arcnmx/ci/v0.7";
+      flake = false;
+    };
     flakelibstd = {
       url = "github:flakelib/std";
       inputs.nix-std.follows = "std";
diff --git a/outputs.nix b/outputs.nix
index 886da5bc..ea345473 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -12,9 +12,9 @@
   checks = set.map (_: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib;
 in
   {
-    inherit inputs tree std pkgs formatter lib checks wrappers;
+    inherit inputs tree std pkgs formatter lib checks;
     legacyPackages = pkgs;
-    packages = pkgs // wrappers;
+    packages = set.merge [pkgs wrappers.packages];
   }
   // systems
   // shells
diff --git a/wrappers/default.nix b/wrappers/default.nix
index e5ec55bd..fccfdb26 100644
--- a/wrappers/default.nix
+++ b/wrappers/default.nix
@@ -5,6 +5,8 @@
   inputs.utils.lib.eachDefaultSystem (system: let
     newArgs = args // { inherit system; };
   in {
-        nf-actions-test = import ./nf-actions-test.nix newArgs;
-        nf-generate = import ./nf-generate.nix newArgs;
+        packages = {
+            nf-actions-test = import ./nf-actions-test.nix newArgs;
+            nf-generate = import ./nf-generate.nix newArgs;
+        };
     })
\ No newline at end of file
diff --git a/wrappers/nf-generate.nix b/wrappers/nf-generate.nix
index 1388a997..bfab46a0 100644
--- a/wrappers/nf-generate.nix
+++ b/wrappers/nf-generate.nix
@@ -10,6 +10,7 @@
   inherit (inputs.std.lib) string list set;
   packages = inputs.self.packages.${system};
   inherit (inputs.self.legacyPackages.${system}) pkgs;
+  inherit (import ../ci/nix.nix) ci;
     nf-generate = pkgs.writeShellScriptBin "nf-generate" ''
       ${exports}
       export PATH="$PATH:${makeBinPath [pkgs.jq]}"