diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/elixir.scm | |
parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/elixir.scm')
-rw-r--r-- | gnu/packages/elixir.scm | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 2ceb3b553f..87177acce0 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -35,7 +35,7 @@ (define-public elixir (package (name "elixir") - (version "1.12.2") + (version "1.12.3") (source (origin (method git-fetch) @@ -44,7 +44,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1rwmwnqxhjcdx9niva9ardx90p1qi4axxh72nw9k15hhlh2jy29x")) + (base32 "07fisdx755cgyghwy95gvdds38sh138z56biariml18jjw5mk3r6")) (patches (search-patches "elixir-path-length.patch")))) (build-system gnu-build-system) (arguments @@ -56,8 +56,7 @@ (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) + (for-each make-file-writable (find-files ".")))) (add-after 'make-git-checkout-writable 'replace-paths (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -82,8 +81,7 @@ "; fi"))) (substitute* "bin/mix" (("#!/usr/bin/env elixir") - (string-append "#!" out "/bin/elixir")))) - #t)) + (string-append "#!" out "/bin/elixir")))))) (add-before 'build 'make-current ;; The Elixir compiler checks whether or not to compile files by ;; inspecting their timestamps. When the timestamp is equal to the @@ -93,17 +91,14 @@ (for-each (lambda (file) (let ((recent 1400000000)) (utime file recent recent 0 0))) - (find-files "." ".*")) - #t)) + (find-files "." ".*")))) (add-before 'check 'set-home (lambda* (#:key inputs #:allow-other-keys) ;; Some tests require access to a home directory. - (setenv "HOME" "/tmp") - #t)) + (setenv "HOME" "/tmp"))) (delete 'configure)))) (inputs - `(("erlang" ,erlang) - ("git" ,git))) + (list erlang git)) (home-page "https://elixir-lang.org/") (synopsis "Elixir programming language") (description "Elixir is a dynamic, functional language used to build |