diff options
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/dictionaries.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/patches/translate-shell-fix-curl-tests.patch | 60 |
2 files changed, 4 insertions, 65 deletions
diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 42dc291975..9f63223453 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -238,7 +238,7 @@ and a Python library.") (define-public translate-shell (package (name "translate-shell") - (version "0.9.6.7") + (version "0.9.6.8") (source (origin (method url-fetch) @@ -246,14 +246,13 @@ and a Python library.") version ".tar.gz")) (sha256 (base32 - "0inv6r3qbihn2ff1sgcly89r04k4vgcbvvyl50ln0mxlapbhpy95")) - (patches (search-patches "translate-shell-fix-curl-tests.patch")) + "17yc2kwk8957wwxyih0jmsai720ai2yqyvmrqrglcncqg6zdbz9w")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (delete 'configure) ; no configure phase + (delete 'configure) ; no configure phase (add-after 'install 'emacs-install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -275,7 +274,7 @@ and a Python library.") ("rlwrap" ,rlwrap))) (native-inputs `(("emacs" ,emacs-minimal) - ("util-linux" ,util-linux))) ; hexdump, for the test + ("util-linux" ,util-linux))) ; hexdump, for the test (home-page "https://www.soimort.org/translate-shell/") (synopsis "Translations from the command line") (description diff --git a/gnu/packages/patches/translate-shell-fix-curl-tests.patch b/gnu/packages/patches/translate-shell-fix-curl-tests.patch deleted file mode 100644 index 33731462b8..0000000000 --- a/gnu/packages/patches/translate-shell-fix-curl-tests.patch +++ /dev/null @@ -1,60 +0,0 @@ -This patch fixes Curl related tests for 'translate-shell'. - -Upstream bug URL: - -https://github.com/soimort/translate-shell/issues/221 - -From bb9f32d3145125ba664b6b05bf0a2fd34108e9d2 Mon Sep 17 00:00:00 2001 -From: Mort Yao <soi@mort.ninja> -Date: Sun, 25 Mar 2018 03:14:33 +0200 -Subject: [PATCH] TestUtils: perform curl-related tests only if NETWORK_ACCESS - is set to yes (#221) - ---- - test/TestUtils.awk | 32 +++++++++++++++++--------------- - 1 file changed, 17 insertions(+), 15 deletions(-) - -diff --git a/test/TestUtils.awk b/test/TestUtils.awk -index 08bb2e9..1c141e5 100644 ---- a/test/TestUtils.awk -+++ b/test/TestUtils.awk -@@ -30,22 +30,24 @@ BEGIN { - assertTrue(newerVersion("2", "1.9.9999")) - } - -- T("curl()", 1) -- { -- delete tokens; delete ast -- tokenize(tokens, curl("https://httpbin.org/get")) -- parseJson(ast, tokens) -- assertEqual(unparameterize(ast[0 SUBSEP "url"]), -- "https://httpbin.org/get") -- } -+ if (yn(ENVIRON["NETWORK_ACCESS"])) { # if network access enabled -+ T("curl()", 1) -+ { -+ delete tokens; delete ast -+ tokenize(tokens, curl("https://httpbin.org/get")) -+ parseJson(ast, tokens) -+ assertEqual(unparameterize(ast[0 SUBSEP "url"]), -+ "https://httpbin.org/get") -+ } - -- T("curlPost()", 1) -- { -- delete tokens; delete ast -- tokenize(tokens, curlPost("https://httpbin.org/post", "fizz=buzz")) -- parseJson(ast, tokens) -- assertEqual(unparameterize(ast[0 SUBSEP "url"]), -- "https://httpbin.org/post") -+ T("curlPost()", 1) -+ { -+ delete tokens; delete ast -+ tokenize(tokens, curlPost("https://httpbin.org/post", "fizz=buzz")) -+ parseJson(ast, tokens) -+ assertEqual(unparameterize(ast[0 SUBSEP "url"]), -+ "https://httpbin.org/post") -+ } - } - - T("dump()", 3) |