Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7bf3d77ed667
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b9222f51583f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 1, 2020

  1. hidapi: 0.9.0 -> 0.10.0

    @prusnak @FRidh
    prusnak authored and FRidh committed Nov 1, 2020
    Copy the full SHA
    cbe6c27 View commit details

  2. python3Packages.hidapi: 0.9.0.post3 -> 0.10.0

    @prusnak @FRidh
    prusnak authored and FRidh committed Nov 1, 2020
    Copy the full SHA
    b9222f5 View commit details
Showing with 7 additions and 6 deletions.
  1. +3 −2 pkgs/development/libraries/hidapi/default.nix
  2. +4 −4 pkgs/development/python-modules/hidapi/default.nix
5 changes: 3 additions & 2 deletions pkgs/development/libraries/hidapi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "hidapi";
version = "0.9.0";
version = "0.10.0";

src = fetchFromGitHub {
owner = "libusb";
repo = "hidapi";
rev = "${pname}-${version}";
sha256 = "1p4g8lgwj4rki6lbn5l6rvwj0xlbn1xfh4d255bg5pvgczmwmc4i";
sha256 = "1n3xn1zvxgyzb84cjpw3i5alw0gkbrps11r4ijxzyqxqym0khagr";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Library for communicating with USB and Bluetooth HID devices";
homepage = "https://github.com/libusb/hidapi";
maintainers = with maintainers; [ prusnak ];
# Actually, you can chose between GPLv3, BSD or HIDAPI license (more liberal)
license = licenses.bsd3;
platforms = platforms.unix;
8 changes: 4 additions & 4 deletions pkgs/development/python-modules/hidapi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "hidapi";
version = "0.9.0.post3";
version = "0.10.0";

src = fetchPypi {
inherit pname version;
sha256 = "5a2442928f17ba742d9c53073f48b152051c5747d758d2fefd937543da5ab2e5";
sha256 = "2560ad8db212f54cf40ea8d78715adad7df803011cfdce9dabbac0e76acf31ef";
};

propagatedBuildInputs =
@@ -26,11 +26,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "hid" ];

meta = with stdenv.lib; {
description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
description = "A Cython interface to the hidapi from https://github.com/libusb/hidapi";
homepage = "https://github.com/trezor/cython-hidapi";
# license can actually be either bsd3 or gpl3
# see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
license = licenses.bsd3;
maintainers = with maintainers; [ np ];
maintainers = with maintainers; [ np prusnak ];
};
}