From aecc0581c14c8bf123e86b1ed57cc3887a24c3e8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 02:03:17 +0000
Subject: [PATCH 1/2] chore(deps): lock file maintenance

---
 dev/flake.lock | 12 ++++++------
 flake.lock     | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dev/flake.lock b/dev/flake.lock
index 7d130c4..9906a5b 100644
--- a/dev/flake.lock
+++ b/dev/flake.lock
@@ -151,11 +151,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731887066,
-        "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=",
+        "lastModified": 1732482255,
+        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a",
+        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
         "type": "github"
       },
       "original": {
@@ -166,11 +166,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731676054,
-        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
+        "lastModified": 1732014248,
+        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
+        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
         "type": "github"
       },
       "original": {
diff --git a/flake.lock b/flake.lock
index 5eb4dd0..2a47de7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731892832,
-        "narHash": "sha256-E7Ycux1u/mJQfFSmAUTKMN/Og+sjAdJG4QbLDwqfpNo=",
+        "lastModified": 1732499882,
+        "narHash": "sha256-+BWeuEH70v193zbGjil9vTyXFomixVWKwg+C6F4aYnI=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "39cd49ebe145484f70cd517abb27376c0dc63c9b",
+        "rev": "a84dc7f9b8a43f089d094a7d9af8340d21f0d5f0",
         "type": "github"
       },
       "original": {
@@ -97,11 +97,11 @@
     "melpa": {
       "flake": false,
       "locked": {
-        "lastModified": 1731879723,
-        "narHash": "sha256-RNi9oSsT7ZQ2WHuyWcKoroE6+QgbArrhdylsEKOKMzk=",
+        "lastModified": 1732489402,
+        "narHash": "sha256-oTq3brR5JM2qbrkGM9SNr6/mT1rZUiFx5QtyE1CclJg=",
         "owner": "melpa",
         "repo": "melpa",
-        "rev": "d2b2189ea2d354763dce759dcd5f6482e14024a7",
+        "rev": "5e4ccfc8ab211349b577a06dea355ea59b3eb888",
         "type": "github"
       },
       "original": {
@@ -112,11 +112,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731875774,
-        "narHash": "sha256-HIl3lTqMVu/RXx9Gav46qai6+OV9Gu3cQFbvZSOvjJI=",
+        "lastModified": 1732446744,
+        "narHash": "sha256-yXqgr+GiC/RBr8n/6Bn9eRagitXbKXNcoSaZUCovuwI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6c33d760f16f52ffc0dd8538b9239808d96ec699",
+        "rev": "2570b87e71ea16daadf0a93f1eae2d3ad4478a94",
         "type": "github"
       },
       "original": {

From 1a7df954a0974f0a1c2503d9414961e68b6548f2 Mon Sep 17 00:00:00 2001
From: Terje Larsen <terlar@gmail.com>
Date: Tue, 26 Nov 2024 11:02:51 +0100
Subject: [PATCH 2/2] fix: workaround cape when-let byte-compile bug

---
 nix/packageOverrides.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nix/packageOverrides.nix b/nix/packageOverrides.nix
index b550c58..a0a367a 100644
--- a/nix/packageOverrides.nix
+++ b/nix/packageOverrides.nix
@@ -9,6 +9,13 @@
   unzip,
 }:
 _final: prev: {
+  cape = prev.cape.overrideAttrs (_: {
+    preBuild = ''
+      substituteInPlace cape-char.el \
+        --replace-fail "when-let" "when-let*"
+    '';
+  });
+
   devdocs = prev.devdocs.overrideAttrs (_: {
     preBuild = ''
       substituteInPlace devdocs.el --replace-fail "(require 'mathjax)" "(require 'mathjax nil t)"