diff options
| author | adisbladis <adisbladis@gmail.com> | 2018-01-18 09:59:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-18 09:59:41 +0800 |
| commit | ebd422af9b26326cd47c51a8cd6648d8dcd53b8f (patch) | |
| tree | 98abdc9375e5777e3734ab430d59a29a80e36f03 | |
| parent | 08d3da7ad021cb4a8201e891cb1acce6cd4219ef (diff) | |
| parent | 3497ce23bd6235f2de5e13bf1c41d6ba1dbe1c0a (diff) | |
| download | nixlib-ebd422af9b26326cd47c51a8cd6648d8dcd53b8f.tar nixlib-ebd422af9b26326cd47c51a8cd6648d8dcd53b8f.tar.gz nixlib-ebd422af9b26326cd47c51a8cd6648d8dcd53b8f.tar.bz2 nixlib-ebd422af9b26326cd47c51a8cd6648d8dcd53b8f.tar.lz nixlib-ebd422af9b26326cd47c51a8cd6648d8dcd53b8f.tar.xz nixlib-ebd422af9b26326cd47c51a8cd6648d8dcd53b8f.tar.zst nixlib-ebd422af9b26326cd47c51a8cd6648d8dcd53b8f.zip | |
Merge pull request #33986 from ankhers/update_elixir_1_6
Elixir: 1.6-rc -> 1.6
| -rw-r--r-- | pkgs/development/beam-modules/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/elixir/1.6.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/beam-packages.nix | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 6839bef3460a..83de6f9e5697 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -42,9 +42,9 @@ let buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. - elixir = elixir_1_5; + elixir = elixir_1_6; - elixir_1_6_rc = lib.callElixir ../interpreters/elixir/1.6.nix { + elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix { inherit rebar erlang; debugInfo = true; }; diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix index 168007d22d77..673a4b6e51bb 100644 --- a/pkgs/development/interpreters/elixir/1.6.nix +++ b/pkgs/development/interpreters/elixir/1.6.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.6.0-rc.1"; - sha256 = "06g6n9qvv57xa07fyaqhki2y8zw24m3smcjiw1wiw9pzl5a76iby"; + version = "1.6.0"; + sha256 = "0wfmbrq70n85mx17kl9h2k0xzgnhncz3xygjx9cbvpmiwwdzgrdx"; minimumOTPVersion = "18"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ff67a30e2d1..08ebe90e5e79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6677,7 +6677,7 @@ with pkgs; inherit (beam.interpreters) erlang erlangR18 erlangR19 erlangR20 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 - elixir elixir_1_6_rc elixir_1_5 elixir_1_4 elixir_1_3 + elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3 lfe lfe_1_2; inherit (beam.packages.erlang) diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 76807d9b9261..765f69c1b14a 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -52,7 +52,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_rc elixir_1_5 elixir_1_4 elixir_1_3; + inherit (packages.erlang) elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3; inherit (packages.erlang) lfe lfe_1_2; }; |