uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,33 @@
|
|||
From 75baa1751973378cb96fb204b0a18a74e5caa2d1 Mon Sep 17 00:00:00 2001
|
||||
From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
|
||||
Date: Wed, 17 Feb 2021 14:03:20 +0100
|
||||
Subject: [PATCH] serialdriver: remove pyserial version check
|
||||
|
||||
This check isn't required on NixOS, since pyserial within NixOS already
|
||||
contains the patches.
|
||||
|
||||
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
|
||||
---
|
||||
labgrid/driver/serialdriver.py | 6 ------
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/labgrid/driver/serialdriver.py b/labgrid/driver/serialdriver.py
|
||||
index 126f674e..59a92269 100644
|
||||
--- a/labgrid/driver/serialdriver.py
|
||||
+++ b/labgrid/driver/serialdriver.py
|
||||
@@ -27,12 +27,6 @@ class SerialDriver(ConsoleExpectMixin, Driver, ConsoleProtocol):
|
||||
bindings = {"port": "SerialPort", }
|
||||
else:
|
||||
bindings = {"port": {"SerialPort", "NetworkSerialPort"}, }
|
||||
- if version.parse(serial.__version__) != version.Version('3.4.0.1'):
|
||||
- message = ("The installed pyserial version does not contain important RFC2217 fixes.\n"
|
||||
- "You can install the labgrid fork via:\n"
|
||||
- "pip uninstall pyserial\n"
|
||||
- "pip install https://github.com/labgrid-project/pyserial/archive/v3.4.0.1.zip#egg=pyserial\n") # pylint: disable=line-too-long
|
||||
- warnings.warn(message)
|
||||
|
||||
txdelay = attr.ib(default=0.0, validator=attr.validators.instance_of(float))
|
||||
timeout = attr.ib(default=3.0, validator=attr.validators.instance_of(float))
|
||||
--
|
||||
2.30.0
|
||||
|
||||
77
pkgs/development/python-modules/labgrid/default.nix
Normal file
77
pkgs/development/python-modules/labgrid/default.nix
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
{ ansicolors
|
||||
, attrs
|
||||
, autobahn
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, jinja2
|
||||
, lib
|
||||
, mock
|
||||
, packaging
|
||||
, pexpect
|
||||
, psutil
|
||||
, pyserial
|
||||
, pytestCheckHook
|
||||
, pytest-dependency
|
||||
, pytest-mock
|
||||
, pyudev
|
||||
, pyusb
|
||||
, pyyaml
|
||||
, requests
|
||||
, setuptools-scm
|
||||
, xmodem
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "labgrid";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labgrid-project";
|
||||
repo = "labgrid";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ih04lh1q3dysps4vfmk2rhqqrsimssadsxvbxdsnim2yihrrw47";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pyserial within Nixpkgs already includes the necessary fix, remove the
|
||||
# pyserial version check from labgrid.
|
||||
./0001-serialdriver-remove-pyserial-version-check.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ansicolors
|
||||
attrs
|
||||
autobahn
|
||||
jinja2
|
||||
packaging
|
||||
pexpect
|
||||
pyserial
|
||||
pyudev
|
||||
pyusb
|
||||
pyyaml
|
||||
requests
|
||||
xmodem
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
psutil
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
pytest-dependency
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Embedded control & testing library";
|
||||
homepage = "https://labgrid.org";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ emantor ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue