From c93f912ad709dc4dc544d437de3802a847270016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 9 Jul 2024 13:47:37 +0200
Subject: [PATCH] don't inherit from clan-core

clan-core now has packages that we don't need
---
 devShells/flake-module.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/devShells/flake-module.nix b/devShells/flake-module.nix
index 044b75e..d5309e5 100644
--- a/devShells/flake-module.nix
+++ b/devShells/flake-module.nix
@@ -1,6 +1,11 @@
 {
   perSystem =
-    { inputs', pkgs, ... }:
+    {
+      config,
+      inputs',
+      pkgs,
+      ...
+    }:
     let
       convert2Tofu =
         provider:
@@ -16,8 +21,15 @@
           pkgs.bashInteractive
           pkgs.sops
 
+          pkgs.nixVersions.latest
+
+          inputs'.clan-core.packages.tea-create-pr
+          inputs'.clan-core.packages.merge-after-ci
           inputs'.clan-core.packages.clan-cli
 
+          # treefmt with config defined in ./flake.nix
+          config.treefmt.build.wrapper
+
           (pkgs.opentofu.withPlugins (
             p:
             builtins.map convert2Tofu [
@@ -29,7 +41,6 @@
             ]
           ))
         ];
-        inputsFrom = [ inputs'.clan-core.devShells.default ];
       };
     };
 }