diff mbox series

[bug#68303,v2,1/2] gnu: tractor: Update to 4.3.0.

Message ID 20240109160538.251432-1-dani.behzi@ubuntu.com
State New
Headers show
Series [bug#68303,v2,1/2] gnu: tractor: Update to 4.3.0. | expand

Commit Message

Danial Behzadi Jan. 9, 2024, 4:05 p.m. UTC 
* gnu/packages/tor.scm (tractor): Update to 4.3.0.
[source]: The new primary download link is from Framagit.
[inputs]: Remove python-psutil as no longer needed.
[phases]: Upstream is now in src-layout. data is excluded.
[home-page]: The new home is hosted on tractor.frama.io.
---
 gnu/packages/tor.scm | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index b81944ee6b..6045b29bf4 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -10,7 +10,7 @@ 
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2020 André Batista <nandre@riseup.net>
-;;; Copyright © 2021-2023 Danial Behzadi <dani.behzi@ubuntu.com>
+;;; Copyright © 2021-2024 Danial Behzadi <dani.behzi@ubuntu.com>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2022 Jim Newsome <jnewsome@torproject.org>
 ;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
@@ -443,20 +443,20 @@  (define-public nyx
 (define-public tractor
   (package
     (name "tractor")
-    (version "4.1.1")
+    (version "4.3.0")
     (source
      (origin
        (method url-fetch)
-       (uri (pypi-uri "traxtor" version))
+       (uri (string-append "https://framagit.org/tractor/tractor/-/archive/"
+                           version "/tractor-" version ".tar.bz2"))
        (sha256
         (base32
-         "1542g6alycwlmvndxcijzn4d5lgycmxxb78gqd8qwgm9kw0fnr3q"))))
+         "1kal71hh8wbar19785b86q62rcilxrma8ldjjk258vf7lr1w12dv"))))
     (build-system pyproject-build-system)
     (native-inputs
      (list (list glib "bin")))       ; for glib-compile-schemas.
     (inputs
      (list python-fire
-           python-psutil
            python-pygobject
            python-requests
            python-stem
@@ -464,25 +464,21 @@  (define-public tractor
     (arguments
      (list
       #:tests? #f                   ; no test suite.
-      #:phases
-      #~(modify-phases %standard-phases
+      #:phases #~(modify-phases %standard-phases
           (add-after 'install 'install-man-page
             (lambda _
               (let ((man1 (string-append #$output "/share/man/man1")))
-                (install-file "tractor/man/tractor.1" man1))))
+                (install-file "data/tractor.1" man1))))
           (add-after 'install 'install-bash-completion
             (lambda _
-              (mkdir "bash-completion")
-              (rename-file "tractor/tractor-completion"
-                           "bash-completion/tractor")
               (let ((bash-completion
                       (string-append #$output "/share/bash-completion/completions")))
-                (install-file "bash-completion/tractor" bash-completion))))
+                (install-file "data/completion/bash/tractor" bash-completion))))
           (add-after 'install 'install-gschema
             (lambda _
               (let ((schemas (string-append #$output "/share/glib-2.0/schemas")))
-                (install-file "tractor/tractor.gschema.xml" schemas)))))))
-    (home-page "https://framagit.org/tractor")
+               (install-file "src/tractor/tractor.gschema.xml" schemas)))))))
+    (home-page "https://tractor.frama.io/tractor")
     (synopsis "Setup an onion routing proxy")
     (description
      "This package uses Python stem library to provide a connection through