From 01fc7c527c3a07a0b464e48e9b0ce6e61fef005f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 Jul 2023 08:04:38 -0700 Subject: [PATCH 1/2] piston-cli: fix build --- pkgs/tools/misc/piston-cli/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/tools/misc/piston-cli/default.nix index 7e42ff8c81ab..8c78f3f7b30b 100644 --- a/pkgs/tools/misc/piston-cli/default.nix +++ b/pkgs/tools/misc/piston-cli/default.nix @@ -18,13 +18,14 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ poetry-core + pythonRelaxDepsHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'rich = "^10.1.0"' 'rich = "*"' \ - --replace 'PyYAML = "^5.4.1"' 'PyYAML = "*"' - ''; + pythonRelaxDeps = [ + "rich" + "more-itertools" + "PyYAML" + ]; meta = with lib; { broken = stdenv.isDarwin; From 6d157073cf3caebeeeb0964749cfee085c8d655e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 Jul 2023 08:05:06 -0700 Subject: [PATCH 2/2] piston-cli: use Python 3.10 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87ca7b7d29b6..9c999f2c2b10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34173,7 +34173,7 @@ with pkgs; pistol = callPackage ../tools/misc/pistol { }; - piston-cli = callPackage ../tools/misc/piston-cli { python3Packages = python39Packages; }; + piston-cli = callPackage ../tools/misc/piston-cli { }; pizarra = callPackage ../applications/graphics/pizarra { };