Skip to content
This repository has been archived by the owner on Nov 27, 2024. It is now read-only.

Commit

Permalink
Merge pull request #502 from imincik/weekly-update-2024.27
Browse files Browse the repository at this point in the history 
pkgs: weekly update (weekly-update-2024.27)
  • Loading branch information
@imincik
imincik authored Jul 4, 2024
2 parents 47cd8ff + a8bffca commit 3a77b4b
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 47 deletions.
6 changes: 3 additions & 3 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 2 additions & 11 deletions pkgs/gdal/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
, stdenv
, callPackage
, fetchFromGitHub
, fetchpatch

, useMinimalFeatures ? false
, useTiledb ? (!useMinimalFeatures) && !(stdenv.isDarwin && stdenv.isx86_64)
Expand Down Expand Up @@ -80,23 +79,15 @@

stdenv.mkDerivation (finalAttrs: {
pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
version = "3.9.0";
version = "3.9.1";

src = fetchFromGitHub {
owner = "OSGeo";
repo = "gdal";
rev = "v${finalAttrs.version}";
hash = "sha256-xEekgF9GzsPYkwk7Nny9b1DMLTxBqTSdudYxaz4jl/c=";
hash = "sha256-WCTQHUU2WYYiliwCJ4PsbvJIOar9LmvXn/i5jJzTCtM=";
};

patches = [
# HDF5: add support for libhdf5 >= 1.14.4.2 when built with Float16
(fetchpatch {
url = "https://github.com/OSGeo/gdal/commit/16ade8253f26200246abb5ab24d17e18216e7a11.patch";
sha256 = "sha256-N6YqfcOUWeaJXVE9RUo1dzulxqIY5Q/UygPnZHau3Lc=";
})
];

nativeBuildInputs = [
bison
cmake
Expand Down
4 changes: 2 additions & 2 deletions pkgs/gdal/master-rev.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
rev = "d6a7db5";
hash = "sha256-ZUhYNpQSSTv0nDHRdWCjtQTxmCZsr74QUcqgtz/I/kc=";
rev = "c89aeb4";
hash = "sha256-aiYwZaXonn8FHz8jYDCSl+tLSnoQO1Xkdrx84HcgdxY=";
}
31 changes: 19 additions & 12 deletions pkgs/qgis/qgis-ltr-plugins-list.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@


Lizmap = {
version = "4.3.17";
url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.17/download/";
hash = "sha256-slw8raRUsr+MaO37vgJamB9vN4Bmlo46CMwesO4TlvM=";
version = "4.3.19";
url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.19/download/";
hash = "sha256-qbSlsGyDnDw1becVPIchDNAS2w1Sk2KnoZAM0xbRpUA=";
};


Expand Down Expand Up @@ -155,9 +155,9 @@


PDOK-services-plugin = {
version = "5.0.1";
url = "https://plugins.qgis.org/plugins/pdokservicesplugin/version/5.0.1/download/";
hash = "sha256-vAdRuDASeEIUju2JNDO4srLk7Eq1wp70CQ5hd4yomuI=";
version = "5.1.0";
url = "https://plugins.qgis.org/plugins/pdokservicesplugin/version/5.1.0/download/";
hash = "sha256-TgpNgGSOLKmsP+It0xLkZqFCrBD8/aZrMbyRj9ZD/0w=";
};


Expand Down Expand Up @@ -225,9 +225,9 @@


cadastre = {
version = "1.19.1";
url = "https://plugins.qgis.org/plugins/cadastre/version/1.19.1/download/";
hash = "sha256-JfmRXMqIcyezppFNGdRcUYjC0hvdJm9wOqF2GPPNkrI=";
version = "1.19.2";
url = "https://plugins.qgis.org/plugins/cadastre/version/1.19.2/download/";
hash = "sha256-RaG5Bl5hePmjUVc6RgZFE5TfVH//PCA80TJ25N1lpNg=";
};


Expand Down Expand Up @@ -483,6 +483,13 @@
};


Plugin-Builder-3 = {
version = "3.2.1";
url = "https://plugins.qgis.org/plugins/pluginbuilder3/version/3.2.1/download/";
hash = "sha256-60ZjJtc5aTgsTh3uJ5Qb1Eg1izNlkn4TB7TA7o3l+uU=";
};


Shape-Tools = {
version = "3.4.19";
url = "https://plugins.qgis.org/plugins/shapetools/version/3.4.19/download/";
Expand Down Expand Up @@ -638,9 +645,9 @@


Pobieracz-danych-GUGiK = {
version = "1.2.0";
url = "https://plugins.qgis.org/plugins/pobieracz_danych_gugik/version/1.2.0/download/";
hash = "sha256-cs6sidg3ND+vENo3o0jBjPUO9iTMmrwr71ySKkzdeVs=";
version = "1.2.1";
url = "https://plugins.qgis.org/plugins/pobieracz_danych_gugik/version/1.2.1/download/";
hash = "sha256-F4FSRmQbf13zxyu+VC2kcl6GsXQA5KXNpQPapZqKkGE=";
};


Expand Down
31 changes: 19 additions & 12 deletions pkgs/qgis/qgis-plugins-list.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@


Lizmap = {
version = "4.3.17";
url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.17/download/";
hash = "sha256-slw8raRUsr+MaO37vgJamB9vN4Bmlo46CMwesO4TlvM=";
version = "4.3.19";
url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.19/download/";
hash = "sha256-qbSlsGyDnDw1becVPIchDNAS2w1Sk2KnoZAM0xbRpUA=";
};


Expand Down Expand Up @@ -155,9 +155,9 @@


PDOK-services-plugin = {
version = "5.0.1";
url = "https://plugins.qgis.org/plugins/pdokservicesplugin/version/5.0.1/download/";
hash = "sha256-vAdRuDASeEIUju2JNDO4srLk7Eq1wp70CQ5hd4yomuI=";
version = "5.1.0";
url = "https://plugins.qgis.org/plugins/pdokservicesplugin/version/5.1.0/download/";
hash = "sha256-TgpNgGSOLKmsP+It0xLkZqFCrBD8/aZrMbyRj9ZD/0w=";
};


Expand Down Expand Up @@ -225,9 +225,9 @@


cadastre = {
version = "1.19.1";
url = "https://plugins.qgis.org/plugins/cadastre/version/1.19.1/download/";
hash = "sha256-JfmRXMqIcyezppFNGdRcUYjC0hvdJm9wOqF2GPPNkrI=";
version = "1.19.2";
url = "https://plugins.qgis.org/plugins/cadastre/version/1.19.2/download/";
hash = "sha256-RaG5Bl5hePmjUVc6RgZFE5TfVH//PCA80TJ25N1lpNg=";
};


Expand Down Expand Up @@ -483,6 +483,13 @@
};


Plugin-Builder-3 = {
version = "3.2.1";
url = "https://plugins.qgis.org/plugins/pluginbuilder3/version/3.2.1/download/";
hash = "sha256-60ZjJtc5aTgsTh3uJ5Qb1Eg1izNlkn4TB7TA7o3l+uU=";
};


Shape-Tools = {
version = "3.4.19";
url = "https://plugins.qgis.org/plugins/shapetools/version/3.4.19/download/";
Expand Down Expand Up @@ -638,9 +645,9 @@


Pobieracz-danych-GUGiK = {
version = "1.2.0";
url = "https://plugins.qgis.org/plugins/pobieracz_danych_gugik/version/1.2.0/download/";
hash = "sha256-cs6sidg3ND+vENo3o0jBjPUO9iTMmrwr71ySKkzdeVs=";
version = "1.2.1";
url = "https://plugins.qgis.org/plugins/pobieracz_danych_gugik/version/1.2.1/download/";
hash = "sha256-F4FSRmQbf13zxyu+VC2kcl6GsXQA5KXNpQPapZqKkGE=";
};


Expand Down
10 changes: 4 additions & 6 deletions pkgs/qgis/unwrapped-ltr.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ let
urllib3
];
in mkDerivation rec {
version = "3.34.7";
version = "3.34.8";
pname = "qgis-ltr-unwrapped";

src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-6fIBmIoCVo0AtkjC4Vn3jMjz93gZmvkFAgo+KnasyXo=";
hash = "sha256-UeyGx+C7szXv++hXFV006Xk4oSKfSj4teJIwaD4ODVk=";
};

passthru = {
Expand Down Expand Up @@ -143,9 +143,7 @@ in mkDerivation rec {

# Add path to Qt platform plugins
# (offscreen is needed by "${APIS_SRC_DIR}/generate_console_pap.py")
preBuild = ''
export QT_QPA_PLATFORM_PLUGIN_PATH=${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms
'';
env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms";

cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
Expand All @@ -160,7 +158,7 @@ in mkDerivation rec {
);

qtWrapperArgs = [
"--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms"
"--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase}/${qtbase.qtPluginPrefix}/platforms"
];

dontWrapGApps = true; # wrapper params passed below
Expand Down
2 changes: 1 addition & 1 deletion tests/custom-package/flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
};

inputs = {
geonix.url = "github:imincik/geospatial-nix";
geonix.url = "path:../../.";
nixpkgs.follows = "geonix/nixpkgs";
};

Expand Down

0 comments on commit 3a77b4b

Please sign in to comment.