ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-24 22:27:30 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32454 from andir/erlang-cleanup

Browse Source 
Erlang cleanup (remove R17, R16 cleanup, updated couchdb to R19)
This commit is contained in:
Daiderd Jordan 2017-12-09 14:48:56 +01:00 committed by GitHub
commit b2e2490181
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/development/interpreters/erlang/R16.nix
View File

@ -1,35 +0,0 @@
{ mkDerivation, fetchurl }:
mkDerivation rec {
version = "16B03-1";
src = fetchurl {
url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz";
sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp";
};
prePatch = ''
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
'';
# Do not install docs, instead use prebuilt versions.
installTargets = "install";
postInstall = let
manpages = fetchurl {
url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz";
sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g";
};
in ''
tar xf "${manpages}" -C "$out/lib/erlang"
for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do
prefix="''${i%/*}"
ensureDir "$out/share/man/''${prefix##*/}"
ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl"
done
'';
}

8
pkgs/development/interpreters/erlang/R16B02-8-basho.nix → pkgs/development/interpreters/erlang/R16B02-basho.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
baseName = "erlang";
version = "16B02";
version = "16B02.basho10";
src = pkgs.fetchFromGitHub {
owner = "basho";
repo = "otp";
rev = "OTP_R16B02_basho8";
sha256 = "1w0hbm0axxxa45v3kl6bywc9ayir5vwqxjpnjlzc616ldszb2m0x";
rev = "OTP_R16B02_basho10";
sha256 = "1s2c3ag9dnp6xmcr27kh95n1w50xly97n1mp8ivc2a3gpv4blqmj";
};
preConfigure = ''
@ -27,7 +27,7 @@ mkDerivation rec {
installTargets = "install";
postInstall = let
manpages = pkgs.fetchurl {
url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz";
url = "http://www.erlang.org/download/otp_doc_man_R16B02.tar.gz";
sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p";
};
in ''

37
pkgs/development/interpreters/erlang/R17.nix
View File

@ -1,37 +0,0 @@
{ mkDerivation, fetchurl }:
mkDerivation rec {
version = "17.5";
src = fetchurl {
url = "http://www.erlang.org/download/otp_src_${version}.tar.gz";
sha256 = "0x34hj1a4j3rphqdaapdld7la4sqiqillamcz06wac0vk0684a1w";
};
prePatch = ''
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
'';
# Do not install docs, instead use prebuilt versions.
installTargets = "install";
postInstall = let
manpages = fetchurl {
url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz";
sha256 = "1hspm285bl7i9a0d4r6j6lm5yk4sb5d9xzpia3simh0z06hv5cc5";
};
in ''
tar xf "${manpages}" -C "$out/lib/erlang"
for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do
prefix="''${i%/*}"
ensureDir "$out/share/man/''${prefix##*/}"
ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl"
done
'';
meta.knownVulnerabilities = [ "CVE-2017-1000385" ];
}

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

@ -6481,7 +6481,7 @@ with pkgs;
beam = callPackage ./beam-packages.nix { };
inherit (beam.interpreters)
erlang erlangR17 erlangR18 erlangR19 erlangR20
erlang erlangR18 erlangR19 erlangR20
erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
elixir elixir_1_5 elixir_1_4 elixir_1_3
lfe lfe_1_2;
@ -11561,7 +11561,7 @@ with pkgs;
spidermonkey = spidermonkey_1_8_5;
python = python27;
sphinx = python27Packages.sphinx;
erlang = erlangR17;
erlang = erlangR19;
};
couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix {

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

@ -14,13 +14,6 @@ rec {
erlang_nox = erlangR19_nox;
# These are standard Erlang versions, using the generic builder.
erlangR17 = lib.callErlang ../development/interpreters/erlang/R17.nix {};
erlangR17_odbc = erlangR17.override { odbcSupport = true; };
erlangR17_javac = erlangR17.override { javacSupport = true; };
erlangR17_odbc_javac = erlangR17.override {
javacSupport = true; odbcSupport = true;
};
erlangR17_nox = erlangR17.override { wxSupport = false; };
erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix {
wxGTK = wxGTK30;
};
@ -49,8 +42,8 @@ rec {
};
erlangR20_nox = erlangR20.override { wxSupport = false; };
# Bash fork, using custom builder.
erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix {
# Basho fork, using custom builder.
erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix {
};
erlang_basho_R16B02_odbc = erlang_basho_R16B02.override {
odbcSupport = true;
@ -73,7 +66,6 @@ rec {
# Packages built with default Erlang version.
erlang = packagesWith interpreters.erlang;
erlangR17 = packagesWith interpreters.erlangR17;
erlangR18 = packagesWith interpreters.erlangR18;
erlangR19 = packagesWith interpreters.erlangR19;
erlangR20 = packagesWith interpreters.erlangR20;