diff options
author | Robin Gloster <mail@glob.in> | 2016-04-03 11:01:57 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-04-03 11:01:57 +0000 |
commit | 696d85a62d8418e8b33f5f95b932b82706f8d338 (patch) | |
tree | 7afed180c5eb396a567c5a20a4a59859299c6f14 /pkgs/development/interpreters | |
parent | 5df521abdabe5d294811b9824a5839b1ebbd3127 (diff) | |
parent | b8755a4cdf8dd426ac642c006825d302dfe5f4b1 (diff) | |
download | nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.gz nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.bz2 nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.lz nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.xz nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.zst nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/elixir/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/R17.nix | 8 | ||||
-rw-r--r-- | pkgs/development/interpreters/jython/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/php/default.nix | 4 |
4 files changed, 11 insertions, 9 deletions
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 ]; 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/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 ]; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 6fe6b18e0bff..c890a3fc90f4 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -301,8 +301,8 @@ in { }; php70 = generic { - version = "7.0.2"; - sha256 = "0di2vallv5kry85l67za25nq4f2hjr8fad5j0c06nb69v7xpa6wv"; + version = "7.0.5"; + sha256 = "1s8xnnxwq5big2rnbp3w7zw7wh5d5ra9p2q9bxwylds5wrzsy29c"; }; } |