diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-07-25 23:48:29 +0200 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2018-07-25 23:48:50 +0200 |
commit | 911b7b20c0f40547aff59b3fdedf408539d4303a (patch) | |
tree | 11a0335200743974ddbf0098765a4f598eae98ac | |
parent | 7110d87d51cda2ce3dc40d3a2e0ec0acf06fdbb1 (diff) | |
download | nixlib-911b7b20c0f40547aff59b3fdedf408539d4303a.tar nixlib-911b7b20c0f40547aff59b3fdedf408539d4303a.tar.gz nixlib-911b7b20c0f40547aff59b3fdedf408539d4303a.tar.bz2 nixlib-911b7b20c0f40547aff59b3fdedf408539d4303a.tar.lz nixlib-911b7b20c0f40547aff59b3fdedf408539d4303a.tar.xz nixlib-911b7b20c0f40547aff59b3fdedf408539d4303a.tar.zst nixlib-911b7b20c0f40547aff59b3fdedf408539d4303a.zip |
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 f10c8ec86ff9..26bed216acfa 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 000000000000..426e5a4cbba0 --- /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 78598ce3d81e..7d3c6476131d 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 3440bfafb110..da5fed4be4b9 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; }; |