From 4eeb0f10fb57203f020502835130fb982bc7af48 Mon Sep 17 00:00:00 2001 From: Rok Garbas <rok@garbas.si> Date: Thu, 5 Jun 2014 01:16:50 +0100 Subject: [PATCH] erlangR16: updated to R16B03-1 - couchdb: using erlangR16 (fails to build with R17) - rename erlang attr names to use only major version in attr name --- .../interpreters/erlang/{R14B04.nix => R14.nix} | 0 .../interpreters/erlang/{R15B03.nix => R15.nix} | 0 .../interpreters/erlang/{R16B02.nix => R16.nix} | 4 ++-- pkgs/servers/nosql/riak/1.3.1.nix | 4 ++-- pkgs/top-level/all-packages.nix | 13 +++++++------ 5 files changed, 11 insertions(+), 10 deletions(-) rename pkgs/development/interpreters/erlang/{R14B04.nix => R14.nix} (100%) rename pkgs/development/interpreters/erlang/{R15B03.nix => R15.nix} (100%) rename pkgs/development/interpreters/erlang/{R16B02.nix => R16.nix} (95%) diff --git a/pkgs/development/interpreters/erlang/R14B04.nix b/pkgs/development/interpreters/erlang/R14.nix similarity index 100% rename from pkgs/development/interpreters/erlang/R14B04.nix rename to pkgs/development/interpreters/erlang/R14.nix diff --git a/pkgs/development/interpreters/erlang/R15B03.nix b/pkgs/development/interpreters/erlang/R15.nix similarity index 100% rename from pkgs/development/interpreters/erlang/R15B03.nix rename to pkgs/development/interpreters/erlang/R15.nix diff --git a/pkgs/development/interpreters/erlang/R16B02.nix b/pkgs/development/interpreters/erlang/R16.nix similarity index 95% rename from pkgs/development/interpreters/erlang/R16B02.nix rename to pkgs/development/interpreters/erlang/R16.nix index 7dc71ed65461..eaf991ff5637 100644 --- a/pkgs/development/interpreters/erlang/R16B02.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version; - version = "R16B02"; + version = "R16B03-1"; src = fetchurl { url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; - sha256 = "119gnf3jfd98hpxxqs8vnzrc81myv07y302b99alalqqz0fsvf3a"; + sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp"; }; buildInputs = diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix index ccac6e331fdc..96315c52f6bf 100644 --- a/pkgs/servers/nosql/riak/1.3.1.nix +++ b/pkgs/servers/nosql/riak/1.3.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, erlangR15B03 }: +{ stdenv, fetchurl, unzip, erlangR15}: let srcs = { @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { name = "riak-1.3.1"; - buildInputs = [unzip erlangR15B03]; + buildInputs = [unzip erlangR15]; src = srcs.riak; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54ee84c65f84..24d977d51489 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3381,9 +3381,9 @@ let clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; - erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; - erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { }; - erlangR16B02 = callPackage ../development/interpreters/erlang/R16B02.nix { }; + erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { }; + erlangR15 = callPackage ../development/interpreters/erlang/R15.nix { }; + erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { }; erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { }; erlang = erlangR17; @@ -6568,6 +6568,7 @@ let spidermonkey = spidermonkey_185; python = python27; sphinx = python27Packages.sphinx; + erlang = erlangR16; }; dico = callPackage ../servers/dico { }; @@ -6599,7 +6600,7 @@ let dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { }; ejabberd = callPackage ../servers/xmpp/ejabberd { - erlang = erlangR16B02; + erlang = erlangR16; }; elasticmq = callPackage ../servers/elasticmq { }; @@ -9684,8 +9685,8 @@ let winswitch = callPackage ../tools/X11/winswitch { }; wings = callPackage ../applications/graphics/wings { - erlang = erlangR14B04; - esdl = esdl.override { erlang = erlangR14B04; }; + erlang = erlangR14; + esdl = esdl.override { erlang = erlangR14; }; }; wmname = callPackage ../applications/misc/wmname { };