From 3d577fd69bfe89a9b8497367fdc55d75174e34bd Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 15 Apr 2025 09:21:54 +0200
Subject: ...

---
 overlays/deploy-rs.nix       | 14 ++++++++++++++
 overlays/nix-monitored.nix   |  8 ++++++++
 overlays/scutiger.nix        |  2 +-
 overlays/swayosd/default.nix |  4 ++--
 overlays/thunderbird.nix     | 11 -----------
 5 files changed, 25 insertions(+), 14 deletions(-)
 create mode 100644 overlays/deploy-rs.nix
 create mode 100644 overlays/nix-monitored.nix
 delete mode 100644 overlays/thunderbird.nix

(limited to 'overlays')

diff --git a/overlays/deploy-rs.nix b/overlays/deploy-rs.nix
new file mode 100644
index 00000000..0bf1c3b2
--- /dev/null
+++ b/overlays/deploy-rs.nix
@@ -0,0 +1,14 @@
+{ final, prev, flakeInputs, ... }: prev.lib.composeExtensions
+  flakeInputs.deploy-rs.overlays.default
+  (final: prev: {
+    deploy-rs = prev.deploy-rs // {
+      deploy-rs = prev.deploy-rs.deploy-rs.overrideAttrs (oldAttrs: {
+        nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [final.makeWrapper];
+        preFixup = ''
+          wrapProgram $out/bin/deploy \
+            --prefix PATH : ${prev.lib.makeBinPath (with final; [ nix-monitored ])}
+        '';
+      });
+    };
+  })
+  final prev
diff --git a/overlays/nix-monitored.nix b/overlays/nix-monitored.nix
new file mode 100644
index 00000000..9f6caff1
--- /dev/null
+++ b/overlays/nix-monitored.nix
@@ -0,0 +1,8 @@
+{ final, prev, flakeInputs, ... }: prev.lib.composeExtensions
+  flakeInputs.nix-monitored.overlays.default
+  (final: prev: {
+    nix-monitored = prev.nix-monitored.override {
+      withNotify = false;
+    };
+  })
+  final prev
diff --git a/overlays/scutiger.nix b/overlays/scutiger.nix
index 7a56adaf..b00b34a4 100644
--- a/overlays/scutiger.nix
+++ b/overlays/scutiger.nix
@@ -2,7 +2,7 @@
   scutiger = final.rustPlatform.buildRustPackage {
     inherit (sources.scutiger) pname version src;
 
-    cargoHash = "sha256-d+wJ3trrldCVATsudsbglElU6q4LaS6feRocRyHal2k=";
+    cargoHash = "sha256-FTAEmRuO95ii84uwaALVuImiymnSAQkB2UwZ5yX0WPs=";
 
     nativeBuildInputs = with final; [ pkg-config pcre2.dev zlib.dev git ];
   };
diff --git a/overlays/swayosd/default.nix b/overlays/swayosd/default.nix
index 2a3a0f2b..b535f7f9 100644
--- a/overlays/swayosd/default.nix
+++ b/overlays/swayosd/default.nix
@@ -1,10 +1,10 @@
 { final, prev, sources, ... }: {
   swayosd = prev.swayosd.overrideAttrs (oldAttrs: rec {
     inherit (sources.swayosd) version src;
-    cargoDeps = prev.rustPlatform.fetchCargoTarball {
+    cargoDeps = prev.rustPlatform.fetchCargoVendor {
       inherit (oldAttrs) pname;
       inherit version src;
-      hash = "sha256-s2vgyQP6J3i0q2o/Tt8dYoamBH3vrI/FNJYteHO8v5Q=";
+      hash = "sha256-b5Ei6k9p/KiyiSSl5zxDXrTgGAq24O5ll0BvyJ/41F8=";
     };
     patches = (oldAttrs.patches or []) ++ [
       ./exponential.patch
diff --git a/overlays/thunderbird.nix b/overlays/thunderbird.nix
deleted file mode 100644
index 48ae2ccb..00000000
--- a/overlays/thunderbird.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ final, prev, ... }: {
-  thunderbird-unwrapped = prev.thunderbird-unwrapped.overrideAttrs (oldAttrs: {
-    patches = (oldAttrs.patches or [])
-           ++ prev.lib.optional (prev.lib.versionAtLeast oldAttrs.version "136") (prev.fetchpatch {
-                url = "https://hg.mozilla.org/comm-central/raw-rev/a82bd8fc0bc0";
-                hash = "sha256-7t8IqxwcZJqXmOevpGof1mcrFKZvXtCcY2EOIsP47EY=";
-                stripLen = 1;
-                extraPrefix = "comm/";
-              });
-  });
-}
-- 
cgit v1.2.3