ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

erlangR16: updated to R16B03-1

Browse Source 
- couchdb: using erlangR16 (fails to build with R17)
 - rename erlang attr names to use only major version in attr name
This commit is contained in:
Rok Garbas 2014-06-05 01:16:50 +01:00
parent 853f2ca9d5
commit 4eeb0f10fb
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/interpreters/erlang/R14B04.nix → pkgs/development/interpreters/erlang/R14.nix
View File

0
pkgs/development/interpreters/erlang/R15B03.nix → pkgs/development/interpreters/erlang/R15.nix
View File

4
pkgs/development/interpreters/erlang/R16B02.nix → pkgs/development/interpreters/erlang/R16.nix
View File

@ -8,11 +8,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "erlang-" + version; name = "erlang-" + version;
version = "R16B02"; version = "R16B03-1";
src = fetchurl { src = fetchurl {
url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; url = "http://www.erlang.org/download/otp_src_${version}.tar.gz";
sha256 = "119gnf3jfd98hpxxqs8vnzrc81myv07y302b99alalqqz0fsvf3a"; sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp";
}; };
buildInputs = buildInputs =

4
pkgs/servers/nosql/riak/1.3.1.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, erlangR15B03 }: { stdenv, fetchurl, unzip, erlangR15}:
let let
srcs = { srcs = {
@ -15,7 +15,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "riak-1.3.1"; name = "riak-1.3.1";
buildInputs = [unzip erlangR15B03]; buildInputs = [unzip erlangR15];
src = srcs.riak; src = srcs.riak;

13
pkgs/top-level/all-packages.nix
View File

@ -3381,9 +3381,9 @@ let
clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; clooj = callPackage ../development/interpreters/clojure/clooj.nix { };
erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { };
erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { }; erlangR15 = callPackage ../development/interpreters/erlang/R15.nix { };
erlangR16B02 = callPackage ../development/interpreters/erlang/R16B02.nix { }; erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { };
erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { }; erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { };
erlang = erlangR17; erlang = erlangR17;
@ -6568,6 +6568,7 @@ let
spidermonkey = spidermonkey_185; spidermonkey = spidermonkey_185;
python = python27; python = python27;
sphinx = python27Packages.sphinx; sphinx = python27Packages.sphinx;
erlang = erlangR16;
}; };
dico = callPackage ../servers/dico { }; dico = callPackage ../servers/dico { };
@ -6599,7 +6600,7 @@ let
dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
ejabberd = callPackage ../servers/xmpp/ejabberd { ejabberd = callPackage ../servers/xmpp/ejabberd {
erlang = erlangR16B02; erlang = erlangR16;
}; };
elasticmq = callPackage ../servers/elasticmq { }; elasticmq = callPackage ../servers/elasticmq { };
@ -9684,8 +9685,8 @@ let
winswitch = callPackage ../tools/X11/winswitch { }; winswitch = callPackage ../tools/X11/winswitch { };
wings = callPackage ../applications/graphics/wings { wings = callPackage ../applications/graphics/wings {
erlang = erlangR14B04; erlang = erlangR14;
esdl = esdl.override { erlang = erlangR14B04; }; esdl = esdl.override { erlang = erlangR14; };
}; };
wmname = callPackage ../applications/misc/wmname { }; wmname = callPackage ../applications/misc/wmname { };