pyrox.dev
lol
python313Packages.recline: fix build by devendoring outdated argcomplete, switch to pyproject = true
+52
-2
+14
-2
pkgs/development/python-modules/recline/default.nix
+14
-2
pkgs/development/python-modules/recline/default.nix
···
1
1
{
2
2
lib,
3
+
argcomplete,
3
4
buildPythonPackage,
4
5
fetchFromGitHub,
5
6
pudb,
···
10
11
buildPythonPackage rec {
11
12
pname = "recline";
12
13
version = "2024.7.1";
13
-
format = "pyproject";
14
+
pyproject = true;
14
15
15
16
src = fetchFromGitHub {
16
17
owner = "NetApp";
···
19
20
sha256 = "sha256-Qc4oofuhSZ2S5zuCY9Ce9ISldYI3MDUJXFc8VcXdLIU=";
20
21
};
21
22
22
-
nativeBuildInputs = [ setuptools ];
23
+
patches = [
24
+
# based on https://github.com/NetApp/recline/pull/21
25
+
./devendor.patch
26
+
];
27
+
28
+
postPatch = ''
29
+
rm -r recline/vendor/argcomplete
30
+
'';
31
+
32
+
build-system = [ setuptools ];
33
+
34
+
dependencies = [ argcomplete ];
23
35
24
36
nativeCheckInputs = [
25
37
pudb
+38
pkgs/development/python-modules/recline/devendor.patch
+38
pkgs/development/python-modules/recline/devendor.patch
···
1
+
commit 6ea5c039671de2547249c36ca3e1fb51fc4a7e06
2
+
Author: Sandro Jäckel <sandro.jaeckel@gmail.com>
3
+
Date: Thu Feb 6 18:33:28 2025 +0100
4
+
5
+
Devendor argcomplete
6
+
7
+
diff --git a/pyproject.toml b/pyproject.toml
8
+
index 5ac5cab..6b60188 100644
9
+
--- a/pyproject.toml
10
+
+++ b/pyproject.toml
11
+
@@ -21,6 +21,7 @@ packages = [
12
+
]
13
+
14
+
[tool.poetry.dependencies]
15
+
+argcomplete = "*"
16
+
python = ">=3.9.0,<4"
17
+
windows-curses = {version = "^2.3.3", markers = "sys_platform == 'win32'"}
18
+
pyreadline3 = {version = "^3.4.1", markers = "sys_platform == 'win32'"}
19
+
diff --git a/recline/repl/completer.py b/recline/repl/completer.py
20
+
index ff35583..1a05ae3 100644
21
+
--- a/recline/repl/completer.py
22
+
+++ b/recline/repl/completer.py
23
+
@@ -5,6 +5,7 @@
24
+
as argument names and values.
25
+
"""
26
+
27
+
+import argcomplete
28
+
import argparse
29
+
import re
30
+
import readline
31
+
@@ -12,7 +13,6 @@
32
+
33
+
import recline
34
+
from recline.arg_types.recline_type import UniqueParam
35
+
-from recline.vendor import argcomplete
36
+
37
+
38
+
def match_command_hook(substitution, matches, *_):