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

Remove defaultScope in favour of rec for elixir versions

Browse Source 
Also removed superfluous path segments from elixir generic builder
This commit is contained in:
Justin Wood 2017-06-24 09:44:48 -04:00
parent 3595f8e8d6
commit aa1f059116
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/beam-modules/default.nix
View File

@ -16,7 +16,7 @@ let
in in
import ./hex-packages.nix { import ./hex-packages.nix {
inherit pkgs stdenv callPackage; inherit pkgs stdenv callPackage;
} // { } // rec {
inherit callPackage erlang; inherit callPackage erlang;
beamPackages = self; beamPackages = self;
@ -37,18 +37,16 @@ let
buildMix = callPackage ./build-mix.nix {}; buildMix = callPackage ./build-mix.nix {};
# BEAM-based languages. # BEAM-based languages.
elixir = defaultScope.elixir-1_4; elixir = elixir-1_4;
elixir-1_4 = lib.callElixir ../interpreters/elixir/1.4.nix "18" { elixir-1_4 = lib.callElixir ../interpreters/elixir/1.4.nix "18" {
inherit rebar erlang;
debugInfo = true; debugInfo = true;
erlang = erlang;
rebar = defaultScope.rebar;
}; };
elixir-1_3 = lib.callElixir ../interpreters/elixir/1.3.nix "18" { elixir-1_3 = lib.callElixir ../interpreters/elixir/1.3.nix "18" {
inherit rebar erlang;
debugInfo = true; debugInfo = true;
erlang = erlang;
rebar = defaultScope.rebar;
}; };
lfe = callPackage ../interpreters/lfe { }; lfe = callPackage ../interpreters/lfe { };

2
pkgs/development/beam-modules/lib.nix
View File

@ -60,7 +60,7 @@ rec {
callElixir = drv: vsn: args: callElixir = drv: vsn: args:
let let
inherit (stdenv.lib) versionAtLeast; inherit (stdenv.lib) versionAtLeast;
builder = callPackage ../../development/interpreters/elixir/generic-builder.nix args; builder = callPackage ../interpreters/elixir/generic-builder.nix args;
in in
if versionAtLeast (getVersion args.erlang) vsn if versionAtLeast (getVersion args.erlang) vsn
then then