lol

erlang: put Elixir/LFE into per-OTP packageset.

This makes beam.package.erlangR19.abnf to be actually built with R19,
instead of the default R18. It means that Elixir and LFE are provided in
two versions, one built with R18 and with R19.

Please note that Elixir does not build with R16 and R17 - trying to
access beam.packages.erlang{R16,R17}.elixir will throw an error.

+28 -9
+12 -4
pkgs/development/beam-modules/default.nix
··· 1 1 { stdenv, pkgs, erlang, overrides ? (self: super: {}) }: 2 2 3 3 let 4 - inherit (stdenv.lib) fix' extends; 4 + inherit (stdenv.lib) fix' extends getVersion versionAtLeast; 5 + 6 + lib = pkgs.callPackage ./lib.nix {}; 5 7 6 8 # FIXME: add support for overrideScope 7 9 callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args; ··· 34 36 buildErlangMk = callPackage ./build-erlang-mk.nix {}; 35 37 buildMix = callPackage ./build-mix.nix {}; 36 38 37 - ## Non hex packages 39 + # BEAM-based languages. 40 + elixir = if versionAtLeast (lib.getVersion erlang) "18" 41 + then callPackage ../interpreters/elixir { debugInfo = true; } 42 + else throw "Elixir requires at least Erlang/OTP R18."; 43 + lfe = callPackage ../interpreters/lfe { }; 44 + 45 + # Non hex packages 38 46 hex = callPackage ./hex {}; 39 47 webdriver = callPackage ./webdriver {}; 40 48 41 - hex2nix = callPackage ../tools/erlang/hex2nix { }; 42 - cuter = callPackage ../tools/erlang/cuter { }; 49 + hex2nix = callPackage ../tools/erlang/hex2nix {}; 50 + cuter = callPackage ../tools/erlang/cuter {}; 43 51 relxExe = callPackage ../tools/erlang/relx-exe {}; 44 52 }; 45 53 in fix' (extends overrides packages)
+10 -1
pkgs/development/beam-modules/lib.nix
··· 1 - { pkgs }: 1 + { pkgs, stdenv }: 2 2 3 3 rec { 4 4 ··· 11 11 in f (auto // args); 12 12 13 13 callPackage = callPackageWith pkgs; 14 + 15 + /* Erlang/OTP-specific version retrieval, returns 19 for OTP R19 */ 16 + getVersion = x: 17 + let 18 + parse = drv: (builtins.parseDrvName drv).version; 19 + in builtins.replaceStrings ["B" "-"] ["." "."] ( 20 + if builtins.isString x 21 + then parse x 22 + else x.version or (parse x.name)); 14 23 15 24 /* Uses generic-builder to evaluate provided drv containing OTP-version 16 25 specific data.
+6 -4
pkgs/top-level/beam-packages.nix
··· 1 1 { pkgs, stdenv, callPackage, wxGTK30, darwin }: 2 2 3 3 rec { 4 - lib = import ../development/beam-modules/lib.nix { inherit pkgs; }; 4 + lib = callPackage ../development/beam-modules/lib.nix {}; 5 5 6 6 # Each 7 7 interpreters = rec { ··· 45 45 odbcSupport = true; 46 46 }; 47 47 48 - # Other Beam languages. These are built with beam.interpreters.erlang. 49 - elixir = callPackage ../development/interpreters/elixir { debugInfo = true; }; 50 - lfe = callPackage ../development/interpreters/lfe { }; 48 + # Other Beam languages. These are built with `beam.interpreters.erlang`. To 49 + # access for example elixir built with different version of Erlang, use 50 + # `beam.packages.erlangR19.elixir`. 51 + elixir = packages.erlang.elixir; 52 + lfe = packages.erlang.lfe; 51 53 }; 52 54 53 55 # Helper function to generate package set with a specific Erlang version.