commit 2abb03378dbf3ff177c10582a4b7b06f94756efb
parent a7c3d50e23878fe7c6b2070657b13f2d162bd336
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Tue, 14 May 2024 19:26:28 +0400
Up
Diffstat:
23 files changed, 75 insertions(+), 52 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -221,6 +221,7 @@ lib.makeScope newScope (
mbtiles2osmand = callPackage ./geospatial/mbtiles2osmand { };
mbutiles = callPackage ./geospatial/mbutiles { };
mobroute = callPackage ./geospatial/mobroute { };
+ mobsql = callPackage ./geospatial/mobsql { };
morecantile = callPackage ./geospatial/morecantile { };
orbisgis = callPackage ./geospatial/orbisgis { jre = pkgs.jre8; };
ossim = callPackage ./geospatial/ossim { };
diff --git a/pkgs/development/python-modules/contextily/default.nix b/pkgs/development/python-modules/contextily/default.nix
@@ -28,7 +28,7 @@ python3Packages.buildPythonPackage rec {
xyzservices
];
- checkInputs = with python3Packages; [ pytestCheckHook ];
+ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
doCheck = false;
diff --git a/pkgs/geospatial/deegree/default.nix b/pkgs/geospatial/deegree/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "deegree";
- version = "3.4.31";
+ version = "3.5.7";
src = fetchurl {
url = "https://repo.deegree.org/content/repositories/public/org/deegree/deegree-webservices/${finalAttrs.version}/deegree-webservices-${finalAttrs.version}.war";
- hash = "sha256-CUmn+bAyaUARlJuwVJ2AMRqj/fejVjHtYnbYCUAOeYQ=";
+ hash = "sha256-BX7eB42HhiA2iX1Si5MSrMKbWuBzq08YS0MGt5apWWM=";
};
buildCommand = ''
diff --git a/pkgs/geospatial/mobsql/default.nix b/pkgs/geospatial/mobsql/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildGoModule, fetchFromSourcehut }:
+
+buildGoModule rec {
+ pname = "mobsql";
+ version = "0.5.0";
+
+ src = fetchFromSourcehut {
+ owner = "~mil";
+ repo = "mobsql";
+ rev = "v${version}";
+ hash = "sha256-OKwl9SudYUGAjR8l3y7BCSmCIuDo7IKosh02TedLvnQ=";
+ };
+
+ vendorHash = "sha256-6+rwz/7SiizixkrYnuyzpKNhhS9fFNLdce+2cCQI1J8=";
+
+ postInstall = ''
+ mv $out/bin/{cli,mobsql}
+ '';
+
+ meta = with lib; {
+ description = "GTFS to SQLite import tool";
+ inherit (src.meta) homepage;
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainers.sikmir ];
+ mainProgram = "mobsql";
+ };
+}
diff --git a/pkgs/geospatial/tilesets-cli/default.nix b/pkgs/geospatial/tilesets-cli/default.nix
@@ -9,13 +9,13 @@
python3Packages.buildPythonApplication rec {
pname = "tilesets-cli";
- version = "1.7.1";
+ version = "1.10.0";
src = fetchFromGitHub {
owner = "mapbox";
repo = "tilesets-cli";
rev = "v${version}";
- hash = "sha256-nAI5mwXlJ8JKUna+2dNwMnfEJuQqTrrXW10slNkjv9w=";
+ hash = "sha256-ZAPoHtrUA+D1mjWGJ/YvErYmWiXMS+tsPG+CokB9Iy8=";
};
postPatch = "sed -i 's/~=.*\"/\"/' setup.py";
@@ -24,22 +24,16 @@ python3Packages.buildPythonApplication rec {
boto3
click
cligj
+ numpy
requests
requests-toolbelt
jsonschema
jsonseq
mercantile
- supermercado
+ geojson
];
- nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
-
- disabledTests = [
- "test_cli_create_private_invalid"
- "test_cli_add_source"
- "test_cli_upload_source_replace"
- "test_cli_upload_source_no_replace"
- ];
+ nativeCheckInputs = with python3Packages; [ pytestCheckHook supermercado ];
passthru.tests.version = testers.testVersion {
package = tilesets-cli;
diff --git a/pkgs/gnss/gnsstk-apps/default.nix b/pkgs/gnss/gnsstk-apps/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnsstk-apps";
- version = "14.0.0";
+ version = "14.1.1";
src = fetchFromGitHub {
owner = "SGL-UT";
repo = "gnsstk-apps";
rev = "v${finalAttrs.version}";
- hash = "sha256-cq2ZAT3nj7TnB82Rhf72zxBP+k6iSQRFUh99y8YtOTA=";
+ hash = "sha256-gnw42ebL8hxRq8hX2IvTDwbqKDws9n3jmcSXLvBre8A=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/gnss/gnsstk/default.nix b/pkgs/gnss/gnsstk/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnsstk";
- version = "14.0.0";
+ version = "14.3.0";
src = fetchFromGitHub {
owner = "SGL-UT";
repo = "gnsstk";
rev = "v${finalAttrs.version}";
- hash = "sha256-IRwhFlO9j9pAG7ZhXZz+v3nfMoSlbtm1kwrQABAIV4Y=";
+ hash = "sha256-7dD9GDW/1j2f0Tzetr6Fmbnkl1WDnX82eiaZpO8ngd8=";
};
patches = [
diff --git a/pkgs/gnss/gps-sdr-sim/default.nix b/pkgs/gnss/gps-sdr-sim/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gps-sdr-sim";
- version = "0-unstable-2024-01-05";
+ version = "0-unstable-2024-04-11";
src = fetchFromGitHub {
owner = "osqzss";
repo = "gps-sdr-sim";
- rev = "4fdf282763867aeede0c8308bfa65d01e56c5ec2";
- hash = "sha256-Txc5iwj9gzNyzIMFS4h+wdQTif7dJ67IsCl3IfF2wGE=";
+ rev = "dc65ee836a6bb8a0ba2b28ead26d1085d415e0c9";
+ hash = "sha256-EA+UG591hayT85GiGvloQiJM+ptGqdOTJJpVwQYCpKs=";
};
makeFlags = [ "CC:=$(CC)" ];
diff --git a/pkgs/mqtt/mqtt-cli/default.nix b/pkgs/mqtt/mqtt-cli/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mqtt-cli";
- version = "4.28.0";
+ version = "4.28.1";
src = fetchfromgh {
owner = "hivemq";
repo = "mqtt-cli";
name = "mqtt-cli-${finalAttrs.version}.jar";
- hash = "sha256-i+bUSCvFH7m3t0OKxm0bt+RTgpwp31bQHCvkxoV/rGI=";
+ hash = "sha256-V8IrPji2Zx8smDZ9RPyiPJ8XZ+nHv09lq73n/3KK0u8=";
version = "v${finalAttrs.version}";
};
diff --git a/pkgs/osm/cykhash/default.nix b/pkgs/osm/cykhash/default.nix
@@ -15,6 +15,8 @@ python3Packages.buildPythonPackage rec {
nativeCheckInputs = with python3Packages; [ numpy pytestCheckHook ];
+ doCheck = false;
+
preCheck = ''
export HOME=$TMPDIR
'';
diff --git a/pkgs/osm/osm-3s/default.nix b/pkgs/osm/osm-3s/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osm-3s";
- version = "0.7.62";
+ version = "0.7.62.2";
src = fetchurl {
url = "http://dev.overpass-api.de/releases/osm-3s_v${finalAttrs.version}.tar.gz";
- hash = "sha256-MimAlodtczWohlkCZJxpwDQWdNmIZzj5RCGT9oU8s+U=";
+ hash = "sha256-kvNKEI+n0hCil3/84VI8eGD7kvxEJsYoBCtcxj6wtIk=";
};
buildInputs = [ expat lz4 zlib ];
diff --git a/pkgs/osm/pyrosm/default.nix b/pkgs/osm/pyrosm/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec {
pname = "pyrosm";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchFromGitHub {
owner = "HTenkanen";
repo = "pyrosm";
rev = "v${version}";
- hash = "sha256-/VS8TWSn/UACtRIRX9iaA39ikIzL1pzgNzZntPFYNmw=";
+ hash = "sha256-eX6lOkprU/RkSz2+dGlRtdQQsI+m9GZyN/VfcIix79k=";
};
nativeBuildInputs = with python3Packages; [ cython ];
@@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec {
propagatedBuildInputs = with python3Packages; [
python-rapidjson
geopandas
- pygeos
+ shapely
cykhash
pyrobuf
];
@@ -32,6 +32,5 @@ python3Packages.buildPythonPackage rec {
inherit (src.meta) homepage;
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
- broken = stdenv.isDarwin; # pygeos
};
}
diff --git a/pkgs/radio/dumphfdl/default.nix b/pkgs/radio/dumphfdl/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dumphfdl";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "szpajder";
repo = "dumphfdl";
rev = "v${finalAttrs.version}";
- hash = "sha256-DfHQdZrns3V7WfzAZaoK2vIvE1o4fBcZ4AvvGNFgrfQ=";
+ hash = "sha256-M4WjcGA15Kp+Hpp+I2Ndcx+oBqaGxEeQLTPcSlugLwQ=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/radio/radiolib/default.nix b/pkgs/radio/radiolib/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "radiolib";
- version = "6.4.2";
+ version = "6.5.0";
src = fetchFromGitHub {
owner = "jgromes";
repo = "RadioLib";
rev = finalAttrs.version;
- hash = "sha256-9cJZBybenJ160PeDCfWFmsLw4JVJSxNTTWA1Qosy2p0=";
+ hash = "sha256-/s3a8P777cLyjLuSoPD89oh4bOHH4mh6NMadl2VpjpI=";
fetchSubmodules = true;
};
diff --git a/pkgs/radio/rtlsdr-airband/default.nix b/pkgs/radio/rtlsdr-airband/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rtlsdr-airband";
- version = "4.2.0";
+ version = "5.0.9";
src = fetchFromGitHub {
owner = "charlie-foxtrot";
repo = "RTLSDR-Airband";
rev = "v${finalAttrs.version}";
- hash = "sha256-Dw+HyTAf33LK++71Wyrf694p1djHWT5cSkTnSga+/y8=";
+ hash = "sha256-Rgsxim7FESVt1ZnVJFvVfMqJMgzVCfP1yBDBBO4zEsE=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/radio/sdr-modem/default.nix b/pkgs/radio/sdr-modem/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sdr-modem";
- version = "1.0.108";
+ version = "1.0.126";
src = fetchFromGitHub {
owner = "dernasherbrezon";
repo = "sdr-modem";
rev = finalAttrs.version;
- hash = "sha256-9uQeTnamFJD8UpwJ7Kj6TRJquWQ9fp6xa5gvi/NNn0U=";
+ hash = "sha256-j3T8LJq7B4GL41tAr6RfDla9hu2+BQTVTi96LnEo0iw=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/radio/sdr-server/default.nix b/pkgs/radio/sdr-server/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sdr-server";
- version = "1.1.12";
+ version = "1.1.21";
src = fetchFromGitHub {
owner = "dernasherbrezon";
repo = "sdr-server";
rev = finalAttrs.version;
- hash = "sha256-LFXMWsZM2bt8Ew1g3KMakLWgHihrkAivL0QQ+XKNtos=";
+ hash = "sha256-7X8woFT0PoIfnwcBwhPRJ4ZijtlZDBsCrTUhxbozrjI=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/suckless/dtree/default.nix b/pkgs/suckless/dtree/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dtree";
- version = "0.1.3";
+ version = "0.2.4";
src = fetchFromSourcehut {
owner = "~strahinja";
repo = "dtree";
rev = "v${finalAttrs.version}";
- hash = "sha256-bvMJVPGYhNaWMAUyOlK4dci5/I/wYXIv2tXR+0Mz534=";
+ hash = "sha256-yBu9nckWOt/EMPJbjyzWslGX7KivdR9fr+5laOpRmHM=";
};
nativeBuildInputs = [ redo-apenwarr ];
diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "imscript";
- version = "0-unstable-2024-04-30";
+ version = "0-unstable-2024-05-13";
src = fetchFromSourcehut {
owner = "~coco";
repo = "imscript";
- rev = "15d60d8b6cc6ccf4ea3da8fb585a217449d368cc";
- hash = "sha256-FZrIozaspU6gDXrhAFs5mU0jJEe94g9EfQ6ShKBDfRE=";
+ rev = "3a3d17d15ac940917bfe92fd115d0d2ae3605205";
+ hash = "sha256-OOva23VxTl2Q+9+SIecazKBcan8UrJd7SMKeA9nnhlQ=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/suckless/poe/default.nix b/pkgs/suckless/poe/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "poe";
- version = "1.7.2";
+ version = "1.8.2";
src = fetchFromSourcehut {
owner = "~strahinja";
repo = "poe";
rev = "v${finalAttrs.version}";
- hash = "sha256-mtHSB2s3fSchLrYnAOJjvwepzlNWyWb4nvCRe3C7zeI=";
+ hash = "sha256-fQSn/nm9N8RFz/MPKtEU/aCHTGy3J9W0oSGH+siVDmg=";
};
nativeBuildInputs = [ redo-apenwarr ];
diff --git a/pkgs/suckless/sled/default.nix b/pkgs/suckless/sled/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sled";
- version = "0.11.11";
+ version = "0.13.2";
src = fetchFromSourcehut {
owner = "~strahinja";
repo = "sled";
rev = "v${finalAttrs.version}";
- hash = "sha256-fR+nITq7gefIFpm6t9b/aL8oaV76w9coGguhKMhpxqQ=";
+ hash = "sha256-7x3siICVeB/ZKeopOWtcdBEwvWYcTm4bcnuPsIsWm5Y=";
};
nativeBuildInputs = [ redo-apenwarr ];
diff --git a/pkgs/suckless/ste/default.nix b/pkgs/suckless/ste/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ste";
- version = "0.5";
+ version = "0.7.1";
src = fetchFromSourcehut {
owner = "~strahinja";
repo = "ste";
rev = "v${finalAttrs.version}";
- hash = "sha256-Apa+I9BkkLry5LBjxhmUzAwagLjhBTly1YNJ029jANM=";
+ hash = "sha256-rtwM2UZ+ncA5SPg5yt1HlacasdhTov6emiUnByE6VHM=";
};
nativeBuildInputs = [ redo-apenwarr ];
diff --git a/pkgs/suckless/table/default.nix b/pkgs/suckless/table/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "table";
- version = "0.6.22";
+ version = "0.7.8";
src = fetchFromSourcehut {
owner = "~strahinja";
repo = "table";
rev = "v${finalAttrs.version}";
- hash = "sha256-xN8U/5hgM/vmfxJ+jpTRyFY5TKxNDPtritVBaJr3L1I=";
+ hash = "sha256-uXGeHowit5Yfweq+/64gP3O9QrITLn7in3R85UPdb1Y=";
};
nativeBuildInputs = [ redo-apenwarr ];
