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

Merge pull request #44640 from LnL7/beam-erlangR20

Browse Source 
beam-packages: default erlangR19 -> erlangR20
This commit is contained in:
Daiderd Jordan 2018-09-01 14:24:11 +02:00 committed by GitHub
commit 9e2e667d05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/erlang/cuter/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang { stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang
, beamPackages, z3, python27 }: , beamPackages, z3, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cuter-${version}"; name = "cuter-${version}";
@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"
''; '';
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook makeWrapper which ];
buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3.python python27 makeWrapper which ]; buildInputs = [ python python.pkgs.setuptools z3.python erlang ];
buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target";
configurePhase = '' configurePhase = ''
@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
cp -r * "$out/lib/erlang/lib/cuter-${version}" cp -r * "$out/lib/erlang/lib/cuter-${version}"
cp cuter "$out/bin/cuter" cp cuter "$out/bin/cuter"
wrapProgram $out/bin/cuter \ wrapProgram $out/bin/cuter \
--prefix PATH : "${python27}/bin" \ --prefix PATH : "${python}/bin" \
--suffix PYTHONPATH : "${z3}/lib/python2.7/site-packages" \ --suffix PYTHONPATH : "${z3}/${python.sitePackages}" \
--suffix ERL_LIBS : "$out/lib/erlang/lib" --suffix ERL_LIBS : "$out/lib/erlang/lib"
''; '';

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

@ -7386,9 +7386,10 @@ with pkgs;
inherit (beam.packages.erlang) inherit (beam.packages.erlang)
rebar rebar3-open rebar3 rebar rebar3-open rebar3
hexRegistrySnapshot fetchHex beamPackages hexRegistrySnapshot fetchHex beamPackages
hex2nix cuter; hex2nix;
inherit (beam.packages.erlangR18) relxExe; inherit (beam.packages.erlangR18) relxExe;
inherit (beam.packages.erlangR19) cuter;
groovy = callPackage ../development/interpreters/groovy { }; groovy = callPackage ../development/interpreters/groovy { };

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

@ -6,12 +6,12 @@ rec {
# Each # Each
interpreters = rec { interpreters = rec {
# R19 is the default version. # R20 is the default version.
erlang = erlangR19; # The main switch to change default Erlang version. erlang = erlangR20; # The main switch to change default Erlang version.
erlang_odbc = erlangR19_odbc; erlang_odbc = erlangR20_odbc;
erlang_javac = erlangR19_javac; erlang_javac = erlangR20_javac;
erlang_odbc_javac = erlangR19_odbc_javac; erlang_odbc_javac = erlangR20_odbc_javac;
erlang_nox = erlangR19_nox; erlang_nox = erlangR20_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 {