From fc1e886f1b97d5eebd267a6bf7af2205a889b381 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 31 Mar 2016 16:05:23 +0200 Subject: php: 7.0.2 -> 7.0.5 (security) https://secure.php.net/ChangeLog-7.php#7.0.5 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index f15aed484519..fc8041b597b4 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -298,8 +298,8 @@ in { }; php70 = generic { - version = "7.0.2"; - sha256 = "0di2vallv5kry85l67za25nq4f2hjr8fad5j0c06nb69v7xpa6wv"; + version = "7.0.5"; + sha256 = "1s8xnnxwq5big2rnbp3w7zw7wh5d5ra9p2q9bxwylds5wrzsy29c"; }; } -- cgit 1.4.1 From 4cd54c5ce9ad608a3d7a2fbcd726565b5f8b6781 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Fri, 1 Apr 2016 01:51:00 +0100 Subject: jython: 2.7-rc3 -> 2.7.0 --- pkgs/development/interpreters/jython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index f9d6271e5d86..80661c3feb9e 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "jython-${version}"; - version = "2.7-rc3"; + version = "2.7.0"; src = fetchurl { url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar"; - sha256 = "89fcaf53f1bda6124f836065c1e318e2e853d5a9a1fbf0e96a387c6d38828c78"; + sha256 = "0sk4myh9v7ma7nmzb8khg41na77xfi2zck7876bs7kq18n8nc1nx"; }; buildInputs = [ makeWrapper ]; -- cgit 1.4.1 From 456ce674623e186ca026356635b3711c89e227d6 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Mon, 21 Mar 2016 19:19:32 -0500 Subject: Patch erlang-R17 Fix R17 build on OS X, modeling changes after R18, i.e. inherit Carbon, Cocoa. --- pkgs/development/interpreters/erlang/R17.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 19 +++++++++++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index e06b2741d35c..8096ca555a44 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper +, Carbon, Cocoa , odbcSupport ? false, unixODBC ? null , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null , javacSupport ? false, openjdk ? null @@ -27,9 +28,10 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) - ++ optional odbcSupport [ unixODBC ] - ++ optional javacSupport [ openjdk ]; + ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) + ++ optional odbcSupport unixODBC + ++ optional javacSupport openjdk + ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f583ac5cdec..d75963e066aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5231,10 +5231,21 @@ in erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { }; erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; }; - erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { }; - erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; }; - erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; }; - erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; }; + erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + odbcSupport = true; + }; + erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + javacSupport = true; + }; + erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + javacSupport = true; odbcSupport = true; + }; erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; -- cgit 1.4.1 From e549aad2f27b310e50cf592410e6d327b228ad58 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Sat, 2 Apr 2016 15:46:58 -0500 Subject: elixir: 1.2.3 -> 1.2.4 --- pkgs/development/interpreters/elixir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 3977b32bad70..a9854c7c4934 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "elixir-${version}"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "09s8469830s4070i0m04fxdhqimkdyc5k9jylm5vpfz9l3z4wvl8"; + sha256 = "16759ff84d08b480b7e5499716e663b2fffd26e20cf2863de5613bc7bb05c817"; }; buildInputs = [ erlang rebar makeWrapper ]; -- cgit 1.4.1 From 3dfe4297ae090f74b4cab1b4f33cf8e0ed236739 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 3 Apr 2016 14:10:35 +0100 Subject: racket: 6.3 -> 6.4 --- pkgs/development/interpreters/racket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 748482b1bf08..03d646a3b4d6 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -37,11 +37,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.3"; + version = "6.4"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "0f21vnads6wsrzimfja969gf3pkl60s0rdfrjf9s70lcy9x0jz4i"; + sha256 = "1qyzq91r1kzk2k0faggqd5idwmsxizkjbdgxn6ik9iwwsjycxbw6"; }; FONTCONFIG_FILE = fontsConf; -- cgit 1.4.1 From 8949de8cfda05158b56f3e9785017070edf8acdf Mon Sep 17 00:00:00 2001 From: Micxjo Funkcio Date: Sat, 2 Apr 2016 22:14:05 -0700 Subject: rakudo-star: 2015.11 -> 2016.01 Support for the JVM backend has been temporarily switched off as it's not fully functional yet and upstream recommends against using it. --- pkgs/development/interpreters/rakudo/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index cd1631e23a16..e1d1ccba4712 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, perl, jdk, icu, zlib, gmp, readline }: +{ stdenv, fetchurl, perl, icu, zlib, gmp, readline }: stdenv.mkDerivation rec { name = "rakudo-star-${version}"; - version = "2015.11"; + version = "2016.01"; src = fetchurl { url = "http://rakudo.org/downloads/star/${name}.tar.gz"; - sha256 = "1rzabg8daxf2g4l1njhdv3gfav91mp3y9my0mpz2xw06cxqfsjki"; + sha256 = "feb385c5d05166061f413882e442d3a0ec53884918768940d3f00bb63bc85497"; }; - buildInputs = [ icu zlib gmp readline jdk perl ]; + buildInputs = [ icu zlib gmp readline perl ]; configureScript = "perl ./Configure.pl"; configureFlags = - [ "--backends=moar,jvm" + [ "--backends=moar" "--gen-moar" "--gen-nqp" ]; -- cgit 1.4.1 From 106d0f6b513b4e54f94d347bf3b103f1433dcb56 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Mon, 4 Apr 2016 22:22:30 +0200 Subject: clisp: control build options and fix non x86* architectures --- pkgs/development/interpreters/clisp/default.nix | 65 +++++++++++++++++-------- 1 file changed, 45 insertions(+), 20 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 919c3771bc5d..c3d289d2a8d4 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -1,6 +1,27 @@ +# there are the following linking sets: +# - boot (not installed): without modules, only used when building clisp +# - base (default): contains readline and i18n, regexp and syscalls modules +# by default +# - full: contains base plus modules in withModules { stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11 , libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto -, libffi, libffcall, coreutils}: +, libffi, libffcall, coreutils +# build options +, threadSupport ? (stdenv.isi686 || stdenv.isx86_64) +, x11Support ? (stdenv.isi686 || stdenv.isx86_64) +, dllSupport ? true +, withModules ? [ + "bindings/glibc" + "pcre" + "rawsock" + "wildcard" + "zlib" + ] + ++ stdenv.lib.optional x11Support "clx/new-clx" +}: + +assert x11Support -> (libX11 != null && libXau != null && libXt != null + && libXpm != null && xproto != null && libXext != null && xextproto != null); stdenv.mkDerivation rec { v = "2.49"; @@ -13,11 +34,17 @@ stdenv.mkDerivation rec { inherit libsigsegv gettext coreutils; - buildInputs = - [ libsigsegv gettext ncurses readline libX11 libXau - libXt pcre zlib libXpm xproto libXext xextproto libffi - libffcall - ]; + buildInputs = [libsigsegv] + ++ stdenv.lib.optional (gettext != null) gettext + ++ stdenv.lib.optional (ncurses != null) ncurses + ++ stdenv.lib.optional (pcre != null) pcre + ++ stdenv.lib.optional (zlib != null) zlib + ++ stdenv.lib.optional (readline != null) readline + ++ stdenv.lib.optional (libffi != null) libffi + ++ stdenv.lib.optional (libffcall != null) libffcall + ++ stdenv.lib.optionals x11Support [ + libX11 libXau libXt libXpm xproto libXext xextproto + ]; patches = [ ./bits_ipctypes_to_sys_ipc.patch ]; # from Gentoo @@ -34,24 +61,23 @@ stdenv.mkDerivation rec { substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" "" ''; - configureFlags = - '' - --with-readline builddir --with-dynamic-ffi --with-ffcall - --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc - --with-module=pcre --with-module=rawsock --with-module=readline - --with-module=syscalls --with-module=wildcard --with-module=zlib - --with-threads=POSIX_THREADS - ''; + configureFlags = "builddir" + + stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules" + + stdenv.lib.optionalString (readline != null) " --with-readline" + + stdenv.lib.optionalString (libffi != null) " --with-dynamic-ffi" + + stdenv.lib.optionalString (libffcall != null) " --with-ffcall" + + stdenv.lib.concatMapStrings (x: " --with-module=" + x) withModules + + stdenv.lib.optionalString threadSupport " --with-threads=POSIX_THREADS"; preBuild = '' sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d cd builddir ''; - postInstall = '' - ./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full \ - clx/new-clx bindings/glibc pcre rawsock wildcard zlib - ''; + postInstall = + stdenv.lib.optionalString (withModules != []) + (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' + + stdenv.lib.concatMapStrings (x: " " + x) withModules); NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; @@ -61,8 +87,7 @@ stdenv.mkDerivation rec { meta = { description = "ANSI Common Lisp Implementation"; homepage = http://clisp.cons.org; - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = with stdenv.lib.maintainers; [raskin tohl]; platforms = stdenv.lib.platforms.linux; }; } - -- cgit 1.4.1