From 3f6d337be6743edbda8f1457072d8b8591ae88d3 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 13 Jul 2025 17:03:16 +0200 Subject: [PATCH] pkgs/by-name/{u,v,w,x,y,z}*: migrate to pyproject = true --- pkgs/by-name/ud/uddup/package.nix | 8 +++- pkgs/by-name/ud/udocker/package.nix | 8 +++- pkgs/by-name/ul/ulauncher/package.nix | 14 +++++-- pkgs/by-name/un/undervolt/package.nix | 8 +++- pkgs/by-name/un/unicode-paracode/package.nix | 6 ++- pkgs/by-name/un/unsilence/package.nix | 11 +++--- pkgs/by-name/ur/urlwatch/package.nix | 8 +++- pkgs/by-name/us/usbrip/package.nix | 11 +++--- pkgs/by-name/us/usbsdmux/package.nix | 6 ++- pkgs/by-name/va/vanguards/package.nix | 6 ++- pkgs/by-name/va/variety/package.nix | 6 ++- pkgs/by-name/vc/vcstool/package.nix | 10 +++-- pkgs/by-name/vi/vim-vint/package.nix | 22 +++++------ pkgs/by-name/vi/vimiv-qt/package.nix | 9 +++-- pkgs/by-name/vi/virtnbdbackup/package.nix | 4 +- pkgs/by-name/vi/vit/package.nix | 8 +++- pkgs/by-name/vk/vkbasalt-cli/package.nix | 6 ++- pkgs/by-name/wa/waagent/package.nix | 7 +++- pkgs/by-name/wa/wad/package.nix | 6 ++- pkgs/by-name/wa/watson/package.nix | 38 ++++++++++--------- .../wa/wayback-machine-archiver/package.nix | 13 +++++-- pkgs/by-name/wa/waymore/package.nix | 9 ++++- pkgs/by-name/wi/win2xcur/package.nix | 11 +++++- pkgs/by-name/wl/wlc/package.nix | 14 ++++--- pkgs/by-name/wl/wllvm/package.nix | 8 +++- pkgs/by-name/wp/wpm/package.nix | 8 ++-- pkgs/by-name/xb/xborders/package.nix | 6 ++- pkgs/by-name/xd/xdxf2slob/package.nix | 12 ++++-- pkgs/by-name/xe/xed/package.nix | 4 +- pkgs/by-name/xe/xenomapper/package.nix | 11 +++++- pkgs/by-name/xe/xenon/package.nix | 8 +++- pkgs/by-name/xk/xkeysnail/package.nix | 8 +++- pkgs/by-name/xm/xmldiff/package.nix | 8 ++-- .../xonsh/xontribs/xonsh-direnv/default.nix | 2 +- pkgs/by-name/xp/xpaste/package.nix | 6 ++- pkgs/by-name/ya/yams/package.nix | 8 +++- pkgs/by-name/yo/you-get/package.nix | 4 +- pkgs/by-name/yt/ytmdl/package.nix | 21 +++++----- pkgs/by-name/za/zapzap/package.nix | 11 ++++-- pkgs/by-name/zf/zfs-autobackup/package.nix | 6 ++- pkgs/by-name/zi/zim/package.nix | 4 +- .../zs/zsh-history-to-fish/package.nix | 6 ++- 42 files changed, 261 insertions(+), 129 deletions(-) diff --git a/pkgs/by-name/ud/uddup/package.nix b/pkgs/by-name/ud/uddup/package.nix index 9f8ec15df2cf..1975e0d73274 100644 --- a/pkgs/by-name/ud/uddup/package.nix +++ b/pkgs/by-name/ud/uddup/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "uddup"; version = "0.9.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "rotemreiss"; @@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1f5dm3772hiik9irnyvbs7wygcafbwi7czw3b47cwhb90b8fi5hg"; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ colorama ]; diff --git a/pkgs/by-name/ud/udocker/package.nix b/pkgs/by-name/ud/udocker/package.nix index bc87553651ec..49be910c01b3 100644 --- a/pkgs/by-name/ud/udocker/package.nix +++ b/pkgs/by-name/ud/udocker/package.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { pname = "udocker"; version = "1.3.17"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "indigo-dc"; @@ -30,6 +30,10 @@ python3Packages.buildPythonApplication rec { singularity ]; + build-system = with python3Packages; [ + setuptools + ]; + dependencies = with python3Packages; [ pycurl ]; @@ -49,6 +53,8 @@ python3Packages.buildPythonApplication rec { "tests/unit/test_dockerioapi.py" ]; + pythonImportsCheck = [ "udocker" ]; + passthru = { tests.version = testers.testVersion { package = udocker; }; }; diff --git a/pkgs/by-name/ul/ulauncher/package.nix b/pkgs/by-name/ul/ulauncher/package.nix index b7b6e1f74baf..c9fdbcf6defa 100644 --- a/pkgs/by-name/ul/ulauncher/package.nix +++ b/pkgs/by-name/ul/ulauncher/package.nix @@ -23,15 +23,14 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; version = "5.15.7"; - format = "setuptools"; + pyproject = true; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; hash = "sha256-YgOw3Gyy/o8qorWAnAlQrAZ2ZTnyP3PagLs2Qkdg788="; }; - nativeBuildInputs = with python3Packages; [ - distutils-extra + nativeBuildInputs = [ gobject-introspection intltool wrapGAppsHook3 @@ -50,7 +49,12 @@ python3Packages.buildPythonApplication rec { wmctrl ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ + setuptools + distutils-extra + ]; + + dependencies = with python3Packages; [ mock dbus-python pygobject3 @@ -102,6 +106,8 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; + pythonImportsCheck = [ "ulauncher" ]; + # do not double wrap dontWrapGApps = true; preFixup = '' diff --git a/pkgs/by-name/un/undervolt/package.nix b/pkgs/by-name/un/undervolt/package.nix index 3b75f468ca08..b00041ba1124 100644 --- a/pkgs/by-name/un/undervolt/package.nix +++ b/pkgs/by-name/un/undervolt/package.nix @@ -5,9 +5,9 @@ }: python3Packages.buildPythonApplication rec { - version = "0.4.0"; - format = "setuptools"; pname = "undervolt"; + version = "0.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "georgewhewell"; @@ -16,6 +16,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-G+CK/lnZXkQdyNZPqY9P3owVJsd22H3K8wSpjHFG0ow="; }; + build-system = with python3Packages; [ setuptools ]; + + pythonImportsCheck = [ "undervolt" ]; + meta = with lib; { homepage = "https://github.com/georgewhewell/undervolt/"; description = "Program for undervolting Intel CPUs on Linux"; diff --git a/pkgs/by-name/un/unicode-paracode/package.nix b/pkgs/by-name/un/unicode-paracode/package.nix index 004eab28cce9..2b3ac152a4ce 100644 --- a/pkgs/by-name/un/unicode-paracode/package.nix +++ b/pkgs/by-name/un/unicode-paracode/package.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { pname = "unicode"; version = "2.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "garabik"; @@ -26,9 +26,11 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; + build-system = with python3Packages; [ setuptools ]; + postFixup = '' substituteInPlace "$out/bin/.unicode-wrapped" \ - --replace "/usr/share/unicode/UnicodeData.txt" "$ucdtxt" + --replace-fail "/usr/share/unicode/UnicodeData.txt" "$ucdtxt" ''; postInstall = '' diff --git a/pkgs/by-name/un/unsilence/package.nix b/pkgs/by-name/un/unsilence/package.nix index 02784951d806..4b7a8077bc70 100644 --- a/pkgs/by-name/un/unsilence/package.nix +++ b/pkgs/by-name/un/unsilence/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonPackage rec { pname = "unsilence"; version = "1.0.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "lagmoellertim"; @@ -16,13 +16,12 @@ python3Packages.buildPythonPackage rec { hash = "sha256-M4Ek1JZwtr7vIg14aTa8h4otIZnPQfKNH4pZE4GpiBQ="; }; - nativeBuildInputs = with python3Packages; [ - rich + build-system = with python3Packages; [ + setuptools ]; - propagatedBuildInputs = [ - python3Packages.rich - python3Packages.setuptools # imports pkg_resources.parse_version + dependencies = with python3Packages; [ + rich ]; makeWrapperArgs = [ diff --git a/pkgs/by-name/ur/urlwatch/package.nix b/pkgs/by-name/ur/urlwatch/package.nix index d653389865c4..972cd24c1cfd 100644 --- a/pkgs/by-name/ur/urlwatch/package.nix +++ b/pkgs/by-name/ur/urlwatch/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "urlwatch"; version = "2.29"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "thp"; @@ -16,7 +16,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-X1UR9JrQuujOIUg87W0YqfXsM3A5nttWjjJMIe3hgk8="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ cssselect jq keyring @@ -35,6 +37,8 @@ python3Packages.buildPythonApplication rec { # no tests doCheck = false; + pythonImportsCheck = [ "urlwatch" ]; + meta = with lib; { description = "Tool for monitoring webpages for updates"; mainProgram = "urlwatch"; diff --git a/pkgs/by-name/us/usbrip/package.nix b/pkgs/by-name/us/usbrip/package.nix index f44552e5c236..9c07a2002f03 100644 --- a/pkgs/by-name/us/usbrip/package.nix +++ b/pkgs/by-name/us/usbrip/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication { pname = "usbrip"; version = "unstable-2021-07-02"; - format = "setuptools"; + pyproject = true; disabled = python3.pythonOlder "3.6"; @@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication { sha256 = "1vws8ybhv7szpqvlbmv0hrkys2fhhaa5bj9dywv3q2y1xmljl0py"; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ termcolor terminaltables tqdm @@ -27,9 +29,8 @@ python3.pkgs.buildPythonApplication { postPatch = '' # Remove install helpers which we don't need substituteInPlace setup.py \ - --replace "parse_requirements('requirements.txt')," "[]," \ - --replace "resolve('wheel')" "" \ - --replace "'install': LocalInstallCommand," "" + --replace-fail "resolve('wheel')" "" \ + --replace-fail "'install': LocalInstallCommand," "" ''; # Project has no tests diff --git a/pkgs/by-name/us/usbsdmux/package.nix b/pkgs/by-name/us/usbsdmux/package.nix index cbdc49f19418..26945b0c8e98 100644 --- a/pkgs/by-name/us/usbsdmux/package.nix +++ b/pkgs/by-name/us/usbsdmux/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "usbsdmux"; version = "24.1.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -22,6 +22,8 @@ python3Packages.buildPythonApplication rec { --replace-fail 'TAG+="uaccess", GROUP="plugdev"' 'TAG+="uaccess"' ''; + build-system = with python3Packages; [ setuptools ]; + nativeBuildInputs = [ udevCheckHook ]; @@ -32,6 +34,8 @@ python3Packages.buildPythonApplication rec { install -Dm0444 -t $out/lib/udev/rules.d/ contrib/udev/99-usbsdmux.rules ''; + pythonImportsCheck = [ "usbsdmux" ]; + meta = with lib; { description = "Control software for the LXA USB-SD-Mux"; homepage = "https://github.com/linux-automation/usbsdmux"; diff --git a/pkgs/by-name/va/vanguards/package.nix b/pkgs/by-name/va/vanguards/package.nix index f1b81fc4e699..6f2f77c941d5 100644 --- a/pkgs/by-name/va/vanguards/package.nix +++ b/pkgs/by-name/va/vanguards/package.nix @@ -6,7 +6,9 @@ python312Packages.buildPythonApplication { pname = "vanguards"; version = "0.3.1-unstable-2023-10-31"; - format = "setuptools"; + pyproject = true; + + build-system = [ python312Packages.setuptools ]; dependencies = [ python312Packages.stem ]; #tries to access the network during the tests, which fails @@ -25,6 +27,8 @@ python312Packages.buildPythonApplication { 'import stem.response.events' 'import stem.socket; import stem.control; import stem.response.events' ''; + pythonImportsCheck = [ "vanguards" ]; + meta = { maintainers = with lib.maintainers; [ ForgottenBeast ]; mainProgram = "vanguards"; diff --git a/pkgs/by-name/va/variety/package.nix b/pkgs/by-name/va/variety/package.nix index 4515739d0598..3ab710244956 100644 --- a/pkgs/by-name/va/variety/package.nix +++ b/pkgs/by-name/va/variety/package.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { pname = "variety"; version = "0.8.13"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "varietywalls"; @@ -46,6 +46,8 @@ python3Packages.buildPythonApplication rec { librsvg ] ++ lib.optional appindicatorSupport libayatana-appindicator; + build-system = with python3Packages; [ setuptools ]; + dependencies = with python3Packages; [ @@ -85,6 +87,8 @@ python3Packages.buildPythonApplication rec { --replace-fail "{VARIETY_PATH}" "variety" ''; + pythonImportsCheck = [ "variety" ]; + meta = { homepage = "https://github.com/varietywalls/variety"; description = "Wallpaper manager for Linux systems"; diff --git a/pkgs/by-name/vc/vcstool/package.nix b/pkgs/by-name/vc/vcstool/package.nix index 1d1ada92230f..d014089090a6 100644 --- a/pkgs/by-name/vc/vcstool/package.nix +++ b/pkgs/by-name/vc/vcstool/package.nix @@ -12,16 +12,18 @@ with python3Packages; buildPythonApplication rec { pname = "vcstool"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "04b3a963e15386660f139e5b95d293e43e3cb414e3b13e14ee36f5223032ee2c"; }; - propagatedBuildInputs = [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = [ pyyaml - setuptools + setuptools # pkg_resources is imported during runtime ]; makeWrapperArgs = [ @@ -37,6 +39,8 @@ buildPythonApplication rec { doCheck = false; # requires network + pythonImportsCheck = [ "vcstool" ]; + meta = with lib; { description = "Provides a command line tool to invoke vcs commands on multiple repositories"; homepage = "https://github.com/dirk-thomas/vcstool"; diff --git a/pkgs/by-name/vi/vim-vint/package.nix b/pkgs/by-name/vi/vim-vint/package.nix index f1f78a112597..2b5006e5ee91 100644 --- a/pkgs/by-name/vi/vim-vint/package.nix +++ b/pkgs/by-name/vi/vim-vint/package.nix @@ -4,12 +4,10 @@ fetchFromGitHub, }: -with python3Packages; - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "vim-vint"; version = "0.3.21"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Vimjas"; @@ -18,18 +16,18 @@ buildPythonApplication rec { hash = "sha256-A0yXDkB/b9kEEXSoLeqVdmdm4p2PYL2QHqbF4FgAn30="; }; - # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. - disabled = !pythonAtLeast "3.5"; + build-system = with python3Packages; [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ ansicolor chardet pyyaml - setuptools + setuptools # pkg_resources is imported during runtime + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-cov-stub ]; preCheck = '' diff --git a/pkgs/by-name/vi/vimiv-qt/package.nix b/pkgs/by-name/vi/vimiv-qt/package.nix index 15d19936237f..e7f69c62da0b 100644 --- a/pkgs/by-name/vi/vimiv-qt/package.nix +++ b/pkgs/by-name/vi/vimiv-qt/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "vimiv-qt"; version = "0.9.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "karlch"; @@ -19,13 +19,14 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-28sk5qDVmrgXYX2wm5G8zv564vG6GwxNp+gjrFHCRfU="; }; + build-system = with python3.pkgs; [ setuptools ]; + nativeBuildInputs = [ installShellFiles qt5.wrapQtAppsHook - python3.pkgs.setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ pyqt5 py3exiv2 ]; @@ -44,6 +45,8 @@ python3.pkgs.buildPythonApplication rec { done ''; + pythonImportsCheck = [ "vimiv" ]; + # Vimiv has to be wrapped manually because it is a non-ELF executable. dontWrapQtApps = true; preFixup = '' diff --git a/pkgs/by-name/vi/virtnbdbackup/package.nix b/pkgs/by-name/vi/virtnbdbackup/package.nix index 6c2ebe4384fa..ae64b13ece2c 100644 --- a/pkgs/by-name/vi/virtnbdbackup/package.nix +++ b/pkgs/by-name/vi/virtnbdbackup/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "virtnbdbackup"; version = "2.29"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "abbbi"; @@ -38,6 +38,8 @@ python3Packages.buildPythonApplication rec { versionCheckProgramArg = "-V"; + pythonImportsCheck = [ "libvirtnbdbackup" ]; + meta = { description = "Backup utility for Libvirt/qemu/kvm"; homepage = "https://github.com/abbbi/virtnbdbackup"; diff --git a/pkgs/by-name/vi/vit/package.nix b/pkgs/by-name/vi/vit/package.nix index a78636cfb762..88ab07958ba4 100644 --- a/pkgs/by-name/vi/vit/package.nix +++ b/pkgs/by-name/vi/vit/package.nix @@ -11,7 +11,7 @@ with python3Packages; buildPythonApplication rec { pname = "vit"; version = "2.3.3"; - format = "setuptools"; + pyproject = true; disabled = lib.versionOlder python.version "3.7"; src = fetchPypi { @@ -19,7 +19,9 @@ buildPythonApplication rec { hash = "sha256-+lrXGfhoB4z5IWkJTXMIm3GGVPfNGO9lUB3uFTx8hDY="; }; - propagatedBuildInputs = [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = [ tasklib urwid ]; @@ -37,6 +39,8 @@ buildPythonApplication rec { export TERM=''${TERM-linux} ''; + pythonImportsCheck = [ "vit" ]; + meta = with lib; { homepage = "https://github.com/scottkosty/vit"; description = "Visual Interactive Taskwarrior"; diff --git a/pkgs/by-name/vk/vkbasalt-cli/package.nix b/pkgs/by-name/vk/vkbasalt-cli/package.nix index f11a4890f454..c5e32ac4f5b8 100644 --- a/pkgs/by-name/vk/vkbasalt-cli/package.nix +++ b/pkgs/by-name/vk/vkbasalt-cli/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "vkbasalt-cli"; version = "3.1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitLab { owner = "TheEvilSkeleton"; @@ -19,9 +19,11 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace vkbasalt/lib.py \ - --replace /usr ${vkbasalt} + --replace-fail /usr ${vkbasalt} ''; + build-system = with python3Packages; [ setuptools ]; + pythonImportsCheck = [ "vkbasalt.lib" ]; meta = with lib; { diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix index e0537c7afa32..d406c36da99a 100644 --- a/pkgs/by-name/wa/waagent/package.nix +++ b/pkgs/by-name/wa/waagent/package.nix @@ -16,7 +16,8 @@ in python.pkgs.buildPythonApplication rec { pname = "waagent"; version = "2.14.0.0"; - format = "setuptools"; + pyproject = true; + src = fetchFromGitHub { owner = "Azure"; repo = "WALinuxAgent"; @@ -47,7 +48,9 @@ python.pkgs.buildPythonApplication rec { --replace-fail '/usr/bin/openssl' '${openssl}/bin/openssl' ''; - propagatedBuildInputs = [ python.pkgs.distro ]; + build-system = with python.pkgs; [ setuptools ]; + + dependencies = with python.pkgs; [ distro ]; # The udev rules are placed to the wrong place. # Move them to their default location. diff --git a/pkgs/by-name/wa/wad/package.nix b/pkgs/by-name/wa/wad/package.nix index c1e21ab8261a..231c197832ea 100644 --- a/pkgs/by-name/wa/wad/package.nix +++ b/pkgs/by-name/wa/wad/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "wad"; version = "0.4.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "CERN-CERT"; @@ -16,7 +16,9 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-/mlmOzFkyKpmK/uk4813Wk0cf/+ynX3Qxafnd1mGR5k="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ six ]; diff --git a/pkgs/by-name/wa/watson/package.nix b/pkgs/by-name/wa/watson/package.nix index 0b761f2148a5..2d2f926a988a 100644 --- a/pkgs/by-name/wa/watson/package.nix +++ b/pkgs/by-name/wa/watson/package.nix @@ -6,12 +6,10 @@ fetchpatch, }: -with python3.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "watson"; version = "2.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jazzband"; @@ -29,25 +27,31 @@ buildPythonApplication rec { }) ]; + nativeBuildInputs = [ installShellFiles ]; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + arrow + click + click-didyoumean + requests + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + pytest-mock + mock + pytest-datafiles + ]; + postInstall = '' installShellCompletion --bash --name watson watson.completion installShellCompletion --zsh --name _watson watson.zsh-completion installShellCompletion --fish watson.fish ''; - nativeCheckInputs = [ - pytestCheckHook - pytest-mock - mock - pytest-datafiles - ]; - propagatedBuildInputs = [ - arrow - click - click-didyoumean - requests - ]; - nativeBuildInputs = [ installShellFiles ]; + pythonImportsCheck = [ "watson" ]; meta = with lib; { homepage = "https://github.com/jazzband/Watson"; diff --git a/pkgs/by-name/wa/wayback-machine-archiver/package.nix b/pkgs/by-name/wa/wayback-machine-archiver/package.nix index 270f44ca8e11..76fa33e94f33 100644 --- a/pkgs/by-name/wa/wayback-machine-archiver/package.nix +++ b/pkgs/by-name/wa/wayback-machine-archiver/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "wayback-machine-archiver"; version = "1.9.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "agude"; @@ -16,8 +16,13 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0dnnqx507gpj8wsx6f2ivfmha969ydayiqsvxh23p9qcixw9257x"; }; - nativeBuildInputs = with python3.pkgs; [ pypandoc ]; - propagatedBuildInputs = with python3.pkgs; [ requests ]; + build-system = with python3.pkgs; [ + setuptools + pypandoc + ]; + + dependencies = with python3.pkgs; [ requests ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook requests-mock @@ -25,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace \"pytest-runner\", "" + --replace-fail \"pytest-runner\", "" ''; pythonImportsCheck = [ "wayback_machine_archiver" ]; diff --git a/pkgs/by-name/wa/waymore/package.nix b/pkgs/by-name/wa/waymore/package.nix index 181fd35adc10..a0f6c6fdcea1 100644 --- a/pkgs/by-name/wa/waymore/package.nix +++ b/pkgs/by-name/wa/waymore/package.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "waymore"; version = "4.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "xnl-h4ck3r"; @@ -26,6 +26,11 @@ python3Packages.buildPythonApplication rec { setuptools ]; + pythonRemoveDeps = [ + # python already provides urllib.parse + "urlparse3" + ]; + dependencies = with python3Packages; [ requests termcolor @@ -35,6 +40,8 @@ python3Packages.buildPythonApplication rec { tldextract ]; + pythonImportsCheck = [ "waymore.waymore" ]; + passthru.tests.version = testers.testVersion { package = waymore; command = "waymore --version"; diff --git a/pkgs/by-name/wi/win2xcur/package.nix b/pkgs/by-name/wi/win2xcur/package.nix index 1b75eededa37..d365c2aa8a03 100644 --- a/pkgs/by-name/wi/win2xcur/package.nix +++ b/pkgs/by-name/wi/win2xcur/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonPackage rec { pname = "win2xcur"; version = "0.1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "quantum5"; @@ -16,11 +16,18 @@ python3Packages.buildPythonPackage rec { hash = "sha256-OjLj+QYg8YOJzDq3Y6/uyEXlNWbPm8VA/b1yP9jT6Jo="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ numpy wand ]; + pythonImportsCheck = [ + "win2xcur.main.win2xcur" + "win2xcur.main.x2wincur" + ]; + meta = { description = "Tools that convert cursors between the Windows (*.cur, *.ani) and Xcursor format"; homepage = "https://github.com/quantum5/win2xcur"; diff --git a/pkgs/by-name/wl/wlc/package.nix b/pkgs/by-name/wl/wlc/package.nix index 04d734fc0ec1..2c3731103ef3 100644 --- a/pkgs/by-name/wl/wlc/package.nix +++ b/pkgs/by-name/wl/wlc/package.nix @@ -4,19 +4,19 @@ fetchPypi, }: -with python3.pkgs; - -buildPythonPackage rec { +python3.pkgs.buildPythonPackage rec { pname = "wlc"; version = "1.15"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-0T8cMq5Mrv/Ygo6BfYho3sjFuu8dYZyUMtJc5gabuG4="; }; - propagatedBuildInputs = [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ argcomplete python-dateutil requests @@ -25,10 +25,12 @@ buildPythonPackage rec { twine ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; + pythonImportsCheck = [ "wlc" ]; + meta = with lib; { description = "Weblate commandline client using Weblate's REST API"; homepage = "https://github.com/WeblateOrg/wlc"; diff --git a/pkgs/by-name/wl/wllvm/package.nix b/pkgs/by-name/wl/wllvm/package.nix index bc1c9ebac3e0..365c9ff472e2 100644 --- a/pkgs/by-name/wl/wllvm/package.nix +++ b/pkgs/by-name/wl/wllvm/package.nix @@ -5,15 +5,19 @@ }: python3Packages.buildPythonApplication rec { - version = "1.3.1"; - format = "setuptools"; pname = "wllvm"; + version = "1.3.1"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE="; }; + build-system = with python3Packages; [ setuptools ]; + + pythonImportsCheck = [ "wllvm.wllvm" ]; + meta = with lib; { homepage = "https://github.com/travitch/whole-program-llvm"; description = "Wrapper script to build whole-program LLVM bitcode files"; diff --git a/pkgs/by-name/wp/wpm/package.nix b/pkgs/by-name/wp/wpm/package.nix index 63e9a06d3da9..7f12b096c7a2 100644 --- a/pkgs/by-name/wp/wpm/package.nix +++ b/pkgs/by-name/wp/wpm/package.nix @@ -7,15 +7,17 @@ python3.pkgs.buildPythonApplication rec { pname = "wpm"; version = "1.51.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-swT9E5Tto4yWnm0voowcJXtY3cIY3MNqAdfrTnuGbdg="; }; - propagatedBuildInputs = with python3.pkgs; [ - setuptools + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + setuptools # pkg_resources is imported during runtime ]; pythonImportsCheck = [ "wpm" ]; diff --git a/pkgs/by-name/xb/xborders/package.nix b/pkgs/by-name/xb/xborders/package.nix index 72d2c48bdbbe..d3e69da2884c 100644 --- a/pkgs/by-name/xb/xborders/package.nix +++ b/pkgs/by-name/xb/xborders/package.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { pname = "xborders"; version = "3.4"; # in version.txt - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "deter0"; @@ -33,7 +33,9 @@ python3Packages.buildPythonPackage rec { gobject-introspection ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ pycairo requests pygobject3 diff --git a/pkgs/by-name/xd/xdxf2slob/package.nix b/pkgs/by-name/xd/xdxf2slob/package.nix index c694ca396bb6..dc0a015d44d6 100644 --- a/pkgs/by-name/xd/xdxf2slob/package.nix +++ b/pkgs/by-name/xd/xdxf2slob/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication { pname = "xdxf2slob"; version = "unstable-2015-06-30"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "itkach"; @@ -16,11 +16,15 @@ python3Packages.buildPythonApplication { sha256 = "0m3dnc3816ja3kmik1wabb706dkqdf5sxvabwgf2rcrq891xcddd"; }; - propagatedBuildInputs = [ - python3Packages.pyicu - python3Packages.slob + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ + pyicu + slob ]; + pythonImportsCheck = [ "xdxf2slob" ]; + meta = with lib; { description = "Tool to convert XDXF dictionary files to slob format"; homepage = "https://github.com/itkach/xdxf2slob/"; diff --git a/pkgs/by-name/xe/xed/package.nix b/pkgs/by-name/xe/xed/package.nix index e3fea2801bcf..505b337a86f2 100644 --- a/pkgs/by-name/xe/xed/package.nix +++ b/pkgs/by-name/xe/xed/package.nix @@ -13,7 +13,7 @@ let mbuild = python3Packages.buildPythonPackage rec { pname = "mbuild"; version = "2024.11.04"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "intelxed"; @@ -22,6 +22,8 @@ let hash = "sha256-iQVykBG3tEPxI1HmqBkvO1q+K8vi64qBfVC63/rcTOk="; }; + build-system = with python3Packages; [ setuptools ]; + meta = { description = "Python-based build system used for building XED"; homepage = "https://github.com/intelxed/mbuild"; diff --git a/pkgs/by-name/xe/xenomapper/package.nix b/pkgs/by-name/xe/xenomapper/package.nix index 5e269bfc91be..f25f6b249d90 100644 --- a/pkgs/by-name/xe/xenomapper/package.nix +++ b/pkgs/by-name/xe/xenomapper/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "xenomapper"; version = "1.0.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "genomematt"; @@ -16,7 +16,14 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0mnmfzlq5mhih6z8dq5bkx95vb8whjycz9mdlqwbmlqjb3gb3zhr"; }; - propagatedBuildInputs = with python3.pkgs; [ statistics ]; + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ statistics ]; + + pythonImportsCheck = [ + "xenomapper.xenomapper" + "xenomapper.mappability" + ]; meta = with lib; { homepage = "https://github.com/genomematt/xenomapper"; diff --git a/pkgs/by-name/xe/xenon/package.nix b/pkgs/by-name/xe/xenon/package.nix index 583036442ec3..6907c94bf947 100644 --- a/pkgs/by-name/xe/xenon/package.nix +++ b/pkgs/by-name/xe/xenon/package.nix @@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication { inherit pname version; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -20,12 +20,16 @@ python3.pkgs.buildPythonApplication { doCheck = false; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ requests radon pyaml ]; + pythonImportsCheck = [ "xenon" ]; + meta = with lib; { description = "Monitoring tool based on radon"; homepage = "https://github.com/rubik/xenon"; diff --git a/pkgs/by-name/xk/xkeysnail/package.nix b/pkgs/by-name/xk/xkeysnail/package.nix index 68ff0ffbc24f..c9c50863f34c 100644 --- a/pkgs/by-name/xk/xkeysnail/package.nix +++ b/pkgs/by-name/xk/xkeysnail/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication { pname = "xkeysnail"; version = "0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mooz"; @@ -24,7 +24,9 @@ python3Packages.buildPythonApplication { }) ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ evdev xlib inotify-simple @@ -38,6 +40,8 @@ python3Packages.buildPythonApplication { --add-flags "-q" --add-flags "$out/share/browser.py" ''; + pythonImportsCheck = [ "xkeysnail" ]; + meta = { description = "Yet another keyboard remapping tool for X environment"; homepage = "https://github.com/mooz/xkeysnail"; diff --git a/pkgs/by-name/xm/xmldiff/package.nix b/pkgs/by-name/xm/xmldiff/package.nix index 2c68e6b83c1f..4eccca0ffc50 100644 --- a/pkgs/by-name/xm/xmldiff/package.nix +++ b/pkgs/by-name/xm/xmldiff/package.nix @@ -14,13 +14,15 @@ let }; in python3.pkgs.buildPythonApplication { - format = "setuptools"; pname = "xmldiff"; inherit version src; + pyproject = true; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ lxml - setuptools + setuptools # pkg_resources is imported during runtime ]; meta = { diff --git a/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix index 8cba53b3d479..536e71569c02 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "xonsh-direnv"; version = "1.6.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "74th"; diff --git a/pkgs/by-name/xp/xpaste/package.nix b/pkgs/by-name/xp/xpaste/package.nix index 2e1050ec8db6..c56c664402c3 100644 --- a/pkgs/by-name/xp/xpaste/package.nix +++ b/pkgs/by-name/xp/xpaste/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "xpaste"; version = "1.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ossobv"; @@ -16,7 +16,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-eVnoLG+06UTOkvGhzL/XS4JBrEwbXYZ1fuNTIW7YAfE="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ xlib ]; diff --git a/pkgs/by-name/ya/yams/package.nix b/pkgs/by-name/ya/yams/package.nix index d5745e2ea7a5..732bbc4e81d3 100644 --- a/pkgs/by-name/ya/yams/package.nix +++ b/pkgs/by-name/ya/yams/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec { pname = "yams"; # nixpkgs-update: no auto update version = "0.7.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Berulacks"; @@ -17,7 +17,9 @@ python3Packages.buildPythonPackage rec { sha256 = "1zkhcys9i0s6jkaz24an690rvnkv1r84jxpaa84sf46abi59ijh8"; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ pyyaml psutil mpd2 @@ -26,6 +28,8 @@ python3Packages.buildPythonPackage rec { doCheck = false; + pythonImportsCheck = [ "yams.scrobble" ]; + meta = with lib; { homepage = "https://github.com/Berulacks/yams"; description = "Last.FM scrobbler for MPD"; diff --git a/pkgs/by-name/yo/you-get/package.nix b/pkgs/by-name/yo/you-get/package.nix index c9a32a82e0db..d7e4ec0976c5 100644 --- a/pkgs/by-name/yo/you-get/package.nix +++ b/pkgs/by-name/yo/you-get/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "you-get"; version = "0.4.1700"; - format = "setuptools"; + pyproject = true; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -31,6 +31,8 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; + build-system = with python3.pkgs; [ setuptools ]; + postInstall = '' installShellCompletion --cmd you-get \ --zsh contrib/completion/_you-get \ diff --git a/pkgs/by-name/yt/ytmdl/package.nix b/pkgs/by-name/yt/ytmdl/package.nix index dfbadc146b71..7869aedf1aa7 100644 --- a/pkgs/by-name/yt/ytmdl/package.nix +++ b/pkgs/by-name/yt/ytmdl/package.nix @@ -2,14 +2,14 @@ lib, python3Packages, fetchPypi, - yt-dlp, ffmpeg, + writableTmpDirAsHomeHook, }: python3Packages.buildPythonApplication rec { pname = "ytmdl"; version = "2023.11.26"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname; @@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" \ - --replace "/etc/bash_completion.d" "share/bash-completion/completions" \ - --replace "/usr/share/zsh/functions/Completion/Unix" "share/zsh/site-functions" - sed -i '/python_requires=/d' setup.py + --replace-fail "/etc/bash_completion.d" "share/bash-completion/completions" \ + --replace-fail "/usr/share/zsh/functions/Completion/Unix" "share/zsh/site-functions" ''; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ ffmpeg-python musicbrainzngs rich @@ -51,8 +51,11 @@ python3Packages.buildPythonApplication rec { (lib.makeBinPath [ ffmpeg ]) ]; - # This application has no tests - doCheck = false; + nativeCheckInputs = [ + writableTmpDirAsHomeHook # the app tries to log stuff into xdg_cache_home + ]; + + pythonImportsCheck = [ "ytmdl" ]; meta = with lib; { homepage = "https://github.com/deepjyoti30/ytmdl"; diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix index 3d68b11b4b1d..720fd3ed5bbe 100644 --- a/pkgs/by-name/za/zapzap/package.nix +++ b/pkgs/by-name/za/zapzap/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "zapzap"; version = "6.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "rafatosta"; @@ -17,8 +17,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-g3J9oVIRiar0QoksRjJZsbvSKiFBILaUdSUscNs1VXE="; }; - nativeBuildInputs = with python3Packages; [ - setuptools + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; @@ -31,7 +30,9 @@ python3Packages.buildPythonApplication rec { export HOME=$(mktemp -d) ''; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ dbus-python pyqt6 pyqt6-webengine @@ -51,6 +52,8 @@ python3Packages.buildPythonApplication rec { # has no tests doCheck = false; + pythonImportsCheck = [ "zapzap" ]; + meta = with lib; { description = "WhatsApp desktop application written in Pyqt6 + PyQt6-WebEngine."; homepage = "https://rtosta.com/zapzap-web/"; diff --git a/pkgs/by-name/zf/zfs-autobackup/package.nix b/pkgs/by-name/zf/zfs-autobackup/package.nix index db4eb62abcbc..12ef9ebfa6b2 100644 --- a/pkgs/by-name/zf/zfs-autobackup/package.nix +++ b/pkgs/by-name/zf/zfs-autobackup/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "zfs-autobackup"; version = "3.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version; @@ -15,7 +15,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-nAc1mdrtIEmUS0uMqOdvV07xP02MFj6F5uCTiCXtnMs="; }; - propagatedBuildInputs = with python3Packages; [ colorama ]; + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ colorama ]; pythonRemoveDeps = [ "argparse" ]; diff --git a/pkgs/by-name/zi/zim/package.nix b/pkgs/by-name/zi/zim/package.nix index 28b741256cc8..57ec16d3168e 100644 --- a/pkgs/by-name/zi/zim/package.nix +++ b/pkgs/by-name/zi/zim/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { pname = "zim"; version = "0.76.3"; - format = "setuptools"; + pyproject = true; src = fetchurl { url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz"; @@ -36,6 +36,8 @@ python3Packages.buildPythonApplication rec { adwaita-icon-theme ]; + build-system = with python3Packages; [ setuptools ]; + dependencies = with python3Packages; [ pyxdg pygobject3 diff --git a/pkgs/by-name/zs/zsh-history-to-fish/package.nix b/pkgs/by-name/zs/zsh-history-to-fish/package.nix index bbd6ee4b8c25..9932ed8e7a31 100644 --- a/pkgs/by-name/zs/zsh-history-to-fish/package.nix +++ b/pkgs/by-name/zs/zsh-history-to-fish/package.nix @@ -7,14 +7,16 @@ python3.pkgs.buildPythonApplication rec { pname = "zsh-history-to-fish"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-expPuffZttyXNRreplPC5Ee/jfWAyOnmjTIMXONtrnw="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ click ];