diff options
author | Justin Wood <justin.k.wood@gmail.com> | 2017-06-24 09:44:48 -0400 |
---|---|---|
committer | Justin Wood <justin.k.wood@gmail.com> | 2017-06-26 23:13:58 -0400 |
commit | aa1f059116b9e7685e9b905434148c202674f4df (patch) | |
tree | dce34dfca9117c858ce7dfbefc8d3ca69fba4ac5 /pkgs/development/beam-modules | |
parent | 3595f8e8d69e10b4989052e52ba4f08ce30857d2 (diff) |
Remove defaultScope in favour of rec for elixir versions
Also removed superfluous path segments from elixir generic builder
Diffstat (limited to 'pkgs/development/beam-modules')
-rw-r--r-- | pkgs/development/beam-modules/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/beam-modules/lib.nix | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 07cc2ebd94b74..69265aa53e4da 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -16,7 +16,7 @@ let in import ./hex-packages.nix { inherit pkgs stdenv callPackage; - } // { + } // rec { inherit callPackage erlang; beamPackages = self; @@ -37,18 +37,16 @@ let buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. - elixir = defaultScope.elixir-1_4; + elixir = elixir-1_4; elixir-1_4 = lib.callElixir ../interpreters/elixir/1.4.nix "18" { + inherit rebar erlang; debugInfo = true; - erlang = erlang; - rebar = defaultScope.rebar; }; elixir-1_3 = lib.callElixir ../interpreters/elixir/1.3.nix "18" { + inherit rebar erlang; debugInfo = true; - erlang = erlang; - rebar = defaultScope.rebar; }; lfe = callPackage ../interpreters/lfe { }; diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index df0af40576374..8a93282d1ec40 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -60,7 +60,7 @@ rec { callElixir = drv: vsn: args: let inherit (stdenv.lib) versionAtLeast; - builder = callPackage ../../development/interpreters/elixir/generic-builder.nix args; + builder = callPackage ../interpreters/elixir/generic-builder.nix args; in if versionAtLeast (getVersion args.erlang) vsn then |