@@ -1,12 +1,18 @@
1−{ mkDerivation, lib, fetchurl, fetchpatch, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:
1+{ mkDerivation, lib, fetchFromGitHub, cmake
2+, qtscript, qtwebengine, gdal, proj, routino, quazip }:
23
34mkDerivation rec {
45 pname = "qmapshack";
5− version = "1.13.1";
6−
7− src = fetchurl {
8− url = "https://bitbucket.org/maproom/qmapshack/downloads/${pname}-${version}.tar.gz";
9− sha256 = "15x1b2q0hr1vx006f9hjc4cvfjvxvfdwybw32qvczdyc3crq0mc9";
6+ version = "1.13.2";
7+
8+ src = fetchFromGitHub {
9+ owner = "Maproom";
10+ repo = pname;
11+ # TODO: remove it on next release.
12+ # 1.13.2 release tarball is essentially broken, use fixed commit instead.
13+ # See https://github.com/maproom/qmapshack/pull/4 for more details.
14+ rev = "763cfc149566325cce9e4690cb7b5f986048f86a"; #"V_${version}";
15+ sha256 = "1lfivhm9rv9ly1srlmb7d80s77306xplg23lx35vav879bri29rx";
1016 };
1117
1218 nativeBuildInputs = [ cmake ];
@@ -22,21 +28,15 @@ mkDerivation rec {
2228 enableParallelBuilding = true;
2329
2430 patches = [
25− (fetchpatch {
26− url = "https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindPROJ4.patch";
27− sha256 = "1nx4ax233bnnj478cmjpm5c1qqmyn1navlihf10q6hhbanay9n99";
28− })
29− (fetchpatch {
30− url = "https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindQuaZip5.patch";
31− sha256 = "0z1b2dz2zlz685mxgn8bmh1fyhxpf6dzd6jvkkjyk2kvnrdxv3b9";
32− })
31+ "${src}/FindPROJ4.patch"
32+ "${src}/FindQuaZip5.patch"
3333 ];
3434
3535 meta = with lib; {
36− homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home;
37− description = "Plan your next outdoor trip";
36+ homepage = https://github.com/Maproom/qmapshack;
37+ description = "Consumer grade GIS software";
3838 license = licenses.gpl3;
39− maintainers = with maintainers; [ dotlambda ];
39+ maintainers = with maintainers; [ dotlambda sikmir ];
4040 platforms = with platforms; linux;
4141 };
4242}