diff options
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/erlang/R16.nix | 35 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/R16B02-basho.nix (renamed from pkgs/development/interpreters/erlang/R16B02-8-basho.nix) | 10 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/R17.nix | 35 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/R18.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/R19.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/R20.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/generic-builder.nix | 7 | ||||
-rw-r--r-- | pkgs/development/interpreters/lua-5/filesystem.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix | 4 |
9 files changed, 19 insertions, 86 deletions
diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix deleted file mode 100644 index 123d813fc77a..000000000000 --- a/pkgs/development/interpreters/erlang/R16.nix +++ /dev/null @@ -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 - ''; -} diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix index a5f79c197d63..33c34f7fecc0 100644 --- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -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 '' @@ -56,6 +56,8 @@ mkDerivation rec { repository. ''; + knownVulnerabilities = [ "CVE-2017-1000385" ]; + platforms = ["x86_64-linux" "x86_64-darwin"]; license = pkgs.stdenv.lib.licenses.asl20; maintainers = with pkgs.stdenv.lib.maintainers; [ mdaiter ]; diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix deleted file mode 100644 index 02d7513331eb..000000000000 --- a/pkgs/development/interpreters/erlang/R17.nix +++ /dev/null @@ -1,35 +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 - ''; -} diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 39a1a8a0048e..967940ca184f 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -12,8 +12,8 @@ let }; in mkDerivation rec { - version = "18.3.4.4"; - sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk"; + version = "18.3.4.7"; + sha256 = "1l66vzbb1vidrmf6gr84l34kgrpb9k7z2170bac4c6aviah9r02l"; patches = [ rmAndPwdPatch diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 5e2e1c7f215d..aa8c941eb93b 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,8 +1,8 @@ { mkDerivation, fetchurl, fetchpatch }: mkDerivation rec { - version = "19.3"; - sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86"; + version = "19.3.6.4"; + sha256 = "1w0h3wj2h58m3jrfgw56xab2352na3i9ccrbpfs4420dn7igf071"; patches = [ # macOS 10.13 crypto fix from OTP-20.1.2 diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix index cf94a8800f9c..866a38e25759 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -1,8 +1,8 @@ { mkDerivation, fetchurl }: mkDerivation rec { - version = "20.1"; - sha256 = "13f53lzgq2himg9kax41f66rzv5pjfrb1ln8b54yv9spkqx2hqqi"; + version = "20.1.7"; + sha256 = "0sbxl10d76bm7awxb9s07l9815jiwfg78bps07xj2ircxdr08pls"; prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index af728b942ebb..eae4a50aa20e 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -26,7 +26,7 @@ , installTargets ? "install install-docs" , checkPhase ? "", preCheck ? "", postCheck ? "" , fixupPhase ? "", preFixup ? "", postFixup ? "" -, meta ? null +, meta ? {} }: assert wxSupport -> (if stdenv.isDarwin @@ -101,7 +101,7 @@ in stdenv.mkDerivation ({ setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with stdenv.lib; ({ homepage = http://www.erlang.org/; downloadPage = "http://www.erlang.org/download.html"; description = "Programming language used for massively scalable soft real-time systems"; @@ -118,7 +118,7 @@ in stdenv.mkDerivation ({ platforms = platforms.unix; maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ]; license = licenses.asl20; - }; + } // meta); } // optionalAttrs (preUnpack != "") { inherit preUnpack; } // optionalAttrs (postUnpack != "") { inherit postUnpack; } @@ -140,5 +140,4 @@ in stdenv.mkDerivation ({ // optionalAttrs (fixupPhase != "") { inherit fixupPhase; } // optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (postFixup != "") { inherit postFixup; } -// optionalAttrs (meta != null) { inherit meta; } ) diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix index 21f656044a33..7aa41e95cc9b 100644 --- a/pkgs/development/interpreters/lua-5/filesystem.nix +++ b/pkgs/development/interpreters/lua-5/filesystem.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/keplerproject/luafilesystem; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.flosse ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index c7483a815297..b28df2501aac 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -16,6 +16,8 @@ , libffi , CF, configd, coreutils , python-setup-hook +# Some proprietary libs assume UCS2 unicode, especially on darwin :( +, ucsEncoding ? 4 # For the Python package set , pkgs, packageOverrides ? (self: super: {}) }: @@ -107,7 +109,7 @@ let configureFlags = [ "--enable-shared" "--with-threads" - "--enable-unicode=ucs4" + "--enable-unicode=ucs${toString ucsEncoding}" ] ++ optionals (hostPlatform.isCygwin || hostPlatform.isAarch64) [ "--with-system-ffi" ] ++ optionals hostPlatform.isCygwin [ |