From 92672cfff81e2cc227b237037746ef296c551503 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Fri, 27 Nov 2020 12:05:04 +0300
Subject: [PATCH] =?UTF-8?q?qmapshack:=201.15.0=20=E2=86=92=201.15.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/{misc => gis}/qmapshack/default.nix | 8 +++-----
 pkgs/top-level/all-packages.nix                       | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename pkgs/applications/{misc => gis}/qmapshack/default.nix (85%)

diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/gis/qmapshack/default.nix
similarity index 85%
rename from pkgs/applications/misc/qmapshack/default.nix
rename to pkgs/applications/gis/qmapshack/default.nix
index 1a8758955cef..bc7d888e2c15 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/gis/qmapshack/default.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "qmapshack";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "Maproom";
     repo = pname;
     rev = "V_${version}";
-    sha256 = "157bssrbwcc1w58b0v60jb3wrjf2ig4z6z6crjnpvflkqj5p8vwy";
+    sha256 = "1q8qczp9bgk3dzdswb1x64fcn3xg339s0yx31nablb518hcb8jkr";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -22,8 +22,6 @@ mkDerivation rec {
     "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so"
   ];
 
-  enableParallelBuilding = true;
-
   patches = [
     "${src}/FindPROJ4.patch"
     "${src}/FindQuaZip5.patch"
@@ -36,7 +34,7 @@ mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/Maproom/qmapshack";
     description = "Consumer grade GIS software";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ dotlambda sikmir ];
     platforms = with platforms; linux;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ea78c5d1045..6aa71ede4783 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23365,7 +23365,7 @@ in
 
   garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {};
 
-  qmapshack = libsForQt514.callPackage ../applications/misc/qmapshack { };
+  qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { };
 
   qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview {
     boost = boost17x;