diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-08-26 15:34:29 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-08-26 15:34:29 +0200 |
| commit | 4028fd395e6d7f80f7bbeb4ff616b6b89b0bf654 (patch) | |
| tree | 17bac0c3211a872d3a0292cae20347718ecdd5f7 /gnu/packages/erlang.scm | |
| parent | 9d1cc6bc69d53bf8ad45ac94bc3c268125f86359 (diff) | |
| parent | 72e2815d18ad688b0a16ce3b3efba1172423cec4 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/erlang.scm')
| -rw-r--r-- | gnu/packages/erlang.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 07f117e283..a400e712d5 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -23,6 +23,7 @@ #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module (guix packages) + #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages fontutils) #:use-module (gnu packages gl) @@ -34,7 +35,7 @@ (define-public erlang (package (name "erlang") - (version "19.3") + (version "20.0") (source (origin (method url-fetch) ;; The tarball from http://erlang.org/download contains many @@ -45,7 +46,8 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1b47jh549yywyp8fbs8a8j4ydr3zn982navzyqvlms6rg8vwb0pw")))) + "1azjjyb743i6vjq7rnh5qnslsqg0x60a9zrlhg9n3dpm13z1b22l")) + (patches (search-patches "erlang-man-path.patch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) @@ -60,7 +62,7 @@ version ".tar.gz")) (sha256 (base32 - "0p6r3n3y7lbhv38sw8f2vi1xlmc137gyspk9ap086w1nszyjy6gq")))))) + "1k25p37w1l1j20qd8rga4j4q7s7r0rbsi02x3xwzhw51jhm59wdp")))))) (inputs `(("ncurses" ,ncurses) ("openssl" ,openssl) @@ -109,8 +111,7 @@ (("date\\(\\), time\\(\\),") (date->string source-date-epoch "{~Y,~m,~d}, {~H,~M,~S},"))) - (substitute* '("lib/dialyzer/test/small_SUITE_data/src/gs_make.erl" - "lib/gs/src/gs_make.erl") + (substitute* "lib/dialyzer/test/small_SUITE_data/src/gs_make.erl" (("tuple_to_list\\(date\\(\\)\\),tuple_to_list\\(time\\(\\)\\)") (date->string source-date-epoch |