swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-11-04 00:02:12 +00:00 committed by GitHub
parent 3e337de0c2 e279d4851d
commit 7516a2e172
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 221 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
maintainers/maintainer-list.nix
View file

@ -159,6 +159,7 @@
};
abbe = {
email = "ashish.is@lostca.se";
matrix = "@abbe:badti.me";
github = "wahjava";
githubId = 2255192;
name = "Ashish SHUKLA";
@ -1663,6 +1664,7 @@
};
bryanasdev000 = {
email = "bryanasdev000@gmail.com";
matrix = "@bryanasdev000:matrix.org";
github = "bryanasdev000";
githubId = 53131727;
name = "Bryan Albuquerque";
@ -7699,6 +7701,7 @@
mohe2015 = {
name = "Moritz Hedtke";
email = "Moritz.Hedtke@t-online.de";
matrix = "@moritz.hedtke:matrix.org";
github = "mohe2015";
githubId = 13287984;
keys = [{
@ -8686,6 +8689,7 @@
};
pamplemousse = {
email = "xav.maso@gmail.com";
matrix = "@pamplemouss_:matrix.org";
github = "Pamplemousse";
githubId = 2647236;
name = "Xavier Maso";

4
nixos/tests/elk.nix
View file

@ -220,7 +220,7 @@ let
'';
}) { inherit pkgs system; };
in {
ELK-6 = mkElkTest {
ELK-6 = mkElkTest "elk-6-oss" {
name = "elk-6-oss";
elasticsearch = pkgs.elasticsearch6-oss;
logstash = pkgs.logstash6-oss;
@ -230,7 +230,7 @@ in {
};
# We currently only package upstream binaries.
# Feel free to package an SSPL licensed source-based package!
# ELK-7 = mkElkTest {
# ELK-7 = mkElkTest "elk-7-oss" {
# name = "elk-7";
# elasticsearch = pkgs.elasticsearch7-oss;
# logstash = pkgs.logstash7-oss;

4
pkgs/applications/audio/praat/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "praat";
version = "6.1.53";
version = "6.1.55";
src = fetchFromGitHub {
owner = "praat";
repo = "praat";
rev = "v${version}";
sha256 = "sha256-4GOVrKVHl/Cj0PNx+rcLESn5fbyIsnzaheMOFLlEVMU=";
sha256 = "sha256-PQVbrohIlmzKcG/8TzOBgyQWWaMH88voMNWAqEfyUWI=";
};
configurePhase = ''

4
pkgs/applications/science/biology/picard-tools/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "picard-tools";
version = "2.26.3";
version = "2.26.4";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
sha256 = "sha256-H7VgD75tmAEd01Pj1o6BNT0QaXhd1pUIpAFmKM6OUlo=";
sha256 = "sha256-KVOQuqudne0SAdgFEft/lTuoDn9vcpuDtMAafztYvPo=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/science/logic/opensmt/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "opensmt";
version = "2.1.1";
version = "2.2.0";
src = fetchFromGitHub {
owner = "usi-verification-and-security";
repo = "opensmt";
rev = "v${version}";
sha256 = "sha256-StnEvkSSKDHGYXIQsDUu9T9Ztl+RtDTP47JvnRyH0bE=";
sha256 = "sha256-6VkBGDzqG3mplpvFh5DIR0I1I2/J0Pi7xYk/yVn04Kg=";
};
nativeBuildInputs = [ cmake bison flex ];

4
pkgs/desktops/plasma-5/kwin/default.nix
View file

@ -12,7 +12,7 @@
kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
krunner, kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons,
kwindowsystem, kxmlgui, plasma-framework,
kwindowsystem, kxmlgui, plasma-framework, libqaccessibilityclient,
}:
# TODO (ttuegel): investigate qmlplugindump failure
@ -31,7 +31,7 @@ mkDerivation {
kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
kidletime kinit kio knewstuff knotifications kpackage krunner kscreenlocker
kservice kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui
plasma-framework
plasma-framework libqaccessibilityclient
];
outputs = [ "dev" "out" ];

26
pkgs/development/libraries/libqaccessibilityclient/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ lib, stdenv, fetchurl, cmake, qtbase, extra-cmake-modules }:
stdenv.mkDerivation rec {
pname = "libqaccessibilityclient";
version = "0.4.1";
src = fetchurl {
url = "mirror://kde/stable/libqaccessibilityclient/libqaccessibilityclient-${version}.tar.xz";
sha256 = "sha256-HHaLT0MU/K4qB8t958sq4FIrXwK0Fzrz7ti/sqTYNCk=";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
dontWrapQtApps = true;
meta = with lib; {
description = "Accessibilty tools helper library, used e.g. by screen readers";
homepage = "https://github.com/KDE/libqaccessibilityclient";
maintainers = with maintainers; [ artturin ];
license = with licenses; [ lgpl3Only /* or */ lgpl21Only ];
platforms = platforms.linux;
};
}

4
pkgs/development/libraries/py3c/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "py3c";
version = "1.3.1";
version = "1.4";
src = fetchFromGitHub {
owner = "encukou";
repo = pname;
rev = "v${version}";
sha256 = "04i2z7hrig78clc59q3i1z2hh24g7z1bfvxznlzxv00d4s57nhpi";
sha256 = "sha256-v8+0J56sZVbGdBlOotObUa10/zFMTvfXdMYRsKhyZaY=";
};
postPatch = ''

16
pkgs/development/python-modules/aioambient/default.nix
View file

@ -16,18 +16,20 @@
buildPythonPackage rec {
pname = "aioambient";
version = "1.3.0";
version = "2021.10.1";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-blejTXyLe3B2kNytBh+zJz0Q0xDP+Vo2SV9gc7OX6S0=";
sha256 = "sha256-DCh/o7p+lO5BhN3JoLdhImkzfxoyqiscA/6CwwvAnc0=";
};
postPatch = ''
# https://github.com/bachya/aioambient/pull/97
substituteInPlace pyproject.toml \
--replace 'websockets = ">=8.1,<10.0"' 'websockets = ">=8.1,<11.0"'
'';
@ -52,9 +54,13 @@ buildPythonPackage rec {
];
# Ignore the examples directory as the files are prefixed with test_
disabledTestPaths = [ "examples/" ];
disabledTestPaths = [
"examples/"
];
pythonImportsCheck = [ "aioambient" ];
pythonImportsCheck = [
"aioambient"
];
meta = with lib; {
description = "Python library for the Ambient Weather API";

4
pkgs/development/python-modules/aioesphomeapi/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "10.0.3";
version = "10.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9K67vmPaPSR6ODl3tpwwfRMY9DDD/2cCaDRRO38mHVU=";
sha256 = "sha256-SUM9P7qmP3LWANw8LiwMsT5sN1kZJvqeaBT/ZDmTtwE=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/awesomeversion/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "awesomeversion";
version = "21.8.1";
version = "21.10.1";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "sha256-eyo0dzmExJ7WCRAXFvB+ElWi5HTTzJ7XJsmxB2t6yfI=";
sha256 = "sha256-y+QU8T1Cb6FpRcRqhao4KPdE9XlU5C+GURaEuahC25E=";
};
postPatch = ''

37
pkgs/development/python-modules/flake8-length/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, pythonOlder
, flake8
, pytestCheckHook
, fetchPypi
}:
buildPythonPackage rec {
pname = "flake8-length";
version = "0.2.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "15frvccm1qx783jlx8fw811ks9jszln3agbb58lg4dhbmjaf2cxw";
};
propagatedBuildInputs = [
flake8
];
pythonImportsCheck = [
"flake8_length"
];
checkInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "tests/" ];
meta = {
description = "Flake8 plugin for a smart line length validation";
homepage = "https://github.com/orsinium-labs/flake8-length";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ sauyon ];
};
}

