Merge pull request #235262 from wentasah/usbrelay-1.2

usbrelay: 1.0.1 -> 1.2
This commit is contained in:
Pol Dellaiera 2023-06-03 17:10:23 +02:00 committed by GitHub
commit 95b8329fd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions

View File

@ -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;

View File

@ -1,13 +1,13 @@
{ 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;
};
}
})

View File

@ -1,6 +1,6 @@
{ buildPythonPackage, usbrelay }:
buildPythonPackage rec {
buildPythonPackage {
pname = "usbrelay_py";
inherit (usbrelay) version src;