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

python3Packages.python-wayland-extra: init at 0.7.0,...

python3Packages.python-wayland-extra: init at 0.7.0, python3Packages.streamcontroller-streamdeck: init at 0.1.5, Streamcontroller: 1.5.0-beta.8 -> 1.5.0-beta.12 (#416567)
parents 63688d93 1986d1b1
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -18,19 +18,19 @@
}:
let
  # We have to hardcode revision because upstream often create multiple releases for the same version number.
  # This is the commit hash that maps to 1.5.0-beta.8 released on 2025-03-12
  rev = "de11d84afac7873044568606a8468c78d57aceda";
  # This is the commit hash that maps to 1.5.0-beta.12 released on 2025-10-11
  rev = "73b7632ff2977d05763acd56e53bdc7a37d30c0c";
in
stdenv.mkDerivation {
  pname = "streamcontroller";

  version = "1.5.0-beta.8";
  version = "1.5.0-beta.12";

  src = fetchFromGitHub {
    repo = "StreamController";
    owner = "StreamController";
    inherit rev;
    hash = "sha256-pE92/oX9iZYCIhwDkPkjPq/cDUQLUGs+Ou5rjFEIBpo=";
    hash = "sha256-6H0FPkvjKSfso1+E0JwseOnubDXwYys0RVBbyaGCXw0=";
  };

  # The installation method documented upstream
@@ -167,6 +167,7 @@ stdenv.mkDerivation {
    pyro5
    pyspellchecker
    python-dateutil
    python-wayland-extra
    pyudev
    pyusb
    pyyaml
@@ -182,7 +183,7 @@ stdenv.mkDerivation {
    smmap
    speedtest-cli
    streamcontroller-plugin-tools
    streamdeck
    streamcontroller-streamdeck
    textual
    tinycss2
    tqdm
+48 −0
Original line number Diff line number Diff line
{
  buildPythonPackage,
  fetchPypi,
  lib,
  hatchling,
  black,
  lxml,
  pytest,
  requests,
  ruff,
}:

buildPythonPackage rec {
  pname = "python-wayland-extra";
  version = "0.7.0";
  pyproject = true;

  src = fetchPypi {
    inherit version;
    pname = "python_wayland_extra";
    hash = "sha256-HSBOCWP3o/BHmg3LO+LU+GpYkEYSqdljjYcEPdOnxZk=";
  };

  postPatch = ''
    substituteInPlace pyproject.toml \
      --replace-fail ', "black", "lxml", "requests", "pytest", "ruff"' ""
  '';

  build-system = [ hatchling ];

  dependencies = [
    lxml
    requests
  ];

  # requires working wayland display
  doCheck = false;

  pythonImportsCheck = [ "wayland" ];

  meta = {
    description = "Implementation of the Wayland protocol with no external dependencies";
    homepage = "https://github.com/dennisrijsdijk/python-wayland-extra";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ sifmelcara ];
    platforms = lib.platforms.linux;
  };
}
+44 −0
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  buildPythonPackage,
  fetchPypi,
  replaceVars,
  pkgs,
  setuptools,
}:

buildPythonPackage rec {
  pname = "streamcontroller-streamdeck";
  version = "0.1.5";
  pyproject = true;

  src = fetchPypi {
    inherit version;
    pname = "streamcontroller_streamdeck";
    hash = "sha256-JSDCg9PLDqxM1KdoCEnYzJip71re6rdS/mLn6fsGn9E=";
  };

  patches = [
    # substitute libusb path
    (replaceVars ./hardcode-libusb.patch {
      libusb = "${pkgs.hidapi}/lib/libhidapi-libusb${stdenv.hostPlatform.extensions.sharedLibrary}";
    })
  ];

  build-system = [ setuptools ];

  pythonImportsCheck = [ "StreamDeck" ];
  doCheck = false;

  meta = with lib; {
    # This is a fork of abcminiuser/python-elgato-streamdeck targeted at StreamController.
    description = "Python library to control the Elgato Stream Deck";
    homepage = "https://github.com/StreamController/streamcontroller-python-elgato-streamdeck";
    license = licenses.mit;
    maintainers = with maintainers; [
      majiir
      sifmelcara
    ];
  };
}
+13 −0
Original line number Diff line number Diff line
diff --git a/src/StreamDeck/Transport/LibUSBHIDAPI.py b/src/StreamDeck/Transport/LibUSBHIDAPI.py
index edf53a1..2d38af3 100644
--- a/src/StreamDeck/Transport/LibUSBHIDAPI.py
+++ b/src/StreamDeck/Transport/LibUSBHIDAPI.py
@@ -155,7 +155,7 @@ class LibUSBHIDAPI(Transport):
 
             search_library_names = {
                 "Windows": ["hidapi.dll", "libhidapi-0.dll", "./hidapi.dll"],
-                "Linux": ["libhidapi-libusb.so", "libhidapi-libusb.so.0"],
+                "Linux": ["@libusb@"],
                 "Darwin": ["libhidapi.dylib"],
                 "FreeBSD": ["libhidapi.so"],
             }
+6 −0
Original line number Diff line number Diff line
@@ -15595,6 +15595,8 @@ self: super: with self; {
  python-watcherclient = callPackage ../development/python-modules/python-watcherclient { };
  python-wayland-extra = callPackage ../development/python-modules/python-wayland-extra { };
  python-whois = callPackage ../development/python-modules/python-whois { };
  python-wink = callPackage ../development/python-modules/python-wink { };
@@ -18212,6 +18214,10 @@ self: super: with self; {
    callPackage ../development/python-modules/streamcontroller-plugin-tools
      { };
  streamcontroller-streamdeck =
    callPackage ../development/python-modules/streamcontroller-streamdeck
      { };
  streamdeck = callPackage ../development/python-modules/streamdeck { };
  streaming-form-data = callPackage ../development/python-modules/streaming-form-data { };