diff options
| author | nee <nee.git@cock.li> | 2017-12-03 15:39:40 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-12-04 10:36:48 +0100 |
| commit | 6de3d1762beba47a7a94de452a48c4b256c12333 (patch) | |
| tree | df3aa5f582eb5581b4a15c6a5dd40360f2889b80 | |
| parent | 8cbb58918c4e5fe236a1cf34ff46477f4932fb01 (diff) | |
gnu: elixir: Update to 1.5.2 and disable failing tests.
* gnu/packages/elixir.scm (elixir)[origin]: Update to 1.5.2.
[arguments]: Patch the shebang of mix. Disable failing tests.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | gnu/packages/elixir.scm | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 7425b49a431..553c5fa5ae8 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> | 2 | ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> |
| 3 | ;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl> | 3 | ;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl> |
| 4 | ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> | 4 | ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> |
| 5 | ;;; Copyright © 2017 nee <nee.git@cock.li> | ||
| 5 | ;;; | 6 | ;;; |
| 6 | ;;; This file is part of GNU Guix. | 7 | ;;; This file is part of GNU Guix. |
| 7 | ;;; | 8 | ;;; |
| @@ -30,7 +31,7 @@ | |||
| 30 | (define-public elixir | 31 | (define-public elixir |
| 31 | (package | 32 | (package |
| 32 | (name "elixir") | 33 | (name "elixir") |
| 33 | (version "1.4.2") | 34 | (version "1.5.2") |
| 34 | (source (origin | 35 | (source (origin |
| 35 | (method url-fetch) | 36 | (method url-fetch) |
| 36 | (uri (string-append "https://github.com/elixir-lang/elixir" | 37 | (uri (string-append "https://github.com/elixir-lang/elixir" |
| @@ -38,7 +39,7 @@ | |||
| 38 | (file-name (string-append name "-" version ".tar.gz")) | 39 | (file-name (string-append name "-" version ".tar.gz")) |
| 39 | (sha256 | 40 | (sha256 |
| 40 | (base32 | 41 | (base32 |
| 41 | "0gsmgx4h6rvxilcbsx2z6yirm6g2g5bsxdvr0608ng4bsv22wknb")) | 42 | "0v7z0avs3gir7qdfgysfw88l3z9p5f7p7pjnrnsz5gmmsflvf5vk")) |
| 42 | ;; FIXME: 27 tests (out of 4K) had to be disabled as | 43 | ;; FIXME: 27 tests (out of 4K) had to be disabled as |
| 43 | ;; they fail in the build environment. Common failures | 44 | ;; they fail in the build environment. Common failures |
| 44 | ;; are: | 45 | ;; are: |
| @@ -55,14 +56,18 @@ | |||
| 55 | #:phases | 56 | #:phases |
| 56 | (modify-phases %standard-phases | 57 | (modify-phases %standard-phases |
| 57 | (add-after 'unpack 'replace-paths | 58 | (add-after 'unpack 'replace-paths |
| 58 | (lambda* (#:key inputs #:allow-other-keys) | 59 | (lambda* (#:key inputs outputs #:allow-other-keys) |
| 59 | (substitute* '("lib/elixir/lib/system.ex" | 60 | (let ((out (assoc-ref outputs "out"))) |
| 60 | "lib/mix/lib/mix/scm/git.ex") | 61 | (substitute* '("lib/elixir/lib/system.ex" |
| 61 | (("(cmd\\(['\"])git" _ prefix) | 62 | "lib/mix/lib/mix/scm/git.ex") |
| 62 | (string-append prefix (which "git")))) | 63 | (("(cmd\\(['\"])git" _ prefix) |
| 63 | (substitute* "bin/elixir" | 64 | (string-append prefix (which "git")))) |
| 64 | (("ERL_EXEC=\"erl\"") | 65 | (substitute* "bin/elixir" |
| 65 | (string-append "ERL_EXEC=" (which "erl")))) | 66 | (("ERL_EXEC=\"erl\"") |
| 67 | (string-append "ERL_EXEC=" (which "erl")))) | ||
| 68 | (substitute* "bin/mix" | ||
| 69 | (("#!/usr/bin/env elixir") | ||
| 70 | (string-append "#!" out "/bin/elixir")))) | ||
| 66 | #t)) | 71 | #t)) |
| 67 | (add-after 'unpack 'fix-or-disable-tests | 72 | (add-after 'unpack 'fix-or-disable-tests |
| 68 | (lambda* (#:key inputs #:allow-other-keys) | 73 | (lambda* (#:key inputs #:allow-other-keys) |
| @@ -75,6 +80,15 @@ | |||
| 75 | 80 | ||
| 76 | ;; FIXME: Mix.Shell.cmd() always fails with error code 130. | 81 | ;; FIXME: Mix.Shell.cmd() always fails with error code 130. |
| 77 | (delete-file "lib/mix/test/mix/shell_test.exs") | 82 | (delete-file "lib/mix/test/mix/shell_test.exs") |
| 83 | |||
| 84 | ;; FIXME: | ||
| 85 | ;; disabled failing impure tests to make it build again. | ||
| 86 | ;; related discussion: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=28034#14 | ||
| 87 | (delete-file "lib/elixir/test/elixir/kernel/cli_test.exs") | ||
| 88 | (delete-file "lib/elixir/test/elixir/kernel/dialyzer_test.exs") | ||
| 89 | (delete-file "lib/iex/test/iex/helpers_test.exs") | ||
| 90 | (delete-file "lib/ex_unit/test/ex_unit/capture_io_test.exs") | ||
| 91 | |||
| 78 | #t)) | 92 | #t)) |
| 79 | (add-before 'build 'make-current | 93 | (add-before 'build 'make-current |
| 80 | ;; The Elixir compiler checks whether or not to compile files by | 94 | ;; The Elixir compiler checks whether or not to compile files by |
