Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #44111 from LnL7/elixir-1.7.0

elixir: init 1.7.0

authored by Daiderd Jordan and committed by GitHub 0fa2cbf5 5a2ee49f

+26 -14
+17 -12
pkgs/development/beam-modules/default.nix
··· 44 44 # BEAM-based languages. 45 45 elixir = elixir_1_6; 46 46 47 + elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { 48 + inherit rebar erlang; 49 + debugInfo = true; 50 + }; 51 + 47 52 elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix { 48 - inherit rebar erlang; 49 - debugInfo = true; 50 - }; 53 + inherit rebar erlang; 54 + debugInfo = true; 55 + }; 51 56 52 57 elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix { 53 - inherit rebar erlang; 54 - debugInfo = true; 55 - }; 58 + inherit rebar erlang; 59 + debugInfo = true; 60 + }; 56 61 57 62 elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix { 58 - inherit rebar erlang; 59 - debugInfo = true; 60 - }; 63 + inherit rebar erlang; 64 + debugInfo = true; 65 + }; 61 66 62 67 elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix { 63 - inherit rebar erlang; 64 - debugInfo = true; 65 - }; 68 + inherit rebar erlang; 69 + debugInfo = true; 70 + }; 66 71 67 72 lfe = lfe_1_2; 68 73 lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
+7
pkgs/development/interpreters/elixir/1.7.nix
··· 1 + { mkDerivation }: 2 + 3 + mkDerivation rec { 4 + version = "1.7.0"; 5 + sha256 = "082924fngc6ypbkn1ghdwf199radk00daf4q09mm04h81jy4nmxm"; 6 + minimumOTPVersion = "18"; 7 + }
+1 -1
pkgs/development/interpreters/elixir/generic-builder.nix
··· 37 37 38 38 preBuild = '' 39 39 # The build process uses ./rebar. Link it to the nixpkgs rebar 40 - rm -v rebar 40 + rm -vf rebar 41 41 ln -s ${rebar}/bin/rebar rebar 42 42 43 43 substituteInPlace Makefile \
+1 -1
pkgs/top-level/beam-packages.nix
··· 61 61 # Other Beam languages. These are built with `beam.interpreters.erlang`. To 62 62 # access for example elixir built with different version of Erlang, use 63 63 # `beam.packages.erlangR19.elixir`. 64 - inherit (packages.erlang) elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3; 64 + inherit (packages.erlang) elixir elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3; 65 65 66 66 inherit (packages.erlang) lfe lfe_1_2; 67 67 };