From 2e5358c65e1dd8b735d9a957a30d6b277ec7ddbd Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Sat, 14 Dec 2024 13:17:53 -0600 Subject: [PATCH] set pyproject = true --- pkgs/download/default.nix | 10 +++++++--- pkgs/webcomix/default.nix | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/download/default.nix b/pkgs/download/default.nix index d585bb8..3e6d261 100644 --- a/pkgs/download/default.nix +++ b/pkgs/download/default.nix @@ -2,7 +2,7 @@ python3Packages, gallery-dl, ffmpeg, - pkgs, + callPackage, ... }: let @@ -11,16 +11,21 @@ let in python3Packages.buildPythonApplication { inherit pname version; + src = builtins.path { path = ../../scripts/download/.; name = "${pname}-${version}"; }; + + pyproject = true; + build-system = [ python3Packages.setuptools ]; + dependencies = [ ffmpeg gallery-dl - (pkgs.callPackage ../../pkgs/webcomix/default.nix { }) + (callPackage ../../pkgs/webcomix/default.nix { }) ] ++ builtins.attrValues { inherit (python3Packages) @@ -29,5 +34,4 @@ python3Packages.buildPythonApplication { yt-dlp ; }; - } diff --git a/pkgs/webcomix/default.nix b/pkgs/webcomix/default.nix index 8b13892..4597595 100644 --- a/pkgs/webcomix/default.nix +++ b/pkgs/webcomix/default.nix @@ -15,12 +15,14 @@ python3Packages.buildPythonApplication rec { rev = version; hash = "sha256-Y16+/9TnECMkppgI/BeAbTLWt0M4V/xn1+hM4ILp/+g="; }; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "poetry>=1.2.0" poetry-core \ --replace-fail "poetry.masonry.api" "poetry.core.masonry.api" \ --replace-fail 'pytest-rerunfailures = "^11.1.2"' 'pytest-rerunfailures = "14.0"' ''; + build-system = [ python3Packages.poetry-core ];