diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix index 920b294562d17..35f395b69d317 100644 --- a/pkgs/by-name/jo/josm/package.nix +++ b/pkgs/by-name/jo/josm/package.nix @@ -1,22 +1,23 @@ -{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm +{ lib, stdenv, fetchurl, fetchFromGitHub, makeWrapper, unzip, jre, libXxf86vm , extraJavaOpts ? "-Djosm.restart=true -Djava.net.useSystemProxies=true" }: let pname = "josm"; - version = "19207"; + version = "19230"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-dYDJmGXIKd2GhjyKBpQjoIfz9giBsgFdC0TaKplxiPY="; + hash = "sha256-d2KyTPIw7N+ZveNUa5W3yiV6pCouigTq+GICSEkTiis="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; - hash = "sha256-A34nd+RBipON5zOKBD57L1l2KACYEUHNjxs0N6xqoXc="; + hash = "sha256-IrFtRlNdXZI6ucfZC6yEancV4E5lEP7+VNhaZ6p9t4I="; }; - pkg = fetchsvn { - url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; - rev = version; - hash = "sha256-L7P6FtqKLB4e+ezPzXePM33qj5esNoRlTFXi0/GhdsA="; + pkg = fetchFromGitHub { + owner = "JOSM"; + repo = "josm"; + rev = "refs/tags/${version}-tested"; + hash = "sha256-s6vc09qdQbJb2b0j4t7CVPmbfWpjc5Pl3JBCPgGVZMY="; }; }; @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { ${unzip}/bin/unzip ${srcs.macosx} 'JOSM.app/*' -d $out/Applications '' else '' install -Dm644 ${srcs.jar} $out/share/josm/josm.jar - cp -R ${srcs.pkg}/usr/share $out + cp -R ${srcs.pkg}/native/linux/tested/usr/share $out # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin makeWrapper ${jre}/bin/java $out/bin/josm \ @@ -49,14 +50,14 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' ''; - meta = with lib; { + meta = { description = "Extensible editor for OpenStreetMap"; homepage = "https://josm.openstreetmap.de/"; changelog = "https://josm.openstreetmap.de/wiki/Changelog"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ rycee sikmir ]; - platforms = platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ rycee sikmir ]; + platforms = lib.platforms.all; mainProgram = "josm"; }; }