Unverified Commit f63e26f4 authored by Nikolay Korotkiy's avatar Nikolay Korotkiy Committed by GitHub
Browse files

qmapshack: 1.17.1 → 1.18.0 (#422445)

parents 6fe8c222 14760848

pkgs/applications/gis/qmapshack/default.nix→pkgs/by-name/qm/qmapshack/package.nix

+18 −16
Original line number Diff line number Diff line
@@ -3,42 +3,44 @@ 
  stdenv,

  fetchFromGitHub,

  cmake,

  wrapQtAppsHook,

  qtscript,

  qtwebengine,

  qt6,

  qt6Packages,

  alglib,

  gdal,

  proj,

  routino,

  quazip,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "qmapshack";

  version = "1.17.1";

  version = "1.18.0";



  src = fetchFromGitHub {

    owner = "Maproom";

    repo = "qmapshack";

    rev = "V_${version}";

    hash = "sha256-wqztKmaUxY3qd7IgPM7kV7x0BsrTMTX3DbcdM+lsarI=";

    tag = "V_${finalAttrs.version}";

    hash = "sha256-+M76EZeZOsBQ7RXtVplsrbrDgU0plRAht4/jz/GpIhM=";

  };



  nativeBuildInputs = [

    cmake

    wrapQtAppsHook

    qt6.qttools

    qt6.wrapQtAppsHook

  ];



  buildInputs = [

    qtscript

    qtwebengine

    alglib

    gdal

    proj

    routino

    quazip

    qt6.qtwebengine

    qt6Packages.quazip

  ];



  cmakeFlags = [

    "-DROUTINO_XML_PATH=${routino}/share/routino"

    (lib.cmakeFeature "ALGLIB_INCLUDE_DIRS" "${alglib}/include/alglib")

    (lib.cmakeFeature "ALGLIB_LIBRARIES" "alglib3")

    (lib.cmakeFeature "ROUTINO_XML_PATH" "${routino}/share/routino")

  ];



  qtWrapperArgs = [
@@ -53,12 +55,12 @@ stdenv.mkDerivation rec { 
  meta = {

    description = "Consumer grade GIS software";

    homepage = "https://github.com/Maproom/qmapshack";

    changelog = "https://github.com/Maproom/qmapshack/blob/V_${version}/changelog.txt";

    changelog = "https://github.com/Maproom/qmapshack/blob/V_${finalAttrs.version}/changelog.txt";

    license = lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [

      dotlambda

      sikmir

    ];

    platforms = with lib.platforms; linux;

    platforms = lib.platforms.linux;

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -11739,8 +11739,6 @@ with pkgs; 


  qgis = callPackage ../applications/gis/qgis { };



  qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { };



  spatialite-gui = callPackage ../by-name/sp/spatialite-gui/package.nix {

    wxGTK = wxGTK32;

  };