gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-02-10 06:05:03 +00:00
committed by GitHub
parent d2551f49bf f780db4505
commit dc553e12fe
15 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/fr/frigate/package.nix
-1
View File
@@ -26,7 +26,6 @@ let
python = python312.override {
self = python;
packageOverrides = self: super: {
paho-mqtt = super.paho-mqtt_2;
};
};
pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
+12 -3
View File
@@ -4,7 +4,16 @@
python3,
}:
python3.pkgs.buildPythonApplication rec {
let
python = python3.override {
self = python;
packageOverrides = self: super: {
# https://github.com/unixorn/ha-mqtt-discoverable/pull/310
paho-mqtt = self.paho-mqtt_1;
};
};
in
python.pkgs.buildPythonApplication rec {
pname = "ha-mqtt-discoverable-cli";
version = "0.16.4.1";
pyproject = true;
@@ -18,9 +27,9 @@ python3.pkgs.buildPythonApplication rec {
pythonRelaxDeps = [ "ha-mqtt-discoverable" ];
build-system = with python3.pkgs; [ poetry-core ];
build-system = with python.pkgs; [ poetry-core ];
dependencies = with python3.pkgs; [ ha-mqtt-discoverable ];
dependencies = with python.pkgs; [ ha-mqtt-discoverable ];
# Project has no real tests
doCheck = false;
pkgs/by-name/je/jenkins/package.nix
+2 -2
View File
@@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.479.3";
version = "2.492.1";
src = fetchurl {
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
hash = "sha256-MEyFkoYNWwPewnyWteiexY/HRPeBYcU/ejRKC/fOkgM=";
hash = "sha256-wFNPna+QJa5AVOwwUYsbifxdl7Mvr9tVa5s6YOn//8g=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/mq/mqtt-exporter/package.nix
+1 -1
View File
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
paho-mqtt_2
paho-mqtt
prometheus-client
];
pkgs/by-name/ya/yafc-ce/package.nix
+2 -2
View File
@@ -12,13 +12,13 @@ let
in
buildDotnetModule (finalAttrs: {
pname = "yafc-ce";
version = "2.6.0";
version = "2.7.0";
src = fetchFromGitHub {
owner = "shpaass";
repo = "yafc-ce";
rev = finalAttrs.version;
hash = "sha256-anQ49VWDIdze108idGLXXM74dfqAg9KqVthFozHQl0A=";
hash = "sha256-pBnAUrDnOabQq7D1YJ41aJq9MSPIHQ6K8ix5TLwkrZ0=";
};
projectFile = [ "Yafc/Yafc.csproj" ];
pkgs/by-name/zo/zoxide/package.nix
+3 -3
View File
@@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "zoxide";
version = "0.9.6";
version = "0.9.7";
src = fetchFromGitHub {
owner = "ajeetdsouza";
repo = "zoxide";
tag = "v${version}";
hash = "sha256-3XC5K4OlituoFMPN9yJkYi+tkH6M0KK5jVAGdr/GLd0=";
hash = "sha256-+QZpLMlHOZdbKLFYOUOIRZHvIsbMDdstj9oGzyEGVxk=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-+Vip7MjVV23dZdD8GxmNFrfnsjmucohMDUZE9vbpG5w=";
cargoHash = "sha256-uqIL8KTrgWzzzyoPR9gctyh0Rf7WQpTGqXow2/xFvCU=";
postInstall = ''
installManPage man/man*/*
pkgs/development/ocaml-modules/magic/default.nix
+4 -4
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "magic";
version = "0.7.3";
version = "0.7.4";
src = fetchFromGitHub {
owner = "Chris00";
repo = "ocaml-magic";
rev = "510c473d222a3d3d900b8ae1892d13e0d49d08be"; # no tags in repo
sha256 = "0qks3v51xvzxhidai414mbszxhcl8wg8g7zxd04qi260433g77yg";
tag = "v${version}";
sha256 = "sha256-rsBMx68UDqmVVsyeZCxIS97A/0JCBM/JOgh60ly1uSs=";
};
createFindlibDestdir = true;
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/Chris00/ocaml-magic";
description = "Bindings for libmagic";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ dandellion ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/python-modules/amshan/default.nix
+6 -3
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "amshan";
version = "2021.12.1";
version = "2.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "toreamun";
repo = "amshan";
tag = version;
hash = "sha256-eL8YzQB6Vj4l3cYFgWve88vLojvcxMtr2xvTUKT+Ekk=";
rev = version;
hash = "sha256-aw0wTqb2s84STVUN55h6L926pXwaMSppBCfXZVb87w0=";
};
build-system = [
@@ -37,6 +37,9 @@ buildPythonPackage rec {
pythonImportsCheck = [ "han" ];
# 2021.12.1 is an older version
passthru.skipBulkUpdate = true;
meta = {
description = "Decode smart power meter data stream of Cosem HDLC frames used by MBUS";
longDescription = ''
pkgs/development/python-modules/azure-iot-device/default.nix
+2
View File
@@ -50,6 +50,8 @@ buildPythonPackage rec {
];
meta = with lib; {
# https://github.com/Azure/azure-iot-sdk-python/issues/1196
broken = lib.versionAtLeast paho-mqtt.version "2";
description = "Microsoft Azure IoT Device Library for Python";
homepage = "https://github.com/Azure/azure-iot-sdk-python";
license = licenses.mit;
pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
+2
View File
@@ -43,6 +43,8 @@ buildPythonPackage rec {
pythonImportsCheck = [ "ha_mqtt_discoverable" ];
meta = with lib; {
# https://github.com/unixorn/ha-mqtt-discoverable/pull/310
broken = lib.versionAtLeast paho-mqtt.version "2";
description = "Python module to create MQTT entities that are automatically discovered by Home Assistant";
homepage = "https://github.com/unixorn/ha-mqtt-discoverable";
changelog = "https://github.com/unixorn/ha-mqtt-discoverable/releases/tag/v${version}";
pkgs/development/python-modules/meross-iot/default.nix
+2
View File
@@ -41,6 +41,8 @@ buildPythonPackage rec {
pythonImportsCheck = [ "meross_iot" ];
meta = with lib; {
# https://github.com/albertogeniola/MerossIot/pull/413
broken = lib.versionAtLeast paho-mqtt.version "2";
description = "Python library to interact with Meross devices";
homepage = "https://github.com/albertogeniola/MerossIot";
changelog = "https://github.com/albertogeniola/MerossIot/releases/tag/${version}";
pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix
+4 -4
View File
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "mkdocs-git-committers-plugin-2";
version = "2.4.1";
version = "2.5.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "ojacques";
repo = "mkdocs-git-committers-plugin-2";
rev = "refs/tags/${version}";
hash = "sha256-hKt0K5gOkdUDwTlyMTwodl4gD1RD+s+CM+zEpngSnlc=";
tag = version;
hash = "sha256-PpXgY5RlOeb0mB46gcNVWkSGMZa4WPkCwDUXMxCUjsI=";
};
build-system = [
@@ -45,7 +45,7 @@ buildPythonPackage rec {
meta = {
description = "MkDocs plugin for displaying a list of contributors on each page";
homepage = "https://github.com/ojacques/mkdocs-git-committers-plugin-2";
changelog = "https://github.com/ojacques/mkdocs-git-committers-plugin-2/releases/tag/${version}";
changelog = "https://github.com/ojacques/mkdocs-git-committers-plugin-2/releases/tag/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ mahtaran ];
};
pkgs/development/python-modules/weconnect-mqtt/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
paho-mqtt_2,
paho-mqtt,
pytest-cov-stub,
pytestCheckHook,
python-dateutil,
@@ -39,7 +39,7 @@ buildPythonPackage rec {
build-system = [ setuptools ];
dependencies = [
paho-mqtt_2
paho-mqtt
python-dateutil
weconnect
] ++ weconnect.optional-dependencies.Images;
pkgs/servers/home-assistant/stubs.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2025.2.0";
version = "2025.2.1";
pyproject = true;
disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
hash = "sha256-u9RclA8vtsr34TKdocFgc3e/LjaRjP3fqQC0QjqsOs4=";
hash = "sha256-Lw+eItDQX77jKIE9/9S0C9khzR+HMHFPGvPpzRHwrZw=";
};
build-system = [
pkgs/top-level/python-packages.nix
+1 -1
View File
@@ -10046,7 +10046,7 @@ self: super: with self; {
paho-mqtt_1 = callPackage ../development/python-modules/paho-mqtt/1.nix { };
paho-mqtt_2 = callPackage ../development/python-modules/paho-mqtt/default.nix { };
paho-mqtt = paho-mqtt_1;
paho-mqtt = paho-mqtt_2;
paintcompiler = callPackage ../development/python-modules/paintcompiler { };