Unverified Commit 95b8329f authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #235262 from wentasah/usbrelay-1.2 

usbrelay: 1.0.1 -> 1.2
parents 301b38e9 bc10438f

pkgs/os-specific/linux/usbrelay/daemon.nix

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ in 
# This is a separate derivation, not just an additional output of

# usbrelay, because otherwise, we have a cyclic dependency between

# usbrelay (default.nix) and the python module (python.nix).

stdenv.mkDerivation rec {

stdenv.mkDerivation {

  pname = "usbrelayd";



  inherit (usbrelay) src version;

pkgs/os-specific/linux/usbrelay/default.nix

+7 −6
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, hidapi, installShellFiles }:

stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "usbrelay";

  version = "1.0.1";

  version = "1.2";



  src = fetchFromGitHub {

    owner = "darrylb123";

    repo = "usbrelay";

    rev = version;

    sha256 = "sha256-2elDrO+WaaRYdTrG40Ez00qSsNVQjXE6GdOJbWPfugE=";

    rev = finalAttrs.version;

    sha256 = "sha256-oJyHzbXOBKxLmPFZMS2jLF80frkiKjPJ89UwkenjIzs=";

  };



  nativeBuildInputs = [
@@ -19,8 +19,9 @@ stdenv.mkDerivation rec { 
  ];



  makeFlags = [

    "DIR_VERSION=${version}"

    "DIR_VERSION=${finalAttrs.version}"

    "PREFIX=${placeholder "out"}"

    "LDCONFIG=${stdenv.cc.libc.bin}/bin/ldconfig"

  ];



  postInstall = ''
@@ -34,4 +35,4 @@ stdenv.mkDerivation rec { 
    maintainers = with maintainers; [ wentasah ];

    platforms = platforms.linux;

  };

}
 
})

pkgs/os-specific/linux/usbrelay/python.nix

+1 −1
Original line number Diff line number Diff line 
{ buildPythonPackage, usbrelay }:



buildPythonPackage rec {

buildPythonPackage {

  pname = "usbrelay_py";

  inherit (usbrelay) version src;