Unverified Commit a6139c3d authored by Adam C. Stephens's avatar Adam C. Stephens
Browse files

erlang: drop extra lib

parent b044ad6e

pkgs/development/beam-modules/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ let 
  pkgs = __splicedPackages;

  inherit (lib) makeExtensible;



  lib' = pkgs.callPackage ./lib.nix { };



  # FIXME: add support for overrideScope

  callPackageWithScope =

    scope: drv: args:

pkgs/development/beam-modules/lib.nix

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
{ __splicedPackages, lib }:



let

  pkgs = __splicedPackages;

in

rec {



  # Similar to callPackageWith/callPackage, but without makeOverridable

  callPackageWith =

    autoArgs: fn: args:

    let

      f = if pkgs.lib.isFunction fn then fn else import fn;

      auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;

    in

    f (auto // args);



  callPackage = callPackageWith pkgs;



  /*

    Uses generic-builder to evaluate provided drv containing OTP-version

    specific data.



    drv: package containing version-specific args;

    builder: generic builder for all Erlang versions;

    args: arguments merged into version-specific args, used mostly to customize

          dependencies;



    Arguments passed to the generic-builder are overridable, used to

    enable/disable high-level OTP features, like ODBC or WX support;



    Please note that "mkDerivation" defined here is the one called from R16.nix

    and similar files.

  */

  callErlang =

    drv: args:

    let

      genericBuilder =

        versionArgs: import ../../development/interpreters/erlang/generic-builder.nix (versionArgs // args);

    in

    pkgs.callPackage (import drv genericBuilder) { };

}

pkgs/top-level/beam-packages.nix

+12 −5
Original line number Diff line number Diff line
@@ -6,16 +6,23 @@ 
  wxSupport ? true,

  systemd,

  systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,

  __splicedPackages,

}:



let

  self = beam;



  pkgs = __splicedPackages;

  callErlang =

    drv: args:

    let

      genericBuilder =

        versionArgs: import ../development/interpreters/erlang/generic-builder.nix (versionArgs // args);

    in

    pkgs.callPackage (import drv genericBuilder) { };

in



{

  beamLib = callPackage ../development/beam-modules/lib.nix { };



  latestVersion = "erlang_28";



  # Each
@@ -27,15 +34,15 @@ in 
    #

    # Three versions are supported according to https://github.com/erlang/otp/security



    erlang_28 = self.beamLib.callErlang ../development/interpreters/erlang/28.nix {

    erlang_28 = callErlang ../development/interpreters/erlang/28.nix {

      inherit wxSupport systemdSupport;

    };



    erlang_27 = self.beamLib.callErlang ../development/interpreters/erlang/27.nix {

    erlang_27 = callErlang ../development/interpreters/erlang/27.nix {

      inherit wxSupport systemdSupport;

    };



    erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix {

    erlang_26 = callErlang ../development/interpreters/erlang/26.nix {

      inherit wxSupport systemdSupport;

    };