From 563411a342b624a481bcb6c8b1561319852337c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 24 Nov 2024 15:28:29 +0100
Subject: [PATCH] unit-test: pass in sops-install-secrets via callPackage

---
 default.nix         |  2 --
 flake.nix           |  6 ++++--
 pkgs/unit-tests.nix | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/default.nix b/default.nix
index 3546d4f..efc7b59 100644
--- a/default.nix
+++ b/default.nix
@@ -16,8 +16,6 @@ rec {
 
   # backwards compatibility
   inherit (pkgs) ssh-to-pgp;
-
-  unit-tests = pkgs.callPackage ./pkgs/unit-tests.nix { };
 }
 // (pkgs.lib.optionalAttrs pkgs.stdenv.isLinux {
   lint = pkgs.callPackage ./pkgs/lint.nix {
diff --git a/flake.nix b/flake.nix
index 57a5056..724eda1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -156,9 +156,11 @@
         );
 
         devShells = eachSystem (
-          { pkgs, ... }:
+          { system, pkgs, ... }:
           {
-            unit-tests = pkgs.callPackage ./pkgs/unit-tests.nix { };
+            unit-tests = pkgs.callPackage ./pkgs/unit-tests.nix {
+              sops-install-secrets = self.packages.${system}.sops-install-secrets;
+            };
             default = pkgs.callPackage ./shell.nix { };
           }
         );
diff --git a/pkgs/unit-tests.nix b/pkgs/unit-tests.nix
index 9fc14fc..5126da9 100644
--- a/pkgs/unit-tests.nix
+++ b/pkgs/unit-tests.nix
@@ -1,17 +1,17 @@
 {
-  pkgs ? import <nixpkgs> { },
+  stdenv,
+  gnupg,
+  util-linux,
+  nix,
+  sops-install-secrets,
 }:
-let
-  sopsPkgs = import ../. { inherit pkgs; };
-in
-pkgs.stdenv.mkDerivation {
-  name = "unit-tests";
-  nativeBuildInputs = with pkgs; [
-    bashInteractive
+stdenv.mkDerivation {
+  name = "unittests";
+  nativeBuildInputs = [
     gnupg
     util-linux
     nix
-    sopsPkgs.sops-install-secrets.unittest
+    sops-install-secrets.unittest
   ];
   # allow to prefetch shell dependencies in build phase
   dontUnpack = true;