diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-07-28 17:14:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-28 17:14:27 +0200 |
| commit | 0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc (patch) | |
| tree | 8959c474043ddb9521c912cd89f08db2a0d8dc46 | |
| parent | 5a2ee49f3c8b2be19866e80c2a0e301ca3e4961b (diff) | |
| parent | 911b7b20c0f40547aff59b3fdedf408539d4303a (diff) | |
| download | nixpkgs-0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc.tar nixpkgs-0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc.tar.gz nixpkgs-0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc.tar.bz2 nixpkgs-0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc.tar.lz nixpkgs-0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc.tar.xz nixpkgs-0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc.tar.zst nixpkgs-0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc.zip | |
Merge pull request #44111 from LnL7/elixir-1.7.0
elixir: init 1.7.0
| -rw-r--r-- | pkgs/development/beam-modules/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/development/interpreters/elixir/1.7.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/interpreters/elixir/generic-builder.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/beam-packages.nix | 2 |
4 files changed, 26 insertions, 14 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index f10c8ec86ff..26bed216acf 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -44,25 +44,30 @@ let # BEAM-based languages. elixir = elixir_1_6; + elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { + inherit rebar erlang; + debugInfo = true; + }; + elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix { - inherit rebar erlang; - debugInfo = true; - }; + inherit rebar erlang; + debugInfo = true; + }; elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix { - inherit rebar erlang; - debugInfo = true; - }; + inherit rebar erlang; + debugInfo = true; + }; elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix { - inherit rebar erlang; - debugInfo = true; - }; + inherit rebar erlang; + debugInfo = true; + }; elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix { - inherit rebar erlang; - debugInfo = true; - }; + inherit rebar erlang; + debugInfo = true; + }; lfe = lfe_1_2; lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix new file mode 100644 index 00000000000..426e5a4cbba --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.7.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.7.0"; + sha256 = "082924fngc6ypbkn1ghdwf199radk00daf4q09mm04h81jy4nmxm"; + minimumOTPVersion = "18"; +} diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 78598ce3d81..7d3c6476131 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -37,7 +37,7 @@ in preBuild = '' # The build process uses ./rebar. Link it to the nixpkgs rebar - rm -v rebar + rm -vf rebar ln -s ${rebar}/bin/rebar rebar substituteInPlace Makefile \ diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 3440bfafb11..da5fed4be4b 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -61,7 +61,7 @@ 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_6 elixir_1_5 elixir_1_4 elixir_1_3; + inherit (packages.erlang) elixir elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3; inherit (packages.erlang) lfe lfe_1_2; }; |