forked from mirrors/nixpkgs
erlang: refactor: build packages per Erlang/OTP.
This change introduces a fixpoint, which allows to do deep override when building packages defined in pkgs/development/beam-modules/default.hex. This allows to provide beam.packages.erlang{,R16,R17,R18,R19} which contains the same packages built with different Erlang/OTP versions. Top-level attribute beamPackages points at beam.packages.erlangR18, the same applies to other top-level Erlang packages. TODO: - beam.packages.erlang{R16,R17} is almost useless, since rebar/rebar3 does not build using these versions; - all packages in beam.packages which use buildMix are actually built with erlangR18; - update documentation.
This commit is contained in:
parent
31703358bd
commit
d1b9c9d2cd
pkgs
|
@ -1,13 +1,14 @@
|
||||||
{ stdenv, buildRebar3, fetchHex }:
|
{ stdenv, buildRebar3, fetchHex }:
|
||||||
|
|
||||||
{ name, version, sha256
|
{ name, version, sha256
|
||||||
|
, builder ? buildRebar3
|
||||||
, hexPkg ? name
|
, hexPkg ? name
|
||||||
, ... }@attrs:
|
, ... }@attrs:
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
pkg = self: buildRebar3 (attrs // {
|
pkg = self: builder (attrs // {
|
||||||
|
|
||||||
src = fetchHex {
|
src = fetchHex {
|
||||||
pkg = hexPkg;
|
pkg = hexPkg;
|
||||||
|
|
|
@ -1,16 +1,45 @@
|
||||||
{ stdenv, pkgs }:
|
{ stdenv, pkgs, erlang, overrides ? (self: super: {}) }:
|
||||||
|
|
||||||
let
|
let
|
||||||
self = rec {
|
inherit (stdenv.lib) fix' extends;
|
||||||
hexPackages = import ./hex-packages.nix { stdenv = stdenv; callPackage = self.callPackage; pkgs = pkgs; };
|
|
||||||
callPackage = pkgs.lib.callPackageWith (pkgs // self // hexPackages);
|
|
||||||
buildRebar3 = callPackage ./build-rebar3.nix {};
|
|
||||||
buildHex = callPackage ./build-hex.nix {};
|
|
||||||
buildErlangMk = callPackage ./build-erlang-mk.nix {};
|
|
||||||
buildMix = callPackage ./build-mix.nix {};
|
|
||||||
|
|
||||||
## Non hex packages
|
# FIXME: add support for overrideScope
|
||||||
hex = callPackage ./hex {};
|
callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args;
|
||||||
webdriver = callPackage ./webdriver {};
|
mkScope = scope: pkgs // scope;
|
||||||
};
|
|
||||||
in self // self.hexPackages
|
packages = self:
|
||||||
|
let
|
||||||
|
defaultScope = mkScope self;
|
||||||
|
callPackage = drv: args: callPackageWithScope defaultScope drv args;
|
||||||
|
in
|
||||||
|
import ./hex-packages.nix {
|
||||||
|
inherit pkgs stdenv callPackage;
|
||||||
|
} // {
|
||||||
|
inherit callPackage erlang;
|
||||||
|
beamPackages = self;
|
||||||
|
|
||||||
|
rebar = callPackage ../tools/build-managers/rebar { };
|
||||||
|
rebar3-open = callPackage ../tools/build-managers/rebar3 {
|
||||||
|
hermeticRebar3 = false;
|
||||||
|
};
|
||||||
|
rebar3 = callPackage ../tools/build-managers/rebar3 {
|
||||||
|
hermeticRebar3 = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
hexRegistrySnapshot = callPackage ./hex-registry-snapshot.nix { };
|
||||||
|
fetchHex = callPackage ./fetch-hex.nix { };
|
||||||
|
|
||||||
|
buildRebar3 = callPackage ./build-rebar3.nix {};
|
||||||
|
buildHex = callPackage ./build-hex.nix {};
|
||||||
|
buildErlangMk = callPackage ./build-erlang-mk.nix {};
|
||||||
|
buildMix = callPackage ./build-mix.nix {};
|
||||||
|
|
||||||
|
## Non hex packages
|
||||||
|
hex = callPackage ./hex {};
|
||||||
|
webdriver = callPackage ./webdriver {};
|
||||||
|
|
||||||
|
hex2nix = callPackage ../tools/erlang/hex2nix { };
|
||||||
|
cuter = callPackage ../tools/erlang/cuter { };
|
||||||
|
relxExe = callPackage ../tools/erlang/relx-exe {};
|
||||||
|
};
|
||||||
|
in fix' (extends overrides packages)
|
||||||
|
|
|
@ -5986,7 +5986,7 @@ with pkgs;
|
||||||
erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac
|
erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac
|
||||||
erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac;
|
erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac;
|
||||||
|
|
||||||
inherit (beam.packages)
|
inherit (beam.packages.erlang)
|
||||||
rebar rebar3-open rebar3
|
rebar rebar3-open rebar3
|
||||||
hexRegistrySnapshot fetchHex beamPackages
|
hexRegistrySnapshot fetchHex beamPackages
|
||||||
hex2nix cuter relxExe;
|
hex2nix cuter relxExe;
|
||||||
|
|
|
@ -3,10 +3,11 @@
|
||||||
rec {
|
rec {
|
||||||
lib = import ../development/beam-modules/lib.nix { inherit pkgs; };
|
lib = import ../development/beam-modules/lib.nix { inherit pkgs; };
|
||||||
|
|
||||||
|
# Each
|
||||||
interpreters = rec {
|
interpreters = rec {
|
||||||
|
|
||||||
# R18 is the Default version.
|
# R18 is the default version.
|
||||||
erlang = erlangR18;
|
erlang = erlangR18; # The main switch to change default Erlang version.
|
||||||
erlang_odbc = erlangR18_odbc;
|
erlang_odbc = erlangR18_odbc;
|
||||||
erlang_javac = erlangR18_javac;
|
erlang_javac = erlangR18_javac;
|
||||||
erlang_odbc_javac = erlangR18_odbc_javac;
|
erlang_odbc_javac = erlangR18_odbc_javac;
|
||||||
|
@ -44,22 +45,24 @@ rec {
|
||||||
odbcSupport = true;
|
odbcSupport = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Other Beam languages.
|
# Other Beam languages. These are built with beam.interpreters.erlang.
|
||||||
elixir = callPackage ../development/interpreters/elixir { debugInfo = true; };
|
elixir = callPackage ../development/interpreters/elixir { debugInfo = true; };
|
||||||
lfe = callPackage ../development/interpreters/lfe { };
|
lfe = callPackage ../development/interpreters/lfe { };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Helper function to generate package set with a specific Erlang version.
|
||||||
|
packagesWith = erlang: callPackage ../development/beam-modules { inherit erlang; };
|
||||||
|
|
||||||
|
# Each field in this tuple represents all Beam packages in nixpkgs built with
|
||||||
|
# appropriate Erlang/OTP version.
|
||||||
packages = rec {
|
packages = rec {
|
||||||
rebar = callPackage ../development/tools/build-managers/rebar { };
|
|
||||||
rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; };
|
|
||||||
rebar3 = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = true; };
|
|
||||||
hexRegistrySnapshot = callPackage ../development/beam-modules/hex-registry-snapshot.nix { };
|
|
||||||
fetchHex = callPackage ../development/beam-modules/fetch-hex.nix { };
|
|
||||||
|
|
||||||
beamPackages = callPackage ../development/beam-modules { };
|
# Packages built with default Erlang version.
|
||||||
hex2nix = beamPackages.callPackage ../development/tools/erlang/hex2nix { };
|
erlang = packagesWith interpreters.erlang;
|
||||||
cuter = callPackage ../development/tools/erlang/cuter { };
|
erlangR16 = packagesWith interpreters.erlangR16;
|
||||||
|
erlangR17 = packagesWith interpreters.erlangR17;
|
||||||
|
erlangR18 = packagesWith interpreters.erlangR18;
|
||||||
|
erlangR19 = packagesWith interpreters.erlangR19;
|
||||||
|
|
||||||
relxExe = callPackage ../development/tools/erlang/relx-exe {};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue