commit b7a31d22a6fa4c2b090f706588ada9030331cada
parent 6f4c8acbebbc55ac18beb8b3c147539dd0dec192
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 25 Oct 2023 02:29:16 +0400
Up
Diffstat:
9 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/pkgs/development/python-modules/contextily/default.nix b/pkgs/development/python-modules/contextily/default.nix
@@ -2,16 +2,21 @@
python3Packages.buildPythonPackage rec {
pname = "contextily";
- version = "1.3.0";
- disabled = python3Packages.pythonOlder "3.6";
+ version = "1.4.0";
+ pyproject = true;
+ disabled = python3Packages.pythonOlder "3.8";
src = fetchFromGitHub {
owner = "geopandas";
repo = "contextily";
rev = "v${version}";
- hash = "sha256-s8F70I9xrNvYqS8t2kWX7cgjfGqGYLfiAZAYvaKVS6s=";
+ hash = "sha256-42ze/ByGLq2/+WghXpkBCaI9lMNAUFDfoUyU5EEBop4=";
};
+ nativeBuildInputs = with python3Packages; [ setuptools-scm ];
+
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
propagatedBuildInputs = with python3Packages; [
geopy
matplotlib
@@ -23,13 +28,12 @@ python3Packages.buildPythonPackage rec {
xyzservices
];
- doCheck = false;
+ checkInputs = with python3Packages; [ pytestCheckHook ];
meta = with lib; {
description = "Context geo-tiles in Python";
homepage = "https://github.com/geopandas/contextily";
license = licenses.bsd3;
maintainers = [ maintainers.sikmir ];
- broken = stdenv.isDarwin; # xyzservices
};
}
diff --git a/pkgs/garmin/cgpsmapper/default.nix b/pkgs/garmin/cgpsmapper/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation {
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = [ "i686-linux" "x86_64-linux" ];
+ mainProgram = "cgpsmapper-static";
skip.ci = true;
};
}
diff --git a/pkgs/garmin/gmaptool/default.nix b/pkgs/garmin/gmaptool/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation {
license = licenses.cc-by-sa-30;
maintainers = [ maintainers.sikmir ];
platforms = [ "i686-linux" "x86_64-linux" ];
+ mainProgram = "gmt";
skip.ci = true;
};
}
diff --git a/pkgs/gemini/geminid/default.nix b/pkgs/gemini/geminid/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "geminid";
- version = "2021-04-11";
+ version = "2022-04-15";
src = fetchFromGitHub {
owner = "jovoro";
repo = "geminid";
- rev = "bf6148baf91847e8dc011c3a101bee547142f4b5";
- hash = "sha256-yiD3GMrYi9KhKgCWAs+tdenP/0Q1E16FdhatdbTkYK4=";
+ rev = "eec25221eadfa47b09de5bd0dc15e90b1263d43a";
+ hash = "sha256-d9zs0fqH9YqhNfcPY66Ynoq2xo6n/h+sgRcD80ZBCNU=";
};
nativeBuildInputs = [ flex ];
diff --git a/pkgs/geospatial/rio-tiler/default.nix b/pkgs/geospatial/rio-tiler/default.nix
@@ -2,14 +2,14 @@
python3Packages.buildPythonPackage rec {
pname = "rio-tiler";
- version = "4.1.6";
+ version = "6.2.4";
pyproject = true;
src = fetchFromGitHub {
owner = "cogeotiff";
repo = "rio-tiler";
rev = version;
- hash = "sha256-UeAsQ82Lg5aksUdGvcrw/gcTmCJhWnCQkbrcbmqYNgc=";
+ hash = "sha256-CG474B3Q03Dq5QZSg/YtaTovt5mb+f4Aa4zEyB5QORA=";
};
nativeBuildInputs = with python3Packages; [ hatchling ];
diff --git a/pkgs/mqtt/mongoose/default.nix b/pkgs/mqtt/mongoose/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mongoose";
- version = "7.11";
+ version = "7.12";
src = fetchFromGitHub {
owner = "cesanta";
repo = "mongoose";
rev = finalAttrs.version;
- hash = "sha256-xA/08S1n0ziVUnlN9uuo0fST4DWfLrSB8J6+4tDFCKo=";
+ hash = "sha256-cDaPK9ubXX9x/iJZqEgMxTm/VAFslnA4agtQbhQRc6I=";
};
buildInputs = [ mbedtls ];
diff --git a/pkgs/osm/phyghtmap/default.nix b/pkgs/osm/phyghtmap/default.nix
@@ -24,6 +24,5 @@ python3Packages.buildPythonApplication rec {
homepage = "http://katze.tfiu.de/projects/phyghtmap";
license = licenses.gpl2Plus;
maintainers = [ maintainers.sikmir ];
- broken = stdenv.isDarwin; # xyzservices
};
}
diff --git a/pkgs/osm/planetiler/default.nix b/pkgs/osm/planetiler/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "planetiler";
- version = "0.5.0";
+ version = "0.7.0";
src = fetchfromgh {
owner = "onthegomap";
repo = "planetiler";
version = "v${finalAttrs.version}";
name = "planetiler.jar";
- hash = "sha256-XwjY81F1E3MISxwqvSG7OMv2Y1fdKgLSaS01YfFttws=";
+ hash = "sha256-rq5cihkU65xtVkrTvVrT7lPoy+Q92aOawYUWxd5LObI=";
};
dontUnpack = true;
diff --git a/pkgs/suckless/nextvi/default.nix b/pkgs/suckless/nextvi/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nextvi";
- version = "2022-09-05";
+ version = "2023-10-23";
src = fetchFromGitHub {
owner = "kyx0r";
repo = "nextvi";
- rev = "5ccc9f3a18be9d78a72a91c432ab3aac50c69647";
- hash = "sha256-GqTN6kbBVksh1uXUTGs2unyl2GXlz+Vogqr0kLcIgGs=";
+ rev = "0160364bb797e4155ef14d95c29df2730b4d9169";
+ hash = "sha256-D9aq129X/Y1jRd9dejEUJk+6md7IRrqOS0Eulvj6Dyw=";
};
buildPhase = ''
