From d947c32a9b8f1e3639080756e70fc53baf8e3d94 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Thu, 3 Aug 2023 18:04:03 +0200
Subject: [PATCH] use callPackage for merge-after-ci, nix-unit & tea-create-pr

---
 flake.nix                       |  4 +--
 pkgs/flake-module.nix           | 11 ++++++++
 pkgs/merge-after-ci/default.nix | 48 +++++++++++++++------------------
 pkgs/nix-unit/flake-module.nix  |  5 ----
 pkgs/tea-create-pr/default.nix  | 44 +++++++++++++-----------------
 5 files changed, 53 insertions(+), 59 deletions(-)
 create mode 100644 pkgs/flake-module.nix
 delete mode 100644 pkgs/nix-unit/flake-module.nix

diff --git a/flake.nix b/flake.nix
index af62a833..debb8df4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,10 +25,8 @@
         ./templates/flake-module.nix
         ./templates/python-project/flake-module.nix
         ./pkgs/clan-cli/flake-module.nix
-        ./pkgs/nix-unit/flake-module.nix
         ./pkgs/installer/flake-module.nix
-        ./pkgs/tea-create-pr
-        ./pkgs/merge-after-ci
+        ./pkgs/flake-module.nix
         ./lib/flake-module.nix
         ({ self, lib, ... }: {
           flake.nixosModules = lib.mapAttrs (_: nix: { imports = [ nix ]; }) (self.lib.findNixFiles ./nixosModules);
diff --git a/pkgs/flake-module.nix b/pkgs/flake-module.nix
new file mode 100644
index 00000000..d0a2f061
--- /dev/null
+++ b/pkgs/flake-module.nix
@@ -0,0 +1,11 @@
+{ ... }: {
+  perSystem = { pkgs, config, ... }: {
+    packages = {
+      tea-create-pr = pkgs.callPackage ./tea-create-pr { };
+      merge-after-ci = pkgs.callPackage ./merge-after-ci {
+        inherit (config.packages) tea-create-pr;
+      };
+      nix-unit = pkgs.callPackage ./nix-unit { };
+    };
+  };
+}
diff --git a/pkgs/merge-after-ci/default.nix b/pkgs/merge-after-ci/default.nix
index 96fa5666..46dc0627 100644
--- a/pkgs/merge-after-ci/default.nix
+++ b/pkgs/merge-after-ci/default.nix
@@ -1,27 +1,23 @@
-{
-  perSystem =
-    { pkgs
-    , self'
-    , ...
-    }:
-    let
-      name = builtins.baseNameOf ./.;
-      script = pkgs.writeShellApplication {
-        inherit name;
-        runtimeInputs = [
-          pkgs.bash
-          pkgs.coreutils
-          pkgs.git
-          pkgs.tea
-          pkgs.openssh
-          self'.packages.tea-create-pr
-        ];
-        text = ''
-          bash ${./script.sh} "$@"
-        '';
-      };
-    in
-    {
-      packages.${name} = script;
-    };
+{ writeShellApplication
+, coreutils
+, bash
+, git
+, tea
+, openssh
+, tea-create-pr
+, ...
+}:
+writeShellApplication {
+  name = "merge-after-ci";
+  runtimeInputs = [
+    bash
+    coreutils
+    git
+    tea
+    openssh
+    tea-create-pr
+  ];
+  text = ''
+    bash ${./script.sh} "$@"
+  '';
 }
diff --git a/pkgs/nix-unit/flake-module.nix b/pkgs/nix-unit/flake-module.nix
deleted file mode 100644
index dfc25395..00000000
--- a/pkgs/nix-unit/flake-module.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  perSystem = { pkgs, ... }: {
-    packages.nix-unit = pkgs.callPackage ./default.nix { };
-  };
-}
diff --git a/pkgs/tea-create-pr/default.nix b/pkgs/tea-create-pr/default.nix
index e4160cd7..10fdddc8 100644
--- a/pkgs/tea-create-pr/default.nix
+++ b/pkgs/tea-create-pr/default.nix
@@ -1,26 +1,20 @@
-{
-  perSystem =
-    { pkgs
-    , ...
-    }:
-    let
-      name = builtins.baseNameOf ./.;
-      script = pkgs.writeShellApplication {
-        inherit name;
-        runtimeInputs = [
-          pkgs.bash
-          pkgs.coreutils
-          pkgs.git
-          pkgs.tea
-          pkgs.openssh
-        ];
-        text = ''
-          export EDITOR=${pkgs.vim}/bin/vim
-          bash ${./script.sh} "$@"
-        '';
-      };
-    in
-    {
-      packages.${name} = script;
-    };
+{ writeShellApplication
+, bash
+, coreutils
+, git
+, tea
+, openssh
+}:
+writeShellApplication {
+  name = "tea-create-pr";
+  runtimeInputs = [
+    bash
+    coreutils
+    git
+    tea
+    openssh
+  ];
+  text = ''
+    bash ${./script.sh} "$@"
+  '';
 }