diff options
| author | Leo Famulari <leo@famulari.name> | 2021-01-25 15:21:09 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-01-25 15:40:55 -0500 |
| commit | 68dd78e2e47248b3e1e7ba1807a92a8374b39097 (patch) | |
| tree | d38564293f285d688a55b23e8a6424c6b26213b1 /gnu/packages/erlang.scm | |
| parent | 8b55544212a90b0276df49596a3d373e5c2e8f5c (diff) | |
| parent | 3f0af15131e524891df8c9f013f1be1597fe2d7e (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/erlang.scm')
| -rw-r--r-- | gnu/packages/erlang.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 93569f3560..7b5dc70b5d 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2017 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Nikita <nikita@n0.is> +;;; Copyright © 2021 Oskar Köök <oskar@maatriks.ee> ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +41,7 @@ (define-public erlang (package (name "erlang") - (version "21.3.8.13") + (version "23.2.1") (source (origin (method git-fetch) ;; The tarball from http://erlang.org/download contains many @@ -52,7 +53,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1dj37vk712dx76y25g13na24wbpn7a5ddmlpf4n51gm10sib54wj")) + "1p3lw4bcm2dph3pf1h4i0d9pzrcfr83r0iadqanxkwbmm1bl11pm")) (patches (search-patches "erlang-man-path.patch")))) (build-system gnu-build-system) (native-inputs @@ -68,7 +69,7 @@ (version-major+minor version) ".tar.gz")) (sha256 (base32 - "0wm1dg1psv1n3gpiwyms06yhsryrnr28p455fp0l1ak8hdf4nipm")))))) + "0rq0rw68f02vckgdiwmvx8bvyv00l81s27cq59i3h79j9prfal2n")))))) (inputs `(("ncurses" ,ncurses) ("openssl" ,openssl) @@ -180,6 +181,14 @@ (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) |