From dbb0330c64972a4606c1f6f5203f822b9ee31aa0 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Fri, 24 Mar 2023 20:33:06 +0100
Subject: [PATCH] josh: 22.06.22 -> 23.02.14

---
 .../version-management/josh/default.nix       | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/applications/version-management/josh/default.nix
index acf2b24c0794..a9929cca64e4 100644
--- a/pkgs/applications/version-management/josh/default.nix
+++ b/pkgs/applications/version-management/josh/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , rustPlatform
 , libgit2
 , openssl
@@ -12,16 +13,26 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "josh";
-  version = "22.06.22";
+  version = "23.02.14";
+  JOSH_VERSION = "r${version}";
 
   src = fetchFromGitHub {
     owner = "esrlabs";
     repo = "josh";
-    rev = "r" + version;
-    sha256 = "0511qv9zyjvv4zfz6zyi69ssbkrwa24n0ah5w9mb4gzd547as8pq";
+    rev = JOSH_VERSION;
+    sha256 = "1sqa8xi5d55zshky7gicac02f67vp944hclkdsmwy0bczk9hgssr";
   };
 
-  cargoSha256 = "0zfjjyyz4pxar1mfkkj9aij4dnwqy3asdrmay1iy6ijjn1qd97n4";
+  patches = [
+    # Unreleased patch allowing compilation from the GitHub tarball download
+    (fetchpatch {
+      name = "josh-version-without-git.patch";
+      url = "https://github.com/josh-project/josh/commit/13e7565ab029206598881391db4ddc6dface692b.patch";
+      sha256 = "1l5syqj51sn7kcqvffwl6ggn5sq8wfkpviga860agghnw5dpf7ns";
+    })
+  ];
+
+  cargoSha256 = "0f6cvz2s8qs53b2g6xja38m24hafqla61s4r5za0a1dyndgms7sl";
 
   nativeBuildInputs = [
     pkg-config