cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #78599 from cw789/elixir_update

Browse source 
elixir_1_10: init at 1.10.0
This commit is contained in:
worldofpeace 2020-01-28 18:45:01 -05:00 committed by GitHub
commit e22b99bb90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/beam-modules/default.nix
View file

@ -36,7 +36,12 @@ let
buildMix = callPackage ./build-mix.nix {};
# BEAM-based languages.
elixir = elixir_1_9;
elixir = elixir_1_10;
elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix {
inherit rebar erlang;
debugInfo = true;
};
elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix {
inherit rebar erlang;
@ -58,13 +63,8 @@ let
debugInfo = true;
};
elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
inherit rebar erlang;
debugInfo = true;
};
# Remove old versions of elixir, when the supports fades out:
# https://hexdocs.pm/elixir/compatibility-and-deprecations.html
# https://hexdocs.pm/elixir/compatibility-and-deprecations.html
lfe = lfe_1_2;
lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };

9
pkgs/development/interpreters/elixir/1.10.nix Normal file
View file

@ -0,0 +1,9 @@
{ mkDerivation }:
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
mkDerivation {
version = "1.10.0";
sha256 = "1fz22c2jqqm2jvzxar11bh1djg3kqdn5rbxdddlz0cv6mfz7hvgv";
minimumOTPVersion = "21";
}

7
pkgs/development/interpreters/elixir/1.5.nix
View file

@ -1,7 +0,0 @@
{ mkDerivation }:
mkDerivation {
version = "1.5.3";
sha256 = "00kgqcn9g6vflc551wniz9pwv7pszyf8v6smpkqs50j3kbliihy5";
minimumOTPVersion = "18";
}

2
pkgs/top-level/all-packages.nix
View file

@ -9093,7 +9093,7 @@ in
inherit (beam.interpreters)
erlang erlangR18 erlangR19 erlangR20 erlangR21 erlangR22
erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
elixir elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5
elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6
lfe lfe_1_2;
inherit (beam.packages.erlang)

6
pkgs/top-level/beam-packages.nix
View file

@ -71,8 +71,8 @@ rec {
# Other Beam languages. These are built with `beam.interpreters.erlang`. To
# access for example elixir built with different version of Erlang, use
# `beam.packages.erlangR19.elixir`.
inherit (packages.erlang) elixir elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5;
# `beam.packages.erlangR22.elixir`.
inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6;
inherit (packages.erlang) lfe lfe_1_2;
};
@ -83,7 +83,6 @@ rec {
# Each field in this tuple represents all Beam packages in nixpkgs built with
# appropriate Erlang/OTP version.
packages = {
# Packages built with default Erlang version.
erlang = packagesWith interpreters.erlang;
erlangR18 = packagesWith interpreters.erlangR18;
@ -91,6 +90,5 @@ rec {
erlangR20 = packagesWith interpreters.erlangR20;
erlangR21 = packagesWith interpreters.erlangR21;
erlangR22 = packagesWith interpreters.erlangR22;
};
}