guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/04: gnu: repo2docker: Update to 2024.03.0.


From: guix-commits
Subject: 04/04: gnu: repo2docker: Update to 2024.03.0.
Date: Wed, 8 May 2024 04:33:00 -0400 (EDT)

rekado pushed a commit to branch python-team
in repository guix.

commit 09e06ad425361cf5e05cdbf07c19ac136e4602b5
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Wed May 8 10:31:30 2024 +0200

    gnu: repo2docker: Update to 2024.03.0.
    
    * gnu/packages/jupyter.scm (repo2docker): Update to 2024.03.0.
    [build-system]: Use pyproject-build-system.
    [arguments]: Use G-expression.
    [native-inputs]: Add python-setuptools, python-sphinx-autobuild,
    python-sphinx-copybutton, python-sphinxext-opengraph,
    python-sphinxext-rediraffe, and python-wheel.
    
    Change-Id: I5761f6d36e57b7fe25bc1dbbdaedfa2ca69c1fa7
---
 gnu/packages/jupyter.scm | 74 +++++++++++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 32 deletions(-)

diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index 37a88194b3..2c982b4c21 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -832,7 +832,7 @@ version to the original file.")
 (define-public repo2docker
   (package
     (name "repo2docker")
-    (version "2021.08.0")
+    (version "2024.03.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -841,38 +841,38 @@ version to the original file.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "111irpghzys0s5ixs8paskz7465cls1sm9d5bg45a15jklcw84a9"))))
+                "1bcnl91j6p3315lk2mmn02jq6mjsn68m9rcw5rkln4c9fx1160rx"))))
     (outputs '("out" "doc"))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (add-after 'patch-shebangs 'fix-install-miniforge
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let* ((out (assoc-ref outputs "out")))
-                        (substitute* (find-files
-                                      out "^(install-miniforge|install-nix|\
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'patch-shebangs 'fix-install-miniforge
+            (lambda _
+              (substitute* (find-files
+                            #$output "^(install-miniforge|install-nix|\
 nix-shell-wrapper|repo2docker-entrypoint)")
-                          (("^#!(.*)/bin/bash")
-                           "#!/bin/bash"))
-                        (substitute* (find-files out "^freeze\\.py$")
-                          (("^#!(.*)/bin/python3")
-                           "#!/bin/python3\n")))))
-                  (add-after 'install 'make-doc
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let* ((out (assoc-ref outputs "doc"))
-                             (doc (string-append out "/share/doc/"
-                                                 ,(package-name 
this-package))))
-                        (setenv "PYTHONPATH"
-                                (string-append (getcwd) ":"
-                                               (getenv "GUIX_PYTHONPATH")))
-                        ;; Don't treat warnings as errors.
-                        (substitute* "docs/Makefile"
-                          (("(SPHINXOPTS[[:blank:]]+= )-W" _ group)
-                           group))
-                        (with-directory-excursion "docs"
-                          (invoke  "make" "html")
-                          (copy-recursively "build/html"
-                                            (string-append doc "/html")))))))))
+                (("^#!(.*)/bin/bash")
+                 "#!/bin/bash"))
+                (substitute* (find-files #$output "^freeze\\.py$")
+                  (("^#!(.*)/bin/python3")
+                   "#!/bin/python3\n"))))
+          (add-after 'install 'make-doc
+            (lambda _
+              (let ((doc (string-append #$output:out "/share/doc/"
+                                        #$(package-name this-package))))
+                (setenv "PYTHONPATH"
+                        (string-append (getcwd) ":"
+                                       (getenv "GUIX_PYTHONPATH")))
+                ;; Don't treat warnings as errors.
+                (substitute* "docs/Makefile"
+                  (("(SPHINXOPTS[[:blank:]]+= )-W" _ group)
+                   group))
+                (with-directory-excursion "docs"
+                  (invoke  "make" "html")
+                  (copy-recursively "build/html"
+                                    (string-append doc "/html")))))))))
     (inputs
      (list python-traitlets
            python-toml
@@ -886,8 +886,18 @@ nix-shell-wrapper|repo2docker-entrypoint)")
            python-docker
            python-chardet))
     (native-inputs
-     (list python-sphinx python-entrypoints python-recommonmark
-           python-sphinxcontrib-autoprogram python-pydata-sphinx-theme))
+     (list python-entrypoints
+           python-myst-parser
+           python-pydata-sphinx-theme
+           python-recommonmark
+           python-setuptools
+           python-sphinx
+           python-sphinx-autobuild
+           python-sphinx-copybutton
+           python-sphinxcontrib-autoprogram
+           python-sphinxext-opengraph
+           python-sphinxext-rediraffe
+           python-wheel))
     (home-page "https://repo2docker.readthedocs.io/en/latest/index.html#";)
     (synopsis "Generate docker images from repositories")
     (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]