mkgmap-splitter: use SRI hashes and finalAttrs pattern

Also use deps from mkgmap.passthru instead of importing via relative path.

Author: qweered

pkgs/by-name/mk/mkgmap-splitter/package.nix

@@ -7,57 +7,53 @@
   jre,
   ant,
   makeWrapper,
+  mkgmap,
   stripJavaArchivesHook,
   doCheck ? true,
 }:
+
 let
-  deps = import ../deps.nix { inherit fetchurl; };
+  inherit (mkgmap) deps;
   testInputs = import ./testinputs.nix { inherit fetchurl; };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "splitter";
   version = "654";
 
   src = fetchsvn {
     url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk";
-    rev = version;
-    sha256 = "sha256-y/pl8kIQ6fiF541ho72LMgJFWJdkUBqPToQGCGmmcfg=";
+    rev = finalAttrs.version;
+    hash = "sha256-y/pl8kIQ6fiF541ho72LMgJFWJdkUBqPToQGCGmmcfg=";
   };
 
   patches = [
-    # Disable automatic download of dependencies
     ./build.xml.patch
-    # Fix func.SolverAndProblemGeneratorTest test
     ./fix-failing-test.patch
   ];
 
-  postPatch =
-    with deps;
-    ''
-      # Manually create version properties file for reproducibility
-      mkdir -p build/classes
-      cat > build/classes/splitter-version.properties << EOF
-        svn.version=${version}
-        build.timestamp=unknown
-      EOF
+  postPatch = ''
+    mkdir -p build/classes
+    cat > build/classes/splitter-version.properties << EOF
+      svn.version=${finalAttrs.version}
+      build.timestamp=unknown
+    EOF
 
-      # Put pre-fetched dependencies into the right place
-      mkdir -p lib/compile
-      cp ${fastutil} lib/compile/${fastutil.name}
-      cp ${osmpbf} lib/compile/${osmpbf.name}
-      cp ${protobuf} lib/compile/${protobuf.name}
-      cp ${xpp3} lib/compile/${xpp3.name}
-    ''
-    + lib.optionalString doCheck ''
-      mkdir -p lib/test
-      cp ${junit} lib/test/${junit.name}
-      cp ${hamcrest-core} lib/test/${hamcrest-core.name}
+    mkdir -p lib/compile
+    cp ${deps.fastutil} lib/compile/${deps.fastutil.name}
+    cp ${deps.osmpbf} lib/compile/${deps.osmpbf.name}
+    cp ${deps.protobuf} lib/compile/${deps.protobuf.name}
+    cp ${deps.xpp3} lib/compile/${deps.xpp3.name}
+  ''
+  + lib.optionalString doCheck ''
+    mkdir -p lib/test
+    cp ${deps.junit} lib/test/${deps.junit.name}
+    cp ${deps.hamcrest-core} lib/test/${deps.hamcrest-core.name}
 
-      mkdir -p test/resources/in/osm
-      ${lib.concatMapStringsSep "\n" (res: ''
-        cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name}
-      '') testInputs}
-    '';
+    mkdir -p test/resources/in/osm
+    ${lib.concatMapStringsSep "\n" (res: ''
+      cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name}
+    '') testInputs}
+  '';
 
   nativeBuildInputs = [
     jdk
@@ -94,9 +90,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru.updateScript = [
-    ../update.sh
+    ./update.sh
     "mkgmap-splitter"
-    meta.downloadPage
+    finalAttrs.meta.downloadPage
   ];
 
   meta = {
@@ -112,4 +108,4 @@ stdenv.mkDerivation rec {
       binaryBytecode # deps
     ];
   };
-}
+})

pkgs/by-name/mk/mkgmap-splitter/testinputs.nix

@@ -1,20 +1,20 @@
 { fetchurl }:
 let
   fetchTestInput =
-    { res, sha256 }:
+    { res, hash }:
     fetchurl {
-      inherit sha256;
+      inherit hash;
       url = "https://www.mkgmap.org.uk/testinput/${res}";
       name = builtins.replaceStrings [ "/" ] [ "__" ] res;
     };
 in
 [
   (fetchTestInput {
     res = "osm/alaska-2016-12-27.osm.pbf";
-    sha256 = "0hmb5v71a1bxgvrg1cbfj5l27b3vvdazs4pyggpmhcdhbwpw7ppm";
+    hash = "sha256-9d7DL1+wMVjve/4S/VXbe6wjaJFusfDyfn0FFc4uq0I=";
   })
   (fetchTestInput {
     res = "osm/hamburg-2016-12-26.osm.pbf";
-    sha256 = "08bny4aavwm3z2114q99fv3fi2w905zxi0fl7bqgjyhgk0fxjssf";
+    hash = "sha256-TmvZHZgPevnwOtSB2H8BiYvoxnYpYRKC+KPyrRTxdiE=";
   })
 ]