From e5b4bd06190770b3d8393601323c96e4b878634c Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Thu, 19 Sep 2024 18:18:51 +0200
Subject: [PATCH] =?UTF-8?q?rtz:=200.7.0=20=E2=86=92=200.7.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No change in `rtz` code. This is a patch release done to vendor
`utoipa-swagger-ui` and let us remove the patch made in
4478f423e35b72c4450f00f418b618c92fd48896.
---
 pkgs/tools/misc/rtz/Cargo.lock  | 13 ++++++++++---
 pkgs/tools/misc/rtz/default.nix | 20 ++------------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/misc/rtz/Cargo.lock b/pkgs/tools/misc/rtz/Cargo.lock
index a84b6ab4315f..3211e669bf95 100644
--- a/pkgs/tools/misc/rtz/Cargo.lock
+++ b/pkgs/tools/misc/rtz/Cargo.lock
@@ -524,9 +524,9 @@ dependencies = [
 
 [[package]]
 name = "cities-json"
-version = "0.4.0"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4720186a8069da0585af9ec1e2f9e815d7d1bbe47dc817b8597e31a609f898f"
+checksum = "b182994ec23e201f9bd45d2e4f6756dc176f9fc12aa957842bf01348725d1e66"
 dependencies = [
  "lazy_static",
  "rand 0.8.5",
@@ -2470,7 +2470,7 @@ dependencies = [
 
 [[package]]
 name = "rtz"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3568,9 +3568,16 @@ dependencies = [
  "serde_json",
  "url",
  "utoipa",
+ "utoipa-swagger-ui-vendored",
  "zip 1.1.4",
 ]
 
+[[package]]
+name = "utoipa-swagger-ui-vendored"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20d6689d3a5693eec4d21f6b9d7c54f37468b856da8e98a7bb316f7b32df6e3"
+
 [[package]]
 name = "uuid"
 version = "1.4.1"
diff --git a/pkgs/tools/misc/rtz/default.nix b/pkgs/tools/misc/rtz/default.nix
index 3d7670991a5b..61bf79379ee5 100644
--- a/pkgs/tools/misc/rtz/default.nix
+++ b/pkgs/tools/misc/rtz/default.nix
@@ -12,13 +12,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rtz";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "twitchax";
     repo = "rtz";
     rev = "v${version}";
-    hash = "sha256-Wfb3FEZHjWYUtRI4Qn3QNunIXuzW1AIEZkIvtVrjBPs=";
+    hash = "sha256-V7N9NFIc/WWxLaahkjdS47Qj8sc3HRdKSkrBqi1ngA8=";
   };
 
   cargoLock = {
@@ -28,11 +28,6 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
-  swagger-ui = fetchurl {
-    url = "https://github.com/juhaku/utoipa/raw/master/utoipa-swagger-ui-vendored/res/v5.17.12.zip";
-    hash = "sha256-HK4z/JI+1yq8BTBJveYXv9bpN/sXru7bn/8g5mf2B/I=";
-  };
-
   nativeBuildInputs = [
     pkg-config
   ];
@@ -48,17 +43,6 @@ rustPlatform.buildRustPackage rec {
 
   buildFeatures = [ "web" ];
 
-  # ${swagger-ui} is read-only and the copy made by the build script
-  # is as well. Remove it so that checks can copy it again.
-  preCheck = ''
-    find target -name $(basename ${swagger-ui}) -delete
-  '';
-
-  env = {
-    # use local data file instead of requiring network access
-    SWAGGER_UI_DOWNLOAD_URL = "file://${swagger-ui}";
-  };
-
   meta = with lib; {
     description = "Tool to easily work with timezone lookups via a binary, a library, or a server";
     homepage = "https://github.com/twitchax/rtz";