Merge pull request #173820 from sikmir/mkgmap

mkgmap: 4897 → 4902, fix fetch
This commit is contained in:
markuskowa 2022-05-21 11:25:50 +02:00 committed by GitHub
commit f92b87aade
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions

View file

@ -1,5 +1,6 @@
{ lib, stdenv { lib, stdenv
, fetchurl , fetchurl
, fetchsvn
, substituteAll , substituteAll
, jdk , jdk
, jre , jre
@ -14,11 +15,12 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mkgmap"; pname = "mkgmap";
version = "4897"; version = "4902";
src = fetchurl { src = fetchsvn {
url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk";
sha256 = "RR8o8stOnL6nnEkCtRT9tgo8foSxd6ASTsRcGDgbQRk="; rev = version;
sha256 = "sha256-djqa6loaFUYfAhgmF6Lm+4M4Xgzyiw1bXqK4XWqT/tY=";
}; };
patches = [ patches = [

View file

@ -1,5 +1,6 @@
{ lib, stdenv { lib, stdenv
, fetchurl , fetchurl
, fetchsvn
, substituteAll , substituteAll
, jdk , jdk
, jre , jre
@ -13,11 +14,12 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "splitter"; pname = "splitter";
version = "647"; version = "651";
src = fetchurl { src = fetchsvn {
url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk";
sha256 = "j9TJ+9WuItueztWjYoD9s9x8wfsga2QCIY5X2+s3Z1c="; rev = version;
sha256 = "sha256-j6U+Wvxef151NEwkpuv4VdMac/cOT9YZUgkt+YPGCuk=";
}; };
patches = [ patches = [