diff options
| author | cw <789@webuhu.at> | 2020-09-24 15:14:52 +0200 |
|---|---|---|
| committer | cw <789@webuhu.at> | 2020-09-24 15:14:52 +0200 |
| commit | 3c379af10b8a5f75b1d7561d951aa49d628adf00 (patch) | |
| tree | b9f0d90ffc2b333e8413dac0908bccb6ea3f7395 /pkgs/development/interpreters/elixir | |
| parent | ac33603b668c33859bd045091148ef929e01242d (diff) | |
elixir_1_6: remove
Additionally removed the now obsolete rebar build dependency for elixir.
Diffstat (limited to 'pkgs/development/interpreters/elixir')
| -rw-r--r-- | pkgs/development/interpreters/elixir/1.6.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/interpreters/elixir/generic-builder.nix | 8 |
2 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix deleted file mode 100644 index 94dffd1f763d..000000000000 --- a/pkgs/development/interpreters/elixir/1.6.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "1.6.6"; - sha256 = "1wl8rfpw0dxacq4f7xf6wjr8v2ww5691d0cfw9pzw7phd19vazgl"; - minimumOTPVersion = "19"; -} diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 54b046beaab2..f821baf66c5d 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, erlang, rebar, makeWrapper, +{ pkgs, stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, curl, bash, debugInfo ? false }: { baseName ? "elixir" @@ -20,7 +20,7 @@ in inherit src version; - buildInputs = [ erlang rebar makeWrapper ]; + buildInputs = [ erlang makeWrapper ]; LANG = "C.UTF-8"; LC_TYPE = "C.UTF-8"; @@ -32,10 +32,6 @@ in buildFlags = optional debugInfo "ERL_COMPILER_OPTIONS=debug_info"; 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 substituteInPlace Makefile \ |