diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-28 11:55:54 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-28 11:55:54 +0000 |
commit | 66097104090e06c43a784193809bc8843a2ec052 (patch) | |
tree | 021d726cde3c2dec5d4341340b37589feef3b15c /pkgs/development/interpreters | |
parent | b4a3f99c7812a6c8bc34979200693b7010afffcc (diff) |
* Get rid of many instances of "args: with args;", and other coding
guidelines violations.
* Updated libsamplerate to 0.1.7.
svn path=/nixpkgs/trunk/; revision=22782
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/erlang/R13B.nix | 9 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/interpreters/groovy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/jruby/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/interpreters/php-xdebug/default.nix | 13 | ||||
-rw-r--r-- | pkgs/development/interpreters/pyrex/0.9.5.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/pyrex/0.9.6.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/spidermonkey/default.nix | 15 |
8 files changed, 40 insertions, 24 deletions
diff --git a/pkgs/development/interpreters/erlang/R13B.nix b/pkgs/development/interpreters/erlang/R13B.nix index 37b78942dad7..05c8e1331abf 100644 --- a/pkgs/development/interpreters/erlang/R13B.nix +++ b/pkgs/development/interpreters/erlang/R13B.nix @@ -1,18 +1,23 @@ -args: with args; +{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }: let version = "R13B"; in stdenv.mkDerivation { name = "erlang-" + version; + src = fetchurl { url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; sha256 = "112889v9axhrk9x9swcgql5kpj19p14504m06h4n7b99irzxf4rg"; }; - buildInputs = [perl gnum4 ncurses openssl]; + + buildInputs = [ perl gnum4 ncurses openssl ]; + patchPhase = '' 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 ''; + configureFlags = "--with-ssl=${openssl}"; } diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix index b11ef944c382..ec7438c23416 100644 --- a/pkgs/development/interpreters/erlang/default.nix +++ b/pkgs/development/interpreters/erlang/default.nix @@ -1,18 +1,23 @@ -args: with args; +{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }: let version = "R14A"; in stdenv.mkDerivation { name = "erlang-" + version; + src = fetchurl { url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz"; sha256 = "170n5p6al1bxwngdmafm1c6892xjxppb96gzgki9gfb0mla6li73"; }; - buildInputs = [perl gnum4 ncurses openssl]; + + buildInputs = [ perl gnum4 ncurses openssl ]; + patchPhase = '' 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 ''; + configureFlags = "--with-ssl=${openssl}"; } diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index b7dc135215cd..cc994aeea34b 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, unzip }: # at runtime, need jdk @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { phases = "unpackPhase installPhase"; - buildInputs = [unzip]; + buildInputs = [ unzip ]; meta = { description = "An agile dynamic language for the Java Platform"; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 3c0db6c6dcc4..d26ab6949344 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { name = "jruby-1.1.6"; @@ -7,12 +8,11 @@ stdenv.mkDerivation { sha256 = "1q3cjshxk484i8gqxm682bxcrps7205nl9vlim4s6z827bjlmc4a"; }; - buildInputs = []; installPhase = '' ensureDir $out; cp -r * $out ''; meta = { - description = "ruby interpreter written in Java"; - homepage = http://jruby.codehaus.org/; - license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those + description = "Ruby interpreter written in Java"; + homepage = http://jruby.codehaus.org/; + license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those }; } diff --git a/pkgs/development/interpreters/php-xdebug/default.nix b/pkgs/development/interpreters/php-xdebug/default.nix index 6fdeac2d24c5..74aba643ee7d 100644 --- a/pkgs/development/interpreters/php-xdebug/default.nix +++ b/pkgs/development/interpreters/php-xdebug/default.nix @@ -1,13 +1,14 @@ -args: with args; +{ stdenv, fetchurl, php, autoconf, automake }: + stdenv.mkDerivation { - name = "php-xdebug"; + name = "php-xdebug-2.0.5"; - src = args.fetchurl { + src = fetchurl { url = "http://xdebug.org/files/xdebug-2.0.5.tgz"; sha256 = "1cmq7c36gj8n41mfq1wba5rij8j77yqhydpcsbcysk1zchg68f26"; }; - buildInputs = [php autoconf automake]; + buildInputs = [ php autoconf automake ]; configurePhase = '' phpize @@ -25,10 +26,10 @@ stdenv.mkDerivation { ''; meta = { - description = "php debugger and profiler extension"; + description = "PHP debugger and profiler extension"; homepage = http://xdebug.org/; license = "xdebug"; # based on PHP-3 - maintainers = [stdenv.lib.maintainers.marcweber]; + maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 415ed78f117b..5ba57dbc1eab 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, builderDefs, python }: let diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 471532be2feb..cd2334156157 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, builderDefs, python }: let diff --git a/pkgs/development/interpreters/spidermonkey/default.nix b/pkgs/development/interpreters/spidermonkey/default.nix index 97b9115b756d..b63b38ebf29c 100644 --- a/pkgs/development/interpreters/spidermonkey/default.nix +++ b/pkgs/development/interpreters/spidermonkey/default.nix @@ -1,10 +1,11 @@ -args: with args; +{ stdenv, fetchurl, readline }: stdenv.mkDerivation rec { name = "spidermonkey-1.7"; + src = fetchurl { url = ftp://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz; - sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4"; + sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4"; }; buildInputs = [ readline ]; @@ -13,8 +14,12 @@ stdenv.mkDerivation rec { makefileExtra = ./Makefile.extra; makefile = "Makefile.ref"; - patchPhase = "cat ${makefileExtra} >> ${makefile}; - sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile}"; + + patchPhase = + '' + cat ${makefileExtra} >> ${makefile} + sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile} + ''; - makeFlags="-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1"; + makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1"; } |