* gnu/packages/python-xyz.scm (python-colorful): New variable. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6f64e3c8f5..50ba88ab64 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -217,6 +217,34 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-colorful + (package + (name "python-colorful") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "colorful" version)) + (sha256 + (base32 "1sh7g2cn1fyz2hzmzs933razdxi2bna9i1lxa790r9pdwba8m146")))) + (build-system python-build-system) + ;; FIXME: tests cannot be computed: + ;; "Can't perform this operation for unregistered loader type" + (arguments + `(#:tests? #f)) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-flake8" ,python-flake8) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-colorama" ,python-colorama))) + (home-page "http://github.com/timofurrer/colorful") + (synopsis "Terminal string styling") + (description "Python-Colorful provides python libraries for string styling +in terminal.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-yaspin): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 50ba88ab64..ba7dc6488f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -245,6 +245,26 @@ in terminal.") (license license:expat))) +(define-public python-yaspin + (package + (name "python-yaspin") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "yaspin" version)) + (sha256 + (base32 "1iirah0kydrdp505qnjj6gi54avcr7z0hbkfx9vmh8myr30rpz6q")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/pavdmyt/yaspin") + (synopsis "Yet Another Terminal Spinner") + (description "Yaspin provides a full-featured terminal spinner to show the +progress during long-hanging operations.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-check.scm (python-pytest-click): New variable. --- gnu/packages/python-check.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index b68f23a220..90155a478c 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -46,6 +46,26 @@ #:use-module (guix download) #:use-module (guix build-system python)) +(define-public python-pytest-click + (package + (name "python-pytest-click") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "pytest_click" version)) + (sha256 + (base32 "1rcv4m850rl7djzdgzz2zhjd8g5ih8w6l0sj2f9hsynymlsq82xl")))) + (build-system python-build-system) + (propagated-inputs + `(("python-click" ,python-click) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/Stranger6667/pytest-click") + (synopsis "Py.test plugin for Click") + (description "Py.test plugin for Click") + (license license:expat))) + (define-public python-testfixtures (package (name "python-testfixtures") -- 2.31.1
This version is only available in zip format. * gnu/packages/python-xyz.scm (python-nltk)[version]: Update to 3.6.2. [uri]: Use zip extension. [native-inputs]: Add unzip. --- gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ba7dc6488f..2fc30b30f8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15034,18 +15034,20 @@ extracting firmware images") (define-public python-nltk (package (name "python-nltk") - (version "3.2.1") + (version "3.6.2") (source (origin (method url-fetch) - (uri (pypi-uri "nltk" version)) + (uri (pypi-uri "nltk" version ".zip")) (sha256 (base32 - "0skxbhnymwlspjkzga0f7x1hg3y50fwpfghs8g8k7fh6f4nknlym")))) + "1sq32lwgij9h8rsksymnxxr7bqfw3vgx5ijw4azbj6k2xnmmdmap")))) (build-system python-build-system) (arguments '(;; The tests require some extra resources to be downloaded. ;; TODO Try packaging these resources. #:tests? #f)) + (native-inputs + `(("unzip" ,unzip))) (home-page "http://nltk.org/") (synopsis "Natural Language Toolkit") (description "It provides interfaces to over 50 corpora and lexical -- 2.31.1
Setup.py's install_requires refer to these packages. *gnu/packages/python-xyz.scm (python-nltk)[inputs]: Add python-click, python-joblib, python-regex and python-tqdm. --- gnu/packages/python-xyz.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2fc30b30f8..7e8f0c911c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15048,6 +15048,11 @@ extracting firmware images") #:tests? #f)) (native-inputs `(("unzip" ,unzip))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-joblib" ,python-joblib) + ("python-regex" ,python-regex) + ("python-tqdm" ,python-tqdm))) (home-page "http://nltk.org/") (synopsis "Natural Language Toolkit") (description "It provides interfaces to over 50 corpora and lexical -- 2.31.1
* gnu/packages/python-xyz.scm (python-nltk-3.4): New variable. --- gnu/packages/python-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e8f0c911c..16f2055339 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15061,6 +15061,21 @@ for classification, tokenization, stemming, tagging, parsing, and semantic reasoning, wrappers for natural language processing libraries.") (license license:asl2.0))) +;; Versions >=3.5 breaks backward-compatibility, +;; so we keep version 3.4.x around for a while. +(define-public python-nltk-3.4 + (package + (inherit python-nltk) + (version "3.4.5") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/nltk/nltk/" + "archive/refs/tags/" version ".tar.gz")) + (sha256 + (base32 "1d2cqbc1k6qgd27vfhgd3isn7wknqsgp50vx67m29zd6wgmxq9px")))))) + (define-public python2-nltk (package-with-python2 python-nltk)) -- 2.31.1
* gnu/packages/python-xyz.scm (python-lunr): New variable. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 16f2055339..776ada6cbe 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -265,6 +265,31 @@ in terminal.") progress during long-hanging operations.") (license license:expat))) +(define-public python-lunr + (package + (name "python-lunr") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "lunr" version)) + (sha256 + (base32 "106akalywfmnypzkdrhgz4n4740a8xayspybsw59kq06vz8i2qrc")))) + (build-system python-build-system) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-nltk" ,python-nltk-3.4))) + (home-page + "https://github.com/yeraydiazdiaz/lunr.py") + (synopsis "Python implementation of Lunr.js") + (description "Lunar.py aims to bring the simple and powerful full text +search capabilities into Python, guaranteeing results as close as the original +implementation as possible.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-mkdocs): New variable. --- gnu/packages/python-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 776ada6cbe..4042341479 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -290,6 +290,43 @@ search capabilities into Python, guaranteeing results as close as the original implementation as possible.") (license license:expat))) +(define-public python-mkdocs + (package + (name "python-mkdocs") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "mkdocs" version)) + (sha256 + (base32 "0fgv5zawpyyv0vd4j5y8m4h058lh9jkwfcm0xy4pg7dr09a1xdph")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Requirements refer to a specific version of dependencies, + ;; which are too old. So we patch to refer to any later version. + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* "setup.py" + (("==") ">="))))))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-jinja2" ,python-jinja2) + ("python-livereload" ,python-livereload) + ("python-lunr" ,python-lunr) + ("python-markdown" ,python-markdown) + ("python-pyyaml" ,python-pyyaml) + ("python-tornado" ,python-tornado))) + (home-page "https://www.mkdocs.org") + (synopsis "Project documentation with Markdown.") + (description "MkDocs is a fast, simple and downright gorgeous static site +generator that’s geared towards building project documentation. Documentation +source files are written in Markdown, and configured with a single YAML +configuration file.") + (license license:bsd-3))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-pymdown-extensions): New variable. --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4042341479..87c4d16cb3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -327,6 +327,28 @@ source files are written in Markdown, and configured with a single YAML configuration file.") (license license:bsd-3))) +(define-public python-pymdown-extensions + (package + (name "python-pymdown-extensions") + (version "8.1.1") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "pymdown-extensions" version)) + (sha256 + (base32 "0d8pdndrl1kj105lq7r6kw2dnhcvll6h2qs07w71mcpi7gx728v3")))) + (build-system python-build-system) + ;; FIXME: "AssertionError: False is not true" + (arguments + `(#:tests? #f)) + (propagated-inputs + `(("python-markdown" ,python-markdown))) + (home-page "https://github.com/facelessuser/pymdown-extensions") + (synopsis "Extension pack for Python Markdown.") + (description "Extension pack for Python Markdown.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-mkdocs-material): New variable. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 87c4d16cb3..b94f03f928 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -349,6 +349,40 @@ configuration file.") (description "Extension pack for Python Markdown.") (license license:expat))) +(define-public python-mkdocs-material + (package + (name "python-mkdocs-material") + (version "7.1.3") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "mkdocs-material" version)) + (sha256 + (base32 "0ci9xiasq9nfn09v11m7p49vzazdbgslw7rpzjd6y3hsmn9vljz3")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Requirement mkdocs-material-extensions + ;; in-turn requires mkdocs-material. This causes + ;; circular dependency, so we remove this requirement. + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* "requirements.txt" + (("mkdocs-material-extensions.*$") ""))))))) + (propagated-inputs + `(("python-markdown" ,python-markdown) + ("python-mkdocs" ,python-mkdocs) + ("python-pygments" ,python-pygments) + ("python-pymdown-extensions" + ,python-pymdown-extensions))) + (home-page "https://squidfunk.github.io/mkdocs-material/") + (synopsis "Material Design theme for MkDocs") + (description "Material for MkDocs is a theme for MkDocs, a static site +generator geared towards (technical) project documentation.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/telegram.scm (tgcli): New variable. --- gnu/packages/telegram.scm | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index c4414287a7..6c1a2fac89 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -50,6 +50,9 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages textutils) @@ -68,6 +71,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) + #:use-module (guix build-system python) #:use-module (guix build-system qt)) (define-public webrtc-for-telegram-desktop @@ -813,3 +817,49 @@ formerly a part of telegram-cli, but now being maintained separately.") (description "TG is the command-line interface for Telegram Messenger.") (home-page "https://github.com/vysheng/tg") (license license:gpl2+)))) + +(define-public tgcli + (package + (name "tgcli") + (version "0.3.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/erayerdin/tgcli") + (commit (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "082zim7rh4r8qyscqimjh2sz7998vv9j1i2y2wwz2rgrlhkhly5r")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Test requirements referes to specific versions of packages, + ;; which are too old. So we patch to refer to any later versions. + (add-after 'unpack 'patch-test-requirements + (lambda _ + (substitute* "dev.requirements.txt" + (("==") ">=")))) + (replace 'check + (lambda _ + (invoke "pytest")))))) + (native-inputs + `(("coveralls" ,python-coveralls) + ("pytest" ,python-pytest) + ("pytest-click" ,python-pytest-click) + ("pytest-cov" ,python-pytest-cov) + ("mkdocs" ,python-mkdocs) + ("mkdocs-material" ,python-mkdocs-material) + ("requests-mock" ,python-requests-mock))) + (propagated-inputs + `(("click" ,python-click) + ("colorful" ,python-colorful) + ("requests" ,python-requests) + ("yaspin" ,python-yaspin))) + (home-page "https://tgcli.readthedocs.io") + (synopsis "Telegram Terminal Application") + (description "TgCli is a telegram client to automate repetitive tasks.") + (license license:asl2.0))) -- 2.31.1
[-- Attachment #1: Type: text/plain, Size: 440 bytes --] Hi, > +(define-public tgcli > [...] > + (replace 'check > + (lambda _ > + (invoke "pytest")))))) Something I learned some time ago: if you make this > + (replace 'check > + (lambda* (#:key tests? #:allow-other-keys) > + (when tests? > + (invoke "pytest"))))))) then "guix build tgcli --without-tests" can be used, IIRC. Greetings, Maxime. [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 260 bytes --]
* gnu/packages/python-xyz.scm (python-colorful): New variable. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6f64e3c8f5..50ba88ab64 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -217,6 +217,34 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-colorful + (package + (name "python-colorful") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "colorful" version)) + (sha256 + (base32 "1sh7g2cn1fyz2hzmzs933razdxi2bna9i1lxa790r9pdwba8m146")))) + (build-system python-build-system) + ;; FIXME: tests cannot be computed: + ;; "Can't perform this operation for unregistered loader type" + (arguments + `(#:tests? #f)) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-flake8" ,python-flake8) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-colorama" ,python-colorama))) + (home-page "http://github.com/timofurrer/colorful") + (synopsis "Terminal string styling") + (description "Python-Colorful provides python libraries for string styling +in terminal.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-yaspin): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 50ba88ab64..ba7dc6488f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -245,6 +245,26 @@ in terminal.") (license license:expat))) +(define-public python-yaspin + (package + (name "python-yaspin") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "yaspin" version)) + (sha256 + (base32 "1iirah0kydrdp505qnjj6gi54avcr7z0hbkfx9vmh8myr30rpz6q")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/pavdmyt/yaspin") + (synopsis "Yet Another Terminal Spinner") + (description "Yaspin provides a full-featured terminal spinner to show the +progress during long-hanging operations.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-check.scm (python-pytest-click): New variable. --- gnu/packages/python-check.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index b68f23a220..90155a478c 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -46,6 +46,26 @@ #:use-module (guix download) #:use-module (guix build-system python)) +(define-public python-pytest-click + (package + (name "python-pytest-click") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "pytest_click" version)) + (sha256 + (base32 "1rcv4m850rl7djzdgzz2zhjd8g5ih8w6l0sj2f9hsynymlsq82xl")))) + (build-system python-build-system) + (propagated-inputs + `(("python-click" ,python-click) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/Stranger6667/pytest-click") + (synopsis "Py.test plugin for Click") + (description "Py.test plugin for Click") + (license license:expat))) + (define-public python-testfixtures (package (name "python-testfixtures") -- 2.31.1
This version is only available in zip format. * gnu/packages/python-xyz.scm (python-nltk)[version]: Update to 3.6.2. [uri]: Use zip extension. [native-inputs]: Add unzip. --- gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ba7dc6488f..2fc30b30f8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15034,18 +15034,20 @@ extracting firmware images") (define-public python-nltk (package (name "python-nltk") - (version "3.2.1") + (version "3.6.2") (source (origin (method url-fetch) - (uri (pypi-uri "nltk" version)) + (uri (pypi-uri "nltk" version ".zip")) (sha256 (base32 - "0skxbhnymwlspjkzga0f7x1hg3y50fwpfghs8g8k7fh6f4nknlym")))) + "1sq32lwgij9h8rsksymnxxr7bqfw3vgx5ijw4azbj6k2xnmmdmap")))) (build-system python-build-system) (arguments '(;; The tests require some extra resources to be downloaded. ;; TODO Try packaging these resources. #:tests? #f)) + (native-inputs + `(("unzip" ,unzip))) (home-page "http://nltk.org/") (synopsis "Natural Language Toolkit") (description "It provides interfaces to over 50 corpora and lexical -- 2.31.1
Setup.py's install_requires refer to these packages. *gnu/packages/python-xyz.scm (python-nltk)[inputs]: Add python-click, python-joblib, python-regex and python-tqdm. --- gnu/packages/python-xyz.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2fc30b30f8..7e8f0c911c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15048,6 +15048,11 @@ extracting firmware images") #:tests? #f)) (native-inputs `(("unzip" ,unzip))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-joblib" ,python-joblib) + ("python-regex" ,python-regex) + ("python-tqdm" ,python-tqdm))) (home-page "http://nltk.org/") (synopsis "Natural Language Toolkit") (description "It provides interfaces to over 50 corpora and lexical -- 2.31.1
* gnu/packages/python-xyz.scm (python-nltk-3.4): New variable. --- gnu/packages/python-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e8f0c911c..16f2055339 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15061,6 +15061,21 @@ for classification, tokenization, stemming, tagging, parsing, and semantic reasoning, wrappers for natural language processing libraries.") (license license:asl2.0))) +;; Versions >=3.5 breaks backward-compatibility, +;; so we keep version 3.4.x around for a while. +(define-public python-nltk-3.4 + (package + (inherit python-nltk) + (version "3.4.5") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/nltk/nltk/" + "archive/refs/tags/" version ".tar.gz")) + (sha256 + (base32 "1d2cqbc1k6qgd27vfhgd3isn7wknqsgp50vx67m29zd6wgmxq9px")))))) + (define-public python2-nltk (package-with-python2 python-nltk)) -- 2.31.1
* gnu/packages/python-xyz.scm (python-lunr): New variable. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 16f2055339..776ada6cbe 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -265,6 +265,31 @@ in terminal.") progress during long-hanging operations.") (license license:expat))) +(define-public python-lunr + (package + (name "python-lunr") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "lunr" version)) + (sha256 + (base32 "106akalywfmnypzkdrhgz4n4740a8xayspybsw59kq06vz8i2qrc")))) + (build-system python-build-system) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-nltk" ,python-nltk-3.4))) + (home-page + "https://github.com/yeraydiazdiaz/lunr.py") + (synopsis "Python implementation of Lunr.js") + (description "Lunar.py aims to bring the simple and powerful full text +search capabilities into Python, guaranteeing results as close as the original +implementation as possible.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-mkdocs): New variable. --- gnu/packages/python-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 776ada6cbe..4042341479 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -290,6 +290,43 @@ search capabilities into Python, guaranteeing results as close as the original implementation as possible.") (license license:expat))) +(define-public python-mkdocs + (package + (name "python-mkdocs") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "mkdocs" version)) + (sha256 + (base32 "0fgv5zawpyyv0vd4j5y8m4h058lh9jkwfcm0xy4pg7dr09a1xdph")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Requirements refer to a specific version of dependencies, + ;; which are too old. So we patch to refer to any later version. + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* "setup.py" + (("==") ">="))))))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-jinja2" ,python-jinja2) + ("python-livereload" ,python-livereload) + ("python-lunr" ,python-lunr) + ("python-markdown" ,python-markdown) + ("python-pyyaml" ,python-pyyaml) + ("python-tornado" ,python-tornado))) + (home-page "https://www.mkdocs.org") + (synopsis "Project documentation with Markdown.") + (description "MkDocs is a fast, simple and downright gorgeous static site +generator that’s geared towards building project documentation. Documentation +source files are written in Markdown, and configured with a single YAML +configuration file.") + (license license:bsd-3))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-pymdown-extensions): New variable. --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4042341479..87c4d16cb3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -327,6 +327,28 @@ source files are written in Markdown, and configured with a single YAML configuration file.") (license license:bsd-3))) +(define-public python-pymdown-extensions + (package + (name "python-pymdown-extensions") + (version "8.1.1") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "pymdown-extensions" version)) + (sha256 + (base32 "0d8pdndrl1kj105lq7r6kw2dnhcvll6h2qs07w71mcpi7gx728v3")))) + (build-system python-build-system) + ;; FIXME: "AssertionError: False is not true" + (arguments + `(#:tests? #f)) + (propagated-inputs + `(("python-markdown" ,python-markdown))) + (home-page "https://github.com/facelessuser/pymdown-extensions") + (synopsis "Extension pack for Python Markdown.") + (description "Extension pack for Python Markdown.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-mkdocs-material): New variable. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 87c4d16cb3..b94f03f928 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -349,6 +349,40 @@ configuration file.") (description "Extension pack for Python Markdown.") (license license:expat))) +(define-public python-mkdocs-material + (package + (name "python-mkdocs-material") + (version "7.1.3") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "mkdocs-material" version)) + (sha256 + (base32 "0ci9xiasq9nfn09v11m7p49vzazdbgslw7rpzjd6y3hsmn9vljz3")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Requirement mkdocs-material-extensions + ;; in-turn requires mkdocs-material. This causes + ;; circular dependency, so we remove this requirement. + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* "requirements.txt" + (("mkdocs-material-extensions.*$") ""))))))) + (propagated-inputs + `(("python-markdown" ,python-markdown) + ("python-mkdocs" ,python-mkdocs) + ("python-pygments" ,python-pygments) + ("python-pymdown-extensions" + ,python-pymdown-extensions))) + (home-page "https://squidfunk.github.io/mkdocs-material/") + (synopsis "Material Design theme for MkDocs") + (description "Material for MkDocs is a theme for MkDocs, a static site +generator geared towards (technical) project documentation.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/telegram.scm (tgcli): New variable. --- gnu/packages/telegram.scm | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index c4414287a7..7d98c5874e 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -50,6 +50,9 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages textutils) @@ -68,6 +71,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) + #:use-module (guix build-system python) #:use-module (guix build-system qt)) (define-public webrtc-for-telegram-desktop @@ -813,3 +817,51 @@ formerly a part of telegram-cli, but now being maintained separately.") (description "TG is the command-line interface for Telegram Messenger.") (home-page "https://github.com/vysheng/tg") (license license:gpl2+)))) + +(define-public tgcli + (package + (name "tgcli") + (version "0.3.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/erayerdin/tgcli") + (commit (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "082zim7rh4r8qyscqimjh2sz7998vv9j1i2y2wwz2rgrlhkhly5r")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Test requirements referes to specific versions of packages, + ;; which are too old. So we patch to refer to any later versions. + (add-after 'unpack 'patch-test-requirements + (lambda _ + (substitute* "dev.requirements.txt" + (("==") ">=")))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "tests"))))))) + (native-inputs + `(("coveralls" ,python-coveralls) + ("pytest" ,python-pytest) + ("pytest-click" ,python-pytest-click) + ("pytest-cov" ,python-pytest-cov) + ("mkdocs" ,python-mkdocs) + ("mkdocs-material" ,python-mkdocs-material) + ("requests-mock" ,python-requests-mock))) + (propagated-inputs + `(("click" ,python-click) + ("colorful" ,python-colorful) + ("requests" ,python-requests) + ("yaspin" ,python-yaspin))) + (home-page "https://tgcli.readthedocs.io") + (synopsis "Telegram Terminal Application") + (description "TgCli is a telegram client to automate repetitive tasks.") + (license license:asl2.0))) -- 2.31.1
[-- Attachment #1.1.1: Type: text/plain, Size: 501 bytes --] Hi Maxime! >> +(define-public tgcli >> [...] >> + (replace 'check >> + (lambda _ >> + (invoke "pytest")))))) > > Something I learned some time ago: if you make this > >> + (replace 'check >> + (lambda* (#:key tests? #:allow-other-keys) >> + (when tests? >> + (invoke "pytest"))))))) > > then "guix build tgcli --without-tests" can be used, IIRC. Thanks so much! I added it in v2. Regards, RG. [-- Attachment #1.1.2: OpenPGP public key --] [-- Type: application/pgp-keys, Size: 2649 bytes --] [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 236 bytes --]
[-- Attachment #1: Type: text/plain, Size: 762 bytes --] Raghav Gururajan via Guix-patches via schreef op vr 30-04-2021 om 07:34 [-0400]: > + (source > + (origin > + (method url-fetch) > + (uri > + (string-append "https://github.com/nltk/nltk/" > + "archive/refs/tags/" version ".tar.gz")) > + (sha256 > + (base32 "1d2cqbc1k6qgd27vfhgd3isn7wknqsgp50vx67m29zd6wgmxq9px")))))) Is this an autogenerated tarball? It seems to be. Autogenerated tarballs should be avoided for reproducibility (see <https://issues.guix.gnu.org/28659#2>); GitHub sometimes changes the hashes of these tarballs. Perhaps you could use git-fetch instead? I thought there was a linter checking for this, or maybe that's just wishful thinking. Greetings, Maxime [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 260 bytes --]
* gnu/packages/python-xyz.scm (python-colorful): New variable. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6f64e3c8f5..50ba88ab64 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -217,6 +217,34 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-colorful + (package + (name "python-colorful") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "colorful" version)) + (sha256 + (base32 "1sh7g2cn1fyz2hzmzs933razdxi2bna9i1lxa790r9pdwba8m146")))) + (build-system python-build-system) + ;; FIXME: tests cannot be computed: + ;; "Can't perform this operation for unregistered loader type" + (arguments + `(#:tests? #f)) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-flake8" ,python-flake8) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-colorama" ,python-colorama))) + (home-page "http://github.com/timofurrer/colorful") + (synopsis "Terminal string styling") + (description "Python-Colorful provides python libraries for string styling +in terminal.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-yaspin): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 50ba88ab64..ba7dc6488f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -245,6 +245,26 @@ in terminal.") (license license:expat))) +(define-public python-yaspin + (package + (name "python-yaspin") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "yaspin" version)) + (sha256 + (base32 "1iirah0kydrdp505qnjj6gi54avcr7z0hbkfx9vmh8myr30rpz6q")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/pavdmyt/yaspin") + (synopsis "Yet Another Terminal Spinner") + (description "Yaspin provides a full-featured terminal spinner to show the +progress during long-hanging operations.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-check.scm (python-pytest-click): New variable. --- gnu/packages/python-check.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index b68f23a220..90155a478c 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -46,6 +46,26 @@ #:use-module (guix download) #:use-module (guix build-system python)) +(define-public python-pytest-click + (package + (name "python-pytest-click") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "pytest_click" version)) + (sha256 + (base32 "1rcv4m850rl7djzdgzz2zhjd8g5ih8w6l0sj2f9hsynymlsq82xl")))) + (build-system python-build-system) + (propagated-inputs + `(("python-click" ,python-click) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/Stranger6667/pytest-click") + (synopsis "Py.test plugin for Click") + (description "Py.test plugin for Click") + (license license:expat))) + (define-public python-testfixtures (package (name "python-testfixtures") -- 2.31.1
This version is only available in zip format. * gnu/packages/python-xyz.scm (python-nltk)[version]: Update to 3.6.2. [uri]: Use zip extension. [native-inputs]: Add unzip. --- gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ba7dc6488f..2fc30b30f8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15034,18 +15034,20 @@ extracting firmware images") (define-public python-nltk (package (name "python-nltk") - (version "3.2.1") + (version "3.6.2") (source (origin (method url-fetch) - (uri (pypi-uri "nltk" version)) + (uri (pypi-uri "nltk" version ".zip")) (sha256 (base32 - "0skxbhnymwlspjkzga0f7x1hg3y50fwpfghs8g8k7fh6f4nknlym")))) + "1sq32lwgij9h8rsksymnxxr7bqfw3vgx5ijw4azbj6k2xnmmdmap")))) (build-system python-build-system) (arguments '(;; The tests require some extra resources to be downloaded. ;; TODO Try packaging these resources. #:tests? #f)) + (native-inputs + `(("unzip" ,unzip))) (home-page "http://nltk.org/") (synopsis "Natural Language Toolkit") (description "It provides interfaces to over 50 corpora and lexical -- 2.31.1
Setup.py's install_requires refer to these packages. *gnu/packages/python-xyz.scm (python-nltk)[inputs]: Add python-click, python-joblib, python-regex and python-tqdm. --- gnu/packages/python-xyz.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2fc30b30f8..7e8f0c911c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15048,6 +15048,11 @@ extracting firmware images") #:tests? #f)) (native-inputs `(("unzip" ,unzip))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-joblib" ,python-joblib) + ("python-regex" ,python-regex) + ("python-tqdm" ,python-tqdm))) (home-page "http://nltk.org/") (synopsis "Natural Language Toolkit") (description "It provides interfaces to over 50 corpora and lexical -- 2.31.1
* gnu/packages/python-xyz.scm (python-nltk-3.4): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e8f0c911c..7916e8ba3c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15061,6 +15061,25 @@ for classification, tokenization, stemming, tagging, parsing, and semantic reasoning, wrappers for natural language processing libraries.") (license license:asl2.0))) +;; Versions >=3.5 breaks backward-compatibility, +;; so we keep version 3.4.x around for a while. +(define-public python-nltk-3.4 + (package + (inherit python-nltk) + (name "python-nltk") + (version "3.4.5") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/nltk/nltk") + (commit version))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1zh8ryzr203zq53nf1wb19gf3bd5y1nd7any56a7vxw4d7hq35nn")))))) + (define-public python2-nltk (package-with-python2 python-nltk)) -- 2.31.1
* gnu/packages/python-xyz.scm (python-lunr): New variable. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7916e8ba3c..0381ef56fa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -265,6 +265,31 @@ in terminal.") progress during long-hanging operations.") (license license:expat))) +(define-public python-lunr + (package + (name "python-lunr") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "lunr" version)) + (sha256 + (base32 "106akalywfmnypzkdrhgz4n4740a8xayspybsw59kq06vz8i2qrc")))) + (build-system python-build-system) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-nltk" ,python-nltk-3.4))) + (home-page + "https://github.com/yeraydiazdiaz/lunr.py") + (synopsis "Python implementation of Lunr.js") + (description "Lunar.py aims to bring the simple and powerful full text +search capabilities into Python, guaranteeing results as close as the original +implementation as possible.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-mkdocs): New variable. --- gnu/packages/python-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0381ef56fa..e60af2cd37 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -290,6 +290,43 @@ search capabilities into Python, guaranteeing results as close as the original implementation as possible.") (license license:expat))) +(define-public python-mkdocs + (package + (name "python-mkdocs") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "mkdocs" version)) + (sha256 + (base32 "0fgv5zawpyyv0vd4j5y8m4h058lh9jkwfcm0xy4pg7dr09a1xdph")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Requirements refer to a specific version of dependencies, + ;; which are too old. So we patch to refer to any later version. + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* "setup.py" + (("==") ">="))))))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-jinja2" ,python-jinja2) + ("python-livereload" ,python-livereload) + ("python-lunr" ,python-lunr) + ("python-markdown" ,python-markdown) + ("python-pyyaml" ,python-pyyaml) + ("python-tornado" ,python-tornado))) + (home-page "https://www.mkdocs.org") + (synopsis "Project documentation with Markdown.") + (description "MkDocs is a fast, simple and downright gorgeous static site +generator that’s geared towards building project documentation. Documentation +source files are written in Markdown, and configured with a single YAML +configuration file.") + (license license:bsd-3))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-pymdown-extensions): New variable. --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e60af2cd37..6ee1fad694 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -327,6 +327,28 @@ source files are written in Markdown, and configured with a single YAML configuration file.") (license license:bsd-3))) +(define-public python-pymdown-extensions + (package + (name "python-pymdown-extensions") + (version "8.1.1") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "pymdown-extensions" version)) + (sha256 + (base32 "0d8pdndrl1kj105lq7r6kw2dnhcvll6h2qs07w71mcpi7gx728v3")))) + (build-system python-build-system) + ;; FIXME: "AssertionError: False is not true" + (arguments + `(#:tests? #f)) + (propagated-inputs + `(("python-markdown" ,python-markdown))) + (home-page "https://github.com/facelessuser/pymdown-extensions") + (synopsis "Extension pack for Python Markdown.") + (description "Extension pack for Python Markdown.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-mkdocs-material): New variable. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6ee1fad694..af461b07ac 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -349,6 +349,40 @@ configuration file.") (description "Extension pack for Python Markdown.") (license license:expat))) +(define-public python-mkdocs-material + (package + (name "python-mkdocs-material") + (version "7.1.3") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "mkdocs-material" version)) + (sha256 + (base32 "0ci9xiasq9nfn09v11m7p49vzazdbgslw7rpzjd6y3hsmn9vljz3")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Requirement mkdocs-material-extensions + ;; in-turn requires mkdocs-material. This causes + ;; circular dependency, so we remove this requirement. + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* "requirements.txt" + (("mkdocs-material-extensions.*$") ""))))))) + (propagated-inputs + `(("python-markdown" ,python-markdown) + ("python-mkdocs" ,python-mkdocs) + ("python-pygments" ,python-pygments) + ("python-pymdown-extensions" + ,python-pymdown-extensions))) + (home-page "https://squidfunk.github.io/mkdocs-material/") + (synopsis "Material Design theme for MkDocs") + (description "Material for MkDocs is a theme for MkDocs, a static site +generator geared towards (technical) project documentation.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/telegram.scm (tgcli): New variable. --- gnu/packages/telegram.scm | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index c4414287a7..7d98c5874e 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -50,6 +50,9 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages textutils) @@ -68,6 +71,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) + #:use-module (guix build-system python) #:use-module (guix build-system qt)) (define-public webrtc-for-telegram-desktop @@ -813,3 +817,51 @@ formerly a part of telegram-cli, but now being maintained separately.") (description "TG is the command-line interface for Telegram Messenger.") (home-page "https://github.com/vysheng/tg") (license license:gpl2+)))) + +(define-public tgcli + (package + (name "tgcli") + (version "0.3.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/erayerdin/tgcli") + (commit (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "082zim7rh4r8qyscqimjh2sz7998vv9j1i2y2wwz2rgrlhkhly5r")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Test requirements referes to specific versions of packages, + ;; which are too old. So we patch to refer to any later versions. + (add-after 'unpack 'patch-test-requirements + (lambda _ + (substitute* "dev.requirements.txt" + (("==") ">=")))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "tests"))))))) + (native-inputs + `(("coveralls" ,python-coveralls) + ("pytest" ,python-pytest) + ("pytest-click" ,python-pytest-click) + ("pytest-cov" ,python-pytest-cov) + ("mkdocs" ,python-mkdocs) + ("mkdocs-material" ,python-mkdocs-material) + ("requests-mock" ,python-requests-mock))) + (propagated-inputs + `(("click" ,python-click) + ("colorful" ,python-colorful) + ("requests" ,python-requests) + ("yaspin" ,python-yaspin))) + (home-page "https://tgcli.readthedocs.io") + (synopsis "Telegram Terminal Application") + (description "TgCli is a telegram client to automate repetitive tasks.") + (license license:asl2.0))) -- 2.31.1
[-- Attachment #1.1.1: Type: text/plain, Size: 408 bytes --] Hi Maxime< > Is this an autogenerated tarball? It seems to be. Autogenerated tarballs > should be avoided for reproducibility (see <https://issues.guix.gnu.org/28659#2>); > GitHub sometimes changes the hashes of these tarballs. Perhaps you could use > git-fetch instead? Ah, I was not aware of that (https://issues.guix.gnu.org/28659#2), thanks. I have used git-fetch in v3. Regards, RG. [-- Attachment #1.1.2: OpenPGP public key --] [-- Type: application/pgp-keys, Size: 2649 bytes --] [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 236 bytes --]
* gnu/packages/python-xyz.scm (python-colorful): New variable. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6f64e3c8f5..50ba88ab64 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -217,6 +217,34 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-colorful + (package + (name "python-colorful") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "colorful" version)) + (sha256 + (base32 "1sh7g2cn1fyz2hzmzs933razdxi2bna9i1lxa790r9pdwba8m146")))) + (build-system python-build-system) + ;; FIXME: tests cannot be computed: + ;; "Can't perform this operation for unregistered loader type" + (arguments + `(#:tests? #f)) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-flake8" ,python-flake8) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-colorama" ,python-colorama))) + (home-page "http://github.com/timofurrer/colorful") + (synopsis "Terminal string styling") + (description "Python-Colorful provides python libraries for string styling +in terminal.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-yaspin): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 50ba88ab64..ba7dc6488f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -245,6 +245,26 @@ in terminal.") (license license:expat))) +(define-public python-yaspin + (package + (name "python-yaspin") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "yaspin" version)) + (sha256 + (base32 "1iirah0kydrdp505qnjj6gi54avcr7z0hbkfx9vmh8myr30rpz6q")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/pavdmyt/yaspin") + (synopsis "Yet Another Terminal Spinner") + (description "Yaspin provides a full-featured terminal spinner to show the +progress during long-hanging operations.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-check.scm (python-pytest-click): New variable. --- gnu/packages/python-check.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index b68f23a220..90155a478c 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -46,6 +46,26 @@ #:use-module (guix download) #:use-module (guix build-system python)) +(define-public python-pytest-click + (package + (name "python-pytest-click") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "pytest_click" version)) + (sha256 + (base32 "1rcv4m850rl7djzdgzz2zhjd8g5ih8w6l0sj2f9hsynymlsq82xl")))) + (build-system python-build-system) + (propagated-inputs + `(("python-click" ,python-click) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/Stranger6667/pytest-click") + (synopsis "Py.test plugin for Click") + (description "Py.test plugin for Click") + (license license:expat))) + (define-public python-testfixtures (package (name "python-testfixtures") -- 2.31.1
This version is only available in zip format. * gnu/packages/python-xyz.scm (python-nltk)[version]: Update to 3.6.2. [uri]: Use zip extension. [native-inputs]: Add unzip. --- gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ba7dc6488f..2fc30b30f8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15034,18 +15034,20 @@ extracting firmware images") (define-public python-nltk (package (name "python-nltk") - (version "3.2.1") + (version "3.6.2") (source (origin (method url-fetch) - (uri (pypi-uri "nltk" version)) + (uri (pypi-uri "nltk" version ".zip")) (sha256 (base32 - "0skxbhnymwlspjkzga0f7x1hg3y50fwpfghs8g8k7fh6f4nknlym")))) + "1sq32lwgij9h8rsksymnxxr7bqfw3vgx5ijw4azbj6k2xnmmdmap")))) (build-system python-build-system) (arguments '(;; The tests require some extra resources to be downloaded. ;; TODO Try packaging these resources. #:tests? #f)) + (native-inputs + `(("unzip" ,unzip))) (home-page "http://nltk.org/") (synopsis "Natural Language Toolkit") (description "It provides interfaces to over 50 corpora and lexical -- 2.31.1
Setup.py's install_requires refer to these packages. *gnu/packages/python-xyz.scm (python-nltk)[inputs]: Add python-click, python-joblib, python-regex and python-tqdm. --- gnu/packages/python-xyz.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2fc30b30f8..7e8f0c911c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15048,6 +15048,11 @@ extracting firmware images") #:tests? #f)) (native-inputs `(("unzip" ,unzip))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-joblib" ,python-joblib) + ("python-regex" ,python-regex) + ("python-tqdm" ,python-tqdm))) (home-page "http://nltk.org/") (synopsis "Natural Language Toolkit") (description "It provides interfaces to over 50 corpora and lexical -- 2.31.1
* gnu/packages/python-xyz.scm (python-nltk-3.4): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e8f0c911c..7916e8ba3c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15061,6 +15061,25 @@ for classification, tokenization, stemming, tagging, parsing, and semantic reasoning, wrappers for natural language processing libraries.") (license license:asl2.0))) +;; Versions >=3.5 breaks backward-compatibility, +;; so we keep version 3.4.x around for a while. +(define-public python-nltk-3.4 + (package + (inherit python-nltk) + (name "python-nltk") + (version "3.4.5") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/nltk/nltk") + (commit version))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1zh8ryzr203zq53nf1wb19gf3bd5y1nd7any56a7vxw4d7hq35nn")))))) + (define-public python2-nltk (package-with-python2 python-nltk)) -- 2.31.1
* gnu/packages/python-xyz.scm (python-lunr): New variable. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7916e8ba3c..0381ef56fa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -265,6 +265,31 @@ in terminal.") progress during long-hanging operations.") (license license:expat))) +(define-public python-lunr + (package + (name "python-lunr") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "lunr" version)) + (sha256 + (base32 "106akalywfmnypzkdrhgz4n4740a8xayspybsw59kq06vz8i2qrc")))) + (build-system python-build-system) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-nltk" ,python-nltk-3.4))) + (home-page + "https://github.com/yeraydiazdiaz/lunr.py") + (synopsis "Python implementation of Lunr.js") + (description "Lunar.py aims to bring the simple and powerful full text +search capabilities into Python, guaranteeing results as close as the original +implementation as possible.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-mkdocs): New variable. --- gnu/packages/python-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0381ef56fa..62d539eb78 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -290,6 +290,43 @@ search capabilities into Python, guaranteeing results as close as the original implementation as possible.") (license license:expat))) +(define-public python-mkdocs + (package + (name "python-mkdocs") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "mkdocs" version)) + (sha256 + (base32 "0fgv5zawpyyv0vd4j5y8m4h058lh9jkwfcm0xy4pg7dr09a1xdph")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Requirements refer to a specific version of dependencies, + ;; which are too old. So we patch to refer to any later version. + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* "setup.py" + (("==") ">="))))))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-jinja2" ,python-jinja2) + ("python-livereload" ,python-livereload) + ("python-lunr" ,python-lunr) + ("python-markdown" ,python-markdown) + ("python-pyyaml" ,python-pyyaml) + ("python-tornado" ,python-tornado))) + (home-page "https://www.mkdocs.org") + (synopsis "Project documentation with Markdown") + (description "MkDocs is a fast, simple and downright gorgeous static site +generator that’s geared towards building project documentation. Documentation +source files are written in Markdown, and configured with a single YAML +configuration file.") + (license license:bsd-3))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-pymdown-extensions): New variable. --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 62d539eb78..4b636ce74c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -327,6 +327,28 @@ source files are written in Markdown, and configured with a single YAML configuration file.") (license license:bsd-3))) +(define-public python-pymdown-extensions + (package + (name "python-pymdown-extensions") + (version "8.1.1") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "pymdown-extensions" version)) + (sha256 + (base32 "0d8pdndrl1kj105lq7r6kw2dnhcvll6h2qs07w71mcpi7gx728v3")))) + (build-system python-build-system) + ;; FIXME: "AssertionError: False is not true" + (arguments + `(#:tests? #f)) + (propagated-inputs + `(("python-markdown" ,python-markdown))) + (home-page "https://github.com/facelessuser/pymdown-extensions") + (synopsis "Extension pack for Python Markdown") + (description "Extension pack for Python Markdown.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-mkdocs-material): New variable. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4b636ce74c..09edfa2f97 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -349,6 +349,40 @@ configuration file.") (description "Extension pack for Python Markdown.") (license license:expat))) +(define-public python-mkdocs-material + (package + (name "python-mkdocs-material") + (version "7.1.3") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "mkdocs-material" version)) + (sha256 + (base32 "0ci9xiasq9nfn09v11m7p49vzazdbgslw7rpzjd6y3hsmn9vljz3")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Requirement mkdocs-material-extensions + ;; in-turn requires mkdocs-material. This causes + ;; circular dependency, so we remove this requirement. + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* "requirements.txt" + (("mkdocs-material-extensions.*$") ""))))))) + (propagated-inputs + `(("python-markdown" ,python-markdown) + ("python-mkdocs" ,python-mkdocs) + ("python-pygments" ,python-pygments) + ("python-pymdown-extensions" + ,python-pymdown-extensions))) + (home-page "https://squidfunk.github.io/mkdocs-material/") + (synopsis "Material Design theme for MkDocs") + (description "Material for MkDocs is a theme for MkDocs, a static site +generator geared towards (technical) project documentation.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/telegram.scm (tgcli): New variable. --- gnu/packages/telegram.scm | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index c4414287a7..7d98c5874e 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -50,6 +50,9 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages textutils) @@ -68,6 +71,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) + #:use-module (guix build-system python) #:use-module (guix build-system qt)) (define-public webrtc-for-telegram-desktop @@ -813,3 +817,51 @@ formerly a part of telegram-cli, but now being maintained separately.") (description "TG is the command-line interface for Telegram Messenger.") (home-page "https://github.com/vysheng/tg") (license license:gpl2+)))) + +(define-public tgcli + (package + (name "tgcli") + (version "0.3.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/erayerdin/tgcli") + (commit (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "082zim7rh4r8qyscqimjh2sz7998vv9j1i2y2wwz2rgrlhkhly5r")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Test requirements referes to specific versions of packages, + ;; which are too old. So we patch to refer to any later versions. + (add-after 'unpack 'patch-test-requirements + (lambda _ + (substitute* "dev.requirements.txt" + (("==") ">=")))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "tests"))))))) + (native-inputs + `(("coveralls" ,python-coveralls) + ("pytest" ,python-pytest) + ("pytest-click" ,python-pytest-click) + ("pytest-cov" ,python-pytest-cov) + ("mkdocs" ,python-mkdocs) + ("mkdocs-material" ,python-mkdocs-material) + ("requests-mock" ,python-requests-mock))) + (propagated-inputs + `(("click" ,python-click) + ("colorful" ,python-colorful) + ("requests" ,python-requests) + ("yaspin" ,python-yaspin))) + (home-page "https://tgcli.readthedocs.io") + (synopsis "Telegram Terminal Application") + (description "TgCli is a telegram client to automate repetitive tasks.") + (license license:asl2.0))) -- 2.31.1
[-- Attachment #1: Type: text/plain, Size: 310 bytes --] > + (description "MkDocs is a fast, simple and downright gorgeous static site > +generator That's a bit markety and rather subjective. Marketing language should be avoided in Guix, though I don't know the exact reasoning why. Could you reformulate the description a little? Greetings, Maxime. [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 260 bytes --]
* gnu/packages/telegram.scm (telegram-desktop)[version]: Update to 2.7.3. [phases](copy-inputs): Modify. [native-inputs]: Update cmake-helpers. [inputs]: Update codegen-source, lib-base-source, lib-lottie-source, lib-spellcheck-source, lib-storage-source, lib-tl-source, lib-ui-source, lib-webrtc-source and tgcalls-source. Add lib-webview-source, glibmm and webkitgtk. --- gnu/packages/telegram.scm | 59 ++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 42e9adc7dd..c4414287a7 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -57,6 +57,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -279,7 +280,7 @@ Telegram project, for its use in telegram desktop client.") (define-public telegram-desktop (package (name "telegram-desktop") - (version "2.5.9") + (version "2.7.3") (source (origin (method git-fetch) @@ -291,7 +292,7 @@ Telegram project, for its use in telegram desktop client.") (file-name (git-file-name name version)) (sha256 - (base32 "1lqs06scqvzg37a2py8jk7nnlvk42jjifcpnhdd5rgd5biw70nyx")) + (base32 "0vzn4jmxwj0jsqqi1z4k898lyqhfz9qh8s9nmrwnw5z76mlj2p8m")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -358,6 +359,7 @@ Telegram project, for its use in telegram desktop client.") ("Telegram/lib_tl" ,(assoc-ref inputs "lib-tl-source")) ("Telegram/lib_ui" ,(assoc-ref inputs "lib-ui-source")) ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) + ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source")) ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "tgcalls-source")))) #t)) @@ -377,11 +379,11 @@ Telegram project, for its use in telegram desktop client.") (uri (git-reference (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "695fabda6830b58bdc02d09db70531d5dececcd0"))) + (commit "52ccf5e17ab1bd7b352346c43706dc5e53bd19ca"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" version)) (sha256 - (base32 "1j3ppgfmihcjl22w5jk8jhwif10i9wbycq5zqnssn6pnhnj7di5i")))) + (base32 "0s79jf47x940ir6in347nvawfjgvril01mdwkhiza988zdhj5p3d")))) ("cmake-shared" ,cmake-shared) ("extra-cmake-modules" ,extra-cmake-modules) ("gcc" ,gcc-9) @@ -401,16 +403,17 @@ Telegram project, for its use in telegram desktop client.") (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "127968de8129e8ccfa6ac50721c70415a5a087c3"))) + (commit "a4904e076b1d1bfd00cd26f283a5e9ccd9740ac1"))) (file-name (git-file-name "codegen" version)) (sha256 - (base32 "036hzjrsk134ky62192nra43rsln5kh5gz20q1920s922661zky2")))) + (base32 "04vr9yl4pif2gza7zp78vsxvbdh3gsl1yz57b78f4fwqlrnxffi2")))) ("expected" ,libexpected) ("fcitx-qt5" ,fcitx-qt5) ("fcitx5-qt" ,fcitx5-qt) ("ffmpeg" ,ffmpeg) ("glib" ,glib) + ("glibmm" ,glibmm) ("gtk+" ,gtk+) ("hime" ,hime) ("hunspell" ,hunspell) @@ -422,11 +425,11 @@ Telegram project, for its use in telegram desktop client.") (uri (git-reference (url "https://github.com/desktop-app/lib_base.git") - (commit "f1e4168081428fa451d2f50eee7b1c448268c43a"))) + (commit "356daf59b35b2086cf5527e1c255557967fbb0af"))) (file-name (git-file-name "lib-base-for-telegram-desktop" version)) (sha256 - (base32 "0piqp7llwi7sfy4c15g0p8ihr90rz1qps6q5fkl1iasrf5ysw8qc")))) + (base32 "17p09bm1hyihsyxpzhp1bhgl8mss1ww97jh3fkj6qnai9c9a7l2p")))) ("lib-crl-source" ,(origin (method git-fetch) @@ -444,11 +447,11 @@ Telegram project, for its use in telegram desktop client.") (uri (git-reference (url "https://github.com/desktop-app/lib_lottie.git") - (commit "fb40f379d82ffa1fc7506e9a8dddcf48847715ae"))) + (commit "71fecd909b0d5553153ecb6803f03a91158aeefb"))) (file-name (git-file-name "lib-lottie-for-telegram-desktop" version)) (sha256 - (base32 "1vq0mqxcrrv7akcqk9cl4mm61zw6dcfmy8adl0pcp49kynm64saw")))) + (base32 "1rza4gzrhjg59f482b6sygbjbwgzcvww7pb3cjrp52ym5c5gys36")))) ("lib-qr-source" ,(origin (method git-fetch) @@ -488,55 +491,66 @@ Telegram project, for its use in telegram desktop client.") (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "1b540b38ed78e9a3cba93e9ba4ce4525ab692277"))) + (commit "d35fe8aa38a26bfcefd32286d48c371e1c7317b0"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" version)) (sha256 - (base32 "0a7042h5zrdvgs7v153ral2dh1zj84di5yjcmgcry5k4s1im9di7")))) + (base32 "07krq24rzjph476hwva8df4cp9s6nmcszckj2l7zchkx0qwl8wwp")))) ("lib-storage-source" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_storage.git") - (commit "cbe51722b73cfa9ff27bd59294b08aa5ee33c936"))) + (commit "99d7122ddc9f61b6e910db11692426661525647f"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" version)) (sha256 - (base32 "045l5xsyagyz17gbhmmvl2miss4nb92p0dmza7yfs9pkg9gs0f87")))) + (base32 "02hfvy0h5gqgc7612p53famvmr8llrfr42pmwk515d9179ycggxy")))) ("lib-tl-source" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_tl.git") - (commit "404c83d77e5edb8a39f8e9f56a6340960fe5070e"))) + (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) (file-name (git-file-name "lib-tl-for-telegram-desktop" version)) (sha256 - (base32 "1k34nkvvcjqw5q81n1qmklid60cvzjk4lmn9qjimk437m6wbii7f")))) + (base32 "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) ("lib-ui-source" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "e14bc4681d69c1b538b8c5af51501077ae5a8a86"))) + (commit "14c67cf724a572186455a8c0639f037ae26cc762"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" version)) (sha256 - (base32 "04b1x4bswk3bxqrwpv5g7w4frkprrwf0px6aibh6z4drinv08wsv")))) + (base32 "0r4jc9c4m0hra3lq1zvbg5cxlhdx7g4cb854s65zg8n43rdmlwbp")))) ("lib-webrtc-source" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "60d5c43daf882a6c03944a3e6198b5f35b654a0e"))) + (commit "5270a1dbbdbee643e187e175f798595b4bc49996"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" version)) (sha256 - (base32 "0mxmbw8i37axllg9h976p6np2gcfyci6xwwl9hc9mhs49vwwsw5s")))) + (base32 "0g4pswwk2zjgrc8psv4y1ba14mic6alkz63i962ksz4d8n92q2k7")))) + ("lib-webview-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_webview.git") + (commit "91c0e6664db4a444d630e3a0101f599a92df1dd9"))) + (file-name + (git-file-name "lib-webview-for-telegram-desktop" version)) + (sha256 + (base32 "0qsxrmrfsia91pzxsxsmls18i0b701111ibz5b1yj1y5dl764caj")))) ("libdbusmenu-qt" ,libdbusmenu-qt) ("libjpeg" ,libjpeg-turbo) ("libtgvoip" ,libtgvoip-for-telegram-desktop) @@ -561,11 +575,12 @@ Telegram project, for its use in telegram desktop client.") (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "71addf5b41cb6bb6844f75e977edae0020938930"))) + (commit "4a9de89c61882f00e0563d44516284a89874144b"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" version)) (sha256 - (base32 "1zrjxf03n3ad8b95gwjarmq4gj5i5cwhlg93qcjv2232kksh29iy")))) + (base32 "0g48ni5igbcdn4qdqab5y1b02wm8mn4dn5x6yqkxa46k7jmjfjnn")))) + ("webkitgtk" ,webkitgtk) ("webrtc" ,webrtc-for-telegram-desktop) ("x11" ,libx11) ("xcb" ,libxcb) -- 2.31.1
* gnu/packages/python-xyz.scm (python-colorful): New variable. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6f64e3c8f5..50ba88ab64 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -217,6 +217,34 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-colorful + (package + (name "python-colorful") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "colorful" version)) + (sha256 + (base32 "1sh7g2cn1fyz2hzmzs933razdxi2bna9i1lxa790r9pdwba8m146")))) + (build-system python-build-system) + ;; FIXME: tests cannot be computed: + ;; "Can't perform this operation for unregistered loader type" + (arguments + `(#:tests? #f)) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-flake8" ,python-flake8) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-colorama" ,python-colorama))) + (home-page "http://github.com/timofurrer/colorful") + (synopsis "Terminal string styling") + (description "Python-Colorful provides python libraries for string styling +in terminal.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-yaspin): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 50ba88ab64..ba7dc6488f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -245,6 +245,26 @@ in terminal.") (license license:expat))) +(define-public python-yaspin + (package + (name "python-yaspin") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "yaspin" version)) + (sha256 + (base32 "1iirah0kydrdp505qnjj6gi54avcr7z0hbkfx9vmh8myr30rpz6q")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/pavdmyt/yaspin") + (synopsis "Yet Another Terminal Spinner") + (description "Yaspin provides a full-featured terminal spinner to show the +progress during long-hanging operations.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-check.scm (python-pytest-click): New variable. --- gnu/packages/python-check.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index b68f23a220..90155a478c 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -46,6 +46,26 @@ #:use-module (guix download) #:use-module (guix build-system python)) +(define-public python-pytest-click + (package + (name "python-pytest-click") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "pytest_click" version)) + (sha256 + (base32 "1rcv4m850rl7djzdgzz2zhjd8g5ih8w6l0sj2f9hsynymlsq82xl")))) + (build-system python-build-system) + (propagated-inputs + `(("python-click" ,python-click) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/Stranger6667/pytest-click") + (synopsis "Py.test plugin for Click") + (description "Py.test plugin for Click") + (license license:expat))) + (define-public python-testfixtures (package (name "python-testfixtures") -- 2.31.1
This version is only available in zip format. * gnu/packages/python-xyz.scm (python-nltk)[version]: Update to 3.6.2. [uri]: Use zip extension. [native-inputs]: Add unzip. --- gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ba7dc6488f..2fc30b30f8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15034,18 +15034,20 @@ extracting firmware images") (define-public python-nltk (package (name "python-nltk") - (version "3.2.1") + (version "3.6.2") (source (origin (method url-fetch) - (uri (pypi-uri "nltk" version)) + (uri (pypi-uri "nltk" version ".zip")) (sha256 (base32 - "0skxbhnymwlspjkzga0f7x1hg3y50fwpfghs8g8k7fh6f4nknlym")))) + "1sq32lwgij9h8rsksymnxxr7bqfw3vgx5ijw4azbj6k2xnmmdmap")))) (build-system python-build-system) (arguments '(;; The tests require some extra resources to be downloaded. ;; TODO Try packaging these resources. #:tests? #f)) + (native-inputs + `(("unzip" ,unzip))) (home-page "http://nltk.org/") (synopsis "Natural Language Toolkit") (description "It provides interfaces to over 50 corpora and lexical -- 2.31.1
* gnu/packages/python-xyz.scm (python-nltk-3.4): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2fc30b30f8..006ebb1ab0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15056,6 +15056,25 @@ for classification, tokenization, stemming, tagging, parsing, and semantic reasoning, wrappers for natural language processing libraries.") (license license:asl2.0))) +;; Versions >=3.5 breaks backward-compatibility, +;; so we keep version 3.4.x around for a while. +(define-public python-nltk-3.4 + (package + (inherit python-nltk) + (name "python-nltk") + (version "3.4.5") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/nltk/nltk") + (commit version))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1zh8ryzr203zq53nf1wb19gf3bd5y1nd7any56a7vxw4d7hq35nn")))))) + (define-public python2-nltk (package-with-python2 python-nltk)) -- 2.31.1
* gnu/packages/python-xyz.scm (python-lunr): New variable. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 006ebb1ab0..1300855e07 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -265,6 +265,31 @@ in terminal.") progress during long-hanging operations.") (license license:expat))) +(define-public python-lunr + (package + (name "python-lunr") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "lunr" version)) + (sha256 + (base32 "106akalywfmnypzkdrhgz4n4740a8xayspybsw59kq06vz8i2qrc")))) + (build-system python-build-system) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-nltk" ,python-nltk-3.4))) + (home-page + "https://github.com/yeraydiazdiaz/lunr.py") + (synopsis "Python implementation of Lunr.js") + (description "Lunar.py aims to bring the simple and powerful full text +search capabilities into Python, guaranteeing results as close as the original +implementation as possible.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-mkdocs): New variable. --- gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1300855e07..4ade6b3472 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -290,6 +290,42 @@ search capabilities into Python, guaranteeing results as close as the original implementation as possible.") (license license:expat))) +(define-public python-mkdocs + (package + (name "python-mkdocs") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "mkdocs" version)) + (sha256 + (base32 "0fgv5zawpyyv0vd4j5y8m4h058lh9jkwfcm0xy4pg7dr09a1xdph")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Requirements refer to a specific version of dependencies, + ;; which are too old. So we patch to refer to any later version. + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* "setup.py" + (("==") ">="))))))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-jinja2" ,python-jinja2) + ("python-livereload" ,python-livereload) + ("python-lunr" ,python-lunr) + ("python-markdown" ,python-markdown) + ("python-pyyaml" ,python-pyyaml) + ("python-tornado" ,python-tornado))) + (home-page "https://www.mkdocs.org") + (synopsis "Project documentation with Markdown") + (description "MkDocs is a static site generator that’s geared towards +building project documentation. Documentation source files are written in +Markdown, and configured with a single YAML configuration file.") + (license license:bsd-3))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-pymdown-extensions): New variable. --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4ade6b3472..e3a03eda55 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -326,6 +326,29 @@ building project documentation. Documentation source files are written in Markdown, and configured with a single YAML configuration file.") (license license:bsd-3))) +(define-public python-pymdown-extensions + (package + (name "python-pymdown-extensions") + (version "8.1.1") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "pymdown-extensions" version)) + (sha256 + (base32 "0d8pdndrl1kj105lq7r6kw2dnhcvll6h2qs07w71mcpi7gx728v3")))) + (build-system python-build-system) + ;; FIXME: "AssertionError: False is not true" + (arguments + `(#:tests? #f)) + (propagated-inputs + `(("python-markdown" ,python-markdown))) + (home-page "https://github.com/facelessuser/pymdown-extensions") + (synopsis "Extension pack for Python Markdown") + (description "PyMdown Extensions is a collection of extensions for Python +Markdown. All extensions are found under the module namespace of pymdownx.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-mkdocs-material): New variable. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e3a03eda55..352c9bc8c6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -349,6 +349,40 @@ Markdown, and configured with a single YAML configuration file.") Markdown. All extensions are found under the module namespace of pymdownx.") (license license:expat))) +(define-public python-mkdocs-material + (package + (name "python-mkdocs-material") + (version "7.1.3") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "mkdocs-material" version)) + (sha256 + (base32 "0ci9xiasq9nfn09v11m7p49vzazdbgslw7rpzjd6y3hsmn9vljz3")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Requirement mkdocs-material-extensions + ;; in-turn requires mkdocs-material. This causes + ;; circular dependency, so we remove this requirement. + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* "requirements.txt" + (("mkdocs-material-extensions.*$") ""))))))) + (propagated-inputs + `(("python-markdown" ,python-markdown) + ("python-mkdocs" ,python-mkdocs) + ("python-pygments" ,python-pygments) + ("python-pymdown-extensions" + ,python-pymdown-extensions))) + (home-page "https://squidfunk.github.io/mkdocs-material/") + (synopsis "Material Design theme for MkDocs") + (description "Material for MkDocs is a theme for MkDocs, a static site +generator geared towards (technical) project documentation.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/telegram.scm (tgcli): New variable. --- gnu/packages/telegram.scm | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index c4414287a7..6b1617ab80 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -50,6 +50,9 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages textutils) @@ -68,6 +71,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) + #:use-module (guix build-system python) #:use-module (guix build-system qt)) (define-public webrtc-for-telegram-desktop @@ -813,3 +817,51 @@ formerly a part of telegram-cli, but now being maintained separately.") (description "TG is the command-line interface for Telegram Messenger.") (home-page "https://github.com/vysheng/tg") (license license:gpl2+)))) + +(define-public tgcli + (package + (name "tgcli") + (version "0.3.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/erayerdin/tgcli") + (commit (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "082zim7rh4r8qyscqimjh2sz7998vv9j1i2y2wwz2rgrlhkhly5r")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Test requirements referes to specific versions of packages, + ;; which are too old. So we patch them to refer to any later versions. + (add-after 'unpack 'patch-test-requirements + (lambda _ + (substitute* "dev.requirements.txt" + (("==") ">=")))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "tests"))))))) + (native-inputs + `(("coveralls" ,python-coveralls) + ("pytest" ,python-pytest) + ("pytest-click" ,python-pytest-click) + ("pytest-cov" ,python-pytest-cov) + ("mkdocs" ,python-mkdocs) + ("mkdocs-material" ,python-mkdocs-material) + ("requests-mock" ,python-requests-mock))) + (propagated-inputs + `(("click" ,python-click) + ("colorful" ,python-colorful) + ("requests" ,python-requests) + ("yaspin" ,python-yaspin))) + (home-page "https://tgcli.readthedocs.io") + (synopsis "Telegram Terminal Application") + (description "TgCli is a telegram client to automate repetitive tasks.") + (license license:asl2.0))) -- 2.31.1
[-- Attachment #1.1.1: Type: text/plain, Size: 248 bytes --] Hi Maxime, > That's a bit markety and rather subjective. > Marketing language should be avoided in Guix, though I don't know the exact > reasoning why. > Could you reformulate the description a little? Fixed it in v5. :) Regards, RG. [-- Attachment #1.1.2: OpenPGP public key --] [-- Type: application/pgp-keys, Size: 2649 bytes --] [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 236 bytes --]
* gnu/packages/python-xyz.scm (python-colorful): New variable. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3fbb7b3366..67331d1064 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -217,6 +217,34 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-colorful + (package + (name "python-colorful") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "colorful" version)) + (sha256 + (base32 "1sh7g2cn1fyz2hzmzs933razdxi2bna9i1lxa790r9pdwba8m146")))) + (build-system python-build-system) + ;; FIXME: tests cannot be computed: + ;; "Can't perform this operation for unregistered loader type" + (arguments + `(#:tests? #f)) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-flake8" ,python-flake8) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-colorama" ,python-colorama))) + (home-page "http://github.com/timofurrer/colorful") + (synopsis "Terminal string styling") + (description "Colorful provides an array of text styles, that can be used +as functions or string constants to form colored terminal output.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-yaspin): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 67331d1064..aab53bd869 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -245,6 +245,26 @@ as functions or string constants to form colored terminal output.") (license license:expat))) +(define-public python-yaspin + (package + (name "python-yaspin") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "yaspin" version)) + (sha256 + (base32 "1iirah0kydrdp505qnjj6gi54avcr7z0hbkfx9vmh8myr30rpz6q")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/pavdmyt/yaspin") + (synopsis "Yet Another Terminal Spinner") + (description "Yaspin provides a terminal spinner to indicate the progress +during long operations.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-check.scm (python-pytest-click): New variable. --- gnu/packages/python-check.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index b68f23a220..01922b0d9d 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -46,6 +46,27 @@ #:use-module (guix download) #:use-module (guix build-system python)) +(define-public python-pytest-click + (package + (name "python-pytest-click") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "pytest_click" version)) + (sha256 + (base32 "1rcv4m850rl7djzdgzz2zhjd8g5ih8w6l0sj2f9hsynymlsq82xl")))) + (build-system python-build-system) + (propagated-inputs + `(("python-click" ,python-click) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/Stranger6667/pytest-click") + (synopsis "Py.test plugin for Click") + (description "This package provides a plugin to test Python click +interfaces with pytest.") + (license license:expat))) + (define-public python-testfixtures (package (name "python-testfixtures") -- 2.31.1
This version is only available in zip format. * gnu/packages/python-xyz.scm (python-nltk)[version]: Update to 3.6.2. [uri]: Use zip extension. [native-inputs]: Add unzip. --- gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index aab53bd869..a17a2b11b1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15053,18 +15053,20 @@ extracting firmware images") (define-public python-nltk (package (name "python-nltk") - (version "3.2.1") + (version "3.6.2") (source (origin (method url-fetch) - (uri (pypi-uri "nltk" version)) + (uri (pypi-uri "nltk" version ".zip")) (sha256 (base32 - "0skxbhnymwlspjkzga0f7x1hg3y50fwpfghs8g8k7fh6f4nknlym")))) + "1sq32lwgij9h8rsksymnxxr7bqfw3vgx5ijw4azbj6k2xnmmdmap")))) (build-system python-build-system) (arguments '(;; The tests require some extra resources to be downloaded. ;; TODO Try packaging these resources. #:tests? #f)) + (native-inputs + `(("unzip" ,unzip))) (home-page "http://nltk.org/") (synopsis "Natural Language Toolkit") (description "It provides interfaces to over 50 corpora and lexical -- 2.31.1
* gnu/packages/python-xyz.scm (python-nltk-3.4): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a17a2b11b1..912868f0e8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15075,6 +15075,25 @@ for classification, tokenization, stemming, tagging, parsing, and semantic reasoning, wrappers for natural language processing libraries.") (license license:asl2.0))) +;; Versions >=3.5 breaks backward-compatibility, +;; so we keep version 3.4.x around for a while. +(define-public python-nltk-3.4 + (package + (inherit python-nltk) + (name "python-nltk") + (version "3.4.5") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/nltk/nltk") + (commit version))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1zh8ryzr203zq53nf1wb19gf3bd5y1nd7any56a7vxw4d7hq35nn")))))) + (define-public python2-nltk (package-with-python2 python-nltk)) -- 2.31.1
* gnu/packages/python-xyz.scm (python-lunr): New variable. --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 912868f0e8..504b8ec34a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -265,6 +265,30 @@ as functions or string constants to form colored terminal output.") during long operations.") (license license:expat))) +(define-public python-lunr + (package + (name "python-lunr") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "lunr" version)) + (sha256 + (base32 "106akalywfmnypzkdrhgz4n4740a8xayspybsw59kq06vz8i2qrc")))) + (build-system python-build-system) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-nltk" ,python-nltk-3.4))) + (home-page + "https://github.com/yeraydiazdiaz/lunr.py") + (synopsis "Python implementation of Lunr.js") + (description "This package implements full text search capabilities in +Python. It provides similar results to Lunr JavaScript.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-mkdocs): New variable. --- gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 504b8ec34a..88cd6b22f5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -289,6 +289,42 @@ during long operations.") Python. It provides similar results to Lunr JavaScript.") (license license:expat))) +(define-public python-mkdocs + (package + (name "python-mkdocs") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "mkdocs" version)) + (sha256 + (base32 "0fgv5zawpyyv0vd4j5y8m4h058lh9jkwfcm0xy4pg7dr09a1xdph")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Requirements refer to a specific version of dependencies, + ;; which are too old. So we patch to refer to any later version. + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* "setup.py" + (("==") ">="))))))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-jinja2" ,python-jinja2) + ("python-livereload" ,python-livereload) + ("python-lunr" ,python-lunr) + ("python-markdown" ,python-markdown) + ("python-pyyaml" ,python-pyyaml) + ("python-tornado" ,python-tornado))) + (home-page "https://www.mkdocs.org") + (synopsis "Project documentation with Markdown") + (description "MkDocs is a static site generator that’s geared towards +building project documentation. Documentation source files are written in +Markdown, and configured with a single YAML configuration file.") + (license license:bsd-3))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-pymdown-extensions): New variable. --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 88cd6b22f5..f1c8506636 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -325,6 +325,29 @@ building project documentation. Documentation source files are written in Markdown, and configured with a single YAML configuration file.") (license license:bsd-3))) +(define-public python-pymdown-extensions + (package + (name "python-pymdown-extensions") + (version "8.1.1") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "pymdown-extensions" version)) + (sha256 + (base32 "0d8pdndrl1kj105lq7r6kw2dnhcvll6h2qs07w71mcpi7gx728v3")))) + (build-system python-build-system) + ;; FIXME: "AssertionError: False is not true" + (arguments + `(#:tests? #f)) + (propagated-inputs + `(("python-markdown" ,python-markdown))) + (home-page "https://github.com/facelessuser/pymdown-extensions") + (synopsis "Extension pack for Python Markdown") + (description "PyMdown Extensions is a collection of extensions for Python +Markdown. All extensions are found under the module namespace of pymdownx.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-mkdocs-material): New variable. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f1c8506636..a2629381dc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -348,6 +348,40 @@ Markdown, and configured with a single YAML configuration file.") Markdown. All extensions are found under the module namespace of pymdownx.") (license license:expat))) +(define-public python-mkdocs-material + (package + (name "python-mkdocs-material") + (version "7.1.3") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "mkdocs-material" version)) + (sha256 + (base32 "0ci9xiasq9nfn09v11m7p49vzazdbgslw7rpzjd6y3hsmn9vljz3")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Requirement mkdocs-material-extensions + ;; in-turn requires mkdocs-material. This causes + ;; circular dependency, so we remove this requirement. + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* "requirements.txt" + (("mkdocs-material-extensions.*$") ""))))))) + (propagated-inputs + `(("python-markdown" ,python-markdown) + ("python-mkdocs" ,python-mkdocs) + ("python-pygments" ,python-pygments) + ("python-pymdown-extensions" + ,python-pymdown-extensions))) + (home-page "https://squidfunk.github.io/mkdocs-material/") + (synopsis "Material Design theme for MkDocs") + (description "This package provides a theme plugin for the static site +generator MkDocs.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/telegram.scm (tgcli): New variable. --- gnu/packages/telegram.scm | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index e6bfe6c4f2..6f77482117 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -49,6 +49,9 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages textutils) @@ -66,6 +69,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) + #:use-module (guix build-system python) #:use-module (guix build-system qt)) (define-public webrtc-for-telegram-desktop @@ -783,3 +787,51 @@ formerly a part of telegram-cli, but now being maintained separately.") (description "TG is the command-line interface for Telegram Messenger.") (home-page "https://github.com/vysheng/tg") (license license:gpl2+)))) + +(define-public tgcli + (package + (name "tgcli") + (version "0.3.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/erayerdin/tgcli") + (commit (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "082zim7rh4r8qyscqimjh2sz7998vv9j1i2y2wwz2rgrlhkhly5r")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Test requirements referes to specific versions of packages, + ;; which are too old. So we patch them to refer to any later versions. + (add-after 'unpack 'patch-test-requirements + (lambda _ + (substitute* "dev.requirements.txt" + (("==") ">=")))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "tests"))))))) + (native-inputs + `(("coveralls" ,python-coveralls) + ("pytest" ,python-pytest) + ("pytest-click" ,python-pytest-click) + ("pytest-cov" ,python-pytest-cov) + ("mkdocs" ,python-mkdocs) + ("mkdocs-material" ,python-mkdocs-material) + ("requests-mock" ,python-requests-mock))) + (propagated-inputs + `(("click" ,python-click) + ("colorful" ,python-colorful) + ("requests" ,python-requests) + ("yaspin" ,python-yaspin))) + (home-page "https://tgcli.readthedocs.io") + (synopsis "Telegram Terminal Application") + (description "TgCli is a telegram client to automate repetitive tasks.") + (license license:asl2.0))) -- 2.31.1
* gnu/packages/python-xyz.scm (python-colorful): New variable. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3fbb7b3366..67331d1064 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -217,6 +217,34 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-colorful + (package + (name "python-colorful") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "colorful" version)) + (sha256 + (base32 "1sh7g2cn1fyz2hzmzs933razdxi2bna9i1lxa790r9pdwba8m146")))) + (build-system python-build-system) + ;; FIXME: tests cannot be computed: + ;; "Can't perform this operation for unregistered loader type" + (arguments + `(#:tests? #f)) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-flake8" ,python-flake8) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-colorama" ,python-colorama))) + (home-page "http://github.com/timofurrer/colorful") + (synopsis "Terminal string styling") + (description "Colorful provides an array of text styles, that can be used +as functions or string constants to form colored terminal output.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-yaspin): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 67331d1064..aab53bd869 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -245,6 +245,26 @@ as functions or string constants to form colored terminal output.") (license license:expat))) +(define-public python-yaspin + (package + (name "python-yaspin") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "yaspin" version)) + (sha256 + (base32 "1iirah0kydrdp505qnjj6gi54avcr7z0hbkfx9vmh8myr30rpz6q")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/pavdmyt/yaspin") + (synopsis "Yet Another Terminal Spinner") + (description "Yaspin provides a terminal spinner to indicate the progress +during long operations.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-check.scm (python-pytest-click): New variable. --- gnu/packages/python-check.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index b68f23a220..01922b0d9d 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -46,6 +46,27 @@ #:use-module (guix download) #:use-module (guix build-system python)) +(define-public python-pytest-click + (package + (name "python-pytest-click") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "pytest_click" version)) + (sha256 + (base32 "1rcv4m850rl7djzdgzz2zhjd8g5ih8w6l0sj2f9hsynymlsq82xl")))) + (build-system python-build-system) + (propagated-inputs + `(("python-click" ,python-click) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/Stranger6667/pytest-click") + (synopsis "Py.test plugin for Click") + (description "This package provides a plugin to test Python click +interfaces with pytest.") + (license license:expat))) + (define-public python-testfixtures (package (name "python-testfixtures") -- 2.31.1
This version is only available in zip format. * gnu/packages/python-xyz.scm (python-nltk)[version]: Update to 3.6.2. [uri]: Use zip extension. [native-inputs]: Add unzip. --- gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index aab53bd869..a17a2b11b1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15053,18 +15053,20 @@ extracting firmware images") (define-public python-nltk (package (name "python-nltk") - (version "3.2.1") + (version "3.6.2") (source (origin (method url-fetch) - (uri (pypi-uri "nltk" version)) + (uri (pypi-uri "nltk" version ".zip")) (sha256 (base32 - "0skxbhnymwlspjkzga0f7x1hg3y50fwpfghs8g8k7fh6f4nknlym")))) + "1sq32lwgij9h8rsksymnxxr7bqfw3vgx5ijw4azbj6k2xnmmdmap")))) (build-system python-build-system) (arguments '(;; The tests require some extra resources to be downloaded. ;; TODO Try packaging these resources. #:tests? #f)) + (native-inputs + `(("unzip" ,unzip))) (home-page "http://nltk.org/") (synopsis "Natural Language Toolkit") (description "It provides interfaces to over 50 corpora and lexical -- 2.31.1
* gnu/packages/python-xyz.scm (python-nltk-3.4): New variable. --- gnu/packages/python-xyz.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a17a2b11b1..9dc191dcb5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15075,6 +15075,19 @@ for classification, tokenization, stemming, tagging, parsing, and semantic reasoning, wrappers for natural language processing libraries.") (license license:asl2.0))) +;; Versions >=3.5 breaks backward-compatibility, +;; so we keep version 3.4.x around for a while. +(define-public python-nltk-3.4 + (package + (inherit python-nltk) + (version "3.4.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nltk" version ".zip")) + (sha256 + (base32 "153x2clrnigs74jdgnn3qmljdjj4gprmvpdvh49i18ls4m8mbm5y")))))) + (define-public python2-nltk (package-with-python2 python-nltk)) -- 2.31.1
* gnu/packages/python-xyz.scm (python-lunr): New variable. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9dc191dcb5..ec45958134 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -265,6 +265,31 @@ as functions or string constants to form colored terminal output.") during long operations.") (license license:expat))) +(define-public python-lunr + (package + (name "python-lunr") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "lunr" version)) + (sha256 + (base32 "106akalywfmnypzkdrhgz4n4740a8xayspybsw59kq06vz8i2qrc")))) + (build-system python-build-system) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-nltk" ,python-nltk-3.4))) + (home-page + "https://github.com/yeraydiazdiaz/lunr.py") + (synopsis "Full-text search library") + (description "This package provides python library for full-text search. +It indexes documents and provides a search interface for retrieving documents +that best match text queries.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-mkdocs): New variable. --- gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ec45958134..d076fa1c16 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -290,6 +290,42 @@ It indexes documents and provides a search interface for retrieving documents that best match text queries.") (license license:expat))) +(define-public python-mkdocs + (package + (name "python-mkdocs") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "mkdocs" version)) + (sha256 + (base32 "0fgv5zawpyyv0vd4j5y8m4h058lh9jkwfcm0xy4pg7dr09a1xdph")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Requirements refer to a specific version of dependencies, + ;; which are too old. So we patch to refer to any later version. + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* "setup.py" + (("==") ">="))))))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-jinja2" ,python-jinja2) + ("python-livereload" ,python-livereload) + ("python-lunr" ,python-lunr) + ("python-markdown" ,python-markdown) + ("python-pyyaml" ,python-pyyaml) + ("python-tornado" ,python-tornado))) + (home-page "https://www.mkdocs.org") + (synopsis "Project documentation with Markdown") + (description "MkDocs is a static site generator geared towards building +project documentation. Documentation source files are written in Markdown, and +configured with a single YAML configuration file.") + (license license:bsd-3))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-pymdown-extensions): New variable. --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d076fa1c16..5e6579a5ae 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -326,6 +326,29 @@ project documentation. Documentation source files are written in Markdown, and configured with a single YAML configuration file.") (license license:bsd-3))) +(define-public python-pymdown-extensions + (package + (name "python-pymdown-extensions") + (version "8.1.1") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "pymdown-extensions" version)) + (sha256 + (base32 "0d8pdndrl1kj105lq7r6kw2dnhcvll6h2qs07w71mcpi7gx728v3")))) + (build-system python-build-system) + ;; FIXME: "AssertionError: False is not true" + (arguments + `(#:tests? #f)) + (propagated-inputs + `(("python-markdown" ,python-markdown))) + (home-page "https://github.com/facelessuser/pymdown-extensions") + (synopsis "Extension pack for Python Markdown") + (description "PyMdown Extensions is a collection of extensions for Python +Markdown. All extensions are found under the module namespace of pymdownx.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/python-xyz.scm (python-mkdocs-material): New variable. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5e6579a5ae..ab12c3b69c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -349,6 +349,40 @@ configured with a single YAML configuration file.") Markdown. All extensions are found under the module namespace of pymdownx.") (license license:expat))) +(define-public python-mkdocs-material + (package + (name "python-mkdocs-material") + (version "7.1.3") + (source + (origin + (method url-fetch) + (uri + (pypi-uri "mkdocs-material" version)) + (sha256 + (base32 "0ci9xiasq9nfn09v11m7p49vzazdbgslw7rpzjd6y3hsmn9vljz3")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Requirement mkdocs-material-extensions + ;; in-turn requires mkdocs-material. This causes + ;; circular dependency, so we remove this requirement. + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* "requirements.txt" + (("mkdocs-material-extensions.*$") ""))))))) + (propagated-inputs + `(("python-markdown" ,python-markdown) + ("python-mkdocs" ,python-mkdocs) + ("python-pygments" ,python-pygments) + ("python-pymdown-extensions" + ,python-pymdown-extensions))) + (home-page "https://squidfunk.github.io/mkdocs-material/") + (synopsis "Material Design theme for MkDocs") + (description "This package provides a theme plugin for the static site +generator MkDocs.") + (license license:expat))) + (define-public python-slixmpp (package (name "python-slixmpp") -- 2.31.1
* gnu/packages/telegram.scm (tgcli): New variable. --- gnu/packages/telegram.scm | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index e6bfe6c4f2..6f77482117 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -49,6 +49,9 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages textutils) @@ -66,6 +69,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) + #:use-module (guix build-system python) #:use-module (guix build-system qt)) (define-public webrtc-for-telegram-desktop @@ -783,3 +787,51 @@ formerly a part of telegram-cli, but now being maintained separately.") (description "TG is the command-line interface for Telegram Messenger.") (home-page "https://github.com/vysheng/tg") (license license:gpl2+)))) + +(define-public tgcli + (package + (name "tgcli") + (version "0.3.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/erayerdin/tgcli") + (commit (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "082zim7rh4r8qyscqimjh2sz7998vv9j1i2y2wwz2rgrlhkhly5r")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Test requirements referes to specific versions of packages, + ;; which are too old. So we patch them to refer to any later versions. + (add-after 'unpack 'patch-test-requirements + (lambda _ + (substitute* "dev.requirements.txt" + (("==") ">=")))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "tests"))))))) + (native-inputs + `(("coveralls" ,python-coveralls) + ("pytest" ,python-pytest) + ("pytest-click" ,python-pytest-click) + ("pytest-cov" ,python-pytest-cov) + ("mkdocs" ,python-mkdocs) + ("mkdocs-material" ,python-mkdocs-material) + ("requests-mock" ,python-requests-mock))) + (propagated-inputs + `(("click" ,python-click) + ("colorful" ,python-colorful) + ("requests" ,python-requests) + ("yaspin" ,python-yaspin))) + (home-page "https://tgcli.readthedocs.io") + (synopsis "Telegram Terminal Application") + (description "TgCli is a telegram client to automate repetitive tasks.") + (license license:asl2.0))) -- 2.31.1