pythonPackages.scapy: 2.4.0 -> 2.4.1

This commit is contained in:
Michael Weiss 2019-01-10 14:47:02 +01:00
parent b07fbf0add
commit 44e1571a42
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
3 changed files with 20 additions and 17 deletions

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "scapy";
version = "2.4.0";
version = "2.4.1";
disabled = isPyPy;
@ -21,13 +21,16 @@ buildPythonPackage rec {
owner = "secdev";
repo = "scapy";
rev = "v${version}";
sha256 = "0dw6kl1qi9bf3rbm79gb1h40ms8y0b5dbmpip841p2905d5r2isj";
sha256 = "1k5hfhgq87b99x854s50ffyzh6jqv263n1lnr4y3pm6as9r7iff5";
};
# TODO: Temporary workaround
patches = [ ./fix-version-1.patch ./fix-version-2.patch ];
patches = [ ./fix-version.patch ];
postPatch = lib.optionalString withManufDb ''
postPatch = ''
sed -i "s/NIXPKGS_SCAPY_VERSION/${version}/" \
setup.py scapy/__init__.py
'' + lib.optionalString withManufDb ''
substituteInPlace scapy/data.py --replace "/opt/wireshark" "${wireshark}"
'';

View file

@ -1,11 +0,0 @@
--- a/setup.py 2018-02-15 22:14:08.531591678 +0100
+++ b/setup.py 2018-03-27 17:15:38.617315539 +0200
@@ -47,7 +47,7 @@
setup(
name='scapy',
- version=__import__('scapy').VERSION,
+ version='2.4.0',
packages=[
'scapy',
'scapy/arch',

View file

@ -1,3 +1,14 @@
--- a/setup.py 2018-02-15 22:14:08.531591678 +0100
+++ b/setup.py 2018-03-27 17:15:38.617315539 +0200
@@ -47,7 +47,7 @@
setup(
name='scapy',
- version=__import__('scapy').VERSION,
+ version='NIXPKGS_SCAPY_VERSION',
packages=[
'scapy',
'scapy/arch',
--- a/scapy/__init__.py 2018-03-27 17:38:52.706481269 +0200
+++ b/scapy/__init__.py 2018-03-27 17:39:56.576688890 +0200
@@ -82,9 +82,10 @@
@ -5,10 +16,10 @@
return "git-archive.dev" + match.group(1)
elif sha1:
- return "git-archive.dev" + sha1
+ return '2.4.0'
+ return 'NIXPKGS_SCAPY_VERSION'
else:
- return 'unknown.version'
+ return '2.4.0'
+ return 'NIXPKGS_SCAPY_VERSION'
+
VERSION = _version()