nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-26 02:05:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-04-20 18:13:16 +00:00
committed by GitHub
parent 960439e003 30b7492d9b
commit b08c9b444b
30 changed files with 599 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/python-modules/mysql-connector/default.nix
View File

@@ -4,13 +4,13 @@ let
py = python;
in buildPythonPackage rec {
pname = "mysql-connector";
version = "8.0.23";
version = "8.0.24";
src = fetchFromGitHub {
owner = "mysql";
repo = "mysql-connector-python";
rev = version;
sha256 = "sha256-YVtcHbDsW1mTjbCY1YhqgtqWv4keKlLExn2AhlOzNEw=";
sha256 = "1zb5wf65rnpbk0lw31i4piy0bq09hqa62gx7bh241zc5310zccc7";
};
propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ];
@@ -20,6 +20,8 @@ in buildPythonPackage rec {
# But the library should be working as expected.
doCheck = false;
pythonImportsCheck = [ "mysql" ];
meta = {
description = "A MySQL driver";
longDescription = ''
@@ -28,7 +30,7 @@ in buildPythonPackage rec {
'';
homepage = "https://github.com/mysql/mysql-connector-python";
changelog = "https://raw.githubusercontent.com/mysql/mysql-connector-python/${version}/CHANGES.txt";
license = [ lib.licenses.gpl2 ];
maintainers = with lib.maintainers; [ primeos ];
license = [ lib.licenses.gpl2Only ];
maintainers = with lib.maintainers; [ ];
};
}

7
pkgs/development/python-modules/scapy/default.nix
View File

@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "scapy";
version = "2.4.4";
version = "2.4.5";
disabled = isPyPy;
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "secdev";
repo = "scapy";
rev = "v${version}";
sha256 = "1wpx7gps3g8q5ykbfcd67mxwcs416zg37b53fwfzzlc1m58vhk3p";
sha256 = "0nxci1v32h5517gl9ic6zjq8gc8drwr0n5pz04c91yl97xznnw94";
};
postPatch = ''
@@ -44,6 +44,7 @@ buildPythonPackage rec {
patchShebangs .
.config/ci/test.sh
'';
pythonImportsCheck = [ "scapy" ];
meta = with lib; {
description = "A Python-based network packet manipulation program and library";
@@ -70,7 +71,7 @@ buildPythonPackage rec {
'';
homepage = "https://scapy.net/";
changelog = "https://github.com/secdev/scapy/releases/tag/v${version}";
license = licenses.gpl2;
license = licenses.gpl2Only;
platforms = platforms.unix;
maintainers = with maintainers; [ primeos bjornfor ];
};