Unverified Commit 54d9bb9c authored by Yt's avatar Yt Committed by GitHub
Browse files

erlang_28: init at 28.0-rc1 (#382722)

parents a2de5752 7ffa9e92

pkgs/development/beam-modules/default.nix

+10 −4
Original line number Diff line number Diff line 
{ lib, __splicedPackages, erlang }:

{

  lib,

  __splicedPackages,

  erlang,

}:



let

  pkgs = __splicedPackages;
@@ -7,10 +11,13 @@ let 
  lib' = pkgs.callPackage ./lib.nix { };



  # FIXME: add support for overrideScope

  callPackageWithScope = scope: drv: args: lib.callPackageWith scope drv args;

  callPackageWithScope =

    scope: drv: args:

    lib.callPackageWith scope drv args;

  mkScope = scope: pkgs // scope;



  packages = self:

  packages =

    self:

    let

      defaultScope = mkScope self;

      callPackage = drv: args: callPackageWithScope defaultScope drv args;
@@ -75,7 +82,6 @@ let 


      ex_doc = callPackage ./ex_doc {

        inherit fetchMixDeps mixRelease;

        elixir = elixir_1_17;

      };



      elixir-ls = callPackage ./elixir-ls { inherit elixir fetchMixDeps mixRelease; };

pkgs/development/beam-modules/ex_doc/default.nix

+6 −4
Original line number Diff line number Diff line 
{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease }:

{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease, nix-update-script }:

# Based on ../elixir-ls/default.nix



let

  pname = "ex_doc";

  version = "0.34.1";

  version = "0.37.1";

  src = fetchFromGitHub {

    owner = "elixir-lang";

    repo = "${pname}";

    rev = "v${version}";

    hash = "sha256-OXIRippEDYAKD222XzNJkkZdXbUkDUauv5amr4oAU7c=";

    hash = "sha256-PF+4bJ1FGr7t8khorlrB7rSSmNsGpyhC4HmWjw6j0JQ=";

  };

in

mixRelease {
@@ -19,7 +19,7 @@ mixRelease { 
  mixFodDeps = fetchMixDeps {

    pname = "mix-deps-${pname}";

    inherit src version elixir;

    hash = "sha256-fYINsATbw3M3r+IVoYS14aVEsg9OBuH6mNUqzQJuDQo=";

    hash = "sha256-s4b6wuBJPdN0FPn76zbLCHzqJNEZ6E4nOyB1whUM2VY=";

  };



  configurePhase = ''
@@ -41,6 +41,8 @@ mixRelease { 
    runHook postInstall

  '';



  passthru.updateScript = nix-update-script { };



  meta = with lib; {

    homepage = "https://github.com/elixir-lang/ex_doc";

    description = ''

pkgs/development/interpreters/erlang/28.nix

0 → 100644
+6 −0
Original line number Diff line number Diff line 
{ mkDerivation }:



mkDerivation {

  version = "28.0-rc1";

  sha256 = "sha256-fjje31F5YW5rzetb2r4fkESwKt9N+WOH3yrqETUjJzg=";

}

pkgs/development/interpreters/erlang/generic-builder.nix

+7 −0
Original line number Diff line number Diff line
@@ -140,6 +140,13 @@ stdenv.mkDerivation ( 
      libxml2

    ];



    env = lib.optionalAttrs ((lib.versionAtLeast "28.0-rc1" version) && ex_docSupport) {

      # erlang-28.0-rc> warning: jinterface.html redirects to ../lib/jinterface/doc/html/index.html, which does not exist

      # erlang-28.0-rc>

      # erlang-28.0-rc> warning: odbc.html redirects to ../lib/odbc/doc/html/index.html, which does not exist

      EX_DOC_WARNINGS_AS_ERRORS = "false";

    };



    buildInputs =

      [

        ncurses

pkgs/top-level/all-packages.nix

+5 −1
Original line number Diff line number Diff line
@@ -6948,7 +6948,7 @@ with pkgs; 
  };















  inherit (beam.interpreters)













    erlang erlang_27 erlang_26 erlang_25













    erlang erlang_28 erlang_27 erlang_26 erlang_25















    elixir elixir_1_18 elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14















    elixir-ls;























@@ -6966,10 +6966,14 @@ with pkgs;













  beam25Packages = recurseIntoAttrs beam.packages.erlang_25;















  beam26Packages = recurseIntoAttrs beam.packages.erlang_26;















  beam27Packages = recurseIntoAttrs beam.packages.erlang_27;













  # 28 is pre-release













  beam28Packages = dontRecurseIntoAttrs beam.packages.erlang_28;





























  beamMinimal25Packages = recurseIntoAttrs beam_minimal.packages.erlang_25;















  beamMinimal26Packages = recurseIntoAttrs beam_minimal.packages.erlang_26;















  beamMinimal27Packages = recurseIntoAttrs beam_minimal.packages.erlang_27;













  # 28 is pre-release













  beamMinimal28Packages = dontRecurseIntoAttrs beam_minimal.packages.erlang_28;





























  erlang_language_platform = callPackage ../by-name/er/erlang-language-platform/package.nix { };