JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #64801 from serokell/beam-erlangR21

Browse Source 
beam-packages: default erlangR20 -> erlangR22
This commit is contained in:
Daiderd Jordan 2019-07-19 00:03:07 +02:00 committed by GitHub
commit 8c4152dac3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/erlang/hex2nix/default.nix
View File

@ -2,20 +2,20 @@
rebar3Relx rec { rebar3Relx rec {
name = "hex2nix"; name = "hex2nix";
version = "0.0.6-a31eadd7"; version = "0.0.6-42d7b2ec";
releaseType = "escript"; releaseType = "escript";
checkouts = fetchRebar3Deps { checkouts = fetchRebar3Deps {
inherit name version; inherit name version;
src = "${src}/rebar.config"; src = "${src}/rebar.config";
sha256 = "1b59vk6ynakdiwqd1s6axaj9bvkaaq7ll28b48nv613z892h7nm5"; sha256 = "0z6v1f6hagl3qyj97frqr2ww3adrwgfwdyb2zshaai0d3xchg3ly";
}; };
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "erlang-nix"; owner = "erlang-nix";
repo = "hex2nix"; repo = "hex2nix";
rev = "a31eadd7af2cbdac1b87991b378e98ea4fb40ae0"; rev = "42d7b2ec64f61f21061066b192003cf7f460bf43";
sha256 = "1hnkrksyrbpq2gq25rfsrnm86n0g3biab88gswm3zj88ddrz6dyk"; sha256 = "0ac1fmckvid5077djg3ajycxn7gwbf7pdk1knhfp8yva3c5qq58r";
}; };
} }

8
pkgs/development/tools/erlang/relx-exe/default.nix
View File

@ -2,18 +2,18 @@
rebar3Relx rec { rebar3Relx rec {
name = "relx-exe"; name = "relx-exe";
version = "3.23.1"; version = "3.32.1";
releaseType = "escript"; releaseType = "escript";
src = fetchHex { src = fetchHex {
pkg = "relx"; pkg = "relx";
sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d"; sha256 = "0693k8ac7hvpm9jd3ysbdn8bk97d68ini22p1fsqdsi9qv9f7nq7";
version = "3.23.1"; inherit version;
}; };
checkouts = fetchRebar3Deps { checkouts = fetchRebar3Deps {
inherit name version; inherit name version;
src = "${src}/rebar.lock"; src = "${src}/rebar.lock";
sha256 = "046b1lb9rymndlvzmin3ppa3vkssjqspyfp98869k11s5avg76hd"; sha256 = "0l7r3x7zwcz49013zv8z5v2i06p7wqkgzdyzrl8jk0hglscvhpf6";
}; };
} }

2
pkgs/servers/http/couchdb/2.0.0.nix
View File

@ -5,6 +5,8 @@ stdenv.mkDerivation rec {
name = "couchdb-${version}"; name = "couchdb-${version}";
version = "2.3.0"; version = "2.3.0";
# when updating this, please consider bumping the OTP version
# in all-packages.nix
src = fetchurl { src = fetchurl {
url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
sha256 = "0lpk64n6fip85j1jz59kq20jdliwv6mh8j2h5zyxjn5i8b86hf0b"; sha256 = "0lpk64n6fip85j1jz59kq20jdliwv6mh8j2h5zyxjn5i8b86hf0b";

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

@ -8315,9 +8315,8 @@ in
inherit (beam.packages.erlang) inherit (beam.packages.erlang)
rebar rebar3-open rebar3 rebar rebar3-open rebar3
hexRegistrySnapshot fetchHex beamPackages hexRegistrySnapshot fetchHex beamPackages
hex2nix; hex2nix relxExe;
inherit (beam.packages.erlangR18) relxExe;
inherit (beam.packages.erlangR19) cuter; inherit (beam.packages.erlangR19) cuter;
groovy = callPackage ../development/interpreters/groovy { }; groovy = callPackage ../development/interpreters/groovy { };
@ -14234,6 +14233,7 @@ in
couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix { couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix {
spidermonkey = spidermonkey_1_8_5; spidermonkey = spidermonkey_1_8_5;
erlang = erlangR21;
}; };
couchpotato = callPackage ../servers/couchpotato {}; couchpotato = callPackage ../servers/couchpotato {};

12
pkgs/top-level/beam-packages.nix
View File

@ -6,12 +6,12 @@ rec {
# Each # Each
interpreters = rec { interpreters = rec {
# R20 is the default version. # R22 is the default version.
erlang = erlangR20; # The main switch to change default Erlang version. erlang = erlangR22; # The main switch to change default Erlang version.
erlang_odbc = erlangR20_odbc; erlang_odbc = erlangR22_odbc;
erlang_javac = erlangR20_javac; erlang_javac = erlangR22_javac;
erlang_odbc_javac = erlangR20_odbc_javac; erlang_odbc_javac = erlangR22_odbc_javac;
erlang_nox = erlangR20_nox; erlang_nox = erlangR22_nox;
# These are standard Erlang versions, using the generic builder. # These are standard Erlang versions, using the generic builder.
erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix {