diff options
| author | Peter Simons <simons@cryp.to> | 2012-11-11 20:41:50 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-11-11 20:41:50 +0100 |
| commit | 724d416fae0ac935e59081656089346d87634782 (patch) | |
| tree | 790efec2a231827019b161a0bd7dd66a2fdc5ec0 | |
| parent | 4fbd441418a260df7631f9375ee2cc034f5cea51 (diff) | |
| download | nixlib-724d416fae0ac935e59081656089346d87634782.tar nixlib-724d416fae0ac935e59081656089346d87634782.tar.gz nixlib-724d416fae0ac935e59081656089346d87634782.tar.bz2 nixlib-724d416fae0ac935e59081656089346d87634782.tar.lz nixlib-724d416fae0ac935e59081656089346d87634782.tar.xz nixlib-724d416fae0ac935e59081656089346d87634782.tar.zst nixlib-724d416fae0ac935e59081656089346d87634782.zip | |
erlang: drop obsolete R15B01 version
| -rw-r--r-- | pkgs/development/interpreters/erlang/R15B01.nix | 28 | ||||
| -rw-r--r-- | pkgs/development/interpreters/erlang/R15B02.nix (renamed from pkgs/development/interpreters/erlang/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 2 insertions, 32 deletions
diff --git a/pkgs/development/interpreters/erlang/R15B01.nix b/pkgs/development/interpreters/erlang/R15B01.nix deleted file mode 100644 index 18cfeca63294..000000000000 --- a/pkgs/development/interpreters/erlang/R15B01.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, perl, gnum4, ncurses, openssl -, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: - -assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; - -let version = "R15B01"; in - -stdenv.mkDerivation { - name = "erlang-" + version; - - src = fetchurl { - url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; - sha256 = "1pmb3hk51p6dwsspxx40qs7gjfyhxjjc3290qk6w1wwa6bkpskzr"; - }; - - buildInputs = - [ perl gnum4 ncurses openssl - ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ]; - - patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; - - preConfigure = '' - export HOME=$PWD/../ - sed -e s@/bin/pwd@pwd@g -i otp_build - ''; - - configureFlags = "--with-ssl=${openssl}"; -} diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/R15B02.nix index 50d818e1bb1a..50d818e1bb1a 100644 --- a/pkgs/development/interpreters/erlang/default.nix +++ b/pkgs/development/interpreters/erlang/R15B02.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb21994df6d4..23d301b11ffa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2737,11 +2737,9 @@ let clooj = clooj_standalone_binary; }; - erlang = callPackage ../development/interpreters/erlang { }; - - erlangR15B01 = callPackage ../development/interpreters/erlang/R15B01.nix { }; - erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; + erlangR15B02 = callPackage ../development/interpreters/erlang/R15B02.nix { }; + erlang = erlangR15B02; groovy = callPackage ../development/interpreters/groovy { }; |