diff options
Diffstat (limited to 'pkgs/development/interpreters')
17 files changed, 190 insertions, 105 deletions
diff --git a/pkgs/development/interpreters/erlang/R16B03-1-basho.nix b/pkgs/development/interpreters/erlang/R16B03-1-basho.nix new file mode 100644 index 000000000000..cbb5f0789fa2 --- /dev/null +++ b/pkgs/development/interpreters/erlang/R16B03-1-basho.nix @@ -0,0 +1,98 @@ +{ stdenv, fetchurl, fetchgit, perl, gnum4, ncurses, openssl, autoconf264, gcc, erlang +, gnused, gawk, makeWrapper +, odbcSupport ? false, unixODBC ? null +, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null +, enableDebugInfo ? false +, Carbon ? null, Cocoa ? null }: + +assert wxSupport -> mesa != null && wxGTK != null && xorg != null; +assert odbcSupport -> unixODBC != null; + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "erlang-basho-" + version + "${optionalString odbcSupport "-odbc"}"; + version = "16B03-1"; + + src = fetchgit { + url = "https://github.com/basho/otp"; + rev = "cb3a485894e493ad172db2749129e613fe52713a"; + sha256 = "0xn28cxlq0ya1aww9q14rg8jf3x2flwxrz6wdnpb0l2h2dasr655"; + }; + + debugInfo = enableDebugInfo; + + buildInputs = + [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc + ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] + ++ optional odbcSupport [ unixODBC ]; + + patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in ''; + + preConfigure = '' + export HOME=$PWD/../ + export LANG=C + export ERL_TOP=$(pwd) + sed -e s@/bin/pwd@pwd@g -i otp_build + sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc + ''; + + configureFlags= [ + "--with-ssl=${openssl.dev}" + "--enable-smp-support" + "--enable-threads" + "--enable-kernel-poll" + "--disable-hipe" + "${optionalString odbcSupport "--with-odbc=${unixODBC}"}" + "${optionalString stdenv.isDarwin "--enable-darwin-64bit"}" + "${optionalString stdenv.isLinux "--enable-m64-build"}" + ]; + + buildPhase = '' + ./otp_build autoconf + ./otp_build setup -a --prefix=$out $configureFlags + ''; + + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; + sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g"; + }; + in '' + ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + 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 + ''; + + # Some erlang bin/ scripts run sed and awk + postFixup = '' + wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" + ''; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = "https://github.com/basho/otp/"; + description = "Programming language used for massively scalable soft real-time systems, Basho fork"; + + longDescription = '' + Erlang is a programming language used to build massively scalable + soft real-time systems with requirements on high availability. + Some of its uses are in telecoms, banking, e-commerce, computer + telephony and instant messaging. Erlang's runtime system has + built-in support for concurrency, distribution and fault + tolerance. + This version of Erlang is Basho's version, forked from Ericsson's + repository. + ''; + + platforms = ["x86_64-linux" "x86_64-darwin"]; + license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 56b4626a2127..57323a587f81 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -6,6 +6,7 @@ , javacSupport ? false, openjdk ? null , enableHipe ? true , enableDebugInfo ? false +, enableDirtySchedulers ? false }: assert wxSupport -> (if stdenv.isDarwin @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { configureFlags= [ "--with-ssl=${openssl.dev}" ] ++ optional enableHipe "--enable-hipe" + ++ optional enableDirtySchedulers "--enable-dirty-schedulers" ++ optional wxSupport "--enable-wx" ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional javacSupport "--with-javac" diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 5d9c5dac3d8e..f9b6edc3fa4b 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -6,6 +6,7 @@ , javacSupport ? false, openjdk ? null , enableHipe ? true , enableDebugInfo ? false +, enableDirtySchedulers ? false }: assert wxSupport -> (if stdenv.isDarwin @@ -20,7 +21,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + "${optionalString javacSupport "-javac"}"; - version = "18.3.4"; + version = "18.3.4.4"; # Minor OTP releases are not always released as tarbals at # http://erlang.org/download/ So we have to download from @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = "otp"; rev = "OTP-${version}"; - sha256 = "1f8nhybzsdmjvkmkzpjj3wj9jzx8mihlvi6gfp47fxkalansz39h"; + sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk"; }; buildInputs = @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { configureFlags= [ "--with-ssl=${openssl.dev}" ] ++ optional enableHipe "--enable-hipe" + ++ optional enableDirtySchedulers "--enable-dirty-schedulers" ++ optional wxSupport "--enable-wx" ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional javacSupport "--with-javac" diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index ddeccb29b59d..824c68688803 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -6,6 +6,7 @@ , javacSupport ? false, openjdk ? null , enableHipe ? true , enableDebugInfo ? false +, enableDirtySchedulers ? false }: assert wxSupport -> (if stdenv.isDarwin @@ -20,7 +21,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + "${optionalString javacSupport "-javac"}"; - version = "19.1"; + version = "19.1.6"; # Minor OTP releases are not always released as tarbals at # http://erlang.org/download/ So we have to download from @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = "otp"; rev = "OTP-${version}"; - sha256 = "0nnjj069d5pjhgcd8vvqbrkjdac3p1v4s3zb59i4h73vg7f5p736"; + sha256 = "120dqi8h2fwqfmh9g2nmkf153zlglzw9kkddz57xqvqq5arcs72y"; }; buildInputs = @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { configureFlags= [ "--with-ssl=${openssl.dev}" ] ++ optional enableHipe "--enable-hipe" + ++ optional enableDirtySchedulers "--enable-dirty-schedulers" ++ optional wxSupport "--enable-wx" ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional javacSupport "--with-javac" diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 78d154bb6542..a883080f58e7 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.6"; + version = "2.4.7"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "0s474wy7db7j1pans5ks986b52bdmn40l29zl6xl44y23fsvagwv"; + sha256 = "1mgvpqxc99057szfhhjfirmf3xyhs0vmgb0jzy47wr2jh84xd3a3"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index adf743848d19..6da5c265aaf6 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "luajit-${version}"; - version = "2.1.0-beta1"; + version = "2.1.0-beta2"; luaversion = "5.1"; src = fetchurl { url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - sha256 = "06170d38387c59d1292001a166e7f5524f5c5deafa8705a49a46fa42905668dd"; + sha256 = "0iyghj1xjlmd9ywa4flf9yszynf3jhbp0yqb9b49k7ab0g528fbi"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 96c85704f5ef..3b1b288fd5d5 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -302,12 +302,12 @@ let in { php56 = generic { - version = "5.6.27"; - sha256 = "0g1adx231c738694gc4bh8x65c7fwsqdbm42n9xwrsdncyhd6xrv"; + version = "5.6.28"; + sha256 = "13sl8z5inwyzmi1d5z4g42nq3n8gjdl4876h65bbd86mmbsa6pn5"; }; php70 = generic { - version = "7.0.12"; - sha256 = "09va788b9zk5igzmsfxr593ly174qf9kmihd4fq3kclgzsa75i1q"; + version = "7.0.13"; + sha256 = "1hc8zry3mrggfh1yxvm255xal5h6bxf0p3wdq307w48j719bp46h"; }; } diff --git a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix deleted file mode 100644 index 24ba479186ec..000000000000 --- a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, readline, nspr }: - -stdenv.mkDerivation rec { - version = "1.8.0-rc1"; - name = "spidermonkey-${version}"; - - src = fetchurl { - url = "mirror://mozilla/js/js-${version}.tar.gz"; - sha256 = "374398699ac3fd802d98d642486cf6b0edc082a119c9c9c499945a0bc73e3413"; - }; - - buildInputs = [ readline nspr ]; - - postUnpack = "sourceRoot=\${sourceRoot}/src"; - - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.isi686 "pic"; - - makefileExtra = ./Makefile.extra; - makefile = "Makefile.ref"; - - patchPhase = - '' - cat ${makefileExtra} >> ${makefile} - sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile} - ''; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" - ''; - - makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1 JS_THREADSAFE=1"; - - meta = { - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/interpreters/spidermonkey/arm-flags.patch b/pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch index 721aff154e37..721aff154e37 100644 --- a/pkgs/development/interpreters/spidermonkey/arm-flags.patch +++ b/pkgs/development/interpreters/spidermonkey/1.8.5-arm-flags.patch diff --git a/pkgs/development/interpreters/spidermonkey/findvanilla.patch b/pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch index f6dab5497a0a..f6dab5497a0a 100644 --- a/pkgs/development/interpreters/spidermonkey/findvanilla.patch +++ b/pkgs/development/interpreters/spidermonkey/1.8.5-findvanilla.patch diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 582e7039d17c..3c5eef01db01 100644 --- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -1,11 +1,11 @@ -{ stdenv, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }: +{ stdenv, lib, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }: stdenv.mkDerivation rec { - version = "185-1.0.0"; name = "spidermonkey-${version}"; + version = "1.8.5"; src = fetchurl { - url = "mirror://mozilla/js/js${version}.tar.gz"; + url = "mirror://mozilla/js/js185-1.0.0.tar.gz"; sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687"; }; @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" export LIBXUL_DIST=$out - ${if stdenv.isArm then "autoreconf --verbose --force" else ""} + ${lib.optionalString stdenv.isArm "autoreconf --verbose --force"} ''; patches = stdenv.lib.optionals stdenv.isArm [ # Explained below in configureFlags for ARM - ./findvanilla.patch + ./1.8.5-findvanilla.patch # Fix for hard float flags. - ./arm-flags.patch + ./1.8.5-arm-flags.patch ]; patchFlags = "-p3"; diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.nix index a2ecfb2ef97a..a2ecfb2ef97a 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.nix diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.nix index 279528e9e83c..6e354c542963 100644 --- a/pkgs/development/interpreters/spidermonkey/24.2.nix +++ b/pkgs/development/interpreters/spidermonkey/24.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline }: +{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline, icu }: stdenv.mkDerivation rec { version = "24.2.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - buildInputs = [ pkgconfig perl python2 zip libffi readline ]; + buildInputs = [ pkgconfig perl python2 zip libffi readline icu ]; postPatch = '' # Fixes an issue with version detection under perl 5.22.x @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { "--libdir=$(lib)/lib" "--includedir=$(dev)/include" "--enable-threadsafe" + "--with-system-icu" "--with-system-nspr" "--with-system-ffi" "--enable-readline" diff --git a/pkgs/development/interpreters/spidermonkey/31.5.nix b/pkgs/development/interpreters/spidermonkey/31.nix index f52d526e3fa9..585ebc120d8e 100644 --- a/pkgs/development/interpreters/spidermonkey/31.5.nix +++ b/pkgs/development/interpreters/spidermonkey/31.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline }: +{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, nspr, icu, readline }: stdenv.mkDerivation rec { version = "31.5.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd"; }; - buildInputs = [ pkgconfig perl python2 zip libffi readline ]; + buildInputs = [ pkgconfig perl python2 zip libffi readline nspr icu ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-threadsafe" "--with-system-ffi" + "--with-system-nspr" + "--with-system-icu" "--enable-readline" # enabling these because they're wanted by 0ad. They may or may diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix new file mode 100644 index 000000000000..89c02f262001 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline, icu, zlib, nspr }: + +stdenv.mkDerivation rec { + version = "38.2.1.rc0"; + name = "spidermonkey-${version}"; + + # the release notes point to some guys home directory, see + # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38 + # probably it would be more ideal to pull a particular tag/revision + # from the mercurial repo + src = fetchurl { + url = "https://people.mozilla.org/~sstangl/mozjs-${version}.tar.bz2"; + sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681"; + }; + + buildInputs = [ pkgconfig perl python2 zip libffi readline icu zlib nspr ]; + + postUnpack = "sourceRoot=\${sourceRoot}/js/src"; + + preConfigure = '' + export CXXFLAGS="-fpermissive" + export LIBXUL_DIST=$out + export PYTHON="${python2.interpreter}" + ''; + + configureFlags = [ + "--enable-threadsafe" + "--with-system-ffi" + "--with-system-nspr" + "--with-system-zlib" + "--with-system-icu" + "--enable-readline" + + # enabling these because they're wanted by 0ad. They may or may + # not be good defaults for other uses. + "--enable-gcgenerational" + "--enable-shared-js" + ]; + + # This addresses some build system bug. It's quite likely to be safe + # to re-enable parallel builds if the source revision changes. + enableParallelBuilding = true; + + postFixup = '' + # The headers are symlinks to a directory that doesn't get put + # into $out, so they end up broken. Fix that by just resolving the + # symlinks. + for i in $(find $out -type l); do + cp --remove-destination "$(readlink "$i")" "$i"; + done + ''; + + meta = with stdenv.lib; { + description = "Mozilla's JavaScript engine written in C/C++"; + homepage = https://developer.mozilla.org/en/SpiderMonkey; + # TODO: MPL/GPL/LGPL tri-license. + + maintainers = [ maintainers.abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/interpreters/spidermonkey/Makefile.extra b/pkgs/development/interpreters/spidermonkey/Makefile.extra deleted file mode 100644 index a764cfc69cb6..000000000000 --- a/pkgs/development/interpreters/spidermonkey/Makefile.extra +++ /dev/null @@ -1,10 +0,0 @@ -install: $(PROGRAM) $(SHARED_LIBRARY) - mkdir -pv $(DIST)/{bin,lib} - mkdir -pv $(DIST)/include - cp -v $(PROGRAM) $(DIST)/bin - cp -v $(SHARED_LIBRARY) $(LIBRARY) $(DIST)/lib - cp -v $(JS_HFILES) $(API_HFILES) $(OTHER_HFILES) $(DIST)/include - mkdir -pv $(DIST)/include/js - find . -name '*.h' -exec cp '{}' $(DIST)/include/js ';' - find . -name '*.msg' -exec cp '{}' $(DIST)/include/js ';' - diff --git a/pkgs/development/interpreters/spidermonkey/default.nix b/pkgs/development/interpreters/spidermonkey/default.nix deleted file mode 100644 index 1fe4b90b2b80..000000000000 --- a/pkgs/development/interpreters/spidermonkey/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, readline }: - -stdenv.mkDerivation rec { - name = "spidermonkey-1.7"; - - src = fetchurl { - url = mirror://mozilla/js/js-1.7.0.tar.gz; - sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4"; - }; - - hardeningDisable = [ "format" ] - ++ stdenv.lib.optional stdenv.isi686 "stackprotector"; - - buildInputs = [ readline ]; - - postUnpack = "sourceRoot=\${sourceRoot}/src"; - - makefileExtra = ./Makefile.extra; - makefile = "Makefile.ref"; - - patchPhase = - '' - cat ${makefileExtra} >> ${makefile} - sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile} - ''; - - CFLAGS = "-DPIC -fPIC -DJS_C_STRINGS_ARE_UTF8"; - - makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1"; - - meta = with stdenv.lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"; - license = licenses.mpl20; - platforms = platforms.all; - }; -} |