commit 367fdd8617427118b0a0e6c332ea1c43cd5f9eb6
parent d1a5c1afefd13fd628215cc8a31b7a4da1e10c55
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 6 Aug 2025 00:25:40 +0400
Up
Diffstat:
13 files changed, 58 insertions(+), 38 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -261,6 +261,7 @@ lib.makeScope newScope (
pygnssutils = callPackage ./gnss/pygnssutils { };
pygpsclient = callPackage ./gnss/pygpsclient { };
pyrtcm = callPackage ./gnss/pyrtcm { };
+ pysbf2 = callPackage ./gnss/pysbf2 { };
pyspartn = callPackage ./gnss/pyspartn { };
pyubx2 = callPackage ./gnss/pyubx2 { };
pyubxutils = callPackage ./gnss/pyubxutils { };
diff --git a/pkgs/geospatial/tilecloud/default.nix b/pkgs/geospatial/tilecloud/default.nix
@@ -7,30 +7,22 @@
python3Packages.buildPythonApplication rec {
pname = "tilecloud";
- version = "1.13.1";
+ version = "1.13.2";
pyproject = true;
src = fetchFromGitHub {
owner = "camptocamp";
repo = "tilecloud";
tag = version;
- hash = "sha256-Xl20jXDLQdlQy/dKYxIBus7i03D3InbYtvQj6mIUBGk=";
+ hash = "sha256-nxTfMTKj0pXAzQPYRdh08Qi0u+WY865s3JtvdNy2eIQ=";
};
- pythonRelaxDeps = [
- "bottle"
- "certifi"
- "cryptography"
- "pillow"
- "pyproj"
- "webob"
- ];
+ pythonRelaxDeps = true;
patches = [ ./set-tmpl-path.patch ];
postPatch = ''
substituteInPlace pyproject.toml \
- --replace-fail "\"poetry-plugin-drop-python-upper-constraint\"" "" \
--replace-fail "\"poetry-plugin-tweak-dependencies-version\"," "" \
--replace-fail "\"poetry-plugin-tweak-dependencies-version>=1.1.0\"," ""
'';
diff --git a/pkgs/gnss/gnsstk/default.nix b/pkgs/gnss/gnsstk/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnsstk";
- version = "14.3.0";
+ version = "14.6.1";
src = fetchFromGitHub {
owner = "SGL-UT";
repo = "gnsstk";
tag = "v${finalAttrs.version}";
- hash = "sha256-7dD9GDW/1j2f0Tzetr6Fmbnkl1WDnX82eiaZpO8ngd8=";
+ hash = "sha256-JdRCfrlF1WkuacDrly2zJ9pihKOAZws6wVf8tzdW/HM=";
};
patches = [
diff --git a/pkgs/gnss/pygnssutils/default.nix b/pkgs/gnss/pygnssutils/default.nix
@@ -2,6 +2,7 @@
lib,
fetchFromGitHub,
python3Packages,
+ pysbf2,
pyspartn,
pyubx2,
pyubxutils,
@@ -9,14 +10,14 @@
python3Packages.buildPythonPackage rec {
pname = "pygnssutils";
- version = "1.1.13";
+ version = "1.1.16";
pyproject = true;
src = fetchFromGitHub {
owner = "semuconsulting";
repo = "pygnssutils";
tag = "v${version}";
- hash = "sha256-9jWq2F8RrRKZfa6DwnVzRYe+t0U1kPI68wTqJd20eIc=";
+ hash = "sha256-zDPkVZ1lDQCWVNcHLW+E31H4Xe266mCHiILgJVyYrk8=";
};
build-system = with python3Packages; [ setuptools ];
@@ -24,6 +25,7 @@ python3Packages.buildPythonPackage rec {
dependencies = with python3Packages; [
certifi
paho-mqtt
+ pysbf2
pyserial
pyspartn
pyubx2
diff --git a/pkgs/gnss/pygpsclient/default.nix b/pkgs/gnss/pygpsclient/default.nix
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "pygpsclient";
- version = "1.5.7";
+ version = "1.5.10";
pyproject = true;
src = fetchFromGitHub {
owner = "semuconsulting";
repo = "PyGPSClient";
tag = "v${version}";
- hash = "sha256-dh3ohHEQW2hWFiQmH/ID2q0POzvo0Q/45rqXjpheWSY=";
+ hash = "sha256-xtj1d/bT0Ks1NpSLH16oP7SUj1Uy0D9RHzknvbqXEQk=";
};
build-system = with python3Packages; [ setuptools ];
diff --git a/pkgs/gnss/pyrtcm/default.nix b/pkgs/gnss/pyrtcm/default.nix
@@ -6,14 +6,14 @@
python3Packages.buildPythonPackage rec {
pname = "pyrtcm";
- version = "1.1.6";
+ version = "1.1.8";
pyproject = true;
src = fetchFromGitHub {
owner = "semuconsulting";
repo = "pyrtcm";
tag = "v${version}";
- hash = "sha256-PqNigqolC44DWZiSQDtdlt4RVUfyKTDznbHu1AvrwzQ=";
+ hash = "sha256-yQ/Mv3JOmHSM9IXO87nu93IikmhqI8/BAjS4E+XLLAc=";
};
build-system = with python3Packages; [ setuptools ];
diff --git a/pkgs/gnss/pysbf2/default.nix b/pkgs/gnss/pysbf2/default.nix
@@ -0,0 +1,35 @@
+{
+ lib,
+ fetchFromGitHub,
+ python3Packages,
+ pyrtcm,
+}:
+
+python3Packages.buildPythonPackage rec {
+ pname = "pysbf2";
+ version = "1.0.0";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "semuconsulting";
+ repo = "pysbf2";
+ tag = "v${version}";
+ hash = "sha256-3Iez0VwHgNh17zcPUQtpqN7klr9HT6p3dEMQGrn7sCk=";
+ };
+
+ build-system = with python3Packages; [ setuptools ];
+
+ dependencies = with python3Packages; [
+ pynmeagps
+ pyrtcm
+ ];
+
+ pythonImportsCheck = [ "pysbf2" ];
+
+ meta = {
+ description = "SBF protocol parser and generator";
+ homepage = "https://github.com/semuconsulting/pysbf2";
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.sikmir ];
+ };
+}
diff --git a/pkgs/gnss/pyspartn/default.nix b/pkgs/gnss/pyspartn/default.nix
@@ -6,14 +6,14 @@
python3Packages.buildPythonPackage rec {
pname = "pyspartn";
- version = "1.0.5";
+ version = "1.0.7";
pyproject = true;
src = fetchFromGitHub {
owner = "semuconsulting";
repo = "pyspartn";
tag = "v${version}";
- hash = "sha256-cuTWBvaGtoV579pGGVXIFhn7WbSJ5jufAi0JeUmk6sA=";
+ hash = "sha256-iXpXetoXkM442bMOBPO9HmsHBNpGqroYt/t0i4PjimI=";
};
build-system = with python3Packages; [ setuptools ];
diff --git a/pkgs/gnss/pyubx2/default.nix b/pkgs/gnss/pyubx2/default.nix
@@ -7,14 +7,14 @@
python3Packages.buildPythonPackage rec {
pname = "pyubx2";
- version = "1.2.52";
+ version = "1.2.55";
pyproject = true;
src = fetchFromGitHub {
owner = "semuconsulting";
repo = "pyubx2";
tag = "v${version}";
- hash = "sha256-qlVNI61iAujUE+wywMF92CWDCpkffcXHKnHQPX8JRjo=";
+ hash = "sha256-pwIdQMuqu6/IQ7wh/fI5fxAg4bRZGYssKsatTaN8lwM=";
};
build-system = with python3Packages; [ setuptools ];
diff --git a/pkgs/misc/huami-token/default.nix b/pkgs/misc/huami-token/default.nix
@@ -17,10 +17,7 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-nQiz1vrZz0sOoZFQaN9ZtzfDY3zn3Gk0jMdqORDDW3w=";
};
- pythonRelaxDeps = [
- "requests"
- "types-requests"
- ];
+ pythonRelaxDeps = true;
build-system = with python3Packages; [ flit ];
diff --git a/pkgs/mqtt/mqtt-logger/default.nix b/pkgs/mqtt/mqtt-logger/default.nix
@@ -16,10 +16,7 @@ python3Packages.buildPythonPackage rec {
hash = "sha256-AG8L2CD+YN6gWswDtsUtUMOA3xC2ro1f1YKYgc4jwXE=";
};
- pythonRelaxDeps = [
- "paho-mqtt"
- "rich"
- ];
+ pythonRelaxDeps = true;
build-system = with python3Packages; [ poetry-core ];
diff --git a/pkgs/mqtt/mqttwarn/default.nix b/pkgs/mqtt/mqttwarn/default.nix
@@ -44,11 +44,7 @@ python312Packages.buildPythonApplication rec {
six
];
- pythonRelaxDeps = [
- "attrs"
- "future"
- "paho-mqtt"
- ];
+ pythonRelaxDeps = true;
optional-dependencies = with python312Packages; {
apprise = [ apprise ];
diff --git a/pkgs/osm/osm-3s/default.nix b/pkgs/osm/osm-3s/default.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osm-3s";
- version = "0.7.62.5";
+ version = "0.7.62.7";
src = fetchurl {
url = "http://dev.overpass-api.de/releases/osm-3s_v${finalAttrs.version}.tar.gz";
- hash = "sha256-xVSV1w9eY6IzrEGrc3LV1OG6XdRt/aUa9IsNrTxWh3I=";
+ hash = "sha256-e5XzXH1Ffz6Jvk767h9IAwOK3P1BjLAFYx26YPjgmUQ=";
};
buildInputs = [
