Merge pull request #33986 from ankhers/update_elixir_1_6

Elixir: 1.6-rc -> 1.6

authored by adisbladis and committed by GitHub ebd422af 08d3da7a

+6 -6
+2 -2
pkgs/development/beam-modules/default.nix
··· 42 42 buildMix = callPackage ./build-mix.nix {}; 43 43 44 44 # BEAM-based languages. 45 - elixir = elixir_1_5; 45 + elixir = elixir_1_6; 46 46 47 - elixir_1_6_rc = lib.callElixir ../interpreters/elixir/1.6.nix { 47 + elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix { 48 48 inherit rebar erlang; 49 49 debugInfo = true; 50 50 };
+2 -2
pkgs/development/interpreters/elixir/1.6.nix
··· 1 1 { mkDerivation }: 2 2 3 3 mkDerivation rec { 4 - version = "1.6.0-rc.1"; 5 - sha256 = "06g6n9qvv57xa07fyaqhki2y8zw24m3smcjiw1wiw9pzl5a76iby"; 4 + version = "1.6.0"; 5 + sha256 = "0wfmbrq70n85mx17kl9h2k0xzgnhncz3xygjx9cbvpmiwwdzgrdx"; 6 6 minimumOTPVersion = "18"; 7 7 }
+1 -1
pkgs/top-level/all-packages.nix
··· 6677 6677 inherit (beam.interpreters) 6678 6678 erlang erlangR18 erlangR19 erlangR20 6679 6679 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 6680 - elixir elixir_1_6_rc elixir_1_5 elixir_1_4 elixir_1_3 6680 + elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3 6681 6681 lfe lfe_1_2; 6682 6682 6683 6683 inherit (beam.packages.erlang)
+1 -1
pkgs/top-level/beam-packages.nix
··· 52 52 # Other Beam languages. These are built with `beam.interpreters.erlang`. To 53 53 # access for example elixir built with different version of Erlang, use 54 54 # `beam.packages.erlangR19.elixir`. 55 - inherit (packages.erlang) elixir elixir_1_6_rc elixir_1_5 elixir_1_4 elixir_1_3; 55 + inherit (packages.erlang) elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3; 56 56 57 57 inherit (packages.erlang) lfe lfe_1_2; 58 58 };