diff options
author | Matthew Daiter <matthew@nomoko.camera> | 2016-12-02 16:12:14 +0100 |
---|---|---|
committer | Matthew Daiter <matthew@nomoko.camera> | 2016-12-02 16:12:14 +0100 |
commit | d331e538c2d18cc4718c823a091837e1ffa47373 (patch) | |
tree | 20574404be346dee4ef88c9cb69e295154d70c62 /pkgs | |
parent | 96e1220813888f8870de6c3f323db4435f38e849 (diff) | |
download | nixlib-d331e538c2d18cc4718c823a091837e1ffa47373.tar nixlib-d331e538c2d18cc4718c823a091837e1ffa47373.tar.gz nixlib-d331e538c2d18cc4718c823a091837e1ffa47373.tar.bz2 nixlib-d331e538c2d18cc4718c823a091837e1ffa47373.tar.lz nixlib-d331e538c2d18cc4718c823a091837e1ffa47373.tar.xz nixlib-d331e538c2d18cc4718c823a091837e1ffa47373.tar.zst nixlib-d331e538c2d18cc4718c823a091837e1ffa47373.zip |
erlang_basho_R16: B03-1 -> B02-8
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/interpreters/erlang/R16B02-8-basho.nix (renamed from pkgs/development/interpreters/erlang/R16B03-1-basho.nix) | 15 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/development/interpreters/erlang/R16B03-1-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix index cbb5f0789fa2..a4afd1e9b40c 100644 --- a/pkgs/development/interpreters/erlang/R16B03-1-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, perl, gnum4, ncurses, openssl, autoconf264, gcc, erlang +{ stdenv, fetchurl, fetchFromGitHub, perl, gnum4, ncurses, openssl, autoconf264, gcc, erlang , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null , wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null @@ -12,12 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-basho-" + version + "${optionalString odbcSupport "-odbc"}"; - version = "16B03-1"; + version = "16B02"; - src = fetchgit { - url = "https://github.com/basho/otp"; - rev = "cb3a485894e493ad172db2749129e613fe52713a"; - sha256 = "0xn28cxlq0ya1aww9q14rg8jf3x2flwxrz6wdnpb0l2h2dasr655"; + src = fetchFromGitHub { + owner = "basho"; + repo = "otp"; + rev = "OTP_R16B02_basho8"; + sha256 = "1w0hbm0axxxa45v3kl6bywc9ayir5vwqxjpnjlzc616ldszb2m0x"; }; debugInfo = enableDebugInfo; @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { postInstall = let manpages = fetchurl { url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; - sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g"; + sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p"; }; in '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01d8593a676d..3c40896dd6c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5400,10 +5400,10 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; odbcSupport = true; }; - erlang_basho_R16B03 = callPackage ../development/interpreters/erlang/R16B03-1-basho.nix { + erlang_basho_R16B02 = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - erlang_basho_R16B03_odbc = callPackage ../development/interpreters/erlang/R16B03-1-basho.nix { + erlang_basho_R16B02_odbc = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; odbcSupport = true; }; @@ -10277,11 +10277,11 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { - erlang = erlang_basho_R16B03; + erlang = erlang_basho_R16B02; }; stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { - erlang = erlang_basho_R16B03; + erlang = erlang_basho_R16B02; }; influxdb = callPackage ../servers/nosql/influxdb { }; |