From 14bcd6804ffe14613847bf093cc451cedddb02cc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 9 Sep 2021 17:54:43 +0200 Subject: gnu: python-pikepdf: Update to 3.0.0. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 3.0.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7c70829de9..2f93e0bda5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6438,13 +6438,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.16.1") + (version "3.0.0") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "1phdpi9cm2pbvgcxqvwr8ck327sxhdw4dnxmzhrbf7hzydmgykg2")))) + (base32 "0hw88971b1462c0f5fy7wb8iv4gjkpl314g6fnlsy8hb4dz965rw")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit 1.4.1 From bae57cc7d2917c4a67e9afb68ed61ad7117ea7ea Mon Sep 17 00:00:00 2001 From: Daniel Meißner Date: Tue, 10 Aug 2021 18:28:18 +0200 Subject: gnu: python-decorator: Update to 5.0.9. * gnu/packages/python-xyz.scm (python-decorator): Update to 5.0.9. Signed-off-by: Arun Isaac --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2f93e0bda5..97112e5bbd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -108,6 +108,7 @@ ;;; Copyright © 2021 Franck Pérignon ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Simon Streit +;;; Copyright © 2021 Daniel Meißner ;;; ;;; This file is part of GNU Guix. ;;; @@ -7097,13 +7098,13 @@ PNG, PostScript, PDF, and SVG file output.") (define-public python-decorator (package (name "python-decorator") - (version "4.3.0") + (version "5.0.9") (source (origin (method url-fetch) (uri (pypi-uri "decorator" version)) (sha256 - (base32 "0308djallnh00v112y5b7nadl657ysmkp6vc8xn51d6yzc9zm7n3")))) + (base32 "1mcy64hllgm938v8k1x2a4g0q9swsnrfnsvhz59kr28a6ajgpv3j")))) (build-system python-build-system) (home-page "https://pypi.org/project/decorator/") (synopsis "Python module to simplify usage of decorators") -- cgit 1.4.1 From 370d1cdb61e1b9b5467d2aed4cab89c2a8e2a491 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 9 Sep 2021 23:40:34 +0200 Subject: Revert "gnu: python-pikepdf: Update to 3.0.0." This reverts commit 14bcd6804ffe14613847bf093cc451cedddb02cc. The library fails to build. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 97112e5bbd..e98eec19bc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6439,13 +6439,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "3.0.0") + (version "2.16.1") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "0hw88971b1462c0f5fy7wb8iv4gjkpl314g6fnlsy8hb4dz965rw")))) + (base32 "1phdpi9cm2pbvgcxqvwr8ck327sxhdw4dnxmzhrbf7hzydmgykg2")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit 1.4.1 From 9003bd8709c2b3f88e4ab34d3fc8e061a1beb08e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Sep 2021 17:05:00 +0200 Subject: gnu: Add texlive-pdftex. * gnu/packages/chez.scm (texlive-pdftex): New variable. (texlive-generic-pdftex): Deprecate in favor of texlive-pdftex. (teximpatient)[native-inputs]: Replace texlive-generic-pdftex with texlive-pdftex. (texlive-latex-pdfx)[propagated-inputs]: Same. * gnu/packages/python-xyz.scm (python-numpy-documentation)[native-inputs]: Same. (python-matplotlib-documentation)[native-inputs]: Same. (python-ipython-documentation)[native-inputs]: Same. * gnu/packages/chez.scm (chez-web)[native-inputs]: Same. (chez-sockets)[native-inputs]: Same. --- gnu/packages/chez.scm | 4 +-- gnu/packages/python-xyz.scm | 6 ++-- gnu/packages/tex.scm | 75 +++++++++++++++++++-------------------------- 3 files changed, 36 insertions(+), 49 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 1cd2cde71b..adc2f1976e 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -320,9 +320,9 @@ and 32-bit PowerPC architectures.") texlive-generic-epsf texlive-metapost texlive-fonts-charter - texlive-generic-pdftex texlive-context-base texlive-fonts-cm + texlive-pdftex texlive-tex-plain))))) (arguments `(#:make-flags (list (string-append "PREFIX=" %output) @@ -381,7 +381,7 @@ programming in Scheme.") (native-inputs `(("chez-scheme" ,chez-scheme) ("chez-web" ,chez-web) - ("texlive" ,(texlive-union (list texlive-generic-pdftex))))) + ("texlive" ,(texlive-union (list texlive-pdftex))))) (arguments `(#:tests? #f ; no tests #:phases diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e98eec19bc..11e9d3437b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5386,7 +5386,7 @@ readable format.") ("texlive" ,(texlive-union (list texlive-fonts-cm-super texlive-fonts-ec texlive-generic-ifxetex - texlive-generic-pdftex + texlive-pdftex texlive-amsfonts/patched texlive-latex-capt-of texlive-latex-cmap @@ -5929,7 +5929,7 @@ toolkits.") texlive-latex-type1cm texlive-latex-ucs - texlive-generic-pdftex + texlive-pdftex texlive-fonts-ec texlive-fonts-adobe-times @@ -8264,7 +8264,7 @@ computing.") ("texlive" ,(texlive-union (list texlive-amsfonts/patched texlive-fonts-ec texlive-generic-ifxetex - texlive-generic-pdftex + texlive-pdftex texlive-latex-capt-of texlive-latex-cmap texlive-latex-environ diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2c9acc5019..306f9a4f7c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6187,49 +6187,33 @@ requires the suffix package, which in turn requires that it runs under e-TeX.") (license license:lppl1.3+))) -(define-public texlive-generic-pdftex +(define-public texlive-pdftex (package - (name "texlive-generic-pdftex") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/generic/pdftex")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0k68zmqzs4qvrqxdwsrawbjb14hxqjfamq649azvai0jjxdpkljd")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/generic/pdftex")) - (target-map (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/fonts/map/pdftex"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - (mkdir-p target-map) - (copy-recursively (assoc-ref %build-inputs "pdftex-map") target-map) - #t)))) - (native-inputs - `(("pdftex-map" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/map/pdftex")) - (revision %texlive-revision))) - (file-name (string-append name "-map-" version "-checkout")) - (sha256 - (base32 - "03rfif2631pgd8g1ar4xblcdh078kky7fvw3kfsj5a47rxxgicp2")))))) + (inherit (simple-texlive-package + "texlive-pdftex" + (list "/doc/pdftex/" + "/doc/man/man1/pdftex.1" + "/doc/man/man1/pdfetex.1" + "/fonts/map/dvips/dummy-space/dummy-space.map" + "/fonts/tfm/public/pdftex/dummy-space.tfm" + "/fonts/type1/public/pdftex/dummy-space.pfb" + "/scripts/simpdftex/simpdftex" + "/tex/generic/config/pdftex-dvi.tex" + "/tex/generic/pdftex/glyphtounicode.tex" + "/tex/generic/pdftex/pdfcolor.tex") + (base32 + "0wsgbl0jrqc1qzgf23dla6b95lv2h8x6xvs5466d8jdrih6pwriq") + #:trivial? #t)) + ;; TODO: add this missing package: + ;; dehyph + (propagated-inputs + `(("texlive-cm" ,texlive-cm) + ("texlive-etex" ,texlive-etex) + ("texlive-fonts-knuth-lib" ,texlive-fonts-knuth-lib) + ("texlive-hyphen-base" ,texlive-hyphen-base) + ("texlive-kpathsea" ,texlive-kpathsea) + ("texlive-tex-ini-files" ,texlive-tex-ini-files) + ("texlive-tex-plain" ,texlive-tex-plain))) (home-page "https://www.ctan.org/pkg/pdftex") (synopsis "TeX extension for direct creation of PDF") (description @@ -6237,6 +6221,9 @@ e-TeX.") directly generate PDF documents instead of DVI.") (license license:gpl2+))) +(define-public texlive-generic-pdftex + (deprecated-package "texlive-generic-pdftex" texlive-pdftex)) + (define texlive-texmf (package (name "texlive-texmf") @@ -6617,7 +6604,7 @@ develop documents with LaTeX, in a single application.") texlive-fonts-adobe-zapfding texlive-fonts-knuth-lib texlive-fonts-mflogo-font - texlive-generic-pdftex))) + texlive-pdftex))) ("automake" ,automake))) (home-page "https://www.gnu.org/software/teximpatient/") (synopsis "Book on TeX, plain TeX and Eplain") @@ -7421,7 +7408,7 @@ the file to which it applies.") (delete-file (string-append target "/pdfx.sty")) #t)))))) (propagated-inputs - `(("texlive-generic-pdftex" ,texlive-generic-pdftex))) + `(("texlive-pdftex" ,texlive-pdftex))) (native-inputs `(("texlive-tex-pdfx" ,(origin -- cgit 1.4.1 From 0bce8636e8305dc735ba298ff2b85406b040ff79 Mon Sep 17 00:00:00 2001 From: Pradana Aumars Date: Tue, 14 Sep 2021 08:56:02 +0200 Subject: gnu: Add python-crontab. * gnu/packages/python-xyz.scm (python-crontab): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 11e9d3437b..66857b31b0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -109,6 +109,7 @@ ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Simon Streit ;;; Copyright © 2021 Daniel Meißner +;;; Copyright © 2021 Pradana Aumars ;;; ;;; This file is part of GNU Guix. ;;; @@ -22434,6 +22435,28 @@ processes may share the same data.") format.") (license license:expat))) +(define-public python-crontab + (package + (name "python-crontab") + (version "2.5.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri name version)) + (sha256 + (base32 "0cccrqc10r8781ba81x8r2frs3pl2m4hkm599k5358ak0xr7xgjb")))) + (build-system python-build-system) + (arguments + ;; Comptability tests fail so they are disabled. + `(#:tests? #f)) + (inputs + `(("python-dateutil" ,python-dateutil))) + (home-page "https://gitlab.com/doctormo/python-crontab/") + (synopsis "Module for reading and writing crontab files") + (description "This Python module can read, write crontab files, and +access the system cron automatically and simply using a direct API.") + (license license:lgpl3+))) + (define-public python-pylzma (package (name "python-pylzma") -- cgit 1.4.1 From 1e230044634955e0c989b0e9933033e2024413cb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Sep 2021 23:37:04 +0200 Subject: gnu: python-natsort: Update to 7.1.1. * gnu/packages/python-xyz.scm (python-natsort): Update to 7.1.1. [arguments]: Remove obsolete phase. --- gnu/packages/python-xyz.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 66857b31b0..c7045a604e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16000,13 +16000,13 @@ Python to manipulate OpenDocument 1.2 files.") (define-public python-natsort (package (name "python-natsort") - (version "7.0.1") + (version "7.1.1") (source (origin (method url-fetch) (uri (pypi-uri "natsort" version)) (sha256 (base32 - "1ksqfai72dbcfbwx43pxl658j59mx2rvqypjy1fk0ax2qd6lccx6")))) + "00y49bfsi7rrsd1s42gc2w95a6arl9ipdsx2493hr0v54fj07ih0")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) @@ -16016,9 +16016,6 @@ Python to manipulate OpenDocument 1.2 files.") (ice-9 ftw)) #:phases (modify-phases %standard-phases - (add-before 'check 'set-cachedir - ;; Tests require write access to $HOME by default - (lambda _ (setenv "PYTHON_EGG_CACHE" "/tmp") #t)) (replace 'check (lambda _ (let ((cwd (getcwd))) -- cgit 1.4.1 From 3bd222e79d11e215eb69d7bbe7b728164f2dd845 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 16 Sep 2021 19:06:35 +0200 Subject: gnu: python-relatorio: Update to 0.10.0. * gnu/packages/python-xyz.scm (python-relatorio): Update to 0.10.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c7045a604e..4cf7797f84 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17962,14 +17962,14 @@ information.") (define-public python-relatorio (package (name "python-relatorio") - (version "0.8.0") + (version "0.10.0") (source (origin (method url-fetch) (uri (pypi-uri "relatorio" version)) (sha256 (base32 - "1na6hlhz1awi1hbjg1gyclq0khz42iz90wvdjw7mmj655788bpxx")))) + "09nhrz80dfm60nssbvjgz4czzy4yzfa8gxczcdlzbgcnnvm914vb")))) (build-system python-build-system) (propagated-inputs `(("python-lxml" ,python-lxml) -- cgit 1.4.1 From ce0d39ae2b8084392f4dee61ef976b1a5270014c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Sep 2021 14:35:05 +0200 Subject: gnu: Remove python2-natsort. This package currently fails to build and has no users in Guix. * gnu/packages/python-xyz.scm (python2-natsort): Remove variable. (python-natsort)[properties]: Remove. --- gnu/packages/python-xyz.scm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4cf7797f84..4e2e719afc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16045,23 +16045,7 @@ on a list such as @code{[@code{a20}, @code{a9}, @code{a1}, @code{a4}, identifies numbers and sorts them separately from strings. It can also sort version numbers, real numbers, mixed types and more, and comes with a shell command @command{natsort} that exposes this functionality in the command line.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-natsort)))))) - -;; Natsort 6.x are the last versions with support for Python 2. -(define-public python2-natsort - (let ((base (package-with-python2 (strip-python2-variant python-natsort)))) - (package (inherit base) - (version "6.2.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "natsort" version)) - (sha256 - (base32 - "1mc9hbh6fv76xyz13frm7dgi05cf74f9j5wvcyjiy5234gylz565")))) - (native-inputs - `(("python2-pathlib" ,python2-pathlib) - ,@(package-native-inputs base)))))) + (license license:expat))) (define-public glances (package -- cgit 1.4.1