lol

Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
7516a2e1 3e337de0

+221 -171
+4
maintainers/maintainer-list.nix
··· 159 }; 160 abbe = { 161 email = "ashish.is@lostca.se"; 162 github = "wahjava"; 163 githubId = 2255192; 164 name = "Ashish SHUKLA"; ··· 1663 }; 1664 bryanasdev000 = { 1665 email = "bryanasdev000@gmail.com"; 1666 github = "bryanasdev000"; 1667 githubId = 53131727; 1668 name = "Bryan Albuquerque"; ··· 7699 mohe2015 = { 7700 name = "Moritz Hedtke"; 7701 email = "Moritz.Hedtke@t-online.de"; 7702 github = "mohe2015"; 7703 githubId = 13287984; 7704 keys = [{ ··· 8686 }; 8687 pamplemousse = { 8688 email = "xav.maso@gmail.com"; 8689 github = "Pamplemousse"; 8690 githubId = 2647236; 8691 name = "Xavier Maso";
··· 159 }; 160 abbe = { 161 email = "ashish.is@lostca.se"; 162 + matrix = "@abbe:badti.me"; 163 github = "wahjava"; 164 githubId = 2255192; 165 name = "Ashish SHUKLA"; ··· 1664 }; 1665 bryanasdev000 = { 1666 email = "bryanasdev000@gmail.com"; 1667 + matrix = "@bryanasdev000:matrix.org"; 1668 github = "bryanasdev000"; 1669 githubId = 53131727; 1670 name = "Bryan Albuquerque"; ··· 7701 mohe2015 = { 7702 name = "Moritz Hedtke"; 7703 email = "Moritz.Hedtke@t-online.de"; 7704 + matrix = "@moritz.hedtke:matrix.org"; 7705 github = "mohe2015"; 7706 githubId = 13287984; 7707 keys = [{ ··· 8689 }; 8690 pamplemousse = { 8691 email = "xav.maso@gmail.com"; 8692 + matrix = "@pamplemouss_:matrix.org"; 8693 github = "Pamplemousse"; 8694 githubId = 2647236; 8695 name = "Xavier Maso";
+2 -2
nixos/tests/elk.nix
··· 220 ''; 221 }) { inherit pkgs system; }; 222 in { 223 - ELK-6 = mkElkTest { 224 name = "elk-6-oss"; 225 elasticsearch = pkgs.elasticsearch6-oss; 226 logstash = pkgs.logstash6-oss; ··· 230 }; 231 # We currently only package upstream binaries. 232 # Feel free to package an SSPL licensed source-based package! 233 - # ELK-7 = mkElkTest { 234 # name = "elk-7"; 235 # elasticsearch = pkgs.elasticsearch7-oss; 236 # logstash = pkgs.logstash7-oss;
··· 220 ''; 221 }) { inherit pkgs system; }; 222 in { 223 + ELK-6 = mkElkTest "elk-6-oss" { 224 name = "elk-6-oss"; 225 elasticsearch = pkgs.elasticsearch6-oss; 226 logstash = pkgs.logstash6-oss; ··· 230 }; 231 # We currently only package upstream binaries. 232 # Feel free to package an SSPL licensed source-based package! 233 + # ELK-7 = mkElkTest "elk-7-oss" { 234 # name = "elk-7"; 235 # elasticsearch = pkgs.elasticsearch7-oss; 236 # logstash = pkgs.logstash7-oss;
+2 -2
pkgs/applications/audio/praat/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "praat"; 5 - version = "6.1.53"; 6 7 src = fetchFromGitHub { 8 owner = "praat"; 9 repo = "praat"; 10 rev = "v${version}"; 11 - sha256 = "sha256-4GOVrKVHl/Cj0PNx+rcLESn5fbyIsnzaheMOFLlEVMU="; 12 }; 13 14 configurePhase = ''
··· 2 3 stdenv.mkDerivation rec { 4 pname = "praat"; 5 + version = "6.1.55"; 6 7 src = fetchFromGitHub { 8 owner = "praat"; 9 repo = "praat"; 10 rev = "v${version}"; 11 + sha256 = "sha256-PQVbrohIlmzKcG/8TzOBgyQWWaMH88voMNWAqEfyUWI="; 12 }; 13 14 configurePhase = ''
+2 -2
pkgs/applications/science/biology/picard-tools/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "picard-tools"; 5 - version = "2.26.3"; 6 7 src = fetchurl { 8 url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; 9 - sha256 = "sha256-H7VgD75tmAEd01Pj1o6BNT0QaXhd1pUIpAFmKM6OUlo="; 10 }; 11 12 nativeBuildInputs = [ makeWrapper ];
··· 2 3 stdenv.mkDerivation rec { 4 pname = "picard-tools"; 5 + version = "2.26.4"; 6 7 src = fetchurl { 8 url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; 9 + sha256 = "sha256-KVOQuqudne0SAdgFEft/lTuoDn9vcpuDtMAafztYvPo="; 10 }; 11 12 nativeBuildInputs = [ makeWrapper ];
+2 -2
pkgs/applications/science/logic/opensmt/default.nix
··· 6 7 stdenv.mkDerivation rec { 8 pname = "opensmt"; 9 - version = "2.1.1"; 10 11 src = fetchFromGitHub { 12 owner = "usi-verification-and-security"; 13 repo = "opensmt"; 14 rev = "v${version}"; 15 - sha256 = "sha256-StnEvkSSKDHGYXIQsDUu9T9Ztl+RtDTP47JvnRyH0bE="; 16 }; 17 18 nativeBuildInputs = [ cmake bison flex ];
··· 6 7 stdenv.mkDerivation rec { 8 pname = "opensmt"; 9 + version = "2.2.0"; 10 11 src = fetchFromGitHub { 12 owner = "usi-verification-and-security"; 13 repo = "opensmt"; 14 rev = "v${version}"; 15 + sha256 = "sha256-6VkBGDzqG3mplpvFh5DIR0I1I2/J0Pi7xYk/yVn04Kg="; 16 }; 17 18 nativeBuildInputs = [ cmake bison flex ];
+2 -2
pkgs/desktops/plasma-5/kwin/default.nix
··· 12 kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, 13 kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, 14 krunner, kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons, 15 - kwindowsystem, kxmlgui, plasma-framework, 16 }: 17 18 # TODO (ttuegel): investigate qmlplugindump failure ··· 31 kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes 32 kidletime kinit kio knewstuff knotifications kpackage krunner kscreenlocker 33 kservice kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui 34 - plasma-framework 35 36 ]; 37 outputs = [ "dev" "out" ];
··· 12 kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, 13 kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, 14 krunner, kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons, 15 + kwindowsystem, kxmlgui, plasma-framework, libqaccessibilityclient, 16 }: 17 18 # TODO (ttuegel): investigate qmlplugindump failure ··· 31 kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes 32 kidletime kinit kio knewstuff knotifications kpackage krunner kscreenlocker 33 kservice kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui 34 + plasma-framework libqaccessibilityclient 35 36 ]; 37 outputs = [ "dev" "out" ];
+26
pkgs/development/libraries/libqaccessibilityclient/default.nix
···
··· 1 + { lib, stdenv, fetchurl, cmake, qtbase, extra-cmake-modules }: 2 + 3 + stdenv.mkDerivation rec { 4 + pname = "libqaccessibilityclient"; 5 + version = "0.4.1"; 6 + 7 + src = fetchurl { 8 + url = "mirror://kde/stable/libqaccessibilityclient/libqaccessibilityclient-${version}.tar.xz"; 9 + sha256 = "sha256-HHaLT0MU/K4qB8t958sq4FIrXwK0Fzrz7ti/sqTYNCk="; 10 + }; 11 + 12 + nativeBuildInputs = [ cmake extra-cmake-modules ]; 13 + buildInputs = [ qtbase ]; 14 + 15 + outputs = [ "out" "dev" ]; 16 + 17 + dontWrapQtApps = true; 18 + 19 + meta = with lib; { 20 + description = "Accessibilty tools helper library, used e.g. by screen readers"; 21 + homepage = "https://github.com/KDE/libqaccessibilityclient"; 22 + maintainers = with maintainers; [ artturin ]; 23 + license = with licenses; [ lgpl3Only /* or */ lgpl21Only ]; 24 + platforms = platforms.linux; 25 + }; 26 + }
+2 -2
pkgs/development/libraries/py3c/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "py3c"; 5 - version = "1.3.1"; 6 7 src = fetchFromGitHub { 8 owner = "encukou"; 9 repo = pname; 10 rev = "v${version}"; 11 - sha256 = "04i2z7hrig78clc59q3i1z2hh24g7z1bfvxznlzxv00d4s57nhpi"; 12 }; 13 14 postPatch = ''
··· 2 3 stdenv.mkDerivation rec { 4 pname = "py3c"; 5 + version = "1.4"; 6 7 src = fetchFromGitHub { 8 owner = "encukou"; 9 repo = pname; 10 rev = "v${version}"; 11 + sha256 = "sha256-v8+0J56sZVbGdBlOotObUa10/zFMTvfXdMYRsKhyZaY="; 12 }; 13 14 postPatch = ''
+11 -5
pkgs/development/python-modules/aioambient/default.nix
··· 16 17 buildPythonPackage rec { 18 pname = "aioambient"; 19 - version = "1.3.0"; 20 format = "pyproject"; 21 - disabled = pythonOlder "3.6"; 22 23 src = fetchFromGitHub { 24 owner = "bachya"; 25 repo = pname; 26 rev = version; 27 - sha256 = "sha256-blejTXyLe3B2kNytBh+zJz0Q0xDP+Vo2SV9gc7OX6S0="; 28 }; 29 30 postPatch = '' 31 substituteInPlace pyproject.toml \ 32 --replace 'websockets = ">=8.1,<10.0"' 'websockets = ">=8.1,<11.0"' 33 ''; ··· 52 ]; 53 54 # Ignore the examples directory as the files are prefixed with test_ 55 - disabledTestPaths = [ "examples/" ]; 56 57 - pythonImportsCheck = [ "aioambient" ]; 58 59 meta = with lib; { 60 description = "Python library for the Ambient Weather API";
··· 16 17 buildPythonPackage rec { 18 pname = "aioambient"; 19 + version = "2021.10.1"; 20 format = "pyproject"; 21 + 22 + disabled = pythonOlder "3.7"; 23 24 src = fetchFromGitHub { 25 owner = "bachya"; 26 repo = pname; 27 rev = version; 28 + sha256 = "sha256-DCh/o7p+lO5BhN3JoLdhImkzfxoyqiscA/6CwwvAnc0="; 29 }; 30 31 postPatch = '' 32 + # https://github.com/bachya/aioambient/pull/97 33 substituteInPlace pyproject.toml \ 34 --replace 'websockets = ">=8.1,<10.0"' 'websockets = ">=8.1,<11.0"' 35 ''; ··· 54 ]; 55 56 # Ignore the examples directory as the files are prefixed with test_ 57 + disabledTestPaths = [ 58 + "examples/" 59 + ]; 60 61 + pythonImportsCheck = [ 62 + "aioambient" 63 + ]; 64 65 meta = with lib; { 66 description = "Python library for the Ambient Weather API";
+2 -2
pkgs/development/python-modules/aioesphomeapi/default.nix
··· 12 13 buildPythonPackage rec { 14 pname = "aioesphomeapi"; 15 - version = "10.0.3"; 16 format = "setuptools"; 17 18 disabled = pythonOlder "3.7"; ··· 21 owner = "esphome"; 22 repo = pname; 23 rev = "v${version}"; 24 - sha256 = "sha256-9K67vmPaPSR6ODl3tpwwfRMY9DDD/2cCaDRRO38mHVU="; 25 }; 26 27 propagatedBuildInputs = [
··· 12 13 buildPythonPackage rec { 14 pname = "aioesphomeapi"; 15 + version = "10.2.0"; 16 format = "setuptools"; 17 18 disabled = pythonOlder "3.7"; ··· 21 owner = "esphome"; 22 repo = pname; 23 rev = "v${version}"; 24 + sha256 = "sha256-SUM9P7qmP3LWANw8LiwMsT5sN1kZJvqeaBT/ZDmTtwE="; 25 }; 26 27 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/awesomeversion/default.nix
··· 8 9 buildPythonPackage rec { 10 pname = "awesomeversion"; 11 - version = "21.8.1"; 12 disabled = pythonOlder "3.8"; 13 14 src = fetchFromGitHub { 15 owner = "ludeeus"; 16 repo = pname; 17 rev = version; 18 - sha256 = "sha256-eyo0dzmExJ7WCRAXFvB+ElWi5HTTzJ7XJsmxB2t6yfI="; 19 }; 20 21 postPatch = ''
··· 8 9 buildPythonPackage rec { 10 pname = "awesomeversion"; 11 + version = "21.10.1"; 12 disabled = pythonOlder "3.8"; 13 14 src = fetchFromGitHub { 15 owner = "ludeeus"; 16 repo = pname; 17 rev = version; 18 + sha256 = "sha256-y+QU8T1Cb6FpRcRqhao4KPdE9XlU5C+GURaEuahC25E="; 19 }; 20 21 postPatch = ''
+37
pkgs/development/python-modules/flake8-length/default.nix
···
··· 1 + { lib 2 + , buildPythonPackage 3 + , pythonOlder 4 + , flake8 5 + , pytestCheckHook 6 + , fetchPypi 7 + }: 8 + 9 + buildPythonPackage rec { 10 + pname = "flake8-length"; 11 + version = "0.2.0"; 12 + disabled = pythonOlder "3.6"; 13 + 14 + src = fetchPypi { 15 + inherit pname version; 16 + sha256 = "15frvccm1qx783jlx8fw811ks9jszln3agbb58lg4dhbmjaf2cxw"; 17 + }; 18 + 19 + propagatedBuildInputs = [ 20 + flake8 21 + ]; 22 + 23 + pythonImportsCheck = [ 24 + "flake8_length" 25 + ]; 26 + 27 + checkInputs = [ pytestCheckHook ]; 28 + 29 + pytestFlagsArray = [ "tests/" ]; 30 + 31 + meta = { 32 + description = "Flake8 plugin for a smart line length validation"; 33 + homepage = "https://github.com/orsinium-labs/flake8-length"; 34 + license = lib.licenses.mit; 35 + maintainers = with lib.maintainers; [ sauyon ]; 36 + }; 37 + }
+2 -2
pkgs/development/python-modules/greeclimate/default.nix
··· 10 11 buildPythonPackage rec { 12 pname = "greeclimate"; 13 - version = "0.12.1"; 14 15 disabled = pythonOlder "3.6"; 16 ··· 18 owner = "cmroche"; 19 repo = "greeclimate"; 20 rev = version; 21 - sha256 = "sha256-HO+JBlyRFkwijR3g75P7yOabK3LhNFFYevSn/aFStUE="; 22 }; 23 24 propagatedBuildInputs = [
··· 10 11 buildPythonPackage rec { 12 pname = "greeclimate"; 13 + version = "0.12.3"; 14 15 disabled = pythonOlder "3.6"; 16 ··· 18 owner = "cmroche"; 19 repo = "greeclimate"; 20 rev = version; 21 + sha256 = "sha256-7O21/eL/CcQmENJTGKfZCHjZcRN3pwuWZrmMMX3YPAg="; 22 }; 23 24 propagatedBuildInputs = [
+46
pkgs/development/python-modules/ha-av/default.nix
···
··· 1 + { lib 2 + , buildPythonPackage 3 + , pythonOlder 4 + , fetchPypi 5 + , pkg-config 6 + , ffmpeg 7 + , numpy 8 + , pytestCheckHook 9 + , python 10 + }: 11 + 12 + buildPythonPackage rec { 13 + pname = "ha-av"; 14 + version = "8.0.4rc1"; 15 + format = "setuptools"; 16 + 17 + disabled = pythonOlder "3.5"; 18 + 19 + src = fetchPypi { 20 + inherit pname version; 21 + sha256 = "sha256-txdi2/X6upqrACeHhHpEh4tGqgPpW/dyWda8y++7c3M="; 22 + }; 23 + 24 + nativeBuildInputs = [ 25 + pkg-config 26 + ]; 27 + 28 + buildInputs = [ 29 + ffmpeg 30 + ]; 31 + 32 + pythonImportsCheck = [ 33 + "av" 34 + "av._core" 35 + ]; 36 + 37 + # tests fail to import av._core 38 + doCheck = false; 39 + 40 + meta = with lib; { 41 + homepage = "https://pypi.org/project/ha-av/"; 42 + description = "Pythonic bindings for FFmpeg's libraries"; 43 + license = licenses.bsd3; 44 + maintainers = with maintainers; [ hexa ]; 45 + }; 46 + }
+2 -2
pkgs/development/python-modules/pyefergy/default.nix
··· 10 11 buildPythonPackage rec { 12 pname = "pyefergy"; 13 - version = "0.1.0"; 14 format = "setuptools"; 15 16 disabled = pythonOlder "3.8"; ··· 19 owner = "tkdrob"; 20 repo = pname; 21 rev = version; 22 - sha256 = "0nm7dc5q4wvdpqxpirlc4nwm68lf3n2df6j5yy4m8wr294yb7a1k"; 23 }; 24 25 propagatedBuildInputs = [
··· 10 11 buildPythonPackage rec { 12 pname = "pyefergy"; 13 + version = "0.1.3"; 14 format = "setuptools"; 15 16 disabled = pythonOlder "3.8"; ··· 19 owner = "tkdrob"; 20 repo = pname; 21 rev = version; 22 + sha256 = "sha256-TGvS/ntIRbkcMsD5y0QdqyLE2dcPUbX3d79jHc3ddd0="; 23 }; 24 25 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/pylitterbot/default.nix
··· 11 12 buildPythonPackage rec { 13 pname = "pylitterbot"; 14 - version = "2021.9.0"; 15 disabled = pythonOlder "3.6"; 16 17 src = fetchFromGitHub { 18 owner = "natekspencer"; 19 repo = pname; 20 rev = version; 21 - sha256 = "sha256-S25x9k6vBwnmJq15y5PVUWaTujT9UNHvgIX9uH+N8dY="; 22 }; 23 24 propagatedBuildInputs = [
··· 11 12 buildPythonPackage rec { 13 pname = "pylitterbot"; 14 + version = "2021.10.1"; 15 disabled = pythonOlder "3.6"; 16 17 src = fetchFromGitHub { 18 owner = "natekspencer"; 19 repo = pname; 20 rev = version; 21 + sha256 = "sha256-xE+H23AZR1OXfuLMvSuI7IeYKX7k2iEATHq5VheMLn4="; 22 }; 23 24 propagatedBuildInputs = [
+9 -2
pkgs/development/python-modules/simple_di/default.nix
··· 8 }: 9 10 buildPythonPackage rec { 11 - version = "0.1.2"; 12 pname = "simple_di"; 13 - disabled = pythonOlder "3.6.1"; 14 15 src = fetchPypi { 16 inherit pname version; ··· 23 ] ++ lib.optional (pythonOlder "3.7") [ 24 dataclasses 25 ]; 26 27 meta = { 28 description = "Simple dependency injection library";
··· 8 }: 9 10 buildPythonPackage rec { 11 pname = "simple_di"; 12 + version = "0.1.2"; 13 + disabled = pythonOlder "3.6"; 14 15 src = fetchPypi { 16 inherit pname version; ··· 23 ] ++ lib.optional (pythonOlder "3.7") [ 24 dataclasses 25 ]; 26 + 27 + pythonImportsCheck = [ 28 + "simple_di" 29 + ]; 30 + 31 + # pypi distribution contains no tests 32 + doCheck = false; 33 34 meta = { 35 description = "Simple dependency injection library";
+2 -2
pkgs/development/python-modules/simplisafe-python/default.nix
··· 18 19 buildPythonPackage rec { 20 pname = "simplisafe-python"; 21 - version = "12.0.2"; 22 format = "pyproject"; 23 disabled = pythonOlder "3.7"; 24 ··· 26 owner = "bachya"; 27 repo = pname; 28 rev = version; 29 - sha256 = "sha256-/KnDsnx+Jrirj6uBkdao6PI2jhtzKqDK6cmmQgsO5T4="; 30 }; 31 32 nativeBuildInputs = [ poetry-core ];
··· 18 19 buildPythonPackage rec { 20 pname = "simplisafe-python"; 21 + version = "2021.10.0"; 22 format = "pyproject"; 23 disabled = pythonOlder "3.7"; 24 ··· 26 owner = "bachya"; 27 repo = pname; 28 rev = version; 29 + sha256 = "sha256-J0uMlczR7y5wDchaOjp5d3Vf36WfRmt7d51koGiNHBk="; 30 }; 31 32 nativeBuildInputs = [ poetry-core ];
+9 -3
pkgs/development/python-modules/spiderpy/default.nix
··· 2 , buildPythonPackage 3 , isPy27 4 , fetchFromGitHub 5 , requests 6 }: 7 8 buildPythonPackage rec { 9 pname = "spiderpy"; 10 - version = "1.5.0"; 11 12 disabled = isPy27; 13 ··· 15 owner = "peternijssen"; 16 repo = "spiderpy"; 17 rev = version; 18 - sha256 = "1nbfjqwiyyl7lhkb4rvickxiy9nwynr2sxr1hpyv0vm09h6q8hsc"; 19 }; 20 21 propagatedBuildInputs = [ 22 requests 23 ]; 24 25 - # no unit tests implemented 26 doCheck = false; 27 28 pythonImportsCheck = [ "spiderpy.spiderapi" ];
··· 2 , buildPythonPackage 3 , isPy27 4 , fetchFromGitHub 5 + , poetry-core 6 , requests 7 }: 8 9 buildPythonPackage rec { 10 pname = "spiderpy"; 11 + version = "1.7.1"; 12 + format = "pyproject"; 13 14 disabled = isPy27; 15 ··· 17 owner = "peternijssen"; 18 repo = "spiderpy"; 19 rev = version; 20 + sha256 = "sha256-gQ/Y5c8+aSvoJzXI6eQ9rk0xDPxpi0xgO3xBKR+vVrY="; 21 }; 22 23 + nativeBuildInputs = [ 24 + poetry-core 25 + ]; 26 + 27 propagatedBuildInputs = [ 28 requests 29 ]; 30 31 + # tests don't mock remote resources 32 doCheck = false; 33 34 pythonImportsCheck = [ "spiderpy.spiderapi" ];
+10 -8
pkgs/development/python-modules/swspotify/default.nix
··· 1 - { lib, buildPythonPackage, fetchFromGitHub, requests, flask-cors, dbus-python, pytestCheckHook, mock, isPy27 }: 2 3 buildPythonPackage rec { 4 pname = "SwSpotify"; 5 - version = "1.2.1"; 6 disabled = isPy27; 7 8 src = fetchFromGitHub { 9 owner = "SwagLyrics"; 10 repo = "SwSpotify"; 11 rev = "v${version}"; 12 - sha256 = "0jxcvy8lw8kpjbl4q6mi11164pvi0w9m9p76bxj2m7i7s5p4dxd4"; 13 }; 14 15 propagatedBuildInputs = [ 16 - requests flask-cors dbus-python 17 ]; 18 19 preConfigure = '' 20 substituteInPlace setup.py \ 21 - --replace 'requests>=2.24.0' 'requests~=2.23' \ 22 - --replace 'flask-cors==3.0.8' 'flask-cors' 23 ''; 24 25 checkPhase = '' 26 - pytest tests/test_spotify.py::LinuxTests 27 ''; 28 29 checkInputs = [ pytestCheckHook mock ]; ··· 35 description = "Library to get the currently playing song and artist from Spotify"; 36 license = licenses.mit; 37 maintainers = with maintainers; [ siraben ]; 38 - platforms = platforms.linux; 39 }; 40 }
··· 1 + { lib, stdenv, buildPythonPackage, fetchFromGitHub, poetry-core, requests 2 + , pytestCheckHook, flask, flask-cors, dbus-python, mock, isPy27 }: 3 4 buildPythonPackage rec { 5 pname = "SwSpotify"; 6 + version = "1.2.2"; 7 disabled = isPy27; 8 9 src = fetchFromGitHub { 10 owner = "SwagLyrics"; 11 repo = "SwSpotify"; 12 rev = "v${version}"; 13 + sha256 = "sha256-571knnY8LegIbqyPeKUfl+d0suTWAMQHYLN7edKFNdI="; 14 }; 15 16 propagatedBuildInputs = [ 17 + requests flask flask-cors dbus-python 18 ]; 19 20 preConfigure = '' 21 substituteInPlace setup.py \ 22 + --replace 'flask==2.0.1' 'flask' 23 ''; 24 25 + doCheck = !stdenv.isDarwin; 26 + 27 checkPhase = '' 28 + pytest tests/test_spotify.py::${if stdenv.isDarwin then "DarwinTests" else "LinuxTests"} 29 ''; 30 31 checkInputs = [ pytestCheckHook mock ]; ··· 37 description = "Library to get the currently playing song and artist from Spotify"; 38 license = licenses.mit; 39 maintainers = with maintainers; [ siraben ]; 40 + platforms = platforms.unix; 41 }; 42 }
+2 -2
pkgs/development/python-modules/xknx/default.nix
··· 11 12 buildPythonPackage rec { 13 pname = "xknx"; 14 - version = "0.18.9"; 15 disabled = pythonOlder "3.7"; 16 17 src = fetchFromGitHub { 18 owner = "XKNX"; 19 repo = pname; 20 rev = version; 21 - sha256 = "1dw1dqhd790wsa6v7bpcv921zf1y544ry7drwcfdcmprsm7hs42j"; 22 }; 23 24 propagatedBuildInputs = [
··· 11 12 buildPythonPackage rec { 13 pname = "xknx"; 14 + version = "0.18.12"; 15 disabled = pythonOlder "3.7"; 16 17 src = fetchFromGitHub { 18 owner = "XKNX"; 19 repo = pname; 20 rev = version; 21 + sha256 = "sha256-Wk6+IRIGMaOPOEVEyzalBKyK88Y2yfKKo6T0fKxeOOE="; 22 }; 23 24 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/zeroconf/default.nix
··· 10 11 buildPythonPackage rec { 12 pname = "zeroconf"; 13 - version = "0.36.9"; 14 format = "setuptools"; 15 disabled = pythonOlder "3.6"; 16 ··· 19 owner = "jstasiak"; 20 repo = "python-zeroconf"; 21 rev = version; 22 - sha256 = "sha256-V2AiKmL3laA6Kd2lOXZ7f+7L08zMtDfvhLxayylp1CQ="; 23 }; 24 25 propagatedBuildInputs = [
··· 10 11 buildPythonPackage rec { 12 pname = "zeroconf"; 13 + version = "0.36.11"; 14 format = "setuptools"; 15 disabled = pythonOlder "3.6"; 16 ··· 19 owner = "jstasiak"; 20 repo = "python-zeroconf"; 21 rev = version; 22 + sha256 = "sha256-MGaikOO4vdBRCR+jYHr38FGOdg2rjypK5z0UY5lThY4="; 23 }; 24 25 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/zha-quirks/default.nix
··· 9 10 buildPythonPackage rec { 11 pname = "zha-quirks"; 12 - version = "0.0.62"; 13 14 src = fetchFromGitHub { 15 owner = "zigpy"; 16 repo = "zha-device-handlers"; 17 rev = version; 18 - sha256 = "sha256-wXXdxE69EABrvJA8utrhLW4+8ixcyCraWHx2M3uE8mw="; 19 }; 20 21 propagatedBuildInputs = [
··· 9 10 buildPythonPackage rec { 11 pname = "zha-quirks"; 12 + version = "0.0.63"; 13 14 src = fetchFromGitHub { 15 owner = "zigpy"; 16 repo = "zha-device-handlers"; 17 rev = version; 18 + sha256 = "sha256-jAd/qT+uwylE/AOHFnkKWECHnxFFqgCtCp36mrqFZIE="; 19 }; 20 21 propagatedBuildInputs = [
+7 -11
pkgs/servers/home-assistant/component-packages.nix
··· 2 # Do not edit! 3 4 { 5 - version = "2021.10.7"; 6 components = { 7 "abode" = ps: with ps; [ abodepy ]; 8 "accuweather" = ps: with ps; [ accuweather ]; ··· 243 "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter 244 "eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt 245 "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors ifaddr zeroconf ]; 246 - "essent" = ps: with ps; [ ]; # missing inputs: PyEssent 247 "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api 248 "eufy" = ps: with ps; [ ]; # missing inputs: lakeside 249 "everlights" = ps: with ps; [ pyeverlights ]; ··· 379 "http" = ps: with ps; [ aiohttp-cors ]; 380 "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense 381 "huawei_lte" = ps: with ps; [ huawei-lte-api stringcase url-normalize ]; 382 - "huawei_router" = ps: with ps; [ ]; 383 "hue" = ps: with ps; [ aiohue ]; 384 "huisbaasje" = ps: with ps; [ huisbaasje-client ]; 385 "humidifier" = ps: with ps; [ ]; ··· 477 "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle 478 "london_air" = ps: with ps; [ ]; 479 "london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status 480 "loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy 481 "lovelace" = ps: with ps; [ ]; 482 "luci" = ps: with ps; [ openwrt-luci-rpc ]; ··· 485 "lutron" = ps: with ps; [ pylutron ]; 486 "lutron_caseta" = ps: with ps; [ aiolip pylutron-caseta ]; 487 "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 488 - "lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides 489 "lyric" = ps: with ps; [ aiohttp-cors aiolyric ]; 490 "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed 491 "mailbox" = ps: with ps; [ aiohttp-cors ]; ··· 535 "mold_indicator" = ps: with ps; [ ]; 536 "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice 537 "moon" = ps: with ps; [ ]; 538 - "motion_blinds" = ps: with ps; [ ]; # missing inputs: motionblinds 539 "motioneye" = ps: with ps; [ aiohttp-cors motioneye-client ]; 540 "mpchc" = ps: with ps; [ ]; 541 "mpd" = ps: with ps; [ mpd2 ]; ··· 561 "nanoleaf" = ps: with ps; [ aionanoleaf ]; 562 "neato" = ps: with ps; [ aiohttp-cors pybotvac ]; 563 "nederlandse_spoorwegen" = ps: with ps; [ nsapi ]; 564 - "nello" = ps: with ps; [ pynello ]; 565 "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient 566 "nest" = ps: with ps; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm 567 "netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyatmo ]; ··· 599 "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi 600 "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics 601 "obihai" = ps: with ps; [ pyobihai ]; 602 - "octoprint" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; 603 "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat 604 "ohmconnect" = ps: with ps; [ defusedxml ]; 605 "ombi" = ps: with ps; [ pyombi ]; ··· 826 "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd 827 "stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron 828 "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert 829 - "stream" = ps: with ps; [ aiohttp-cors av ]; 830 "streamlabswater" = ps: with ps; [ streamlabswater ]; 831 "stt" = ps: with ps; [ aiohttp-cors ]; 832 "subaru" = ps: with ps; [ subarulink ]; ··· 904 "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy 905 "trend" = ps: with ps; [ numpy ]; 906 "tts" = ps: with ps; [ aiohttp-cors mutagen ]; 907 - "tuya" = ps: with ps; [ tuya-iot-py-sdk ]; 908 "twentemilieu" = ps: with ps; [ twentemilieu ]; 909 "twilio" = ps: with ps; [ aiohttp-cors twilio ]; 910 "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; ··· 948 "vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek 949 "vizio" = ps: with ps; [ pyvizio ]; 950 "vlc" = ps: with ps; [ python-vlc ]; 951 - "vlc_telnet" = ps: with ps; [ ]; # missing inputs: python-telnet-vlc 952 "voicerss" = ps: with ps; [ ]; 953 "volkszaehler" = ps: with ps; [ volkszaehler ]; 954 "volumio" = ps: with ps; [ pyvolumio ]; ··· 973 "whois" = ps: with ps; [ python-whois ]; 974 "wiffi" = ps: with ps; [ wiffi ]; 975 "wilight" = ps: with ps; [ pywilight ]; 976 - "wink" = ps: with ps; [ aiohttp-cors pubnubsub-handler python-wink ]; 977 "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy 978 "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api 979 "wled" = ps: with ps; [ wled ];
··· 2 # Do not edit! 3 4 { 5 + version = "2021.11.0"; 6 components = { 7 "abode" = ps: with ps; [ abodepy ]; 8 "accuweather" = ps: with ps; [ accuweather ]; ··· 243 "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter 244 "eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt 245 "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors ifaddr zeroconf ]; 246 "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api 247 "eufy" = ps: with ps; [ ]; # missing inputs: lakeside 248 "everlights" = ps: with ps; [ pyeverlights ]; ··· 378 "http" = ps: with ps; [ aiohttp-cors ]; 379 "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense 380 "huawei_lte" = ps: with ps; [ huawei-lte-api stringcase url-normalize ]; 381 "hue" = ps: with ps; [ aiohue ]; 382 "huisbaasje" = ps: with ps; [ huisbaasje-client ]; 383 "humidifier" = ps: with ps; [ ]; ··· 475 "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle 476 "london_air" = ps: with ps; [ ]; 477 "london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status 478 + "lookin" = ps: with ps; [ aiolookin ]; 479 "loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy 480 "lovelace" = ps: with ps; [ ]; 481 "luci" = ps: with ps; [ openwrt-luci-rpc ]; ··· 484 "lutron" = ps: with ps; [ pylutron ]; 485 "lutron_caseta" = ps: with ps; [ aiolip pylutron-caseta ]; 486 "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 487 "lyric" = ps: with ps; [ aiohttp-cors aiolyric ]; 488 "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed 489 "mailbox" = ps: with ps; [ aiohttp-cors ]; ··· 533 "mold_indicator" = ps: with ps; [ ]; 534 "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice 535 "moon" = ps: with ps; [ ]; 536 + "motion_blinds" = ps: with ps; [ aiohttp-cors ifaddr ]; # missing inputs: motionblinds 537 "motioneye" = ps: with ps; [ aiohttp-cors motioneye-client ]; 538 "mpchc" = ps: with ps; [ ]; 539 "mpd" = ps: with ps; [ mpd2 ]; ··· 559 "nanoleaf" = ps: with ps; [ aionanoleaf ]; 560 "neato" = ps: with ps; [ aiohttp-cors pybotvac ]; 561 "nederlandse_spoorwegen" = ps: with ps; [ nsapi ]; 562 "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient 563 "nest" = ps: with ps; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm 564 "netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyatmo ]; ··· 596 "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi 597 "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics 598 "obihai" = ps: with ps; [ pyobihai ]; 599 + "octoprint" = ps: with ps; [ ]; # missing inputs: pyoctoprintapi 600 "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat 601 "ohmconnect" = ps: with ps; [ defusedxml ]; 602 "ombi" = ps: with ps; [ pyombi ]; ··· 823 "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd 824 "stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron 825 "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert 826 + "stream" = ps: with ps; [ aiohttp-cors ha-av ]; 827 "streamlabswater" = ps: with ps; [ streamlabswater ]; 828 "stt" = ps: with ps; [ aiohttp-cors ]; 829 "subaru" = ps: with ps; [ subarulink ]; ··· 901 "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy 902 "trend" = ps: with ps; [ numpy ]; 903 "tts" = ps: with ps; [ aiohttp-cors mutagen ]; 904 + "tuya" = ps: with ps; [ ha-ffmpeg tuya-iot-py-sdk ]; 905 "twentemilieu" = ps: with ps; [ twentemilieu ]; 906 "twilio" = ps: with ps; [ aiohttp-cors twilio ]; 907 "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; ··· 945 "vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek 946 "vizio" = ps: with ps; [ pyvizio ]; 947 "vlc" = ps: with ps; [ python-vlc ]; 948 + "vlc_telnet" = ps: with ps; [ ]; # missing inputs: aiovlc 949 "voicerss" = ps: with ps; [ ]; 950 "volkszaehler" = ps: with ps; [ volkszaehler ]; 951 "volumio" = ps: with ps; [ pyvolumio ]; ··· 970 "whois" = ps: with ps; [ python-whois ]; 971 "wiffi" = ps: with ps; [ wiffi ]; 972 "wilight" = ps: with ps; [ pywilight ]; 973 "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy 974 "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api 975 "wled" = ps: with ps; [ wled ];
+6 -43
pkgs/servers/home-assistant/default.nix
··· 37 # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt 38 (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") 39 40 - # Pinned due to API changes in aioesphomeapi>=10.0.0 41 - (self: super: { 42 - aioesphomeapi = super.aioesphomeapi.overridePythonAttrs (oldAttrs: rec { 43 - version = "9.1.5"; 44 - src = fetchFromGitHub { 45 - owner = "esphome"; 46 - repo = "aioesphomeapi"; 47 - rev = "v${version}"; 48 - sha256 = "sha256-PPag65ZMz9KZEe9FmiB42/DgeM0vJw5L0haAG/jBjqg="; 49 - }; 50 - }); 51 - }) 52 - 53 # Pinned due to API changes in iaqualink>=2.0, remove after 54 # https://github.com/home-assistant/core/pull/48137 was merged 55 (self: super: { ··· 107 # Pinned due to API changes in 0.1.0 108 (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") 109 110 - # Pinned due to missing simpliypy.errors.PendingAuthorizationError in simplisafe-python>12 which results in a failing import 111 - (self: super: { 112 - simplisafe-python = super.simplisafe-python.overridePythonAttrs (oldAttrs: rec { 113 - version = "11.0.7"; 114 - src = fetchFromGitHub { 115 - owner = "bachya"; 116 - repo = "simplisafe-python"; 117 - rev = version; 118 - sha256 = "02nrighkdcd5n9qgbizm9gyfnpgdm4iibw7y8nbyfaxpng069fzp"; 119 - }; 120 - checkInputs = oldAttrs.checkInputs ++ [ super.aioresponses ]; 121 - }); 122 - }) 123 - 124 - # Pinned due to changes in total-connect-client>0.58 which made the tests fails at the moment 125 - (self: super: { 126 - total-connect-client = super.total-connect-client.overridePythonAttrs (oldAttrs: rec { 127 - version = "0.58"; 128 - src = fetchFromGitHub { 129 - owner = "craigjmidwinter"; 130 - repo = "total-connect-client"; 131 - rev = version; 132 - sha256 = "1dqmgvgvwjh235wghygan2jnfvmn9vz789in2as3asig9cifix9z"; 133 - }; 134 - }); 135 - }) 136 - 137 # home-assistant-frontend does not exist in python3.pkgs 138 (self: super: { 139 home-assistant-frontend = self.callPackage ./frontend.nix { }; ··· 167 extraBuildInputs = extraPackages py.pkgs; 168 169 # Don't forget to run parse-requirements.py after updating 170 - hassVersion = "2021.10.7"; 171 172 in with py.pkgs; buildPythonApplication rec { 173 pname = "homeassistant"; ··· 184 owner = "home-assistant"; 185 repo = "core"; 186 rev = version; 187 - sha256 = "1kibny2hd91c011bv7g46sn5q9fg6wmrbwzwckwa737d6gj27c1y"; 188 }; 189 190 # leave this in, so users don't have to constantly update their downstream patch handling ··· 195 postPatch = '' 196 substituteInPlace setup.py \ 197 --replace "bcrypt==3.1.7" "bcrypt" \ 198 - --replace "jinja2==3.0.1" "jinja2" \ 199 --replace "pip>=8.0.3,<20.3" "pip" \ 200 --replace "yarl==1.6.3" "yarl==1.7.0" 201 substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' 202 ''; ··· 237 238 checkInputs = [ 239 # test infrastructure (selectively from requirement_test.txt) 240 pytest-aiohttp 241 pytest-mock 242 pytest-rerunfailures 243 pytest-xdist 244 pytestCheckHook 245 requests-mock
··· 37 # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt 38 (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") 39 40 # Pinned due to API changes in iaqualink>=2.0, remove after 41 # https://github.com/home-assistant/core/pull/48137 was merged 42 (self: super: { ··· 94 # Pinned due to API changes in 0.1.0 95 (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") 96 97 # home-assistant-frontend does not exist in python3.pkgs 98 (self: super: { 99 home-assistant-frontend = self.callPackage ./frontend.nix { }; ··· 127 extraBuildInputs = extraPackages py.pkgs; 128 129 # Don't forget to run parse-requirements.py after updating 130 + hassVersion = "2021.11.0"; 131 132 in with py.pkgs; buildPythonApplication rec { 133 pname = "homeassistant"; ··· 144 owner = "home-assistant"; 145 repo = "core"; 146 rev = version; 147 + sha256 = "1bhm2ahc9fvh3czhfim3la0vdwdis2r86fa0qldqpnh11v25hb2s"; 148 }; 149 150 # leave this in, so users don't have to constantly update their downstream patch handling ··· 155 postPatch = '' 156 substituteInPlace setup.py \ 157 --replace "bcrypt==3.1.7" "bcrypt" \ 158 --replace "pip>=8.0.3,<20.3" "pip" \ 159 + --replace "pyyaml==6.0" "pyyaml" \ 160 --replace "yarl==1.6.3" "yarl==1.7.0" 161 substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' 162 ''; ··· 197 198 checkInputs = [ 199 # test infrastructure (selectively from requirement_test.txt) 200 + freezegun 201 pytest-aiohttp 202 + pytest-freezegun 203 pytest-mock 204 pytest-rerunfailures 205 + pytest-socket 206 pytest-xdist 207 pytestCheckHook 208 requests-mock
+2 -2
pkgs/servers/home-assistant/frontend.nix
··· 4 # the frontend version corresponding to a specific home-assistant version can be found here 5 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json 6 pname = "home-assistant-frontend"; 7 - version = "20211007.1"; 8 9 src = fetchPypi { 10 inherit pname version; 11 - sha256 = "sha256-wsDNLwzhpwH5vwdHRWhZGlumjFM8/S+kXProbD+VpE8="; 12 }; 13 14 # there is nothing to strip in this package
··· 4 # the frontend version corresponding to a specific home-assistant version can be found here 5 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json 6 pname = "home-assistant-frontend"; 7 + version = "20211103.0"; 8 9 src = fetchPypi { 10 inherit pname version; 11 + sha256 = "sha256-gny97mYHNwQ8KderebfLALCbIyddbwRoD5Ux6ahDdVk="; 12 }; 13 14 # there is nothing to strip in this package
+2 -2
pkgs/shells/oksh/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "oksh"; 5 - version = "6.9"; 6 7 src = fetchFromGitHub { 8 owner = "ibara"; 9 repo = pname; 10 rev = "${pname}-${version}"; 11 - sha256 = "sha256-b5b6xYqlmjWAT8kTq6YraVLawV/k3ugHZUjXD1LJyhs="; 12 }; 13 14 meta = with lib; {
··· 2 3 stdenv.mkDerivation rec { 4 pname = "oksh"; 5 + version = "7.0"; 6 7 src = fetchFromGitHub { 8 owner = "ibara"; 9 repo = pname; 10 rev = "${pname}-${version}"; 11 + sha256 = "sha256-076nD0aPps6n5qkR3LQJ6Kn2g3mkov+/M0qSvxNLZ6o="; 12 }; 13 14 meta = with lib; {
+1 -4
pkgs/tools/misc/coreutils/default.nix
··· 33 ./fix-chmod-exit-code.patch 34 # Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51433 35 ./disable-seek-hole.patch 36 - ] ++ optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch 37 - # fix gnulib tests on 32-bit ARM. Included on coreutils master. 38 - # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html 39 - ++ optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; 40 41 postPatch = '' 42 # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems.
··· 33 ./fix-chmod-exit-code.patch 34 # Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51433 35 ./disable-seek-hole.patch 36 + ] ++ optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; 37 38 postPatch = '' 39 # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems.
-45
pkgs/tools/misc/coreutils/fix-gnulib-tests-arm.patch
··· 1 - >From 175e0bc72808d564074c4adcc72aeadb74adfcc6 Mon Sep 17 00:00:00 2001 2 - From: Paul Eggert <eggert@cs.ucla.edu> 3 - Date: Thu, 27 Aug 2020 17:52:58 -0700 4 - Subject: [PATCH] perror, strerror_r: remove unportable tests 5 - 6 - Problem reported by Florian Weimer in: 7 - https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html 8 - * tests/test-perror2.c (main): 9 - * tests/test-strerror_r.c (main): Omit unportable tests. 10 - --- 11 - tests/test-perror2.c | 3 --- 12 - tests/test-strerror_r.c | 3 --- 13 - 2 files changed, 6 deletions(-) 14 - 15 - diff --git a/gnulib-tests/test-perror2.c b/gnulib-tests/test-perror2.c 16 - index 1d14eda7b..c6214dd25 100644 17 - --- a/gnulib-tests/test-perror2.c 18 - +++ b/gnulib-tests/test-perror2.c 19 - @@ -79,9 +79,6 @@ main (void) 20 - errno = -5; 21 - perror (""); 22 - ASSERT (!ferror (stderr)); 23 - - ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); 24 - - ASSERT (msg2 == msg4 || STREQ (msg2, str2)); 25 - - ASSERT (msg3 == msg4 || STREQ (msg3, str3)); 26 - ASSERT (STREQ (msg4, str4)); 27 - 28 - free (str1); 29 - diff --git a/gnulib-tests/test-strerror_r.c b/gnulib-tests/test-strerror_r.c 30 - index b11d6fd9f..c1dbcf837 100644 31 - --- a/gnulib-tests/test-strerror_r.c 32 - +++ b/gnulib-tests/test-strerror_r.c 33 - @@ -165,9 +165,6 @@ main (void) 34 - 35 - strerror_r (EACCES, buf, sizeof buf); 36 - strerror_r (-5, buf, sizeof buf); 37 - - ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); 38 - - ASSERT (msg2 == msg4 || STREQ (msg2, str2)); 39 - - ASSERT (msg3 == msg4 || STREQ (msg3, str3)); 40 - ASSERT (STREQ (msg4, str4)); 41 - 42 - free (str1); 43 - -- 44 - 2.17.1 45 -
···
+2 -2
pkgs/tools/misc/nms/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "nms"; 5 - version = "0.3.3"; 6 7 src = fetchFromGitHub { 8 owner = "bartobri"; 9 repo = "no-more-secrets"; 10 rev = "v${version}"; 11 - sha256 = "1zfv4qabikf8w9winsr4brxrdvs3f0d7xvydksyx8bydadsm2v2h"; 12 }; 13 14 buildFlags = [ "nms" "sneakers" ];
··· 2 3 stdenv.mkDerivation rec { 4 pname = "nms"; 5 + version = "1.0.1"; 6 7 src = fetchFromGitHub { 8 owner = "bartobri"; 9 repo = "no-more-secrets"; 10 rev = "v${version}"; 11 + sha256 = "sha256-QVCEpplsZCSQ+Fq1LBtCuPBvnzgLsmLcSrxR+e4nA5I="; 12 }; 13 14 buildFlags = [ "nms" "sneakers" ];
+7 -8
pkgs/tools/misc/swaglyrics/default.nix
··· 2 3 python3.pkgs.buildPythonApplication rec { 4 pname = "swaglyrics"; 5 - version = "1.2.2"; 6 7 src = fetchFromGitHub { 8 owner = "SwagLyrics"; 9 repo = "SwagLyrics-For-Spotify"; 10 - rev = "v${version}"; 11 - sha256 = "1dwj9fpyhqqpm2z3imp8hfribkzxya891shh77yg77rc2xghp7mh"; 12 }; 13 14 propagatedBuildInputs = with python3.pkgs; [ ··· 17 18 preConfigure = '' 19 substituteInPlace setup.py \ 20 - --replace 'requests>=2.24.0' 'requests~=2.23' \ 21 - --replace 'beautifulsoup4==4.9.1' 'beautifulsoup4~=4.9' \ 22 - --replace 'colorama==0.4.3' 'colorama~=0.4' \ 23 - --replace 'unidecode==1.1.1' 'unidecode~=1.2' 24 ''; 25 26 preBuild = "export HOME=$NIX_BUILD_TOP"; ··· 43 homepage = "https://github.com/SwagLyrics/SwagLyrics-For-Spotify"; 44 license = licenses.mit; 45 maintainers = with maintainers; [ siraben ]; 46 - platforms = platforms.linux; 47 }; 48 }
··· 2 3 python3.pkgs.buildPythonApplication rec { 4 pname = "swaglyrics"; 5 + version = "unstable-2021-06-17"; 6 7 src = fetchFromGitHub { 8 owner = "SwagLyrics"; 9 repo = "SwagLyrics-For-Spotify"; 10 + rev = "99fe764a9e45cac6cb9fcdf724c7d2f8cb4524fb"; 11 + sha256 = "sha256-O48T1WsUIVnNQb8gmzSkFFHTOiFOKVSAEYhF9zUqZz0="; 12 }; 13 14 propagatedBuildInputs = with python3.pkgs; [ ··· 17 18 preConfigure = '' 19 substituteInPlace setup.py \ 20 + --replace 'beautifulsoup4==4.9.3' 'beautifulsoup4>=4.9.3' \ 21 + --replace 'unidecode==1.2.0' 'unidecode>=1.2.0' \ 22 + --replace 'flask==2.0.1' 'flask>=2.0.1' 23 ''; 24 25 preBuild = "export HOME=$NIX_BUILD_TOP"; ··· 42 homepage = "https://github.com/SwagLyrics/SwagLyrics-For-Spotify"; 43 license = licenses.mit; 44 maintainers = with maintainers; [ siraben ]; 45 + platforms = platforms.unix; 46 }; 47 }
+3 -3
pkgs/tools/package-management/nix-du/default.nix
··· 12 13 rustPlatform.buildRustPackage rec { 14 pname = "nix-du"; 15 - version = "0.4.0"; 16 17 src = fetchFromGitHub { 18 owner = "symphorien"; 19 repo = "nix-du"; 20 rev = "v${version}"; 21 - sha256 = "0nl451xfby8krxl2wyn91mm0rvacj1718qbqw6k56dwsqlnnxmx0"; 22 }; 23 24 - cargoSha256 = "0swdlp3qdisr8gxihg5syplzssggx9avmdb2w70056436046gs1r"; 25 26 doCheck = true; 27 checkInputs = [ nix graphviz ];
··· 12 13 rustPlatform.buildRustPackage rec { 14 pname = "nix-du"; 15 + version = "0.4.1"; 16 17 src = fetchFromGitHub { 18 owner = "symphorien"; 19 repo = "nix-du"; 20 rev = "v${version}"; 21 + sha256 = "0v6hixj81aa6g3sddny46i0yqaaqv6krp5xadj0xz1g77cb8xy2w"; 22 }; 23 24 + cargoSha256 = "11jaks6adsvrvxlqqw3glvn4ff7xh9j35ayfrl89rb4achvqp7xn"; 25 26 doCheck = true; 27 checkInputs = [ nix graphviz ];
+2 -2
pkgs/tools/security/nwipe/default.nix
··· 9 10 stdenv.mkDerivation rec { 11 pname = "nwipe"; 12 - version = "0.31"; 13 14 src = fetchFromGitHub { 15 owner = "martijnvanbrummelen"; 16 repo = "nwipe"; 17 rev = "v${version}"; 18 - sha256 = "sha256-+xwQLjl0jhven6udfCprRKW8qWM6JMh5MOZ+ZdaJWQg="; 19 }; 20 21 nativeBuildInputs = [
··· 9 10 stdenv.mkDerivation rec { 11 pname = "nwipe"; 12 + version = "0.32"; 13 14 src = fetchFromGitHub { 15 owner = "martijnvanbrummelen"; 16 repo = "nwipe"; 17 rev = "v${version}"; 18 + sha256 = "sha256-O3kYiai+5KMHWd2om4+HrTIw9lB2wLJF3Mrr6iY2+I8="; 19 }; 20 21 nativeBuildInputs = [
+5 -1
pkgs/top-level/python-packages.nix
··· 2719 2720 flake8 = callPackage ../development/python-modules/flake8 { }; 2721 2722 flake8-debugger = callPackage ../development/python-modules/flake8-debugger { }; 2723 2724 flake8-future-import = callPackage ../development/python-modules/flake8-future-import { }; ··· 3427 hacking = callPackage ../development/python-modules/hacking { }; 3428 3429 hdate = callPackage ../development/python-modules/hdate { }; 3430 3431 ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; 3432 ··· 8523 8524 simplekml = callPackage ../development/python-modules/simplekml { }; 8525 8526 - simple_di = callPackage ../development/python-modules/simple_di { }; 8527 8528 simple-rest-client = callPackage ../development/python-modules/simple-rest-client { }; 8529
··· 2719 2720 flake8 = callPackage ../development/python-modules/flake8 { }; 2721 2722 + flake8-length = callPackage ../development/python-modules/flake8-length { }; 2723 + 2724 flake8-debugger = callPackage ../development/python-modules/flake8-debugger { }; 2725 2726 flake8-future-import = callPackage ../development/python-modules/flake8-future-import { }; ··· 3429 hacking = callPackage ../development/python-modules/hacking { }; 3430 3431 hdate = callPackage ../development/python-modules/hdate { }; 3432 + 3433 + ha-av = callPackage ../development/python-modules/ha-av { }; 3434 3435 ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; 3436 ··· 8527 8528 simplekml = callPackage ../development/python-modules/simplekml { }; 8529 8530 + simple-di = callPackage ../development/python-modules/simple_di { }; 8531 8532 simple-rest-client = callPackage ../development/python-modules/simple-rest-client { }; 8533
+2
pkgs/top-level/qt5-packages.nix
··· 136 137 libqtav = callPackage ../development/libraries/libqtav { }; 138 139 kpmcore = callPackage ../development/libraries/kpmcore { }; 140 141 mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { };
··· 136 137 libqtav = callPackage ../development/libraries/libqtav { }; 138 139 + libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; 140 + 141 kpmcore = callPackage ../development/libraries/kpmcore { }; 142 143 mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { };