From a4870bb43cbe3d980d4e6a4879e69bd4712a3ecc Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 23 Mar 2023 20:06:56 +0100
Subject: [PATCH] swayws: unstable-2022-03-10 -> 1.2.0

https://gitlab.com/w0lff/swayws/-/compare/514f3c664439cf2c11bb9096c7e1d3b8c0b898a2...v1.2.0?from_project_id=28532095&straight=false
---
 .../window-managers/sway/ws-update-Cargo-lock.patch | 13 +++++++++++++
 pkgs/applications/window-managers/sway/ws.nix       | 12 ++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/window-managers/sway/ws-update-Cargo-lock.patch

diff --git a/pkgs/applications/window-managers/sway/ws-update-Cargo-lock.patch b/pkgs/applications/window-managers/sway/ws-update-Cargo-lock.patch
new file mode 100644
index 000000000000..e1d7614e8bfa
--- /dev/null
+++ b/pkgs/applications/window-managers/sway/ws-update-Cargo-lock.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index f01f824..e00d079 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -328,7 +328,7 @@ dependencies = [
+
+ [[package]]
+ name = "swayws"
+-version = "1.1.1"
++version = "1.2.0"
+ dependencies = [
+  "clap",
+  "env_logger",
diff --git a/pkgs/applications/window-managers/sway/ws.nix b/pkgs/applications/window-managers/sway/ws.nix
index babb252d7452..999581153ac9 100644
--- a/pkgs/applications/window-managers/sway/ws.nix
+++ b/pkgs/applications/window-managers/sway/ws.nix
@@ -2,16 +2,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "swayws";
-  version = "unstable-2022-03-10";
+  version = "1.2.0";
 
   src = fetchFromGitLab {
     owner = "w0lff";
     repo = pname;
-    rev = "514f3c664439cf2c11bb9096c7e1d3b8c0b898a2";
-    sha256 = "sha256-vUnbn79v08riYLMBI8BxeBPpe/pHOWlraG7QAaohw3s=";
+    rev = "v${version}";
+    sha256 = "sha256-f0kXy7/31imgHHqKPmW9K+QrLqroaPaXwlJkzOoezRU=";
   };
 
-  cargoSha256 = "sha256-PvKpcTewajvbzUHPssBahWVcAQB3V/aMmOJ/wA0Nrv4=";
+  cargoSha256 = "sha256-VYT6wV59fraAoJgR/i6GlO8s7LUoehGtxPAggEL1eLo=";
+  # Required patch until upstream fixes https://gitlab.com/w0lff/swayws/-/issues/1
+  cargoPatches = [
+    ./ws-update-Cargo-lock.patch
+  ];
 
   # swayws does not have any tests
   doCheck = false;