commit 5792bd60163e64d28b2cbae2f982be3cf27f9da2 · pyrox.dev/nixpkgs

+1 -1

pkgs/development/beam-modules/default.nix

···

       89
       89
        
               inherit fetchMixDeps mixRelease;

     

       90
       90
        
             };

     

       91
       91
        
       

     

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

     

       92
       92
       +
             elixir-ls = callPackage ./elixir-ls { inherit elixir; };

     

       93
       93
        
       

     

       94
       94
        
             lfe = lfe_2_1;

     

       95
       95
        
             lfe_2_1 = lib'.callLFE ../interpreters/lfe/2.1.nix { inherit erlang buildRebar3 buildHex; };

+15 -29

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

···

       3
       3
        
         elixir,

     

       4
       4
        
         fetchpatch,

     

       5
       5
        
         fetchFromGitHub,

     

       6
       6
       -
         fetchMixDeps,

     

       7
       6
        
         makeWrapper,

     

       8
       8
       -
         mixRelease,

     

       7
       7
       +
         stdenv,

     

       9
       8
        
         nix-update-script,

     

       10
       9
        
       }:

     

       11
       10
        
       

     

       12
       12
       -
       mixRelease rec {

     

       11
       11
       +
       stdenv.mkDerivation rec {

     

       13
       12
        
         pname = "elixir-ls";

     

       14
       13
        
         version = "0.28.1";

     

       15
       14
        
       

     
···

       20
       19
        
           hash = "sha256-r4P+3MPniDNdF3SG2jfBbzHsoxn826eYd2tsv6bJBoI=";

     

       21
       20
        
         };

     

       22
       21
        
       

     

       23
       23
       -
         inherit elixir;

     

       24
       24
       -
       

     

       25
       25
       -
         stripDebug = true;

     

       26
       26
       -
       

     

       27
       27
       -
         mixFodDeps = fetchMixDeps {

     

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

     

       29
       29
       -
           inherit src version elixir;

     

       30
       30
       -
           hash = "sha256-8zs+99jwf+YX5SwD65FCPmfrYhTCx4AQGCGsDeCKxKc=";

     

       31
       31
       -
         };

     

       32
       32
       -
       

     

       33
       22
        
         patches = [

     

       34
       23
        
           # fix elixir deterministic support https://github.com/elixir-lsp/elixir-ls/pull/1216

     

       35
       24
        
           # remove > 0.28.1

     
···

       46
       35
        
           makeWrapper

     

       47
       36
        
         ];

     

       48
       37
        
       

     

       49
       49
       -
         # elixir-ls require a special step for release

     

       50
       50
       -
         # compile and release need to be performed together because

     

       51
       51
       -
         # of the no-deps-check requirement

     

       52
       52
       -
         buildPhase = ''

     

       53
       53
       -
           runHook preBuild

     

       54
       54
       -
       

     

       55
       55
       -
           mix do compile --no-deps-check, elixir_ls.release${lib.optionalString (lib.versionAtLeast elixir.version "1.16.0") "2"}

     

       38
       38
       +
         # for substitution

     

       39
       39
       +
         env.elixir = elixir;

     

       56
       40
        
       

     

       57
       57
       -
           runHook postBuild

     

       58
       58
       -
         '';

     

       41
       41
       +
         dontConfigure = true;

     

       42
       42
       +
         dontBuild = true;

     

       59
       43
        
       

     

       60
       44
        
         installPhase = ''

     

       61
       61
       -
           mkdir -p $out/bin

     

       62
       62
       -
           cp -Rv release $out/libexec

     

       45
       45
       +
           cp -R . $out

     

       46
       46
       +
           ln -s $out/VERSION $out/scripts/VERSION

     

       63
       47
        
       

     

       64
       64
       -
           substituteAllInPlace $out/libexec/launch.sh

     

       48
       48
       +
           substituteAllInPlace $out/scripts/launch.sh

     

       65
       49
        
       

     

       66
       66
       -
           makeWrapper $out/libexec/language_server.sh $out/bin/elixir-ls \

     

       67
       67
       -
             --set ELS_INSTALL_PREFIX "$out/libexec"

     

       50
       50
       +
           mkdir -p $out/bin

     

       51
       51
       +
       

     

       52
       52
       +
           makeWrapper $out/scripts/language_server.sh $out/bin/elixir-ls \

     

       53
       53
       +
             --set ELS_LOCAL "1"

     

       68
       54
        
       

     

       69
       69
       -
           makeWrapper $out/libexec/debug_adapter.sh $out/bin/elixir-debug-adapter \

     

       70
       70
       -
             --set ELS_INSTALL_PREFIX "$out/libexec"

     

       55
       55
       +
           makeWrapper $out/scripts/debug_adapter.sh $out/bin/elixir-debug-adapter \

     

       56
       56
       +
             --set ELS_LOCAL "1"

     

       71
       57
        
       

     

       72
       58
        
           runHook postInstall

     

       73
       59
        
         '';

+4 -4

pkgs/development/beam-modules/elixir-ls/launch.sh.patch

···

       1
       1
       -
       diff --git i/scripts/launch.sh w/scripts/launch.sh

     

       2
       2
       -
       index 21afbb1e..975cbdf0 100755

     

       3
       3
       -
       --- i/scripts/launch.sh

     

       1
       1
       +
       diff --git c/scripts/launch.sh w/scripts/launch.sh

     

       2
       2
       +
       index 21afbb1e..6b61f0b4 100755

     

       3
       3
       +
       --- c/scripts/launch.sh

     

       4
       4
        
       +++ w/scripts/launch.sh

     

       5
       5
        
       @@ -1,125 +1,4 @@

     

       6
       6
        
       -#!/bin/sh

     
···

       140
       140
        
       -  SCRIPTPATH=${ELS_INSTALL_PREFIX}

     

       141
       141
        
       -fi

     

       142
       142
        
       +SCRIPT=$(readlink -f "$0")

     

       143
       143
       -
       +SCRIPTPATH=$(dirname "$SCRIPT")/../libexec

     

       143
       143
       +
       +SCRIPTPATH=$(dirname "$SCRIPT")/../scripts

     

       144
       144
        
        

     

       145
       145
        
        export MIX_ENV=prod

     

       146
       146
        
        # Mix.install prints to stdout and reads from stdin