diff options
74 files changed, 320 insertions, 161 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 3032cad6e7c..40236d141d3 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -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 diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index af5147e0128..18f44320f07 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -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`. diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 441ff961549..a2f6b17a874 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -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 ]; diff --git a/pkgs/applications/misc/cambrinary/default.nix b/pkgs/applications/misc/cambrinary/default.nix index 67e325cbce0..1fecfe1c17c 100644 --- a/pkgs/applications/misc/cambrinary/default.nix +++ b/pkgs/applications/misc/cambrinary/default.nix @@ -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 diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index 7adb6a1130f..e1b4fdcfa20 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -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 = '' diff --git a/pkgs/development/embedded/fpga/apio/default.nix b/pkgs/development/embedded/fpga/apio/default.nix index b201ca169d4..1ca1e3cd200 100644 --- a/pkgs/development/embedded/fpga/apio/default.nix +++ b/pkgs/development/embedded/fpga/apio/default.nix @@ -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 diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 306c33a91fd..700276e77af 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -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"; diff --git a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh b/pkgs/development/interpreters/python/hooks/flit-build-hook.sh deleted file mode 100644 index 45893aae00f..00000000000 --- a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh +++ /dev/null @@ -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 diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index e9c783116b6..fbacf6bb233 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -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 { diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index e5f9c00b2fb..d42e4e85c10 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -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 diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index ae0cbf99841..66f81b12329 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -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") [ diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix index b09accb38b7..4a66a8f35d0 100644 --- a/pkgs/development/python-modules/aioprocessing/default.nix +++ b/pkgs/development/python-modules/aioprocessing/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioprocessing"; version = "2.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index 20271236723..f0e63e0ae37 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/argon2-cffi/default.nix b/pkgs/development/python-modules/argon2-cffi/default.nix index 24e32526682..2282a06e5c6 100644 --- a/pkgs/development/python-modules/argon2-cffi/default.nix +++ b/pkgs/development/python-modules/argon2-cffi/default.nix @@ -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; diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index 9257e12f721..9049a228518 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -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 ''; diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index 4d27c6da882..8cd6af449f9 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix index b7ccfedfbb8..582e7c5dccf 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -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 diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index e5420f26c1a..90cf6a4be7f 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -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 diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index 1d2f56a85f1..a3a979f68f8 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "confuse"; version = "1.7.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/ecs-logging/default.nix b/pkgs/development/python-modules/ecs-logging/default.nix index 07def603cb7..cd55d1c4c2b 100644 --- a/pkgs/development/python-modules/ecs-logging/default.nix +++ b/pkgs/development/python-modules/ecs-logging/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ecs-logging"; version = "2.1.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/emborg/default.nix b/pkgs/development/python-modules/emborg/default.nix index 0d7218ea3ea..b4b0b9b2106 100644 --- a/pkgs/development/python-modules/emborg/default.nix +++ b/pkgs/development/python-modules/emborg/default.nix @@ -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 diff --git a/pkgs/development/python-modules/formbox/default.nix b/pkgs/development/python-modules/formbox/default.nix index 387ee2bea4e..098d13e87c9 100644 --- a/pkgs/development/python-modules/formbox/default.nix +++ b/pkgs/development/python-modules/formbox/default.nix @@ -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" ]; diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 37a9d75beee..e109f4fa048 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -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 diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index fd01e1b1d81..6ff8cc13be0 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/ipwhl/default.nix b/pkgs/development/python-modules/ipwhl/default.nix index 80068293145..6e6d0e21ef0 100644 --- a/pkgs/development/python-modules/ipwhl/default.nix +++ b/pkgs/development/python-modules/ipwhl/default.nix @@ -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 diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 81b89e77a8b..631a853833d 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "jupyter-book"; version = "0.15.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/jupyter-cache/default.nix b/pkgs/development/python-modules/jupyter-cache/default.nix index cbeb05bde98..29a8bb02458 100644 --- a/pkgs/development/python-modules/jupyter-cache/default.nix +++ b/pkgs/development/python-modules/jupyter-cache/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "jupyter-cache"; version = "0.6.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/loca/default.nix b/pkgs/development/python-modules/loca/default.nix index 8ad0a4adbe7..28a9020d744 100644 --- a/pkgs/development/python-modules/loca/default.nix +++ b/pkgs/development/python-modules/loca/default.nix @@ -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" ]; diff --git a/pkgs/development/python-modules/looseversion/default.nix b/pkgs/development/python-modules/looseversion/default.nix index 19b5d10ca0e..b16fd1a572d 100644 --- a/pkgs/development/python-modules/looseversion/default.nix +++ b/pkgs/development/python-modules/looseversion/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/mdformat-admon/default.nix b/pkgs/development/python-modules/mdformat-admon/default.nix index 1d285d89c70..a7fd0f94037 100644 --- a/pkgs/development/python-modules/mdformat-admon/default.nix +++ b/pkgs/development/python-modules/mdformat-admon/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/mdformat-footnote/default.nix b/pkgs/development/python-modules/mdformat-footnote/default.nix index cee0e1bd5e5..4d7b56f0c2f 100644 --- a/pkgs/development/python-modules/mdformat-footnote/default.nix +++ b/pkgs/development/python-modules/mdformat-footnote/default.nix @@ -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 diff --git a/pkgs/development/python-modules/mdformat-frontmatter/default.nix b/pkgs/development/python-modules/mdformat-frontmatter/default.nix index 67e0634fa1d..b073bb83a59 100644 --- a/pkgs/development/python-modules/mdformat-frontmatter/default.nix +++ b/pkgs/development/python-modules/mdformat-frontmatter/default.nix @@ -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 diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 73404542652..e8efd7bac91 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -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 diff --git a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix index b4d293f6368..c5bbeeb46de 100644 --- a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix +++ b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/mdformat-tables/default.nix b/pkgs/development/python-modules/mdformat-tables/default.nix index 747029eab27..018371ada82 100644 --- a/pkgs/development/python-modules/mdformat-tables/default.nix +++ b/pkgs/development/python-modules/mdformat-tables/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix index a3c2ad7794f..00a657800da 100644 --- a/pkgs/development/python-modules/mediafile/default.nix +++ b/pkgs/development/python-modules/mediafile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mediafile"; version = "0.10.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index 28f754e98ed..c37aa8f867e 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -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" ]; diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index f5243236189..86a1b5d3d32 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index 6ede481fba8..33c06fc2461 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "myst-nb"; version = "0.17.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index 807060528ee..185fffba413 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , docopt , fetchFromGitHub -, flitBuildHook +, flit-core , hypothesis , inform , nestedtext @@ -27,7 +27,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix index 340af281269..35d6fa16e1d 100644 --- a/pkgs/development/python-modules/nkdfu/default.nix +++ b/pkgs/development/python-modules/nkdfu/default.nix @@ -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 diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index 38370a1c805..4306579bc51 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -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 diff --git a/pkgs/development/python-modules/pep440/default.nix b/pkgs/development/python-modules/pep440/default.nix index c9753a47d81..0faa3c324b3 100644 --- a/pkgs/development/python-modules/pep440/default.nix +++ b/pkgs/development/python-modules/pep440/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pep440"; version = "0.1.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix index d70cfd1c434..ddb610b53bc 100644 --- a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix +++ b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix @@ -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; diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 2a6ad34d706..0af07db4ec1 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -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; diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index dbbf42c9b6a..1f11f31e213 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix index 29cf253fad2..eea7a6ead0e 100644 --- a/pkgs/development/python-modules/pytest-cid/default.nix +++ b/pkgs/development/python-modules/pytest-cid/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/pytest-param-files/default.nix b/pkgs/development/python-modules/pytest-param-files/default.nix index bf629cc356a..80dea1dbeaa 100644 --- a/pkgs/development/python-modules/pytest-param-files/default.nix +++ b/pkgs/development/python-modules/pytest-param-files/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-Q7wWoggJN2w2a2umQHx5TsVcugqpovBEtOKruNMZQ8A="; }; - format = "flit"; + format = "pyproject"; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/pytest-raisin/default.nix b/pkgs/development/python-modules/pytest-raisin/default.nix index 2b3860c93f9..2da96d21c9e 100644 --- a/pkgs/development/python-modules/pytest-raisin/default.nix +++ b/pkgs/development/python-modules/pytest-raisin/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/python_docs_theme/default.nix b/pkgs/development/python-modules/python_docs_theme/default.nix index 1e3776b906a..90cf78e4d69 100644 --- a/pkgs/development/python-modules/python_docs_theme/default.nix +++ b/pkgs/development/python-modules/python_docs_theme/default.nix @@ -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" ]; diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index 18141543c98..367416c2960 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/quantiphy-eval/default.nix b/pkgs/development/python-modules/quantiphy-eval/default.nix index 68eba2e9462..92e1f94c1ad 100644 --- a/pkgs/development/python-modules/quantiphy-eval/default.nix +++ b/pkgs/development/python-modules/quantiphy-eval/default.nix @@ -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 diff --git a/pkgs/development/python-modules/quantiphy/default.nix b/pkgs/development/python-modules/quantiphy/default.nix index b05a0428f97..57ac30017ce 100644 --- a/pkgs/development/python-modules/quantiphy/default.nix +++ b/pkgs/development/python-modules/quantiphy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, flitBuildHook +, flit-core , pytestCheckHook , pythonOlder , inform @@ -27,7 +27,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rkm-codes/default.nix b/pkgs/development/python-modules/rkm-codes/default.nix index 558dcdc076a..ca003ed9069 100644 --- a/pkgs/development/python-modules/rkm-codes/default.nix +++ b/pkgs/development/python-modules/rkm-codes/default.nix @@ -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 diff --git a/pkgs/development/python-modules/rsskey/default.nix b/pkgs/development/python-modules/rsskey/default.nix index 095ce2b5c8c..61cba286d1b 100644 --- a/pkgs/development/python-modules/rsskey/default.nix +++ b/pkgs/development/python-modules/rsskey/default.nix @@ -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 diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index b0166c303d7..fef12eb963a 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -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 diff --git a/pkgs/development/python-modules/sphinx-design/default.nix b/pkgs/development/python-modules/sphinx-design/default.nix index 4e585353687..ad109b1d30f 100644 --- a/pkgs/development/python-modules/sphinx-design/default.nix +++ b/pkgs/development/python-modules/sphinx-design/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sphinx-design"; version = "0.5.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix index cc0163ba3d6..0aff8f37caa 100644 --- a/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sphinx-external-toc"; version = "0.3.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix index f11db7fc973..d6237387bf8 100644 --- a/pkgs/development/python-modules/sphinx-hoverxref/default.nix +++ b/pkgs/development/python-modules/sphinx-hoverxref/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "sphinx-hoverxref"; version = "1.3.0"; - format = "flit"; + format = "pyproject"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix index 4803e8d4c1a..0f44efae979 100644 --- a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix +++ b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix index ca7e574c82f..d20446e91bb 100644 --- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sphinx-mdinclude"; version = "0.5.3"; - format = "flit"; + format = "pyproject"; src = fetchPypi { pname = "sphinx_mdinclude"; diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix index c6255bbc538..edc8e2ce6b0 100644 --- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sphinx-notfound-page"; version = "0.8.3"; - format = "flit"; + format = "pyproject"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix index 6d05a38d63a..ecb2cbf55e7 100644 --- a/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-vRHPq6BAuhn5QvHG2BGen9v6ezA3RgFVtustsNxU+n8="; }; - format = "flit"; + format = "pyproject"; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index bfe40429127..54d7fa12829 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -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 diff --git a/pkgs/development/python-modules/tidyexc/default.nix b/pkgs/development/python-modules/tidyexc/default.nix index b4f7ed0ef58..5e14812fe7b 100644 --- a/pkgs/development/python-modules/tidyexc/default.nix +++ b/pkgs/development/python-modules/tidyexc/default.nix @@ -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" ]; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 4c21305ac09..35c8578cab4 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tinycss2"; version = "1.1.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/turnt/default.nix b/pkgs/development/python-modules/turnt/default.nix index 1fe1d303856..b003f134004 100644 --- a/pkgs/development/python-modules/turnt/default.nix +++ b/pkgs/development/python-modules/turnt/default.nix @@ -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 diff --git a/pkgs/development/python-modules/zeversolarlocal/default.nix b/pkgs/development/python-modules/zeversolarlocal/default.nix index 04063837b42..b1e515d7632 100644 --- a/pkgs/development/python-modules/zeversolarlocal/default.nix +++ b/pkgs/development/python-modules/zeversolarlocal/default.nix @@ -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" "" diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json index 10c7b9e4ca4..201aae3c920 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json @@ -4,7 +4,6 @@ "flit", "flit-core", "pbr", - "flitBuildHook", "cython", "hatchling", "hatch-vcs", diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index 176881caeed..04174d1c435 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -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": [ diff --git a/pkgs/games/brutalmaze/default.nix b/pkgs/games/brutalmaze/default.nix index d9c904d99a3..8f8930ce0c6 100644 --- a/pkgs/games/brutalmaze/default.nix +++ b/pkgs/games/brutalmaze/default.nix @@ -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 diff --git a/pkgs/servers/mail/spf-engine/default.nix b/pkgs/servers/mail/spf-engine/default.nix index c90522edf04..326d42d5d78 100644 --- a/pkgs/servers/mail/spf-engine/default.nix +++ b/pkgs/servers/mail/spf-engine/default.nix @@ -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 = [ diff --git a/pkgs/tools/security/pynitrokey/default.nix b/pkgs/tools/security/pynitrokey/default.nix index b9847171616..9c36ceb3c84 100644 --- a/pkgs/tools/security/pynitrokey/default.nix +++ b/pkgs/tools/security/pynitrokey/default.nix @@ -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" diff --git a/pkgs/tools/security/trueseeing/default.nix b/pkgs/tools/security/trueseeing/default.nix index 607a1798452..a9c4f300141 100644 --- a/pkgs/tools/security/trueseeing/default.nix +++ b/pkgs/tools/security/trueseeing/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "trueseeing"; version = "2.1.7"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "alterakey"; |