commit cc5cd01f8398a802f59f896c0af03aa962998bdc parent 7362cfd18877a78306929b52efd166d138f717fa Author: Nikolay Korotkiy <sikmir@disroot.org> Date: Mon, 7 Jul 2025 01:59:28 +0400 Up Diffstat:
M | pkgs/default.nix | | | 10 | +++++----- |
M | pkgs/misc/modbus_sim_cli/default.nix | | | 2 | ++ |
M | pkgs/mqtt/mqtt-cli/default.nix | | | 4 | ++-- |
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -467,14 +467,14 @@ lib.makeScope newScope ( ### NAKARTE elevation-server = callPackage ./nakarte/elevation-server { }; - map-tiler = callPackage ./nakarte/map-tiler { python3Packages = pkgs.python310Packages; }; + map-tiler = callPackage ./nakarte/map-tiler { python3Packages = pkgs.python311Packages; }; mapillary-render = callPackage ./nakarte/mapillary-render { }; - maprec = callPackage ./nakarte/maprec { python3Packages = pkgs.python310Packages; }; + maprec = callPackage ./nakarte/maprec { python3Packages = pkgs.python311Packages; }; #nakarte = callPackage ./nakarte/nakarte { }; - ozi-map = callPackage ./nakarte/ozi-map { python3Packages = pkgs.python310Packages; }; - pyimagequant = callPackage ./nakarte/pyimagequant { python3Packages = pkgs.python310Packages; }; + ozi-map = callPackage ./nakarte/ozi-map { python3Packages = pkgs.python311Packages; }; + pyimagequant = callPackage ./nakarte/pyimagequant { python3Packages = pkgs.python311Packages; }; thinplatespline = callPackage ./nakarte/thinplatespline { - python3Packages = pkgs.python310Packages; + python3Packages = pkgs.python311Packages; }; tracks-storage-server = pkgs.python3Packages.callPackage ./nakarte/tracks-storage-server { }; westra-passes = callPackage ./nakarte/westra-passes { }; diff --git a/pkgs/misc/modbus_sim_cli/default.nix b/pkgs/misc/modbus_sim_cli/default.nix @@ -33,6 +33,8 @@ python3Packages.buildPythonApplication { pyyaml ]; + pythonRelaxDeps = true; + preConfigure = '' find modbus_sim -name "*.py" | xargs 2to3 -w ''; diff --git a/pkgs/mqtt/mqtt-cli/default.nix b/pkgs/mqtt/mqtt-cli/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mqtt-cli"; - version = "4.40.0"; + version = "4.41.0"; src = fetchfromgh { owner = "hivemq"; repo = "mqtt-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-D0zCS+Ju4SlD5lHAv0OKZKNvTFi0BIeFhvlR+6/9X7Y="; + hash = "sha256-ormYRI2hUR5ka85GosbNA1c1Nb+3QoKQYHLzpnPKkPg="; name = "mqtt-cli-${finalAttrs.version}.jar"; };