4
pkgs/development/python-modules/greeclimate/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "greeclimate";
version = "0.12.1";
version = "0.12.3";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "cmroche";
repo = "greeclimate";
rev = version;
sha256 = "sha256-HO+JBlyRFkwijR3g75P7yOabK3LhNFFYevSn/aFStUE=";
sha256 = "sha256-7O21/eL/CcQmENJTGKfZCHjZcRN3pwuWZrmMMX3YPAg=";
};
propagatedBuildInputs = [

46
pkgs/development/python-modules/ha-av/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, pkg-config
, ffmpeg
, numpy
, pytestCheckHook
, python
}:
buildPythonPackage rec {
pname = "ha-av";
version = "8.0.4rc1";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-txdi2/X6upqrACeHhHpEh4tGqgPpW/dyWda8y++7c3M=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
ffmpeg
];
pythonImportsCheck = [
"av"
"av._core"
];
# tests fail to import av._core
doCheck = false;
meta = with lib; {
homepage = "https://pypi.org/project/ha-av/";
description = "Pythonic bindings for FFmpeg's libraries";
license = licenses.bsd3;
maintainers = with maintainers; [ hexa ];
};
}

4
pkgs/development/python-modules/pyefergy/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyefergy";
version = "0.1.0";
version = "0.1.3";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tkdrob";
repo = pname;
rev = version;
sha256 = "0nm7dc5q4wvdpqxpirlc4nwm68lf3n2df6j5yy4m8wr294yb7a1k";
sha256 = "sha256-TGvS/ntIRbkcMsD5y0QdqyLE2dcPUbX3d79jHc3ddd0=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pylitterbot/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pylitterbot";
version = "2021.9.0";
version = "2021.10.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "natekspencer";
repo = pname;
rev = version;
sha256 = "sha256-S25x9k6vBwnmJq15y5PVUWaTujT9UNHvgIX9uH+N8dY=";
sha256 = "sha256-xE+H23AZR1OXfuLMvSuI7IeYKX7k2iEATHq5VheMLn4=";
};
propagatedBuildInputs = [

11
pkgs/development/python-modules/simple_di/default.nix
View file

@ -8,9 +8,9 @@
}:
buildPythonPackage rec {
version = "0.1.2";
pname = "simple_di";
disabled = pythonOlder "3.6.1";
version = "0.1.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
@ -24,6 +24,13 @@ buildPythonPackage rec {
dataclasses
];
pythonImportsCheck = [
"simple_di"
];
# pypi distribution contains no tests
doCheck = false;
meta = {
description = "Simple dependency injection library";
homepage = "https://github.com/bentoml/simple_di";

4
pkgs/development/python-modules/simplisafe-python/default.nix
View file

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "simplisafe-python";
version = "12.0.2";
version = "2021.10.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-/KnDsnx+Jrirj6uBkdao6PI2jhtzKqDK6cmmQgsO5T4=";
sha256 = "sha256-J0uMlczR7y5wDchaOjp5d3Vf36WfRmt7d51koGiNHBk=";
};
nativeBuildInputs = [ poetry-core ];

12
pkgs/development/python-modules/spiderpy/default.nix
View file

@ -2,12 +2,14 @@
, buildPythonPackage
, isPy27
, fetchFromGitHub
, poetry-core
, requests
}:
buildPythonPackage rec {
pname = "spiderpy";
version = "1.5.0";
version = "1.7.1";
format = "pyproject";
disabled = isPy27;
@ -15,14 +17,18 @@ buildPythonPackage rec {
owner = "peternijssen";
repo = "spiderpy";
rev = version;
sha256 = "1nbfjqwiyyl7lhkb4rvickxiy9nwynr2sxr1hpyv0vm09h6q8hsc";
sha256 = "sha256-gQ/Y5c8+aSvoJzXI6eQ9rk0xDPxpi0xgO3xBKR+vVrY=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
requests
];
# no unit tests implemented
# tests don't mock remote resources
doCheck = false;
pythonImportsCheck = [ "spiderpy.spiderapi" ];

18
pkgs/development/python-modules/swspotify/default.nix
View file

@ -1,29 +1,31 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests, flask-cors, dbus-python, pytestCheckHook, mock, isPy27 }:
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, poetry-core, requests
, pytestCheckHook, flask, flask-cors, dbus-python, mock, isPy27 }:
buildPythonPackage rec {
pname = "SwSpotify";
version = "1.2.1";
version = "1.2.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "SwagLyrics";
repo = "SwSpotify";
rev = "v${version}";
sha256 = "0jxcvy8lw8kpjbl4q6mi11164pvi0w9m9p76bxj2m7i7s5p4dxd4";
sha256 = "sha256-571knnY8LegIbqyPeKUfl+d0suTWAMQHYLN7edKFNdI=";
};
propagatedBuildInputs = [
requests flask-cors dbus-python
requests flask flask-cors dbus-python
];
preConfigure = ''
substituteInPlace setup.py \
--replace 'requests>=2.24.0' 'requests~=2.23' \
--replace 'flask-cors==3.0.8' 'flask-cors'
--replace 'flask==2.0.1' 'flask'
'';
doCheck = !stdenv.isDarwin;
checkPhase = ''
pytest tests/test_spotify.py::LinuxTests
pytest tests/test_spotify.py::${if stdenv.isDarwin then "DarwinTests" else "LinuxTests"}
'';
checkInputs = [ pytestCheckHook mock ];
@ -35,6 +37,6 @@ buildPythonPackage rec {
description = "Library to get the currently playing song and artist from Spotify";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

4
pkgs/development/python-modules/xknx/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "xknx";
version = "0.18.9";
version = "0.18.12";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "XKNX";
repo = pname;
rev = version;
sha256 = "1dw1dqhd790wsa6v7bpcv921zf1y544ry7drwcfdcmprsm7hs42j";
sha256 = "sha256-Wk6+IRIGMaOPOEVEyzalBKyK88Y2yfKKo6T0fKxeOOE=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/zeroconf/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.36.9";
version = "0.36.11";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "jstasiak";
repo = "python-zeroconf";
rev = version;
sha256 = "sha256-V2AiKmL3laA6Kd2lOXZ7f+7L08zMtDfvhLxayylp1CQ=";
sha256 = "sha256-MGaikOO4vdBRCR+jYHr38FGOdg2rjypK5z0UY5lThY4=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/zha-quirks/default.nix
View file

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "zha-quirks";
version = "0.0.62";
version = "0.0.63";
src = fetchFromGitHub {
owner = "zigpy";
repo = "zha-device-handlers";
rev = version;
sha256 = "sha256-wXXdxE69EABrvJA8utrhLW4+8ixcyCraWHx2M3uE8mw=";
sha256 = "sha256-jAd/qT+uwylE/AOHFnkKWECHnxFFqgCtCp36mrqFZIE=";
};
propagatedBuildInputs = [

18
pkgs/servers/home-assistant/component-packages.nix
View file

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2021.10.7";
version = "2021.11.0";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
@ -243,7 +243,6 @@
"epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter
"eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt
"esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors ifaddr zeroconf ];
"essent" = ps: with ps; [ ]; # missing inputs: PyEssent
"etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api
"eufy" = ps: with ps; [ ]; # missing inputs: lakeside
"everlights" = ps: with ps; [ pyeverlights ];
@ -379,7 +378,6 @@
"http" = ps: with ps; [ aiohttp-cors ];
"htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
"huawei_lte" = ps: with ps; [ huawei-lte-api stringcase url-normalize ];
"huawei_router" = ps: with ps; [ ];
"hue" = ps: with ps; [ aiohue ];
"huisbaasje" = ps: with ps; [ huisbaasje-client ];
"humidifier" = ps: with ps; [ ];
@ -477,6 +475,7 @@
"logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle
"london_air" = ps: with ps; [ ];
"london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status
"lookin" = ps: with ps; [ aiolookin ];
"loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy
"lovelace" = ps: with ps; [ ];
"luci" = ps: with ps; [ openwrt-luci-rpc ];
@ -485,7 +484,6 @@
"lutron" = ps: with ps; [ pylutron ];
"lutron_caseta" = ps: with ps; [ aiolip pylutron-caseta ];
"lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12
"lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides
"lyric" = ps: with ps; [ aiohttp-cors aiolyric ];
"magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed
"mailbox" = ps: with ps; [ aiohttp-cors ];
@ -535,7 +533,7 @@
"mold_indicator" = ps: with ps; [ ];
"monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice
"moon" = ps: with ps; [ ];
"motion_blinds" = ps: with ps; [ ]; # missing inputs: motionblinds
"motion_blinds" = ps: with ps; [ aiohttp-cors ifaddr ]; # missing inputs: motionblinds
"motioneye" = ps: with ps; [ aiohttp-cors motioneye-client ];
"mpchc" = ps: with ps; [ ];
"mpd" = ps: with ps; [ mpd2 ];
@ -561,7 +559,6 @@
"nanoleaf" = ps: with ps; [ aionanoleaf ];
"neato" = ps: with ps; [ aiohttp-cors pybotvac ];
"nederlandse_spoorwegen" = ps: with ps; [ nsapi ];
"nello" = ps: with ps; [ pynello ];
"ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient
"nest" = ps: with ps; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm
"netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyatmo ];
@ -599,7 +596,7 @@
"nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi
"oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics
"obihai" = ps: with ps; [ pyobihai ];
"octoprint" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ];
"octoprint" = ps: with ps; [ ]; # missing inputs: pyoctoprintapi
"oem" = ps: with ps; [ ]; # missing inputs: oemthermostat
"ohmconnect" = ps: with ps; [ defusedxml ];
"ombi" = ps: with ps; [ pyombi ];
@ -826,7 +823,7 @@
"steam_online" = ps: with ps; [ ]; # missing inputs: steamodd
"stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron
"stookalert" = ps: with ps; [ ]; # missing inputs: stookalert
"stream" = ps: with ps; [ aiohttp-cors av ];
"stream" = ps: with ps; [ aiohttp-cors ha-av ];
"streamlabswater" = ps: with ps; [ streamlabswater ];
"stt" = ps: with ps; [ aiohttp-cors ];
"subaru" = ps: with ps; [ subarulink ];
@ -904,7 +901,7 @@
"travisci" = ps: with ps; [ ]; # missing inputs: TravisPy
"trend" = ps: with ps; [ numpy ];
"tts" = ps: with ps; [ aiohttp-cors mutagen ];
"tuya" = ps: with ps; [ tuya-iot-py-sdk ];
"tuya" = ps: with ps; [ ha-ffmpeg tuya-iot-py-sdk ];
"twentemilieu" = ps: with ps; [ twentemilieu ];
"twilio" = ps: with ps; [ aiohttp-cors twilio ];
"twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
@ -948,7 +945,7 @@
"vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek
"vizio" = ps: with ps; [ pyvizio ];
"vlc" = ps: with ps; [ python-vlc ];
"vlc_telnet" = ps: with ps; [ ]; # missing inputs: python-telnet-vlc
"vlc_telnet" = ps: with ps; [ ]; # missing inputs: aiovlc
"voicerss" = ps: with ps; [ ];
"volkszaehler" = ps: with ps; [ volkszaehler ];
"volumio" = ps: with ps; [ pyvolumio ];
@ -973,7 +970,6 @@
"whois" = ps: with ps; [ python-whois ];
"wiffi" = ps: with ps; [ wiffi ];
"wilight" = ps: with ps; [ pywilight ];
"wink" = ps: with ps; [ aiohttp-cors pubnubsub-handler python-wink ];
"wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy
"withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api
"wled" = ps: with ps; [ wled ];

49
pkgs/servers/home-assistant/default.nix
View file

@ -37,19 +37,6 @@ let
# Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
(mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270")
# Pinned due to API changes in aioesphomeapi>=10.0.0
(self: super: {
aioesphomeapi = super.aioesphomeapi.overridePythonAttrs (oldAttrs: rec {
version = "9.1.5";
src = fetchFromGitHub {
owner = "esphome";
repo = "aioesphomeapi";
rev = "v${version}";
sha256 = "sha256-PPag65ZMz9KZEe9FmiB42/DgeM0vJw5L0haAG/jBjqg=";
};
});
})
# Pinned due to API changes in iaqualink>=2.0, remove after
# https://github.com/home-assistant/core/pull/48137 was merged
(self: super: {
@ -107,33 +94,6 @@ let
# Pinned due to API changes in 0.1.0
(mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp")
# Pinned due to missing simpliypy.errors.PendingAuthorizationError in simplisafe-python>12 which results in a failing import
(self: super: {
simplisafe-python = super.simplisafe-python.overridePythonAttrs (oldAttrs: rec {
version = "11.0.7";
src = fetchFromGitHub {
owner = "bachya";
repo = "simplisafe-python";
rev = version;
sha256 = "02nrighkdcd5n9qgbizm9gyfnpgdm4iibw7y8nbyfaxpng069fzp";
};
checkInputs = oldAttrs.checkInputs ++ [ super.aioresponses ];
});
})
# Pinned due to changes in total-connect-client>0.58 which made the tests fails at the moment
(self: super: {
total-connect-client = super.total-connect-client.overridePythonAttrs (oldAttrs: rec {
version = "0.58";
src = fetchFromGitHub {
owner = "craigjmidwinter";
repo = "total-connect-client";
rev = version;
sha256 = "1dqmgvgvwjh235wghygan2jnfvmn9vz789in2as3asig9cifix9z";
};
});
})
# home-assistant-frontend does not exist in python3.pkgs
(self: super: {
home-assistant-frontend = self.callPackage ./frontend.nix { };
@ -167,7 +127,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.10.7";
hassVersion = "2021.11.0";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -184,7 +144,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "1kibny2hd91c011bv7g46sn5q9fg6wmrbwzwckwa737d6gj27c1y";
sha256 = "1bhm2ahc9fvh3czhfim3la0vdwdis2r86fa0qldqpnh11v25hb2s";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@ -195,8 +155,8 @@ in with py.pkgs; buildPythonApplication rec {
postPatch = ''
substituteInPlace setup.py \
--replace "bcrypt==3.1.7" "bcrypt" \
--replace "jinja2==3.0.1" "jinja2" \
--replace "pip>=8.0.3,<20.3" "pip" \
--replace "pyyaml==6.0" "pyyaml" \
--replace "yarl==1.6.3" "yarl==1.7.0"
substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
'';
@ -237,9 +197,12 @@ in with py.pkgs; buildPythonApplication rec {
checkInputs = [
# test infrastructure (selectively from requirement_test.txt)
freezegun
pytest-aiohttp
pytest-freezegun
pytest-mock
pytest-rerunfailures
pytest-socket
pytest-xdist
pytestCheckHook
requests-mock

4
pkgs/servers/home-assistant/frontend.nix
View file

@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20211007.1";
version = "20211103.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-wsDNLwzhpwH5vwdHRWhZGlumjFM8/S+kXProbD+VpE8=";
sha256 = "sha256-gny97mYHNwQ8KderebfLALCbIyddbwRoD5Ux6ahDdVk=";
};
# there is nothing to strip in this package

4
pkgs/shells/oksh/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "oksh";
version = "6.9";
version = "7.0";
src = fetchFromGitHub {
owner = "ibara";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-b5b6xYqlmjWAT8kTq6YraVLawV/k3ugHZUjXD1LJyhs=";
sha256 = "sha256-076nD0aPps6n5qkR3LQJ6Kn2g3mkov+/M0qSvxNLZ6o=";
};
meta = with lib; {

5
pkgs/tools/misc/coreutils/default.nix
View file

@ -33,10 +33,7 @@ stdenv.mkDerivation (rec {
./fix-chmod-exit-code.patch
# Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51433
./disable-seek-hole.patch
] ++ optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch
# fix gnulib tests on 32-bit ARM. Included on coreutils master.
# https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html
++ optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch;
] ++ optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
postPatch = ''
# The test tends to fail on btrfs,f2fs and maybe other unusual filesystems.

45
pkgs/tools/misc/coreutils/fix-gnulib-tests-arm.patch
View file

@ -1,45 +0,0 @@
>From 175e0bc72808d564074c4adcc72aeadb74adfcc6 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 27 Aug 2020 17:52:58 -0700
Subject: [PATCH] perror, strerror_r: remove unportable tests
Problem reported by Florian Weimer in:
https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html
* tests/test-perror2.c (main):
* tests/test-strerror_r.c (main): Omit unportable tests.
---
tests/test-perror2.c | 3 ---
tests/test-strerror_r.c | 3 ---
2 files changed, 6 deletions(-)
diff --git a/gnulib-tests/test-perror2.c b/gnulib-tests/test-perror2.c
index 1d14eda7b..c6214dd25 100644
--- a/gnulib-tests/test-perror2.c
+++ b/gnulib-tests/test-perror2.c
@@ -79,9 +79,6 @@ main (void)
errno = -5;
perror ("");
ASSERT (!ferror (stderr));
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
ASSERT (STREQ (msg4, str4));
free (str1);
diff --git a/gnulib-tests/test-strerror_r.c b/gnulib-tests/test-strerror_r.c
index b11d6fd9f..c1dbcf837 100644
--- a/gnulib-tests/test-strerror_r.c
+++ b/gnulib-tests/test-strerror_r.c
@@ -165,9 +165,6 @@ main (void)
strerror_r (EACCES, buf, sizeof buf);
strerror_r (-5, buf, sizeof buf);
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
ASSERT (STREQ (msg4, str4));
free (str1);
--
2.17.1

4
pkgs/tools/misc/nms/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nms";
version = "0.3.3";
version = "1.0.1";
src = fetchFromGitHub {
owner = "bartobri";
repo = "no-more-secrets";
rev = "v${version}";
sha256 = "1zfv4qabikf8w9winsr4brxrdvs3f0d7xvydksyx8bydadsm2v2h";
sha256 = "sha256-QVCEpplsZCSQ+Fq1LBtCuPBvnzgLsmLcSrxR+e4nA5I=";
};
buildFlags = [ "nms" "sneakers" ];

15
pkgs/tools/misc/swaglyrics/default.nix
View file

@ -2,13 +2,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "swaglyrics";
version = "1.2.2";
version = "unstable-2021-06-17";
src = fetchFromGitHub {
owner = "SwagLyrics";
repo = "SwagLyrics-For-Spotify";
rev = "v${version}";
sha256 = "1dwj9fpyhqqpm2z3imp8hfribkzxya891shh77yg77rc2xghp7mh";
rev = "99fe764a9e45cac6cb9fcdf724c7d2f8cb4524fb";
sha256 = "sha256-O48T1WsUIVnNQb8gmzSkFFHTOiFOKVSAEYhF9zUqZz0=";
};
propagatedBuildInputs = with python3.pkgs; [
@ -17,10 +17,9 @@ python3.pkgs.buildPythonApplication rec {
preConfigure = ''
substituteInPlace setup.py \
--replace 'requests>=2.24.0' 'requests~=2.23' \
--replace 'beautifulsoup4==4.9.1' 'beautifulsoup4~=4.9' \
--replace 'colorama==0.4.3' 'colorama~=0.4' \
--replace 'unidecode==1.1.1' 'unidecode~=1.2'
--replace 'beautifulsoup4==4.9.3' 'beautifulsoup4>=4.9.3' \
--replace 'unidecode==1.2.0' 'unidecode>=1.2.0' \
--replace 'flask==2.0.1' 'flask>=2.0.1'
'';
preBuild = "export HOME=$NIX_BUILD_TOP";
@ -43,6 +42,6 @@ python3.pkgs.buildPythonApplication rec {
homepage = "https://github.com/SwagLyrics/SwagLyrics-For-Spotify";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

6
pkgs/tools/package-management/nix-du/default.nix
View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "nix-du";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "symphorien";
repo = "nix-du";
rev = "v${version}";
sha256 = "0nl451xfby8krxl2wyn91mm0rvacj1718qbqw6k56dwsqlnnxmx0";
sha256 = "0v6hixj81aa6g3sddny46i0yqaaqv6krp5xadj0xz1g77cb8xy2w";
};
cargoSha256 = "0swdlp3qdisr8gxihg5syplzssggx9avmdb2w70056436046gs1r";
cargoSha256 = "11jaks6adsvrvxlqqw3glvn4ff7xh9j35ayfrl89rb4achvqp7xn";
doCheck = true;
checkInputs = [ nix graphviz ];

4
pkgs/tools/security/nwipe/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "nwipe";
version = "0.31";
version = "0.32";
src = fetchFromGitHub {
owner = "martijnvanbrummelen";
repo = "nwipe";
rev = "v${version}";
sha256 = "sha256-+xwQLjl0jhven6udfCprRKW8qWM6JMh5MOZ+ZdaJWQg=";
sha256 = "sha256-O3kYiai+5KMHWd2om4+HrTIw9lB2wLJF3Mrr6iY2+I8=";
};
nativeBuildInputs = [

6
pkgs/top-level/python-packages.nix
View file

@ -2719,6 +2719,8 @@ in {
flake8 = callPackage ../development/python-modules/flake8 { };
flake8-length = callPackage ../development/python-modules/flake8-length { };
flake8-debugger = callPackage ../development/python-modules/flake8-debugger { };
flake8-future-import = callPackage ../development/python-modules/flake8-future-import { };
@ -3428,6 +3430,8 @@ in {
hdate = callPackage ../development/python-modules/hdate { };
ha-av = callPackage ../development/python-modules/ha-av { };
ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { };
ha-philipsjs = callPackage ../development/python-modules/ha-philipsjs{ };
@ -8523,7 +8527,7 @@ in {
simplekml = callPackage ../development/python-modules/simplekml { };
simple_di = callPackage ../development/python-modules/simple_di { };
simple-di = callPackage ../development/python-modules/simple_di { };
simple-rest-client = callPackage ../development/python-modules/simple-rest-client { };

2
pkgs/top-level/qt5-packages.nix
View file

@ -136,6 +136,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
libqtav = callPackage ../development/libraries/libqtav { };
libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { };
kpmcore = callPackage ../development/libraries/kpmcore { };
mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { };