commit 456d4c9dcc07cf023103a35277dd70f06b4a4769
parent 9435a91b24c0945e1973b0acf215880a81ada4bd
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 13 Jul 2025 17:55:11 +0400
Up
Diffstat:
5 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/pkgs/data/osm/osm-extracts/default.nix b/pkgs/data/osm/osm-extracts/default.nix
@@ -5,13 +5,13 @@
osmium-tool,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "osm-extracts";
- version = "250603";
+ version = "250712";
src = fetchurl {
- url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
- hash = "sha256-CEXhsdCUfVkPo1lHqiLqEHP21BtyB/e82fsc3colb8U=";
+ url = "https://download.geofabrik.de/russia/northwestern-fed-district-${finalAttrs.version}.osm.pbf";
+ hash = "sha256-0dA528K98ZorXG7nmD5mL8x4yQ7H8vKsjXqoULX8Mm4=";
};
dontUnpack = true;
@@ -44,4 +44,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.all;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -124,7 +124,7 @@ lib.makeScope newScope (
### EMBEDDED
- chdk = callPackage ./embedded/chdk { gcc-arm-embedded = pkgs.gcc-arm-embedded-10; };
+ chdk = callPackage ./embedded/chdk { };
embox-aarch64 = callPackage ./embedded/embox { arch = "aarch64"; };
embox-arm = callPackage ./embedded/embox { arch = "arm"; };
embox-ppc = callPackage ./embedded/embox { arch = "ppc"; };
diff --git a/pkgs/embedded/chdk/default.nix b/pkgs/embedded/chdk/default.nix
@@ -12,7 +12,7 @@
let
version = "1.6.1";
- revision = "6261"; # check on http://mighty-hoernsche.de/
+ revision = "6315"; # check on http://mighty-hoernsche.de/
branch = "release-${lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version)}";
optFI2 = fi2key != null && fi2iv != null;
batchBuild = platform == null || platformsub == null;
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
url = "https://app.assembla.com/spaces/chdk/subversion/source/${revision}/branches/${branch}?_format=zip";
extension = "zip";
stripRoot = false;
- hash = "sha256-VNkPju3nVxk1g5SzRZok5994JVupySbO7KZsD6sgXo8=";
+ hash = "sha256-uka+Hn0gUoJS0XX5lqcY/crUx29KQSPrL2/OAg0vQKM=";
};
nativeBuildInputs = [
diff --git a/pkgs/geospatial/cogdumper/default.nix b/pkgs/geospatial/cogdumper/default.nix
@@ -18,6 +18,12 @@ python3Packages.buildPythonPackage {
build-system = with python3Packages; [ setuptools ];
+ dependencies = with python3Packages; [
+ boto3
+ click
+ requests
+ ];
+
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
diff --git a/pkgs/geospatial/pysheds/default.nix b/pkgs/geospatial/pysheds/default.nix
@@ -19,12 +19,16 @@ python3Packages.buildPythonPackage rec {
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
- scikitimage
affine
geojson
- rasterio
- pyproj
+ looseversion
numba
+ numpy
+ pandas
+ pyproj
+ rasterio
+ scikitimage
+ scipy
];
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];