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

erlang-ls: pin to erlang_26 

Currently a failing test in els_completion_SUITE
parent 4e54ea92

pkgs/development/beam-modules/erlang-ls/default.nix

+2 −6
Original line number Diff line number Diff line
@@ -50,11 +50,6 @@ rebar3Relx { 
  releaseType = "escript";

  beamDeps = builtins.attrValues deps;



  # https://github.com/erlang-ls/erlang_ls/issues/1429

  postPatch = ''

    rm apps/els_lsp/test/els_diagnostics_SUITE.erl

  '';



  buildPlugins = [ rebar3-proper ];

  buildPhase = "HOME=. make";

  # based on https://github.com/erlang-ls/erlang_ls/blob/main/.github/workflows/build.yml
@@ -76,7 +71,7 @@ rebar3Relx { 
  };

  passthru.updateScript = writeScript "update.sh" ''

    #!/usr/bin/env nix-shell

    #! nix-shell -i bash -p common-updater-scripts coreutils git gnused gnutar gzip "rebar3WithPlugins { globalPlugins = [ beamPackages.rebar3-nix ]; }"

    #! nix-shell -i bash -p common-updater-scripts coreutils git gnused gnutar gzip nixfmt-rfc-style "rebar3WithPlugins { globalPlugins = [ beamPackages.rebar3-nix ]; }"



    set -ox errexit

    latest=$(list-git-tags | sed -n '/[\d\.]\+/p' | sort -V | tail -1)
@@ -88,6 +83,7 @@ rebar3Relx { 
      cp -R $(nix-build $nixpkgs --no-out-link -A erlang-ls.src)/* "$tmpdir"

      DEBUG=1

      (cd "$tmpdir" && HOME=. rebar3 as test nix lock -o "$nix_path/rebar-deps.nix")

      nixfmt "$nix_path/rebar-deps.nix"

    else

      echo "erlang-ls is already up-to-date"

    fi

pkgs/top-level/all-packages.nix

+4 −1
Original line number Diff line number Diff line
@@ -7181,10 +7181,13 @@ with pkgs; 
  erlang_nox = beam_nox.interpreters.erlang;















  inherit (beam.packages.erlang)













    ex_doc erlang-ls erlfmt elvis-erlang













    ex_doc erlfmt elvis-erlang















    rebar rebar3 rebar3WithPlugins















    fetchHex















    lfe lfe_2_1;

























  inherit (beam.packages.erlang_26) erlang-ls;



























  beamPackages = beam.packages.erlang // { __attrsFailEvaluation = true; };





























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