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

Merge pull request #254309 from pbsds/flit-prune

Browse Source 
python3Packages.flitBuildHook: remove
This commit is contained in:
Frederik Rietdijk 2023-09-25 11:34:15 +02:00 committed by GitHub
commit f4822bb295
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
74 changed files with 320 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/languages-frameworks/python.section.md
View File

@ -459,7 +459,6 @@ are used in [`buildPythonPackage`](#buildpythonpackage-function).
with the `eggInstallHook`
- `eggBuildHook` to skip building for eggs.
- `eggInstallHook` to install eggs.
- `flitBuildHook` to build a wheel using `flit`.
- `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system
(e.g. `setuptools` or `flit`) should still be added as `nativeBuildInput`.
- `pypaBuildHook` to build a wheel using

2
nixos/doc/manual/release-notes/rl-2311.section.md
View File

@ -347,4 +347,6 @@ The module update takes care of the new config syntax and the data itself (user
can automatically format the root device by setting
`virtualisation.fileSystems."/".autoFormat = true;`.
- `python3.pkgs.flitBuildHook` has been removed. Use `flit-core` and `format = "pyproject"` instead.
- The `electron` packages now places its application files in `$out/libexec/electron` instead of `$out/lib/electron`. Packages using electron-builder will fail to build and need to be adjusted by changing `lib` to `libexec`.

3
pkgs/applications/audio/sublime-music/default.nix
View File

@ -44,7 +44,7 @@ in
python.pkgs.buildPythonApplication rec {
pname = "sublime-music";
version = "0.12.0";
format = "flit";
format = "pyproject";
src = fetchFromGitHub {
owner = "sublime-music";
@ -54,6 +54,7 @@ python.pkgs.buildPythonApplication rec {
};
nativeBuildInputs = [
python.pkgs.flit-core
gobject-introspection
wrapGAppsHook
];

7
pkgs/applications/misc/cambrinary/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, buildPythonApplication
, fetchFromGitHub
, flit
, aiohttp
, beautifulsoup4
}:
@ -8,7 +9,7 @@
buildPythonApplication rec {
pname = "cambrinary";
version = "unstable-2023-07-16";
format = "flit";
format = "pyproject";
src = fetchFromGitHub {
owner = "xueyuanl";
@ -17,6 +18,10 @@ buildPythonApplication rec {
hash = "sha256-wDcvpKAY/6lBjO5h3qKH3+Y2G2gm7spcKCXFMt/bAtE=";
};
nativeBuildInputs = [
flit
];
propagatedBuildInputs = [
aiohttp
beautifulsoup4

4
pkgs/applications/networking/browsers/offpunk/default.nix
View File

@ -32,7 +32,7 @@ in
python3Packages.buildPythonPackage rec {
pname = "offpunk";
version = "1.10";
format = "flit";
format = "pyproject";
disabled = python3Packages.pythonOlder "3.7";
@ -43,7 +43,7 @@ python3Packages.buildPythonPackage rec {
hash = "sha256-+jGKPPnKZHn+l6VAwuae6kICwR7ymkYJjsM2OHQAEmU=";
};
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [ python3Packages.flit-core installShellFiles ];
propagatedBuildInputs = otherDependencies ++ pythonDependencies;
postInstall = ''

7
pkgs/development/embedded/fpga/apio/default.nix
View File

@ -10,13 +10,14 @@
, scons
, setuptools
, tinyprog
, flit-core
, pytestCheckHook
}:
buildPythonApplication rec {
pname = "apio";
version = "0.8.1";
format = "flit";
format = "pyproject";
src = fetchFromGitHub {
owner = "FPGAwars";
@ -47,6 +48,10 @@ buildPythonApplication rec {
'version = semantic_version.Version(pkg_version.replace(".dev", "-dev"))'
'';
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
click
semantic-version

9
pkgs/development/interpreters/python/hooks/default.nix
View File

@ -45,15 +45,6 @@ in {
propagatedBuildInputs = [ ];
} ./egg-unpack-hook.sh) {};
flitBuildHook = callPackage ({ makePythonHook, flit }:
makePythonHook {
name = "flit-build-hook";
propagatedBuildInputs = [ flit ];
substitutions = {
inherit pythonInterpreter;
};
} ./flit-build-hook.sh) {};
pipBuildHook = callPackage ({ makePythonHook, pip, wheel }:
makePythonHook {
name = "pip-build-hook.sh";

15
pkgs/development/interpreters/python/hooks/flit-build-hook.sh
View File

@ -1,15 +0,0 @@
# Setup hook for flit
echo "Sourcing flit-build-hook"
flitBuildPhase () {
echo "Executing flitBuildPhase"
runHook preBuild
@pythonInterpreter@ -m flit build --format wheel
runHook postBuild
echo "Finished executing flitBuildPhase"
}
if [ -z "${dontUseFlitBuild-}" ] && [ -z "${buildPhase-}" ]; then
echo "Using flitBuildPhase"
buildPhase=flitBuildPhase
fi

6
pkgs/development/interpreters/python/mk-python-derivation.nix
View File

@ -11,7 +11,6 @@
, namePrefix
, update-python-libraries
, setuptools
, flitBuildHook
, pypaBuildHook
, pypaInstallHook
, pythonCatchConflictsHook
@ -90,7 +89,6 @@
# Several package formats are supported.
# "setuptools" : Install a common setuptools/distutils based package. This builds a wheel.
# "wheel" : Install from a pre-compiled wheel.
# "flit" : Install a flit package. This builds a wheel.
# "pyproject": Install a package using a ``pyproject.toml`` file (PEP517). This builds a wheel.
# "egg": Install a package from an egg.
# "other" : Provide your own buildPhase and installPhase.
@ -122,7 +120,7 @@ let
else
"setuptools";
withDistOutput = lib.elem format' ["pyproject" "setuptools" "flit" "wheel"];
withDistOutput = lib.elem format' ["pyproject" "setuptools" "wheel"];
name_ = name;
@ -222,8 +220,6 @@ let
unzip
] ++ lib.optionals (format' == "setuptools") [
setuptoolsBuildHook
] ++ lib.optionals (format' == "flit") [
flitBuildHook
] ++ lib.optionals (format' == "pyproject") [(
if isBootstrapPackage then
pypaBuildHook.override {

6
pkgs/development/interpreters/python/python2/mk-python-derivation.nix
View File

@ -98,12 +98,10 @@
, ... } @ attrs:
assert lib.assertMsg (format != "flit") "flit is not a supported Python 2 format";
let
inherit (python) stdenv;
withDistOutput = lib.elem format ["pyproject" "setuptools" "flit" "wheel"];
withDistOutput = lib.elem format ["pyproject" "setuptools" "wheel"];
name_ = name;
@ -171,7 +169,7 @@ let
nativeBuildInputs = [
python
wrapPython
ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)?
ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, ...)?
pythonRemoveTestsDirHook
] ++ lib.optionals catchConflicts [
pythonCatchConflictsHook

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

@ -2,6 +2,7 @@
, aiohttp
, buildPythonPackage
, fetchPypi
, flit
, pytest-aiohttp
, pytestCheckHook
, pythonOlder
@ -11,7 +12,7 @@
buildPythonPackage rec {
pname = "aiohttp-remotes";
version = "1.2.0";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -21,6 +22,10 @@ buildPythonPackage rec {
sha256 = "f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c";
};
nativeBuildInputs = [
flit
];
propagatedBuildInputs = [
aiohttp
] ++ lib.optionals (pythonOlder "3.7") [

2
pkgs/development/python-modules/aioprocessing/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioprocessing";
version = "2.0.1";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.5";

16
pkgs/development/python-modules/aiorun/default.nix
View File

@ -2,6 +2,8 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, fetchpatch
, flit-core
, pygments
, pytestCheckHook
, uvloop
@ -10,7 +12,7 @@
buildPythonPackage rec {
pname = "aiorun";
version = "2023.7.2";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,6 +23,18 @@ buildPythonPackage rec {
hash = "sha256-3AGsT8IUNi5SZHBsBfd7akj8eQ+xb0mrR7ydIr3T8gs=";
};
patches = [
# Raise flit-core version constrains
(fetchpatch { # https://github.com/cjrh/aiorun/pull/85
url = "https://github.com/cjrh/aiorun/commit/a0c027ea331167712738e35ca70fefcd794e16d5.patch";
hash = "sha256-M1rcrkdFcoFa3IncPnJaRhnXbelyk56QnMGtmgB6bvk=";
})
];
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
pygments
];

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

@ -6,6 +6,7 @@
, wheel
, buildPythonPackage
, fetchPypi
, flit-core
, isPy3k
, lib
, stdenv
@ -15,13 +16,17 @@
buildPythonPackage rec {
pname = "argon2-cffi";
version = "21.3.0";
format = "flit";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b";
};
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [ cffi six argon2-cffi-bindings ]
++ lib.optional (!isPy3k) enum34;

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

@ -1,13 +1,14 @@
{ lib
, buildPythonPackage
, fetchFromGitLab
, flit-core
, python
}:
buildPythonPackage rec {
pname = "asyncinotify";
version = "4.0.2";
format = "flit";
format = "pyproject";
src = fetchFromGitLab {
owner = "Taywee";
@ -16,6 +17,10 @@ buildPythonPackage rec {
hash = "sha256-Q7b406UENCmD9SGbaml+y2YLDi7VLZBmDkYMo8CLuVw=";
};
nativeBuildInputs = [
flit-core
];
checkPhase = ''
${python.pythonForBuild.interpreter} ${src}/test.py
'';

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

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, typing-extensions
, flit-core
, pytestCheckHook
, pythonOlder
}:
@ -9,7 +10,7 @@
buildPythonPackage rec {
pname = "asyncstdlib";
version = "3.10.8";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,6 +21,10 @@ buildPythonPackage rec {
hash = "sha256-7HQFyIR+NWRzbFkzkZiuEQotZfCXpCzrWfWIFg1lWv4=";
};
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
typing-extensions
];

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

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, fetchpatch
, flit-core
, ipykernel
, isPy27
, python
@ -12,7 +13,7 @@
buildPythonPackage rec {
pname = "bash_kernel";
version = "0.9.0";
format = "flit";
format = "pyproject";
disabled = isPy27;
src = fetchPypi {
@ -33,6 +34,8 @@ buildPythonPackage rec {
--replace "\"bash\"" "'${bash}/bin/bash'"
'';
nativeBuildInputs = [ flit-core ];
propagatedBuildInputs = [ ipykernel pexpect ];
# no tests

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

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, flit-core
, psutil
, pytestCheckHook
, pyyaml
@ -11,13 +12,17 @@
buildPythonPackage rec {
pname = "circus";
version = "0.18.0";
format = "flit";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-GTzoIk4GjO1mckz0gxBvtmdLUaV1g6waDn7Xp+6Mcas=";
};
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
psutil
pyzmq

2
pkgs/development/python-modules/confuse/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "confuse";
version = "1.7.0";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";

2
pkgs/development/python-modules/ecs-logging/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "ecs-logging";
version = "2.1.0";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.8";

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

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, flit-core
, pytestCheckHook
, pythonOlder
, borgbackup
@ -20,7 +21,7 @@
buildPythonPackage rec {
pname = "emborg";
version = "1.37";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -31,6 +32,10 @@ buildPythonPackage rec {
hash = "sha256-bHYs+vlNku/T5Hb9u77Xml9/FNj5vgqPeXSzcilsS+I=";
};
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
appdirs
arrow

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

@ -1,9 +1,9 @@
{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, bleach, markdown }:
{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, flit-core, bleach, markdown }:
buildPythonPackage rec {
pname = "formbox";
version = "0.4.1";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromSourcehut {
@ -13,6 +13,7 @@ buildPythonPackage rec {
hash = "sha256-zOvXmSeBiwc0Z5mRMwMsHLU3A/iP7rpjXm0T0I2gUTk=";
};
nativeBuildInputs = [ flit-core ];
propagatedBuildInputs = [ bleach markdown ];
doCheck = false; # there's no test
pythonImportsCheck = [ "formbox" ];

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

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, flit
, uritemplate
, pyjwt
, pytestCheckHook
@ -15,7 +16,7 @@
buildPythonPackage rec {
pname = "gidgethub";
version = "5.3.0";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -24,6 +25,10 @@ buildPythonPackage rec {
hash = "sha256-ns59N/vOuBm4BWDn7Vj5NuSKZdN+xfVtt5FFFWtCaiU=";
};
nativeBuildInputs = [
flit
];
propagatedBuildInputs = [
uritemplate
pyjwt

4
pkgs/development/python-modules/gspread/default.nix
View File

@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flitBuildHook
, flit-core
, google-auth
, google-auth-oauthlib
, pytest-vcr
@ -25,7 +25,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [
flitBuildHook
flit-core
];
propagatedBuildInputs = [

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

@ -1,10 +1,10 @@
{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut
, kubo, packaging, tomli }:
, kubo, packaging, tomli, flit-core }:
buildPythonPackage rec {
pname = "ipwhl";
version = "1.1.0";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromSourcehut {
@ -14,6 +14,7 @@ buildPythonPackage rec {
hash = "sha256-YaIYcoUnbiv9wUOFIzGj2sWGbh7NsqRQcqOR2X6+QZA=";
};
nativeBuildInputs = [ flit-core ];
buildInputs = [ kubo ];
propagatedBuildInputs = [ packaging tomli ];
doCheck = false; # there's no test

2
pkgs/development/python-modules/jupyter-book/default.nix
View File

@ -28,7 +28,7 @@ buildPythonPackage rec {
pname = "jupyter-book";
version = "0.15.1";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";

2
pkgs/development/python-modules/jupyter-cache/default.nix
View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "jupyter-cache";
version = "0.6.1";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";

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

@ -1,9 +1,9 @@
{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut }:
{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, flit-core }:
buildPythonPackage rec {
pname = "loca";
version = "2.0.1";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromSourcehut {
@ -13,6 +13,10 @@ buildPythonPackage rec {
sha256 = "1l6jimw3wd81nz1jrzsfw1zzsdm0jm998xlddcqaq0h38sx69w8g";
};
nativeBuildInputs = [
flit-core
];
doCheck = false; # all checks are static analyses
pythonImportsCheck = [ "loca" ];

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

@ -2,18 +2,23 @@
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, hatchling
}:
buildPythonPackage rec {
pname = "looseversion";
version = "1.3.0";
format = "flit";
format = "pyproject";
src = fetchPypi {
inherit version pname;
sha256 = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4=";
};
nativeBuildInputs = [
hatchling
];
nativeCheckInputs = [
pytestCheckHook
];

6
pkgs/development/python-modules/mdformat-admon/default.nix
View File

@ -24,7 +24,7 @@ let
in python.pkgs.buildPythonPackage rec {
pname = "mdformat-admon";
version = "1.0.2";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -35,6 +35,10 @@ in python.pkgs.buildPythonPackage rec {
hash = "sha256-33Q3Re/axnoOHZ9XYA32mmK+efsSelJXW8sD7C1M/jU=";
};
nativeBuildInputs = with python.pkgs; [
flit-core
];
buildInputs = with python.pkgs; [
mdformat
];

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

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, linkify-it-py
, markdown-it-py
, mdformat
@ -11,7 +12,7 @@
buildPythonPackage rec {
pname = "mdformat-footnote";
version = "0.1.1";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,6 +23,10 @@ buildPythonPackage rec {
hash = "sha256-DUCBWcmB5i6/HkqxjlU3aTRO7i0n2sj+e/doKB8ffeo=";
};
nativeBuildInputs = [
flit-core
];
buildInputs = [
mdformat
mdit-py-plugins

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

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, linkify-it-py
, markdown-it-py
, mdformat
@ -12,7 +13,7 @@
buildPythonPackage rec {
pname = "mdformat-frontmatter";
version = "2.0.1";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -23,6 +24,10 @@ buildPythonPackage rec {
hash = "sha256-PhT5whtvvcYSs5gHQEsIvV1evhx7jR+3DWFMHrF0uMw=";
};
nativeBuildInputs = [
flit-core
];
buildInputs = [
mdformat
mdit-py-plugins

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

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, mdformat
, mdformat-gfm
, mdit-py-plugins
@ -10,7 +11,7 @@
buildPythonPackage rec {
pname = "mdformat-mkdocs";
version = "1.0.4";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,6 +22,10 @@ buildPythonPackage rec {
hash = "sha256-mGWeG8clWJ7obsvO+gYaVzfAyDOh9HNdyWW5KgOgfmM=";
};
nativeBuildInputs = [
flit-core
];
buildInputs = [
mdformat
mdformat-gfm

7
pkgs/development/python-modules/mdformat-simple-breaks/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, mdformat
, mdit-py-plugins
, pythonOlder
@ -9,7 +10,7 @@
buildPythonPackage rec {
pname = "mdformat-simple-breaks";
version = "0.0.1";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,6 +21,10 @@ buildPythonPackage rec {
hash = "sha256-4lJHB4r9lI2uGJ/BmFFc92sumTRKBBwiRmGBdQkzfd0=";
};
nativeBuildInputs = [
flit-core
];
buildInputs = [
mdformat
];

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

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, mdformat
, mdit-py-plugins
, pytestCheckHook
@ -10,7 +11,7 @@
buildPythonPackage rec {
pname = "mdformat-tables";
version = "0.4.1";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,6 +22,10 @@ buildPythonPackage rec {
hash = "sha256-Q61GmaRxjxJh9GjyR8QCZOH0njFUtAWihZ9lFQJ2nQQ=";
};
nativeBuildInputs = [
flit-core
];
buildInputs = [
mdformat
];

2
pkgs/development/python-modules/mediafile/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "mediafile";
version = "0.10.1";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.6";

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

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, flit-core
, ipython
, matplotlib
, numpy
@ -11,6 +12,7 @@
buildPythonPackage rec {
pname = "mediapy";
version = "1.1.8";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -19,9 +21,10 @@ buildPythonPackage rec {
hash = "sha256-mVhBM+NQEkLYByp/kCPFJCAY26La5CWjcPl6PgclA9A=";
};
nativeBuildInputs = [ flit-core ];
propagatedBuildInputs = [ ipython matplotlib numpy pillow ];
format = "flit";
pythonImportsCheck = [ "mediapy" ];

4
pkgs/development/python-modules/more-itertools/default.nix
View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "more-itertools";
version = "9.1.0";
format = "flit";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-yrqjQa0DieqDwXqUVmpTrkydBzSYYeyxTcbQNFz5rF0=";
};
nativeBuildInouts = [
nativeBuildInputs = [
flit-core
];

2
pkgs/development/python-modules/myst-nb/default.nix
View File

@ -22,7 +22,7 @@ buildPythonPackage rec {
pname = "myst-nb";
version = "0.17.2";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";

4
pkgs/development/python-modules/nestedtext/default.nix
View File

@ -2,7 +2,7 @@
, buildPythonPackage
, docopt
, fetchFromGitHub
, flitBuildHook
, flit-core
, hypothesis
, inform
, nestedtext
@ -27,7 +27,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [
flitBuildHook
flit-core
];
propagatedBuildInputs = [

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

@ -1,15 +1,19 @@
{ lib, buildPythonPackage, fetchPypi, fire, tqdm, intelhex, libusb1 }:
{ lib, buildPythonPackage, fetchPypi, flit-core, fire, tqdm, intelhex, libusb1 }:
buildPythonPackage rec {
pname = "nkdfu";
version = "0.2";
format = "flit";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-8l913dOCxHKFtpQ83p9RV3sUlu0oT5PVi14FSuYJ9fg=";
};
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
fire
tqdm

7
pkgs/development/python-modules/parametrize-from-file/default.nix
View File

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, fetchpatch
, flit-core
, pytestCheckHook
, coveralls
, numpy
@ -16,7 +17,7 @@
buildPythonPackage rec {
pname = "parametrize-from-file";
version = "0.17.0";
format = "flit";
format = "pyproject";
src = fetchPypi {
inherit version;
@ -40,6 +41,10 @@ buildPythonPackage rec {
--replace "more_itertools~=8.10" "more_itertools"
'';
nativeBuildInputs = [
flit-core
];
nativeCheckInputs = [
numpy
pytestCheckHook

2
pkgs/development/python-modules/pep440/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pep440";
version = "0.1.2";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.8";

16
pkgs/development/python-modules/pkgutil-resolve-name/default.nix
View File

@ -1,13 +1,15 @@
{ buildPythonPackage
, fetchPypi
, fetchpatch
, lib
, nix-update-script
, pythonOlder
, flit-core
}:
buildPythonPackage rec {
pname = "pkgutil-resolve-name";
version = "1.3.10";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -17,6 +19,18 @@ buildPythonPackage rec {
hash = "sha256-NX1snmp1VlPP14iTgXwIU682XdUeyX89NYqBk3O70XQ=";
};
patches = [
# Raise flit-core version constrains
(fetchpatch { # https://github.com/graingert/pkgutil-resolve-name/pull/5
url = "https://github.com/graingert/pkgutil-resolve-name/commit/042834290c735fa836bb308ce9e93c9f64d67cbe.patch";
hash = "sha256-M1rcrkdFcoFa3IncPnJaRhnXbelyk56QnMGtmgB6bvk=";
})
];
nativeBuildInputs = [
flit-core
];
# has no tests
doCheck = false;

8
pkgs/development/python-modules/pytest-celery/default.nix
View File

@ -1,10 +1,10 @@
{ lib, buildPythonPackage, fetchFromGitHub }:
{ lib, buildPythonPackage, fetchFromGitHub, flit-core }:
buildPythonPackage rec {
pname = "pytest-celery";
version = "0.1.0";
format = "flit";
format = "pyproject";
src = fetchFromGitHub {
owner = "celery";
@ -19,6 +19,10 @@ buildPythonPackage rec {
--replace '"celery >= 4.4.0"' ""
'';
nativeBuildInputs = [
flit-core
];
# This package has nothing to test or import.
doCheck = false;

9
pkgs/development/python-modules/pytest-check/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, flit-core
, pytest
, pytestCheckHook
}:
@ -8,14 +9,18 @@
buildPythonPackage rec {
pname = "pytest-check";
version = "2.1.4";
format = "flit";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-AbN/1wPaD6ZntwF68fBGDHRKhfHuh2de4+D5Ssw98XI=";
};
buildInputs = [
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
pytest
];

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

@ -2,6 +2,7 @@
, fetchFromGitHub
, buildPythonPackage
, pythonOlder
, flit-core
, py-cid
, pytestCheckHook
, pytest-cov
@ -10,7 +11,7 @@
buildPythonPackage rec {
pname = "pytest-cid";
version = "1.1.2";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
@ -25,6 +26,10 @@ buildPythonPackage rec {
--replace "pytest >= 5.0, < 7.0" "pytest >= 5.0"
'';
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
py-cid
];

2
pkgs/development/python-modules/pytest-param-files/default.nix
View File

@ -17,7 +17,7 @@ buildPythonPackage rec {
hash = "sha256-Q7wWoggJN2w2a2umQHx5TsVcugqpovBEtOKruNMZQ8A=";
};
format = "flit";
format = "pyproject";
nativeBuildInputs = [ flit-core ];

6
pkgs/development/python-modules/pytest-raisin/default.nix
View File

@ -1,14 +1,14 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, flit
, pytest
}:
buildPythonPackage rec {
pname = "pytest-raisin";
version = "0.4";
format = "flit";
format = "pyproject";
src = fetchFromGitHub {
owner = "wimglenn";
@ -18,7 +18,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [
flit-core
flit
];
propagatedBuildInputs = [

6
pkgs/development/python-modules/python_docs_theme/default.nix
View File

@ -1,9 +1,9 @@
{ lib, buildPythonPackage, fetchFromGitHub, sphinx }:
{ lib, buildPythonPackage, fetchFromGitHub, flit-core, sphinx }:
buildPythonPackage rec {
pname = "python_docs_theme";
version = "2023.7";
format = "flit";
format = "pyproject";
src = fetchFromGitHub {
owner = "python";
@ -12,6 +12,8 @@ buildPythonPackage rec {
sha256 = "sha256-43/TlgYm7Q4ZtY25MiLU9fd1atDmiDUeUK6AYfDfmag=";
};
nativeBuildInputs = [ flit-core ];
propagatedBuildInputs = [ sphinx ];
pythonImportsCheck = [ "python_docs_theme" ];

4
pkgs/development/python-modules/qpsolvers/default.nix
View File

@ -3,6 +3,7 @@
, fetchFromGitHub
, buildPythonPackage
, unittestCheckHook
, flit-core
, daqp
, ecos
, numpy
@ -14,7 +15,7 @@
buildPythonPackage rec {
pname = "qpsolvers";
version = "3.4.0";
format = "flit";
format = "pyproject";
src = fetchFromGitHub {
owner = "qpsolvers";
@ -35,6 +36,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
flit-core
quadprog
unittestCheckHook
];

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

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, inform
, pythonOlder
, sly
@ -9,7 +10,7 @@
buildPythonPackage rec {
pname = "quantiphy-eval";
version = "0.5";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -20,6 +21,10 @@ buildPythonPackage rec {
hash = "sha256-7VHcuINhe17lRNkHUnZkVOEtD6mVWk5gu0NbrLZwprg=";
};
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
inform
sly

4
pkgs/development/python-modules/quantiphy/default.nix
View File

@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flitBuildHook
, flit-core
, pytestCheckHook
, pythonOlder
, inform
@ -27,7 +27,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [
flitBuildHook
flit-core
];
propagatedBuildInputs = [

4
pkgs/development/python-modules/rkm-codes/default.nix
View File

@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flitBuildHook
, flit-core
, setuptools
}:
@ -18,7 +18,7 @@ buildPythonPackage rec {
format = "pyproject";
nativeBuildInputs = [
flitBuildHook
flit-core
];
propagatedBuildInputs = [
setuptools

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

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, flit-core
, feedparser
, httpx
, loca
@ -11,13 +12,17 @@
buildPythonPackage rec {
pname = "rsskey";
version = "0.2.0";
format = "flit";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-QedLuwd0ES2LWhZ72Cjh3+ZZ7HbRyNsyLN9lNFbY5dQ=";
};
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
feedparser
httpx

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

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, flit
, click
, cryptography
, ecdsa
@ -15,7 +16,7 @@
buildPythonPackage rec {
pname = "solo-python";
version = "0.1.1";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -26,6 +27,10 @@ buildPythonPackage rec {
hash = "sha256-XVPYr7JwxeZfZ68+vQ7a7MNiAfJ2bvMbM3R1ryVJ+OU=";
};
nativeBuildInputs = [
flit
];
propagatedBuildInputs = [
click
cryptography

2
pkgs/development/python-modules/sphinx-design/default.nix
View File

@ -10,7 +10,7 @@ buildPythonPackage rec {
pname = "sphinx-design";
version = "0.5.0";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.8";

2
pkgs/development/python-modules/sphinx-external-toc/default.nix
View File

@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "sphinx-external-toc";
version = "0.3.1";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";

2
pkgs/development/python-modules/sphinx-hoverxref/default.nix
View File

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "sphinx-hoverxref";
version = "1.3.0";
format = "flit";
format = "pyproject";
outputs = [ "out" "doc" ];
src = fetchFromGitHub {

7
pkgs/development/python-modules/sphinx-inline-tabs/default.nix
View File

@ -1,13 +1,14 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, sphinx
}:
buildPythonPackage rec {
pname = "sphinx-inline-tabs";
version = "2023.04.21";
format = "flit";
format = "pyproject";
src = fetchFromGitHub {
owner = "pradyunsg";
@ -16,6 +17,10 @@ buildPythonPackage rec {
hash = "sha256-1oZheHDNOQU0vWL3YClQrJe94WyUJ72bCAF1UKtjJ0w=";
};
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
sphinx
];

2
pkgs/development/python-modules/sphinx-mdinclude/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "sphinx-mdinclude";
version = "0.5.3";
format = "flit";
format = "pyproject";
src = fetchPypi {
pname = "sphinx_mdinclude";

2
pkgs/development/python-modules/sphinx-notfound-page/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "sphinx-notfound-page";
version = "0.8.3";
format = "flit";
format = "pyproject";
outputs = [ "out" "doc" ];
src = fetchFromGitHub {

2
pkgs/development/python-modules/sphinx-pytest/default.nix
View File

@ -18,7 +18,7 @@ buildPythonPackage rec {
hash = "sha256-vRHPq6BAuhn5QvHG2BGen9v6ezA3RgFVtustsNxU+n8=";
};
format = "flit";
format = "pyproject";
nativeBuildInputs = [ flit-core ];

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

@ -2,7 +2,7 @@
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, flit
, flit-core
, pytestCheckHook
, numpy
, scipy
@ -13,7 +13,7 @@ buildPythonPackage rec {
version = "3.1.0";
disabled = pythonOlder "3.6";
format = "flit";
format = "pyproject";
src = fetchFromGitHub {
owner = "joblib";
@ -22,6 +22,10 @@ buildPythonPackage rec {
hash = "sha256-/qt7cgFbvpc1BLZC7a4S0RToqSggKXAqF1Xr6xOqzw8=";
};
nativeBuildInputs = [
flit-core
];
nativeCheckInputs = [
pytestCheckHook
numpy

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

@ -2,12 +2,13 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, flit
}:
buildPythonPackage rec {
pname = "tidyexc";
version = "0.10.0";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -16,6 +17,10 @@ buildPythonPackage rec {
sha256 = "1gl1jmihafawg7hvnn4xb20vd2x5qpvca0m1wr2gk0m2jj42yiq6";
};
nativeBuildInputs = [
flit
];
pythonImportsCheck = [
"tidyexc"
];

2
pkgs/development/python-modules/tinycss2/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tinycss2";
version = "1.1.1";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.6";

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

@ -1,15 +1,19 @@
{ lib, buildPythonPackage, fetchPypi, click, tomli }:
{ lib, buildPythonPackage, fetchPypi, flit, click, tomli }:
buildPythonPackage rec {
pname = "turnt";
version = "1.11.0";
format = "flit";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-XN+qzRgZMSdeBmW0OM36mQ79sRCuP8E++SqH8FOoEq0=";
};
nativeBuildInputs = [
flit
];
propagatedBuildInputs = [
click
tomli

19
pkgs/development/python-modules/zeversolarlocal/default.nix
View File

@ -1,7 +1,9 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, flit-core
, dos2unix
, httpx
, pytest-asyncio
, pytest-mock
@ -12,7 +14,7 @@
buildPythonPackage rec {
pname = "zeversolarlocal";
version = "1.1.0";
format = "flit";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -23,6 +25,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
flit-core
dos2unix
];
propagatedBuildInputs = [
@ -35,6 +38,20 @@ buildPythonPackage rec {
pytestCheckHook
];
# the patch below won't apply unless we fix the line endings
prePatch = ''
dos2unix pyproject.toml
'';
patches = [
# Raise the flit-core limit
# https://github.com/sander76/zeversolarlocal/pull/4
(fetchpatch {
url = "https://github.com/sander76/zeversolarlocal/commit/bff072ea046de07eced77bc79eb8e90dfef1f53f.patch";
hash = "sha256-tzFCwPzhAfwVfN5mLY/DMwRv7zGzx3ScBe+kKzkYcvo=";
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov zeversolarlocal --cov-report xml:cov.xml --cov-report term-missing -vv" ""

1
pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json
View File

@ -4,7 +4,6 @@
"flit",
"flit-core",
"pbr",
"flitBuildHook",
"cython",
"hatchling",
"hatch-vcs",

66
pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
View File

@ -316,7 +316,7 @@
"setuptools"
],
"aiohttp-remotes": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"aiohttp-retry": [
@ -348,7 +348,7 @@
"setuptools"
],
"aiojobs": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"aiokafka": [
@ -428,7 +428,6 @@
],
"aioprocessing": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"aiopulse": [
@ -476,7 +475,7 @@
"setuptools"
],
"aiorun": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"aiosenseme": [
@ -920,7 +919,7 @@
"setuptools"
],
"argon2-cffi": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"argon2-cffi-bindings": [
@ -1143,7 +1142,7 @@
"setuptools"
],
"asyncstdlib": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"asynctest": [
@ -2014,7 +2013,7 @@
"setuptools"
],
"bash-kernel": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"bashlex": [
@ -3297,7 +3296,6 @@
],
"confuse": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"connect-box": [
@ -4859,7 +4857,6 @@
],
"ecs-logging": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"ed25519": [
@ -5162,7 +5159,7 @@
"exceptiongroup": [
"flit-core",
"flit-scm",
"flitBuildHook",
"flit-core",
"setuptools"
],
"exchangelib": [
@ -5293,7 +5290,7 @@
"setuptools"
],
"fastapi": [
"flitBuildHook",
"flit-core",
"hatchling",
"setuptools"
],
@ -5897,7 +5894,7 @@
"setuptools"
],
"formbox": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"formencode": [
@ -6004,7 +6001,7 @@
"setuptools"
],
"furo": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"fuse": [
@ -6248,7 +6245,7 @@
"setuptools"
],
"gidgethub": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"gigalixir": [
@ -7612,14 +7609,14 @@
"setuptools"
],
"ipfshttpclient": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"iptools": [
"setuptools"
],
"ipwhl": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"ipwhois": [
@ -8068,7 +8065,6 @@
],
"jupyter-book": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"jupyter-c-kernel": [
@ -8755,7 +8751,7 @@
"setuptools"
],
"loca": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"localimport": [
@ -9166,7 +9162,6 @@
],
"mediafile": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"mediapy": [
@ -9536,7 +9531,6 @@
],
"more-itertools": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"more-properties": [
@ -9830,12 +9824,10 @@
],
"myst-nb": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"myst-parser": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"nad-receiver": [
@ -10140,7 +10132,7 @@
"setuptools"
],
"nkdfu": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"nltk": [
@ -11239,7 +11231,6 @@
],
"pep440": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"pep440-version-utils": [
@ -11281,7 +11272,6 @@
],
"pex": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"pexif": [
@ -14144,15 +14134,15 @@
"setuptools"
],
"pytest-celery": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"pytest-check": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"pytest-cid": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"pytest-clarity": [
@ -14310,7 +14300,6 @@
],
"pytest-param-files": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"pytest-profiling": [
@ -14332,7 +14321,6 @@
],
"pytest-raisin": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"pytest-random-order": [
@ -16016,7 +16004,7 @@
"setuptools"
],
"rsskey": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"rst2ansi": [
@ -16878,7 +16866,7 @@
"setuptools"
],
"solo-python": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"somajo": [
@ -17012,19 +17000,17 @@
],
"sphinx-design": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"sphinx-external-toc": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"sphinx-fortran": [
"setuptools"
],
"sphinx-inline-tabs": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"sphinx-jinja": [
@ -17042,7 +17028,6 @@
],
"sphinx-mdinclude": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"sphinx-multitoc-numbering": [
@ -17053,7 +17038,6 @@
],
"sphinx-pytest": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"sphinx-rtd-theme": [
@ -17434,7 +17418,7 @@
"setuptools"
],
"structlog": [
"flitBuildHook",
"flit-core",
"hatch-fancy-pypi-readme",
"hatch-vcs",
"hatchling",
@ -17952,7 +17936,7 @@
"setuptools"
],
"threadpoolctl": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"threat9-test-bed": [
@ -18023,7 +18007,6 @@
],
"tinycss2": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"tinydb": [
@ -18343,7 +18326,7 @@
"setuptools"
],
"turnt": [
"flitBuildHook",
"flit-core",
"setuptools"
],
"tusker": [
@ -19848,7 +19831,6 @@
],
"zeversolarlocal": [
"flit-core",
"flitBuildHook",
"setuptools"
],
"zfec": [

6
pkgs/games/brutalmaze/default.nix
View File

@ -3,7 +3,7 @@
python3Packages.buildPythonApplication rec {
pname = "brutalmaze";
version = "1.1.1";
format = "flit";
format = "pyproject";
disabled = python3Packages.pythonOlder "3.7";
src = fetchFromSourcehut {
@ -13,6 +13,10 @@ python3Packages.buildPythonApplication rec {
sha256 = "1m105iq378mypj64syw59aldbm6bj4ma4ynhc50gafl656fabg4y";
};
nativeBuildInputs = with python3Packages; [
flit-core
];
propagatedBuildInputs = with python3Packages; [
loca
palace

6
pkgs/servers/mail/spf-engine/default.nix
View File

@ -1,15 +1,17 @@
{ lib, buildPythonApplication, fetchurl, pyspf, dnspython, authres, pymilter }:
{ lib, buildPythonApplication, fetchurl, flit-core, pyspf, dnspython, authres, pymilter }:
buildPythonApplication rec {
pname = "spf-engine";
version = "3.0.4";
format = "flit";
format = "pyproject";
src = fetchurl {
url = "https://launchpad.net/${pname}/${lib.versions.majorMinor version}/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "sha256-Gcw7enNIb/TrZEYa0Z04ezHUmfMmc1J+aEH6FlXbhTo=";
};
nativeBuildInputs = [ flit-core ];
propagatedBuildInputs = [ pyspf dnspython authres pymilter ];
pythonImportsCheck = [

6
pkgs/tools/security/pynitrokey/default.nix
View File

@ -11,7 +11,7 @@ with python3Packages;
buildPythonApplication rec {
pname = "pynitrokey";
version = "0.4.39";
format = "flit";
format = "pyproject";
src = fetchPypi {
inherit pname version;
@ -43,9 +43,13 @@ buildPythonApplication rec {
];
nativeBuildInputs = [
flit-core
pythonRelaxDepsHook
];
# FIXME: does pythonRelaxDepsHook not work for pypaBuildHook + flit-core?
pypaBuildFlags = [ "--skip-dependency-check" ];
pythonRelaxDeps = [
"click"
"cryptography"

2
pkgs/tools/security/trueseeing/default.nix
View File

@ -6,7 +6,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "trueseeing";
version = "2.1.7";
format = "flit";
format = "pyproject";
src = fetchFromGitHub {
owner = "alterakey";