Skip to content

qgis-ltr, qgis: 3.16.16 -> 3.22.4, 3.22.3 -> 3.24.0 #160681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erictapen merged 4 commits into from
Feb 27, 2022
Merged

qgis-ltr, qgis: 3.16.16 -> 3.22.4, 3.22.3 -> 3.24.0 #160681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7495c1e
qgis: 3.22.3 -> 3.24.0
willcohen Feb 18, 2022
af46311
qgis-ltr: 3.16.16 -> 3.22.4
willcohen Feb 18, 2022
eae16ad
qgis: add willcohen to maintainers
willcohen Feb 27, 2022
f48d6b7
qgis-ltr: add willcohen to maintainers
willcohen Feb 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions pkgs/applications/gis/qgis/unwrapped-ltr.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
, grass
, withWebKit ? true
, qtwebkit
, pdal
, zstd
, makeWrapper
}:

Expand Down Expand Up @@ -67,14 +69,14 @@ let
six
];
in mkDerivation rec {
version = "3.16.16";
version = "3.22.4";
pname = "qgis-ltr-unwrapped";

src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "85RlV1Ik1BeN9B7UE51ktTWMiGkMga2E/fnhyiVwjIs=";
sha256 = "sha256-z2dCdaIJUKpZgJHtn1/qA07uMJpAWKL0cDx6B/n1Oxg=";
};

passthru = {
Expand Down Expand Up @@ -108,6 +110,8 @@ in mkDerivation rec {
qtserialport
qtxmlpatterns
qt3d
pdal
zstd
] ++ lib.optional withGrass grass
++ lib.optional withWebKit qtwebkit
++ pythonBuildInputs;
Expand All @@ -126,6 +130,7 @@ in mkDerivation rec {
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DWITH_3D=True"
"-DWITH_PDAL=TRUE"
"-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"
"-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
Expand All @@ -138,11 +143,11 @@ in mkDerivation rec {
--prefix PATH : ${lib.makeBinPath [ grass ]}
'';

meta = with lib; {
meta = {
description = "A Free and Open Source Geographic Information System";
homepage = "https://www.qgis.org";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ lsix sikmir erictapen ];
license = lib.licenses.gpl2Plus;
platforms = with lib.platforms; linux;
maintainers = with lib.maintainers; [ lsix sikmir erictapen willcohen ];
};
}
6 changes: 3 additions & 3 deletions pkgs/applications/gis/qgis/unwrapped.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ let
six
];
in mkDerivation rec {
version = "3.22.3";
version = "3.24.0";
pname = "qgis-unwrapped";

src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "TLXhXHU0dp0MnKHFw/+1rQnJbebnwje21Oasy0qWctk=";
sha256 = "sha256-EPF8sXAH7UAttLutxXGFovog3+XpXP0GXg2tu0mSU2s=";
};

passthru = {
Expand Down Expand Up @@ -148,6 +148,6 @@ in mkDerivation rec {
homepage = "https://www.qgis.org";
license = lib.licenses.gpl2Plus;
platforms = with lib.platforms; linux;
maintainers = with lib.maintainers; [ lsix sikmir erictapen ];
maintainers = with lib.maintainers; [ lsix sikmir erictapen willcohen ];
};
}