colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #268488 from a-n-n-a-l-e-e/pkg-about

Browse Source
This commit is contained in:
Artturi 2023-11-19 15:11:17 +02:00 committed by GitHub
commit 85a141849f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/libpcap/default.nix
View File

@ -7,7 +7,6 @@
, pkgsLibpcap
, pkg-about
, setuptools
, tox
}:
buildPythonPackage rec {
@ -25,10 +24,12 @@ buildPythonPackage rec {
nativeBuildInputs = [
setuptools
tox
];
# tox is listed in build requirements but not actually used to build
# keeping it as a requirement breaks the build unnecessarily
postPatch = ''
sed -i "/requires/s/, 'tox>=3.25.1'//" pyproject.toml
cat <<EOF >src/libpcap/libpcap.cfg
[libpcap]
LIBPCAP = ${pkgsLibpcap}/lib/libpcap${stdenv.hostPlatform.extensions.sharedLibrary}

8
pkgs/development/python-modules/pkg-about/default.nix
View File

@ -7,7 +7,6 @@
, setuptools
, packaging
, tomli
, tox
}:
buildPythonPackage rec {
@ -24,10 +23,15 @@ buildPythonPackage rec {
hash = "sha256-mb43XbKypgilagXLW33kP8wXxioNsfLtl6AEnOI1WlA=";
};
# tox is listed in build requirements but not actually used to build
# keeping it as a requirement breaks the build unnecessarily
postPatch = ''
sed -i "/requires/s/, 'tox>=3.25.1'//" pyproject.toml
'';
nativeBuildInputs = [
packaging
setuptools
tox
];
propagatedBuildInputs = [