From f77fa09f568366630b582381d51756ed9f3fc6f3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 10 Feb 2012 05:22:58 +0000 Subject: [PATCH] v8: Get building on darwin svn path=/nixpkgs/trunk/; revision=32168 --- .../interpreters/ruby/generated.nix | 65 +++++++++++++++---- pkgs/development/libraries/v8/default.nix | 6 +- pkgs/development/web/nodejs/default.nix | 4 +- 3 files changed, 59 insertions(+), 16 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 92641f1ca44..4d46a06d7e1 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -16,9 +16,12 @@ g: # Get dependencies from patched gems builder = g.builder_3_0_0; buildr = g.buildr_1_4_6; bundler = g.bundler_1_0_21; - childprocess = g.childprocess_0_3_0; + childprocess = g.childprocess_0_3_1; + coffee_script = g.coffee_script_2_2_0; + coffee_script_source = g.coffee_script_source_1_2_0; diff_lcs = g.diff_lcs_1_1_3; erubis = g.erubis_2_7_0; + execjs = g.execjs_1_3_0; ffi = g.ffi_1_0_11; highline = g.highline_1_5_1; hike = g.hike_1_2_1; @@ -51,7 +54,7 @@ g: # Get dependencies from patched gems rspec_mocks = g.rspec_mocks_2_1_0; rubyforge = g.rubyforge_2_0_4; rubyzip = g.rubyzip_0_9_5; - sass = g.sass_3_1_13; + sass = g.sass_3_1_14; selenium_webdriver = g.selenium_webdriver_2_18_0; sprockets = g.sprockets_2_1_2; thor = g.thor_0_14_6; @@ -60,7 +63,7 @@ g: # Get dependencies from patched gems tzinfo = g.tzinfo_0_3_31; xml_simple = g.xml_simple_1_0_12; }; - gem_nix_args = [ ''autotest-rails'' ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; + gem_nix_args = [ ''autotest-rails'' ''buildr'' ''coffee-script'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; gems = { ZenTest_4_5_0 = { basename = ''ZenTest''; @@ -153,7 +156,7 @@ installed versions.''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; name = ''activesupport-3.2.1''; - requiredGems = [ g.i18n_0_6_0 g.multi_json_1_0_4 ]; + requiredGems = [ g.i18n_0_6_0 ]; sha256 = ''0ajkzsa7467jp7lxgjcsl94nqkvw9d0h492rypljs0f8f1fn744v''; }; arel_3_0_0 = { @@ -262,16 +265,44 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''0lcxz75vvgqib43wxzv6021qs5d7bxhnds4j4q27hzqs982cn0s6''; }; - childprocess_0_3_0 = { + childprocess_0_3_1 = { basename = ''childprocess''; meta = { description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; homepage = ''http://github.com/jarib/childprocess''; longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; }; - name = ''childprocess-0.3.0''; + name = ''childprocess-0.3.1''; requiredGems = [ g.ffi_1_0_11 ]; - sha256 = ''1bvx6nkc1m24wjjybk943x1vjr51c98l0pwj73hj1r237307jyb4''; + sha256 = ''0phkpxvwz88kgbi4d2akiqbppf374kn2rwf64hfs99p1j1ksbw5l''; + }; + coffee_script_2_2_0 = { + basename = ''coffee_script''; + meta = { + description = ''Ruby CoffeeScript Compiler''; + homepage = ''http://github.com/josh/ruby-coffee-script''; + longDescription = '' Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler. +''; + }; + name = ''coffee-script-2.2.0''; + requiredGems = [ g.coffee_script_source_1_2_0 g.execjs_1_3_0 ]; + sha256 = ''133cp4znfp44wwnv12myw8s0z6qws74ilqmw88iwzkshg689zpdc''; + }; + coffee_script_source_1_2_0 = { + basename = ''coffee_script_source''; + meta = { + description = ''The CoffeeScript Compiler''; + homepage = ''http://jashkenas.github.com/coffee-script/''; + longDescription = '' CoffeeScript is a little language that compiles into JavaScript. + Underneath all of those embarrassing braces and semicolons, + JavaScript has always had a gorgeous object model at its heart. + CoffeeScript is an attempt to expose the good parts of JavaScript + in a simple way. +''; + }; + name = ''coffee-script-source-1.2.0''; + requiredGems = [ ]; + sha256 = ''13cpmlj2m5lyxipdxmnajy12bzwmgc6g2n090gpa0wd5am7xvhkp''; }; diff_lcs_1_1_2 = { basename = ''diff_lcs''; @@ -332,6 +363,18 @@ is the MIT license.''; requiredGems = [ ]; sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3''; }; + execjs_1_3_0 = { + basename = ''execjs''; + meta = { + description = ''Run JavaScript code from Ruby''; + homepage = ''https://github.com/sstephenson/execjs''; + longDescription = '' ExecJS lets you run JavaScript code from Ruby. +''; + }; + name = ''execjs-1.3.0''; + requiredGems = [ g.multi_json_1_0_4 ]; + sha256 = ''1sski14wdzfljx2f9j7r09li3rxqwvink8n5v489ykw1sicg6l2s''; + }; ffi_1_0_11 = { basename = ''ffi''; meta = { @@ -819,7 +862,7 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''1744bds6lc46d1kjfgapf34p2574s70hcyz63877qkry4db2jb54''; }; - sass_3_1_13 = { + sass_3_1_14 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -830,9 +873,9 @@ See RDoc for a description of RDoc's markup and basic use.''; command line tool or a web-framework plugin. ''; }; - name = ''sass-3.1.13''; + name = ''sass-3.1.14''; requiredGems = [ ]; - sha256 = ''0x07yckw9c4d59713midk2n85d3h88fcp147p8nai88gbvrm8b63''; + sha256 = ''0nrgsrqkfn3w8bpqsq9h4jv5wj0wikn3mp0gb3b7qdzkhw0h9947''; }; selenium_webdriver_2_18_0 = { basename = ''selenium_webdriver''; @@ -842,7 +885,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; name = ''selenium-webdriver-2.18.0''; - requiredGems = [ g.rubyzip_0_9_5 g.childprocess_0_3_0 ]; + requiredGems = [ g.rubyzip_0_9_5 g.childprocess_0_3_1 ]; sha256 = ''17am2b6bjv62s02n1bfmhg9wz5n7sppzh7dx1llp28ivj2hdfbg9''; }; sprockets_2_1_2 = { diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 7024478afae..8aa342186c0 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -4,10 +4,10 @@ assert readline != null; let system = stdenv.system; - arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else ""; + arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else ""; version = "3.6.6.20"; in -assert system == "i686-linux" || system == "x86_64-linux"; +assert arch != ""; stdenv.mkDerivation rec { name = "v8-${version}"; src = fetchsvn { @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { cp -v libv8.* $out/lib cp -v d8 $out/bin/d8 cp -vR include $out/ - wrapProgram $out/bin/d8 --set LD_LIBRARY_PATH $out/lib + wrapProgram $out/bin/d8 --set ${if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} $out/lib ''; } diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 914b2cc26c3..9f48627e392 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, python, zlib, v8 }: stdenv.mkDerivation rec { - version = "0.6.9"; + version = "0.6.10"; name = "nodejs-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "484ab6b3da6195339544c16aff17f747aa85d1dd15d765d6724aa8a4ecda03ca"; + sha256 = "1mbbb3dy0hh5qahx7aqaj8cny0wm42d00c1m804r81y6afmn1l6i"; }; configureFlags = [