Merge pull request #234997 from helsinki-systems/upd/targetcli
targetcli: 2.1.54 -> 2.1.56
This commit is contained in:
commit
288d963e92
@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "configshell";
|
||||
version = "1.1.29";
|
||||
version = "1.1.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-iscsi";
|
||||
repo = "${pname}-fb";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mjj3c9335sph8rhwww7j4zvhyk896fbmx887vibm89w3jpvjjr9";
|
||||
hash = "sha256-7iWmYVCodwncoPdpw85zrNsZSEq+ume412lyiiJqRPc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -23,11 +23,6 @@ buildPythonPackage rec {
|
||||
urwid
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pyparsing >=2.0.2,<3.0" "pyparsing >=2.0.2"
|
||||
'';
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
|
@ -1,24 +1,16 @@
|
||||
{ lib, fetchFromGitHub, fetchpatch, buildPythonPackage, six, pyudev, pygobject3 }:
|
||||
{ lib, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rtslib";
|
||||
version = "2.1.75";
|
||||
version = "2.1.76";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-iscsi";
|
||||
repo = "${pname}-fb";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qBlr4K+LeJIC6Hwy6dN9n/VjHIUYCy8pLlRtPvooWyE=";
|
||||
hash = "sha256-z9fpSVyv96ZoJaP0ch2A3bX/o/K23ooEpxa/OAhY6Z4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# <https://github.com/open-iscsi/rtslib-fb/pull/187>
|
||||
(fetchpatch {
|
||||
url = "https://github.com/zhaofengli/rtslib-fb/commit/1c3c8257940a88e65676f4333363ddf259a06723.patch";
|
||||
hash = "sha256-nDzL8pUKwKIej+6rOg7Om5AkwkClKk6qKlImbpoufz4=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ six pyudev pygobject3 ];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "targetcli";
|
||||
version = "2.1.54";
|
||||
version = "2.1.56";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-iscsi";
|
||||
repo = "${pname}-fb";
|
||||
rev = "v${version}";
|
||||
sha256 = "1kbbvx0lba96ynr5iwws9jpi319m4rzph4bmcj7yfb37k8mi161v";
|
||||
hash = "sha256-sWLwjfuy9WPnrGK0BxUGnNrhtGDoQyRFMY1OSlyxqs4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [ configshell rtslib ];
|
||||
|
Loading…
Reference in New Issue
Block a user