From 4b99331e5ac8974eb154fd95059c51f0087026ca Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Thu, 13 Jul 2023 11:06:34 +0000
Subject: [PATCH] nixpkgs: 2023-07-11 -> 2023-07-12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/f2406198ea0e4e37d4380d0e20336c575b8f8ef9' (2023-07-11)
  → 'github:nixos/nixpkgs/2de8efefb6ce7f5e4e75bdf57376a96555986841' (2023-07-12)
```
---
 flake.lock          |  6 +++---
 nixpatches/list.nix | 12 ++++--------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index f6dadd0b..fa2771f8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -85,11 +85,11 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1689098530,
-        "narHash": "sha256-fxc/9f20wRyo/5ydkmZkX/Sh/ULa7RcT8h+cUv8p/44=",
+        "lastModified": 1689192006,
+        "narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f2406198ea0e4e37d4380d0e20336c575b8f8ef9",
+        "rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841",
         "type": "github"
       },
       "original": {
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index ca7ebf1e..e06b7e13 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -140,16 +140,12 @@ in [
   #   hash = "sha256-MNG8C0OgdPnFQ8SF2loiEhXJuP2z4n9pkXr8Zh4X7QU=";
   # })
 
-  # (fetchpatch' {
-  #   title = "conky: 1.13.1 -> 1.18.0";
-  #   prUrl = "https://github.com/NixOS/nixpkgs/pull/217224";
-  #   hash = "sha256-paNHUbsIBmWRTuSl7stE8INGtENL1ccO9UoDVGJNykM=";
-  # })
   (fetchpatch' {
-    # includes the diff of the above 1.13.1 -> 1.18.0 upgrade
     title = "conky: support wayland";
-    saneCommit = "dc8ef58ce033862663ea2fc320c5bb5e0d70d81b";
-    hash = "sha256-yXH6H1ZtQj8ywHWj8SVbDFCff0t0lpJAhb8fFG8Qrv4=";
+    # saneCommit = "82978099c3a0d5fb4925351da1b0e2598503dc6c";
+    # hash = "sha256-lnDGEDhmeOIXfFnizEIVUiUzI7nMvpoCERbdjhR+Bto=";
+    saneCommit = "3ad928e20b498444e3a106b182e09317cea9a11f";
+    hash = "sha256-lvIASvQWVFbjHsQwO2EhEBUTSq1UkHvriaZZ2iS0ulU=";
   })
 
   # (fetchpatch' {