From 04890bc14e9b66cefbf43f7adedc818cced93468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 6 Aug 2023 11:54:20 -0700 Subject: [PATCH 1/3] freexl: 1.0.6 -> 2.0.0 --- pkgs/development/libraries/freexl/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/freexl/default.nix b/pkgs/development/libraries/freexl/default.nix index 7bc1322ccc8c..ac5609425b56 100644 --- a/pkgs/development/libraries/freexl/default.nix +++ b/pkgs/development/libraries/freexl/default.nix @@ -1,17 +1,29 @@ -{ lib, stdenv, fetchurl, validatePkgConfig, libiconv }: +{ lib +, stdenv +, fetchurl +, validatePkgConfig +, expat +, minizip +, zlib +, libiconv +}: stdenv.mkDerivation rec { pname = "freexl"; - version = "1.0.6"; + version = "2.0.0"; src = fetchurl { url = "https://www.gaia-gis.it/gaia-sins/freexl-${version}.tar.gz"; - hash = "sha256-Pei1ej0TDLKIHqUtOqnOH+7bG1e32qTrN/dRQE+Q/CI="; + hash = "sha256-F2cF8d5Yq3we679cbeRqt2/Ni4VlCNvSj1ZI98bhp/A="; }; nativeBuildInputs = [ validatePkgConfig ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = [ + expat + minizip + zlib + ] ++ lib.optional stdenv.isDarwin libiconv; enableParallelBuilding = true; From f7bc25396d91ed6e1a63bfb91f381e8c0c45c710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 6 Aug 2023 11:49:22 -0700 Subject: [PATCH 2/3] libspatialite: 5.0.1 -> 5.1.0 --- pkgs/development/libraries/libspatialite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index cc7da2b5f183..372f0c479c81 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libspatialite"; - version = "5.0.1"; + version = "5.1.0"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/libspatialite-${version}.tar.gz"; - hash = "sha256-7svJQxHHgBLQWevA+uhupe9u7LEzA+boKzdTwbNAnpg="; + url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${version}.tar.gz"; + hash = "sha256-Q74t00na/+AW3RQAxdEShYKMIv6jXKUQnyHz7VBgUIA="; }; nativeBuildInputs = [ From 619248ce8d4d45bc21df7268e452f3db349af765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 6 Aug 2023 11:53:29 -0700 Subject: [PATCH 3/3] spatialite_tools: 5.0.1 -> 5.1.0 --- pkgs/applications/gis/spatialite-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/gis/spatialite-tools/default.nix b/pkgs/applications/gis/spatialite-tools/default.nix index 875c33e60f3c..b336c41862e7 100644 --- a/pkgs/applications/gis/spatialite-tools/default.nix +++ b/pkgs/applications/gis/spatialite-tools/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "spatialite-tools"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-${version}.tar.gz"; - hash = "sha256-lgTCBeh/A3eJvFIwLGbM0TccPpjHTo7E4psHUt41Fxw="; + url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-${version}.tar.gz"; + hash = "sha256-3zAwNnwInKkPpmMIl/PxooB4TaKeG6Y080DbpLCFg7U="; }; nativeBuildInputs = [ pkg-config ];