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 | |
parent | b4a3f99c7812a6c8bc34979200693b7010afffcc (diff) | |
download | nixlib-66097104090e06c43a784193809bc8843a2ec052.tar nixlib-66097104090e06c43a784193809bc8843a2ec052.tar.gz nixlib-66097104090e06c43a784193809bc8843a2ec052.tar.bz2 nixlib-66097104090e06c43a784193809bc8843a2ec052.tar.lz nixlib-66097104090e06c43a784193809bc8843a2ec052.tar.xz nixlib-66097104090e06c43a784193809bc8843a2ec052.tar.zst nixlib-66097104090e06c43a784193809bc8843a2ec052.zip |
* 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')
70 files changed, 384 insertions, 435 deletions
diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix index 9cc012d917f1..779aa48c2d06 100644 --- a/pkgs/development/compilers/adobe-flex-sdk/default.nix +++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, unzip }: + stdenv.mkDerivation rec { name = "adobe-flex-sdk-4.0.0.14159-mpl"; @@ -8,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1x12sji6g42bm1h7jndkda5vpah6vnkpc13qwq0c4xvbsh8757v5"; }; - phases="installPhase"; + phases = "installPhase"; buildInputs = [ unzip ]; @@ -32,8 +33,8 @@ stdenv.mkDerivation rec { ''; meta = { - description = "flex sdk flash / action script developement kit"; - homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation"; - license = "MPLv1.1"; # Mozilla Public License Version 1.1 + description = "flex sdk flash / action script developement kit"; + homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation"; + license = "MPLv1.1"; # Mozilla Public License Version 1.1 }; } diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index fadc73c051ef..88f0ab910672 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -1,19 +1,20 @@ -args: with args; +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "fpc-2.4.0-binary"; - src = if stdenv.system == "i686-linux" then - fetchurl { - url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/i386-linux/fpc-2.4.0.i386-linux.tar"; - sha256 = "1zas9kp0b36zxqvb9i4idh2l0nb6qpmgah038l77w6las7ghh0dv"; - } - else if stdenv.system == "x86_64-linux" then - fetchurl { - url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/x86_64-linux/fpc-2.4.0.x86_64-linux.tar"; - sha256 = "111d11g5ra55hjywx64ldwwflpimsy8zryvap68v0309nyd23f0z"; - } - else null; + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/i386-linux/fpc-2.4.0.i386-linux.tar"; + sha256 = "1zas9kp0b36zxqvb9i4idh2l0nb6qpmgah038l77w6las7ghh0dv"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/x86_64-linux/fpc-2.4.0.x86_64-linux.tar"; + sha256 = "111d11g5ra55hjywx64ldwwflpimsy8zryvap68v0309nyd23f0z"; + } + else throw "Not supported on ${stdenv.system}."; builder = ./binary-builder.sh; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index ce1f101b4f56..ee2aa27a621b 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -1,8 +1,6 @@ -args: +{ stdenv, fetchurl, gawk }: -if args ? startFPC && args.startFPC != null then - -with args; +let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { version = "2.4.0"; @@ -13,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1m2g2bafjixbwl5b9lna5h7r56y1rcayfnbp8kyjfd1c1ymbxaxk"; }; - buildInputs = [startFPC gawk]; + buildInputs = [ startFPC gawk ]; preConfigure = - if system == "i686-linux" || system == "x86_64-linux" then '' + if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then '' sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas '' else ""; @@ -38,5 +36,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; } - -else (import ./default.nix (args // {startFPC = (import ./binary.nix args);})) diff --git a/pkgs/development/compilers/hugs/default.nix b/pkgs/development/compilers/hugs/default.nix index 4f3bbc6294be..db712b18d3fe 100644 --- a/pkgs/development/compilers/hugs/default.nix +++ b/pkgs/development/compilers/hugs/default.nix @@ -1,24 +1,26 @@ -args: with args; +{ composableDerivation, fetchurl }: + let edf = composableDerivation.edf; wwf = composableDerivation.wwf; in + composableDerivation.composableDerivation {} { - - name="hugs98"; + name = "hugs98"; src = fetchurl { - url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz; - sha256 = "3cf4d27673564cffe691bd14032369f646233f14daf2bc37c6c6df9f062b46b6"; + url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz; + sha256 = "3cf4d27673564cffe691bd14032369f646233f14daf2bc37c6c6df9f062b46b6"; }; - #encode all character I/O using the byte encoding - #determined by the locale in effect at that time. To - #require that the UTF-8 encoding is always used, give - #the --enable-char-encoding=utf8 option. - #[default=autodetect] + #encode all character I/O using the byte encoding + #determined by the locale in effect at that time. To + #require that the UTF-8 encoding is always used, give + #the --enable-char-encoding=utf8 option. + #[default=autodetect] postUnpack = '' find -type f | xargs sed -i 's@/bin/cp@cp@'; ''; - configurePhase="./configure --prefix=\$out --enable-char-encoding=utf8 $configureFlags"; + + configurePhase = "./configure --prefix=\$out --enable-char-encoding=utf8 $configureFlags"; flags = edf { name = "pathCanonicalization"; feat="path-canonicalization"; } @@ -39,16 +41,13 @@ composableDerivation.composableDerivation {} { cfg = { largeBannerSupport = true; # seems to be default - - - char = { cfgOption = "--enable-char-encoding"; blocks = "utf8"; }; - utf8 = { cfgOption = "--enable-char-encoding=utf8"; blocks="char"; }; - - }; + char = { cfgOption = "--enable-char-encoding"; blocks = "utf8"; }; + utf8 = { cfgOption = "--enable-char-encoding=utf8"; blocks="char"; }; + }; meta = { license = "as-is"; # gentoo is calling it this way.. - description = "The HUGS98 Haskell <interpreter"; + description = "The HUGS 98 Haskell interpreter"; homepage = http://www.haskell.org/hugs; }; } diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix index b2e7e131a817..4f7e9469bbf2 100644 --- a/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/pkgs/development/compilers/ocaml/3.08.0.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, x11 }: stdenv.mkDerivation { name = "ocaml-3.08.0"; diff --git a/pkgs/development/compilers/ocaml/3.09.1.nix b/pkgs/development/compilers/ocaml/3.09.1.nix deleted file mode 100644 index 6e9922ccc366..000000000000 --- a/pkgs/development/compilers/ocaml/3.09.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -args: with args; - -stdenv.mkDerivation { - name = "ocaml-3.09.1"; - builder = ./builder.sh; - src = fetchurl { - url = http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-3.09.1.tar.gz; - md5 = "c73f4b093e27ba5bf13d62923f89befc"; - }; - configureScript = ./configure-3.09.1; - dontAddPrefix = "True"; - configureFlags = ["-no-tk" "-x11lib" x11]; - buildFlags = ["world" "bootstrap" "opt"]; - checkTarget = ["opt.opt"]; - buildInputs = [x11 ncurses]; -} diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 8a8ddd7ee975..a77e5fdd0ac9 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, x11, ncurses }: stdenv.mkDerivation (rec { diff --git a/pkgs/development/compilers/ocaml/3.11.1.nix b/pkgs/development/compilers/ocaml/3.11.1.nix index c825830e43d9..e22db680577d 100644 --- a/pkgs/development/compilers/ocaml/3.11.1.nix +++ b/pkgs/development/compilers/ocaml/3.11.1.nix @@ -1,11 +1,12 @@ -args: with args; +{ stdenv, fetchurl, ncurses, x11 }: let - useX11 = (stdenv.system != "armv5tel-linux"); - useNativeCompilers = (stdenv.system != "armv5tel-linux"); + useX11 = stdenv.system != "armv5tel-linux"; + useNativeCompilers = stdenv.system != "armv5tel-linux"; inherit (stdenv.lib) optionals optionalString; in -stdenv.mkDerivation (rec { + +stdenv.mkDerivation rec { name = "ocaml-3.11.1"; @@ -49,4 +50,4 @@ stdenv.mkDerivation (rec { ''; }; -}) +} diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 3f8247861190..3e11c2303111 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl }: # at runtime, need jre or jdk 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"; } diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index bd7b66f21a19..1821d746ac4e 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, SDL, libogg, libvorbis }: stdenv.mkDerivation rec { pname = "SDL_mixer"; diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index 6c8c79d701c1..cbca42ef5df8 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { pname = "SDL_net"; diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index 29c1df93a50f..591a4bfbd6dd 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, SDL, freetype }: stdenv.mkDerivation { name = "SDL_ttf-2.0.9"; diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix index b54680b3d3f6..1bccf32b0f05 100644 --- a/pkgs/development/libraries/audio/vamp/default.nix +++ b/pkgs/development/libraries/audio/vamp/default.nix @@ -1,6 +1,8 @@ # set VAMP_PATH ? # plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) -args: with args; + +{ stdenv, fetchurl, pkgconfig, libsndfile }: + rec { vampSDK = stdenv.mkDerivation { @@ -17,8 +19,8 @@ rec { description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; homepage = http://sourceforge.net/projects/vamp; license = "BSD"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; }; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index d00e3f67f3cc..2464a09f51aa 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,17 +1,16 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl }: + +stdenv.mkDerivation { name = "babl-0.0.22"; - src = args.fetchurl { + src = fetchurl { url = ftp://ftp.gtk.org/pub/babl/0.0/babl-0.0.22.tar.bz2; sha256 = "0v8gbf9si4sd06199f8lfmrsbvi6i0hxphd34kyvsj6g2kkkg10s"; }; - buildInputs =(with args; []); - meta = { - description = "image pixel format coneversion libraray"; - homepage = http://gegl.org/babl/; - license = "GPL3"; + description = "Image pixel format conversion library"; + homepage = http://gegl.org/babl/; + license = "GPL3"; }; } diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index 54bf2331bf7e..419215a45a5b 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig }: + stdenv.mkDerivation { name = "boolstuff-0.1.12"; @@ -7,13 +8,13 @@ stdenv.mkDerivation { sha256 = "0h39civar6fjswaf3bn1r2ddj589rya0prd6gzsyv3qzr9srprq9"; }; - buildInputs = [pkgconfig]; + buildInputs = [ pkgconfig ]; meta = { - description = "operations on boolean expression binary trees"; + description = "Library for operations on boolean expression binary trees"; homepage = http://perso.b2b2c.ca/sarrazip/dev/boolstuff.html; license = "GPL"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 5424e7a73def..11b8fba8b049 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, openssl, pkgconfig, libgcrypt, commoncpp2 }: + stdenv.mkDerivation { name = "ccrtp-1.7.1"; @@ -7,13 +8,13 @@ stdenv.mkDerivation { sha256 = "0psi91r0fgawpa5x4jiq7lkr180agdi25gi0mfriqcmykxg7r1jn"; }; - buildInputs = [openssl pkgconfig libgcrypt commoncpp2]; + buildInputs = [ openssl pkgconfig libgcrypt commoncpp2 ]; meta = { description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"; homepage = "http://www.gnu.org/software/ccrtp/"; license = "GPLv2"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix index c30166d015c5..950fe1baf089 100644 --- a/pkgs/development/libraries/ctl/default.nix +++ b/pkgs/development/libraries/ctl/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, ilmbase }: + stdenv.mkDerivation { name = "ctl-1.4.1"; @@ -7,8 +8,12 @@ stdenv.mkDerivation { sha256 = "16lzgbpxdyhykdwndj1i9vx3h4bfkxqqcrvasvgg70gb5raxj0mj"; }; - propagatedBuildInputs = [ilmbase]; - configureFlags="--with-ilmbase-prefix=${ilmbase}"; + patches = [ ./patch.patch ]; + + propagatedBuildInputs = [ ilmbase ]; + + configureFlags = "--with-ilmbase-prefix=${ilmbase}"; + #configurePhase = " #export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\" #echo $CXXFLAGS @@ -16,10 +21,9 @@ stdenv.mkDerivation { #"; meta = { - description = "Color Transformation Language"; - homepage = http://ampasctl.sourceforge.net; - license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this? + description = "Color Transformation Language"; + homepage = http://ampasctl.sourceforge.net; + license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this? }; - patches = [ ./patch.patch ]; } diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index d1c0a825dea3..f133217b202a 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -1,19 +1,20 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl, autoconf, automake, libtool }: + +stdenv.mkDerivation { name = "faac-1.26"; - src = args.fetchurl { + src = fetchurl { url = http://downloads.sourceforge.net/faac/faac-1.26.tar.gz; sha256 = "0ld9d8mn3yp90japzkqkicmjcggi7d8y9gn7cl1jdsb74bif4j2b"; }; preConfigure = "./bootstrap"; - buildInputs =(with args; [autoconf automake libtool]); + buildInputs = [ autoconf automake libtool ]; meta = { - description="open source MPEG-4 and MPEG-2 AAC encoder"; - homepage = http://www.audiocoding.com/faac.html; - license = "LGPL"; + description = "Open source MPEG-4 and MPEG-2 AAC encoder"; + homepage = http://www.audiocoding.com/faac.html; + license = "LGPL"; }; } diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 0af3e4f55379..81474b62dc6f 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -1,18 +1,16 @@ -args: -args.stdenv.mkDerivation rec { +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { name = "fcgi-2.4.0"; - src = args.fetchurl { - name = name + ".tar.gz"; + src = fetchurl { url = http://www.fastcgi.com/dist/fcgi.tar.gz; sha256 = "1f857wnl1d6jfrgfgfpz3zdaj8fch3vr13mnpcpvy8bang34bz36"; }; - buildInputs =(with args; []); - meta = { - description = "FastCGI is a language independent, scalable, open extension to CG"; - homepage = http://www.fastcgi.com/; - license = "FastCGI see LICENSE.TERMS"; + description = "FastCGI is a language independent, scalable, open extension to CG"; + homepage = http://www.fastcgi.com/; + license = "FastCGI see LICENSE.TERMS"; }; } diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 79356b31b7e7..6c506df3f89f 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, python, pkgconfig, glib }: stdenv.mkDerivation rec { name = "gamin-0.1.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0fgjfyr0nlkpdxj94a4qfm82wypljdyv1b6l56v7i9jdx0hcdqhr"; }; - buildInputs = [python pkgconfig glib]; + buildInputs = [ python pkgconfig glib ]; # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from # <sys/socket.h> with Glibc 2.9. diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index d3df5ce58d6a..dde953643379 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,18 +1,15 @@ -args: with args; - -let inherit (args.composableDerivation) composableDerivation edf wwf; in - -composableDerivation {} ( fixed : { +{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib +, postgresql, mysql, libgeotiff }: +composableDerivation.composableDerivation {} (fixed: { name = "gdal-1.7.1"; - src = fetchurl { url = ftp://ftp.remotesensing.org/gdal/gdal171.zip; md5 = "f5592cff69b239166c9b64ff81943b1a"; }; - buildInputs = [unzip libjpeg]; + buildInputs = [ unzip libjpeg ]; # don't use optimization for gcc >= 4.3. That's said to be causeing segfaults preConfigure = "export CFLAGS=-O0; export CXXFLAGS=-O0"; @@ -27,78 +24,11 @@ composableDerivation {} ( fixed : { "--with-geotiff=${libgeotiff}" ]; - /* TODO - # --with-grass=ARG Include GRASS support (GRASS 5.7+, ARG=GRASS install tree dir) - # --with-libgrass=ARG Include GRASS support based on libgrass (GRASS 5.0+) - --with-cfitsio=ARG Include FITS support (ARG=no or libcfitsio path) - --with-pcraster=ARG Include PCRaster (libcsf) support (ARG=internal, no or path) - --with-netcdf=ARG Include netCDF support (ARG=no or netCDF tree prefix) - --with-png=ARG Include PNG support (ARG=internal, no or path) - --with-pcidsk=ARG Path to external PCIDSK SDK, or internal (default), or old - --with-libtiff=ARG Libtiff library to use (ARG=internal, yes or path) - --with-jpeg=ARG Include JPEG support (ARG=internal, no or path) - --without-jpeg12 Disable JPEG 8/12bit TIFF support - --with-gif=ARG Include GIF support (ARG=internal, no or path) - --with-ogdi=ARG Include OGDI support (ARG=path) - --with-fme=ARG Include FMEObjects support (ARG=FME_HOME path) - --with-hdf4=ARG Include HDF4 support (ARG=path) - --with-hdf5=ARG Include HDF5 support (ARG=path) - --with-jasper=ARG Include JPEG-2000 support via JasPer library (ARG=path) - --with-ecw=ARG Include ECW support (ARG=ECW SDK Path, yes or no) - --with-kakadu=ARG Include Kakadu/JPEG2000 support - --with-mrsid=ARG Include MrSID support (ARG=path to MrSID DSDK or no) - --with-jp2mrsid=ARG Enable MrSID JPEG2000 support (ARG=yes/no) - --with-msg=ARG Enable MSG driver (ARG=yes or no) - --without-bsb Disable BSB driver (legal issues pending - --with-oci=[ARG] use Oracle OCI API from given Oracle home - (ARG=path); use existing ORACLE_HOME (ARG=yes); - disable Oracle OCI support (ARG=no) - --with-oci-include=[DIR] - use Oracle OCI API headers from given path - --with-oci-lib=[DIR] use Oracle OCI API libraries from given path - --without-grib Disable GRIB driver - --without-ogr Don't build OGR into shared library - --with-ingres=ARG Include Ingres (ARG=$II_SYSTEM) - --with-xerces=[ARG] use Xerces C++ Parser from given prefix (ARG=path); - check standard prefixes (ARG=yes); disable (ARG=no) - --with-xerces-inc=[DIR] path to Xerces C++ Parser headers - --with-xerces-lib=[ARG] link options for Xerces C++ Parser libraries - --with-expat=[ARG] use Expat XML Parser from given prefix (ARG=path); - check standard prefixes (ARG=yes); disable (ARG=no) - --with-expat-inc=[DIR] path to Expat XML Parser headers - --with-expat-lib=[ARG] link options for Expat XML Parser libraries - --with-odbc=ARG Include ODBC support (ARG=no or path) - --with-dods-root=ARG Include DODS support (ARG=no or absolute path) - --with-curl=ARG Include curl (ARG=path to curl-config.) - --with-spatialite=ARG Include SpatiaLite support (ARG=no or path) - --with-sqlite3=[ARG] use SQLite 3 library [default=yes], optionally - specify the prefix for sqlite3 library - --with-dwgdirect=path Include DWG direct support - --with-dwg-plt=platform DWGdirect Platform, defaults to lnxX86 - --with-idb=DIR Include Informix DataBlade support (DIR points to Informix root) - --with-sde=DIR Include ESRI SDE support (DIR is SDE's install dir). - --with-sde-version=VERSION NUMBER Set ESRI SDE version number (Default is 80). - --without-vfk Disable VFK support - --with-epsilon=ARG Include EPSILON support (ARG=no, yes or libepsilon install root path) - --with-geos=ARG Include GEOS support (ARG=yes, no or geos-config - path) - --without-pam Disable PAM (.aux.xml) support - --with-static-proj4=ARG Compile with PROJ.4 statically (ARG=no or path) - --with-gdal-ver=ARG Override GDAL version - --with-macosx-framework Build and install GDAL as a Mac OS X Framework - --with-perl Enable perl bindings - --with-php Enable php bindings - --with-ruby Enable Ruby bindings - --with-python Enable python bindings - --with-pymoddir=ARG Override Old-gen Python package install dir - - */ - meta = { - description = "translator library for raster geospatial data formats"; + description = "Translator library for raster geospatial data formats"; homepage = http://www.gdal.org/; license = "X/MIT"; - maintainers = [stdenv.lib.maintainers.marcweber]; + maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index 56b51d71ca62..f87211195d52 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -1,17 +1,16 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl }: + +stdenv.mkDerivation { name = "gmm-3.0"; - src = args.fetchurl { + src = fetchurl { url = http://download.gna.org/getfem/stable/gmm-3.0.tar.gz; sha256 = "1lc34w68s0rhii6caklvq2pyc3jaa4g6kza948ya8ha6rr8d1ypp"; }; - buildInputs =(with args; []); - meta = { - description = "generic C++ template library for sparse, dense and skyline matrices"; - homepage = http://home.gna.org/getfem/gmm_intro.html; - license = "LGLP2.1"; # or later + description = "Generic C++ template library for sparse, dense and skyline matrices"; + homepage = http://home.gna.org/getfem/gmm_intro.html; + license = "LGLP2.1"; # or later }; } diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix index 36b74a1980e0..6dea424075df 100644 --- a/pkgs/development/libraries/ilbc/default.nix +++ b/pkgs/development/libraries/ilbc/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, msilbc }: stdenv.mkDerivation { name = "ilbc-rfc3951"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = stdenv.mkDerivation { name = "ilbc-rfc3951.tar.gz"; src = msilbc.src; - outputHashAlgo = "sha256"; + outputHashAlgo = "sha256"; outputHash = "0f6scsp72bz2ifscd8c0x57ipcxi2i4a9b4nwlnwx7a7a0hrazhj"; phases = "unpackPhase installPhase"; installPhase = "cp ilbc-rfc3951.tar.gz \${out}"; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index f289dd8ee0ff..c038adf632f2 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,10 +1,12 @@ -args: with args; +{ stdenv, fetchurl, x11, libjpeg, libtiff, libungif, libpng, bzip2 }: stdenv.mkDerivation { name = "imlib2-1.3.0"; + src = fetchurl { url = mirror://sourceforge/enlightenment/imlib2-1.3.0.tar.gz; sha256 = "1lrg7haqhmzpdb14cgp9vny5fanlwlyhf5n017v130in297gv1qj"; }; - buildInputs = [x11 libjpeg libtiff libungif libpng bzip2]; + + buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ]; } diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 4c7cbb4e6916..0dbab1a7ac40 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, cfitsio, libusb, zlib }: + stdenv.mkDerivation { name = "indilib-0.5"; @@ -7,7 +8,7 @@ stdenv.mkDerivation { sha256 = "02km37m3d2l8c9wnab24zm2k6a3l8h2fali74jhm4z3khwr277ad"; }; - propagatedBuildInputs = [cfitsio libusb zlib]; + propagatedBuildInputs = [ cfitsio libusb zlib ]; meta = { homepage = http://indi.sf.net; diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 46fe5b6ef033..9b45dbb91ec8 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -1,34 +1,35 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation rec{ - name = "iniparser-3.0b"; + name = "iniparser-3.0b"; - src = fetchurl { - url = "${meta.homepage}/iniparser3.0b.tar.gz"; - sha256 = "09klyddnqlpbgkv4cmh6ww9q5pv6nf1vfmzw4z256p51rnnlqqwa"; - }; + src = fetchurl { + url = "${meta.homepage}/iniparser3.0b.tar.gz"; + sha256 = "09klyddnqlpbgkv4cmh6ww9q5pv6nf1vfmzw4z256p51rnnlqqwa"; + }; - patches = ./no-usr.patch; + patches = ./no-usr.patch; - buildFlags = "libiniparser.so"; + buildFlags = "libiniparser.so"; - installPhase = '' - ensureDir $out/lib - cp libiniparser.so.0 $out/lib - ln -s libiniparser.so.0 $out/lib/libiniparser.so + installPhase = '' + ensureDir $out/lib + cp libiniparser.so.0 $out/lib + ln -s libiniparser.so.0 $out/lib/libiniparser.so - ensureDir $out/include - cp src/*.h $out/include + ensureDir $out/include + cp src/*.h $out/include - ensureDir $out/share/doc/${name} - for i in AUTHORS INSTALL LICENSE README; do - bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2; - done; - cp -r html $out/share/doc/${name} - ''; + ensureDir $out/share/doc/${name} + for i in AUTHORS INSTALL LICENSE README; do + bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2; + done; + cp -r html $out/share/doc/${name} + ''; - meta = { - homepage = http://ndevilla.free.fr/iniparser; - description = "Free standalone ini file parsing library"; - license = "MIT"; - }; + meta = { + homepage = http://ndevilla.free.fr/iniparser; + description = "Free standalone ini file parsing library"; + license = "MIT"; + }; } diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index 672ca202354f..07753c864030 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig, libraw1394 }: + stdenv.mkDerivation { name = "libavc1394-0.5.3"; @@ -7,12 +8,12 @@ stdenv.mkDerivation { sha256 = "19i40i3722ilhziknfds3a6w5xzv66fvc68gvbir1p2fvwi6ij93"; }; - buildInputs = [pkgconfig]; - propagatedBuildInputs = [libraw1394]; + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ libraw1394 ]; meta = { - description = "programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"; - homepage = http://sourceforge.net/projects/libavc1394/; - license = [ "GPL" "LGPL" ]; + description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"; + homepage = http://sourceforge.net/projects/libavc1394/; + license = [ "GPL" "LGPL" ]; }; } diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix index 69011a6ef97e..3213c0634ba2 100644 --- a/pkgs/development/libraries/libdv/default.nix +++ b/pkgs/development/libraries/libdv/default.nix @@ -1,6 +1,8 @@ -args: with args; -let inherit (args.composableDerivation) composableDerivation edf; in -composableDerivation {} { +{ composableDerivation, fetchurl }: + +let inherit (composableDerivation) edf; in + +composableDerivation.composableDerivation {} { flags = { } # TODO! implement flags @@ -14,15 +16,13 @@ composableDerivation {} { name = "libdv-1.0.0"; - src = args.fetchurl { + src = fetchurl { url = mirror://sourceforge/libdv/libdv-1.0.0.tar.gz; sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3"; }; meta = { - description = "software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards"; + description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards"; homepage = http://sourceforge.net/projects/libdv/; - # you can choose one of the following licenses: - license = []; }; } diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 76434d2c30bd..7c2c9129c266 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { name = "libexif-0.6.16"; @@ -8,5 +8,5 @@ stdenv.mkDerivation rec { sha256 = "0hxc3aik3sn8xq4mbmxxb8ycx2lwffmhi5xvz0zjffhfwkaqas6v"; }; - buildInputs = [gettext]; + buildInputs = [ gettext ]; } diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 16272ebeb2b2..920f40abd5ab 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, libtiff }: + stdenv.mkDerivation { name = "libgeotiff-1.2.4"; @@ -7,10 +8,10 @@ stdenv.mkDerivation { sha256 = "0z2yx77pm0zs81hc0b4lwzdd5s0rxcbylnscgq80b649src1fyzj"; }; - buildInputs = [libtiff]; + buildInputs = [ libtiff ]; meta = { - description = "library implementing attempt to create a tiff based interchange format for georeferenced raster imagery"; + description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery"; homepage = http://www.remotesensing.org/geotiff/geotiff.html; license = "X11"; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 51c06c0382b0..ff22d1d032bd 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, zlib, libpng }: + stdenv.mkDerivation { name = "haru-2.1.0"; @@ -9,13 +10,13 @@ stdenv.mkDerivation { configureFlags = "--with-zlib=${zlib} --with-png=${libpng}"; - buildInputs = [zlib libpng]; + buildInputs = [ zlib libpng ]; meta = { description = "cross platform, open source library for generating PDF files"; homepage = http://libharu.org/wiki/Main_Page; license = "ZLIB/LIBPNG"; # see README. - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index a2590a7de3f6..d13376042603 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig, libraw1394 }: + stdenv.mkDerivation rec { version = "1.2.0"; name = "libiec61883-${version}"; @@ -9,12 +10,12 @@ stdenv.mkDerivation rec { sha256 = "7c7879c6b9add3148baea697dfbfdcefffbc8ac74e8e6bcf46125ec1d21b373a"; }; - buildInputs = [pkgconfig]; - propagatedBuildInputs = [libraw1394]; + buildInputs = [ pkgconfig ]; + + propagatedBuildInputs = [ libraw1394 ]; meta = { - description = "TODO"; - homepage = http://www.linux1394.org; - license = "LGPL"; - }; + homepage = http://www.linux1394.org; + license = "LGPL"; + }; } diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index eb574fbc8c88..c65c62eaca7c 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms, automake, autoconf, libtool }: + stdenv.mkDerivation { name = "libmng-1.0.10"; @@ -7,18 +8,15 @@ stdenv.mkDerivation { sha256 = "06415s40gz833s1v1q7c04c0m49p4sc87ich0vpdid2ldj0pf53v"; }; - preConfigure = " - unmaintained/autogen.sh - #cp makefiles/makefile.linux Makefile - "; + preConfigure = "unmaintained/autogen.sh"; - buildInputs = [zlib libpng libjpeg lcms automake autoconf libtool]; + buildInputs = [ zlib libpng libjpeg lcms automake autoconf libtool ]; meta = { - description = "THE reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; + description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; homepage = http://sourceforge.net/projects/libmng; license = "zlib/libpng"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index e2d1c25d013d..e24a93c10439 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libnova-0.12.1"; diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix index 2ca8c543fa95..a910d11f4108 100644 --- a/pkgs/development/libraries/libraw1394/default.nix +++ b/pkgs/development/libraries/libraw1394/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation rec { name = "libraw1394-1.3.0"; @@ -8,8 +9,8 @@ stdenv.mkDerivation rec { }; meta = { - description = "library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface"; - homepage = "http://www.linux1394.org"; - license = ["GPL" "LGPL"]; + description = "Library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface"; + homepage = http://www.linux1394.org; + license = ["GPL" "LGPL"]; }; } diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 05ffb27bc0a4..e02cedeeab3c 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig, librdf_raptor, ladspaH, openssl, zlib }: + stdenv.mkDerivation { name = "liblrdf-0.4.0"; @@ -7,13 +8,13 @@ stdenv.mkDerivation { sha256 = "015jv7pp0a0qxgljgdvf7d01nj4fx0zgzg0wayjp7v86pa38xscm"; }; - buildInputs = [pkgconfig librdf_raptor ladspaH openssl zlib]; + buildInputs = [ pkgconfig librdf_raptor ladspaH openssl zlib ]; meta = { description = "A lightweight RDF library with special support for LADSPA plugins."; homepage = http://sourceforge.net/projects/lrdf/; license = "GPLv2"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index 0ddb45be30c2..738369e796a7 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, libxml2, curl }: + stdenv.mkDerivation rec { name = "raptor-1.4.21"; @@ -7,15 +8,13 @@ stdenv.mkDerivation rec { sha256 = "db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca"; }; - buildInputs = [ - #optional - libxml2 curl]; + buildInputs = [ libxml2 curl ]; meta = { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; license = "LGPL-2.1 Apache-2.0"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index ee99a173b6f6..681453985b97 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, librdf_raptor, gmp, pkgconfig, pcre, libxml2 }: + stdenv.mkDerivation rec { name = "rasqal-0.9.19"; @@ -7,23 +8,17 @@ stdenv.mkDerivation rec { sha256 = "a042846e8b7af52d9d66fba788c9d579e58c535cfaf80d33dc0bd69bf6ffeb08"; }; - buildInputs = [ - librdf_raptor - gmp /*or mpfr*/ - pkgconfig - #optional - pcre libxml2 - ]; + buildInputs = [ librdf_raptor gmp /*or mpfr*/ pkgconfig pcre libxml2 ]; preConfigure = '' export NIX_LDFLAGS="$NIX_LDFLAGS -lraptor" ''; meta = { - description = "library that handles Resource Description Framework (RDF)"; + description = "Library that handles Resource Description Framework (RDF)"; homepage = "http://librdf.org/rasqal"; license = "LGPL-2.1 Apache-2.0"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index a30a2884c6a3..911145c5b748 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -1,23 +1,23 @@ -args: with args; -stdenv.mkDerivation { +{ stdenv, fetchurl }: - name = "libsamplerate-0.1.2"; +stdenv.mkDerivation rec { + name = "libsamplerate-0.1.7"; - src = args.fetchurl { - url = http://www.mega-nerd.com/SRC/libsamplerate-0.1.2.tar.gz; + src = fetchurl { + url = "http://www.mega-nerd.com/SRC/${name}.tar.gz"; sha256 = "1m1iwzpcny42kcqv5as2nyb0ggrb56wzckpximqpp2y74dipdf4q"; }; - - buildInputs = ["pkgconfig"]; # maybe interesting configure flags: #--disable-fftw disable usage of FFTW #--disable-cpu-clip disable tricky cpu specific clipper - configurePhase = " - export LIBSAMPLERATE_CFLAGS=\"-I \$libsamplerate/include\" - export LIBSAMPLERATE_LIBS=\"-L \$libsamplerate/libs\" - ./configure --prefix=\$out"; + configurePhase = + '' + export LIBSAMPLERATE_CFLAGS="-I $libsamplerate/include" + export LIBSAMPLERATE_LIBS="-L $libsamplerate/libs" + ./configure --prefix=$out + ''; meta = { description = "Sample Rate Converter for audio"; diff --git a/pkgs/development/libraries/libsigsegv/2.5.nix b/pkgs/development/libraries/libsigsegv/2.5.nix index 9dd50c37c613..ba11e0752b2d 100644 --- a/pkgs/development/libraries/libsigsegv/2.5.nix +++ b/pkgs/development/libraries/libsigsegv/2.5.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libsigsegv-2.5"; diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index 7f7d76931824..95740882a93c 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, zlib, imagemagick, libpng, pkgconfig, glib, freetype +, libjpeg, libxml2 }: stdenv.mkDerivation { name = "libwmf-0.2.8.4"; @@ -8,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v"; }; - buildInputs = [zlib imagemagick libpng pkgconfig glib freetype libjpeg libxml2]; + buildInputs = [ zlib imagemagick libpng pkgconfig glib freetype libjpeg libxml2 ]; meta = { description = "WMF library from wvWare"; diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix index 857197ea0c1b..1754539a5f17 100644 --- a/pkgs/development/libraries/libzrtpcpp/default.nix +++ b/pkgs/development/libraries/libzrtpcpp/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, commoncpp2, openssl, pkgconfig, ccrtp }: stdenv.mkDerivation rec { name = "libzrtpcpp-1.4.1"; @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { sha256 = "0gj5xiv15xnxdbppa06fy02j8jg0zm1capva4nhbpgzg08n7p8y0"; }; - buildInputs = [commoncpp2 openssl pkgconfig ccrtp]; + buildInputs = [ commoncpp2 openssl pkgconfig ccrtp ]; meta = { description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP"; license = "GPLv2"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/openalSoft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index f0bce75e07a3..59851eda25aa 100644 --- a/pkgs/development/libraries/openalSoft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, cmake, alsaLib }: + stdenv.mkDerivation { #The current release is still in a testing phase, though it should be stable # (neither the ABI or API will break). Please try it out and let me know how it @@ -11,11 +12,11 @@ stdenv.mkDerivation { sha256 = "162nyv4jy6qzi7s5q3wpdawfph6npyn1n4wjf21haxdxq0mmp6l7"; }; - buildInputs = [cmake alsaLib]; + buildInputs = [ cmake alsaLib ]; meta = { - description = "openal alternative"; - homepage = http://kcat.strangesoft.net/openal.html; - license = "GPL2"; + description = "OpenAL alternative"; + homepage = http://kcat.strangesoft.net/openal.html; + license = "GPL2"; }; } diff --git a/pkgs/development/libraries/proj.4/default.nix b/pkgs/development/libraries/proj/default.nix index ffb3bed5054d..6e3cc7cac55c 100644 --- a/pkgs/development/libraries/proj.4/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { name = "proj-4.5.0"; @@ -8,8 +9,8 @@ stdenv.mkDerivation { }; meta = { - description = "Cartographic Projections Library"; - homepage = http://proj.maptools.org; - license = "MIT"; + description = "Cartographic Projections Library"; + homepage = http://proj.maptools.org; + license = "MIT"; }; } diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index 631a76224062..be219f1f2881 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -1,14 +1,15 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation rec { - name = "pth-2.0.7"; - - src = fetchurl { - url = "mirror://gnu/pth/${name}.tar.gz"; - sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; - }; + name = "pth-2.0.7"; + + src = fetchurl { + url = "mirror://gnu/pth/${name}.tar.gz"; + sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; + }; - meta = { - description = "The GNU Portable Threads"; - homepage = http://www.gnu.org/software/pth; - }; + meta = { + description = "The GNU Portable Threads library"; + homepage = http://www.gnu.org/software/pth; + }; } diff --git a/pkgs/development/libraries/readline/readline5.nix b/pkgs/development/libraries/readline/readline5.nix index a36d7870cc21..c208d5b9fe6b 100644 --- a/pkgs/development/libraries/readline/readline5.nix +++ b/pkgs/development/libraries/readline/readline5.nix @@ -1,11 +1,14 @@ -args: with args; +{ stdenv, fetchurl, ncurses }: stdenv.mkDerivation { name = "readline-5.2"; + src = fetchurl { url = mirror://gnu/readline/readline-5.2.tar.gz; sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j"; }; + propagatedBuildInputs = [ncurses]; + patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch; } diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix index cb18a8509bf0..f9de62e7cfa9 100644 --- a/pkgs/development/libraries/science/biology/biolib/default.nix +++ b/pkgs/development/libraries/science/biology/biolib/default.nix @@ -1,8 +1,10 @@ -args: with args; +{ stdenv, fetchurl, cmake, rLang, zlib }: stdenv.mkDerivation rec { name = "biolib"; + version = "0.0.1"; + src = fetchurl { url = "http://bio3.xparrot.eu/download/nix-biology/biolib-${version}.tar.gz"; sha256 = "1la639rs0v4f3ayvarqv0yxwlnwn188bb1v71d2ybw1xr6gdy688"; @@ -11,11 +13,14 @@ stdenv.mkDerivation rec { buildInputs = [cmake rLang zlib]; meta = { - description = "BioLib"; - longDescription = ''BioLib brings together a set of opensource libraries -written in C/C++ and makes them available for major Bio* languages: BioPerl, -BioRuby, BioPython''; - license = "GPL2"; - homepage = http://biolib.open-bio.org/; + description = "BioLib"; + longDescription = + '' + BioLib brings together a set of opensource libraries written + in C/C++ and makes them available for major Bio* languages: + BioPerl, BioRuby, BioPython + ''; + license = "GPL2"; + homepage = http://biolib.open-bio.org/; }; } diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 5d9167d00ecd..e2d9083eda48 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -1,7 +1,8 @@ -args: with args; +{ stdenv, fetchurl, gfortran }: stdenv.mkDerivation { name = "atlas-3.9.11"; + src = fetchurl { url = mirror://sf/math-atlas/atlas3.9.11.tar.bz2; sha256 = "d91e593a772cf540ff693f7d8c43d10c3037eb334c5c77572ea1b6a64a0b9677"; @@ -13,11 +14,11 @@ stdenv.mkDerivation { # the manual says you should pass -fPIC as configure arg .. It works configureFlags = "-Fa alg -fPIC"; - buildInputs = [gfortran]; + buildInputs = [ gfortran ]; meta = { - description = "Atlas library"; - license = "GPL"; - homepage = http://math-atlas.sourceforge.net/; + description = "Atlas library"; + license = "GPL"; + homepage = http://math-atlas.sourceforge.net/; }; } diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 5e852e3e2458..93a01a3d2bcb 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -1,10 +1,12 @@ -args: with args; +{ stdenv, fetchurl, libogg }: stdenv.mkDerivation rec { name = "speex-1.2rc1"; + src = fetchurl { url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz"; - sha256 = "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl"; + sha256 = "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl"; }; - buildInputs = [libogg]; + + buildInputs = [ libogg ]; } diff --git a/pkgs/development/libraries/telepathy-gabble/default.nix b/pkgs/development/libraries/telepathy-gabble/default.nix index 67ffa950c956..c188f271742c 100644 --- a/pkgs/development/libraries/telepathy-gabble/default.nix +++ b/pkgs/development/libraries/telepathy-gabble/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, loudmouth }: stdenv.mkDerivation rec { name = "telepathy-gabble-0.7.2"; diff --git a/pkgs/development/libraries/telepathy-glib/default.nix b/pkgs/development/libraries/telepathy-glib/default.nix index 764854045683..5864253bbb41 100644 --- a/pkgs/development/libraries/telepathy-glib/default.nix +++ b/pkgs/development/libraries/telepathy-glib/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }: stdenv.mkDerivation rec { name = "telepathy-glib-0.7.0"; diff --git a/pkgs/development/libraries/wvstreams/default.nix b/pkgs/development/libraries/wvstreams/default.nix index 28bab0291721..e1238578edcc 100644 --- a/pkgs/development/libraries/wvstreams/default.nix +++ b/pkgs/development/libraries/wvstreams/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, qt4, dbus, zlib, openssl, readline, perl }: + stdenv.mkDerivation { name = "wvstreams-4.6.1"; @@ -11,13 +12,13 @@ stdenv.mkDerivation { find -type f | xargs sed -i 's@/bin/bash@bash@g' ''; - buildInputs = [qt4 dbus zlib openssl readline perl]; + buildInputs = [ qt4 dbus zlib openssl readline perl ]; meta = { - description = "network programming library in C++"; + description = "Network programming library in C++"; homepage = http://alumnit.ca/wiki/index.php?page=WvStreams; license = "LGPL"; - maintainers = [stdenv.lib.maintainers.marcweber]; + maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix index 46782889dfb3..ef1482d7a540 100644 --- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix +++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix @@ -17,8 +17,6 @@ args.stdenv.mkDerivation { sha256 = "058iv3vs6syy01pfkd5894xap9zakjx8ki1bpjdnihn6vk6fr80l"; }; - buildInputs =(with args; []); - phases = "doAll"; # don't call any wired $buildInputs/nix-support/* scripts or such. This makes the build fail diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index b76f660c8c65..7c9fb19c2754 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -1,17 +1,17 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { name = "avr8-burn-omat-2.0.1"; - src = args.fetchurl { + src = fetchurl { url = http://avr8-burn-o-mat.brischalle.de/AVR8_Burn-O-Mat_2_0_1.zip; sha256 = "0nqlrbsx7z5r3b9y9wb6b7wawa3yxwx07zn7l4g4s59scxah2skk"; }; - buildInputs =(with args; [unzip]); + buildInputs = [unzip]; phases = "unpackPhase installPhase"; - # move to nix-support to not create that many symlinks.. # TODO burnomat tries to read /usr/local/etc/avrdude.conf (but you can edit it within the settings dialog) installPhase = '' @@ -25,8 +25,8 @@ args.stdenv.mkDerivation { ''; meta = { - description = "gui tool for avrdude (nice to set fuse bits)"; - homepage = http://avr8-burn-o-mat.brischalle.de/avr8_burn_o_mat_avrdude_gui_en.html; - license = "GPLv3"; + description = "GUI tool for avrdude"; + homepage = http://avr8-burn-o-mat.brischalle.de/avr8_burn_o_mat_avrdude_gui_en.html; + license = "GPLv3"; }; } diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 227759fa9596..9fc25aad64d2 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, unzip }: # at runtime, need jdk diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index ce2d36bebe80..3cfd8736d822 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -1,21 +1,22 @@ -args: with args; +{ composableDerivation, fetchurl, yacc, flex, texLive }: + let edf = composableDerivation.edf; in + composableDerivation.composableDerivation {} { name="avrdude-5.4"; src = fetchurl { - url = http://mirror.switch.ch/mirror/gentoo/distfiles/avrdude-5.4.tar.gz; - sha256 = "bee4148c51ec95999d803cb9f68f12ac2e9128b06f07afe307d38966c0833b30"; + url = http://mirror.switch.ch/mirror/gentoo/distfiles/avrdude-5.4.tar.gz; + sha256 = "bee4148c51ec95999d803cb9f68f12ac2e9128b06f07afe307d38966c0833b30"; }; configureFlags = [ "--disable-dependency-tracking" ]; - buildInputs = [yacc flex]; + buildInputs = [ yacc flex ]; flags = - edf { name = "doc"; enable = { buildInputs = texLive; configureFlags = ["--enable-doc"]; }; } - // edf { name = "parport"; } - ; + edf { name = "doc"; enable = { buildInputs = texLive; configureFlags = ["--enable-doc"]; }; } + // edf { name = "parport"; }; cfg = { docSupport = false; # untested diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index dd2856975bd7..c91d826e3b37 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/pkgs/development/tools/misc/cproto/default.nix @@ -1,20 +1,21 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl, flex, bison }: + +stdenv.mkDerivation { name = "cproto-4.6"; - src = args.fetchurl { + src = fetchurl { url = mirror://sourceforge/cproto/cproto-4.6.tar.gz; sha256 = "0ilhkx9iwc5bh65q47mf68p39iyk07d52fv00z431nl6qcb9hp9j"; }; - buildInputs =(with args; [flex bison]); + buildInputs = [flex bison]; # patch made by Joe Khoobyar copied from gentoo bugs - patches= ./cproto_patch ; + patches = ./cproto_patch; meta = { - description = "generate C function prototypes from C source code"; - homepage = http://cproto.sourceforge.net/; - license = "public domain"; + description = "Tool to generate C function prototypes from C source code"; + homepage = http://cproto.sourceforge.net/; + license = "public domain"; }; } diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index edf2ee389466..0465b6d90a89 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { name = "inotify-tools-3.13"; @@ -7,13 +8,10 @@ stdenv.mkDerivation { sha256 = "0icl4bx041axd5dvhg89kilfkysjj86hjakc7bk8n49cxjn4cha6"; }; - buildInputs = []; - meta = { - description = ""; homepage = http://sourceforge.net/projects/inotify-tools/; license = "GPLv2"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index 694dc940d929..732d3ab92c15 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/pkgs/development/tools/misc/uisp/default.nix @@ -1,16 +1,15 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { name = "uisp-20050207"; - configureFlags="--disable-dependency-tracking"; - src = fetchurl { url = http://mirror.switch.ch/mirror/gentoo/distfiles/uisp-20050207.tar.gz; sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw"; }; meta = { - description = "tool for AVR microcontrollers which can interface to many hardware in-system programmers"; + description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers"; license = "GPL-2"; homepage = http://savannah.nongnu.org/projects/uisp; }; diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 7d4380656e32..a883024690ae 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,11 +1,9 @@ -args: with args; +{ stdenv, fetchurl, libusb }: stdenv.mkDerivation { - name = "usb-modeswitch-1.1.2"; - src = - fetchurl { + src =fetchurl { url = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-1.1.2.tar.bz2"; sha256 = "1wzhd0r49nh5y43qrvsi3c7a29206zwd6v8xlpb8dqm40xg3j9nz"; }; @@ -18,13 +16,11 @@ stdenv.mkDerivation { makeFlags="DESTDIR=$out PREFIX=$out" ''; - buildInputs = [libusb]; + buildInputs = [ libusb ]; meta = { - description = "..."; - homepage = "TODO"; license = "GPLv2"; - maintainers = [stdenv.lib.maintainers.marcweber]; + maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 5d75e6ea1524..4c92946008ec 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -1,20 +1,25 @@ # This package is only used to create the documentation of zsh-cvs # eg have a look at http://www.zsh.org/mla/users/2008/msg00715.html # latest release is newer though -args: with args; + +{ stdenv, fetchurl, perl }: + stdenv.mkDerivation { name = "yodl-2.14.3"; - buildInputs = [perl]; + buildInputs = [ perl ]; src = fetchurl { url = "mirror://sourceforge/yodl/yodl_2.14.3.orig.tar.gz"; sha256 = "0paypm76p34hap3d18vvks5rrilchcw6q56rvq6pjf9raqw8ynd4"; }; - patches = [(fetchurl { - url = "mirror://sourceforge/yodl/yodl_2.14.3-1.diff.gz"; - sha256 = "176hlbiidv7p9051f04anzj4sr9dwlp9439f9mjvvgks47ac0qx4"; - })]; + + patches = + [ (fetchurl { + url = "mirror://sourceforge/yodl/yodl_2.14.3-1.diff.gz"; + sha256 = "176hlbiidv7p9051f04anzj4sr9dwlp9439f9mjvvgks47ac0qx4"; + }) + ]; # This doesn't isntall docs yet, do you need them? installPhase = '' diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index a9cc8e0a4080..ec3026110531 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { name = "byacc-1.9"; @@ -7,15 +8,14 @@ stdenv.mkDerivation { sha256 = "d61a15ac4ac007c188d0c0e99365f016f8d327755f43032b58e400754846f736"; }; - preConfigure = [ + preConfigure = ''mkdir -p $out/bin sed -i "s@^DEST.*\$@DEST = $out/bin/yacc@" Makefile - '' - ]; + ''; meta = { - description = "Berkeley YACC"; - homepage = http://dickey.his.com/byacc/byacc.html; - license = "public domain"; + description = "Berkeley YACC"; + homepage = http://dickey.his.com/byacc/byacc.html; + license = "public domain"; }; } |