Unverified Commit 1ff88d2f authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #314408 from SuperSandro2000/ledfx 

 ledfx: 2.0.96 -> 2.0.99, fix build
parents ab6d993f a6216de3

pkgs/applications/audio/ledfx/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ 


python3.pkgs.buildPythonPackage rec {

  pname = "ledfx";

  version = "2.0.96";

  version = "2.0.99";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-nvPHAnoD5j1rneeuMufQkXj8YWXau2zJYug+Avpe87I=";

    hash = "sha256-pwrAVcIwZ3RDYFMDk80q5aVSqLTQ5weZqgB3GRRu2ig=";

  };



  pythonRelaxDeps = true;
@@ -58,6 +58,7 @@ python3.pkgs.buildPythonPackage rec { 
    sounddevice

    stupidartnet

    uvloop

    vnoise

    voluptuous

    zeroconf

  ];
@@ -71,5 +72,6 @@ python3.pkgs.buildPythonPackage rec { 
    changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst";

    license = licenses.gpl3Only;

    maintainers = teams.c3d2.members;

    mainProgram = "ledfx";

  };

}

pkgs/development/python-modules/pystray/default.nix

+14 −4
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  buildPythonPackage,

  fetchFromGitHub,

  fetchpatch,

  pillow,

  xlib,

  six,
@@ -15,19 +16,28 @@ 


buildPythonPackage rec {

  pname = "pystray";

  version = "0.19.2";

  format = "pyproject";

  version = "0.19.5";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "moses-palmer";

    repo = "pystray";

    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 = ''

    substituteInPlace setup.py \

      --replace "'sphinx >=1.3.1'" ""

      --replace-fail "'sphinx >=1.3.1'" ""

  '';



  nativeBuildInputs = [

pkgs/development/python-modules/vnoise/default.nix

0 → 100644
+35 −0
Original line number Diff line number Diff line 
{ 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 ];

  };

}

pkgs/top-level/python-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -16718,6 +16718,8 @@ self: super: with self; { 














  vncdo = callPackage ../development/python-modules/vncdo { };



























  vnoise = callPackage ../development/python-modules/vnoise { };



























  vobject = callPackage ../development/python-modules/vobject { };





























  volatile = callPackage ../development/python-modules/volatile { };