summary refs log tree commit diff
path: root/pkgs/top-level/beam-packages.nix
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2018-07-28 19:25:14 +0200
committerLluís Batlle i Rossell <viric@viric.name>2018-07-28 19:25:14 +0200
commitf54b387b63299245092d9bbf09cb562bac125461 (patch)
tree0c09809c0964d7bd931c6c8d1a7d19dcac342abd /pkgs/top-level/beam-packages.nix
parent66d7126255b96a3d9c1cc0cdd7c2cd79d1789758 (diff)
parent0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc (diff)
downloadnixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar
nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.gz
nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.bz2
nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.lz
nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.xz
nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.zst
nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.zip
Merge remote-tracking branch 'central/master' into viric_clean
Diffstat (limited to 'pkgs/top-level/beam-packages.nix')
-rw-r--r--pkgs/top-level/beam-packages.nix2
1 files changed, 1 insertions, 1 deletions
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;
   };