diff --git a/pkgs/by-name/sw/swayws/package.nix b/pkgs/by-name/sw/swayws/package.nix index 90752a14da04..1bc606d030bf 100644 --- a/pkgs/by-name/sw/swayws/package.nix +++ b/pkgs/by-name/sw/swayws/package.nix @@ -11,15 +11,14 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitLab { owner = "w0lff"; repo = pname; - rev = "v${version}"; - hash = "sha256-f0kXy7/31imgHHqKPmW9K+QrLqroaPaXwlJkzOoezRU="; + # Specifying commit hash rather than tag because upstream has + # rewritten a tag before: + # https://gitlab.com/w0lff/swayws/-/issues/1#note_1342349382 + rev = "98f0d5c1896b10e890e1727654f1cf3b34a2371e"; + hash = "sha256-zeM6/x2vjZ2IL+nZz1WBf5yY4C6ovmxyvgVLD54BKVc="; }; cargoHash = "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; diff --git a/pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch b/pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch deleted file mode 100644 index e1d7614e8bfa..000000000000 --- a/pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -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",