public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #98649 from cw789/elixir_cleanup 

elixir_1_6: remove
This commit is contained in:
zimbatm 2020-09-24 22:00:03 +00:00 committed by GitHub
parent 047484d772 3c379af10b
commit cc9b34a56b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/beam-modules/default.nix
View File

@ -39,27 +39,22 @@ let
elixir = elixir_1_10; elixir = elixir_1_10;
elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix { elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix {
inherit rebar erlang; inherit erlang;
debugInfo = true; debugInfo = true;
}; };
elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix { elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix {
inherit rebar erlang; inherit erlang;
debugInfo = true; debugInfo = true;
}; };
elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix { elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix {
inherit rebar erlang; inherit erlang;
debugInfo = true; debugInfo = true;
}; };
elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix {
inherit rebar erlang; inherit erlang;
debugInfo = true;
};
elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix {
inherit rebar erlang;
debugInfo = true; debugInfo = true;
}; };

7
pkgs/development/interpreters/elixir/1.6.nix
View File

@ -1,7 +0,0 @@
{ mkDerivation }:
mkDerivation {
version = "1.6.6";
sha256 = "1wl8rfpw0dxacq4f7xf6wjr8v2ww5691d0cfw9pzw7phd19vazgl";
minimumOTPVersion = "19";
}

8
pkgs/development/interpreters/elixir/generic-builder.nix
View File

@ -1,4 +1,4 @@
{ pkgs, stdenv, fetchFromGitHub, erlang, rebar, makeWrapper, { pkgs, stdenv, fetchFromGitHub, erlang, makeWrapper,
coreutils, curl, bash, debugInfo ? false }: coreutils, curl, bash, debugInfo ? false }:
{ baseName ? "elixir" { baseName ? "elixir"
@ -20,7 +20,7 @@ in
inherit src version; inherit src version;
buildInputs = [ erlang rebar makeWrapper ]; buildInputs = [ erlang makeWrapper ];
LANG = "C.UTF-8"; LANG = "C.UTF-8";
LC_TYPE = "C.UTF-8"; LC_TYPE = "C.UTF-8";
@ -32,10 +32,6 @@ in
buildFlags = optional debugInfo "ERL_COMPILER_OPTIONS=debug_info"; buildFlags = optional debugInfo "ERL_COMPILER_OPTIONS=debug_info";
preBuild = '' preBuild = ''
# The build process uses ./rebar. Link it to the nixpkgs rebar
rm -vf rebar
ln -s ${rebar}/bin/rebar rebar
patchShebangs lib/elixir/generate_app.escript || true patchShebangs lib/elixir/generate_app.escript || true
substituteInPlace Makefile \ substituteInPlace Makefile \

2
pkgs/top-level/all-packages.nix
View File

@ -9991,7 +9991,7 @@ in
inherit (beam.interpreters) inherit (beam.interpreters)
erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18
erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6; elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
inherit (beam.packages.erlang) inherit (beam.packages.erlang)
rebar rebar3 rebar rebar3

2
pkgs/top-level/beam-packages.nix
View File

@ -97,7 +97,7 @@ rec {
# Other Beam languages. These are built with `beam.interpreters.erlang`. To # Other Beam languages. These are built with `beam.interpreters.erlang`. To
# access for example elixir built with different version of Erlang, use # access for example elixir built with different version of Erlang, use
# `beam.packages.erlangR22.elixir`. # `beam.packages.erlangR22.elixir`.
inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6; inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
inherit (packages.erlang) lfe lfe_1_2 lfe_1_3; inherit (packages.erlang) lfe lfe_1_2 lfe_1_3;
}; };