[bug#30933] [PATCH 0/2] gnu: translate-shell: Update to 0.9.6.7-1.bb9f32d.

[bug#30933] [PATCH 0/2] gnu: translate-shell: Update to 0.9.6.7-1.bb9f32d.

[Oleg Pykhalov]

Hello Guix,

Those patch series fix a ‘git lint’ home-page warning and update
‘translate-shell’ package.

Oleg Pykhalov (2):
  gnu: translate-shell: Update home-page.
  gnu: translate-shell: Update to 0.9.6.7-1.bb9f32d.

 gnu/packages/dictionaries.scm | 94 ++++++++++++++++++++++++-------------------
 1 file changed, 52 insertions(+), 42 deletions(-)

-- 
2.16.2

[bug#30933] [PATCH 1/2] gnu: translate-shell: Update home-page.

[Oleg Pykhalov]

* gnu/packages/dictionaries.scm (translate-shell)[home-page]: Append slash.
---
 gnu/packages/dictionaries.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index 3f50070ef..5cd5724f5 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -274,7 +274,7 @@ and a Python library.")
     (native-inputs
      `(("emacs" ,emacs-minimal)
        ("util-linux" ,util-linux))) ; hexdump, for the test
-    (home-page "https://www.soimort.org/translate-shell")
+    (home-page "https://www.soimort.org/translate-shell/")
     (synopsis "Translations from the command line")
     (description
      "Translate Shell (formerly Google Translate CLI) is a command-line
-- 
2.16.2

[bug#30933] [PATCH 2/2] gnu: translate-shell: Update to 0.9.6.7-1.bb9f32d.

[Oleg Pykhalov]

* gnu/packages/dictionaries.scm (translate-shell): Update to
0.9.6.7-1.bb9f32d.
[arguments](make-flags): Add "NETWORK_ACCESS=no test".
[phases]: Add 'change-file-permissions' phase.
---
 gnu/packages/dictionaries.scm | 94 ++++++++++++++++++++++++-------------------
 1 file changed, 52 insertions(+), 42 deletions(-)

diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index 5cd5724f5..bafae77bf 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -24,6 +24,7 @@
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
@@ -237,48 +238,57 @@ and a Python library.")
     (license gpl3+)))
 
 (define-public translate-shell
-  (package
-    (name "translate-shell")
-    (version "0.9.6.4")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://github.com/soimort/" name "/archive/v"
-                            version ".tar.gz"))
-        (sha256
-         (base32
-          "1fg6nf1plvgimc57fsdr9rcjbf7jvmk5jrlj5ya509vpdcdgvj2s"))
-        (file-name (string-append name "-" version ".tar.gz"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (delete 'configure) ; no configure phase
-         (add-after 'install 'emacs-install
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out   (assoc-ref outputs "out"))
-                    (dest  (string-append out "/share/emacs/site-lisp"))
-                    (emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs")))
-               (install-file "google-translate-mode.el" dest)
-               (emacs-generate-autoloads ,name dest)))))
-       #:make-flags (list (string-append "PREFIX=" %output))
-       #:imported-modules (,@%gnu-build-system-modules (guix build emacs-utils))
-       #:modules ((guix build gnu-build-system)
-                  (guix build emacs-utils)
-                  (guix build utils))
-       #:test-target "test"))
-    (propagated-inputs
-     `(("curl" ,curl)
-       ("fribidi" ,fribidi)
-       ("rlwrap" ,rlwrap)))
-    (native-inputs
-     `(("emacs" ,emacs-minimal)
-       ("util-linux" ,util-linux))) ; hexdump, for the test
-    (home-page "https://www.soimort.org/translate-shell/")
-    (synopsis "Translations from the command line")
-    (description
-     "Translate Shell (formerly Google Translate CLI) is a command-line
+  (let ((commit "bb9f32d3145125ba664b6b05bf0a2fd34108e9d2"))
+    (package
+      (name "translate-shell")
+      (version (git-version "0.9.6.7" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/soimort/translate-shell.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0vl50vfd4kn0mazj3j30m75xldcra23skrd3qhx3kav2613a9y3i"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (delete 'configure) ; no configure phase
+           (add-after 'unpack 'change-file-permissions
+             (lambda _
+               (chmod "translate" #o755)
+               #t))
+           (add-after 'install 'emacs-install
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (let* ((out   (assoc-ref outputs "out"))
+                      (dest  (string-append out "/share/emacs/site-lisp"))
+                      (emacs (string-append (assoc-ref inputs "emacs")
+                                            "/bin/emacs")))
+                 (install-file "google-translate-mode.el" dest)
+                 (emacs-generate-autoloads ,name dest)))))
+         #:make-flags (list (string-append "PREFIX=" %output)
+                            "NETWORK_ACCESS=no test")
+         #:imported-modules (,@%gnu-build-system-modules
+                             (guix build emacs-utils))
+         #:modules ((guix build gnu-build-system)
+                    (guix build emacs-utils)
+                    (guix build utils))
+         #:test-target "test"))
+      (propagated-inputs
+       `(("curl" ,curl)
+         ("fribidi" ,fribidi)
+         ("rlwrap" ,rlwrap)))
+      (native-inputs
+       `(("emacs" ,emacs-minimal)
+         ("util-linux" ,util-linux))) ; hexdump, for the test
+      (home-page "https://www.soimort.org/translate-shell/")
+      (synopsis "Translations from the command line")
+      (description
+       "Translate Shell (formerly Google Translate CLI) is a command-line
 translator powered by Google Translate (default), Bing Translator,
 Yandex.Translate and Apertium.  It gives you easy access to one of these
 translation engines from your terminal.")
-    (license public-domain)))
+      (license public-domain))))
-- 
2.16.2

[bug#30933] [PATCH 2/2] gnu: translate-shell: Update to 0.9.6.7-1.bb9f32d.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 2576 bytes --]

Oleg Pykhalov <go.wigust@gmail.com> writes:

> * gnu/packages/dictionaries.scm (translate-shell): Update to
> 0.9.6.7-1.bb9f32d.
> [arguments](make-flags): Add "NETWORK_ACCESS=no test".
> [phases]: Add 'change-file-permissions' phase.

[...]
  
>  (define-public translate-shell
> -  (package
> -    (name "translate-shell")
> -    (version "0.9.6.4")
> -    (source
> -      (origin
> -        (method url-fetch)
> -        (uri (string-append "https://github.com/soimort/" name "/archive/v"
> -                            version ".tar.gz"))
> -        (sha256
> -         (base32
> -          "1fg6nf1plvgimc57fsdr9rcjbf7jvmk5jrlj5ya509vpdcdgvj2s"))
> -        (file-name (string-append name "-" version ".tar.gz"))))
> -    (build-system gnu-build-system)
> -    (arguments
> -     `(#:phases
> -       (modify-phases %standard-phases
> -         (delete 'configure) ; no configure phase
> -         (add-after 'install 'emacs-install
> -           (lambda* (#:key inputs outputs #:allow-other-keys)
> -             (let* ((out   (assoc-ref outputs "out"))
> -                    (dest  (string-append out "/share/emacs/site-lisp"))
> -                    (emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs")))
> -               (install-file "google-translate-mode.el" dest)
> -               (emacs-generate-autoloads ,name dest)))))
> -       #:make-flags (list (string-append "PREFIX=" %output))
> -       #:imported-modules (,@%gnu-build-system-modules (guix build emacs-utils))
> -       #:modules ((guix build gnu-build-system)
> -                  (guix build emacs-utils)
> -                  (guix build utils))
> -       #:test-target "test"))
> -    (propagated-inputs
> -     `(("curl" ,curl)
> -       ("fribidi" ,fribidi)
> -       ("rlwrap" ,rlwrap)))
> -    (native-inputs
> -     `(("emacs" ,emacs-minimal)
> -       ("util-linux" ,util-linux))) ; hexdump, for the test
> -    (home-page "https://www.soimort.org/translate-shell/")
> -    (synopsis "Translations from the command line")
> -    (description
> -     "Translate Shell (formerly Google Translate CLI) is a command-line
> +  (let ((commit "bb9f32d3145125ba664b6b05bf0a2fd34108e9d2"))
> +    (package
> +      (name "translate-shell")
> +      (version (git-version "0.9.6.7" "1" commit))

There are only five commits since this version.  I assume the git
checkout is because of the patch that adds "NETWORK_ACCESS"?

The patch itself is smaller than the reindent from the let binding, so I
would prefer to simply add it.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30933] [PATCH 2/2] gnu: translate-shell: Update to 0.9.6.7-1.bb9f32d.

[Oleg Pykhalov]

[-- Attachment #1: Type: text/plain, Size: 734 bytes --]

Marius Bakke <mbakke@fastmail.com> writes:

> Oleg Pykhalov <go.wigust@gmail.com> writes:
>
>> * gnu/packages/dictionaries.scm (translate-shell): Update to
>> 0.9.6.7-1.bb9f32d.
>> [arguments](make-flags): Add "NETWORK_ACCESS=no test".
>> [phases]: Add 'change-file-permissions' phase.

[…]

>> +      (version (git-version "0.9.6.7" "1" commit))
>
> There are only five commits since this version.  I assume the git
> checkout is because of the patch that adds "NETWORK_ACCESS"?
>
> The patch itself is smaller than the reindent from the let binding, so I
> would prefer to simply add it.

OK.  Thank you for a review.

Pushe as 196c8b3739d16241da73c78536ce86aaab948677

I'll close the bug report.

Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#30933] [PATCH 1/2] gnu: translate-shell: Update home-page.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

Oleg Pykhalov <go.wigust@gmail.com> writes:

> * gnu/packages/dictionaries.scm (translate-shell)[home-page]: Append slash.

I'd squash this with the next commit, but no strong opinion.  LGTM!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]