Re: [PATCH] gnu: Add erlang.

[Leo Famulari <leo@famulari.name>]

[-- Attachment #1: Type: text/plain, Size: 1769 bytes --]

On Wed, Mar 16, 2016 at 10:00:21PM -0700, Steve Sprang wrote:
> I don't have anything else packaged. I've only dabbled with Erlang myself.
> You can start a REPL with:
> 
> % erl

Okay, I was able to build this on x86_64 and cross-build to i686. Would
anyone like the test the build on armhf or mips64el?

I was able to run a "Hello world" program [0]:

---
$ ./pre-inst-env guix environment --pure --ad-hoc erlang -- erl -noshell -eval 'io:fwrite("Hello, world!\n"), init:stop().'
Hello, world!
---

The configure script was not finding OpenSSL, so I've modified the
package locally to provide the path.

I did something similar for `rm`. Also, I had to provide the path to
`sed` in 'erl/bin', which is just a small shell script.

I've attached my changes. What do you think?

The Nix package [1] might show the way for future improvements to this
package.

For example, the documentation (man pages) is distributed separately, so
I've attached a patch that adds them in their own package. But, they are
only 6 megabytes (erlang itself is 100 megabytes), so they should
probably be folded into the the erlang package.

[0]
http://erlangcentral.org/wiki/index.php/Hello_World

[1]
https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/erlang/R18.nix

> 
> -Steve
> On Mar 16, 2016 9:21 PM, "Leo Famulari" <leo@famulari.name> wrote:
> 
> > On Wed, Mar 16, 2016 at 05:18:57PM -0700, Steve Sprang wrote:
> > > Oops, I didn't follow up on this. I made the suggested changes to the
> > > patch. I also bumped the version to 18.3, which has subsequently
> > > become available.
> >
> > This is awesome!
> >
> > Do you have any erlang programs packaged that we can try it out with? Or
> > is there some "hello world" thing I can try for this package?
> >

[-- Attachment #2: 0001-gnu-Add-erlang.patch --]
[-- Type: text/x-diff, Size: 6272 bytes --]

From cafc65901667dab9a3773f637eba65a43346da1a Mon Sep 17 00:00:00 2001
Message-Id: <cafc65901667dab9a3773f637eba65a43346da1a.1458574834.git.leo@famulari.name>
From: Steve Sprang <scs@stevesprang.com>
Date: Sat, 6 Feb 2016 12:40:53 -0800
Subject: [PATCH 1/2] gnu: Add erlang.

* gnu/packages/erlang.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.

Signed-off-by: Leo Famulari <leo@famulari.name>
---
 gnu-system.am           |   1 +
 gnu/packages/erlang.scm | 127 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+)
 create mode 100644 gnu/packages/erlang.scm

diff --git a/gnu-system.am b/gnu-system.am
index f13a55d..4cc44df 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -102,6 +102,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/enchant.scm			\
   gnu/packages/engineering.scm			\
   gnu/packages/enlightenment.scm		\
+  gnu/packages/erlang.scm			\
   gnu/packages/fcitx.scm			\
   gnu/packages/feh.scm                          \
   gnu/packages/figlet.scm			\
diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm
new file mode 100644
index 0000000..4f9d6e4
--- /dev/null
+++ b/gnu/packages/erlang.scm
@@ -0,0 +1,127 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Steve Sprang <scs@stevesprang.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages erlang)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages tls))
+
+(define-public erlang
+  (package
+    (name "erlang")
+    (version "18.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://erlang.org/download/otp_src_"
+                    version
+                    ".tar.gz"))
+              (sha256
+               (base32
+                "1hy9slq9gjvwdb504dmvp6rax90isnky6chqkyq5v4ybl4lq3azx"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("perl" ,perl)))
+    (inputs
+     `(("ncurses" ,ncurses)
+       ("openssl" ,openssl)))
+    (arguments
+     `(#:configure-flags
+       (list (string-append "--with-ssl=" (assoc-ref %build-inputs "openssl")))
+       #:phases
+       (modify-phases %standard-phases
+	 (add-after 'patch-source-shebangs 'patch-source-env
+	   (lambda _
+	     (let ((escripts
+		    (append
+		     (find-files "." "\\.escript")
+		     (find-files "lib/stdlib/test/escript_SUITE_data/")
+		     '("erts/lib_src/utils/make_atomics_api"
+		       "erts/preloaded/src/add_abstract_code"
+		       "lib/diameter/bin/diameterc"
+		       "lib/reltool/examples/display_args"
+		       "lib/reltool/examples/mnesia_core_dump_viewer"
+		       "lib/snmp/src/compile/snmpc.src"
+		       "make/verify_runtime_dependencies"
+		       "make/emd2exml.in"))))
+	       (substitute* escripts
+		 (("/usr/bin/env") (which "env"))))))
+         (add-after 'unpack 'path-to-rm
+           (lambda _
+             (substitute* "erts/configure"
+               (("/bin/rm") (which "rm")))
+             (substitute* "lib/odbc/configure"
+               (("/bin/rm") (which "rm")))))
+         (add-before 'configure 'set-erl-top
+           (lambda _
+             (setenv "ERL_TOP" (getcwd))))
+         (add-after 'install 'patch-erl
+           ;; This only works after install.
+           (lambda _
+             (substitute* (string-append (assoc-ref %outputs "out") "/bin/erl")
+               (("sed") (which "sed"))))))
+       #:test-target "release_tests"))
+    (home-page "http://erlang.org/")
+    (synopsis "The Erlang programming language")
+    (description
+     "Erlang is a programming language used to build massively
+scalable soft real-time systems with requirements on high
+availability.  Some of its uses are in telecoms, banking, e-commerce,
+computer telephony and instant messaging.  Erlang's runtime system has
+built-in support for concurrency, distribution and fault tolerance.")
+    (license license:asl2.0)))
+
+(define-public erlang-manpages
+  ;; Keep in sync with 'erlang'!
+  (package
+    (name "erlang-manpages")
+    (version (package-version erlang))
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://erlang.org/download/otp_doc_man_"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1hpcr7a3dx2y9gnb53bvb4g6lyvbwigadl9s3f978s01x40f32wp"))))
+    (build-system trivial-build-system)
+    (arguments
+     '(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+         (let* ((gz  (assoc-ref %build-inputs "gzip"))
+                (tar (assoc-ref %build-inputs "tar"))
+                (out (assoc-ref %outputs "out"))
+                (man (string-append out "/share/man")))
+           (setenv "PATH" (string-append tar "/bin:" gz "/bin"))
+           (mkdir-p man)
+           (with-directory-excursion man
+             (zero? (system* "tar" "xvf"
+                             (assoc-ref %build-inputs "source"))))
+           (delete-file (string-append man "/PR.template"))
+           (delete-file (string-append man "/README"))))))
+    (native-inputs `(("tar" ,tar)
+                     ("gzip" ,gzip)))
+    (synopsis "Man pages of Erlang")
+    (description "This provides the man pages of Erlang.")
+    (home-page (package-home-page erlang))
+    (license license:asl2.0)))
-- 
2.7.3


[-- Attachment #3: 0002-gnu-Add-erlang-manpages.patch --]
[-- Type: text/x-diff, Size: 1468 bytes --]

From 5fb31a0190755b728f76775de7cea9cac54bde36 Mon Sep 17 00:00:00 2001
Message-Id: <5fb31a0190755b728f76775de7cea9cac54bde36.1458574834.git.leo@famulari.name>
In-Reply-To: <cafc65901667dab9a3773f637eba65a43346da1a.1458574834.git.leo@famulari.name>
References: <cafc65901667dab9a3773f637eba65a43346da1a.1458574834.git.leo@famulari.name>
From: Leo Famulari <leo@famulari.name>
Date: Mon, 21 Mar 2016 01:25:57 -0400
Subject: [PATCH 2/2] gnu: Add erlang-manpages.

* gnu/packages/erlang.scm (erlang-manpages): New variable.
---
 gnu/packages/erlang.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm
index 4f9d6e4..e90a7b7 100644
--- a/gnu/packages/erlang.scm
+++ b/gnu/packages/erlang.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Steve Sprang <scs@stevesprang.com>
+;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,11 +22,15 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system trivial)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages tls))
 
 (define-public erlang
+  ;; Keep in sync with 'erlang-manpages'!
   (package
     (name "erlang")
     (version "18.3")
-- 
2.7.3