* Sync with the trunk.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18122

STABLE

@@ -1 +1 @@
-1
+0

VERSION

@@ -1 +1 @@
-0.12
+0.13

doc/Makefile

@@ -1,5 +1,6 @@
 # You may need to override this.
 docbookxsl = $(HOME)/.nix-profile/xml/xsl/docbook
+dblatex = dblatex
 
 XMLLINT = xmllint --catalogs
 XSLTPROC = xsltproc --catalogs \
@@ -16,7 +17,7 @@ NEWS_OPTS = \
  --stringparam section.autolabel.max.depth 0 \
  --stringparam header.rule 0
 
-all: NEWS.html NEWS.txt manual.html
+all: NEWS.html NEWS.txt manual.html manual.pdf
 
 NEWS.html: release-notes.xml
 	$(XSLTPROC) --nonet --xinclude --output $@ $(NEWS_OPTS) \
@@ -34,4 +35,7 @@ manual.html: *.xml
 	  $(docbookxsl)/html/docbook.xsl manual.xml
 
 manual.pdf: *.xml
-	dblatex manual.xml
+	$(dblatex) \
+	  -P doc.collab.show=0 \
+	  -P latex.output.revhistory=0 \
+	  manual.xml

doc/coding-conventions.xml

@@ -0,0 +1,175 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="chap-conventions">
+
+<title>Coding conventions</title>
+
+
+<section><title>Syntax</title>
+
+<itemizedlist>
+
+  <listitem><para>Use 2 spaces of indentation per indentation level in
+  Nix expressions, 4 spaces in shell scripts.</para></listitem>
+
+  <listitem><para>Do not use tab characters, i.e. configure your
+  editor to use soft tabs.  For instance, use <literal>(setq-default
+  indent-tabs-mode nil)</literal> in Emacs.  Everybody has different
+  tab settings so it’s asking for trouble.</para></listitem>
+
+  <listitem><para>Use <literal>lowerCamelCase</literal> for variable
+  names, not <literal>UpperCamelCase</literal>.  TODO: naming of
+  attributes in
+  <filename>all-packages.nix</filename>?</para></listitem>
+
+  <listitem><para>Function calls with attribute set arguments are
+  written as
+
+<programlisting>
+foo {
+  arg = ...;
+}
+</programlisting>
+
+  not
+
+<programlisting>
+foo
+{
+  arg = ...;
+}
+</programlisting>
+
+  Also fine is
+
+<programlisting>
+foo { arg = ...; }
+</programlisting>
+
+  if it's a short call.</para></listitem>
+
+  <listitem><para>In attribute sets or lists that span multiple lines,
+  the attribute names or list elements should be aligned:
+
+<programlisting>
+# A long list.
+list =
+  [ elem1
+    elem2
+    elem3
+  ];
+
+# A long attribute set.
+attrs =
+  { attr1 = short_expr;
+    attr2 =
+      if true then big_expr else big_expr;
+  };
+
+# Alternatively:
+attrs = {
+  attr1 = short_expr;
+  attr2 =
+    if true then big_expr else big_expr;
+};
+</programlisting>
+
+  </para></listitem>
+
+  <listitem><para>Short lists or attribute sets can be written on one
+  line:
+
+<programlisting>
+# A short list.
+list = [ elem1 elem2 elem3 ];
+
+# A short set.
+attrs = { x = 1280; y = 1024; };
+</programlisting>
+
+  </para></listitem>
+
+  <listitem><para>Breaking in the middle of a function argument can
+  give hard-to-read code, like
+
+<programlisting>
+someFunction { x = 1280;
+  y = 1024; } otherArg
+  yetAnotherArg
+</programlisting>
+
+  (especially if the argument is very large, spanning multiple
+  lines).</para>
+
+  <para>Better:
+
+<programlisting>
+someFunction
+  { x = 1280; y = 1024; }
+  otherArg
+  yetAnotherArg
+</programlisting>
+
+  or
+
+<programlisting>
+let res = { x = 1280; y = 1024; };
+in someFunction res otherArg yetAnotherArg
+</programlisting>
+
+  </para></listitem>
+
+  <listitem><para>The bodies of functions, asserts, and withs are not
+  indented to prevent a lot of superfluous indentation levels, i.e.
+
+<programlisting>
+{ arg1, arg2 }:
+assert system == "i686-linux";
+stdenv.mkDerivation { ...
+</programlisting>
+
+  not
+
+<programlisting>
+{ arg1, arg2 }:
+  assert system == "i686-linux";
+    stdenv.mkDerivation { ...
+</programlisting>
+
+  </para></listitem>
+
+  <listitem><para>Function formal arguments are written as:
+
+<programlisting>
+{ arg1, arg2, arg3 }:
+</programlisting>
+
+  but if they don't fit on one line they're written as:
+
+<programlisting>
+{ arg1, arg2, arg3
+, arg4, ...
+, # Some comment...
+  argN
+}:
+</programlisting>
+
+  </para></listitem>
+
+</itemizedlist>
+
+</section>
+
+
+<section><title>File naming and organisation</title>
+
+<para>Names of files and directories should be in lowercase, with
+dashes between words — not in camel case.  For instance, it should be
+<filename>all-packages.nix</filename>, not
+<filename>allPackages.nix</filename> or
+<filename>AllPackages.nix</filename>.</para>
+
+</section>
+
+
+</chapter>

doc/language-support.xml

@@ -13,7 +13,7 @@ in Nixpkgs to easily build packages for other programming languages,
 such as Perl or Haskell.  These are described in this chapter.</para>
 
 
-<section><title>Perl</title>
+<section xml:id="ssec-language-perl"><title>Perl</title>
 
 <para>Nixpkgs provides a function <varname>buildPerlPackage</varname>,
 a generic package builder function for any Perl package that has a
@@ -156,7 +156,42 @@ ClassC3Componentised = buildPerlPackage rec {
 
 <section><title>Python</title>
 
-<para>TODO</para>
+<para>
+  Python packages that
+  use <link xlink:href="http://pypi.python.org/pypi/setuptools/"><literal>setuptools</literal></link>,
+  which many Python packages do nowadays, can be built very simply using
+  the <varname>buildPythonPackage</varname> function.  This function is
+  implemented
+  in <link xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/development/python-modules/generic/default.nix"><filename>pkgs/development/python-modules/generic/default.nix</filename></link>
+  and works similarly to <varname>buildPerlPackage</varname>. (See
+  <xref linkend="ssec-language-perl"/> for details.)
+</para>
+
+<para>
+  Python packages that use <varname>buildPythonPackage</varname> are
+  defined
+  in <link xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>.
+  Most of them are simple.  For example:
+
+  <programlisting>
+twisted = buildPythonPackage {
+  name = "twisted-8.1.0";
+
+  src = fetchurl {
+    url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
+    sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
+  };
+
+  propagatedBuildInputs = [ pkgs.ZopeInterface ];
+
+  meta = {
+    homepage = http://twistedmatrix.com/;
+    description = "Twisted, an event-driven networking engine written in Python";
+    license = "MIT";
+  };
+};
+  </programlisting>
+</para>
 
 </section>
 
@@ -182,4 +217,4 @@ ClassC3Componentised = buildPerlPackage rec {
 </section>
 
 
-</chapter>
+</chapter>

doc/manual.xml

@@ -21,11 +21,10 @@
 
     <copyright>
       <year>2008</year>
+      <year>2009</year>
       <holder>Eelco Dolstra</holder>
     </copyright>
 
-    <date>June 2008</date>
-    
   </info>
 
   <xi:include href="introduction.xml" />
@@ -34,6 +33,7 @@
   <xi:include href="meta.xml" />
   <xi:include href="language-support.xml" />
   <xi:include href="package-notes.xml" />
+  <xi:include href="coding-conventions.xml" />
   
         
 </book>

doc/meta.xml

@@ -96,6 +96,18 @@ interpretation:</para>
     allowed values.</para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>maintainers</varname></term>
+    <listitem><para>A list of names and e-mail addresses of the
+    maintainers of this Nix expression, e.g. <literal>["Alice
+    &lt;alice@example.org>" "Bob &lt;bob@example.com>"]</literal>.  If
+    you are the maintainer of multiple packages, you may want to add
+    yourself to <link
+    xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/lib/maintainers.nix"><filename>pkgs/lib/maintainers.nix</filename></link>
+    and write something like <literal>[stdenv.lib.maintainers.alice
+    stdenv.lib.maintainers.bob]</literal>.</para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>priority</varname></term>
     <listitem><para>The <emphasis>priority</emphasis> of the package,
@@ -112,7 +124,7 @@ interpretation:</para>
 </section>
 
 
-<section><title>Licenses</title>
+<section xml:id="sec-meta-license"><title>Licenses</title>
 
 <note><para>This is just a first attempt at standardising the license
 attribute.</para></note>
@@ -152,6 +164,18 @@ following:
     3 or higher.</para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>bsd</varname></term>
+    <listitem><para>Catch-all for licenses that are essentially
+    similar to <link
+    xlink:href="http://www.gnu.org/licenses/license-list.html#ModifiedBSD">the
+    original BSD license with the advertising clause removed</link>,
+    i.e. permissive non-copyleft free software licenses.  This
+    includes the <link
+    xlink:href="http://www.gnu.org/licenses/license-list.html#X11License">X11
+    (“MIT”) License</link>.</para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>free</varname></term>
     <listitem><para>Catch-all for free software licenses not listed
@@ -164,6 +188,12 @@ following:
     listed above.</para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>free-non-copyleft</varname></term>
+    <listitem><para>Catch-all for free, non-copyleft software licenses
+    not listed above.</para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>unfree-redistributable</varname></term>
     <listitem><para>Unfree package that can be redistributed in binary

doc/package-notes.xml

@@ -170,9 +170,12 @@ splashutils_15 = ...;</programlisting>
 
 <para>The Nix expressions for the X.org packages reside in
 <filename>pkgs/servers/x11/xorg/default.nix</filename>.  This file is
-automatically generated from lists of tarballs in an X.org
-release.  As such it should not be modified directly; rather, you
-should modify the lists or the generator script.</para>
+automatically generated from lists of tarballs in an X.org release.
+As such it should not be modified directly; rather, you should modify
+the lists, the generator script or the file
+<filename>pkgs/servers/x11/xorg/overrides.nix</filename>, in which you
+can override or add to the derivations produced by the
+generator.</para>
 
 <para>The generator is invoked as follows:
 
@@ -212,8 +215,8 @@ some people or by other packages (such as
 <para>If the expression for a package requires derivation attributes
 that the generator cannot figure out automatically (say,
 <varname>patches</varname> or a <varname>postInstall</varname> hook),
-you should modify the generator script
-(<varname>generate-expr-from-tarballs.pl</varname>).</para>
+you should modify
+<filename>pkgs/servers/x11/xorg/overrides.nix</filename>.</para>
 
 </section>
 

doc/quick-start.xml

@@ -1,6 +1,6 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="chap-overvie">
+         xml:id="chap-quick-start">
 
 <title>Quick Start to Adding a Package</title>
 
@@ -104,8 +104,8 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
         </listitem>
 
         <listitem>
-          <para>Firefox: <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/networking/browsers/firefox-3/default.nix"><filename>pkgs/applications/networking/browsers/firefox-3/default.nix</filename></link>.
+          <para>Thunderbird: <link
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix</filename></link>.
           Lots of dependencies.</para>
         </listitem>
 
@@ -120,20 +120,19 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
 
         <listitem>
           <para>XML::Simple, a Perl module: <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></link>
-          (search for the <varname>perlXMLSimple</varname>
-          attribute).  Most Perl modules are so simple to build that
-          they are defined directly in
-          <filename>all-packages.nix</filename>, no need to make a
-          separate file for them.</para>
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>
+          (search for the <varname>XMLSimple</varname> attribute).
+          Most Perl modules are so simple to build that they are
+          defined directly in <filename>perl-packages.nix</filename>;
+          no need to make a separate file for them.</para>
         </listitem>
 
         <listitem>
           <para>Adobe Reader: <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/acrobat-reader/default.nix"><filename>pkgs/applications/misc/acrobat-reader/default.nix</filename></link>.
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>.
           Shows how binary-only packages can be supported.  In
           particular the <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/acrobat-reader/builder.sh">builder</link>
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/adobe-reader/builder.sh">builder</link>
           uses <command>patchelf</command> to set the RUNPATH and ELF
           interpreter of the executables so that the right libraries
           are found at runtime.</para>
@@ -148,10 +147,11 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
       <itemizedlist>
 
         <listitem>
-          <para>All <varname>meta</varname> attributes are optional,
-          but it’s still a good idea to provide at least the
-          <varname>description</varname> and
-          <varname>homepage</varname>.</para>
+          <para>All <varname linkend="chap-meta">meta</varname>
+          attributes are optional, but it’s still a good idea to
+          provide at least the <varname>description</varname>,
+          <varname>homepage</varname> and <varname
+          linkend="sec-meta-license">license</varname>.</para>
         </listitem>
 
         <listitem>
@@ -230,11 +230,11 @@ $ nix-env -f . -iA libfoo</screen>
     package and make them available in the <link
     xlink:href="http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/"><literal>nixpkgs</literal>
     channel</link>, add it to <link
-    xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/build-for-release.nix"><filename>pkgs/top-level/build-for-release.nix</filename></link>.</para>
+    xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/release.nix"><filename>pkgs/top-level/release.nix</filename></link>.</para>
   </listitem>
 
 </orderedlist>
 
 </para>
 
-</chapter>
+</chapter>

doc/stdenv.xml

@@ -879,7 +879,7 @@ distribution of the package.  The default
 <function>distPhase</function> first calls <command>make
 dist</command>, then it copies the resulting source tarballs to
 <filename>$out/tarballs/</filename>.  This phase is only executed if
-the <varname>doDist</varname> is not set.</para>
+the attribute <varname>doDist</varname> is not set.</para>
 
 <variablelist>
   <title>Variables controlling the distribution phase</title>

maintainers/docs/bugs.txt

@@ -1,49 +0,0 @@
-*** All these bugs should be moved to JIRA (if they still exist) ***
-
-
-* If NIX_DEBUG is turned on (set to "1"), autoconf configure scripts
-  may fail to find the correct preprocessor:
-
-    checking how to run the C preprocessor... /lib/cpp
-
-
-* When building gcc using a Nix gcc, generated libraries link against
-  the libraries of the latter:
-
-    $ ldd /nix/store/3b1d3995c4edbf026be5c73f66f69245-gcc-3.3.3/lib/libstdc++.so
-    ...
-    libgcc_s.so.1 => /nix/store/1f19e61d1b7051f1131f78b41b2a0e7e-gcc-3.3.2/lib/libgcc_s.so.1 (0x400de000)
-    (wrong! should be .../3b1d.../lib/libgcc_s...)
-    ...
-
-
-* In libXt:
-
-/bin/sh ./libtool --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.     -DXTHREADS -DXUSE_MTSAFE_API -I/nix/store/aadf0bd4a908da11d14f6538503b8408-libX11-6.2.1/include -I/nix/store/ba366e3b944ead64ec9b0490bb615874-xproto-6.6.1/include   -I./include/X11 -g -O2 -c -o ActionHook.lo `test -f 'ActionHook.c' || echo './'`ActionHook.c
-mkdir .libs
- gcc -DHAVE_CONFIG_H -I. -I. -I. -DXTHREADS -DXUSE_MTSAFE_API -I/nix/store/aadf0bd4a908da11d14f6538503b8408-libX11-6.2.1/include -I/nix/store/ba366e3b944ead64ec9b0490bb615874-xproto-6.6.1/include -I./include/X11 -g -O2 -c ActionHook.c  -fPIC -DPIC -o .libs/ActionHook.o
-In file included from IntrinsicI.h:55,
-                 from ActionHook.c:69:
-include/X11/IntrinsicP.h:54:27: X11/Intrinsic.h: No such file or directory
-
-
-* Then:
-
- gcc -DHAVE_CONFIG_H -I. -I. -I. -DXTHREADS -DXUSE_MTSAFE_API -I/nix/store/aadf0bd4a908da11d14f6538503b8408-libX11-6.2.1/include -I/nix/store/ba366e3b944ead64ec9b0490bb615874-xproto-6.6.1/include -I./include -I./include/X11 -g -O2 -c ActionHook.c  -fPIC -DPIC -o .libs/ActionHook.o
-In file included from IntrinsicI.h:55,
-                 from ActionHook.c:69:
-include/X11/IntrinsicP.h:202:25: X11/ObjectP.h: No such file or directory
-
-(moved to include/X11; should edit include/Makefile.am)
-
-
-* In gtksourceview-sharp: does the prefix patch cause problems (e.g.,
-  makefile.am says "mimeinfodir should be the same as the gnome
-  prefix")?
-
-
-* fgrep/egrep: these fail if grep is not in the $PATH.
-
-
-* teTeX: some programs (such as epstopdf) depend on /usr/bin/env, and
-  expect perl to be in the environment.

maintainers/docs/coding-conventions.txt

@@ -1,101 +0,0 @@
-Some conventions:
-
-* Directories / file names: lowercase, and use dashes between words,
-  no camel case.  I.e., all-packages.nix, not all allPackages.nix or
-  AllPackages.nix.
-
-* Don't use TABs.  Everybody has different TAB settings so it's asking
-  for trouble.
-
-* Use 2 spaces of indentation per indentation level in Nix
-  expressions, 4 spaces in shell scripts.  (Maybe 2 is too low, but
-  for consistency's sake it should be the same.  Certainly indentation
-  should be consistent within a single file.)
-
-* Use lowerCamelCase for variable names, not UpperCamelCase.
-
-* Function calls with attribute set arguments are written as
-
-    foo {
-      arg = ...;
-    }
-
-  not
-
-    foo
-    {
-      arg = ...;
-    }
-
-  Also fine is
-
-    foo { arg = ...; }
-
-  if it's a short call.
-
-* In attribute sets or lists that span multiple lines, the attribute
-  names or list elements should be aligned:
-
-    # A long list.
-    list = [
-      elem1
-      elem2
-      elem3
-    ];
-
-    # A long attribute set.
-    attrs = {
-      attr1 = short_expr;
-      attr2 =
-        if true then big_expr else big_expr;
-    };
-    
-* Short lists or attribute sets can be written on one line:
-    
-    # A short list.
-    list = [ elem1 elem2 elem3 ];
-
-    # A short set.
-    attrs = { x = 1280; y = 1024; };
-
-* Breaking in the middle of a function argument can give hard-to-read
-  code, like
-
-    someFunction { x = 1280;
-      y = 1024; } otherArg
-      yetAnotherArg
-
-  (especially if the argument is very large, spanning multiple lines).
-
-  Better:
-
-    someFunction
-      { x = 1280; y = 1024; }
-      otherArg
-      yetAnotherArg
-
-  or
-    
-    let res = { x = 1280; y = 1024; };
-    in someFunction res otherArg yetAnotherArg
-
-* The bodies of functions, asserts, and withs are not indented, so
-
-    assert system == "i686-linux";
-    stdenv.mkDerivation { ...
-
-  not
-
-    assert system == "i686-linux";
-      stdenv.mkDerivation { ...
-
-* Function formal arguments are written as:
-
-    {arg1, arg2, arg3}:
-
-  but if they don't fit on one line they're written as:
-
-    { arg1, arg2, arg3
-    , arg4, ...
-    , argN
-    }:

maintainers/docs/create-new-static-env

@@ -1,31 +0,0 @@
-Creating a new static stdenv
-----------------------------
-
-When Nix is ported to a new (Linux) platform and you want to have a completely
-pure setup for the stdenv (for example for NixOS) it is necessary to rebuild
-the static tools.
-
-The challenge is that there is no Nix environment yet, for bootstrapping.
-The first task is to create all the tools that are necessary. For most tools
-there are ready made Nix expressions.
-
-
-  GCC
-
-There is an expression gcc-static-3.4. Depending on whether or not you already
-have an environment built with Nix (x86-linux: yes, rest: not yet) you should
-set the noSysDirs parameter in all-packages.nix. If there is an environment,
-leave it, but if the system is still impure (like most systems), set noSysDirs
-to false.
-
-  bash
-
-There is an expression for bash-static. Simply build it.
-
-  bzip2
-
-There is an expression for bzip2-static. Simply build it.
-
-  findutils
-
-There is an expression for findutils-static. Simply build it.

maintainers/docs/static-initial-env

@@ -1,35 +0,0 @@
-Upgrading the standard initial environment
-
-For Nix on i686-linux we make use of an environment of statically linked
-tools (see $nixpkgs/stdenv/linux). The first version of these tools were
-compiled outside of Nix, in an impure environment. They are used as some
-magical ingredient to make everything work. To keep these tools more in
-synchronization with the rest of nixpkgs and to make porting of nixpkgs
-to other platforms easier the static versions are now also built with Nix
-and nixpkgs.
-
-The tools can be found in nixpkgs in:
-
-- shells/bash-static
-- tools/networking/curl-diet
-- tools/archivers/gnutar-diet
-- tools/compression/gzip-diet
-- tools/compression/bzip2-static
-- tools/text/gnused-diet
-- tools/text/diffutils-diet
-- tools/text/gnupatch-diet
-- tools/misc/findutils-static
-
-and
-- development/compilers/gcc-static-3.4
-
-Most packages are compiled with dietlibc, an alternate C library, apart
-from bash and findutils, which are statically linked to glibc. The reason
-we chose dietlibc has various reasons. First of all, curl cannot be built
-statically with glibc. If we do, we get a static binary, but it cannot resolve
-hostnames to IP addresses. glibc dynamically loads functionality at runtime
-to do resolving. When linking with dietlibc this doesn't happen.
-
-The static tools are not used as part of the input hashing (see Eelco's
-PhD thesis, paragraph 5.4.1), so changing them does not change anything and
-will not force a massive rebuild.

maintainers/docs/todo.txt

@@ -1,12 +0,0 @@
-* Patch development/tools/misc/libtool not to search standard
-  directories for libraries (like setup.sh does now). [do we want
-  this?]
-
-* Inform freedesktop people that Xaw requires Xpm.
-
-* After building gcc, filter out references to /tmp/nix... in
-  .../lib/libsupc++.la and .../lib/libstdc++.la
-
-* Add gettext to glib propagatedBuildInputs?  Glib's `gi18n.h' doesn't
-  seem to like Glibc `libintl.h'; needs the gettext one instead.
-  [Move from libbonoboui]

maintainers/scripts/copy-tarballs.sh

@@ -0,0 +1,57 @@
+#! /bin/sh -e
+
+distDir=/data/webserver/tarballs
+
+urls=$(nix-instantiate --eval-only --xml --strict pkgs/top-level/build-for-release.nix \
+    | grep -A2 'name="urls"' \
+    | grep '<string value=' \
+    | sed 's/.*"\(.*\)".*/\1/' \
+    | sort | uniq)
+
+for url in $urls; do
+    
+    if echo "$url" | grep -q -E "www.cs.uu.nl|nixos.org|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe|belastingdienst|microsoft|armijn/.nix|sun.com|archive.eclipse.org"; then continue; fi
+
+    base="$(basename "$url")"
+    newPath="$distDir/$base"
+
+    if ! test -e "$newPath"; then
+
+        #if echo $url | grep -q 'mirror://'; then
+        #   echo "$fn: skipping mirrored $url"
+        #   continue
+        #fi
+
+        echo "downloading $url to $newPath"
+
+        if test -n "$doCopy"; then
+            declare -a res
+            if ! res=($(PRINT_PATH=1 nix-prefetch-url "$url")); then
+                continue
+            fi
+            storePath=${res[1]}
+            cp $storePath "$newPath.tmp.$$"
+            mv -f "$newPath.tmp.$$" "$newPath"
+        fi
+        
+    fi
+
+    if test -n "$doCopy" -a -e "$newPath"; then
+
+        echo "hashing $newPath"
+
+        md5=$(nix-hash --flat --type md5 "$newPath")
+        ln -sfn "../$base" $distDir/md5/$md5
+
+        sha1=$(nix-hash --flat --type sha1 "$newPath")
+        ln -sfn "../$base" $distDir/sha1/$sha1
+
+        sha256=$(nix-hash --flat --type sha256 "$newPath")
+        ln -sfn "../$base" $distDir/sha256/$sha256
+        ln -sfn "../$base" $distDir/sha256/$(nix-hash --type sha256 --to-base32 "$sha256")
+
+    fi
+
+done
+
+echo DONE

maintainers/scripts/evacuate-urls.sh

@@ -1,83 +0,0 @@
-#! /bin/sh -e
-
-distDir=/data/webserver/dist/tarballs
-
-find "$1" -name "*.nix" | while read fn; do
-
-    grep -E '^ *url = ' "$fn" | while read line; do
-
-        if url=$(echo "$line" | sed 's^url = \(.*\);^\1^'); then
-
-            if ! echo "$url" | grep -q -E "www.cs.uu.nl|nixos.org|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe|belastingdienst|microsoft|armijn/.nix|sun.com|archive.eclipse.org"; then
-                base="$(basename "$url")"
-                newPath="$distDir/$base"
-
-		if test -e "$newPath"; then
-
-		    #echo "$fn: checking hash of existing $newPath"
-		    hash=$(fgrep -A 1 "$url" "$fn" | grep md5 | sed 's^.*md5 = \"\(.*\)\";.*^\1^')
-		    hashType=md5
-		    if test -z "$hash"; then
-			hash=$(fgrep -A 1 "$url" "$fn" | grep sha256 | sed 's^.*sha256 = \"\(.*\)\";.*^\1^')
-			hashType="sha256 --base32"
-			if test -n "$hash"; then
-			    if test "${#hash}" = 64; then
-				hash=$(nix-hash --to-base32 --type sha256 $hash)
-			    fi
-			else
-			    hash=$(fgrep -A 1 "$url" "$fn" | grep sha1 | sed 's^.*sha1 = \"\(.*\)\";.*^\1^')
-			    hashType="sha1"
-			    if test -z "$hash"; then
-				echo "WARNING: $fn: cannot figure out the hash for $url"
-				continue
-			    fi
-			fi
-		    fi
-		    #echo "HASH = $hash"
-		    if ! test "$(nix-hash --type $hashType --flat "$newPath")" = "$hash"; then
-			echo "WARNING: $fn: $newPath exists and differs, hash should be $hash!"
-			continue
-		    fi
-
-		else
-
-		    if echo $url | grep -q 'mirror://'; then
-			#echo "$fn: skipping mirrored $url"
-			continue
-		    fi
-
-		    echo "$fn: $url -> $newPath"
-
-		    if test -n "$doCopy"; then
-			if ! curl --disable-epsv --fail --location --max-redirs 20 --remote-time \
-			    "$url" --output "$newPath".tmp; then
-			    continue
-			fi
-		        mv -f "$newPath".tmp "$newPath"
-		    fi
-
-		fi
-
-		if test -n "$doCopy" -a -e "$newPath"; then
-
-		    md5=$(nix-hash --flat --type md5 "$newPath")
-		    ln -sfn "../$base" $distDir/md5/$md5
-
-		    sha1=$(nix-hash --flat --type sha1 "$newPath")
-		    ln -sfn "../$base" $distDir/sha1/$sha1
-
-		    sha256=$(nix-hash --flat --type sha256 "$newPath")
-		    ln -sfn "../$base" $distDir/sha256/$sha256
-		    ln -sfn "../$base" $distDir/sha256/$(nix-hash --type sha256 --to-base32 "$sha256")
-
-		fi
-
-            fi
-            
-        fi
-    
-    done
-
-done
-
-echo DONE

maintainers/scripts/patchelf-hints.sh

@@ -0,0 +1,84 @@
+
+usage() {
+    echo "
+$0 <path to unpacked binary distribution directory>
+
+This program return the list of libraries and where to find them based on
+your currently installed programs.
+";
+    exit 1
+}
+
+if test $# -ne 1; then
+  usage
+fi
+
+binaryDist=$1
+
+hasBinaries=false
+for bin in $(find $binaryDist -executable -type f) :; do
+    if test $bin = ":"; then
+        $hasBinaries || \
+            echo "No patchable found in this directory."
+        break
+    fi
+    hasBinaries=true
+
+    echo ""
+    echo "$bin:"
+    hasLibraries=false
+    unset interpreter
+    unset addRPath
+    for lib in $(strings $bin | grep '^\(/\|\)lib.*\.so' | sort | uniq) :; do
+        if test $lib = ":"; then
+            $hasLibraries || \
+                echo "  This program is a script or it is statically linked."
+            break
+        fi
+        hasLibraries=true
+
+        echo "  $lib:";
+
+        libPath=$lib
+        lib=$(basename $lib)
+
+        #versionLessLib=$(echo $lib | sed 's,[.][.0-9]*$,,')
+
+        libs="$(
+            find /nix/store/*/lib* \( -type f -or -type l \) -name $lib |
+            grep -v '\(bootstrap-tools\|system-path\|user-environment\|extra-utils\)'
+        )"
+
+        echo "$libs" |
+        sed 's,^/nix/store/[a-z0-9]*-\([^/]*\)/.*/\([^/]*\)$,    \1 -> \2,' |
+        sort |
+        uniq;
+
+        names=$(
+            echo "$libs" |
+            sed 's,^/nix/store/[a-z0-9]*-\([^/]*\)-[.0-9]*/.*$,\1,' |
+            sort |
+            uniq;
+        )
+
+        if test "$names" = "glibc"; then names="stdenv.glibc"; fi
+        if echo $names | grep -c "gcc" &> /dev/null; then names="stdenv.gcc.gcc"; fi
+
+        if test $lib != $libPath; then
+            interpreter="--interpreter \${$names}/lib/$lib"
+        elif echo $addRPath | grep -c "$names" &> /dev/null; then
+            :
+        else
+            addRPath=${addRPath+$addRPath:}"\${$names}/lib"
+        fi
+    done;
+    $hasLibraries && \
+        echo "
+  Patchelf command:
+
+    patchelf $interpreter \\
+      ${addRPath+--set-rpath $addRPath \\
+}      \$out/$bin
+
+"
+done;

maintainers/scripts/rebuild-amount.sh

@@ -0,0 +1,260 @@
+#!/bin/sh
+
+usage () {
+  echo 1>&2 "
+usage:
+  $0
+    [--git commit..commit | --git commit]
+    [--svn rev:rev | --svn rev]
+    [--path path[:path]*]
+    [--help]
+
+This program is used to investigate how any changes inside your nixpkgs
+repository may hurt.  With these kind of information you may choose wisely
+where you should commit your changes.
+
+This program adapts it-self to your versionning system to avoid too much
+effort on your Internet bandwidth.  If you need to check more than one
+commits / revisions, you may use the following commands:
+
+  --git remotes/trunk..master
+  --svn 17670:17677
+
+    Check the differences between each commit separating the first and the
+    last commit.
+
+  --path /etc/nixos/nixpkgs:/tmp/nixpkgs_1:/tmp/nixpkgs_2
+
+    Check the differences between multiple directories containing different
+    versions of nixpkgs.
+
+All these options exist with one commit / revision argument.  Such options
+are used to compare your \$NIXPKGS path with the specified version.
+
+If you omit to mention any other commit / revision, then your \$NIXPKGS path
+is compared with its last update.  This command is useful to test code from
+a dirty repository.
+
+"
+
+  exit 1;
+}
+
+#####################
+# Process Arguments #
+#####################
+
+: ${NIXPKGS=/etc/nixos/nixpkgs/}
+
+vcs=""
+gitCommits=""
+svnRevisions=""
+pathLocations=""
+verbose=false
+
+argfun=""
+for arg; do
+  if test -z "$argfun"; then
+    case $arg in
+      --git) vcs="git"; argfun="set_gitCommits";;
+      --svn) vcs="svn"; argfun="set_svnRevisions";;
+      --path) vcs="path"; argfun="set_pathLocations";;
+      --verbose) verbose=true;;
+      --help) usage;;
+      *) usage;;
+    esac
+  else
+    case $argfun in
+      set_*)
+        var=$(echo $argfun | sed 's,^set_,,')
+        eval $var=$arg
+        ;;
+    esac
+    argfun=""
+  fi
+done
+
+if $verbose; then
+  set -x
+else
+  set +x
+fi
+
+############################
+# Find the repository type #
+############################
+
+if test -z "$vcs"; then
+  if test -x "$NIXPKGS/.git"; then
+    if git --git-dir="$NIXPKGS/.git" branch > /dev/null 2>&1; then
+      vcs="git"
+      gitCommits=$(git --git-dir="$NIXPKGS/.git" log -n 1 --pretty=format:%H 2> /dev/null)
+    fi
+  elif test -x "$NIXPKGS/.svn"; then
+    cd "$NIXPKGS"
+    if svn info > /dev/null 2>&1; then
+      vcs="svn";
+      svnRevisions=$(svn info | sed -n 's,Revision: ,,p')
+    fi
+    cd -
+  else
+    usage
+  fi
+fi
+
+###############################
+# Define a storage directory. #
+###############################
+
+pkgListDir=""
+exitCode=1
+cleanup(){
+  test -e "$pkgListDir" && rm -rf "$pkgListDir"
+  exit $exitCode;
+}
+
+trap cleanup EXIT SIGINT SIGQUIT ERR
+
+pkgListDir=$(mktemp --tmpdir -d rebuild-amount-XXXXXXXX)
+vcsDir="$pkgListDir/.vcs"
+
+###########################
+# Versionning for Dummies #
+###########################
+
+path_init() {
+  if test "${pathLocations#*:}" = "$pathLocations"; then
+    pathLocations="$NIXPKGS:$pathLocations"
+  fi
+  pathLocations="${pathLocations}:"
+}
+
+path_getNext() {
+  pathLoc="${pathLocations%%:*}"
+  pathLocations="${pathLocations#*:}"
+}
+
+path_setPath() {
+  path="$pathLoc"
+}
+
+path_setName() {
+  name=$(echo "$pathLoc" | tr '/' '_')
+}
+
+################
+# Git Commands #
+################
+
+git_init() {
+  git clone "$NIXPKGS/.git" "$vcsDir" > /dev/null 2>&1
+  if echo "gitCommits" | grep -c "\.\." > /dev/null 2>&1; then
+    gitCommits=$(git --git-dir="$vcsDir/.git" log --reverse --pretty=format:%H $gitCommits 2> /dev/null)
+  else
+    pathLocations="$vcsDir:$NIXPKGS"
+    vcs="path"
+    path_init
+  fi
+}
+
+git_getNext() {
+  git --git-dir="$vcsDir/.git" checkout $(echo "$gitCommits" | head -n 1) > /dev/null 2>&1
+  gitCommits=$(echo "$gitCommits" | sed '1 d')
+}
+
+git_setPath() {
+  path="$vcsDir"
+}
+
+git_setName() {
+  name=$(git --git-dir="$vcsDir/.git" log -n 1 --pretty=format:%H  2> /dev/null)
+}
+
+#######################
+# Subversion Commands #
+#######################
+
+svn_init() {
+  cp -r "$NIXPKGS" "$vcsDir" > /dev/null 2>&1
+  if echo "svnRevisions" | grep -c ":" > /dev/null 2>&1; then
+    svnRevisions=$(seq ${svnRevisions%:*} ${svnRevisions#*:})
+  else
+    pathLocations="$vcsDir:$NIXPKGS"
+    vcs="path"
+    path_init
+  fi
+}
+
+svn_getNext() {
+  cd "$vcsDir"
+  svn checkout $(echo "$svnRevisions" | head -n 1) > /dev/null 2>&1
+  cd -
+  svnRevisions=$(echo "$svnRevisions" | sed '1 d')
+}
+
+svn_setPath() {
+  path="$vcsDir"
+}
+
+svn_setName() {
+  name=$(svn info  2> /dev/null | sed -n 's,Revision: ,,p')
+}
+
+####################
+# Logical Commands #
+####################
+
+init    () { ${vcs}_init; }
+getNext () { ${vcs}_getNext; }
+setPath () { ${vcs}_setPath; }
+setName () { ${vcs}_setName; }
+
+
+#####################
+# Check for Rebuild #
+#####################
+
+# Generate the list of all derivations that could be build from a nixpkgs
+# respository.  This list of derivation hashes is compared with previous
+# lists and a brief summary is produced on the output.
+
+compareNames () {
+    nb=$(diff -y --suppress-common-lines --speed-large-files "$pkgListDir/$1.drvs" "$pkgListDir/$2.drvs" 2> /dev/null | wc -l)
+    echo "$1 -> $2: $nb"
+}
+
+echo "Please wait, this may take some minutes ..."
+
+init
+first=""
+oldPrev=""
+
+prev=""
+curr=""
+
+while true; do
+  getNext
+  setPath # set path=...
+  setName # set name=...
+  curr="$name"
+
+  test -z "$curr" && break || true
+
+  nix-instantiate "$path" > "$pkgListDir/$curr.drvs" > /dev/null 2>&1 || true
+
+  if test -n "$prev"; then
+    compareNames "$prev" "$curr"
+  else
+    echo "Number of package to rebuild:"
+    first="$curr"
+  fi
+  oldPrev="$prev"
+  prev="$curr"
+done
+
+if test "$first" != "$oldPrev"; then
+  echo "Number of package to rebuild (first -> last):"
+  compareNames "$first" "$curr"
+fi
+
+exitCode=0

pkgs/applications/audio/ardour/default.nix

@@ -0,0 +1,40 @@
+args: with args;
+
+stdenv.mkDerivation {
+
+  name = "ardour-2.8.2";
+
+  # svn is the source to get official releases from their site?
+  # alternative: wget  --data-urlencode 'key=7c4b2e1df903aae5ff5cc4077cda801e' http://ardour.org/downloader
+  # but hash is changing ?
+  src = fetchurl {
+    url = http://mawercer.de/~nix/ardour-2.8.2.tar.bz2;
+    sha256 = "1igwv1r6rlybdac24qady5asaf34f9k7kawkkgyvsifhl984m735";
+  };
+
+  buildInputs = [
+    scons boost
+    pkgconfig fftw redland librdf_raptor librdf_rasqal jackaudio flac
+    libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx libusb cairomm
+    glib pango gtk glibmm gtkmm libgnomecanvas fftw librdf liblo aubio
+    fftw fftwSinglePrec libmad
+  ];
+
+  buildPhase = ''
+    ensureDir $out
+    export CXX=g++
+    scons PREFIX=$out install
+  '';
+  installPhase = ":";
+
+  meta = { 
+    description = "multi-track hard disk recording software";
+    longDescription = ''
+      Also read "the importance of Paying Something on their homepage, pelase!"
+    '';
+    homepage = http://ardour.org/;
+    license = "GPLv2";
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}

pkgs/applications/audio/audacious/plugins.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, audacious, dbus_glib, gettext
 , libmad, xlibs, alsaLib, taglib, libmpcdec, libogg, libvorbis
-, libcdio, libcddb
+, libcdio, libcddb, libxml2
 }:
 
 stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [
     pkgconfig audacious dbus_glib gettext libmad
     xlibs.libXcomposite alsaLib taglib libmpcdec
-    libogg libvorbis libcdio libcddb
+    libogg libvorbis libcdio libcddb libxml2
   ];
 
   preBuild = ''

pkgs/applications/audio/audacity/default.nix

@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib }:
+{ stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
+  libogg, libvorbis, libmad
+  }:
 
 stdenv.mkDerivation {
   name = "audacity-1.3.7";
@@ -7,9 +9,10 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = mirror://sourceforge/audacity/audacity-fullsrc-1.3.7.tar.bz2;
-    sha256 = "1kashc6cc6d5g6i59nqcrl795x1jqdh0lpg3msa1wckfj3hpljmy";
+    sha256 = "0b4arafpdyjjk52l6n7aw518hzm65iv9w5g39jqr2bmvn6a9qivi";
   };
-  buildInputs = [ wxGTK pkgconfig gettext gtk glib zlib ];
+  buildInputs = [ wxGTK pkgconfig gettext gtk glib zlib intltool perl 
+    libogg libvorbis libmad];
 
   meta = {
     description = "Sound editor with graphical UI";

pkgs/applications/audio/bmp-plugins/wma/builder.sh

@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-buildFlags="-f Makefile.bmp"
-
-installPhase=installPhase
-installPhase() {
-    ensureDir "$out/lib/bmp/Input"
-    cp libwma.so "$out/lib/bmp/Input"
-}
-
-genericBuild

pkgs/applications/audio/bmp-plugins/wma/default.nix

@@ -2,10 +2,18 @@
 
 stdenv.mkDerivation {
   name = "bmp-plugin-wma-1.0.5";
-  builder = ./builder.sh;
+  
   src = fetchurl {
     url = http://mcmcc.bat.ru/xmms-wma/xmms-wma-1.0.5.tar.bz2;
     md5 = "5d62a0f969617aeb40096362c7a8a506";
   };
+  
   buildInputs = [pkgconfig bmp];
+
+  buildFlags = "-f Makefile.bmp";
+  
+  installPhase = ''
+    ensureDir "$out/lib/bmp/Input"
+    cp libwma.so "$out/lib/bmp/Input"
+  '';
 }

pkgs/applications/audio/flac/default.nix

@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [libogg];
+
+  patches = [
+    # Fix for building on GCC 4.3.
+    (fetchurl {
+      url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1";
+      sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr";
+    })
+  ];
   
   meta = {
     homepage = http://flac.sourceforge.net;

pkgs/applications/audio/gtkpod/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser, libglade, flex, libid3tag }:
+{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser, libglade, flex, libid3tag, libvorbis }:
 
 stdenv.mkDerivation {
   name = "gtkpod-0.99.14";
@@ -7,7 +7,12 @@ stdenv.mkDerivation {
     url = mirror://sourceforge/gtkpod/gtkpod-0.99.14.tar.gz;
     sha256 = "0ggcfyhcdlf3br88csdki215k4clxixa192afz6f16k7h8s2iqbk";
   };
-  buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex libid3tag];
+
+  buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex libid3tag libvorbis ];
+
+  patchPhase = ''
+    sed -i 's/which/type -P/' scripts/*.sh
+  '';
 
   meta = {
     description = "GTK Manager for an Apple ipod";

pkgs/applications/audio/jackmeter/default.nix

@@ -0,0 +1,23 @@
+args: with args;
+
+let name = "jackmeter-0.3";
+in
+stdenv.mkDerivation {
+
+  inherit name;
+
+  src = fetchurl {
+    url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz";
+    sha256 = "03siznnq3f0nnqyighgw9qdq1y4bfrrxs0mk6394pza3sz4b6sgp";
+  };
+
+  buildInputs = [jackaudio pkgconfig];
+
+  meta = { 
+    description = "console jack loudness meter";
+    homepage = http://www.aelius.com/njh/jackmeter/;
+    license = "GPLv2";
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}

pkgs/applications/audio/ladspa-plugins/default.nix

@@ -10,7 +10,7 @@ args: with args;
 	};
 	in with localDefs;
 let
-	postInstall = FullDepEntry ("
+	postInstall = fullDepEntry ("
 		ensureDir \$out/share/ladspa/
 		ln -s \$out/lib/ladspa \$out/share/ladspa/lib
 	") [minInit defEnsureDir];

pkgs/applications/audio/ladspa-plugins/ladspah.nix

@@ -12,7 +12,7 @@ in
 	};
 	in with localDefs;
 let
-	copyFile = FullDepEntry ("
+	copyFile = fullDepEntry ("
 		ensureDir \$out/include
 		cp ${src} \$out/include/ladspa.h
 	") [minInit defEnsureDir];

pkgs/applications/audio/lame/default.nix

@@ -1,9 +1,13 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "lame-3.97";
+  name = "lame-3.98.2";
   src = fetchurl {
-    url = mirror://sourceforge/lame/lame-3.97.tar.gz ;
-    sha256 = "05xy9lv6m9s013lzlvhxwvr1586c239xaiiwka52k18hs6k388qa";
+    url = mirror://sourceforge/lame/lame-398-2.tar.gz;
+    sha256 = "0cmgr515szd9kd19mpzvwl3cbnpfyjyi47swj4afblcfkmb2hym1";
   };
+
+  # Either disable static, or fix the rpath of 'lame' for it to point
+  # properly to the libmp3lame shared object.
+  dontDisableStatic = true;
 }

pkgs/applications/audio/pavucontrol/default.nix

@@ -0,0 +1,30 @@
+{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libsigcxx
+, libglademm, libcanberra, intltool, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "pavucontrol-0.9.7";
+
+  src = fetchurl {
+    url = "http://0pointer.de/lennart/projects/pavucontrol/${name}.tar.gz";
+    sha256 = "1a1v06hbl1j78ryqy5aiccg6w5hf1yzday2b9h31kx7vr42ir1w0";
+  };
+
+  buildInputs = [ pkgconfig pulseaudio gtkmm libsigcxx libglademm libcanberra
+    intltool gettext ];
+
+  configureFlags = "--disable-lynx";
+
+  meta = {
+    description = "PulseAudio Volume Control";
+
+    longDescription = ''
+      PulseAudio Volume Control (pavucontrol) provides a GTK+
+      graphical user interface to connect to a PulseAudio server and
+      easily control the volume of all clients, sinks, etc.
+    '';
+
+    homepage = http://0pointer.de/lennart/projects/pavucontrol/;
+
+    license = "GPLv2+";
+  };
+}

pkgs/applications/audio/snd/default.nix

@@ -2,9 +2,9 @@ args :
 let 
   lib = args.lib;
   fetchurl = args.fetchurl;
-  FullDepEntry = args.FullDepEntry;
+  fullDepEntry = args.fullDepEntry;
 
-  version = lib.getAttr ["version"] "9.4" args; 
+  version = lib.attrByPath ["version"] "9.4" args; 
   buildInputs = with args; [gtk glib pkgconfig 
      libXpm gmp gettext libX11 fftw]
       ++ (lib.optional (args ? ruby) args.ruby)
@@ -38,20 +38,18 @@ rec {
   phaseNames = ["doConfigure" "preBuild" "makeDocsWork" 
     "doMakeInstall" "doForceShare"];
 
-  makeDocsWork = FullDepEntry ''
+  makeDocsWork = fullDepEntry ''
                 # hackish way to make html docs work
                 h="$out/share/snd/html"; ensureDir "$h"; cp *.html "$h"
                 patch -p1 < ${./doc.patch}
                 sed "s@HTML-DIR@$h@" -i index.scm snd-help.c
             '' ["defEnsureDir"];
 
-  preBuild = FullDepEntry (''
-		cp config.log /tmp/snd-config.log
+  preBuild = fullDepEntry (''
 		export NIX_LDFLAGS="$NIX_LDFLAGS -L${args.libX11}/lib -lX11"
-                
             '') ["minInit" "doUnpack" "makeDocsWork"];
 
-  name = "Snd-" + version;
+  name = "snd-" + version;
   meta = {
     description = "Snd sound editor.";
     homepage = http://ccrma.stanford.edu/software/snd;

pkgs/applications/audio/sonic-visualizer/default.nix

@@ -0,0 +1,45 @@
+# TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
+
+args: with args;
+
+stdenv.mkDerivation {
+
+#TODO add plugins!
+
+  name = "sonic-visualizer-1.6";
+
+  src = fetchurl {
+    url = http://downloads.sourceforge.net/sv1/sonic-visualiser-1.6.tar.bz2;
+    sha256 = "1dbqqa7anii2jnjpfwm4sr83nn4bwmz68xw4n6clycsz5iqk52f5";
+  };
+
+  buildInputs = [libsndfile qt fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
+    libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
+    # optional
+    jackaudio
+    # portaudio
+    pulseaudio
+    libmad
+    libogg # ?
+    # fishsound
+    liblo
+    ];
+
+  buildPhase = ''
+    qmake -makefile PREFIX=$out && make
+  '';
+
+  installPhase = ''
+    ensureDir $out/{bin,share/sv}
+    cp sv/sonic-visualiser $out/bin
+    cp -r sv/samples $out/share/sv/samples
+  '';
+
+  meta = { 
+    description = "View and analyse contents of music audio files";
+    homepage = http://www.sonicvisualiser.org/;
+    license = "GPLv2";
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}

pkgs/applications/audio/xmms/default.nix

@@ -2,6 +2,7 @@
 
 stdenv.mkDerivation {
   name = "xmms-1.2.10";
+  
   src = fetchurl {
     url = http://nixos.org/tarballs/xmms-1.2.10.tar.bz2;
     md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c";
@@ -15,5 +16,6 @@ stdenv.mkDerivation {
   meta = {
     description = "A music player very similar to Winamp";
     homepage = http://www.xmms.org;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/display-managers/slim/default.nix

@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
     # pam_response structures, not a pointer to an array of pointers to
     # pam_response structures.  Of course C can't tell the difference...
     ./pam.patch
+
+    # Don't set PAM_RHOST to "localhost", it confuses ConsoleKit
+    # (which assumes that a non-empty string means a remote session).
+    ./pam2.patch
   ];
 
   buildInputs = [x11 libjpeg libpng libXmu freetype pam];

pkgs/applications/display-managers/slim/pam2.patch

@@ -0,0 +1,20 @@
+diff -rc slim-1.3.1-orig/app.cpp slim-1.3.1/app.cpp
+*** slim-1.3.1-orig/app.cpp	2008-09-26 02:54:15.000000000 +0200
+--- slim-1.3.1/app.cpp	2009-08-17 02:59:37.000000000 +0200
+***************
+*** 226,232 ****
+          pam.start("slim");
+          pam.set_item(PAM::Authenticator::TTY, DisplayName);
+          pam.set_item(PAM::Authenticator::Requestor, "root");
+!         pam.set_item(PAM::Authenticator::Host, "localhost");
+  
+      }
+      catch(PAM::Exception& e){
+--- 226,232 ----
+          pam.start("slim");
+          pam.set_item(PAM::Authenticator::TTY, DisplayName);
+          pam.set_item(PAM::Authenticator::Requestor, "root");
+!         pam.set_item(PAM::Authenticator::Host, "");
+  
+      }
+      catch(PAM::Exception& e){

pkgs/applications/editors/eclipse-classic/default.nix

@@ -0,0 +1,69 @@
+{ stdenv, fetchurl, patchelf, makeDesktopItem
+, freetype, fontconfig, libX11, libXext, libXrender
+, glib, gtk, libXtst
+, jre
+}:
+
+assert stdenv ? glibc;
+
+stdenv.mkDerivation rec {
+  name = "eclipse-3.5.1";
+  src = if stdenv.system == "x86_64-linux" then
+    fetchurl {
+      url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz;
+      sha256 = "132zd7q9q29h978wnlsfbrlszc85r1wj30yqs2aqbv3l5xgny1kk";
+    }
+    else
+    fetchurl {
+      url = http://mirrors.linux-bg.org/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk.tar.gz;
+      sha256 = "0a0lpa7gxg91zswpahi6fvg3csl4csvlym4z2ad5cc1d4yvicp56";
+    }
+    ;
+
+  desktopItem = makeDesktopItem {
+    name = "Eclipse";
+    exec = "eclipse";
+    icon = "eclipse";
+    comment = "Integrated Development Environment";
+    desktopName = "Eclipse IDE";
+    genericName = "Integrated Development Environment";
+    categories = "Application;Development;";
+  };
+
+  buildInputs = [ patchelf ];
+  buildCommand = ''
+    # Unpack tarball
+    
+    tar xfvz $src
+    
+    # Patch binaries
+    cd eclipse
+    ${if stdenv.system == "x86_64-linux" then
+        "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 ./eclipse"
+      else
+        "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 ./eclipse"
+      }
+    patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib ./libcairo-swt.so
+
+    # Create wrapper script
+    cd ..
+    ensureDir $out/bin
+    cp -av eclipse $out
+    
+    cat > $out/bin/eclipse <<EOF
+    #!/bin/sh
+    
+    export PATH=${jre}/bin
+    export LD_LIBRARY_PATH=${glib}/lib:${gtk}/lib:${libXtst}/lib
+    
+    $out/eclipse/eclipse "\$@"
+    EOF
+    
+    chmod 755 $out/bin/eclipse
+    
+    # Create desktop item
+    
+    ensureDir $out/share/applications
+    cp ${desktopItem}/share/applications/* $out/share/applications
+  '';
+}

pkgs/applications/editors/eclipse/builder.sh

@@ -22,7 +22,7 @@ cat >> $out/bin/eclipse << EOF
 #! /bin/sh -e
 export PATH=${jdk}/bin\${PATH:+:}\$PATH
 export LD_LIBRARY_PATH=$rpath\${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH
-exec \$(dirname $0)/../eclipse/eclipse $@
+exec \$(dirname \$0)/../eclipse/eclipse $@
 EOF
 chmod +x $out/bin/eclipse
 

pkgs/applications/editors/eclipse/default.nix

@@ -9,25 +9,29 @@
 # Why use a local copy? This way it's easier to use the update manager to get plugins :-)
 
 
-{fetchurl, stdenv, jdk, gtk, glib, libXtst, plugins ? []}:
+{fetchurl, stdenv, jdk, gtk, glib, libXtst, makeOverridable, plugins ? [], unzip}:
 
-let {
-  body =
+let eclipseFun = 
+  makeOverridable ({name, bindist} :
     stdenv.mkDerivation {
-      name = "eclipse-sdk-3.5M6";
+      inherit name;
       builder = ./builder.sh;
       src = bindist;
-      buildInputs = [];
+      buildInputs = [ unzip /* unzip required by eclipseCDT */ ];
       inherit jdk plugins;
       libraries = [gtk glib libXtst];
-   };
+   }); in
 
-  bindist = 
-    if (stdenv.system == "x86_64-linux") then fetchurl {
-      url = ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/eclipse/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk-x86_64.tar.gz;
-      sha256 = "10p4idp5rcdf7xqwfk3kvmjxhi8x1v835m0y4pn9q4nhfb5643pi";
-    } else fetchurl {
-      url = ftp://mirror.micromata.de/eclipse/eclipse/downloads/drops/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk.tar.gz;
-      sha256 = "1z8j26b632ydhqrmwgbcqgiq7f1a542jam06z2h62mcbqazrcyah";
-    };
-}
+  eclipseFun {
+    # you can override these settings usnig .override {...} 
+    name = "eclipse-sdk-3.5M6";
+
+    bindist = 
+      if (stdenv.system == "x86_64-linux") then fetchurl {
+        url = ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/eclipse/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk-x86_64.tar.gz;
+        sha256 = "10p4idp5rcdf7xqwfk3kvmjxhi8x1v835m0y4pn9q4nhfb5643pi";
+      } else fetchurl {
+        url = ftp://mirror.micromata.de/eclipse/eclipse/downloads/drops/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk.tar.gz;
+        sha256 = "1z8j26b632ydhqrmwgbcqgiq7f1a542jam06z2h62mcbqazrcyah";
+      };
+  }

pkgs/applications/editors/eclipse/plugins/spoofax/default.nix

@@ -1,6 +0,0 @@
-{stdenv, fetchurl}:
-
-fetchurl {
-  url = http://www.ii.uib.no/~karltk/spoofax/plugins/org.spoofax.editor_0.3.11.jar;
-  md5 = "c36941afcb0e538e16fafd594eae128e";
-}

pkgs/applications/editors/eclipse/runner.nix

@@ -0,0 +1,32 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "nix-eclipse-runner-script";
+
+  phases = "installPhase";
+  installPhase = ''
+    ensureDir $out/bin
+    target=$out/bin/nix-run-eclipse
+    cat > $target << EOF
+    #!/bin/sh
+    export PATH=${jre}/bin:$PATH
+    export LD_LIBRARY_PATH=${glib}/lib:${gtk}/lib:${libXtst}/lib
+    # If you run out of XX space try these? -vmargs -Xms512m -Xmx2048m -XX:MaxPermSize=256m
+    exec "\$@"
+    EOF
+    chmod +x $target
+  '';
+
+  meta = { 
+    description = "provide environment to run Eclipse";
+    longDescription = ''
+      Is there one distribution providing support for up to date Eclipse installations?
+      There are various reasons why not.
+      Installing binaries just works. Get Eclipse binaries form eclipse.org/downloads
+      install this wrapper then run Eclipse like this:
+      nix-run-eclipse $PATH_TO_ECLIPSE/eclipse/eclipse
+      and be happy. Everything works including update sites.
+    '';
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}

pkgs/applications/editors/ed/default.nix

@@ -1,10 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "ed-1.2";
+  name = "ed-1.4";
+
   src = fetchurl {
     url = "mirror://gnu/ed/${name}.tar.gz";
-    sha256 = "1jhw050fzaffjf5qdj1ccn7alngam7yhd5zpzyxvrjphwmkd46kx";
+    sha256 = "1njgcghms1377csldi1yqjhcpghiii6bshdhnjpqp78sxs2xldnv";
   };
 
   doCheck = true;
@@ -26,5 +27,7 @@ stdenv.mkDerivation rec {
     license = "GPLv3+";
 
     homepage = http://www.gnu.org/software/ed/;
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }

pkgs/applications/editors/emacs-21/builder.sh

@@ -8,6 +8,5 @@ postConfigure() {
   cp $myglibc/lib/crti.o src
   cp $myglibc/lib/crtn.o src
 }
-postConfigure=postConfigure
 
 genericBuild

pkgs/applications/editors/emacs-22/builder.sh

@@ -1,6 +1,5 @@
 source $stdenv/setup
 
-preConfigure=preConfigure
 preConfigure() {
     libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
     echo "libc: $libc"

pkgs/applications/editors/emacs-22/default.nix

@@ -42,5 +42,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/emacs/;
     license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.linux;  # GTK & co. are needed.
   };
 }

pkgs/applications/editors/emacs-23/builder.sh

@@ -0,0 +1,34 @@
+source $stdenv/setup
+
+# This hook is supposed to be run on Linux. It patches the proper locations of
+# the crt{1,i,n}.o files into the build to ensure that Emacs is linked with
+# *our* versions, not the ones found in the system, as it would do by default.
+# On other platforms, this appears to be unnecessary.
+preConfigure() {
+    case "${system}" in
+	x86_64-linux)	glibclibdir=lib64 ;;
+	i686-linux)	glibclibdir=lib ;;
+        *)              return;
+    esac
+
+    libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
+    echo "libc: $libc"
+
+    for i in src/s/*.h src/m/*.h; do
+        substituteInPlace $i \
+            --replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \
+            --replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \
+            --replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \
+            --replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \
+            --replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \
+            --replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o
+    done
+
+    for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
+        substituteInPlace $i --replace /bin/pwd pwd
+    done
+}
+
+preBuild="make bootstrap"
+
+genericBuild

pkgs/applications/editors/emacs-23/default.nix

@@ -0,0 +1,73 @@
+{ xawSupport ? true
+, xpmSupport ? true
+, dbusSupport ? true
+, xaw3dSupport ? false
+, gtkGUI ? false
+, xftSupport ? false
+, stdenv, fetchurl, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
+, pkgconfig ? null, gtk ? null, libXft ? null, dbus ? null
+, libpng, libjpeg, libungif, libtiff, texinfo
+}:
+
+assert xawSupport -> libXaw != null;
+assert xpmSupport -> libXpm != null;
+assert dbusSupport -> dbus != null;
+assert xaw3dSupport -> Xaw3d != null;
+assert gtkGUI -> pkgconfig != null && gtk != null;
+assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug
+assert stdenv.system == "i686-darwin" -> xawSupport; # fails to link otherwise
+
+stdenv.mkDerivation rec {
+  name = "emacs-23.1";
+
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = "mirror://gnu/emacs/${name}.tar.bz2";
+    sha256 = "076b4ixdp29l4c02bwic26d14gxlj0lcqyam33wyj3ksgi2z8d9b";
+  };
+
+  buildInputs = [
+    ncurses x11 texinfo
+    (if xawSupport then libXaw else null)
+    (if xpmSupport then libXpm else null)
+    (if dbusSupport then dbus else null)
+    (if xaw3dSupport then Xaw3d else null)
+    libpng libjpeg libungif libtiff # maybe not strictly required?
+  ]
+  ++ (if gtkGUI then [pkgconfig gtk] else [])
+  ++ (if xftSupport then [libXft] else []);
+
+  configureFlags = "
+    ${if gtkGUI then "--with-x-toolkit=gtk --enable-font-backend --with-xft" else ""}
+  ";
+
+  doCheck = true;
+
+  meta = {
+    description = "GNU Emacs 23.x, the extensible, customizable text editor";
+
+    longDescription = ''
+      GNU Emacs is an extensible, customizable text editor—and more.  At its
+      core is an interpreter for Emacs Lisp, a dialect of the Lisp
+      programming language with extensions to support text editing.
+
+      The features of GNU Emacs include: content-sensitive editing modes,
+      including syntax coloring, for a wide variety of file types including
+      plain text, source code, and HTML; complete built-in documentation,
+      including a tutorial for new users; full Unicode support for nearly all
+      human languages and their scripts; highly customizable, using Emacs
+      Lisp code or a graphical interface; a large number of extensions that
+      add other functionality, including a project planner, mail and news
+      reader, debugger interface, calendar, and more.  Many of these
+      extensions are distributed with GNU Emacs; others are available
+      separately.
+    '';
+
+    homepage = http://www.gnu.org/software/emacs/;
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.linux;  # GTK & co. are needed.
+  };
+}

pkgs/applications/editors/emacs-modes/ecb/default.nix

@@ -0,0 +1,48 @@
+{ fetchurl, stdenv, emacs, cedet, jdee, texinfo }:
+
+stdenv.mkDerivation rec {
+  name = "ecb-2.40";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ecb/${name}.tar.gz";
+    sha256 = "0gp56ixfgnyk2j1fps4mk1yv1vpz81kivb3gq9f56jw4kdlhjrjs";
+  };
+
+  buildInputs = [ emacs ];
+  propagatedBuildInputs = [ cedet jdee ];
+  propagatedUserEnvPkgs = propagatedBuildInputs;
+
+  patchPhase = ''
+    sed -i "Makefile" \
+        -e 's|CEDET[[:blank:]]*=.*$|CEDET = ${cedet}/share/emacs/site-lisp|g ;
+            s|INSTALLINFO[[:blank:]]*=.*$|INSTALLINFO = ${texinfo}/bin/install-info|g ;
+            s|MAKEINFO[[:blank:]]*=.*$|MAKEINFO = ${texinfo}/bin/makeinfo|g ;
+            s|common/cedet.el|cedet.el|g'
+  '';
+
+  installPhase = ''
+    ensureDir "$out/share/emacs/site-lisp"
+    cp -rv *.el *.elc ecb-images "$out/share/emacs/site-lisp"
+
+    ensureDir "$out/share/info"
+    cp -v info-help/*.info* "$out/share/info"
+  '';
+
+  meta = {
+    description = "ECB, the Emacs Code browser";
+
+    longDescription = ''
+      ECB stands for "Emacs Code Browser".  While Emacs already has
+      good editing support for many modes, its browsing support is
+      somewhat lacking.  That's where ECB comes in: it displays a
+      number of informational windows that allow for easy source code
+      navigation and overview.
+    '';
+
+    license = "GPLv2+";
+
+    homepage = http://ecb.sourceforge.net/;
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}

pkgs/applications/editors/emacs-modes/eieio/default.nix

@@ -1,40 +0,0 @@
-{ fetchurl, stdenv, emacs }:
-
-stdenv.mkDerivation rec {
-  name = "eieio-0.17";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/cedet/${name}.tar.gz";
-    sha256 = "0n31z9d47ar10g9xrnzz3nl4pmixw1nkk0kpxaillls7xvjd1zy2";
-  };
-
-  buildInputs = [ emacs ];
-
-  doCheck = false;
-  checkPhase = "make test";
-
-  installPhase = ''
-    ensureDir "$out/share/emacs/site-lisp"
-    cp -v *.el *.elc "$out/share/emacs/site-lisp"
-    chmod a-x "$out/share/emacs/site-lisp/"*
-
-    ensureDir "$out/share/info"
-    cp -v *.info* "$out/share/info"
-  '';
-
-  meta = {
-    description = "EIEIO: Enhanced Implementation of Emacs Interpreted Objects";
-
-    longDescription = ''
-      This package is now part of CEDET, please upgrade.
-
-      EIEIO is a package which implements a CLOS subset for Emacs.  It
-      includes examples which can draw simple tree graphs, and bar
-      charts.
-    '';
-
-    license = "GPLv2+";
-
-    homepage = http://cedet.sourceforge.net/;
-  };
-}

pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix

@@ -0,0 +1,61 @@
+{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoconf }:
+
+let date = "2009-07-09"; in
+stdenv.mkDerivation rec {
+  name = "emacs-w3m-cvs${date}";
+
+  # Get the source from CVS because the previous release (1.4.4) is old and
+  # doesn't work with GNU Emacs 23.
+  src = fetchcvs {
+    inherit date;
+    cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
+    module = "emacs-w3m";
+    sha256 = "ad46592d4fe3cdaadc02ce6d3fb1ac237e200beecd2ad11a04c1395a38a70a0a";
+  };
+
+  buildInputs = [ emacs w3m texinfo autoconf ];
+
+  # XXX: Should we do the same for xpdf/evince, gv, gs, etc.?
+  patchPhase = ''
+    sed -i "w3m.el" \
+        -e 's|defcustom w3m-command nil|defcustom w3m-command "${w3m}/bin/w3m"|g ;
+            s|(w3m-which-command "display")|"${imagemagick}/bin/display"|g'
+
+    sed -i "w3m-image.el" \
+        -e 's|(w3m-which-command "convert")|"${imagemagick}/bin/convert"|g ;
+            s|(w3m-which-command "identify")|"${imagemagick}/bin/identify"|g'
+  '';
+
+  configurePhase = ''
+    autoreconf -vfi && \
+    ./configure --prefix="$out" --with-lispdir="$out/share/emacs/site-lisp" \
+                --with-icondir="$out/share/emacs/site-lisp/images/w3m"
+  '';
+
+  postInstall = ''
+    cd "$out/share/emacs/site-lisp"
+    for i in ChangeLog*
+    do
+      mv -v "$i" "w3m-$i"
+    done
+  '';
+
+  meta = {
+    description = "Emacs-w3m, a simple Emacs interface to the w3m web browser";
+
+    longDescription = ''
+      Emacs/W3 used to be known as the most popular WEB browser on Emacs, but
+      it worked so slowly that we wanted a simple and speedy alternative.
+
+      w3m is a pager with WWW capability, developed by Akinori ITO. Although
+      it is a pager, it can be used as a text-mode WWW browser. Then we
+      developed a simple Emacs interface to w3m.
+    '';
+
+    license = "GPLv2+";
+
+    homepage = http://emacs-w3m.namazu.org/;
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}

pkgs/applications/editors/emacs-modes/haskell/default.nix

@@ -1,15 +1,15 @@
 {stdenv, fetchurl, emacs}:
 
 stdenv.mkDerivation rec {
-  name = "haskell-mode-2.4";
-  
+  name = "haskell-mode-2.6.1";
+
   src = fetchurl {
-    url = "http://www.iro.umontreal.ca/~monnier/elisp/${name}.tar.gz";
-    sha256 = "1s2dd0clwm0qaq7z43vxx437l48c88yrd3z1a6qhbq8aak9y8jc5";
+    url = "http://projects.haskell.org/haskellmode-emacs/${name}.tar.gz";
+    sha256 = "cc33fd0d4692667a6eb56fea3dc549de3897d8dbb7b71818489760f45d564a76";
   };
-  
+
   buildInputs = [emacs];
-  
+
   installPhase = ''
     ensureDir "$out/share/emacs/site-lisp"
     cp *.el *.elc *.hs "$out/share/emacs/site-lisp/"

pkgs/applications/editors/emacs-modes/jdee/build-properties.patch

@@ -0,0 +1,12 @@
+Make sure `build.properties' is honored.
+
+--- jde/build.xml
++++ jde/build.xml
+@@ -14,6 +14,7 @@
+   <property name="project.version" value="2.4.0"/>
+   <property name="config.dir" location="./config"/>
+ 
++  <property file="build.properties"/>
+ 
+   <!-- everything depends on this initialization target -->
+   <target name="init">

pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch

@@ -0,0 +1,18 @@
+JDE insists on seeing CEDET's source tree layout, with various
+sub-directories (`common', `eieio', etc.).  However, the installed CEDET
+is flat, with everything under ${cedet}/share/emacs/site-lisp.
+
+--- jde/config/build.el	(revision 90)
++++ jde/config/build.el	(working copy)
+@@ -50,10 +50,5 @@ PATHS are sub directories under CEDET-DI
+ (jde-make-autoloads-and-compile (expand-file-name "@{build.lisp.dir}")
+ 				"@{src.lisp.dir}"
+ 				"@{cedet.dir}"
+-				'("common"
+-				  "eieio"
+-				  "semantic"
+-				  "semantic/bovine"
+-				  "speedbar"
+-				  )
++				'(".")
+ 				"@{build.lisp.autoload.libname}")

pkgs/applications/editors/emacs-modes/jdee/default.nix

@@ -0,0 +1,95 @@
+{ fetchsvn, stdenv, emacs, cedet, ant }:
+
+let
+  revision = "137";
+in
+  stdenv.mkDerivation rec {
+    name = "jdee-svn${revision}";
+
+    # Last release is too old, so use SVN.
+    # See http://www.emacswiki.org/emacs/JavaDevelopmentEnvironment .
+    src = fetchsvn {
+      # Looks like they're not sure whether to put one or two `e'...
+      url = "https://jdee.svn.sourceforge.net/svnroot/jdee/trunk/jde";
+      rev = revision;
+      sha256 = "0pjkbr1srx2m428xkky1csf97fr5219prs4dif7njlydyrwp0gnn";
+    };
+
+    patches = [
+      ./build-properties.patch
+      ./cedet-paths.patch ./elib-avltree.patch
+      ./java-directory.patch
+    ];
+
+    configurePhase = ''
+      ensureDir "dist"
+      cat > build.properties <<EOF
+        dist.lisp.dir = dist/share/emacs/site-lisp
+        dist.java.lib.dir = dist/lib/java
+        dist.jar.jde.file = dist/lib/java/jde.jar
+        dist.java.src.dir = dist/src/${name}/java
+        dist.doc.dir  dist/doc/${name}
+        prefix.dir = $out
+        cedet.dir = ${cedet}/share/emacs/site-lisp
+        elib.dir = /nowhere
+        build.bin.emacs = ${emacs}/bin/emacs
+      EOF
+
+      # Substitute variables, à la Autoconf.
+      for i in "lisp/"*.el
+      do
+        sed -i "$i" -e "s|@out@|$out|g ;
+                        s|@javadir@|$out/lib/java|g ;
+                        s|@datadir@|$out/share/${name}|g"
+      done
+    '';
+
+    buildPhase = "ant dist";
+
+    installPhase = ''
+      ant install
+
+      ensureDir "$out/share/${name}"
+      cp -rv java/bsh-commands "$out/share/${name}"
+
+      # Move everything that's not a JAR to $datadir.  This includes
+      # `sun_checks.xml', license files, etc.
+      cd "$out/lib/java"
+      for i in *
+      do
+        if echo $i | grep -qv '\.jar''$'
+        then
+            mv -v "$i" "$out/share/${name}"
+        fi
+      done
+    '';
+
+    buildInputs = [ emacs ant ];
+    propagatedBuildInputs = [ cedet ];
+    propagatedUserEnvPkgs = propagatedBuildInputs; # FIXME: Not honored
+
+    meta = {
+      description = "JDEE, a Java development environment for Emacs";
+
+      longDescription = ''
+        The JDEE is a software package that interfaces Emacs to
+        command-line Java development tools (for example, JavaSoft's
+        JDK).  JDEE features include:
+
+        * JDEE menu with compile, run, debug, build, browse, project,
+          and help commands
+        * syntax coloring
+        * auto indentation
+        * compile error to source links
+        * source-level debugging
+        * source code browsing
+        * make file support
+        * automatic code generation
+        * Java source interpreter (Pat Neimeyer's BeanShell)
+      '';
+
+      license = "GPLv2+";
+
+      maintainers = [ stdenv.lib.maintainers.ludo ];
+    };
+  }

pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch

@@ -0,0 +1,105 @@
+JDEE refers to the `avltree' module from GNU Elib, but GNU Elib
+no longer exists (see http://www.gnu.org/software/elib/).  This
+patch updates the module names to what's current in Emacs.
+
+--- jde/config/build.el
++++ jde/config/build.el
+@@ -33,11 +33,10 @@ compile.
+ CEDET-DIR is the cedet lisp code base directory (see PATHS).
+ 
+ PATHS are sub directories under CEDET-DIR we use to compile."
+-  (dolist (path (list dir lisp-src-dir elib-dir cedet-dir))
++  (dolist (path (list dir lisp-src-dir cedet-dir))
+     (if (not (file-directory-p path))
+ 	(error "Doesn't exist or not a directory: %s" path)))
+   (let ((autoload-buf (jde-make-autoloads dir autoload-libname)))
+-    (add-to-list 'load-path elib-dir t)
+     (dolist (path paths)
+       (add-to-list 'load-path (expand-file-name path cedet-dir) t))
+     (add-to-list 'load-path lisp-src-dir t)
+
+--- jde/lisp/jde-parse.el	(revision 90)
++++ jde/lisp/jde-parse.el	(working copy)
+@@ -24,7 +24,7 @@
+ 
+ (require 'semantic-sb)
+ (require 'semantic-ctxt)
+-(require 'avltree)
++(require 'avl-tree)
+ (require 'thingatpt)
+ (require 'eieio)
+ (require 'jde-imenu)                    ; All the imenu stuff is here now!
+@@ -869,7 +869,8 @@ in a method; otherwise, nil."
+ 
+ (defclass jde-avl-tree ()
+   ((tree        :initarg tree
+-	        :type list
++		;; FIXME: Emacs 23 `avl-tree' objects are not lists.
++	        ;;:type list
+ 	        :documentation
+ 	        "The tree")
+    (compare-fcn :initarg compare-fcn
+@@ -887,51 +887,51 @@ in a method; otherwise, nil."
+ 
+   (assert (typep  (oref this compare-fcn)  'function))
+ 
+-  (oset this  tree (avltree-create (oref this compare-fcn))))
++  (oset this  tree (avl-tree-create (oref this compare-fcn))))
+ 
+ (defmethod jde-avl-tree-add ((this jde-avl-tree) item)
+   "Inserts ITEM in this tree."
+-  (avltree-enter (oref this tree) item))
++  (avl-tree-enter (oref this tree) item))
+ 
+ (defmethod jde-avl-tree-delete ((this jde-avl-tree) item)
+   "Deletes ITEM from THIS tree."
+-  (avltree-delete (oref this tree) item))
++  (avl-tree-delete (oref this tree) item))
+ 
+ (defmethod jde-avl-tree-is-empty ((this jde-avl-tree))
+   "Return t if THIS tree is empty, otherwise return nil."
+-  (avltree-empty (oref this tree)))
++  (avl-tree-empty (oref this tree)))
+ 
+ (defmethod jde-avl-tree-find ((this jde-avl-tree) item)
+   "Return the element in THIS tree that matches item."
+-  (avltree-member (oref this tree) item))
++  (avl-tree-member (oref this tree) item))
+ 
+ (defmethod jde-avl-tree-map ((this jde-avl-tree) map-function)
+   "Applies MAP-FUNCTION to all elements of THIS tree."
+-  (avltree-map map-function (oref this tree)))
++  (avl-tree-map map-function (oref this tree)))
+ 
+ (defmethod jde-avl-tree-first ((this jde-avl-tree))
+   "Return the first item in THIS tree."
+-  (avltree-first (oref this tree)))
++  (avl-tree-first (oref this tree)))
+   
+ (defmethod jde-avl-tree-last ((this jde-avl-tree))
+   "Return the last item in THIS tree."
+-  (avltree-last (oref this tree)))
++  (avl-tree-last (oref this tree)))
+ 
+ (defmethod jde-avl-tree-copy ((this jde-avl-tree))
+   "Return a copy of THIS tree."
+-  (avltree-copy (oref this tree)))
++  (avl-tree-copy (oref this tree)))
+ 
+ (defmethod jde-avl-tree-flatten ((this jde-avl-tree))
+   "Return a sorted list containing all elements of THIS tree."
+-  (avltree-flatten (oref this tree)))
++  (avl-tree-flatten (oref this tree)))
+ 
+ (defmethod jde-avl-tree-size ((this jde-avl-tree))
+   "Return the number of elements in THIS tree."
+-  (avltree-size (oref this tree)))
++  (avl-tree-size (oref this tree)))
+ 
+ (defmethod jde-avl-tree-clear ((this jde-avl-tree))
+   "Delete all elements of THIS tree."
+-  (avltree-clear (oref this tree)))
++  (avl-tree-clear (oref this tree)))
+ 
+ (defclass jde-parse-method-map (jde-avl-tree) 
+   ()

pkgs/applications/editors/emacs-modes/jdee/java-directory.patch

@@ -0,0 +1,82 @@
+Tell the elisp code about the right Java directory.
+
+--- jde/lisp/jde.el	(revision 90)
++++ jde/lisp/jde.el	(working copy)
+@@ -2448,17 +2448,14 @@ environment variable."
+ (defmethod initialize-instance ((this jde-bsh) &rest fields)
+   "Constructor for the JDEE BeanShell instance."
+   (call-next-method)
+-  (let* ((jde-java-directory
+-          (concat
+-           (jde-find-jde-data-directory)
+-           "java/")))
+-
+-    (oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory))
+-    (oset this checkstyle-jar  (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))
+-    (oset this regexp-jar (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory))
++  (let ((jde-java-directory "@out@/lib/java"))
++
++    (oset this bsh-cmd-dir "@datadir@/bsh-commands")
++    (oset this checkstyle-jar  (expand-file-name "checkstyle-all.jar" jde-java-directory))
++    (oset this regexp-jar (expand-file-name "jakarta-regexp.jar" jde-java-directory))
+     (oset this jde-classes-dir (expand-file-name "classes" jde-java-directory))
+-    (oset this jde-jar (expand-file-name "lib/jde.jar" jde-java-directory))
+-    (oset this jar  (expand-file-name "lib/bsh.jar" jde-java-directory))
++    (oset this jde-jar (expand-file-name "jde.jar" jde-java-directory))
++    (oset this jar  (expand-file-name "bsh.jar" jde-java-directory))
+     (oset-default 'jde-bsh the-bsh this)))
+ 
+ (defmethod bsh-create-buffer ((this jde-bsh))
+
+--- jde/lisp/jde-checkstyle.el	(revision 90)
++++ jde/lisp/jde-checkstyle.el	(working copy)
+@@ -316,10 +316,7 @@ string describing how the compilation fi
+ 	 (vm-path (oref (jde-run-get-vm) :path))
+ 	 (source-file 
+ 	  (concat (file-name-nondirectory buffer-file-name)))
+-	 (jde-java-directory
+-	  (concat
+-	   (jde-find-jde-data-directory)
+-	   "java/"))
++	 (jde-java-directory "@out@/lib/java")
+ 	 (args (append
+ 		(unless jde-checkstyle-expanded-properties-file
+ 		  (jde-checkstyle-get-property-args this))
+@@ -328,12 +325,12 @@ string describing how the compilation fi
+ 		      (if jde-checkstyle-classpath
+ 			  (jde-build-classpath jde-checkstyle-classpath)
+ 			(jde-normalize-path
+-			 (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))))
++			 (expand-file-name "checkstyle-all.jar" jde-java-directory))))
+ 		(list jde-checkstyle-class)		
+ 		(list "-c" 
+ 		      (if jde-checkstyle-style
+ 			  (jde-normalize-path jde-checkstyle-style)
+-			(concat (jde-find-jde-data-directory) "java/lib/sun_checks.xml")))
++			"@datadir@/sun_checks.xml"))
+ 		(if jde-checkstyle-expanded-properties-file
+                     (list "-p" (jde-normalize-path jde-checkstyle-expanded-properties-file)))
+ 		(if jde-checkstyle-module-package-names-file
+
+--- jde/lisp/jde-dbs.el	(revision 90)
++++ jde/lisp/jde-dbs.el	(working copy)
+@@ -899,9 +899,7 @@ for the breakpoint."
+ 		  (jde-normalize-path 'jde-run-working-directory)
+ 		source-directory))	     
+              (vm (oref (jde-run-get-vm) :path))
+-	     (jde-java-directory
+-	      (expand-file-name "java"
+-	       (jde-find-jde-data-directory)))
++	     (jde-java-directory "@out@/lib/java")
+ 	     (vm-args 
+ 		(let (args)
+ 		  (setq args 
+@@ -912,7 +910,7 @@ for the breakpoint."
+ 			  (jde-build-classpath
+ 			       (list
+ 				 (expand-file-name 
+-				  (if jde-bug-debug "classes" "lib/jde.jar")
++				  (if jde-bug-debug "classes" "jde.jar")
+ 				  jde-java-directory)
+ 				 (if (jde-bug-vm-includes-jpda-p)
+                                    (jde-get-tools-jar)

pkgs/applications/editors/emacs-modes/magit/default.nix

@@ -0,0 +1,31 @@
+{stdenv, fetchurl, emacs, texinfo}:
+
+stdenv.mkDerivation {
+  name = "magit-0.7";
+
+  src = fetchurl {
+    url = "http://zagadka.vm.bytemark.co.uk/magit/magit-0.7.tar.gz";
+    sha256 = "0qry1vj41pycwkf71sqrz3zgzh85zdg5acq26asscq4s7jksrjiz";
+  };
+
+  buildInputs = [emacs texinfo];
+
+  meta = {
+    description = "An an interface to Git, implemented as an extension to Emacs.";
+
+    longDescription = ''
+      With Magit, you can inspect and modify your Git repositories with
+      Emacs. You can review and commit the changes you have made to the
+      tracked files, for example, and you can browse the history of past
+      changes. There is support for cherry picking, reverting, merging,
+      rebasing, and other common Git operations.
+
+      Magit is not a complete interface to Git; it just aims to make the
+      most common Git operations convenient. Thus, Magit will likely not
+      save you from learning Git itself.
+    '';
+
+    license = "GPLv3+";
+    homepage = "http://zagadka.vm.bytemark.co.uk/magit/";
+  };
+}

pkgs/applications/editors/emacs-modes/quack/builder.sh

@@ -1,7 +0,0 @@
-source "$stdenv/setup" || exit 1
-
-emacsDir="$out/share/emacs/site-lisp"
-
-ensureDir "$emacsDir" &&					\
-cp "$src" "$emacsDir/quack.el" &&				\
-emacs --batch -f batch-byte-compile "$emacsDir/quack.el"

pkgs/applications/editors/emacs-modes/quack/default.nix

@@ -1,21 +1,32 @@
 { fetchurl, stdenv, emacs }:
 
 stdenv.mkDerivation {
-  name = "quack-0.30";
+  name = "quack-0.37";
 
   src = fetchurl {
     # XXX: Upstream URL is not versioned, which might eventually break this.
     url = "http://www.neilvandyke.org/quack/quack.el";
-    sha256 = "1xmpbdb064s3l3cv4agf03ir1g7xfzyvlqayr3yy5f8z3i6pf7mi";
+    sha256 = "1q5442cpvw2i0qhmhn7mh45jnmzg0cmd01k5zp4gvg1526c0hbcc";
   };
 
   buildInputs = [ emacs ];
 
-  builder = ./builder.sh;
+  unpackPhase = "true";
+  configurePhase = "true";
+  installPhase = "true";
+
+  buildPhase = ''
+    emacsDir="$out/share/emacs/site-lisp"
+
+    ensureDir "$emacsDir"
+    cp -v "$src" "$emacsDir/quack.el"
+    emacs --batch -f batch-byte-compile "$emacsDir/quack.el"
+  '';
 
   meta = {
     description = "Enhanced Emacs support for editing and running Scheme code";
     homepage = http://www.neilvandyke.org/quack/;
     license = "GPLv2+";
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }

pkgs/applications/editors/emacs-modes/scala-mode/default.nix

@@ -0,0 +1,30 @@
+{ fetchsvn, stdenv, emacs }:
+
+let revision = "17339"; in
+stdenv.mkDerivation rec {
+  name = "scala-mode-r${revision}";
+
+  src = fetchsvn {
+    url = "http://lampsvn.epfl.ch/svn-repos/scala/scala-tool-support/trunk/src/emacs";
+    rev = revision;
+    sha256 = "05g3xk2mxkqwdnyvxklnrdyhppkvhfs2fd21blhzbhf474cgqlyh";
+  };
+
+  buildInputs = [ emacs ];
+
+  installPhase =
+    '' ensureDir "$out/share/emacs/site-lisp"
+       cp -v *.el *.elc "$out/share/emacs/site-lisp"
+    '';
+
+  meta = {
+    description = "An Emacs mode for editing Scala code";
+
+    homepage = http://www.scala-lang.org/node/354;
+
+    # non-copyleft, BSD-style
+    license = "permissive";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}

pkgs/applications/editors/emacs-modes/semantic/default.nix

@@ -1,52 +0,0 @@
-{ fetchurl, stdenv, emacs, eieio }:
-
-stdenv.mkDerivation rec {
-  name = "semantic-1.4.4";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/cedet/${name}.tar.gz";
-    sha256 = "0j50dqdy5bl35vqfbgxp93grs11llg9i4398044br73lvvif9n5f";
-  };
-
-  buildInputs = [ emacs eieio ];
-
-  doCheck = true;
-  checkPhase = "make Tests";
-
-  preConfigure = ''
-    sed -i "Makefile" -es'|^LOADPATH[[:blank:]]*=.*$|LOADPATH = ${eieio}/share/emacs/site-lisp|g'
-  '';
-
-  installPhase = ''
-    ensureDir "$out/share/emacs/site-lisp"
-    cp -v *.el *.elc "$out/share/emacs/site-lisp"
-    chmod a-x "$out/share/emacs/site-lisp/"*
-
-    ensureDir "$out/share/info"
-    cp -v *.info* "$out/share/info"
-  '';
-
-  meta = {
-    description = "Semantic, infrastructure for parser based text analysis in Emacs";
-
-    longDescription = ''
-      This package is now part of CEDET, please upgrade.
-
-      Semantic is an infrastructure for parser based text analysis in
-      Emacs.  It is a lexer, parser-generator, and parser.  It is
-      written in Emacs Lisp and is customized to the way Emacs thinks
-      about language files, and is optimized to use Emacs' parsing
-      capabilities.
-
-      Semantic's goal is to provide an intermediate API for authors of
-      language agnostic tools who want to deal with languages in a
-      generic way.  It also provides a simple way for Mode Authors who
-      are experts in their language, to provide a parser for those
-      tool authors, without knowing anything about those tools.
-    '';
-
-    license = "GPLv2+";
-
-    homepage = http://cedet.sourceforge.net/;
-  };
-}

pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix

@@ -0,0 +1,27 @@
+{stdenv, fetchurl, emacs}:
+
+stdenv.mkDerivation rec {
+  name = "session-management-for-emacs-2.2a";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge.net/sourceforge/emacs-session/session-2.2a.tar.gz";
+    sha256 = "0i01dnkizs349ahyybzy0mjzgj52z65rxynsj2mlw5mm41sbmprp";
+  };
+  
+  buildInputs = [emacs];
+  
+  installPhase = ''
+    ensureDir "$out/share/emacs/site-lisp"
+    cp lisp/*.el "$out/share/emacs/site-lisp/"
+  '';
+
+  meta = { 
+    /* installation: add to your ~/.emacs
+       (require 'session)
+       (add-hook 'after-init-hook 'session-initialize)
+    */
+    description = "small session management for emacs";
+    homepage = http://emacs-session.sourceforge.net/;
+    license = "GPL";
+  };
+}

pkgs/applications/editors/emacs-modes/stratego/builder.sh

@@ -0,0 +1,4 @@
+source $stdenv/setup
+
+mkdir -p $out/share/emacs/site-lisp
+cp $src $out/share/emacs/site-lisp/stratego.el

pkgs/applications/editors/emacs-modes/stratego/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchsvn}: 
+stdenv.mkDerivation {
+  name = "stratego-mode";
+  builder = ./builder.sh;
+  src = fetchsvn {
+    url = https://svn.strategoxt.org/repos/StrategoXT/stratego-editors/trunk/emacs/stratego.el;
+    rev = 12678;
+    sha256 = "4ab4ec587550233f29ca08b82fa0a9f7e5b33fc178348037e3ab1816bd60f538";
+  };
+}

pkgs/applications/editors/emacs-snapshot/builder.sh

@@ -1,6 +1,5 @@
 source $stdenv/setup
 
-preConfigure=preConfigure
 preConfigure() {
     libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
     echo "libc: $libc"

pkgs/applications/editors/emacs-snapshot/default.nix

@@ -17,7 +17,7 @@ assert xaw3dSupport -> Xaw3d != null;
 assert gtkGUI -> pkgconfig != null && gtk != null;
 assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug
 
-let date = "2009-02-16"; in
+let date = "2009-06-26"; in
 stdenv.mkDerivation {
   name = "emacs-snapshot-23-${date}";
   
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     inherit date;
     cvsRoot = ":pserver:anonymous@cvs.savannah.gnu.org:/sources/emacs";
     module = "emacs";
-    sha256 = "6ec63da94a199c5f95bf4a9aa578cf14b3d85800fd37b3562d9a446b144b0d47";
+    sha256 = "bf9b21a0634f45474a1ce91e6153ced69194f1e9c0acd6626a931198f4a5972f";
   };
 
   preConfigure = "autoreconf -vfi";
@@ -52,5 +52,7 @@ stdenv.mkDerivation {
     description = "GNU Emacs with Unicode, GTK and Xft support (23.x alpha)";
     homepage = http://www.emacswiki.org/cgi-bin/wiki/XftGnuEmacs;
     license = "GPLv3+";
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.linux;  # GTK & co. are needed.
   };
 }

pkgs/applications/editors/leksah/default.nix

@@ -1,12 +1,12 @@
-{cabal, gtk2hs, binary, parsec, regexPosix, utf8String, libedit, makeWrapper}:
+{cabal, gtk2hs, binary, parsec, regexPosix, regexCompat, utf8String, libedit, makeWrapper}:
 
 cabal.mkDerivation (self : {
   pname = "leksah";
-  version = "0.4.4.1";
-  sha256 = "092a8gi73jhalgs4ppg8ki761vwk3gdnjwlyd4chnahbv5i1wrjw";
+  version = "0.6.1";
+  sha256 = "de4e0974be3df0e58fd26bfbb76594d81514f1e1d898b9f47881b42084bacf35";
 
   # !!! The explicit libedit dependency shouldn't be necessary.
-  extraBuildInputs = [gtk2hs binary parsec regexPosix utf8String libedit makeWrapper];
+  extraBuildInputs = [gtk2hs binary parsec regexPosix regexCompat utf8String libedit makeWrapper];
 
   preConfigure =
     ''

pkgs/applications/editors/monodevelop/builder.sh

@@ -3,7 +3,6 @@ source $makeWrapper
 
 export MONO_GAC_PREFIX=$monodoc:$gtksharp
 
-postInstall=postInstall
 postInstall() {
     mv $out/bin $out/bin-orig
     mkdir $out/bin

pkgs/applications/editors/monodoc/builder.sh

@@ -1,7 +1,6 @@
 source $stdenv/setup
 source $makeWrapper
 
-postInstall=postInstall
 postInstall() {
     mv $out/bin $out/bin-orig
     mkdir $out/bin

pkgs/applications/editors/nedit/builder.sh

@@ -2,7 +2,6 @@ source $stdenv/setup
 
 export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE"
 
-installPhase=installPhase
 installPhase() {
     ensureDir $out/bin
     cp -p source/nedit source/nc $out/bin

pkgs/applications/editors/nvi/default.nix

@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
     ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/vi
     ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/ex
     ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/view
+    ln -s $out/bin/{,vi-}nvi # create a symlink so that all vi(m) users will find it
   '';
 
   meta = {

pkgs/applications/editors/vim-diet/default.nix

@@ -1,19 +0,0 @@
-{stdenv, fetchurl, ncurses}:
- 
-stdenv.mkDerivation {
-  name = "vim-7.0";
- 
-  src = fetchurl {
-    url = ftp://ftp.vim.org/pub/vim/unix/vim-7.0.tar.bz2;
-    md5 = "4ca69757678272f718b1041c810d82d8";
-  };
- 
-  inherit ncurses;
-  buildInputs = [ncurses];
-
-  NIX_CFLAGS_COMPILE="-D_BSD_SOURCE=1";
-
-  meta = {
-    homepage = http://www.vim.org;
-  };
-}

pkgs/applications/editors/vim/default.nix

@@ -24,9 +24,9 @@ let
 	"ximSupport" "-xim"
 	];
 	configFlags = [
-	"true" " "
+	"true" " --enable-multibyte "
 	"x11Support" " --enable-gui=auto "
-	"hugeFeatures" "--with-features=huge --enable-cscope --enable-multibyte --enable-xsmp "
+	"hugeFeatures" "--with-features=huge --enable-cscope --enable-xsmp "
 	"pythonSupport" " --enable-pythoninterp "
 	"perlSupport" " --enable-perlinterp "
 	"tclSupport" " --enable-tclinterp "
@@ -44,7 +44,7 @@ args.stdenv.mkDerivation {
  
   src = args.fetchurl {
     url = ftp://ftp.vim.org/pub/vim/unix/vim-7.2.tar.bz2;
-    sha256 = "076ydlfcmlnldjzarahg58vflawn083y90is6sz2j4klg9mj2iim";
+    sha256 = "11hxkb6r2550c4n13nwr0d8afvh30qjyr5c2hw16zgay43rb0kci";
   };
  
   inherit (args) ncurses;

pkgs/applications/editors/zile/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ncurses, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "zile-2.3.7";
+  name = "zile-2.3.13";
 
   src = fetchurl {
     url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "04fiqy4nwhm42pdl839av7xgmpps9wfm4srpmhgwaydvjv79dgs1";
+    sha256 = "13nvrlns4vjngwjwg110r3djmpwq34q22crr4x8wpzf9c0chp8i4";
   };
 
   buildInputs = [ ncurses help2man ];
@@ -39,5 +39,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/zile/;
 
     license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }

pkgs/applications/graphics/ImageMagick/default.nix

@@ -1,17 +1,16 @@
 args: with args;
 
-let version = "6.4.8-9"; in
+let version = "6.5.5-6"; in
 
 stdenv.mkDerivation (rec {
   name = "ImageMagick-${version}";
 
   src = fetchurl {
     url = "mirror://imagemagick/${name}.tar.bz2";
-    sha256 = "1ngfs99wryrc7v5pqrjbcrvhsilc29iaj6zplzxm450f49xmpidq";
+    sha256 = "1037nsvfpw7wdgsvvzvi0bn1n5d667d8aj1xam7zgmf7xi6xha3q";
   };
 
   configureFlags = ''
-    --with-dots
     --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts
     --with-gslib
     ${if args ? tetex then "--with-frozenpaths" else ""}

pkgs/applications/graphics/cinepaint/default.nix

@@ -1,36 +1,36 @@
-{ stdenv, fetchurl, pkgconfig, gtk, freetype, fontconfig, lcms, fltk,
+{ stdenv, fetchcvs, cmake, pkgconfig, gtk, freetype, fontconfig, lcms, fltk,
   flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
   perlXMLParser, python, pygtk, gettext, intltool, babl, gegl,
   glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
-  mesa, libXext, libXpm, libXxf86vm } :
+  mesa, libXext, libXpm, libXxf86vm, automake, autoconf, libtool } :
 
 stdenv.mkDerivation {
-  name = "cinepaint-0.22-1";
+  name = "cinepaint-0.25.0";
 
-  src = fetchurl {
-    url = mirror://sourceforge/cinepaint/cinepaint-0.22-1.tar.gz;
-    sha256 = "bb08a9210658959772df12408769d660999ede168b7431514e1f3cead07c0fea";
+  # The developer told me this cvs fetch is 0.25.0
+  src = fetchcvs {
+    cvsRoot = ":pserver:anonymous@cinepaint.cvs.sourceforge.net:/cvsroot/cinepaint";
+    module = "cinepaint-project";
+    date = "2004-03-01";
+    sha256 = "bf6dc04f3ea2094b7ef6f87f40f2c90d75a557e40a773f8eb76e8a71f14362cf";
   };
 
-  buildInputs = [ pkgconfig gtk freetype fontconfig lcms fltk flex libtiff
+  buildInputs = [ cmake pkgconfig gtk freetype fontconfig lcms fltk flex libtiff
     libjpeg libpng libexif zlib perl libX11 perlXMLParser python pygtk gettext
     intltool babl gegl glib makedepend xf86vidmodeproto xineramaproto libXmu
-    openexr mesa libXext libXpm libXxf86vm ];
+    openexr mesa libXext libXpm libXxf86vm automake autoconf libtool ];
 
-  patches = [ ./fltk.patch ];
+  dontUseCmakeConfigure = 1;
 
-  prePatch = ''
-    sed -i -e s@/usr/X11R6/bin/makedepend@${makedepend}/bin/makedepend@ \
-      -e s@/usr/X11R6/include/X11/extensions/xf86vmode@${xf86vidmodeproto}/include/X11/extensions/xf86vmode@ \
-      -e s@/usr/X11R6/include/X11/Xlib.h@${libX11}/include/X11/Xlib.h@ \
-      -e s@/usr/X11R6/include/X11/extensions/Xinerama.h@${xineramaproto}/include/X11/extensions/Xinerama.h@ \
-      -e s@/usr/X11R6/lib/libfreetype.a@${freetype}/lib/libfreetype.a@ \
-      plug-ins/icc_examin/icc_examin/configure \
-      plug-ins/icc_examin/icc_examin/configure.sh
+  NIX_CFLAGS_COMPILE = "-I.";
+
+  configurePhase = ''
+    cd cinepaint
+    chmod 0777 autogen.sh
+    ./autogen.sh
+    ./configure --prefix=$out
   '';
 
-  configureFlags = [ "--disable-print" "--enable-gtk2" ];
-
   meta = {
     homepage = http://www.cinepaint.org/;
     license = "free";

pkgs/applications/graphics/cinepaint/fltk.patch

@@ -1,13 +0,0 @@
-diff --git a/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp b/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp
-index b507454..85f4441 100644
---- a/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp
-+++ b/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp
-@@ -226,7 +226,7 @@ namespace icc_examin_ns {
- 
-   int  awake(void)
-   {
--    Fl::awake(0);
-+    Fl::awake((void *)0);
-     return 0;
-   }
-   int  leerWait(void) { return 0; }

pkgs/applications/graphics/comical/default.nix

@@ -19,5 +19,7 @@ stdenv.mkDerivation {
     description = "Viewer of CBR and CBZ files, often used to store scanned comics";
     homepage = http://comical.sourceforge.net/;
     license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/applications/graphics/f-spot/builder.sh

@@ -1,7 +1,6 @@
 source $stdenv/setup
 source $makeWrapper
 
-postInstall=postInstall
 postInstall() {
     mv $out/bin $out/bin-orig
     mkdir $out/bin

pkgs/applications/graphics/fbida/default.nix

@@ -0,0 +1,34 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.attrByPath ["version"] "2.07" a; 
+  buildInputs = with a; [
+    libjpeg libexif giflib libtiff libpng
+      imagemagick ghostscript which curl 
+      pkgconfig freetype fontconfig
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://dl.bytesex.org/releases/fbida/fbida-${version}.tar.gz";
+    sha256 = "0i6v3fvjc305pfw48sglb5f22lwxldmfch6mjhqbcp7lqkkxw435";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+  makeFlags = [
+    "prefix=$out"
+    "verbose=yes"
+    ];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doMakeInstall" (a.doPatchShebangs "$out/bin")];
+      
+  name = "fbida-" + version;
+  meta = {
+    description = "Framebuffer image viewing programs";
+    maintainers = [
+    ];
+  };
+}

pkgs/applications/graphics/feh/default.nix

@@ -1,18 +1,5 @@
-{stdenv, fetchurl, x11, imlib2, libjpeg, libpng}:
+{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib }:
 
-let
-
-  giblib = stdenv.mkDerivation {
-    name = "giblib-1.2.4";
-    src = fetchurl {
-      url = http://linuxbrit.co.uk/downloads/giblib-1.2.4.tar.gz;
-      sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp";
-    };
-    buildInputs = [x11 imlib2];
-  };
-
-in
-  
 stdenv.mkDerivation {
   name = "feh-1.3.4";
 

pkgs/applications/graphics/gimp/default.nix

@@ -1,22 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, gtk, libgtkhtml, freetype
+{ stdenv, fetchurl, pkgconfig, gtk, freetype
 , fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
 , perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl, gegl
 }:
 
-stdenv.mkDerivation {
-  name = "gimp-2.6.6";
+stdenv.mkDerivation rec {
+  name = "gimp-2.6.7";
   
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gimp/v2.6/gimp-2.6.6.tar.bz2;
-    sha256 = "0l875y4krqxxappnbw08s44bp3njjjriwyl8br5wmx25a3x63hjk";
+    url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
+    sha256 = "05g1dwxf0ydaadc8nv85akr9n240frh3f2sdrc9j90cywpxwa0d4";
   };
   
   buildInputs = [
-    pkgconfig gtk libgtkhtml freetype fontconfig
+    pkgconfig gtk freetype fontconfig
     libart_lgpl libtiff libjpeg libpng libexif zlib perl
     perlXMLParser python pygtk gettext intltool babl gegl
   ];
 
+  passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
+
   configureFlags = [ "--disable-print" ];
 
   # "screenshot" needs this.

pkgs/applications/graphics/gimp/plugins/default.nix

@@ -0,0 +1,218 @@
+# install these packages into your profile. Then add
+# ~/.nix-profile/gimp-version-plugins to your plugin list you can find at
+# preferences -> Folders -> Plug-ins
+# same applies for the scripts
+
+{ pkgs, gimp }:
+let
+  inherit (pkgs) stdenv fetchurl pkgconfig gtkLibs;
+  inherit (gtkLibs) glib;
+  targetPluginDir = "$out/${gimp.name}-plugins";
+  targetScriptDir = "$out/${gimp.name}-scripts";
+  prefix = "plugin-gimp-";
+
+  pluginDerivation = a: stdenv.mkDerivation ({
+    prePhases = "extraLib";
+    extraLib = ''
+      installScripts(){
+        ensureDir ${targetScriptDir};
+        for p in "$@"; do cp "$p" ${targetScriptDir}; done
+      }
+      installPlugins(){
+        ensureDir ${targetPluginDir};
+        for p in "$@"; do cp "$p" ${targetPluginDir}; done
+      }
+    '';
+  }
+  // a
+    # don't call this gimp-* unless you want nix replace gimp by a plugin :-)
+  // { name = "${a.name}-${gimp.name}-plugin"; }
+  );
+
+  scriptDerivation = {name, src} : pluginDerivation {
+    inherit name; phases = "extraLib installPhase";
+    installPhase = "installScripts ${src}";
+  };
+
+ libLQR = pluginDerivation {
+    name = "liblqr-1-0.4.1";
+    # required by lqrPlugin, you don't havet to install this lib explicitely
+    buildInputs = [ gimp ] ++ gimp.buildInputs;
+    src = fetchurl {
+      url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2;
+      sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz";
+    };
+  };
+
+in
+rec {
+  fourier = pluginDerivation {
+    /* menu:
+       Filters/Generic/FFT Forward
+       Filters/Generic/FFT Inverse
+    */
+    name = "fourier-0.3.3";
+    buildInputs = [ gimp pkgs.fftwSinglePrec  pkgconfig glib] ++ gimp.buildInputs;
+    postInstall = "fail";
+    installPhase = "installPlugins fourier";
+    src = fetchurl {
+      url = http://people.via.ecp.fr/~remi/soft/gimp/fourier-0.3.3.tar.gz;
+      sha256 = "0xxgp0lrjxsj54sgygi31c7q41jkqzn0v18qyznrviv8r099v29p";
+    };
+  };
+
+  resynthesizer = pluginDerivation {
+    /* menu:
+      Filters/Map/Resynthesize
+      Filters/Enhance/Smart enlarge
+      Filters/Enhance/Smart sharpen
+      Filters/Enhance/Smart remove selection
+    */
+    name = "resynthesizer-0.16";
+    buildInputs = [ gimp pkgs.fftw ] ++ gimp.buildInputs;
+    src = fetchurl {
+      url = http://www.logarithmic.net/pfh-files/resynthesizer/resynthesizer-0.16.tar.gz;
+      sha256 = "1k90a1jzswxmajn56rdxa4r60v9v34fmqsiwfdxqcvx3yf4yq96x";
+    };
+
+    installPhase = "
+      installPlugins resynth
+      installScripts smart-{enlarge,remove}.scm
+    ";
+  };
+
+  texturize = pluginDerivation {
+    name = "texturize-2.1";
+    buildInputs = [ gimp ] ++ gimp.buildInputs;
+    src = fetchurl {
+      url = http://prdownloads.sourceforge.net/gimp-texturize/texturize-2.1_src.tgz;
+      sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3";
+    };
+    installPhase = "installPlugins src/texturize";
+  };
+
+  waveletSharpen = pluginDerivation {
+    /* menu:
+      Filters/Enhance/Wavelet sharpen
+    */
+    name = "wavelet-sharpen-0.1.2";
+    buildInputs = [ gimp ] ++ gimp.buildInputs;
+    src = fetchurl {
+      url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz;
+      sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
+    };
+    installPhase = "installPlugins src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix?
+  };
+
+  lqrPlugin = pluginDerivation {
+    /* menu:
+       Layer/Liquid Rescale
+    */
+    name = "lqr-plugin-0.6.1";
+    buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.buildInputs;
+    src = fetchurl {
+      url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
+      sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";
+    };
+    #postInstall = ''ensureDir $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"'';
+    installPhase = "installPlugins src/gimp-lqr-plugin";
+  };
+
+  # this is more than a gimp plugin !
+  # it can be made to compile the gimp plugin only though..
+  gmic =
+  let imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough?
+  in pluginDerivation {
+      name = "gmic-1.3.2.0";
+      buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.buildInputs;
+      src = fetchurl {
+        url = http://dfn.dl.sourceforge.net/sourceforge/gmic/gmic_1.3.2.0.tar.gz;
+        sha256 = "0mxq664vzzc2l6k6sqm9syp34mihhi262i6fixk1g12lmc28797h";
+      };
+      preConfigure = ''
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${imagemagick}/include/ImageMagick"
+      '';
+      installPhase = "installPlugins src/gmic4gimp";
+      meta = { 
+        description = "script language for image processing which comes with its open-source interpreter";
+        homepage = http://gmic.sourceforge.net/repository.shtml;
+        license = "CeCILL FREE SOFTWARE LICENSE AGREEMENT";
+        /*
+        The purpose of this Free Software license agreement is to grant users
+        the right to modify and redistribute the software governed by this
+        license within the framework of an open source distribution model.
+        [ ... ] */
+      };
+  };
+
+  # this is more than a gimp plugin !
+  # either load the raw image with gimp (and the import dialog will popup)
+  # or use the binary
+  ufraw = pluginDerivation {
+    name = "ufraw-0.15";
+    buildInputs = [pkgs.lcms gimp] ++ gimp.buildInputs;
+      # --enable-mime - install mime files, see README for more information
+      # --enable-extras - build extra (dcraw, nikon-curve) executables
+      # --enable-dst-correction - enable DST correction for file timestamps.
+      # --enable-contrast - enable the contrast setting option.
+      # --enable-interp-none: enable 'None' interpolation (mostly for debugging).
+      # --with-lensfun: use the lensfun library - experimental feature, read this before using it. 
+      # --with-prefix=PREFIX - use also PREFIX as an input prefix for the build
+      # --with-dosprefix=PREFIX - PREFIX in the the prefix in dos format (needed only for ms-window
+    configureFlags = "--enable-extras --enable-dst-correction --enable-contrast";
+
+    src = fetchurl {
+      url = mirror://sourceforge/ufraw/ufraw-0.15.tar.gz;
+      sha256 = "0cf3csksjkyl91zxhjnn74vc31l14nm6n1i02s76xdvvkk9ics8k";
+    };
+    installPhase = "
+      installPlugins ufraw-gimp
+      ensureDir $out/bin
+      cp ufraw $out/bin
+    ";
+  };
+
+  /* =============== simple script files ==================== */
+
+  # also have a look at enblendenfuse in all-packages.nix
+  exposureBlend = scriptDerivation {
+    name = "exposure-blend";
+    src = fetchurl {
+      url = http://tir.astro.utoledo.edu/jdsmith/code/eb/exposure-blend.scm;
+      sha256 = "1b6c9wzpklqras4wwsyw3y3jp6fjmhnnskqiwm5sabs8djknfxla";
+    };
+  };
+
+  lightning = scriptDerivation {
+    name = "Lightning";
+    src = fetchurl {
+      url = http://registry.gimp.org/files/Lightning.scm;
+      sha256 = "c14a8f4f709695ede3f77348728a25b3f3ded420da60f3f8de3944b7eae98a49";
+    };
+  };
+
+  /* space in name trouble ?
+
+  rainbowPlasma = scriptDerivation {
+    # http://registry.gimp.org/node/164
+    name = "rainbow-plasma";
+    src = fetchurl {
+      url = "http://registry.gimp.org/files/Rainbow Plasma.scm";
+      sha256 = "34308d4c9441f9e7bafa118af7ec9540f10ea0df75e812e2f3aa3fd7b5344c23";
+      name = "Rainbow-Plasma.scm"; # nix doesn't like spaces, does it?
+    };
+  };
+  */
+
+  /* doesn't seem to be working :-(
+  lightningGate = scriptDerivation {
+    # http://registry.gimp.org/node/153
+    name = "lightning-gate";
+    src = fetchurl {
+      url = http://registry.gimp.org/files/LightningGate.scm;
+      sha256 = "181w1zi9a99kn2mfxjp43wkwcgw5vbb6iqjas7a9mhm8p04csys2";
+    };
+  };
+  */
+
+}

pkgs/applications/graphics/hugin/default.nix

@@ -1,4 +1,5 @@
-{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost, pkgconfig, exiv2, gettext, ilmbase }:
+{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost,
+  pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc }:
 
 stdenv.mkDerivation {
   name = "hugin-0.7.0";
@@ -8,6 +9,8 @@ stdenv.mkDerivation {
     sha256 = "0nbrvzz94gqgk2v1900lly101g0wjz4zksnh5718226n2g8zlccf";
   };
 
+  patches = [ ./levmar-64-bit-alignment.patch ];
+
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
 
   NIX_LDFLAGS = "-lrt";
@@ -35,6 +38,10 @@ stdenv.mkDerivation {
     eval -- "cmake .. $cmakeFlags"
     set +x
     '';
+  postInstall = ''
+    ensureDir "$out/nix-support"
+    echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages
+  '';
 
   meta = {
     homepage = http://hugin.sourceforge.net/;

pkgs/applications/graphics/hugin/levmar-64-bit-alignment.patch

@@ -0,0 +1,64 @@
+This patch fixes alignment issues on 64-bit machines.  It was taken
+from http://www.mail-archive.com/hugin-ptx@googlegroups.com/msg02976.html .
+See also http://thread.gmane.org/gmane.linux.distributions.nixos/2352 .
+
+--- hugin/src/foreign/levmar/misc_core.c	2009-04-28 13:30:33.000000000 +0200 # SVN 3799
++++ hugin/src/foreign/levmar/misc_core.c	2009-05-04 07:49:00.000000000 +0200 # Merged patch.pt and fix_alias.diff
+@@ -332,7 +332,7 @@
+   a_sz=m*m;
+   u_sz=m*m; s_sz=m; vt_sz=m*m;
+ 
+-  tot_sz=iworksz*sizeof(int) + (a_sz + u_sz + s_sz + vt_sz + worksz)*sizeof(LM_REAL);
++  tot_sz=(a_sz + u_sz + s_sz + vt_sz + worksz)*sizeof(LM_REAL) + iworksz*sizeof(int); /* should be arranged in that order for proper doubles alignment */
+ 
+     buf_sz=tot_sz;
+     buf=(LM_REAL *)malloc(buf_sz);
+@@ -414,25 +414,27 @@
+ int buf_sz=0;
+ 
+ register int i, j, k, l;
+-int *idx, maxi=-1, idx_sz, a_sz, x_sz, work_sz, tot_sz;
++int *idxbuf, *idx, maxi=-1, idx_sz, a_sz, x_sz, work_sz, tot_sz;
+ LM_REAL *a, *x, *work, max, sum, tmp;
+ 
+   /* calculate required memory size */
+   idx_sz=m;
++  idxbuf=(void *)malloc(idx_sz*sizeof(int));
++
+   a_sz=m*m;
+   x_sz=m;
+   work_sz=m;
+-  tot_sz=idx_sz*sizeof(int) + (a_sz+x_sz+work_sz)*sizeof(LM_REAL);
++  tot_sz=(a_sz + x_sz + work_sz)*sizeof(LM_REAL) + idx_sz*sizeof(int); /* should be arranged in that order for proper doubles alignment */
+ 
+   buf_sz=tot_sz;
+   buf=(void *)malloc(tot_sz);
+-  if(!buf){
++  if(!buf || !idxbuf){
+     fprintf(stderr, RCAT("memory allocation in ", LEVMAR_LUINVERSE) "() failed!\n");
+     exit(1);
+   }
+ 
+-  idx=(int *)buf;
+-  a=(LM_REAL *)(idx + idx_sz);
++  idx=(int *)idxbuf;
++  a=(LM_REAL *)buf;
+   x=a + a_sz;
+   work=x + x_sz;
+ 
+@@ -448,6 +450,7 @@
+ 		  if(max==0.0){
+         fprintf(stderr, RCAT("Singular matrix A in ", LEVMAR_LUINVERSE) "()!\n");
+         free(buf);
++	free(idxbuf);
+ 
+         return 0;
+       }
+@@ -522,6 +525,7 @@
+   }
+ 
+   free(buf);
++  free(idxbuf);
+ 
+   return 1;
+ }

pkgs/applications/graphics/inkscape/default.nix

@@ -8,12 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "0flrjqa68vnnn8lrhj86xpa6h2cyzrvjy6873v9id092f86ix1li";
   };
 
-  patches = [ ./configure-python-libs.patch ./libpng-setjmp.patch ]; 
+  patches = [ ./configure-python-libs.patch ./libpng-setjmp.patch ./gtk-clist.patch ]; 
 
   propagatedBuildInputs = [
     # Python is used at run-time to execute scripts, e.g., those from
     # the "Effects" menu.
-    python pyxml
+    python pyxml lxml
   ];
 
   buildInputs = [
@@ -24,6 +24,14 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-python";
 
+  # Fix compilation on glibc 2.9 by adding missing string header
+  preConfigure = ''
+    echo "#include <string.h>" > tmp.cpp
+    cat tmp.cpp src/dom/io/uristream.cpp > src/dom/io/uristream.cpp.new
+    rm tmp.cpp
+    mv src/dom/io/uristream.cpp.new src/dom/io/uristream.cpp
+  '';
+
   preBuild = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I./extension/script"
   '';
@@ -33,7 +41,7 @@ stdenv.mkDerivation rec {
     for i in "$out/bin/"*
     do
       wrapProgram "$i" --prefix PYTHONPATH :      \
-       "$(toPythonPath ${pyxml})" ||  \
+       "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml})" ||  \
         exit 2
     done
   '';
@@ -44,6 +52,9 @@ stdenv.mkDerivation rec {
     longDescription = ''
       Inkscape is a feature-rich vector graphics editor that edits
       files in the W3C SVG (Scalable Vector Graphics) file format.
+
+      If you want to import .eps files install ps2edit
     '';
+
   };
 }

pkgs/applications/graphics/inkscape/gtk-clist.patch

@@ -0,0 +1,11 @@
+--- inkscape-0.46/src/widgets/sp-xmlview-attr-list.h  2008/06/07 22:06:52 1.1
++++ inkscape-0.46/src/widgets/sp-xmlview-attr-list.h  2008/06/07 22:09:22
+@@ -13,7 +13,7 @@
+  */
+ 
+ #include <stdio.h>
+-#include <gtk/gtkclist.h>
++#include <gtk/gtk.h>
+ #include "../xml/repr.h"
+ 
+ #include <glib.h>

pkgs/applications/graphics/meshlab/default.nix

@@ -0,0 +1,38 @@
+{stdenv, fetchurl, qt, bzip2}:
+
+stdenv.mkDerivation {
+  name = "meshlab-1.2.0";
+
+  src = fetchurl {
+    url = mirror://sourceforge/meshlab/MeshLabSrc_v120.tgz;
+    sha256 = "0iidp2pzwq96v8zbm8gc67wi1f41anpkncp17ajkv1rrh653nila";
+  };
+
+
+  setSourceRoot = "sourceRoot=`pwd`/meshlab/src";
+
+  buildPhase = ''
+    pushd external
+    qmake -recursive external.pro
+    make
+    popd
+    qmake -recursive meshlabv12.pro
+    make
+  '';
+
+  installPhase = ''
+    ensureDir $out/opt/meshlab $out/bin
+    pushd meshlab
+    cp -R meshlab plugins shaders* textures images $out/opt/meshlab
+    popd
+    ln -s $out/opt/meshlab/meshlab $out/bin/meshlab
+  '';
+
+  buildInputs = [ qt bzip2 ];
+
+  meta = {
+    description = "System for the processing and editing of unstructured 3D triangular meshes";
+    homepage = http://meshlab.sourceforge.net/;
+    license = "GPLv2+";
+  };
+}

pkgs/applications/graphics/paraview/default.nix

@@ -7,6 +7,8 @@ stdenv.mkDerivation {
     sha256 = "27544f442e957e9aa60b32c674f2dcd84fffeecc9a40071ef6e305333413187d";
   };
 
+  patches = [ ./include-qobject.patch ];
+
   # I added these flags to get all the rpaths right, which I guess they are
   # taken from the qt4 sources. Not very nice.
   cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/paraview-3.4\"" +
@@ -30,5 +32,13 @@ stdenv.mkDerivation {
     '';
 
   buildInputs = [ cmake qt4 ];
+
+  meta = {
+    homepage = "http://www.paraview.org/";
+    description = "3D Data analysis and visualization application";
+    license = "free";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
 }
 

pkgs/applications/graphics/paraview/include-qobject.patch

@@ -0,0 +1,38 @@
+diff --git a/VTK/GUISupport/Qt/CMakeLists.txt b/VTK/GUISupport/Qt/CMakeLists.txt
+index 2c35be7..866f1aa 100644
+--- a/VTK/GUISupport/Qt/CMakeLists.txt
++++ b/VTK/GUISupport/Qt/CMakeLists.txt
+@@ -166,6 +166,7 @@ IF(DESIRED_QT_VERSION MATCHES 4)
+      )
+   ENDIF(QT_QTGUI_LIBRARY)
+   INCLUDE_DIRECTORIES(${QT_QTDESIGNER_INCLUDE_DIR})
++  INCLUDE_DIRECTORIES(${QT_QTCORE_INCLUDE_DIR})
+   QT4_WRAP_CPP ( PluginMocSrcs ${PluginMocHeaders} )
+ ELSE(DESIRED_QT_VERSION MATCHES 4)
+   QT_WRAP_CPP ( QVTKWidgetPlugin PluginMocSrcs ${PluginMocHeaders} )
+diff --git a/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h b/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h
+index 6782b90..ced3a67 100644
+--- a/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h
++++ b/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h
+@@ -43,7 +43,7 @@
+ #include "vtkObject.h"
+ #include "vtkCommand.h"  // for event defines
+ #include "QVTKWin32Header.h"  // for export define
+-#include "qobject.h"          // for version info
++#include <qobject.h>          // for version info
+ 
+ class QObject;
+ class vtkQtConnections;
+diff --git a/VTK/GUISupport/Qt/vtkQtConnection.h b/VTK/GUISupport/Qt/vtkQtConnection.h
+index 923ec2e..b189ddc 100644
+--- a/VTK/GUISupport/Qt/vtkQtConnection.h
++++ b/VTK/GUISupport/Qt/vtkQtConnection.h
+@@ -33,7 +33,7 @@
+ 
+ #include "vtkObject.h"
+ #include "vtkCommand.h"  // for event defines
+-#include "qobject.h"
++#include <qobject.h>
+ 
+ class QObject;
+ class vtkCallbackCommand;

pkgs/applications/graphics/ufraw/default.nix

@@ -0,0 +1,39 @@
+{ fetchurl, stdenv, pkgconfig, gtk, gettext, bzip2, zlib
+, libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview }:
+
+stdenv.mkDerivation rec {
+  name = "ufraw-0.16";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ufraw/${name}.tar.gz";
+    sha256 = "0d3hd04msdk6l0nv1n8zs3ybipy3jikli57d9q41pb7v0hnl6hzd";
+  };
+
+  patches = [ ./mkinstalldirs.patch ];
+  preConfigure = "chmod +x mkinstalldirs";
+
+  buildInputs =
+    [ pkgconfig gtk gtkimageview gettext bzip2 zlib
+      libjpeg libtiff cfitsio exiv2 lcms
+    ];
+
+  meta = {
+    homepage = http://ufraw.sourceforge.net/;
+
+    description = "UFRaw, a utility to read and manipulate raw images from digital cameras";
+
+    longDescription =
+      '' The Unidentified Flying Raw (UFRaw) is a utility to read and
+         manipulate raw images from digital cameras.  It can be used on its
+         own or as a Gimp plug-in.  It reads raw images using Dave Coffin's
+         raw conversion utility - DCRaw.  UFRaw supports color management
+         workflow based on Little CMS, allowing the user to apply ICC color
+         profiles.  For Nikon users UFRaw has the advantage that it can read
+         the camera's tone curves.
+      '';
+
+    license = "GPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}

pkgs/applications/graphics/ufraw/mkinstalldirs.patch

@@ -0,0 +1,167 @@
+Add the missing GNU `mkinstalldirs' script, taken from Gnulib.
+
+--- /dev/null	2009-10-19 13:42:41.176006468 +0200
++++ ufraw/mkinstalldirs	2009-06-26 22:10:56.000000000 +0200
+@@ -0,0 +1,162 @@
++#! /bin/sh
++# mkinstalldirs --- make directory hierarchy
++
++scriptversion=2009-04-28.21; # UTC
++
++# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
++# Created: 1993-05-16
++# Public domain.
++#
++# This file is maintained in Automake, please report
++# bugs to <bug-automake@gnu.org> or send patches to
++# <automake-patches@gnu.org>.
++
++nl='
++'
++IFS=" ""	$nl"
++errstatus=0
++dirmode=
++
++usage="\
++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
++
++Create each directory DIR (with mode MODE, if specified), including all
++leading file name components.
++
++Report bugs to <bug-automake@gnu.org>."
++
++# process command line arguments
++while test $# -gt 0 ; do
++  case $1 in
++    -h | --help | --h*)         # -h for help
++      echo "$usage"
++      exit $?
++      ;;
++    -m)                         # -m PERM arg
++      shift
++      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
++      dirmode=$1
++      shift
++      ;;
++    --version)
++      echo "$0 $scriptversion"
++      exit $?
++      ;;
++    --)                         # stop option processing
++      shift
++      break
++      ;;
++    -*)                         # unknown option
++      echo "$usage" 1>&2
++      exit 1
++      ;;
++    *)                          # first non-opt arg
++      break
++      ;;
++  esac
++done
++
++for file
++do
++  if test -d "$file"; then
++    shift
++  else
++    break
++  fi
++done
++
++case $# in
++  0) exit 0 ;;
++esac
++
++# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
++# mkdir -p a/c at the same time, both will detect that a is missing,
++# one will create a, then the other will try to create a and die with
++# a "File exists" error.  This is a problem when calling mkinstalldirs
++# from a parallel make.  We use --version in the probe to restrict
++# ourselves to GNU mkdir, which is thread-safe.
++case $dirmode in
++  '')
++    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++      echo "mkdir -p -- $*"
++      exec mkdir -p -- "$@"
++    else
++      # On NextStep and OpenStep, the `mkdir' command does not
++      # recognize any option.  It will interpret all options as
++      # directories to create, and then abort because `.' already
++      # exists.
++      test -d ./-p && rmdir ./-p
++      test -d ./--version && rmdir ./--version
++    fi
++    ;;
++  *)
++    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
++       test ! -d ./--version; then
++      echo "mkdir -m $dirmode -p -- $*"
++      exec mkdir -m "$dirmode" -p -- "$@"
++    else
++      # Clean up after NextStep and OpenStep mkdir.
++      for d in ./-m ./-p ./--version "./$dirmode";
++      do
++        test -d $d && rmdir $d
++      done
++    fi
++    ;;
++esac
++
++for file
++do
++  case $file in
++    /*) pathcomp=/ ;;
++    *)  pathcomp= ;;
++  esac
++  oIFS=$IFS
++  IFS=/
++  set fnord $file
++  shift
++  IFS=$oIFS
++
++  for d
++  do
++    test "x$d" = x && continue
++
++    pathcomp=$pathcomp$d
++    case $pathcomp in
++      -*) pathcomp=./$pathcomp ;;
++    esac
++
++    if test ! -d "$pathcomp"; then
++      echo "mkdir $pathcomp"
++
++      mkdir "$pathcomp" || lasterr=$?
++
++      if test ! -d "$pathcomp"; then
++	errstatus=$lasterr
++      else
++	if test ! -z "$dirmode"; then
++	  echo "chmod $dirmode $pathcomp"
++	  lasterr=
++	  chmod "$dirmode" "$pathcomp" || lasterr=$?
++
++	  if test ! -z "$lasterr"; then
++	    errstatus=$lasterr
++	  fi
++	fi
++      fi
++    fi
++
++    pathcomp=$pathcomp/
++  done
++done
++
++exit $errstatus
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-time-zone: "UTC"
++# time-stamp-end: "; # UTC"
++# End:

pkgs/applications/graphics/xaos/default.nix

@@ -2,7 +2,7 @@ a :
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.getAttr ["version"] "3.4" a; 
+  version = a.lib.attrByPath ["version"] "3.4" a; 
   buildInputs = with a; [
     aalib gsl libpng libX11 xproto libXext xextproto 
     libXt zlib gettext intltool perl
@@ -20,7 +20,7 @@ rec {
   /* doConfigure should be removed if not needed */
   phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
 
-  preConfigure = a.FullDepEntry (''
+  preConfigure = a.fullDepEntry (''
     sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*')
     ensureDir $out/share/locale
   '') ["doUnpack" "minInit" "defEnsureDir"];

pkgs/applications/graphics/xfig/builder.sh

@@ -2,13 +2,14 @@ source $stdenv/setup
 
 makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man"
 
-preBuild=preBuild
 preBuild() {
     echo "#define XAW3D" >> Imakefile.tmp
     echo "#define XAW3D1_5E" >> Imakefile.tmp
     cat Imakefile >> Imakefile.tmp
     mv Imakefile.tmp Imakefile
     xmkmf
+
+    sed -e 's@[$][$]m@-- &@g' -i Makefile
 }
 
 installPhase() {

pkgs/applications/graphics/xournal/default.nix

@@ -0,0 +1,35 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.attrByPath ["version"] "0.4.2.1" a; 
+  buildInputs = with a; [
+    ghostscript atk gtk glib fontconfig freetype
+    libgnomecanvas libgnomeprint libgnomeprintui
+    pango libX11 xproto zlib poppler popplerData
+    autoconf automake libtool pkgconfig
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/xournal/xournal-${version}.tar.gz";
+    sha256 = "1zxqcdhsd7h19c6pz7dwkr8bncn64v07liiqyw504m2v8lylrsif";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["setEnvVars" "doAutotools" "doConfigure" "doMakeInstall"];
+
+  setEnvVars = a.noDepEntry (''
+    export NIX_LDFLAGS="-lX11"
+  '');
+      
+  name = "xournal-" + version;
+  meta = {
+    description = "note-taking application (supposes stylus)";
+    maintainers = [
+    ];
+  };
+}

pkgs/applications/graphics/xscreensaver/default.nix

@@ -1,13 +1,13 @@
 args : with args; let localDefs = builderDefs.passthru.function (args // rec {
-                version = lib.getAttr ["version"] "5.07" args;
+                version = lib.attrByPath ["version"] "5.10" args;
 		src = /* put a fetchurl here */
 		fetchurl {
 		    url = "http://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz";
-		    sha256 = "1dmd9gwwqr4rnhxl71x1wn8j3xgijbpf6ydx42xzrzxi0x6afl4c";
+		    sha256 = "07zy157wqwgcapqycyv89yabxa8byk4p8jn3zlvhf7lx5w1xmval";
 		};
 		useConfig = true;
 		reqsList = [
-			["true" "libX11" "gtk" "pkgconfig" "bc" "perl" "intltool" "libXmu"]
+			["true" "libX11" "pkgconfig" "bc" "perl" "intltool" "libXmu"]
 			["GL" "mesa"]
 			["GUI" "gtk" "libxml2" "libglade"]
 			["jpeg" "libjpeg"]
@@ -22,19 +22,20 @@ args : with args; let localDefs = builderDefs.passthru.function (args // rec {
 		];
 	});
 	in with localDefs;
-let 
-	preConfigure = FullDepEntry ("
+let
+	preConfigure = fullDepEntry ("
 		sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' "+
 		"-i driver/Makefile.in po/Makefile.in.in;
-	") [minInit doUnpack];
+	") ["minInit" "doUnpack"];
 in
 stdenv.mkDerivation rec {
-	name = "xscreensaver-5.07";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [preConfigure doConfigure doMakeInstall doForceShare doPropagate]);
+	name = "xscreensaver-5.10";
+	buildCommand = textClosure localDefs
+          [preConfigure doConfigure doMakeInstall doForceShare doPropagate];
 	meta = {
 		description = "A set of screensavers";
 		inherit src;
+    		maintainers = [stdenv.lib.maintainers.raskin];
+		platforms = stdenv.lib.platforms.allBut "i686-cygwin";
 	};
 }
-

pkgs/applications/misc/acrobat-reader/builder.sh

@@ -1,29 +0,0 @@
-source $stdenv/setup
-
-echo "unpacking $src..."
-tar xvfz $src
-
-mkdir $out
-
-echo "unpacking reader..."
-tar xvf AdobeReader/COMMON.TAR -C $out
-tar xvf AdobeReader/ILINXR.TAR -C $out
-
-# Disable this plugin for now (it needs LDAP, and I'm too lazy to add it).
-rm $out/Reader/intellinux/plug_ins/PPKLite.api
-
-if test -n "$fastStart"; then
-    echo "removing plugins..."
-    rm -v $(ls $out/Reader/intellinux/plug_ins/*.api | grep -v SearchFind)
-fi
-
-fullPath=
-for i in $libPath; do
-    fullPath=$fullPath${fullPath:+:}$i/lib
-done
-
-patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-    --set-rpath $fullPath \
-    $out/Reader/intellinux/bin/acroread
-
-substituteInPlace $out/bin/acroread --replace /lib:/usr/lib /no-such-path --replace /bin/pwd pwd

pkgs/applications/misc/acrobat-reader/default.nix

@@ -1,30 +0,0 @@
-{ xineramaSupport ? false
-, stdenv, fetchurl, libXt, libXp, libXext, libX11, libXinerama ? null
-, glib, pango, atk, gtk, libstdcpp5, zlib
-, fastStart ? false
-}:
-
-assert stdenv.system == "i686-linux";
-
-stdenv.mkDerivation {
-  name = "acrobat-reader-7.0.9";
-  
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/AdobeReader_enu-7.0.9-1.i386.tar.gz;
-    sha256 = "0qs8v57gamkk243f44yqxic93izf0bn2d9l4wwbqqy1jv5s125hy";
-  };
-  
-  libPath = [
-    libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib
-    (if xineramaSupport then libXinerama else null)
-  ];
-  
-  inherit fastStart;
-  
-  meta = {
-    description = "Adobe Reader, a viewer for PDF documents";
-    homepage = http://www.adobe.com/products/reader;
-  };
-}

pkgs/applications/misc/adobe-reader/builder.sh

@@ -0,0 +1,26 @@
+source $stdenv/setup
+
+echo "unpacking $src..."
+tar xvfa $src
+
+ensureDir $out
+
+echo "unpacking reader..."
+tar xvf AdobeReader/COMMON.TAR -C $out
+tar xvf AdobeReader/ILINXR.TAR -C $out
+
+# Disable this plugin for now (it needs LDAP, and I'm too lazy to add it).
+rm $out/Adobe/Reader*/Reader/intellinux/plug_ins/PPKLite.api
+
+patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+    --set-rpath $libPath \
+    $out/Adobe/Reader*/Reader/intellinux/bin/acroread
+
+# The "xargs -r" is to shut up a warning when Mozilla can't be found.
+substituteInPlace $out/Adobe/Reader*/bin/acroread \
+    --replace /bin/pwd $(type -P pwd) \
+    --replace /bin/ls $(type -P ls) \
+    --replace xargs "xargs -r"
+
+ensureDir $out/bin
+ln -s $out/Adobe/Reader*/bin/acroread $out/bin/acroread

pkgs/applications/misc/adobe-reader/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, libX11, cups, glib, pango, atk, gtk, zlib, libxml2 }:
+
+assert stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+  name = "adobe-reader-9.2-1";
+  
+  builder = ./builder.sh;
+  
+  src = fetchurl {
+    url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.2/enu/AdbeRdr9.2-1_i486linux_enu.tar.bz2;
+    sha256 = "0067w0kjj2c04342g8c9qvcs49kkiqlxn2zyx9qzlg7a32qfc9l2";
+  };
+
+  # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.
+  # We should probably remove those and use the regular Nixpkgs
+  # versions.
+  
+  libPath = stdenv.lib.makeLibraryPath
+    [ stdenv.gcc.gcc libX11 glib pango atk gtk zlib libxml2 cups ];
+  
+  meta = {
+    description = "Adobe Reader, a viewer for PDF documents";
+    homepage = http://www.adobe.com/products/reader;
+  };
+}