Merge pull request #314408 from SuperSandro2000/ledfx

ledfx: 2.0.96 -> 2.0.99, fix build
This commit is contained in:
Sandro 2024-05-26 20:59:25 +02:00 committed by GitHub
commit 1ff88d2f06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 55 additions and 6 deletions

View File

@ -6,12 +6,12 @@
python3.pkgs.buildPythonPackage rec { python3.pkgs.buildPythonPackage rec {
pname = "ledfx"; pname = "ledfx";
version = "2.0.96"; version = "2.0.99";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-nvPHAnoD5j1rneeuMufQkXj8YWXau2zJYug+Avpe87I="; hash = "sha256-pwrAVcIwZ3RDYFMDk80q5aVSqLTQ5weZqgB3GRRu2ig=";
}; };
pythonRelaxDeps = true; pythonRelaxDeps = true;
@ -58,6 +58,7 @@ python3.pkgs.buildPythonPackage rec {
sounddevice sounddevice
stupidartnet stupidartnet
uvloop uvloop
vnoise
voluptuous voluptuous
zeroconf zeroconf
]; ];
@ -71,5 +72,6 @@ python3.pkgs.buildPythonPackage rec {
changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst"; changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = teams.c3d2.members; maintainers = teams.c3d2.members;
mainProgram = "ledfx";
}; };
} }

View File

@ -2,6 +2,7 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
pillow, pillow,
xlib, xlib,
six, six,
@ -15,19 +16,28 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pystray"; pname = "pystray";
version = "0.19.2"; version = "0.19.5";
format = "pyproject"; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "moses-palmer"; owner = "moses-palmer";
repo = "pystray"; repo = "pystray";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-8B178MSe4ujlnGBmQhIu+BoAh1doP9V5cL0ermLQTvs="; hash = "sha256-CZhbaXwKFrRBEomzfFPMQdMkTOl5lbgI64etfDRiRu4=";
}; };
patches = [
# fix test_menu_construct_from_none test case
# https://github.com/moses-palmer/pystray/pull/133
(fetchpatch {
url = "https://github.com/moses-palmer/pystray/commit/813007e3034d950d93a2f3e5b029611c3c9c98ad.patch";
hash = "sha256-m2LfZcWXSfgxb73dac21VDdMDVz3evzcCz5QjdnfM1U=";
})
];
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "'sphinx >=1.3.1'" "" --replace-fail "'sphinx >=1.3.1'" ""
''; '';
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, numpy
, pytestCheckHook
, setuptools
}:
buildPythonPackage rec {
pname = "vnoise";
version = "0.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "plottertools";
repo = "vnoise";
rev = version;
hash = "sha256-nflAh3vj48wneM0wy/+M+XD6GC63KZEIFb1x4SS46YI=";
};
nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = [ numpy ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "vnoise" ];
meta = with lib; {
description = "Vectorized, pure-Python Perlin noise library";
homepage = "https://github.com/plottertools/vnoise";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View File

@ -16718,6 +16718,8 @@ self: super: with self; {
vncdo = callPackage ../development/python-modules/vncdo { }; vncdo = callPackage ../development/python-modules/vncdo { };
vnoise = callPackage ../development/python-modules/vnoise { };
vobject = callPackage ../development/python-modules/vobject { }; vobject = callPackage ../development/python-modules/vobject { };
volatile = callPackage ../development/python-modules/volatile { }; volatile = callPackage ../development/python-modules/volatile { };