From a098e80118f4781b9846c4e248dd8e93c2138c85 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Mon, 25 Nov 2024 21:57:40 -0800 Subject: [PATCH] josm: revert workaround to broken fetchsvn re #356829 --- pkgs/by-name/jo/josm/package.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix index e2cd5ece6505..c8e0cb1a4089 100644 --- a/pkgs/by-name/jo/josm/package.nix +++ b/pkgs/by-name/jo/josm/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - fetchFromGitHub, + fetchsvn, makeWrapper, unzip, jre, @@ -21,11 +21,10 @@ let url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; hash = "sha256-8eps1eTUn9FHHYwECH/742PV7wnnRO08dlZmaxd1aZU="; }; - pkg = fetchFromGitHub { - owner = "JOSM"; - repo = "josm"; - tag = "${version}-tested"; - hash = "sha256-ke8+JMFx95WyYR+ZIbjUVh3CT72bAfiMBGkc0Mim+60="; + pkg = fetchsvn { + url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; + rev = version; + hash = "sha256-4mK+IdVRDhINJqzOovw7YPNiJmFxTCIfYVNMXKSdBv0="; }; }; @@ -53,7 +52,7 @@ stdenv.mkDerivation { else '' install -Dm644 ${srcs.jar} $out/share/josm/josm.jar - cp -R ${srcs.pkg}/native/linux/tested/usr/share $out + cp -R ${srcs.pkg}/usr/share $out # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin makeWrapper ${jre}/bin/java $out/bin/josm \