git.iko.soy/typeable/nixpkgs
on master help sign in
qmapshack: 1.15.0 → 1.15.1
commit92672cfff81e2cc227b237037746ef296c551503 authorNikolay Korotkiy <sikmir@gmail.com> dateFri 27 Nov 2020, 12:05 (6 years ago) parent215337d
2 files changed+4−6
pkgs/applications/misc/qmapshack/default.nix → pkgs/applications/gis/qmapshack/default.nix+3−5 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/misc/qmapshack/default.nix → pkgs/applications/gis/qmapshack/default.nixrenamed+3−5
@@ -3,13 +3,13 @@
33
44mkDerivation rec {
55 pname = "qmapshack";
6− version = "1.15.0";
6+ version = "1.15.1";
77
88 src = fetchFromGitHub {
99 owner = "Maproom";
1010 repo = pname;
1111 rev = "V_${version}";
12− sha256 = "157bssrbwcc1w58b0v60jb3wrjf2ig4z6z6crjnpvflkqj5p8vwy";
12+ sha256 = "1q8qczp9bgk3dzdswb1x64fcn3xg339s0yx31nablb518hcb8jkr";
1313 };
1414
1515 nativeBuildInputs = [ cmake ];
@@ -22,8 +22,6 @@ mkDerivation rec {
2222 "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so"
2323 ];
2424
25− enableParallelBuilding = true;
26−
2725 patches = [
2826 "${src}/FindPROJ4.patch"
2927 "${src}/FindQuaZip5.patch"
@@ -36,7 +34,7 @@ mkDerivation rec {
3634 meta = with lib; {
3735 homepage = "https://github.com/Maproom/qmapshack";
3836 description = "Consumer grade GIS software";
39− license = licenses.gpl3;
37+ license = licenses.gpl3Plus;
4038 maintainers = with maintainers; [ dotlambda sikmir ];
4139 platforms = with platforms; linux;
4240 };
pkgs/top-level/all-packages.nix+1−1
@@ -23365,7 +23365,7 @@ in
2336523365
2336623366 garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {};
2336723367
23368− qmapshack = libsForQt514.callPackage ../applications/misc/qmapshack { };
23368+ qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { };
2336923369
2337023370 qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview {
2337123371 boost = boost17x;