nix: add mainline josm version 15155, external guava

JOSM · Jun 17, 2019 · 5dd7729 · 5dd7729
1 parent adbe616
commit 5dd7729
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/default.nix b/default.nix
@@ -16,25 +16,34 @@ let
     fetchsvn = fetchsvnSafe;
     antBuild = pkgs.releaseTools.antBuild;
     stdenv = pkgs.stdenv;
-    version = "14760";
+    version = "15155";
   };
   jmockit = pkgs.fetchMavenArtifact {
     groupId = "org.jmockit";
     artifactId = "jmockit";
     version = "1.34";
     sha256 = "0spabz9n1s8r5jia0nmk0kb5by66f0m0qjxv9w10vi8g4q5kphyy";
   };
+  guava = pkgs.fetchMavenArtifact {
+    groupId = "com.google.guava";
+    artifactId = "guava";
+    sha256 = "14ag7fa462vddprizb3jv61qyimmg4j3mf2d58lrv3qfbypddr3k";
+    version = "28.0-jre";
+  };
 in {
   markseenDevEnv = pkgs.stdenv.mkDerivation {
     name = "josm-markseen-dev-env";
     buildInputs = [
+      pkgs.glibcLocales
       pkgs.ant
       pkgs.openjdk
       pkgs.rlwrap  # just try using jdb without it
       pkgs.man
       pkgs.inkscape  # for building icons
     ] ++ pkgs.stdenv.lib.optional ((builtins.compareVersions josm.version "14052") == -1) [
       jmockit
+    ] ++ pkgs.stdenv.lib.optional ((builtins.compareVersions josm.version "14760") == 1) [
+      guava
     ];
 
     JOSM_PLUGINS_SRC_DIR=josmPluginsSrc;

diff --git a/nix/josm.nix b/nix/josm.nix
@@ -14,6 +14,7 @@ antBuild rec {
       "13576" = "0xihpx2nrbcf32yyvscs8rzn1wwhg248p4vcsaw3lnsybjnx9mz6";  # 2018-03-26 release
       "14178" = "16y7s064ksncvp0xk1bgiqs7cbzpd3bbvpyn66pm65rw3sqsrm35";  # 2018-08-22 release
       "14760" = "1dxhqg5ariyrb5dk2fp44hzsw1xwa9jda39nmma5h63g8992rk05";  # 2019-02-05 release
+      "15155" = "1k933j9an7awa8vafjymylq006rkjn477f3hahhgb4lpb7mwx5p8";  # 2019-06-03 release
     };
     rev=version;
   };