this repo has no description
Update ElixirLS and ErlangLS to newest versions
+87
-38
+5
fish/.config/fish/completions/wiki.fish
+5
fish/.config/fish/completions/wiki.fish
···
1
+
complete -f -c wiki -xa diary -d 'Open Diary index'
2
+
complete -f -c wiki -xa today -d 'Open today Diary entry'
3
+
complete -f -c wiki -xa yesterday -d 'Open yesterday Diary entry'
4
+
complete -f -c wiki -xa tomorrow -d 'Open tomorrow Diary entry'
5
+
complete -f -c wiki -xa index -d 'Open Wiki index'
+25
fish/.config/fish/functions/wiki.fish
+25
fish/.config/fish/functions/wiki.fish
···
1
+
function wiki
2
+
set -l comm index
3
+
set -l editor nvim
4
+
5
+
if set -q NVIM_LISTEN_ADDRESS
6
+
set editor nvr -cc split
7
+
end
8
+
9
+
if test (count $argv) -gt 0
10
+
set comm $argv[1]
11
+
end
12
+
13
+
switch $comm
14
+
case diary d
15
+
eval "$editor" +VimwikiDiaryIndex
16
+
case today t
17
+
eval "$editor" +VimwikiMakeDiaryNote
18
+
case yesterday y
19
+
eval "$editor" +VimwikiMakeYesterdayDiaryNote
20
+
case tomorrow a
21
+
eval "$editor" +VimwikiMakeTomorrowDiaryNote
22
+
case '' index i
23
+
eval "$editor" +VimwikiIndex
24
+
end
25
+
end
+1
-1
nix/.config/nixpkgs/overlays/encpipe.nix
+1
-1
nix/.config/nixpkgs/overlays/encpipe.nix
+2
-2
nix/.config/nixpkgs/overlays/erlang/elixir-ls.json
+2
-2
nix/.config/nixpkgs/overlays/erlang/elixir-ls.json
···
1
1
{
2
2
"owner": "elixir-lsp",
3
3
"repo": "elixir-ls",
4
-
"rev": "bc2c612db4835120252543772d945ee9be831abc",
5
-
"sha256": "0vlxgnphcgyrm13h2yy5g5l817ccb6sqhq4mxp6y8slh124i0kxq"
4
+
"rev": "1256038da37b2581dadb0f15c51d9cff590034ee",
5
+
"sha256": "1kw0wcchxxd4zgkpv4v0nrbb79yk3pad683x9mgqb88x6zbp1spc"
6
6
}
+24
-12
nix/.config/nixpkgs/overlays/erlang/elixir-ls.nix
+24
-12
nix/.config/nixpkgs/overlays/erlang/elixir-ls.nix
···
1
-
{ stdenv, elixir, rebar3, hex, fetchFromGitHub, fetchMixDeps, gitMinimal }:
1
+
{ stdenv, elixir, rebar3, hex, fetchFromGitHub, fetchMixDeps, git, cacert }:
2
2
3
3
let
4
4
json = builtins.fromJSON (builtins.readFile ./elixir-ls.json);
···
7
7
name = "elixir-ls";
8
8
version = json.rev;
9
9
10
-
nativeBuildInputs = [ elixir hex gitMinimal deps ];
10
+
nativeBuildInputs = [ elixir hex git deps cacert ];
11
11
12
12
deps = fetchMixDeps {
13
-
inherit name version src;
13
+
name = "${name}-${version}";
14
+
inherit src;
14
15
};
15
16
16
17
# refresh: nix-prefetch-git https://github.com/elixir-lsp/elixir-ls.git [--rev branchName | --rev sha]
···
20
21
21
22
configurePhase = ''
22
23
runHook preConfigure
24
+
export MIX_ENV=prod
25
+
23
26
export HEX_OFFLINE=1
24
-
export MIX_HOME=`pwd`
27
+
export HEX_HOME="$PWD/hex"
28
+
export MIX_HOME="$PWD"
29
+
export MIX_REBAR3="${rebar3}/bin/rebar3"
30
+
export REBAR_GLOBAL_CONFIG_DIR="$out/rebar3"
31
+
export REBAR_CACHE_DIR="$out/rebar3.cache"
25
32
26
-
cp --no-preserve=all -R ${deps}/deps deps
27
-
mix local.rebar rebar3 ${rebar3}/bin/rebar3
33
+
cp --no-preserve=all -R ${deps} deps
34
+
28
35
runHook postConfigure
29
36
'';
30
37
31
38
buildPhase = ''
32
39
runHook preBuild
33
-
export MIX_ENV=prod
34
40
35
41
mix elixir_ls.release
36
42
···
40
46
installPhase = ''
41
47
mkdir -p $out/bin
42
48
cp -Rv release $out/lib
43
-
substitute release/language_server.sh $out/bin/language_server.sh \
44
-
--replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" "ERL_LIBS=$out/lib:\$ERL_LIBS" \
45
-
--replace "elixir -e" "${elixir}/bin/elixir -e"
46
-
chmod +x $out/bin/language_server.sh
47
-
mv $out/bin/language_server.sh $out/bin/elixir-ls
49
+
50
+
# Prepare the wrapper script
51
+
substitute release/language_server.sh $out/bin/elixir-ls \
52
+
--replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh"
53
+
chmod +x $out/bin/elixir-ls
54
+
55
+
# prepare the launcher
56
+
substituteInPlace $out/lib/launch.sh \
57
+
--replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \
58
+
"ERL_LIBS=$out/lib:\$ERL_LIBS" \
59
+
--replace "elixir -e" "${elixir}/bin/elixir -e"
48
60
'';
49
61
}
+2
-2
nix/.config/nixpkgs/overlays/erlang/erlang-ls.json
+2
-2
nix/.config/nixpkgs/overlays/erlang/erlang-ls.json
···
1
1
{
2
2
"owner": "erlang-ls",
3
3
"repo": "erlang_ls",
4
-
"rev": "634cc2ad63f8b1c5675737ea9b62764fe912630c",
5
-
"sha256": "0sqw5xn07np2cwsaw2hcsysrz123fdi014d46s49l6xfd96jrkyx"
4
+
"rev": "a24a29c64078991dda513dcb6fd55ab33df793f0",
5
+
"sha256": "06p8dvji8kmfxm4jzn9d0258wls6s73yhhpn0kpicn3v1mmr53zi"
6
6
}
+23
-21
nix/.config/nixpkgs/overlays/erlang/fetch-mix-deps.nix
+23
-21
nix/.config/nixpkgs/overlays/erlang/fetch-mix-deps.nix
···
1
-
{ stdenv, elixir, rebar3, gitMinimal, cacert }:
1
+
{ stdenvNoCC, elixir, rebar, rebar3, git, cacert }:
2
2
3
-
{ name, version, sha256 ? null, src, env ? "prod" }:
3
+
{ name ? null, src, env ? "prod", ... }:
4
4
5
-
with stdenv;
5
+
stdenvNoCC.mkDerivation {
6
+
name = "mix-deps" + (if name != null then "-${name}" else "");
6
7
7
-
mkDerivation {
8
-
name = "mix-deps-${name}-${version}";
9
-
10
-
nativeBuildInputs = [ elixir gitMinimal cacert ];
8
+
nativeBuildInputs = [ elixir git cacert ];
11
9
12
-
phases = [ "downloadPhase" "installPhase" ];
10
+
inherit src;
13
11
14
-
downloadPhase = ''
15
-
export HEX_HOME=$PWD
16
-
export MIX_HOME=$PWD
17
-
export MIX_ENV=${env}
12
+
configurePhase = ''
13
+
export MIX_ENV="${env}"
18
14
19
-
cp -R ${src}/* .
15
+
export HEX_HOME="$PWD/hex"
16
+
export MIX_HOME="$PWD/mix"
17
+
export MIX_DEPS_PATH="$out"
18
+
export MIX_REBAR="${rebar}/bin/rebar"
19
+
export MIX_REBAR3="${rebar3}/bin/rebar3"
20
+
export REBAR_GLOBAL_CONFIG_DIR="$PWD/rebar3"
21
+
export REBAR_CACHE_DIR="$PWD/rebar3.cache"
20
22
21
23
mix local.hex --force
22
-
mix local.rebar rebar3 ${rebar3}/bin/rebar3
23
-
mix deps.get
24
24
'';
25
25
26
-
installPhase = ''
27
-
mkdir -p "$out"
28
-
cp -R deps "$out"
26
+
buildPhase = ''
27
+
mix deps.get
29
28
'';
30
29
31
-
outputHashAlgo = "sha256";
32
-
outputHashMode = "recursive";
30
+
dontInstall = true;
31
+
32
+
# outputHashAlgo = "sha256";
33
+
# outputHashMode = "recursive";
34
+
# outputHash = sha256;
33
35
34
-
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
36
+
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
35
37
}