commit 9a94edc02e3a8ca02e4750002d7fbe86e4b4c4dd
parent e4d0795df5ba3e82c188f337fd2a0672176d5c74
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 14 Jul 2025 01:24:38 +0400
Up
Diffstat:
5 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1751949589,
- "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=",
+ "lastModified": 1752077645,
+ "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "9b008d60392981ad674e04016d25619281550a9d",
+ "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6",
"type": "github"
},
"original": {
diff --git a/pkgs/geospatial/rio-color/default.nix b/pkgs/geospatial/rio-color/default.nix
@@ -17,6 +17,12 @@ python3Packages.buildPythonPackage rec {
hash = "sha256-iJ+whIk3ANop8i712dLE0mJyDMHGnE0tic23H6f67Xg=";
};
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace-fail "numpy==2.0.2" "numpy" \
+ --replace-fail "cython==3.0.11" "cython"
+ '';
+
build-system = with python3Packages; [
setuptools
cython
@@ -29,8 +35,6 @@ python3Packages.buildPythonPackage rec {
rio-mucho
];
- pythonRelaxDeps = true;
-
doCheck = false;
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
diff --git a/pkgs/mqtt/amqtt/default.nix b/pkgs/mqtt/amqtt/default.nix
@@ -6,36 +6,38 @@
python3Packages.buildPythonApplication rec {
pname = "amqtt";
- version = "0.10.1-unstable-2025-01-08";
+ version = "0.11.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Yakifo";
repo = "amqtt";
- rev = "440e8ff945bf83c262f3a9d16be2f014fce6265c";
- hash = "sha256-ZFXIYgjNnYqBLLdYgxDpG9JG7weuY3vlHC4pwZlFsh0=";
+ tag = "v${version}";
+ hash = "sha256-l/YbfrjJsBA5a/IHH2p/B3irZF/z2xzNYxXOMOieV04=";
};
- build-system = with python3Packages; [ poetry-core ];
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace-fail ', "uv-dynamic-versioning"' ""
+ '';
+
+ build-system = with python3Packages; [ hatchling hatch-vcs ];
dependencies = with python3Packages; [
- docopt
passlib
+ psutil
pyyaml
transitions
+ typer
websockets
];
- pythonRelaxDeps = [
- "transitions"
- "websockets"
- ];
+ pythonRelaxDeps = true;
doCheck = false;
nativeCheckInputs = with python3Packages; [
hypothesis
- psutil
pytest-asyncio
pytest-cov-stub
pytest-logdog
diff --git a/pkgs/mqtt/mqttfs/default.nix b/pkgs/mqtt/mqttfs/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/mburakov/mqttfs";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
- platforms = lib.platforms.unix;
+ platforms = lib.platforms.linux;
+ skip.ci = stdenv.isDarwin;
};
})
diff --git a/pkgs/osm/pyrosm/default.nix b/pkgs/osm/pyrosm/default.nix
@@ -19,6 +19,10 @@ python3Packages.buildPythonPackage rec {
hash = "sha256-eX6lOkprU/RkSz2+dGlRtdQQsI+m9GZyN/VfcIix79k=";
};
+ postPatch = ''
+ substituteInPlace pyproject.toml --replace-fail "cykhash==2.0.0" "cykhash"
+ '';
+
build-system = with python3Packages; [
setuptools
cython
@@ -32,8 +36,6 @@ python3Packages.buildPythonPackage rec {
pyrobuf
];
- pythonRelaxDeps = true;
-
doCheck = false;
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];