From 2a0fc5949897ab5df4dd96296730585f84accf91 Mon Sep 17 00:00:00 2001
From: pjotrp
Date: Wed, 22 Jun 2016 15:14:10 +0000
Subject: Testing Leo's Erlang update. Bumped versions on Erlang and Elixir

---
 gn/packages/elixir.scm |  6 +++---
 gn/packages/erlang.scm | 45 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 45 insertions(+), 6 deletions(-)

(limited to 'gn/packages')

diff --git a/gn/packages/elixir.scm b/gn/packages/elixir.scm
index 15206f0..8262532 100644
--- a/gn/packages/elixir.scm
+++ b/gn/packages/elixir.scm
@@ -30,7 +30,7 @@
 (define-public elixir
   (package
     (name "elixir")
-    (version "1.2.6")
+    (version "1.3.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -39,7 +39,7 @@
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "05h9bd752rs88p4sb1k1fp7xfr3df8wnpbyda7qxjjwbgnfyvm1g"))))
+                "0jh0wid7ld78apzqqii6j0n1jcpp2ck4qmds26npqfb0vm489jv6"))))
     (build-system gnu-build-system)
     (inputs
      `(("erlang" ,erlang)))
@@ -50,7 +50,7 @@
           'build 'rewrite-path
           (lambda* (#:key inputs #:allow-other-keys)
                    (substitute* "bin/elixir"
-                     (("ERL_EXEC=\"erl\"") (string-append "ERL_EXEC=" (which "erl"))))))                           
+                     (("ERL_EXEC=\"erl\"") (string-append "ERL_EXEC=" (which "erl"))))))
         ;; (replace 'check
         ;;          (lambda _
         ;;           (zero? (system* "make" "test")))))))
diff --git a/gn/packages/erlang.scm b/gn/packages/erlang.scm
index 9e900cb..b164a79 100644
--- a/gn/packages/erlang.scm
+++ b/gn/packages/erlang.scm
@@ -35,7 +35,7 @@
    (name "erlang")
     ;; This is the from git install
     ;; When updating, remember to update the hash of erlang-manpages!
-    (version "19.0-rc2")
+    (version "19.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -44,7 +44,7 @@
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1ny2c3n9v8ifjpmnhlj5gpmzcsi882qv2vfhsssrk2f9rk4z4hpb"))))
+                "1dxyz6x1yfv33fd0xfry2ihylkyfa2d655q1vxvbz8dflyd64yqh"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("perl" ,perl)
@@ -65,13 +65,52 @@
        ("mesa" ,mesa)))
 
     (arguments
-     `(#:configure-flags
+     `(;; I don't know if specifying the modules here is the right way or not.
+       #:modules ((srfi srfi-19)
+                  (guix build utils)
+                  (guix build gnu-build-system))
+       #:configure-flags
        (list "--disable-saved-compile-time" "--enable-wx" "--enable-native-libs"
              "--enable-threads" "--enable-dynamic-ssl-lib" "--enable-shared-zlib"
              "--enable-smp-support"
              (string-append "--with-ssl=" (assoc-ref %build-inputs "openssl")))
        #:phases
        (modify-phases %standard-phases
+        (add-after 'unpack 'remove-timestamps
+          (lambda _
+            (let ((source-date-epoch
+                    (time-utc->date
+                      (make-time time-utc 0 (string->number
+                                              (getenv "SOURCE_DATE_EPOCH"))))))
+              (substitute* "lib/reltool/src/reltool_target.erl"
+                (("Date = date\\(\\),")
+                 (string-append "Date = "
+                                (date->string source-date-epoch
+                                              "'{~Y,~m,~d}',"))))
+              (substitute* "lib/reltool/src/reltool_target.erl"
+                (("Time = time\\(\\),")
+                 (string-append "Time = "
+                                (date->string source-date-epoch
+                                              "'{~H,~M,~S}',"))))
+              (substitute* '("lib/reltool/src/reltool_target.erl"
+                             "lib/sasl/src/systools_make.erl")
+                (("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")
+                (("tuple_to_list\\(date\\(\\)\\),tuple_to_list\\(time\\(\\)\\)")
+                 (date->string
+                   source-date-epoch
+                   "tuple_to_list({~Y,~m,~d}), tuple_to_list({~H,~M,~S})")))
+              (substitute* "lib/snmp/src/compile/snmpc_mib_to_hrl.erl"
+                (("\\{Y,Mo,D\\} = date\\(\\),")
+                 (date->string source-date-epoch
+                               "{Y,Mo,D} = {~Y,~m,~d},")))
+              (substitute* "lib/snmp/src/compile/snmpc_mib_to_hrl.erl"
+                (("\\{H,Mi,S\\} = time\\(\\),")
+                 (date->string source-date-epoch
+                               "{H,Mi,S} = {~H,~M,~S},"))))))
         (add-before 'configure 'autoconf
           (lambda _
             ;; (zero? (system* "autoreconf" "-vfi"))))
-- 
cgit v1.2.3