diff options
Diffstat (limited to 'gnu/packages/erlang.scm')
| -rw-r--r-- | gnu/packages/erlang.scm | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 7b5dc70b5d..32bc12ebb8 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2018 Nikita <[email protected]> ;;; Copyright © 2021 Oskar Köök <[email protected]> +;;; Copyright © 2021 Cees de Groot <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +31,6 @@ #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages) - #:use-module (gnu packages autotools) #:use-module (gnu packages fontutils) #:use-module (gnu packages gl) #:use-module (gnu packages ncurses) @@ -41,7 +41,7 @@ (define-public erlang (package (name "erlang") - (version "23.2.1") + (version "24.0.5") (source (origin (method git-fetch) ;; The tarball from http://erlang.org/download contains many @@ -53,13 +53,11 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1p3lw4bcm2dph3pf1h4i0d9pzrcfr83r0iadqanxkwbmm1bl11pm")) + "0f8zr2jxr0v4zcd98zqx99zxdn768vjpzwxsbsd6ss3if405sq2a")) (patches (search-patches "erlang-man-path.patch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) - ("autoconf" ,autoconf) - ("automake" ,automake) ;; Erlang's documentation is distributed in a separate tarball. ("erlang-manpages" @@ -69,7 +67,7 @@ (version-major+minor version) ".tar.gz")) (sha256 (base32 - "0rq0rw68f02vckgdiwmvx8bvyv00l81s27cq59i3h79j9prfal2n")))))) + "1c9ccp93pmm54mmvpiyrmj8v00pq11a60c4xv220k97i965zkwsg")))))) (inputs `(("ncurses" ,ncurses) ("openssl" ,openssl) @@ -177,18 +175,6 @@ (lambda _ (setenv "ERL_TOP" (getcwd)) #t)) - (add-after 'patch-source-env 'autoconf - (lambda _ - (invoke "./otp_build" "autoconf") - #t)) - (add-after 'autoconf 'patch-configure-script-shell - (lambda _ - (substitute* "configure" - (("cmd_str=\"./configure") - (string-append "cmd_str=\"" - (which "sh") - " ./configure"))) - #t)) (add-after 'install 'patch-erl ;; This only works after install. (lambda* (#:key outputs #:allow-other-keys) @@ -202,13 +188,8 @@ (manpages (assoc-ref inputs "erlang-manpages")) (share (string-append out "/share/"))) (mkdir-p share) - (mkdir-p (string-append share "/misc/erlang")) (with-directory-excursion share - (invoke "tar" "xvf" manpages) - (rename-file "COPYRIGHT" - (string-append share "/misc/erlang/COPYRIGHT")) - ;; Delete superfluous file. - (delete-file "PR.template")) + (invoke "tar" "xvf" manpages)) #t)))))) (home-page "https://www.erlang.org/") (synopsis "The Erlang programming language") @@ -232,7 +213,7 @@ built-in support for concurrency, distribution and fault tolerance.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'add-source-to-load-path 'change-working-directory + (add-before 'expand-load-path 'change-working-directory (lambda _ (chdir "lib/tools/emacs") #t))))) (home-page "https://www.erlang.org/") (synopsis "Erlang major mode for Emacs") |