From 5cdfe18fc3a6e96b1c9713fbcdfac28eef211156 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 28 Apr 2026 10:19:58 +0200
Subject: [PATCH 1/2] josh: fix changelog url

---
 pkgs/by-name/jo/josh/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/jo/josh/package.nix b/pkgs/by-name/jo/josh/package.nix
index 0a47b643cb7f..ab3310bc96a5 100644
--- a/pkgs/by-name/jo/josh/package.nix
+++ b/pkgs/by-name/jo/josh/package.nix
@@ -48,6 +48,7 @@ rustPlatform.buildRustPackage {
   # used to teach josh itself about its version number
   env.JOSH_VERSION = "r${version}";
 
+  # josh and josh-filter are used interactively, so git is likely already in PATH
   postInstall = ''
     wrapProgram "$out/bin/josh-proxy" --prefix PATH : "${git}/bin"
   '';
@@ -56,7 +57,7 @@ rustPlatform.buildRustPackage {
     description = "Just One Single History";
     homepage = "https://josh-project.github.io/josh/";
     downloadPage = "https://github.com/josh-project/josh";
-    changelog = "https://github.com/josh-project/josh/releases/tag/${version}";
+    changelog = "https://github.com/josh-project/josh/releases/tag/r${version}";
     license = lib.licenses.mit;
     maintainers = [
       lib.maintainers.sternenseemann

From a5607f5924cadc0646fa62720a0951113988a70f Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 28 Apr 2026 10:21:43 +0200
Subject: [PATCH 2/2] josh: 24.10.04 -> 26.04.19

https://github.com/josh-project/josh/releases/tag/r26.04.19
---
 pkgs/by-name/jo/josh/package.nix | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/jo/josh/package.nix b/pkgs/by-name/jo/josh/package.nix
index ab3310bc96a5..266ced05efa0 100644
--- a/pkgs/by-name/jo/josh/package.nix
+++ b/pkgs/by-name/jo/josh/package.nix
@@ -10,13 +10,7 @@
 }:
 
 let
-  # josh-ui requires javascript dependencies, haven't tried to figure it out yet
-  cargoFlags = [
-    "--workspace"
-    "--exclude"
-    "josh-ui"
-  ];
-  version = "24.10.04";
+  version = "26.04.19";
 in
 
 rustPlatform.buildRustPackage {
@@ -27,10 +21,10 @@ rustPlatform.buildRustPackage {
     owner = "josh-project";
     repo = "josh";
     rev = "r${version}";
-    hash = "sha256-6rfNEWNeC0T/OXhCReaV5npcJjQoH6XhsZzHXGnnxOo=";
+    hash = "sha256-tWU7ZGs148fmCXJxUM1RiDIgJONMZnFXO7ksaqqoT9I=";
   };
 
-  cargoHash = "sha256-Kb0EKWae1sldDg+F3ccoztI3zbQ/BJjy+4ojnqiqKA4=";
+  cargoHash = "sha256-Ksl3dFeEpwhpiotNuM9/vg7aD2TUuHKvqUaZkbceCdY=";
 
   nativeBuildInputs = [
     pkg-config
@@ -42,8 +36,13 @@ rustPlatform.buildRustPackage {
     openssl
   ];
 
-  cargoBuildFlags = cargoFlags;
-  cargoTestFlags = cargoFlags;
+  cargoBuildFlags = [ "--workspace" ];
+  # josh-proxy's inline tests need to interact with a specific test environment
+  cargoTestFlags = [
+    "--workspace"
+    "--exclude"
+    "josh-proxy"
+  ];
 
   # used to teach josh itself about its version number
   env.JOSH_VERSION = "r${version}";