diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index a89861faebb..af58762f80e 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -1,5 +1,5 @@ { stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang -, beamPackages, z3, python27 }: +, beamPackages, z3, python }: stdenv.mkDerivation rec { name = "cuter-${version}"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" ''; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3.python python27 makeWrapper which ]; + nativeBuildInputs = [ autoreconfHook makeWrapper which ]; + buildInputs = [ python python.pkgs.setuptools z3.python erlang ]; buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; configurePhase = '' @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { cp -r * "$out/lib/erlang/lib/cuter-${version}" cp cuter "$out/bin/cuter" wrapProgram $out/bin/cuter \ - --prefix PATH : "${python27}/bin" \ - --suffix PYTHONPATH : "${z3}/lib/python2.7/site-packages" \ + --prefix PATH : "${python}/bin" \ + --suffix PYTHONPATH : "${z3}/${python.sitePackages}" \ --suffix ERL_LIBS : "$out/lib/erlang/lib" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 943f09a842e..076c61f6635 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7386,9 +7386,10 @@ with pkgs; inherit (beam.packages.erlang) rebar rebar3-open rebar3 hexRegistrySnapshot fetchHex beamPackages - hex2nix cuter; + hex2nix; inherit (beam.packages.erlangR18) relxExe; + inherit (beam.packages.erlangR19) cuter; groovy = callPackage ../development/interpreters/groovy { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index da5fed4be4b..85bdc59e6db 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -6,12 +6,12 @@ rec { # Each interpreters = rec { - # R19 is the default version. - erlang = erlangR19; # The main switch to change default Erlang version. - erlang_odbc = erlangR19_odbc; - erlang_javac = erlangR19_javac; - erlang_odbc_javac = erlangR19_odbc_javac; - erlang_nox = erlangR19_nox; + # R20 is the default version. + erlang = erlangR20; # The main switch to change default Erlang version. + erlang_odbc = erlangR20_odbc; + erlang_javac = erlangR20_javac; + erlang_odbc_javac = erlangR20_odbc_javac; + erlang_nox = erlangR20_nox; # These are standard Erlang versions, using the generic builder. erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix {