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

Merge branch 'NixOS:master' into binfmt-emulatedsystems-fix

Browse Source
This commit is contained in:
Jenna Fligor
2023-12-19 13:25:19 -06:00
committed by GitHub
parent c82896c292 b0d1fe9a32
commit 1f873183b8
14 changed files with 207 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/anova-wifi/default.nix
+59
View File
@@ -0,0 +1,59 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, poetry-core
, aiohttp
, sensor-state-data
, pytestCheckHook
, pytest-asyncio
}:
buildPythonPackage rec {
pname = "anova-wifi";
version = "0.10.3";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "Lash-L";
repo = "anova_wifi";
rev = "refs/tags/v${version}";
hash = "sha256-tCmvp29KSCkc+g0w0odcB7vGjtDx6evac7XsHEF0syM=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov=anova_wifi --cov-report=term-missing:skip-covered" ""
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
sensor-state-data
];
nativeCheckInputs = [
pytestCheckHook
pytest-asyncio
];
disabledTests = [
# Makes network calls
"test_async_data_1"
];
pythonImportsCheck = [ "anova_wifi" ];
meta = with lib; {
description = "A Python package for reading anova sous vide api data";
homepage = "https://github.com/Lash-L/anova_wifi";
changelog = "https://github.com/Lash-L/anova_wifi/releases/tag/v${version}";
maintainers = with maintainers; [ jamiemagee ];
license = licenses.mit;
};
}
pkgs/development/python-modules/findpython/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
let
pname = "findpython";
version = "0.4.0";
version = "0.4.1";
in
buildPythonPackage {
inherit pname version;
@@ -25,7 +25,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
hash = "sha256-GLFNEVZ42hiuku4i1wAcwwkV6lMQU/dwEO4Fo5aA9Dg=";
hash = "sha256-19AUVYaBs3YdV6WyNCpxOovzAvbB/J2Z+Budi9FoGwQ=";
};
nativeBuildInputs = [
pkgs/development/python-modules/fschat/default.nix
+2 -2
View File
@@ -29,7 +29,7 @@
, protobuf
}:
let
version = "0.2.33";
version = "0.2.34";
in
buildPythonPackage {
pname = "fschat";
@@ -40,7 +40,7 @@ buildPythonPackage {
owner = "lm-sys";
repo = "FastChat";
rev = "refs/tags/v${version}";
hash = "sha256-tfFgiYJBuVt71qHOmkDoSrZ2tvXStjubmkw7sexkGZg=";
hash = "sha256-4dnKrLQYkd2uQh2K2yaQ7EgrkgX8bO4QXfjIOqpzCE8=";
};
nativeBuildInputs = [
pkgs/development/python-modules/icalevents/default.nix
+59
View File
@@ -0,0 +1,59 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
, poetry-core
, datetime
, httplib2
, icalendar
, python-dateutil
, pytz
}:
buildPythonPackage rec {
pname = "icalevents";
version = "0.1.27";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "jazzband";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-vSYQEJFBjXUF4WwEAtkLtcO3y/am00jGS+8Vj+JMMqQ=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
datetime
httplib2
icalendar
python-dateutil
pytz
];
nativeCheckInputs = [
pytestCheckHook
];
disabledTests = [
# Makes HTTP calls
"test_events_url"
"test_events_async_url"
];
pythonImportsCheck = [ "icalevents" ];
meta = with lib; {
changelog = "https://github.com/jazzband/icalevents/releases/tag/v${version}";
description = "Python module for iCal URL/file parsing and querying";
homepage = "https://github.com/jazzband/icalevents";
maintainers = with maintainers; [ jamiemagee ];
license = licenses.mit;
};
}
pkgs/development/python-modules/python-didl-lite/default.nix
+16 -7
View File
@@ -4,21 +4,27 @@
, pythonOlder
, defusedxml
, pytestCheckHook
, setuptools
}:
buildPythonPackage rec {
pname = "python-didl-lite";
version = "1.3.2";
format = "setuptools";
disabled = pythonOlder "3.5.3";
version = "1.4.0";
pyroject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "StevenLooman";
repo = pname;
rev = version;
hash = "sha256-laKmWGDEzlBVJCUSKxekjPEXVlAz4MIzM7dNJfta/ek=";
repo = "python-didl-lite";
rev = "refs/tags/${version}";
hash = "sha256-A+G97T/udyL/yRqykq1sEGDEI6ZwtDBc5xUNFiJp0UQ=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
defusedxml
];
@@ -27,11 +33,14 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "didl_lite" ];
pythonImportsCheck = [
"didl_lite"
];
meta = with lib; {
description = "DIDL-Lite (Digital Item Declaration Language) tools for Python";
homepage = "https://github.com/StevenLooman/python-didl-lite";
changelog = "https://github.com/StevenLooman/python-didl-lite/blob/${version}/CHANGES.rst";
license = licenses.asl20;
maintainers = with maintainers; [ hexa ];
};
pkgs/development/tools/sqlboiler/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "sqlboiler";
version = "4.14.2";
version = "4.15.0";
src = fetchFromGitHub {
owner = "volatiletech";
repo = "sqlboiler";
rev = "refs/tags/v${version}";
hash = "sha256-d3SML1cm+daYU5dEuwSXSsKwsJHxGuOEbwCvYfsMcFI=";
hash = "sha256-MT1tjVCDaFB9HfjlGGnf6jTiPdKcrDamgp2nTpIarqY=";
};
vendorHash = "sha256-/z5l+tgQuYBZ0A99A8CoTuqTSfnM52R43ppFrooRgOM=";
vendorHash = "sha256-tZ1RQGmeDv4rtdF1WTRQV1K4Xy1AgIatLPPexnHJnkA=";
tags = [
"mysql"
pkgs/games/path-of-building/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
let
data = stdenv.mkDerivation(finalAttrs: {
pname = "path-of-building-data";
version = "2.38.2";
version = "2.38.3";
src = fetchFromGitHub {
owner = "PathOfBuildingCommunity";
repo = "PathOfBuilding";
rev = "v${finalAttrs.version}";
hash = "sha256-WgnYjG47E5p0R5MXlDXN8sbh0Y9E8cZN0gMSdkHpXfw=";
hash = "sha256-LzNHc6lx0d+Hg0qkOb9G50V5pYOxH7eavQdcAXE5EKI=";
};
nativeBuildInputs = [ unzip ];
pkgs/servers/home-assistant/component-packages.nix
+2 -1
View File
@@ -169,7 +169,8 @@
anel-pwrctrl-homeassistant
];
"anova" = ps: with ps; [
]; # missing inputs: anova-wifi
anova-wifi
];
"anthemav" = ps: with ps; [
anthemav
];
pkgs/servers/home-assistant/custom-components/default.nix
+2
View File
@@ -9,4 +9,6 @@
miele = callPackage ./miele {};
prometheus_sensor = callPackage ./prometheus_sensor {};
waste_collection_schedule = callPackage ./waste_collection_schedule {};
}
pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix
+47
View File
@@ -0,0 +1,47 @@
{ lib
, buildHomeAssistantComponent
, fetchFromGitHub
, fetchpatch
, beautifulsoup4
, icalendar
, icalevents
, lxml
, recurring-ical-events
}:
buildHomeAssistantComponent rec {
owner = "mampfes";
domain = "waste_collection_schedule";
version = "1.44.0";
src = fetchFromGitHub {
inherit owner;
repo = "hacs_${domain}";
rev = "refs/tags/${version}";
hash = "sha256-G1x7HtgdtK+IaPAfxT+7xsDJi5FnXN4Pg3q7T5Xr8lA=";
};
patches = [
# Corrects a dependency on beautifulsoup4
(fetchpatch {
url = "https://github.com/mampfes/hacs_waste_collection_schedule/pull/1515.patch";
hash = "sha256-dvmicKTjolEcCrKRtZfpN0M/9RQCEQkFk+M6E+qCqfQ=";
})
];
propagatedBuildInputs = [
beautifulsoup4
icalendar
icalevents
lxml
recurring-ical-events
];
meta = with lib; {
changelog = "https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/${version}";
description = "Home Assistant integration framework for (garbage collection) schedules";
homepage = "https://github.com/mampfes/hacs_waste_collection_schedule";
maintainers = with maintainers; [jamiemagee];
license = licenses.mit;
};
}
pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "collectd-exporter";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "prometheus";
repo = "collectd_exporter";
rev = "v${version}";
sha256 = "0vb6vnd2j87iqxdl86j30dk65vrv4scprv200xb83203aprngqgh";
sha256 = "sha256-8oibunEHPtNdbhVgF3CL6D/xE7bR8hee6+D2IJMzaqY=";
};
vendorHash = null;
vendorHash = "sha256-fQO2fiotqv18xewXVyh6sA4zx5ZNUR6mCebYenryrKI=";
ldflags = [ "-s" "-w" ];
pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mysqld_exporter";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "prometheus";
repo = "mysqld_exporter";
rev = "v${version}";
sha256 = "sha256-LW9vH//TjnKbZGMF3owDSUx/Mu0TUuWxMtmdeKM/q7k=";
sha256 = "sha256-P7EoWa0BWuAr3sjtrUxzofwlklhRLpzwpGVe31hFo7Q=";
};
vendorHash = "sha256-8zoiYSW8/z1Ch5W1WJHbWAPKFUOhUT8YcjrvyhwI+8w=";
vendorHash = "sha256-GEL9sMwwdGqpklm4yKNqzSOM6I/JzZjg3+ZB2ix2M8w=";
ldflags = let t = "github.com/prometheus/common/version"; in [
"-s" "-w"
pkgs/tools/networking/ooniprobe-cli/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "ooniprobe-cli";
version = "3.19.1";
version = "3.20.0";
src = fetchFromGitHub {
owner = "ooni";
repo = "probe-cli";
rev = "v${version}";
hash = "sha256-sYIp5zl49waERfTYPfNjbyzep7p4sRlweDVcuTtWB28=";
hash = "sha256-kOARV3tnRyOAScc3Vn96TFQFgqvTgi6NFHWM7ZbpciU=";
};
vendorHash = "sha256-6RyK0oy9Lcuh2TXpQqAqmrA+bS9hug6+il7L1z+kYvs=";
vendorHash = "sha256-c922VpxtpNfua3Sx3vXKz4x1FsLMwbaSvRH4dyFrr9s=";
subPackages = [ "cmd/ooniprobe" ];
pkgs/top-level/python-packages.nix
+4
View File
@@ -554,6 +554,8 @@ self: super: with self; {
anonip = callPackage ../development/python-modules/anonip { };
anova-wifi = callPackage ../development/python-modules/anova-wifi { };
ansi2html = callPackage ../development/python-modules/ansi2html { };
ansi2image = callPackage ../development/python-modules/ansi2image { };
@@ -5347,6 +5349,8 @@ self: super: with self; {
icalendar = callPackage ../development/python-modules/icalendar { };
icalevents = callPackage ../development/python-modules/icalevents { };
icecream = callPackage ../development/python-modules/icecream { };
iceportal = callPackage ../development/python-modules/iceportal { };