From 6bb7072f175879715f151ad3acd959e7671eefe4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 28 Oct 2024 00:52:35 +0000
Subject: [PATCH 1/2] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/ffe2d07e771580a005e675108212597e5b367d2d?narHash=sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs%3D' (2024-09-26)
  → 'github:nix-community/home-manager/e83414058edd339148dc142a8437edb9450574c8?narHash=sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0%3D' (2024-10-27)
• Updated input 'nix-darwin':
    'github:LnL7/nix-darwin/f2e1c4aa29fc211947c3a7113cba1dd707433b70?narHash=sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA%3D' (2024-09-28)
  → 'github:LnL7/nix-darwin/5c0c6aaa797d6ccbb6cdab14de0248135735709d?narHash=sha256-%2BRYCbdU6l4E4pr40%2B%2BlrdhdE3gNC/BR54AL7xWG/YRU%3D' (2024-10-27)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/4471f9f67fe0f95f5fec4cc2ebac59fe32af2b62?narHash=sha256-oRkgc%2BDosM3HIl9el98TxF2rtliKHCNVw00nlQC7xYM%3D' (2024-09-28)
  → 'github:NixOS/nixpkgs/86e78d3d2084ff87688da662cf78c2af085d8e73?narHash=sha256-eWPRZAlhf446bKSmzw6x7RWEE4IuZgAp8NW3eXZwRAY%3D' (2024-10-26)
• Updated input 'nur-rennsax':
    'github:rennsax/nur-packages/ad9a6ef65f83e1c88c8ea10fcfb06c556e92c71e?narHash=sha256-5ON7WGPLODJZS8jLUV1bJlBTh6L%2BMiviHAz75Z9jHHM%3D' (2024-09-29)
  → 'github:rennsax/nur-packages/5ed784b9439f175fd3a05cb0912c3daec3f152e2?narHash=sha256-s4CRmm90NtEzXGGyibmjcKYx0YoGWLSg1/jAY/Ytrrc%3D' (2024-10-07)
---
 flake.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index cad336a..1ac1a7d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727383923,
-        "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
+        "lastModified": 1730016908,
+        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
+        "rev": "e83414058edd339148dc142a8437edb9450574c8",
         "type": "github"
       },
       "original": {
@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727507295,
-        "narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=",
+        "lastModified": 1730070491,
+        "narHash": "sha256-+RYCbdU6l4E4pr40++lrdhdE3gNC/BR54AL7xWG/YRU=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70",
+        "rev": "5c0c6aaa797d6ccbb6cdab14de0248135735709d",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727492312,
-        "narHash": "sha256-oRkgc+DosM3HIl9el98TxF2rtliKHCNVw00nlQC7xYM=",
+        "lastModified": 1729980323,
+        "narHash": "sha256-eWPRZAlhf446bKSmzw6x7RWEE4IuZgAp8NW3eXZwRAY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4471f9f67fe0f95f5fec4cc2ebac59fe32af2b62",
+        "rev": "86e78d3d2084ff87688da662cf78c2af085d8e73",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727588515,
-        "narHash": "sha256-5ON7WGPLODJZS8jLUV1bJlBTh6L+MiviHAz75Z9jHHM=",
+        "lastModified": 1728305831,
+        "narHash": "sha256-s4CRmm90NtEzXGGyibmjcKYx0YoGWLSg1/jAY/Ytrrc=",
         "owner": "rennsax",
         "repo": "nur-packages",
-        "rev": "ad9a6ef65f83e1c88c8ea10fcfb06c556e92c71e",
+        "rev": "5ed784b9439f175fd3a05cb0912c3daec3f152e2",
         "type": "github"
       },
       "original": {

From 0bad1ac92ac9aae9cf3ee22aacf7f1b603dd2bd1 Mon Sep 17 00:00:00 2001
From: Bojun Ren <bj.ren.coding@outlook.com>
Date: Mon, 28 Oct 2024 09:54:01 +0800
Subject: [PATCH 2/2] cheat: stop applying patch with overlay

This patch has already merged in Nixpkgs.
---
 overlays/default.nix             |  3 ---
 overlays/patches/cheat.zsh.patch | 10 ----------
 2 files changed, 13 deletions(-)
 delete mode 100644 overlays/patches/cheat.zsh.patch

diff --git a/overlays/default.nix b/overlays/default.nix
index 65bbd10..3f862e5 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,8 +1,5 @@
 { ... }: [
   (final: prev: {
-    cheat = prev.cheat.overrideAttrs (old: {
-      patches = (old.patches or [ ]) ++ [ ./patches/cheat.zsh.patch ];
-    });
     sarasa-term-sc-nerd = prev.callPackage ./sarasa-term-sc-nerd.nix { };
     gnu-coding-standards = prev.callPackage ./gnu-coding-standards.nix { };
     macos-trash = prev.callPackage ./macos-trash.nix { };
diff --git a/overlays/patches/cheat.zsh.patch b/overlays/patches/cheat.zsh.patch
deleted file mode 100644
index 9c40c04..0000000
--- a/overlays/patches/cheat.zsh.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/scripts/cheat.zsh b/scripts/cheat.zsh
-index befe1b2..675c9f8 100755
---- a/scripts/cheat.zsh
-+++ b/scripts/cheat.zsh
-@@ -62,4 +62,4 @@ _cheat() {
-   esac
- }
- 
--compdef _cheat cheat
-+_cheat "$@"