From 49c98726e806db319e624aa4476e081ee2aadf23 Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Tue, 17 Oct 2023 09:22:02 -0500
Subject: [PATCH 1/2] Drop dmg2img; add iproxy

dmg2img is apparently no longer maintained upstream. Gentoo has axed it, and we'll do the same. `qemu-img` generally handles all DMGs necessary, and `7z` often gets the rest.
---
 home/desktop.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/desktop.nix b/home/desktop.nix
index 8c301c3..0f879c1 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -10,7 +10,6 @@
     binwalk
     cloc
     croc
-    dmg2img
     exiftool
     ffmpeg
     gcc-arm-embedded
@@ -22,6 +21,7 @@
     jadx
     jdk
     jq
+    libusbmuxd
     meld
     mitmproxy
     monaco-powerline

From 343957cc3a9efab160652ad46783f084e91cbf2f Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Tue, 17 Oct 2023 09:22:13 -0500
Subject: [PATCH 2/2] swiftformat: 0.52.7 -> 0.52.8

---
 flake.lock           | 6 +++---
 pkgs/swiftformat.nix | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2a0c853..6f2d4fd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696940889,
-        "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=",
+        "lastModified": 1697531492,
+        "narHash": "sha256-v813jggnyO+wLMKvbkeOruZCh6wubVZEdfxKqJS4bq8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408",
+        "rev": "7a46e6cb3ca02a478bdafc53c0ac89da6efc050c",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/swiftformat.nix b/pkgs/swiftformat.nix
index 27abf99..80d4699 100644
--- a/pkgs/swiftformat.nix
+++ b/pkgs/swiftformat.nix
@@ -2,13 +2,13 @@
 
 clangStdenv.mkDerivation rec {
   pname = "swiftformat";
-  version = "0.52.7";
+  version = "0.52.8";
 
   src = fetchFromGitHub {
     owner = "nicklockwood";
     repo = "SwiftFormat";
     rev = version;
-    sha256 = "sha256-PIUWUtikU3jgxTu/xtydQ736lANACNEGkMZ0hi2AcN0=";
+    sha256 = "sha256-3PZc2c2TxBEylAtu0JpqlRjKC2DYzl2KNiz9Cwhzyg0=";
   };
 
   nativeBuildInputs = [ swift swiftpm ];