diff options
132 files changed, 931 insertions, 964 deletions
diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 297bc91af4b..97c39982a65 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -1,23 +1,20 @@ -args: with args; +{ stdenv, fetchurl, jackaudio, pkgconfig }: -let name = "jackmeter-0.3"; -in -stdenv.mkDerivation { - - inherit name; +stdenv.mkDerivation rec { + name = "jackmeter-0.3"; src = fetchurl { url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz"; sha256 = "03siznnq3f0nnqyighgw9qdq1y4bfrrxs0mk6394pza3sz4b6sgp"; }; - buildInputs = [jackaudio pkgconfig]; + buildInputs = [ jackaudio pkgconfig ]; meta = { - description = "console jack loudness meter"; + description = "Console jack loudness meter"; homepage = http://www.aelius.com/njh/jackmeter/; 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/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix index 12ea91714a3..8cd3dcc1bfb 100644 --- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix +++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix @@ -1,28 +1,28 @@ -args: with args; +{ stdenv, fetchurl, builderDefs }: + let - src = - fetchurl { - url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt; - sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67"; - }; + src = fetchurl { + url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt; + sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67"; + }; in - let localDefs = builderDefs.passthru.function { - buildInputs = []; - inherit src; - }; - in with localDefs; + let localDefs = builderDefs.passthru.function { + buildInputs = []; + inherit src; + }; + in with localDefs; let - copyFile = fullDepEntry (" - ensureDir \$out/include - cp ${src} \$out/include/ladspa.h - ") [minInit defEnsureDir]; + copyFile = fullDepEntry (" + ensureDir \$out/include + cp ${src} \$out/include/ladspa.h + ") [minInit defEnsureDir]; in stdenv.mkDerivation { - name = "ladspa.h"; - builder = writeScript "ladspa.h-builder" - (textClosure localDefs [copyFile]); - meta = { - description = "LADSPA format audio plugins"; - inherit src; - }; + name = "ladspa.h"; + builder = writeScript "ladspa.h-builder" + (textClosure localDefs [copyFile]); + meta = { + description = "LADSPA format audio plugins"; + inherit src; + }; } diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index 223aabcdf82..4dfe3a204d3 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -1,4 +1,5 @@ -args : with args; +{ stdenv, fetchurl, ncurses }: + stdenv.mkDerivation { name = "bvi-1.3.2"; @@ -7,11 +8,11 @@ stdenv.mkDerivation { sha256 = "110wxqnyianqamxq4y53drqqxb9vp4k2fcvic45qggvlqkqhlfgz"; }; - buildInputs = [ncurses]; + buildInputs = [ ncurses ]; meta = { - description = "hex editor with vim style keybindings"; - homepage = http://bvi.sourceforge.net/download.html; - license = "GPL2"; + description = "Hex editor with vim style keybindings"; + homepage = http://bvi.sourceforge.net/download.html; + license = "GPL2"; }; } diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index c43b7f86914..f49919b70bb 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, ant }: + stdenv.mkDerivation { name = "jedit-4.2"; @@ -18,11 +19,11 @@ stdenv.mkDerivation { cp modes/catalog \$out/lib/modes "; - buildInputs = [ant]; + buildInputs = [ ant ]; meta = { - description = "really nice programmers editor written in Java. Give it a try"; - homepage = http://www.jedit.org; - license = "GPL"; + description = "really nice programmers editor written in Java. Give it a try"; + homepage = http://www.jedit.org; + license = "GPL"; }; } diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 62d5347d0ea..974ced7d2b1 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, ncurses, gettext }: + stdenv.mkDerivation (rec { pname = "nano"; version = "2.2.3"; @@ -9,9 +10,10 @@ stdenv.mkDerivation (rec { url = "mirror://gnu/nano/${name}.tar.gz"; sha256 = "1vpl993xrpj8bqi1ayga8fc0j2jag90xp6rqakzwm3bxw71hmwi2"; }; - buildInputs = [ncurses gettext]; -# configureFlags = "--enable-tiny"; - configureFlags = " + + buildInputs = [ ncurses gettext ]; + + configureFlags = '' --disable-browser --disable-help --disable-justify @@ -20,7 +22,7 @@ stdenv.mkDerivation (rec { --disable-speller --disable-tabcomp --disable-wrapping - "; + ''; meta = { homepage = http://www.nano-editor.org/; diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index 24429cfddad..ab22312e903 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -1,13 +1,14 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl, snack, tcl, tk, makeWrapper }: + +stdenv.mkDerivation { name = "wavesurfer-1.8.5"; - src = args.fetchurl { + src = fetchurl { url = http://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz; sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807"; }; - buildInputs =(with args; [snack tcl tk makeWrapper]); + buildInputs = [ snack tcl tk makeWrapper ]; installPhase = '' ensureDir $out/{bin,nix-support,share/wavesurfer/} @@ -15,13 +16,13 @@ args.stdenv.mkDerivation { mv * $out/nix-support ln -s $out/{nix-support,bin}/wavesurfer.tcl wrapProgram "$out/nix-support/wavesurfer.tcl" \ - --set TCLLIBPATH "${args.snack}/lib" \ - --prefix PATH : "${args.tcl}/bin:${args.tk}/bin" + --set TCLLIBPATH "${snack}/lib" \ + --prefix PATH : "${tcl}/bin:${tk}/bin" ''; meta = { - description = "tool for recording, playing, editing, viewing and labeling of audio"; - homepage = http://www.speech.kth.se/wavesurfer/; - license = "BSD"; + description = "Tool for recording, playing, editing, viewing and labeling of audio"; + homepage = http://www.speech.kth.se/wavesurfer/; + license = "BSD"; }; } diff --git a/pkgs/applications/misc/flite/default.nix b/pkgs/applications/misc/flite/default.nix index ad3b9df164d..8a2414ec885 100644 --- a/pkgs/applications/misc/flite/default.nix +++ b/pkgs/applications/misc/flite/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { name = "flite-1.3-release"; @@ -7,20 +8,22 @@ stdenv.mkDerivation { sha256 = "12wanxx57bbqgkag54dlqzv6h2kr9053p0z8mkxs0mqy03vja8lj"; }; - buildPhase = " - unset buildPhase - ensureDir \$out/lib - buildPhase - "; + buildPhase = + '' + unset buildPhase + ensureDir $out/lib + buildPhase + ''; - installPhase = " - ensureDir \$out/share/flite - cp -r bin \$out - "; + installPhase = + '' + ensureDir $out/share/flite + cp -r bin $out + ''; meta = { - description = "Flite text to speech engine"; - homepage = http://www.speech.cs.cmu.edu/flite/download.html; - license = "BSD as-is"; + description = "Flite text to speech engine"; + homepage = http://www.speech.cs.cmu.edu/flite/download.html; + license = "BSD as-is"; }; } diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 94b68fc6bc9..6d4fa97c8cb 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }: + stdenv.mkDerivation rec { name = "pgadmin3-1.10.0"; @@ -7,11 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1ndi951da3jw5800fjdgkbvl8n6k71x7x16ghihi1l88bilf2a16"; }; - buildInputs = [postgresql wxGTK libxml2 libxslt openssl]; + buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ]; meta = { - description = "postgresql admin gui tool"; - homepage = http://www.pgadmin.org; - license = "GPL2"; - }; + description = "PostgreSQL administration GUI tool"; + homepage = http://www.pgadmin.org; + license = "GPL2"; + }; } diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 1ccbfd41728..15bcc477bdd 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -1,6 +1,7 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { - name="procmail-3.22"; + name = "procmail-3.22"; buildInputs = [ stdenv.gcc.libc ]; diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index 71cac8eefa7..67d3f32d53f 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation rec { name = "pstree-2.33"; @@ -7,15 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1469lrhpy6wghlvbjx6lmvh27rakq00x11cpz4n965fg11i121hg"; }; - unpackPhase="unpackFile \$src; sourceRoot=."; + unpackPhase = "unpackFile \$src; sourceRoot=."; - buildPhase="pwd; gcc -o pstree pstree.c"; - installPhase="ensureDir \$out/bin; cp pstree \$out/bin"; + buildPhase = "pwd; gcc -o pstree pstree.c"; + installPhase = "ensureDir \$out/bin; cp pstree \$out/bin"; meta = { - description = "show the running processes as tree"; - # don't know the correct homepage.. - homepage = http://fresh.t-systems-sfr.com/unix/src/misc/pstree-2.32.tar.gz; - license = "GPL"; - }; + description = "Show the set of running processes as a tree"; + license = "GPL"; + }; } diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index 6bf28580b35..c14f6080b8c 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -1,18 +1,18 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { name = "sbagen-1.4.4"; - buildPhases="buildPhase installPhase"; + buildPhases = "buildPhase installPhase"; - buildPhase="./mk"; + buildPhase = "./mk"; - installPhase=" - ensureDir \$out/{bin,share/sbagen/doc} - cp -r --target-directory=\$out/share/sbagen examples scripts river1.ogg river2.ogg + installPhase = '' + ensureDir $out/{bin,share/sbagen/doc} + cp -r --target-directory=$out/share/sbagen examples scripts river1.ogg river2.ogg cp sbagen $out/bin - cp --target-directory=\$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt - - "; + cp --target-directory=$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt + ''; src = fetchurl { url = http://uazu.net/sbagen/sbagen-1.4.4.tgz; @@ -20,8 +20,8 @@ stdenv.mkDerivation { }; meta = { - description = "binaural sound generator"; - homepage = http://uazu.net/sbagen; - license = "GPL"; - }; + description = "Binaural sound generator"; + homepage = http://uazu.net/sbagen; + license = "GPL"; + }; } diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index 553e297cf7f..2faed53b7a5 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -1,8 +1,9 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl }: + +stdenv.mkDerivation { name = "thinkingrock-2.2.1-binary"; - src = args.fetchurl { + src = fetchurl { url = mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz; sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm"; }; @@ -28,11 +29,12 @@ args.stdenv.mkDerivation { EOF chmod +x $out/bin/thinkingrock ''; + installPhase = ":"; meta = { - description = "task managing system"; - homepage = http://www.thinkingrock.com.au/; - license = "CDDL"; # Common Development and Distribution License + description = "Task management system"; + homepage = http://www.thinkingrock.com.au/; + license = "CDDL"; # Common Development and Distribution License }; } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index c5b9894a796..9fb59fcdb86 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl +, spidermonkey, guile, gpm }: stdenv.mkDerivation rec { name = "elinks-0.12pre5"; @@ -8,13 +9,17 @@ stdenv.mkDerivation rec { sha256 = "1li4vlbq8wvnigxlkzb15490y90jg6y9yzzrqpqcz2h965w5869d"; }; - buildInputs = [python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm]; - configureFlags = "--enable-finger --enable-html-highlight --with-guile - --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent - --enable-nntp --with-openssl=${openssl}"; + buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm ]; + + configureFlags = + '' + --enable-finger --enable-html-highlight --with-guile + --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent + --enable-nntp --with-openssl=${openssl} + ''; meta = { - description = "Full-Featured Text WWW Browser"; + description = "Full-featured text-mode web browser"; homepage = http://elinks.or.cz; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index d842dc9364b..02fbc9643b7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,10 +1,10 @@ -args: with args; +{ stdenv, fetchurl, pidgin, intltool, libxml2 }: + +let version = "1.10.0"; in -let - version = "1.10.0"; -in stdenv.mkDerivation { name = "pidgin-sipe-${version}"; + src = fetchurl { url = "mirror://sourceforge/sipe/sipe/pidgin-sipe-${version}/pidgin-sipe-${version}.tar.gz"; sha256 = "11d85qxix1dmwvzs3lx0sycsx1d5sy67r9y78fs7z716py4mg9np"; diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/applications/version-management/arch/default.nix index 763a84fab9f..350b842a095 100644 --- a/pkgs/applications/version-management/arch/default.nix +++ b/pkgs/applications/version-management/arch/default.nix @@ -1,7 +1,8 @@ -args: with args; +{ stdenv, fetchurl, which, diffutils, gnupatch, gnutar }: stdenv.mkDerivation rec { name = "tla-1.3.5"; + src = fetchurl { url = "mirror://gnu/gnu-arch/" + name + ".tar.gz"; sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0"; @@ -10,6 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./configure-tmpdir.patch ]; buildInputs = [which]; + propagatedBuildInputs = [diffutils gnupatch gnutar]; # Instead of GNU Autoconf, tla uses Tom Lord's now diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 45737effcce..8c64721bc7e 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -1,17 +1,18 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng }: + +stdenv.mkDerivation { name = "dvdauthor-0.6.14"; - src = args.fetchurl { + src = fetchurl { url = mirror://sourceforge/dvdauthor/dvdauthor-0.6.14.tar.gz; sha256 = "1x4flj3ja7m8rbc956a6ha3qk0k6zxd1y6sl826r6r7dyc91a6yx"; }; - buildInputs =(with args; [imagemagick libdvdread libxml2 freetype fribidi libpng]); + buildInputs = [ imagemagick libdvdread libxml2 freetype fribidi libpng ]; meta = { - description = "Tools for generating DVD files to be played on standalone DVD players"; - homepage = http://dvdauthor.sourceforge.net/; - license = ["GPLv2"]; + description = "Tools for generating DVD files to be played on standalone DVD players"; + homepage = http://dvdauthor.sourceforge.net/; + license = ["GPLv2"]; }; } diff --git a/pkgs/data/documentation/rnrs/r3rs.nix b/pkgs/data/documentation/rnrs/r3rs.nix index adaa03d3a68..d252a1680bd 100644 --- a/pkgs/data/documentation/rnrs/r3rs.nix +++ b/pkgs/data/documentation/rnrs/r3rs.nix @@ -1,6 +1,7 @@ -args: with args; +{ fetchurl, stdenv, texinfo }: -((import ./common.nix) - (args // - { revision = 3; - sha256 = "0knrpkr74s8yn4xcqxkqpgxmzdmzrvahh1n1csqc1wwd2rb4vnpr"; })) +import ./common.nix { + inherit fetchurl stdenv texinfo; + revision = 3; + sha256 = "0knrpkr74s8yn4xcqxkqpgxmzdmzrvahh1n1csqc1wwd2rb4vnpr"; +} diff --git a/pkgs/data/documentation/rnrs/r4rs.nix b/pkgs/data/documentation/rnrs/r4rs.nix index 4f444229917..1aa6a49f02d 100644 --- a/pkgs/data/documentation/rnrs/r4rs.nix +++ b/pkgs/data/documentation/rnrs/r4rs.nix @@ -1,6 +1,7 @@ -args: with args; +{ fetchurl, stdenv, texinfo }: -((import ./common.nix) - (args // - { revision = 4; - sha256 = "02jgy0lvi5ymkdxwjasg50zl03zmyj8sgnfxxnjnbmif72c0k4p8"; })) +import ./common.nix { + inherit fetchurl stdenv texinfo; + revision = 4; + sha256 = "02jgy0lvi5ymkdxwjasg50zl03zmyj8sgnfxxnjnbmif72c0k4p8"; +} diff --git a/pkgs/data/documentation/rnrs/r5rs.nix b/pkgs/data/documentation/rnrs/r5rs.nix index b53bbf551b2..a0fff6507e4 100644 --- a/pkgs/data/documentation/rnrs/r5rs.nix +++ b/pkgs/data/documentation/rnrs/r5rs.nix @@ -1,6 +1,7 @@ -args: with args; +{ fetchurl, stdenv, texinfo }: -((import ./common.nix) - (args // - { revision = 5; - sha256 = "1s2wcslwcgb9j89vjn7qs63qlnsv1481jaw1sgg33fgbgk6a8wrk"; })) +import ./common.nix { + inherit fetchurl stdenv texinfo; + revision = 5; + sha256 = "1s2wcslwcgb9j89vjn7qs63qlnsv1481jaw1sgg33fgbgk6a8wrk"; +} diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 4901c7486c3..1d2aa5e62d3 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -1,38 +1,38 @@ -args: with args; +{ stdenv, fetchurl, wrapFonts }: + let -srcA= - fetchurl { - url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz; - sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh"; - }; -srcB= - fetchurl { - url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz; - sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51"; - }; -srcC= - fetchurl { - url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz; - sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh"; - }; + srcA = fetchurl { + url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz; + sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh"; + }; + + srcB = fetchurl { + url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz; + sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51"; + }; + + srcC = fetchurl { + url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz; + sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh"; + }; in -wrapFonts (stdenv.mkDerivation { - name = "ucs-fonts"; - phases = ["installPhase"]; - installPhase = '' - tar xf ${srcA} - tar xf ${srcB} - tar xf ${srcC} - mkdir -p $out/share/fonts/ucs-fonts - cp *.bdf $out/share/fonts/ucs-fonts - ''; +wrapFonts (stdenv.mkDerivation { + name = "ucs-fonts"; + + phases = ["installPhase"]; + + installPhase = '' + tar xf ${srcA} + tar xf ${srcB} + tar xf ${srcC} + mkdir -p $out/share/fonts/ucs-fonts + cp *.bdf $out/share/fonts/ucs-fonts + ''; - meta = { - description = "Unicode bitmap fonts"; - src = [srcA srcB srcC]; - }; + meta = { + description = "Unicode bitmap fonts"; + }; }) - diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix index 9cc012d917f..779aa48c2d0 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 fadc73c051e..88f0ab91067 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 ce1f101b4f5..ee2aa27a621 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 4f3bbc6294b..db712b18d3f 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 b2e7e131a81..4f7e9469bbf 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 6e9922ccc36..00000000000 --- 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 8a8ddd7ee97..a77e5fdd0ac 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 c825830e43d..e22db680577 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 3f824786119..3e11c230311 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 37b78942dad..05c8e1331ab 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 b11ef944c38..ec7438c2341 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 b7dc135215c..cc994aeea34 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 3c0db6c6dcc..d26ab694934 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 6fdeac2d24c..74aba643ee7 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 415ed78f117..5ba57dbc1ea 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 471532be2fe..cd233415615 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 97b9115b756..b63b38ebf29 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 bd7b66f21a1..1821d746ac4 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 6c8c79d701c..cbca42ef5df 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 29c1df93a50..591a4bfbd6d 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 b54680b3d3f..1bccf32b0f0 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 d00e3f67f3c..2464a09f51a 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 54bf2331bf7..419215a45a5 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 5424e7a73de..11b8fba8b04 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 c30166d015c..950fe1baf08 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 d1c0a825dea..f133217b202 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 0af3e4f5537..81474b62dc6 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 79356b31b7e..6c506df3f89 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 d3df5ce58d6..dde95364337 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 56b51d71ca6..f87211195d5 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 36b74a1980e..6dea424075d 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 f289dd8ee0f..c038adf632f 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 4c7cbb4e691..0dbab1a7ac4 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 46fe5b6ef03..9b45dbb91ec 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 672ca202354..07753c86403 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 69011a6ef97..3213c0634ba 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 76434d2c30b..7c2c9129c26 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 16272ebeb2b..920f40abd5a 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 51c06c0382b..ff22d1d032b 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 a2590a7de3f..d1337604260 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 eb574fbc8c8..c65c62eaca7 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 e2d1c25d013..e24a93c1043 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 2ca8c543fa9..a910d11f410 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 05ffb27bc0a..e02cedeeab3 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 0ddb45be30c..738369e796a 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 ee99a173b6f..681453985b9 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 a30a2884c6a..911145c5b74 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 9dd50c37c61..ba11e0752b2 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 7f7d7693182..95740882a93 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 857197ea0c1..1754539a5f1 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 f0bce75e07a..59851eda25a 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 ffb3bed5054..6e3cc7cac55 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 631a7622406..be219f1f288 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 a36d7870cc2..c208d5b9fe6 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 cb18a8509bf..f9de62e7cfa 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 5d9167d00ec..e2d9083eda4 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 5e852e3e245..93a01a3d2bc 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 67ffa950c95..c188f271742 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 76485404568..5864253bbb4 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 28bab029172..e1238578edc 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 46782889dfb..ef1482d7a54 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 b76f660c8c6..7c9fb19c275 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 227759fa959..9fc25aad64d 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 ce2d36bebe8..3cfd8736d82 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 dd2856975bd..c91d826e3b3 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 edf2ee38946..0465b6d90a8 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 694dc940d92..732d3ab92c1 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 7d4380656e3..a883024690a 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 5d75e6ea152..4c92946008e 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 a9cc8e0a408..ec302611053 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"; }; } diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index aef8c239caf..feb42296c9d 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, rpm, cpio, zlib }: assert stdenv.system == "x86_64-linux"; @@ -25,6 +25,7 @@ then. I've tried that. TODO tidy this all up. Find source instead of binary. Fix paths ... Find out how to check ink levels etc */ + stdenv.mkDerivation { name = "cups-gutenprint-binary-5.0.1"; @@ -58,6 +59,6 @@ stdenv.mkDerivation { ''; meta = { - description = "some additional drivers including canon printer drivers"; + description = "Some additional CUPS drivers including Canon drivers"; }; } diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 832aeb9793c..f1a01eefba5 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -1,12 +1,13 @@ # this package was called gimp-print in the past -{ fetchurl, stdenv, lib, pkgconfig, composableDerivation, cups -, libtiff, libpng, openssl, git, gimp }@args : +{ fetchurl, stdenv, pkgconfig, composableDerivation, cups +, libtiff, libpng, openssl, gimp }: let version = "5.2.4"; - inherit (args.composableDerivation) composableDerivation edf wwf; + inherit (composableDerivation) edf wwf; in -composableDerivation {} { + +composableDerivation.composableDerivation {} { name = "gutenprint-${version}"; src = fetchurl { @@ -15,12 +16,14 @@ composableDerivation {} { }; # gimp, gui is still not working (TODO) - buildInputs = [ openssl pkgconfig]; + buildInputs = [ openssl pkgconfig ]; configureFlags = ["--enable-static-genppd"]; + #preConfigure = '' # configureFlags="--with-cups=$out/usr-cups $configureFlags" #''; + /* is this recommended? without it this warning is printed: @@ -41,7 +44,7 @@ composableDerivation {} { license = "GPL"; }; - mergeAttrBy = { installArgs = lib.concat; }; + mergeAttrBy = { installArgs = stdenv.lib.concat; }; # most interpreters aren't tested yet.. (see python for example how to do it) flags = diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index d26a0aa7fca..666f2d9475b 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -1,13 +1,13 @@ -args: with args; +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "acpi-0.09"; + src = fetchurl { url = "http://grahame.angrygoats.net/source/acpi/${name}.tar.gz"; sha256 = "11iwzbm3gcn9ljvxl4cjj9fc1n135hx45rhrsprnnkqppndf3vn1"; }; - meta = { longDescription = '' Linux ACPI client is a small command-line diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 2ecb21d2b5b..06af0c9228a 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig, fuse }: + stdenv.mkDerivation { name = "afuse-0.2"; @@ -7,18 +8,14 @@ stdenv.mkDerivation { sha256 = "1lj2jdks0bgwxbjqp5a9f7qdry19kar6pg7dh1ml98gapx9siylj"; }; - buildInputs = [pkgconfig fuse]; + buildInputs = [ pkgconfig fuse ]; meta = { - description = "automounting in userspace. Allows easy access to ssh-agent etc"; - longDesc = '' - Example: (automunt using sshfs by accessing ~/sshfs/[user@]domain - afuse -o mount_template="sshfs %r:/ %m" -o unmount_template="fusermount -u -z %m" ~/sshfs/ - ''; + description = "Automounter in userspace"; homepage = http://sourceforge.net/projects/afuse; license = "GPL-v2"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/aufs/default.nix b/pkgs/os-specific/linux/aufs/default.nix index 5042dd1a55e..5321bfa3d6b 100644 --- a/pkgs/os-specific/linux/aufs/default.nix +++ b/pkgs/os-specific/linux/aufs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, kernel}: +{ stdenv, fetchurl, kernel }: stdenv.mkDerivation { name = "aufs-20090414-${kernel.version}"; diff --git a/pkgs/os-specific/linux/bridge_utils/default.nix b/pkgs/os-specific/linux/bridge_utils/default.nix index b4f5efce22f..cb8b033c1e3 100644 --- a/pkgs/os-specific/linux/bridge_utils/default.nix +++ b/pkgs/os-specific/linux/bridge_utils/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, autoconf, automake }: + stdenv.mkDerivation { name = "bridge-utils-1.2"; @@ -7,13 +8,13 @@ stdenv.mkDerivation { sha256 = "0jg3z51c2c34byg4zi39j9g4b66js5kanjhid77hpa0jdfmryfy9"; }; - buildInputs = [autoconf automake]; + buildInputs = [ autoconf automake ]; - preConfigure="autoreconf"; + preConfigure = "autoreconf"; meta = { - description = "http://sourceforge.net/projects/bridge/"; - homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ]; - license = "GPL"; + description = "http://sourceforge.net/projects/bridge/"; + homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ]; + license = "GPL"; }; } diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index 1cffb504322..dfc384b7adb 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -1,9 +1,11 @@ -args: with args; -stdenv.mkDerivation ( rec { +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { pname = "zd1211-firmware"; version = "1.4"; name = "${pname}-${version}"; + src = fetchurl { url = "http://surfnet.dl.sourceforge.net/sourceforge/zd1211/${name}.tar.bz2"; sha256 = "866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1"; @@ -18,4 +20,4 @@ stdenv.mkDerivation ( rec { homepage = http://sourceforge.net/projects/zd1211/; license = "GPL"; }; -}) +} diff --git a/pkgs/os-specific/linux/hal/hal-evt.nix b/pkgs/os-specific/linux/hal/hal-evt.nix index 25b4e503326..a49f4fcc0f8 100644 --- a/pkgs/os-specific/linux/hal/hal-evt.nix +++ b/pkgs/os-specific/linux/hal/hal-evt.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, libxml2, pkgconfig, boolstuff, hal, dbus_glib }: + stdenv.mkDerivation { name = "hal-evt-0.1.4"; @@ -7,13 +8,13 @@ stdenv.mkDerivation { sha256 = "173dphyzpicjz5pnw0d6wmibvib5h99nh1gmyvcqpgvf8la5vrps"; }; - buildInputs = [libxml2 pkgconfig boolstuff hal dbus_glib]; + buildInputs = [ libxml2 pkgconfig boolstuff hal dbus_glib ]; meta = { - description = "execute commands on hal events"; + description = "Execute commands on hal events"; homepage = http://www.nongnu.org/halevt/; 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/applications/misc/i810/default.nix b/pkgs/os-specific/linux/i810switch/default.nix index 9407b8137d1..63a056712ac 100644 --- a/pkgs/applications/misc/i810/default.nix +++ b/pkgs/os-specific/linux/i810switch/default.nix @@ -1,4 +1,6 @@ -args: with args; stdenv.mkDerivation { +{ stdenv, fetchurl, pciutils }: + +stdenv.mkDerivation { name = "i810switch-0.6.5"; phases = "unpackPhase installPhase"; @@ -10,15 +12,13 @@ args: with args; stdenv.mkDerivation { make install DESTDIR=\${out} "; - inherit pciutils; - src = fetchurl { url = http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz; sha256 = "d714840e3b14e1fa9c432c4be0044b7c008d904dece0d611554655b979cad4c3"; }; meta = { - description = "i810switch is a utility for switching the LCD and external VGA display."; + description = "A utility for switching between the LCD and external VGA display on Intel graphics cards"; homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html"; license = "GPL2"; }; diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index d4d39606d62..ff3cad3fe98 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, pciutils }: + stdenv.mkDerivation { name = "radeontool-1.5"; @@ -6,26 +7,26 @@ stdenv.mkDerivation { # Don't know wether it's a good idea to hardcode the lspci path.. # But it will work on nix.. - postUnpack = " - cd $sourceRoot; - sed -i \"s%lspci%\$pciutils/sbin/lspci%g\" radeontool.c + postUnpack = '' + cd $sourceRoot + sed -i "s%lspci%$pciutils/sbin/lspci%g" radeontool.c cd .. - "; + ''; src = fetchurl { url = http://fdd.com/software/radeon/radeontool-1.5.tar.gz; sha256 = "0qbkawhhq0y0gqbbql7q04y0v0hims5c4jkjsbc1y03rf9kr10ar"; }; - installPhase = " - ensureDir \$out/bin + installPhase = '' + ensureDir $out/bin chmod +x lightwatch.pl - cp radeontool lightwatch.pl \$out/bin - "; + cp radeontool lightwatch.pl $out/bin + ''; meta = { - description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards"; - homepage = http://fdd.com/software/radeon/; - license = "ZLIB"; - }; + description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards"; + homepage = http://fdd.com/software/radeon/; + license = "ZLIB"; + }; } diff --git a/pkgs/os-specific/linux/upstart/jobcontrol.nix b/pkgs/os-specific/linux/upstart/jobcontrol.nix deleted file mode 100644 index 5be0276ffd5..00000000000 --- a/pkgs/os-specific/linux/upstart/jobcontrol.nix +++ /dev/null @@ -1,15 +0,0 @@ -args: with args; -stdenv.mkDerivation { - name = "upstart-jobcontrol"; - buildCommand = " - mkdir -p \$out/bin - echo ' - file=/etc/event.d/\$1 - shift - controlscript=\$(egrep exec\\|respawn \$file | tail | sed -e s/^\\\\s\\\\+//g | sed -e s/\\\\s\\\\+/\\ /g | cut -f 2 -d \\ ) - echo Running \$controlscript \"\$@\" - \$controlscript \"\$@\" - ' >\$out/bin/jobcontrol - chmod a+x \$out/bin/jobcontrol - "; -} diff --git a/pkgs/os-specific/linux/wvdial/default.nix b/pkgs/os-specific/linux/wvdial/default.nix index 2b58108ba08..eb9d09d2a11 100644 --- a/pkgs/os-specific/linux/wvdial/default.nix +++ b/pkgs/os-specific/linux/wvdial/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, wvstreams, pkgconfig }: + stdenv.mkDerivation rec { name = "wvdial-1.61"; @@ -7,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0mzcrv8mc60gbdrixc9k8ammbslvjb9x2cs50yf1jq67aabapzsg"; }; - buildInputs = [wvstreams pkgconfig]; + buildInputs = [ wvstreams pkgconfig ]; preConfigure = '' find -type f | xargs sed -i 's@/bin/bash@bash@g' @@ -17,10 +18,10 @@ stdenv.mkDerivation rec { ''; meta = { - description = "dialer automatically recognizing the modem"; + description = "A dialer that automatically recognises the modem"; homepage = http://alumnit.ca/wiki/index.php?page=WvDial; license = "LGPL"; - maintainers = [stdenv.lib.maintainers.marcweber]; + maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix index eacf2371d36..5e5d91fa820 100644 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix @@ -1,17 +1,20 @@ -args: with args; +{ stdenv, fetchurl }: + +# !!! Duplication: this package is almost exactly the same as `bsd-fingerd'. + stdenv.mkDerivation rec { - name = "bsd-fingerd-0.17"; + name = "bsd-fingerd-0.17"; - src = fetchurl { - url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-0.17.tar.gz"; - sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; - }; + src = fetchurl { + url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-0.17.tar.gz"; + sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; + }; - NIX_CFLAGS_COMPILE="-D_GNU_SOURCE"; + NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; - patches = [./ubuntu-0.17-9.patch]; + patches = [ ./ubuntu-0.17-9.patch ]; - preBuild = "cd fingerd"; + preBuild = "cd fingerd"; - preInstall = '' ensureDir $out/man/man8 $out/sbin ''; + preInstall = '' ensureDir $out/man/man8 $out/sbin ''; } diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 10e6d658714..85006a1d175 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -1,7 +1,8 @@ -args: with args; +{ stdenv, fetchurl, openssl, libcap, pam }: stdenv.mkDerivation rec { name = "vsftpd-2.0.5"; + src = fetchurl { url = "ftp://vsftpd.beasts.org/users/cevans/${name}.tar.gz"; sha256 = "0nzsxknnaqnfk853yjsmi31sl02jf5ydix9wxbldv4i7vzqfnqjl"; @@ -10,16 +11,18 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap"; preInstall = '' - ensureDir $out/{,s}bin - ensureDir $out/man/man{5,8} + ensureDir $out/{,s}bin + ensureDir $out/man/man{5,8} ''; patches = [ ./fix.patch ] ; - preConfigure = ''sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h; - sed -i "s@/etc/vsftpd.user_list@$out/vsftpd.user_list@" vsftpd.conf.5 tunables.c''; + + preConfigure = '' + sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h + sed -i "s@/etc/vsftpd.user_list@$out/vsftpd.user_list@" vsftpd.conf.5 tunables.c + ''; - configFile = ./vsftpd.user_list; postInstall = "cp ${./vsftpd.user_list} $out/vsftpd.user_list"; - buildInputs = [ openssl libcap pam configFile ]; + buildInputs = [ openssl libcap pam ]; } diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 5cea1e14548..c0184b87538 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,17 +1,18 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2 }: + +stdenv.mkDerivation { name = "lighttpd-1.4.19"; - src = args.fetchurl { + src = fetchurl { url = http://www.lighttpd.net/download/lighttpd-1.4.19.tar.bz2; sha256 = "1mziqb36ik9z4lf1h5ccm1h4ab7d2hx0cz0g5425lwy374r34fd2"; }; - buildInputs =(with args; [pcre libxml2 zlib attr bzip2]); + buildInputs = [ pcre libxml2 zlib attr bzip2 ]; meta = { - description = "Lightweight high-performance web server"; - homepage = http://www.lighttpd.net/; - license = "BSD"; + description = "Lightweight high-performance web server"; + homepage = http://www.lighttpd.net/; + license = "BSD"; }; } diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index e428f4d649f..ddbdc4346ae 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -1,4 +1,4 @@ -args: with args; +{ stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation { name = "ircd-hybrid-7.2.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1xn4dfbgx019mhismfnr2idhslvarlajyahj7c6bqzmarcwwrvck"; }; - buildInputs = [openssl zlib]; + buildInputs = [ openssl zlib ]; configureFlags = "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl}"; diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 398f7beb541..2293e2ab316 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -1,42 +1,41 @@ -args: with args; - -let inherit (args.composableDerivation) composableDerivation edf; in -composableDerivation {} { - - name = "monetdb-may-2009"; - - src = fetchurl { - url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2; - sha256 = "0r794snnwa4m0x57nv8cgfdxwb689946c1mi2s44wp4iljka2ryj"; - }; - - flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; } - // { - java = { buildInputs = [ (apacheAnt.override {jdk = jdk5;}) jdk5 /* must be 1.5 */ ]; }; - /* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */ - }; - - buildInputs = [ (pcre.override { unicodeSupport = true; }) - openssl readline libxml2]; # optional python perl php java ? - - cfg = { - geomSupport = true; - javaSupport = true; - }; - - configurePhase = ":"; - buildPhase = ":"; - # --enable-template (nightly or cvs sources) - # --enable-optimise - # --enable-geom (geos-config required ?) - installPhase = '' - mkdir $TMP/build - sh monetdb-install.sh --build=$TMP/build --prefix=$out --enable-sql --enable-xquery - ''; - - meta = { - description = "MonetDB is a open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval"; - homepage = http://monetdb.cwi.nl/; - license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html - }; - } +{ composableDerivation, fetchurl, pcre, openssl, readline, libxml2, geos, apacheAnt, jdk5 }: + +let inherit (composableDerivation) edf; in + +composableDerivation.composableDerivation {} { + + name = "monetdb-may-2009"; + + src = fetchurl { + url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2; + sha256 = "0r794snnwa4m0x57nv8cgfdxwb689946c1mi2s44wp4iljka2ryj"; + }; + + flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; } + // { + java = { buildInputs = [ (apacheAnt.override {jdk = jdk5;}) jdk5 /* must be 1.5 */ ]; }; + /* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */ + }; + + buildInputs = [ (pcre.override { unicodeSupport = true; }) + openssl readline libxml2 ]; # optional python perl php java ? + + cfg = { + geomSupport = true; + javaSupport = true; + }; + + configurePhase = ":"; + buildPhase = ":"; + + installPhase = '' + mkdir $TMP/build + sh monetdb-install.sh --build=$TMP/build --prefix=$out --enable-sql --enable-xquery + ''; + + meta = { + description = "MonetDB is a open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval"; + homepage = http://monetdb.cwi.nl/; + license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + }; +} diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 6f4a41d2425..b3d75106980 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig, ghostscript, gd, zlib, plotutils }: + stdenv.mkDerivation { name = "pstoedit-3.50"; @@ -7,14 +8,13 @@ stdenv.mkDerivation { sha256 = "04ap21fxj2zn6vj9mv7zknj4svcbkb1gxwfzxkw5i0sksx969c92"; }; - buildInputs = [pkgconfig ghostscript gd zlib plotutils]; + buildInputs = [ pkgconfig ghostscript gd zlib plotutils ]; meta = { description = "translates PostScript and PDF graphics into other vector formats"; homepage = http://www.helga-glunz.homepage.t-online.de/pstoedit; 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/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index f91a3fabc32..024798a84e3 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -1,17 +1,18 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation { name = "bfr-1.6"; - src = args.fetchurl { + src = fetchurl { url = http://www.glines.org/bin/pk/bfr-1.6.tar.bz2; sha256 = "0fadfssvj9klj4dq9wdrzys1k2a1z2j0p6kgnfgbjv0n1bq6h4cy"; }; - buildInputs =(with args; [perl]); + buildInputs = [ perl ]; meta = { - description = "general-purpose command-line pipe buffer"; - homepage = http://www.glines.org/wiki/bfr; - license = "GPL2"; + description = "general-purpose command-line pipe buffer"; + homepage = http://www.glines.org/wiki/bfr; + license = "GPL2"; }; } diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index fd081940577..53027246b7f 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,9 +1,12 @@ -args: with args; +{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget }: -let devices = fetchurl { +let + + devices = fetchurl { url = mirror://gentoo/distfiles/devices.tar.gz; sha256 = "0j4yhajmlgvbksr2ij0dm7jy3q52j3wzhx2fs5lh05i1icygk4qd"; }; + in stdenv.mkDerivation { @@ -14,11 +17,13 @@ stdenv.mkDerivation { url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.10lenny1_all.deb; sha256 = "a70af8e3369408ce9d6314fb5219de73f9523b347b75a3b07ee17ea92c445051"; }; - buildInputs = [dpkg gettext gawk perl]; + + buildInputs = [ dpkg gettext gawk perl ]; unpackPhase = '' dpkg-deb --extract "$src" . ''; + buildPhase = ":"; patches = [ @@ -80,12 +85,10 @@ stdenv.mkDerivation { */ meta = { - description = "create a debian system in a chroot easily."; - longDescription = "this way you can use debian packages we don't have in nixpkgs yet. - "; + description = "Tool to create a Debian system in a chroot"; homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap license = "GPL-2"; # gentoo says so.. ? - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index b42919430dd..00265d1f31d 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -1,22 +1,22 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl }: + +stdenv.mkDerivation { name = "figlet-222"; # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/ - src = args.fetchurl { + src = fetchurl { url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet222.tar.gz; sha256 = "1y22hhwxhnwd6yrjgl5p3p44r22xzrhv9cksj58n85laac6jdfhs"; }; - buildInputs =(with args; []); preConfigure = '' ensureDir $out/{man/man6,bin} makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet" ''; meta = { - description="program for making large letters out of ordinary text"; - homepage = http://www.figlet.org/; - license = "AFL-2.1"; + description = "Program for making large letters out of ordinary text"; + homepage = http://www.figlet.org/; + license = "AFL-2.1"; }; } diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index 9f285a6cd51..202d28684d0 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -1,25 +1,28 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { name = "hddtemp-0.3-beta15"; db = fetchurl{ - url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db; - sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya"; - }; + url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db; + sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya"; + }; + src = fetchurl { - url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2; - sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1"; + url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2; + sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1"; }; - configurePhase = " - ensureDir \$out/nix-support - cp \$db \$out/nix-support/hddtemp.db - ./configure --prefix=\$out --with-db-path=\$out/nix-support/hddtemp.db - "; + configurePhase = + '' + ensureDir $out/nix-support + cp $db $out/nix-support/hddtemp.db + ./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db + ''; meta = { - description = "shows the harddisk temperature"; - homepage = https://savannah.nongnu.org/projects/hddtemp/; - license = "GPL2"; + description = "Tool for displaying hard disk temperature"; + homepage = https://savannah.nongnu.org/projects/hddtemp/; + license = "GPL2"; }; } diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 54c50c15d23..36b29083e08 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,24 +1,24 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl }: + +stdenv.mkDerivation { name = "keychain-2.6.6"; - src = args.fetchurl { + src = fetchurl { url = http://gentoo.chem.wisc.edu/gentoo/distfiles/keychain-2.6.6.tar.bz2; sha256 = "10v0hzkgrb5cazm1gk0g4ncwp8sqvfk7xfyx59cjd69kzhbbn6ic"; }; phases = "unpackPhase buildPhase"; - buildPhase =" - mkdir -p \$out/bin - cp keychain \$out/bin - "; - - buildInputs =(with args; []); + buildPhase = + '' + mkdir -p $out/bin + cp keychain $out/bin + ''; meta = { - description = "tool starting ssh and gpg management tool"; - homepage = "http://www.gentoo.org/proj/en/keychain/"; - license = "GPL2"; + description = "Keychain management tool"; + homepage = "http://www.gentoo.org/proj/en/keychain/"; + license = "GPL2"; }; } diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 77ea33dc1e9..5d93ef44b36 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -1,16 +1,17 @@ -args: +{ stdenv, fetchurl, perl, shebangfix }: + # The homepage says this script is mature.. -args.stdenv.mkDerivation { +stdenv.mkDerivation { name = "mysql2pgsql-0.0.1a"; - src = args.fetchurl { + src = fetchurl { url = http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz; sha256 = "0dpbxf3kdvpihz9cisx6wi3zzd0cnifaqvjxavrbwm4k4sz1qamp"; }; phases = "unpackPhase installPhase"; - buildInputs = with args; [ perl shebangfix ]; + buildInputs = [ perl shebangfix ]; installPhase = '' mkdir -p $out/bin; @@ -20,8 +21,8 @@ args.stdenv.mkDerivation { ''; meta = { - description = "converts mysql dump files to psql loadable files "; - homepage = http://pgfoundry.org/projects/mysql2pgsql/; - license = "GPL"; + description = "converts mysql dump files to psql loadable files "; + homepage = http://pgfoundry.org/projects/mysql2pgsql/; + license = "GPL"; }; } diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index f587437b5da..f5be7b8a46d 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -1,19 +1,20 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl, openssl }: + +stdenv.mkDerivation { name = "proxytunnel-1.9.0"; - src = args.fetchurl { + src = fetchurl { url = mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz; sha256 = "1fd644kldsg14czkqjybqh3wrzwsp3dcargqf4fjkpqxv3wbpx9f"; }; - buildInputs =(with args; [openssl]); + buildInputs = [ openssl ]; - installPhase=''make DESTDIR="$out" PREFIX="" install''; + installPhase = ''make DESTDIR="$out" PREFIX="" install''; meta = { - description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; - homepage = http://proxytunnel.sourceforge.net/download.php; - license = "GPLv2"; + description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; + homepage = http://proxytunnel.sourceforge.net/download.php; + license = "GPLv2"; }; } diff --git a/pkgs/tools/misc/shebangfix/default.nix b/pkgs/tools/misc/shebangfix/default.nix index ca4a0004d19..082b04b95d7 100644 --- a/pkgs/tools/misc/shebangfix/default.nix +++ b/pkgs/tools/misc/shebangfix/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, perl }: + stdenv.mkDerivation { name = "shebangfix-0.0"; diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix index cc9f1f6f0dc..c861fc6f73a 100644 --- a/pkgs/tools/misc/slsnif/default.nix +++ b/pkgs/tools/misc/slsnif/default.nix @@ -1,17 +1,16 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl }: + +stdenv.mkDerivation { name = "slsnif-0.4.4"; - src = args.fetchurl { + src = fetchurl { url = mirror://sourceforge/slsnif/slsnif-0.4.4.tar.gz; sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii"; }; - buildInputs =(with args; []); - meta = { - description = "serial line sniffer"; - homepage = http://slsnif.sourceforge.net/; - license = "GPLv2"; + description = "Serial line sniffer"; + homepage = http://slsnif.sourceforge.net/; + license = "GPLv2"; }; } diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index e92b5a1cd2b..4fae21250ca 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -1,6 +1,8 @@ -args: with args; -let inherit (args.composableDerivation) composableDerivation edf; in -composableDerivation {} { +{ composableDerivation, stdenv, fetchurl, alsaLib, jackaudio, ncurses }: + +let inherit (composableDerivation) edf; in + +composableDerivation.composableDerivation {} { name = "timidity-2.13.0"; @@ -9,8 +11,6 @@ composableDerivation {} { sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf"; }; - buildInputs = []; - mergeAttrBy.audioModes = a : b : "${a},${b}"; preConfigure = '' @@ -57,7 +57,6 @@ composableDerivation {} { meta = { description = "A software MIDI renderer"; - maintainers = [args.lib.maintainers.marcweber]; + maintainers = [ stdenv.lib.maintainers.marcweber ]; }; - } diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index 870c5b1e121..c112afaee0f 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, perl, freetype }: + stdenv.mkDerivation { name = "ttf2pt1-3.4.4"; @@ -17,12 +18,13 @@ stdenv.mkDerivation { makeFlags="INSTDIR=$out OWNER=`id -u`" ''; - buildInputs = [freetype]; + buildInputs = [ freetype ]; + patches = ./gentoo-makefile.patch; # also contains the freetype patch meta = { - description = "True Type to Postscript Type 3 converter, fpdf"; - homepage = "http://ttf2pt1.sourceforge.net/index.html"; - license = "ttf2pt1"; + description = "True Type to Postscript Type 3 converter, fpdf"; + homepage = "http://ttf2pt1.sourceforge.net/index.html"; + license = "ttf2pt1"; }; } diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index 361a7b927b1..dbb46cea832 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkgconfig, libgsf +, libxml2, bzip2 }: stdenv.mkDerivation { name = "wv-1.2.4"; @@ -8,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7"; }; - buildInputs = [zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2]; + buildInputs = [ zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2 ]; meta = { description = "Converter from Microsoft Word formats to human-editable ones"; diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index d627235494b..fc29af989ce 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -1,17 +1,20 @@ -args: with args; +{ stdenv, fetchurl }: + +# !!! Duplication: this package is almost exactly the same as `bsd-finger'. + stdenv.mkDerivation rec { - name = "bsd-finger-0.17"; + name = "bsd-finger-0.17"; - src = fetchurl { - url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/${name}.tar.gz"; - sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; - }; + src = fetchurl { + url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/${name}.tar.gz"; + sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; + }; - NIX_CFLAGS_COMPILE="-D_GNU_SOURCE"; + NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; - patches = [./ubuntu-0.17-9.patch]; + patches = [ ./ubuntu-0.17-9.patch ]; - preBuild = "cd finger"; + preBuild = "cd finger"; - preInstall = '' ensureDir $out/man/man1 $out/bin ''; + preInstall = '' ensureDir $out/man/man1 $out/bin ''; } diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 9ce1731eb76..86430d3865c 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -1 +1,22 @@ -import ./iodine-0.4.1.nix +{ stdenv, fetchurl, zlib, nettools }: + +stdenv.mkDerivation rec { + name = "iodine-0.4.1"; + + src = fetchurl { + url = "http://code.kryo.se/iodine/${name}.tar.gz"; + sha256 = "1d0v6wbrciwd0xi9khrna956v5wy7wy1inllzrn187as358kiiv5"; + }; + + buildInputs = [ zlib ]; + + patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/sbin/ifconfig,; s,/sbin/route,${nettools}/sbin/route," src/tun.c''; + + installFlags = "prefix=\${out}"; + + meta = { + homepage = http://code.kryo.se/iodine/; + description = "Tool to tunnel IPv4 data through a DNS server"; + license = "ISC"; + }; +} diff --git a/pkgs/tools/networking/iodine/iodine-0.4.1.nix b/pkgs/tools/networking/iodine/iodine-0.4.1.nix deleted file mode 100644 index e20c86debe3..00000000000 --- a/pkgs/tools/networking/iodine/iodine-0.4.1.nix +++ /dev/null @@ -1,21 +0,0 @@ -args: with args; -stdenv.mkDerivation rec { - name = "iodine-0.4.1"; - - src = fetchurl { - url = "http://code.kryo.se/iodine/${name}.tar.gz"; - sha256 = "1d0v6wbrciwd0xi9khrna956v5wy7wy1inllzrn187as358kiiv5"; - }; - - buildInputs = [zlib]; - - patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/sbin/ifconfig,; s,/sbin/route,${nettools}/sbin/route," src/tun.c''; - - installFlags = "prefix=\${out}"; - - meta = { - homepage = http://code.kryo.se/iodine/; - description = "iodine lets you tunnel IPv4 data through a DNS server."; - license = "ISC"; - }; -} diff --git a/pkgs/tools/networking/iperf/default.nix b/pkgs/tools/networking/iperf/default.nix index e799e5118f9..1cb984e3d1c 100644 --- a/pkgs/tools/networking/iperf/default.nix +++ b/pkgs/tools/networking/iperf/default.nix @@ -1,14 +1,13 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { name = "iperf-2.0.4"; - src = args.fetchurl { + src = fetchurl { url = http://garr.dl.sourceforge.net/sourceforge/iperf/iperf-2.0.4.tar.gz; sha256 = "0i3r75prbyxs56rngjbrag8rg480ki3daaa924krrafng30z2liv"; }; -#buildInputs =(with args; []); - meta = { homepage = ""; description = "tool to measure IP bandwidth using UDP or TCP"; diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 8f4c18c06c3..b1456c0666e 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -1,5 +1,6 @@ -args: with args; -stdenv.mkDerivation ( rec { +{ stdenv, fetchurl, pkgconfig, openssl, libsigcxx }: + +stdenv.mkDerivation rec { pname = "libtorrent"; version = "0.12.6"; @@ -15,4 +16,4 @@ stdenv.mkDerivation ( rec { meta = { description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code"; }; -}) +} diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index a74bbc72523..eee5b5acbaa 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -1,5 +1,7 @@ -args: with args; -stdenv.mkDerivation ( rec { +{ stdenv, fetchurl, libtorrent, ncurses, pkgconfig, libsigcxx, curl +, zlib, openssl }: + +stdenv.mkDerivation rec { pname = "rtorrent"; version = "0.8.6"; @@ -15,4 +17,4 @@ stdenv.mkDerivation ( rec { meta = { description = "An ncurses client for libtorrent, ideal for use with screen or dtach"; }; -}) +} diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 8023175c52a..65a1d241c0b 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { name = "stun-0.96.dfsg-5"; @@ -26,11 +27,10 @@ stdenv.mkDerivation { }; meta = { - description = "stun server and test client"; - longDescription = "eg useful to debug voip trouble"; + description = "Stun server and test client"; homepage = http://sourceforge.net/projects/stun/; license = "Vovida 1.0"; # See any header file. - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/pydb/default.nix b/pkgs/tools/pydb/default.nix index 07d9545529b..7aa2d57955f 100644 --- a/pkgs/tools/pydb/default.nix +++ b/pkgs/tools/pydb/default.nix @@ -1,22 +1,23 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl, python, emacs }: + +stdenv.mkDerivation { name = "pydb-1.26"; - src = args.fetchurl { + src = fetchurl { url = "mirror://sourceforge.net/sourceforge/bashdb/pydb-1.26.tar.bz2"; sha256 = "1wlkz1hd5d4gkzhkjkzcm650c1lchj28hj36jx96mklglm41h4q1"; }; - buildInputs =(with args; [python emacs /* emacs is optional */]); + buildInputs = [ python emacs /* emacs is optional */ ]; preConfigure = '' p="$(toPythonPath $out)" - configureFlags="$configureFlags --with-python=${args.python}/bin/python --with-site-packages=$p" + configureFlags="$configureFlags --with-python=${python}/bin/python --with-site-packages=$p" ''; meta = { - description = "python debugger with gdb like commands and emacs bindings"; - homepage = http://bashdb.sourceforge.net/pydb/; - license = "GPLv3"; + description = "Python debugger with GDB-like commands and Emacs bindings"; + homepage = http://bashdb.sourceforge.net/pydb/; + license = "GPLv3"; }; } diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix index 2111a2b8dc1..6dab8f86c32 100644 --- a/pkgs/tools/text/multitran/libfacet/default.nix +++ b/pkgs/tools/text/multitran/libfacet/default.nix @@ -1,7 +1,8 @@ -{stdenv, fetchurl, libmtsupport} : +{ stdenv, fetchurl, libmtsupport }: stdenv.mkDerivation { name = "libfacet-0.0.1alpha2"; + src = fetchurl { url = mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2; sha256 = "dc53351c4035a3c27dc6c1d0410e808346fbc107e7e7c112ec65c59d0df7a144"; @@ -15,7 +16,6 @@ stdenv.mkDerivation { src/Makefile; ''; - meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: enchanced locale facets"; diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix index b89ffb850a0..0ab73142ea0 100644 --- a/pkgs/tools/text/patchutils/default.nix +++ b/pkgs/tools/text/patchutils/default.nix @@ -1,21 +1,19 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl }: + +stdenv.mkDerivation { name = "patchutils-0.3.0"; - src = args.fetchurl { + src = fetchurl { url = http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.0.tar.bz2; sha256 = "08jzvprhpcgwvx0xlkwc8dbdd9ilvwyr3cwnq96xmbfipch69yi7"; }; - buildInputs =(with args; []); - meta = { - description = "collection of programs that operate on patch files, fix" - + " diffs after manually editing them, create a diff of diffs etc"; - homepage = http://cyberelk.net/tim/software/patchutils; - license = "GPLv2"; - executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff" - "filterdiff" "fixcvsdiff" "flipdiff" "grepdiff" "interdiff" "lsdiff" - "recountdiff" "rediff" "splitdiff" "unwrapdiff" ]; + description = "Tools to manipulate patch files"; + homepage = http://cyberelk.net/tim/software/patchutils; + license = "GPLv2"; + executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff" + "filterdiff" "fixcvsdiff" "flipdiff" "grepdiff" "interdiff" "lsdiff" + "recountdiff" "rediff" "splitdiff" "unwrapdiff" ]; }; } diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix index 4249d32b3ce..806a0b21096 100644 --- a/pkgs/tools/video/swftools/default.nix +++ b/pkgs/tools/video/swftools/default.nix @@ -1,24 +1,18 @@ -args: -args.stdenv.mkDerivation { - # snapshot version does'nt compile - #name = "swftools-2008-10-13-1554"; - name = "swftools-0.8.1"; +{ stdenv, fetchurl, zlib }: - src = args.fetchurl { - #url = http://www.swftools.org/swftools-2008-10-13-1554.tar.gz; - #sha256 = "05r2qg8yc6lpj5263jyrdykr2vkq9rlyqxydx0rnfnkqpr7s6931"; +stdenv.mkDerivation { + name = "swftools-0.8.1"; + src = fetchurl { url = http://www.swftools.org/swftools-0.8.1.tar.gz; sha256 = "0l75c3ibwd24g9nqghp1rv1dfrlicw87s0rbdnyffjv4izz6gc2l"; }; - buildInputs =(with args; [zlib - # the following are not needed to compile 0.8.1 - libjpeg giflib freetype]); + buildInputs = [ zlib ]; meta = { - description = "collection of SWF manipulation and creation utilities"; - homepage = http://www.swftools.org/about.html; - license = "GPLv2"; - }; + description = "Collection of SWF manipulation and creation utilities"; + homepage = http://www.swftools.org/about.html; + license = "GPLv2"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ac8071dd64..9b89782a86d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -619,7 +619,7 @@ let }; debootstrap = import ../tools/misc/debootstrap { - inherit fetchurl stdenv lib dpkg gettext gawk wget perl; + inherit fetchurl stdenv dpkg gettext gawk wget perl; }; ddclient = import ../tools/networking/ddclient { @@ -1502,7 +1502,7 @@ let }; pstoedit = import ../tools/graphics/pstoedit { - inherit fetchurl stdenv lib pkgconfig ghostscript gd zlib plotutils; + inherit fetchurl stdenv pkgconfig ghostscript gd zlib plotutils; }; pv = import ../tools/misc/pv { @@ -1718,7 +1718,7 @@ let }; stun = import ../tools/networking/stun { - inherit fetchurl stdenv lib; + inherit fetchurl stdenv; }; stunnel = import ../tools/networking/stunnel { @@ -2082,11 +2082,11 @@ let }; adobe_flex_sdk = import ../development/compilers/adobe-flex-sdk { - inherit fetchurl stdenv unzip jre; + inherit fetchurl stdenv unzip; }; fpc = import ../development/compilers/fpc { - inherit fetchurl stdenv gawk system; + inherit fetchurl stdenv gawk; }; gambit = import ../development/compilers/gambit { @@ -2528,7 +2528,7 @@ let #TODO add packages http://cvs.haskell.org/Hugs/downloads/2006-09/packages/ and test # commented out because it's using the new configuration style proposal which is unstable hugs = import ../development/compilers/hugs { - inherit lib fetchurl stdenv composableDerivation; + inherit fetchurl composableDerivation; }; path64 = import ../development/compilers/path64 { @@ -2613,11 +2613,7 @@ let ocaml = ocaml_3_11_1; ocaml_3_08_0 = import ../development/compilers/ocaml/3.08.0.nix { - inherit fetchurl stdenv fetchcvs x11 ncurses; - }; - - ocaml_3_09_1 = import ../development/compilers/ocaml/3.09.1.nix { - inherit fetchurl stdenv x11 ncurses; + inherit fetchurl stdenv x11; }; ocaml_3_10_0 = import ../development/compilers/ocaml/3.10.0.nix { @@ -2940,11 +2936,11 @@ let pyrex = pyrex095; pyrex095 = import ../development/interpreters/pyrex/0.9.5.nix { - inherit fetchurl stdenv stringsWithDeps lib builderDefs python; + inherit fetchurl stdenv builderDefs python; }; pyrex096 = import ../development/interpreters/pyrex/0.9.6.nix { - inherit fetchurl stdenv stringsWithDeps lib builderDefs python; + inherit fetchurl stdenv builderDefs python; }; Qi = composedArgsAndFun (import ../development/compilers/qi/9.1.nix) { @@ -3126,7 +3122,7 @@ let }; avrdude = import ../development/tools/misc/avrdude { - inherit lib fetchurl stdenv flex yacc composableDerivation texLive; + inherit fetchurl flex yacc composableDerivation texLive; }; binutils = useFromStdenv "binutils" @@ -3340,7 +3336,7 @@ let }; inotifyTools = import ../development/tools/misc/inotify-tools { - inherit fetchurl stdenv lib; + inherit fetchurl stdenv; }; ired = import ../development/tools/analysis/radare/ired.nix { @@ -3496,7 +3492,7 @@ let swigWithJava = swig; swftools = import ../tools/video/swftools { - inherit fetchurl stdenv x264 zlib libjpeg freetype giflib; + inherit fetchurl stdenv zlib; }; texinfo49 = import ../development/tools/misc/texinfo/4.9.nix { @@ -3637,7 +3633,7 @@ let }; boolstuff = import ../development/libraries/boolstuff { - inherit fetchurl stdenv lib pkgconfig; + inherit fetchurl stdenv pkgconfig; }; boost = makeOverridable (import ../development/libraries/boost) { @@ -3673,7 +3669,7 @@ let }; ccrtp = import ../development/libraries/ccrtp { - inherit fetchurl stdenv lib pkgconfig openssl libgcrypt commoncpp2; + inherit fetchurl stdenv pkgconfig openssl libgcrypt commoncpp2; }; chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) { @@ -4573,7 +4569,7 @@ let }; libdv = import ../development/libraries/libdv { - inherit fetchurl stdenv lib composableDerivation; + inherit fetchurl composableDerivation; }; libdrm = if stdenv.isDarwin then null else (import ../development/libraries/libdrm { @@ -4656,7 +4652,7 @@ let }; libharu = import ../development/libraries/libharu { - inherit fetchurl stdenv lib zlib libpng; + inherit fetchurl stdenv zlib libpng; }; libical = import ../development/libraries/libical { @@ -4685,7 +4681,7 @@ let }; libsamplerate = import ../development/libraries/libsamplerate { - inherit fetchurl stdenv pkgconfig lib; + inherit fetchurl stdenv; }; libspectre = import ../development/libraries/libspectre { @@ -4776,7 +4772,7 @@ let }; libmng = import ../development/libraries/libmng { - inherit fetchurl stdenv lib zlib libpng libjpeg lcms automake autoconf libtool; + inherit fetchurl stdenv zlib libpng libjpeg lcms automake autoconf libtool; }; libmpcdec = import ../development/libraries/libmpcdec { @@ -4856,7 +4852,7 @@ let }; # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5 - libsigsegv_25 = import ../development/libraries/libsigsegv/2.5.nix { + libsigsegv_25 = import ../development/libraries/libsigsegv/2.5.nix { inherit fetchurl stdenv; }; @@ -5009,7 +5005,7 @@ let }; libzrtpcpp = import ../development/libraries/libzrtpcpp { - inherit fetchurl stdenv lib commoncpp2 openssl pkgconfig ccrtp; + inherit fetchurl stdenv commoncpp2 openssl pkgconfig ccrtp; }; lightning = import ../development/libraries/lightning { @@ -5137,8 +5133,8 @@ let }; # added because I hope that it has been easier to compile on x86 (for blender) - openalSoft = import ../development/libraries/openalSoft { - inherit fetchurl stdenv alsaLib libtool cmake; + openalSoft = import ../development/libraries/openal-soft { + inherit fetchurl stdenv alsaLib cmake; }; openbabel = import ../development/libraries/openbabel { @@ -5259,7 +5255,7 @@ let inherit fetchurl stdenv; }; - proj = import ../development/libraries/proj.4 { + proj = import ../development/libraries/proj { inherit fetchurl stdenv; }; @@ -5350,15 +5346,15 @@ let }; librdf_raptor = import ../development/libraries/librdf/raptor.nix { - inherit fetchurl stdenv lib libxml2 curl; + inherit fetchurl stdenv libxml2 curl; }; librdf_rasqal = import ../development/libraries/librdf/rasqal.nix { - inherit fetchurl stdenv lib pcre libxml2 gmp librdf_raptor pkgconfig; + inherit fetchurl stdenv pcre libxml2 gmp librdf_raptor pkgconfig; }; librdf = import ../development/libraries/librdf { - inherit fetchurl stdenv lib pkgconfig librdf_raptor ladspaH openssl zlib; + inherit fetchurl stdenv pkgconfig librdf_raptor ladspaH openssl zlib; }; redland = makeOverridable (import ../development/libraries/redland/1.0.10.nix) { @@ -5507,7 +5503,7 @@ let }); vamp = import ../development/libraries/audio/vamp { - inherit fetchurl stdenv lib pkgconfig libsndfile; + inherit fetchurl stdenv pkgconfig libsndfile; }; vtk = import ../development/libraries/vtk { @@ -6026,8 +6022,8 @@ let }; monetdb = import ../servers/sql/monetdb { - inherit composableDerivation getConfig; - inherit fetchurl stdenv pcre openssl readline libxml2 geos apacheAnt jdk5; + inherit composableDerivation; + inherit fetchurl pcre openssl readline libxml2 geos apacheAnt jdk5; }; mysql4 = import ../servers/sql/mysql { @@ -6168,7 +6164,7 @@ let ### OS-SPECIFIC afuse = import ../os-specific/linux/afuse { - inherit fetchurl stdenv lib pkgconfig fuse; + inherit fetchurl stdenv pkgconfig fuse; }; autofs5 = import ../os-specific/linux/autofs/autofs-v5.nix { @@ -6322,7 +6318,7 @@ let }; halevt = import ../os-specific/linux/hal/hal-evt.nix { - inherit fetchurl stdenv lib libxml2 pkgconfig boolstuff hal dbus_glib; + inherit fetchurl stdenv libxml2 pkgconfig boolstuff hal dbus_glib; }; hal_info = import ../os-specific/linux/hal/info.nix { @@ -7074,10 +7070,6 @@ let inherit fetchurl stdenv pkgconfig dbus libnih; }; - upstartJobControl = import ../os-specific/linux/upstart/jobcontrol.nix { - inherit stdenv; - }; - usbutils = import ../os-specific/linux/usbutils { inherit fetchurl stdenv pkgconfig libusb; }; @@ -8239,7 +8231,7 @@ let stdenv = stdenv2; }; - i810switch = import ../applications/misc/i810 { + i810switch = import ../os-specific/linux/i810switch { inherit fetchurl stdenv pciutils; }; @@ -8330,7 +8322,7 @@ let }; jackmeter = import ../applications/audio/jackmeter { - inherit fetchurl stdenv lib jackaudio pkgconfig; + inherit fetchurl stdenv jackaudio pkgconfig; }; jedit = import ../applications/editors/jedit { @@ -8376,7 +8368,7 @@ let }; ladspaH = import ../applications/audio/ladspa-plugins/ladspah.nix { - inherit fetchurl stdenv builderDefs stringsWithDeps; + inherit fetchurl stdenv builderDefs; }; ladspaPlugins = import ../applications/audio/ladspa-plugins { @@ -8686,7 +8678,7 @@ let # perhaps there are better apps for this task? It's how I had configured my preivous system. # And I don't want to rewrite all rules procmail = import ../applications/misc/procmail { - inherit fetchurl stdenv autoconf; + inherit fetchurl stdenv; }; pstree = import ../applications/misc/pstree { @@ -8944,7 +8936,7 @@ let }); timidity = import ../tools/misc/timidity { - inherit fetchurl stdenv lib alsaLib composableDerivation jackaudio ncurses; + inherit fetchurl stdenv alsaLib composableDerivation jackaudio ncurses; }; tkcvs = import ../applications/version-management/tkcvs { @@ -9670,7 +9662,7 @@ let }; biolib = import ../development/libraries/science/biology/biolib { - inherit fetchurl stdenv readline perl cmake rLang zlib; + inherit fetchurl stdenv cmake rLang zlib; }; emboss = import ../applications/science/biology/emboss { @@ -9854,8 +9846,8 @@ let }; gutenprint = import ../misc/drivers/gutenprint { - inherit fetchurl stdenv lib pkgconfig composableDerivation cups libtiff libpng - openssl git gimp; + inherit fetchurl stdenv pkgconfig composableDerivation cups libtiff libpng + openssl gimp; }; gutenprintBin = import ../misc/drivers/gutenprint/bin.nix { |