Merging from trunk.

svn path=/nixpkgs/branches/stdenv-updates2/; revision=18280

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
+all: NEWS.html NEWS.txt manual.html manual.pdf
 
 NEWS.html: release-notes.xml
 	$(XSLTPROC) --nonet --xinclude --output $@ $(NEWS_OPTS) \
@@ -28,3 +29,13 @@ NEWS.txt: release-notes.xml
 	  $(docbookxsl)/html/docbook.xsl -
 	LANG=en_US w3m -dump $@.tmp.html > $@
 	rm $@.tmp.html
+
+manual.html: *.xml
+	$(XSLTPROC) --nonet --xinclude --output manual.html \
+	  $(docbookxsl)/html/docbook.xsl manual.xml
+
+manual.pdf: *.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/introduction.xml

@@ -0,0 +1,21 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="chap-introduction">
+
+<title>Introduction</title>
+
+<para>This manual tells you how to write packages for the Nix Packages
+collection (Nixpkgs).  Thus it’s for packagers and developers who want
+to add packages to Nixpkgs.  End users are kindly referred to the
+<link xlink:href="http://nixos.org/releases/nix/unstable/manual/">Nix
+manual</link>.</para>
+
+<para>This manual does not describe the syntax and semantics of the
+Nix expression language, which are given in the Nix manual in the
+<link
+xlink:href="http://nixos.org/releases/nix/unstable/manual/#chap-writing-nix-expressions">chapter
+on writing Nix expressions</link>.  It only describes the facilities
+provided by Nixpkgs to make writing packages easier, such as the
+standard build environment (<literal>stdenv</literal>).</para>
+
+</chapter>

doc/language-support.xml

@@ -0,0 +1,220 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="chap-meta">
+
+<title>Support for specific programming languages</title>
+
+<para>The <link linkend="chap-stdenv">standard build
+environment</link> makes it easy to build typical Autotools-based
+packages with very little code.  Any other kind of package can be
+accomodated by overriding the appropriate phases of
+<literal>stdenv</literal>.  However, there are specialised functions
+in Nixpkgs to easily build packages for other programming languages,
+such as Perl or Haskell.  These are described in this chapter.</para>
+
+
+<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
+standard <varname>Makefile.PL</varname>.  It’s implemented in <link
+xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.</para>
+
+<para>Perl packages from CPAN are defined in <link
+xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/perl-packages.nix"><filename>pkgs/perl-packages.nix</filename></link>,
+rather than <filename>pkgs/all-packages.nix</filename>.  Most Perl
+packages are so straight-forward to build that they are defined here
+directly, rather than having a separate function for each package
+called from <filename>perl-packages.nix</filename>.  However, more
+complicated packages should be put in a separate file, typically in
+<filename>pkgs/development/perl-modules</filename>.  Here is an
+example of the former:
+
+<programlisting>
+ClassC3 = buildPerlPackage rec {
+  name = "Class-C3-0.21";
+  src = fetchurl {
+    url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
+    sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz";
+  };
+};
+</programlisting>
+
+Note the use of <literal>mirror://cpan/</literal>, and the
+<literal>${name}</literal> in the URL definition to ensure that the
+name attribute is consistent with the source that we’re actually
+downloading.  Perl packages are made available in
+<filename>all-packages.nix</filename> through the variable
+<varname>perlPackages</varname>.  For instance, if you have a package
+that needs <varname>ClassC3</varname>, you would typically write
+
+<programlisting>
+foo = import ../path/to/foo.nix {
+  inherit stdenv fetchurl ...;
+  inherit (perlPackages) ClassC3;
+};
+</programlisting>
+
+in <filename>all-packages.nix</filename>.  You can test building a
+Perl package as follows:
+
+<screen>
+$ nix-build -A perlPackages.ClassC3
+</screen>
+
+<varname>buildPerlPackage</varname> adds <literal>perl-</literal> to
+the start of the name attribute, so the package above is actually
+called <literal>perl-Class-C3-0.21</literal>.  So to install it, you
+can say:
+
+<screen>
+$ nix-env -i perl-Class-C3
+</screen>
+
+(Of course you can also install using the attribute name:
+<literal>nix-env -i -A perlPackages.ClassC3</literal>.)</para>
+
+<para>So what does <varname>buildPerlPackage</varname> do?  It does
+the following:
+
+<orderedlist>
+
+  <listitem><para>In the configure phase, it calls <literal>perl
+  Makefile.PL</literal> to generate a Makefile.  You can set the
+  variable <varname>makeMakerFlags</varname> to pass flags to
+  <filename>Makefile.PL</filename></para></listitem>
+
+  <listitem><para>It adds the contents of the <envar>PERL5LIB</envar>
+  environment variable to <literal>#! .../bin/perl</literal> line of
+  Perl scripts as <literal>-I<replaceable>dir</replaceable></literal>
+  flags.  This ensures that a script can find its
+  dependencies.</para></listitem>
+
+  <listitem><para>In the fixup phase, it writes the propagated build
+  inputs (<varname>propagatedBuildInputs</varname>) to the file
+  <filename>$out/nix-support/propagated-user-env-packages</filename>.
+  <command>nix-env</command> recursively installs all packages listed
+  in this file when you install a package that has it.  This ensures
+  that a Perl package can find its dependencies.</para></listitem>
+
+</orderedlist>
+
+</para>
+
+<para><varname>buildPerlPackage</varname> is built on top of
+<varname>stdenv</varname>, so everything can be customised in the
+usual way.  For instance, the <literal>BerkeleyDB</literal> module has
+a <varname>preConfigure</varname> hook to generate a configuration
+file used by <filename>Makefile.PL</filename>:
+
+<programlisting>
+{buildPerlPackage, fetchurl, db4}:
+
+buildPerlPackage rec {
+  name = "BerkeleyDB-0.36";
+  
+  src = fetchurl {
+    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+    sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1";
+  };
+
+  preConfigure = ''
+    echo "LIB = ${db4}/lib" > config.in
+    echo "INCLUDE = ${db4}/include" >> config.in
+  '';
+}
+</programlisting>  
+
+</para>
+
+<para>Dependencies on other Perl packages can be specified in the
+<varname>buildInputs</varname> and
+<varname>propagatedBuildInputs</varname> attributes.  If something is
+exclusively a build-time dependency, use
+<varname>buildInputs</varname>; if it’s (also) a runtime dependency,
+use <varname>propagatedBuildInputs</varname>.  For instance, this
+builds a Perl module that has runtime dependencies on a bunch of other
+modules:
+
+<programlisting>
+ClassC3Componentised = buildPerlPackage rec {
+  name = "Class-C3-Componentised-1.0004";
+  src = fetchurl {
+    url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz";
+    sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1";
+  };
+  propagatedBuildInputs = [
+    ClassC3 ClassInspector TestException MROCompat
+  ];
+};
+</programlisting>
+
+</para>
+
+</section>
+
+
+<section><title>Python</title>
+
+<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>
+
+
+<section><title>Haskell</title>
+
+<para>TODO</para>
+
+</section>
+
+
+<section><title>Java</title>
+
+<para>TODO; Java support needs lots of improvement</para>
+
+</section>
+
+
+<section><title>TeX / LaTeX</title>
+
+<para>* Special support for building TeX documents</para>
+
+</section>
+
+
+</chapter>

doc/manual.xml

@@ -0,0 +1,39 @@
+<book xmlns="http://docbook.org/ns/docbook"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+
+  <info>
+
+    <title>Nixpkgs Manual</title>
+
+    <subtitle>Draft (Version <xi:include href="../VERSION"
+    parse="text" />)</subtitle>
+
+    <author>
+      <personname>
+        <firstname>Eelco</firstname>
+        <surname>Dolstra</surname>
+      </personname>
+      <affiliation>
+        <orgname>Delft University of Technology</orgname>
+        <orgdiv>Department of Software Technology</orgdiv>
+      </affiliation>
+    </author>
+
+    <copyright>
+      <year>2008</year>
+      <year>2009</year>
+      <holder>Eelco Dolstra</holder>
+    </copyright>
+
+  </info>
+
+  <xi:include href="introduction.xml" />
+  <xi:include href="quick-start.xml" />
+  <xi:include href="stdenv.xml" />
+  <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

@@ -0,0 +1,238 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="chap-meta">
+
+<title>Meta-attributes</title>
+
+<para>Nix packages can declare <emphasis>meta-attributes</emphasis>
+that contain information about a package such as a description, its
+homepage, its license, and so on.  For instance, the GNU Hello package
+has a <varname>meta</varname> declaration like this:
+
+<programlisting>
+meta = {
+  description = "A program that produces a familiar, friendly greeting";
+  longDescription = ''
+    GNU Hello is a program that prints "Hello, world!" when you run it.
+    It is fully customizable.
+  '';
+  homepage = http://www.gnu.org/software/hello/manual/;
+  license = "GPLv3+";
+};
+</programlisting>
+
+</para>
+
+<para>Meta-attributes are not passed to the builder of the package.
+Thus, a change to a meta-attribute doesn’t trigger a recompilation of
+the package.  The value of a meta-attribute must a string.</para>
+
+<para>The meta-attributes of a package can be queried from the
+command-line using <command>nix-env</command>:
+
+<screen>
+$ nix-env -qa hello --meta --xml
+&lt;?xml version='1.0' encoding='utf-8'?>
+&lt;items>
+  &lt;item attrPath="hello" name="hello-2.3" system="i686-linux">
+    &lt;meta name="description" value="A program that produces a familiar, friendly greeting" />
+    &lt;meta name="homepage" value="http://www.gnu.org/software/hello/manual/" />
+    &lt;meta name="license" value="GPLv3+" />
+    &lt;meta name="longDescription" value="GNU Hello is a program that prints &amp;quot;Hello, world!&amp;quot; when you run it.&amp;#xA;It is fully customizable.&amp;#xA;" />
+  &lt;/item>
+&lt;/items>
+</screen>
+
+<command>nix-env</command> knows about the
+<varname>description</varname> field specifically:
+
+<screen>
+$ nix-env -qa hello --description
+hello-2.3  A program that produces a familiar, friendly greeting
+</screen>
+
+</para>
+
+
+<section><title>Standard meta-attributes</title>
+
+<para>The following meta-attributes have a standard
+interpretation:</para>
+
+<variablelist>
+
+  <varlistentry>
+    <term><varname>description</varname></term>
+    <listitem><para>A short (one-line) description of the package.
+    This is shown by <command>nix-env -q --description</command> and
+    also on the Nixpkgs release pages.</para>
+
+    <para>Don’t include a period at the end.  Don’t include newline
+    characters.  Capitalise the first character.  For brevity, don’t
+    repeat the name of package — just describe what it does.</para>
+
+    <para>Wrong: <literal>"libpng is a library that allows you to decode PNG images."</literal></para>
+
+    <para>Right: <literal>"A library for decoding PNG images"</literal></para>
+
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>longDescription</varname></term>
+    <listitem><para>An arbitrarily long description of the
+    package.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>homepage</varname></term>
+    <listitem><para>The package’s homepage.  Example:
+    <literal>http://www.gnu.org/software/hello/manual/</literal></para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>license</varname></term>
+    <listitem><para>The license for the package.  See below for the
+    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,
+    used by <command>nix-env</command> to resolve file name conflicts
+    between packages.  See the Nix manual page for
+    <command>nix-env</command> for details.  Example:
+    <literal>"10"</literal> (a low-priority
+    package).</para></listitem>
+  </varlistentry>
+
+</variablelist>
+
+
+</section>
+
+
+<section xml:id="sec-meta-license"><title>Licenses</title>
+
+<note><para>This is just a first attempt at standardising the license
+attribute.</para></note>
+
+<para>The <varname>meta.license</varname> attribute must be one of the
+following:
+
+<variablelist>
+
+  <varlistentry>
+    <term><varname>GPL</varname></term>
+    <listitem><para>GNU General Public License; version not
+    specified.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>GPLv2</varname></term>
+    <listitem><para>GNU General Public License, version
+    2.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>GPLv2+</varname></term>
+    <listitem><para>GNU General Public License, version
+    2 or higher.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>GPLv3</varname></term>
+    <listitem><para>GNU General Public License, version
+    3.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>GPLv3+</varname></term>
+    <listitem><para>GNU General Public License, version
+    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
+    above.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>free-copyleft</varname></term>
+    <listitem><para>Catch-all for free, copyleft software licenses not
+    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
+    form.  That is, it’s legal to redistribute the
+    <emphasis>output</emphasis> of the derivation.  This means that
+    the package can be included in the Nixpkgs
+    channel.</para>
+
+    <para>Sometimes proprietary software can only be redistributed
+    unmodified.  Make sure the builder doesn’t actually modify the
+    original binaries; otherwise we’re breaking the license.  For
+    instance, the NVIDIA X11 drivers can be redistributed unmodified,
+    but our builder applies <command>patchelf</command> to make them
+    work.  Thus, its license is <varname>unfree</varname> and it
+    cannot be included in the Nixpkgs channel.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>unfree</varname></term>
+    <listitem><para>Unfree package that cannot be redistributed.  You
+    can build it yourself, but you cannot redistribute the output of
+    the derivation.  Thus it cannot be included in the Nixpkgs
+    channel.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>unfree-redistributable-firmware</varname></term>
+    <listitem><para>This package supplies unfree, redistributable
+    firmware.  This is a separate value from
+    <varname>unfree-redistributable</varname> because not everybody
+    cares whether firmware is free.</para></listitem>
+  </varlistentry>
+
+</variablelist>
+
+</para>
+  
+
+</section>
+  
+
+</chapter>

doc/outline.txt

@@ -0,0 +1,158 @@
+- The standard environment
+
+  (Some of this can be moved from the Nix manual)
+
+  - Special attributes
+
+  - Generic builder
+
+  - Helper functions
+
+  - GCC / ld wrapper (+ env vars)
+
+  - Phases (+ how to add phases) and hooks
+
+  - Override functions for stdenv
+
+    - Overriding GCC
+
+    - Overriding the setup script
+
+    - Predefined override functions in all-packages.nix: static binary
+      stdenv, dietlibc stdenv
+
+  - Stdenv bootstrap; how to update the Linux bootstrap binaries
+
+  - Specific platform notes (Linux, Native, Cygwin, Mingw)
+
+
+- Support for specific languages
+
+  - Perl
+
+    - Generic Perl builder
+
+  - Python
+
+    - Wrapper generation
+
+  - Haskell
+
+    - TODO
+
+  - Java
+
+    - TODO; Java needs lots of improvement
+
+  - TeX/LaTeX
+
+    - Special support for building TeX documents
+  
+
+- Special kinds of applications
+
+  - OpenGL apps
+
+  - Binary-only apps
+
+  - Linux kernel modules
+
+  - Mozilla plugins/extensions
+
+  - X apps
+
+  - KDE apps
+
+  - GConf-based apps
+
+  - Programs that need wrappers
+
+    - makeWrapper etc.
+
+  - Initial ramdisks
+
+
+- Library functions
+
+  - i.e. in lib/default.nix
+
+
+- Specific package notes
+
+  - Linux kernel; how to update; feature tests
+
+  - X.org; how to update
+
+  - Gnome; how to update
+
+  - GCC?
+
+  - GHC?
+
+  - ...
+
+
+- Meta attributes
+
+  - License attr; possible values
+
+
+- Virtual machine support (for the build farm)
+
+  - vmtools
+
+  - KVM notes
+
+  - Performing a build in a VM
+
+    - In the host FS
+
+    - In a disk image
+
+  - RPM builds
+
+    - RPM image creation
+
+  - Deb builds
+
+    - Deb image creation
+
+  - Debugging VM builds
+  
+
+- Guidelines for Nixpkgs contributions
+
+  - File naming conventions
+
+    - Versioning of packages
+
+  - Tree organisation
+
+  - Variable naming
+
+  - Layout / indentations style
+
+  - Output FS hierarchy (e.g. $out/share/man instead of $out/man)
+
+  
+- Misc
+
+  - Building outside of the Nixpkgs tree
+
+  - Config options
+
+  - Downloading stuff
+
+    - fetchurl
+
+      - mirror:// scheme
+
+    - fetchsvn
+
+    - fetchcvs
+
+    - fetchdarcs
+
+
+- Appendix: Nixpkgs config options
+

doc/package-notes.xml

@@ -0,0 +1,242 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="chap-introduction">
+
+<title>Package Notes</title>
+
+<para>This chapter contains information about how to use and maintain
+the Nix expressions for a number of specific packages, such as the
+Linux kernel or X.org.</para>
+
+
+<!--============================================================-->
+
+<section>
+
+<title>Linux kernel</title>
+
+<para>The Nix expressions to build the Linux kernel are in <link
+xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/os-specific/linux/kernel"><filename>pkgs/os-specific/linux/kernel</filename></link>.</para>
+
+<para>The function that builds the kernel has an argument
+<varname>kernelPatches</varname> which should be a list of
+<literal>{name, patch, extraConfig}</literal> attribute sets, where
+<varname>name</varname> is the name of the patch (which is included in
+the kernel’s <varname>meta.description</varname> attribute),
+<varname>patch</varname> is the patch itself (possibly compressed),
+and <varname>extraConfig</varname> (optional) is a string specifying
+extra options to be concatenated to the kernel configuration file
+(<filename>.config</filename>).</para>
+
+<para>The kernel derivation exports an attribute
+<varname>features</varname> specifying whether optional functionality
+is or isn’t enabled.  This is used in NixOS to implement
+kernel-specific behaviour.  For instance, if the kernel has the
+<varname>iwlwifi</varname> feature (i.e. has built-in support for
+Intel wireless chipsets), then NixOS doesn’t have to build the
+external <varname>iwlwifi</varname> package:
+
+<programlisting>
+modulesTree = [kernel]
+  ++ pkgs.lib.optional (!kernel.features ? iwlwifi) kernelPackages.iwlwifi
+  ++ ...;
+</programlisting>
+
+</para>
+
+<para>How to add a new (major) version of the Linux kernel to Nixpkgs:
+
+<orderedlist>
+
+  <listitem>
+    <para>Copy (<command>svn cp</command>) the old Nix expression
+    (e.g. <filename>linux-2.6.21.nix</filename>) to the new one
+    (e.g. <filename>linux-2.6.22.nix</filename>) and update it.</para>
+  </listitem>
+
+  <listitem>
+    <para>Add the new kernel to <filename>all-packages.nix</filename>
+    (e.g., create an attribute
+    <varname>kernel_2_6_22</varname>).</para>
+  </listitem>
+
+  <listitem>
+    <para>Now we’re going to update the kernel configuration.  First
+    unpack the kernel.  Then for each supported platform
+    (<literal>i686</literal>, <literal>x86_64</literal>,
+    <literal>uml</literal>) do the following:
+
+      <orderedlist>
+
+        <listitem>
+          <para>Make an <command>svn copy</command> from the old
+          config (e.g. <filename>config-2.6.21-i686-smp</filename>) to
+          the new one
+          (e.g. <filename>config-2.6.22-i686-smp</filename>).</para>
+        </listitem>
+
+        <listitem>
+          <para>Copy the config file for this platform
+          (e.g. <filename>config-2.6.22-i686-smp</filename>) to
+          <filename>.config</filename> in the kernel source tree.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>Run <literal>make oldconfig
+          ARCH=<replaceable>{i386,x86_64,um}</replaceable></literal>
+          and answer all questions.  (For the uml configuration, also
+          add <literal>SHELL=bash</literal>.)  Make sure to keep the
+          configuration consistent between platforms (i.e. don’t
+          enable some feature on <literal>i686</literal> and disable
+          it on <literal>x86_64</literal>).
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>If needed you can also run <literal>make
+          menuconfig</literal>:
+
+            <screen>
+$ nix-env -i ncurses
+$ export NIX_CFLAGS_LINK=-lncurses
+$ make menuconfig ARCH=<replaceable>arch</replaceable></screen>
+          
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>Make sure that
+          <literal>CONFIG_FB_TILEBLITTING</literal> is <emphasis>not
+          set</emphasis> (otherwise <command>fbsplash</command> won't
+          work).  This option has a tendency to be enabled as a
+          side-effect of other options.  If it is, investigate why
+          (there's probably another option that forces it to be on)
+          and fix it.</para>
+        </listitem>
+
+        <listitem>
+          <para>Copy <filename>.config</filename> over the new config
+          file (e.g. <filename>config-2.6.22-i686-smp</filename>).</para>
+        </listitem>
+
+      </orderedlist>
+    
+    </para>
+    
+  </listitem>
+
+  <listitem>
+    <para>Test building the kernel: <literal>nix-build -A
+    kernel_2_6_22</literal>.  If it compiles, ship it!  For extra
+    credit, try booting NixOS with it.</para>
+  </listitem>
+
+  <listitem>
+    <para>It may be that the new kernel requires updating the external
+    kernel modules and kernel-dependent packages listed in the
+    <varname>kernelPackagesFor</varname> function in
+    <filename>all-packages.nix</filename> (such as the NVIDIA drivers,
+    AUFS, splashutils, etc.).  If the updated packages aren’t
+    backwards compatible with older kernels, you need to keep the
+    older versions and use some conditionals.  For example, new
+    kernels require splashutils 1.5 while old kernel require 1.3, so
+    <varname>kernelPackagesFor</varname> says:
+
+      <programlisting>
+splashutils =
+  if kernel.features ? fbSplash then splashutils_13 else
+  if kernel.features ? fbConDecor then splashutils_15 else
+  null;
+
+splashutils_13 = ...;
+splashutils_15 = ...;</programlisting>
+
+    </para>
+  </listitem>
+
+</orderedlist>
+
+</para>
+
+</section>
+
+
+<!--============================================================-->
+
+<section>
+
+<title>X.org</title>
+
+<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, 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:
+
+<screen>
+$ cd pkgs/servers/x11/xorg
+$ cat tarballs-7.4.list extra.list old.list \
+  | perl ./generate-expr-from-tarballs.pl
+</screen>
+
+For each of the tarballs in the <filename>.list</filename> files, the
+script downloads it, unpacks it, and searches its
+<filename>configure.ac</filename> and <filename>*.pc.in</filename>
+files for dependencies.  This information is used to generate
+<filename>default.nix</filename>.  The generator caches downloaded
+tarballs between runs.  Pay close attention to the <literal>NOT FOUND:
+<replaceable>name</replaceable></literal> messages at the end of the
+run, since they may indicate missing dependencies.  (Some might be
+optional dependencies, however.)</para>
+
+<para>A file like <filename>tarballs-7.4.list</filename> contains all
+tarballs in a X.org release.  It can be generated like this:
+
+<screen>
+$ export i="mirror://xorg/X11R7.4/src/everything/"
+$ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \
+  | perl -e 'while (&lt;>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' \
+  | sort > tarballs-7.4.list
+</screen>
+
+<filename>extra.list</filename> contains libraries that aren’t part of
+X.org proper, but are closely related to it, such as
+<literal>libxcb</literal>.  <filename>old.list</filename> contains
+some packages that were removed from X.org, but are still needed by
+some people or by other packages (such as
+<varname>imake</varname>).</para>
+
+<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
+<filename>pkgs/servers/x11/xorg/overrides.nix</filename>.</para>
+
+</section>
+
+
+
+<!--============================================================-->
+
+<section>
+  <title>Gnome</title>
+  <para>* Expression is auto-generated</para>
+  <para>* How to update</para>
+</section>
+
+
+<!--============================================================-->
+
+<section>
+  <title>GCC</title>
+  <para>…</para>
+</section>
+
+
+</chapter>

doc/quick-start.xml

@@ -0,0 +1,240 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="chap-quick-start">
+
+<title>Quick Start to Adding a Package</title>
+
+<para>To add a package to Nixpkgs:
+
+<orderedlist>
+
+  <listitem>
+    <para>Checkout the Nixpkgs source tree:
+
+<screen>
+$ svn checkout https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs
+$ cd nixpkgs</screen>
+
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>Find a good place in the Nixpkgs tree to add the Nix
+    expression for your package.  For instance, a library package
+    typically goes into
+    <filename>pkgs/development/libraries/<replaceable>pkgname</replaceable></filename>,
+    while a web browser goes into
+    <filename>pkgs/applications/networking/browsers/<replaceable>pkgname</replaceable></filename>.
+    See Section XXX for some hints on the tree organisation.  Create a
+    directory for your package, e.g.
+
+<screen>
+$ svn mkdir pkgs/development/libraries/libfoo</screen>
+  
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>In the package directory, create a Nix expression — a piece
+    of code that describes how to build the package.  In this case, it
+    should be a <emphasis>function</emphasis> that is called with the
+    package dependencies as arguments, and returns a build of the
+    package in the Nix store.  The expression should usually be called
+    <filename>default.nix</filename>.
+
+<screen>
+$ emacs pkgs/development/libraries/libfoo/default.nix
+$ svn add pkgs/development/libraries/libfoo/default.nix</screen>
+
+    </para>
+
+    <para>You can have a look at the existing Nix expressions under
+    <filename>pkgs/</filename> to see how it’s done.  Here are some
+    good ones:
+
+      <itemizedlist>
+
+        <listitem>
+          <para>GNU cpio: <link
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>.
+          The simplest possible package.  The generic builder in
+          <varname>stdenv</varname> does everything for you.  It has
+          no dependencies beyond <varname>stdenv</varname>.</para>
+        </listitem>
+
+        <listitem>
+          <para>GNU Hello: <link
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/hello/ex-2/default.nix"><filename>pkgs/applications/misc/hello/ex-2/default.nix</filename></link>.
+          Also trivial, but it specifies some <varname>meta</varname>
+          attributes which is good practice.</para>
+        </listitem>
+
+        <listitem>
+          <para>GNU Multiple Precision arithmetic library (GMP): <link
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/development/libraries/gmp/default.nix"><filename>pkgs/development/libraries/gmp/default.nix</filename></link>.
+          Also done by the generic builder, but has a dependency on
+          <varname>m4</varname>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Pan, a GTK-based newsreader: <link
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></link>.
+          Has an optional dependency on <varname>gtkspell</varname>,
+          which is only built if <varname>spellCheck</varname> is
+          <literal>true</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Apache HTTPD: <link
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nix"><filename>pkgs/servers/http/apache-httpd/default.nix</filename></link>.
+          A bunch of optional features, variable substitutions in the
+          configure flags, a post-install hook, and miscellaneous
+          hackery.</para>
+        </listitem>
+
+        <listitem>
+          <para>BitTorrent (wxPython-based): <link
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/networking/p2p/bittorrent/default.nix"><filename>pkgs/tools/networking/p2p/bittorrent/default.nix</filename></link>.
+          Uses an external <link
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/networking/p2p/bittorrent/builder.sh">build
+          script</link>, which can be useful if you have lots of code
+          that you don’t want cluttering up the Nix expression.  But
+          external builders are mostly obsolete.
+          </para>
+        </listitem>
+
+        <listitem>
+          <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>
+
+        <listitem>
+          <para>JDiskReport, a Java utility: <link
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link>
+          (and the <link
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>).
+          Nixpkgs doesn’t have a decent <varname>stdenv</varname> for
+          Java yet so this is pretty ad-hoc.</para>
+        </listitem>
+
+        <listitem>
+          <para>XML::Simple, a Perl module: <link
+          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/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/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>
+        </listitem>
+
+      </itemizedlist>
+
+    </para>
+
+    <para>Some notes:
+
+      <itemizedlist>
+
+        <listitem>
+          <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>
+          <para>You can use <command>nix-prefetch-url</command>
+          <replaceable>url</replaceable> to get the SHA-256 hash of
+          source distributions.</para>
+        </listitem>
+
+        <listitem>
+          <para>A list of schemes for <literal>mirror://</literal>
+          URLs can be found in <link
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>.</para>
+        </listitem>
+
+      </itemizedlist>
+
+    </para>
+
+    <para>The exact syntax and semantics of the Nix expression
+    language, including the built-in function, are described in the
+    Nix manual in the <link
+    xlink:href="http://nixos.org/releases/nix/unstable/manual/#chap-writing-nix-expressions">chapter
+    on writing Nix expressions</link>.</para>
+    
+  </listitem>
+
+  <listitem>
+    <para>Add a call to the function defined in the previous step to
+    <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>
+    with some descriptive name for the variable,
+    e.g. <varname>libfoo</varname>.
+
+    <screen>
+$ emacs pkgs/top-level/all-packages.nix</screen>
+      
+    </para>
+
+    <para>The attributes in that file are sorted by category (like
+    “Development / Libraries”) that more-or-less correspond to the
+    directory structure of Nixpkgs, and then by attribute name.</para>
+  </listitem>
+
+  <listitem>
+    <para>Test whether the package builds:
+
+    <screen>
+$ nix-build -A libfoo</screen>
+
+    where <varname>libfoo</varname> should be the variable name
+    defined in the previous step.  You may want to add the flag
+    <option>-K</option> to keep the temporary build directory in case
+    something fails.  If the build succeeds, a symlink
+    <filename>./result</filename> to the package in the Nix store is
+    created.</para>
+  </listitem>
+
+  <listitem>
+    <para>If you want to install the package into your profile
+    (optional), do
+
+    <screen>
+$ nix-env -f . -iA libfoo</screen>
+
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>Optionally commit the new package (<command>svn
+    ci</command>) or send a patch to
+    <literal>nix-dev@cs.uu.nl</literal>.</para>
+  </listitem>
+
+  <listitem>
+    <para>If you want the TU Delft build farm to build binaries of the
+    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/release.nix"><filename>pkgs/top-level/release.nix</filename></link>.</para>
+  </listitem>
+
+</orderedlist>
+
+</para>
+
+</chapter>

doc/release-notes.xml

@@ -5,9 +5,90 @@
 <title>Nixpkgs Release Notes</title>
 
 
-<section><title>Release 0.12 (TBA)</title>
+<section><title>Release 0.12 (April 24, 2009)</title>
 
-<para>…</para>
+<para>There are way too many additions to Nixpkgs since the last
+release to list here: for example, the number of packages on Linux has
+increased from 1002 to 2159.  However, some specific improvements are
+worth listing:
+
+<itemizedlist>
+
+  <listitem><para>Nixpkgs now has a manual.  In particular, it
+  describes the standard build environment in
+  detail.</para></listitem>
+
+  <listitem><para>Major new packages:
+
+    <itemizedlist>
+
+      <listitem><para>KDE 4.</para></listitem>
+
+      <listitem><para>TeXLive.</para></listitem>
+
+      <listitem><para>VirtualBox.</para></listitem>
+
+    </itemizedlist>
+
+    … and many others.
+
+  </para></listitem>
+
+  <listitem><para>Important updates:
+
+    <itemizedlist>
+
+      <listitem><para>Glibc 2.7.</para></listitem>
+      
+      <listitem><para>GCC 4.2.4.</para></listitem>
+
+      <listitem><para>Linux 2.6.25 — 2.6.28.</para></listitem>
+
+      <listitem><para>Firefox 3.</para></listitem>
+
+      <listitem><para>X.org 7.3.</para></listitem>
+
+    </itemizedlist>
+
+  </para></listitem>
+
+  <listitem><para>Support for building derivations in a virtual
+  machine, including RPM and Debian builds in automatically generated
+  VM images.  See
+  <filename>pkgs/build-support/vm.default.nix</filename> for
+  details.</para></listitem>
+
+  <listitem><para>Improved support for building Haskell
+  packages.</para></listitem>
+  
+</itemizedlist>
+
+</para>
+
+<para>The following people contributed to this release:
+
+Andres Löh,
+Arie Middelkoop,
+Armijn Hemel,
+Eelco Dolstra,
+Lluís Batlle,
+Ludovic Courtès,
+Marc Weber,
+Mart Kolthof,
+Martin Bravenboer,
+Michael Raskin,
+Nicolas Pierron,
+Peter Simons,
+Pjotr Prins,
+Rob Vermaas,
+Sander van der Burg,
+Tobias Hammerschmidt,
+Valentin David,
+Wouter den Breejen and
+Yury G. Kudryashov.
+
+In addition, several people contributed patches on the
+<literal>nix-dev</literal> mailing list.</para>
 
 </section>
   
@@ -116,12 +197,12 @@ fetchurl {
 
   <function>fetchurl</function> will first try to download this file
   from <link
-  xlink:href="http://nix.cs.uu.nl/dist/tarballs/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>.
+  xlink:href="http://nixos.org/tarballs/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>.
   If that file doesn’t exist, it will try the original URL.  In
   general, the “content-addressed” location is
   <replaceable>mirror</replaceable><literal>/</literal><replaceable>hash-type</replaceable><literal>/</literal><replaceable>hash</replaceable>.
   There is currently only one content-addressable mirror (<link
-  xlink:href="http://nix.cs.uu.nl/dist/tarballs"/>), but more can be
+  xlink:href="http://nixos.org/tarballs"/>), but more can be
   specified in the <varname>hashedMirrors</varname> attribute in
   <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>, or by
   setting the <envar>NIX_HASHED_MIRRORS</envar> environment variable
@@ -216,7 +297,7 @@ export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/</prog
 <section><title>Release 0.10 (October 12, 2006)</title>
 
 <note><para>This release of Nixpkgs requires <link
-xlink:href='http://nix.cs.uu.nl/dist/nix/nix-0.10/'>Nix
+xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix
 0.10</link> or higher.</para></note>
 
 <para>This release has the following improvements:</para>
@@ -422,7 +503,7 @@ some of the more notable changes:</para>
 <itemizedlist>
 
   <listitem><para>Distribution files have been moved to <link
-  xlink:href="http://nix.cs.uu.nl/" />.</para></listitem>
+  xlink:href="http://nixos.org/" />.</para></listitem>
 
   <listitem><para>The C library on Linux, Glibc, has been updated to
   version 2.3.6.</para></listitem>

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,97 +0,0 @@
-Some conventions:
-
-* 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|nix.cs.uu.nl|.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/abcde/cd-paranoia.patch

@@ -0,0 +1,16 @@
+Choose the right CDROM reader syntax for `cd-paranoia'.
+
+--- abcde-2.3.99.6/abcde	2006-08-05 21:14:00.000000000 +0200
++++ abcde-2.3.99.6/abcde	2008-10-29 22:55:38.000000000 +0100
+@@ -3184,7 +3184,10 @@ if [ -n "$DISCID" ] || [ "$CDROMREADERSY
+ if [ "$CDROMREADERSYNTAX" = "" ]; then
+ 	for DEFAULT_CDROMREADER in $DEFAULT_CDROMREADERS; do
+ 		if new_checkexec $DEFAULT_CDROMREADER; then
+-			CDROMREADERSYNTAX=$DEFAULT_CDROMREADER
++                        case "$DEFAULT_CDROMREADER" in
++			  cd-paranoia)  CDROMREADERSYNTAX=cdparanoia;;
++			  *)            CDROMREADERSYNTAX=$DEFAULT_CDROMREADER;;
++			esac
+ 			break
+ 		fi
+ 	done

pkgs/applications/audio/abcde/default.nix

@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools
+, makeWrapper }:
+
+let version = "2.3.99.6";
+in
+  stdenv.mkDerivation {
+    name = "abcde-${version}";
+    src = fetchurl {
+      url = "mirror://debian/pool/main/a/abcde/abcde_${version}.orig.tar.gz";
+      sha256 = "1wl4ygj1cf1d6g05gwwygsd5g83l039fzi011r30ma5lnm763lyb";
+    };
+
+    # FIXME: This package does not support MP3 encoding (only Ogg),
+    # nor `distmp3', `eject', etc.
+
+    patches = [ ./install.patch ./which.patch ./cd-paranoia.patch ];
+
+    configurePhase = ''
+      sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ;
+              s|^[[:blank:]]*etcdir *=.*$|etcdir = $out/etc|g ;
+	      s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \
+	  "Makefile";
+
+      # We use `cd-paranoia' from GNU libcdio, which contains a hyphen
+      # in its name, unlike Xiph's cdparanoia.
+      sed -i "s|^[[:blank:]]*CDPARANOIA=.*$|CDPARANOIA=cd-paranoia|g ;
+              s|^[[:blank:]]*DEFAULT_CDROMREADERS=.*$|DEFAULT_CDROMREADERS=\"cd-paranoia cdda2wav\"|g" \
+           "abcde"
+
+      substituteInPlace "abcde"					\
+	--replace "/etc/abcde.conf" "$out/etc/abcde.conf"
+    '';
+
+    buildInputs = [ makeWrapper ];
+
+    postInstall = ''
+      substituteInPlace "$out/bin/cddb-tool" \
+         --replace '#!/bin/sh' '#!${bash}/bin/sh'
+      substituteInPlace "$out/bin/abcde" \
+         --replace '#!/bin/bash' '#!${bash}/bin/bash'
+
+      wrapProgram "$out/bin/abcde" --prefix PATH ":" \
+        "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin"
+
+      wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
+        "${wget}/bin"
+    '';
+
+    meta = {
+      homepage = http://www.hispalinux.es/~data/abcde.php;
+      licence = "GPLv2+";
+      description = "A Better CD Encoder (ABCDE)";
+
+      longDescription = ''
+        abcde is a front-end command-line utility (actually, a shell
+        script) that grabs tracks off a CD, encodes them to
+        Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+ (Musepack)
+        format, and tags them, all in one go.
+      '';
+    };
+  }

pkgs/applications/audio/abcde/install.patch

@@ -0,0 +1,21 @@
+--- abcde-2.3.3/Makefile~	2005-08-26 00:43:27.000000000 +0200
++++ abcde-2.3.3/Makefile	2008-05-26 22:20:17.000000000 +0200
+@@ -14,13 +14,13 @@ clean:
+ 
+ install:
+ 	$(INSTALL) -d -m 755 $(bindir)
+-	$(INSTALL) -m 755 -o 0 abcde $(bindir)
+-	$(INSTALL) -m 755 -o 0 cddb-tool $(bindir)
++	$(INSTALL) -m 755 abcde $(bindir)
++	$(INSTALL) -m 755 cddb-tool $(bindir)
+ 	$(INSTALL) -d -m 755 $(mandir)
+-	$(INSTALL) -m 644 -o 0 abcde.1 $(mandir)
+-	$(INSTALL) -m 644 -o 0 cddb-tool.1 $(mandir)
++	$(INSTALL) -m 644 abcde.1 $(mandir)
++	$(INSTALL) -m 644 cddb-tool.1 $(mandir)
+ 	$(INSTALL) -d -m 755 $(etcdir)
+-	$(INSTALL) -m 644 -o 0 abcde.conf $(etcdir)
++	$(INSTALL) -m 644 abcde.conf $(etcdir)
+ 
+ tarball:
+ 	@cd .. && tar czvf abcde_$(VERSION).orig.tar.gz \

pkgs/applications/audio/abcde/which.patch

@@ -0,0 +1,16 @@
+Add an alias for `which'.
+
+--- abcde-2.3.99.6/abcde	2006-08-05 21:14:00.000000000 +0200
++++ abcde-2.3.99.6/abcde	2008-10-29 22:49:16.000000000 +0100
+@@ -15,6 +15,11 @@
+ 
+ VERSION='2.3.99-$Revision: 222M $'
+ 
++which ()
++{
++  type -P $1
++}
++
+ usage ()
+ {
+ echo "This is abcde v$VERSION."

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/player.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, glib, gtk, libmowgli
+, libglade, libmcs, gettext, xlibs, dbus_glib
+}:
+
+stdenv.mkDerivation {
+  name = "audacious-1.5.1";
+  
+  src = fetchurl {
+    url = http://distfiles.atheme.org/audacious-1.5.1.tbz2;
+    sha256 = "1s32pdgx85qkrq15wwmvdw7wbcbxcf3nrhqxi6y72aijqm6fjwnz";
+  };
+
+  buildInputs = [pkgconfig libglade libmcs gettext dbus_glib];
+
+  propagatedBuildInputs = [glib gtk libmowgli libmcs];
+
+  NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib";
+
+  # Otherwise we barf with "libgcc_s.so.1 must be installed for
+  # pthread_cancel to work" on exit, as it tries to find libgcc_s
+  # dynamically.
+  dontPatchELF = true;
+
+  preBuild = ''
+    ensureDir $out/lib
+  '';
+
+  meta = {
+    description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork";
+    homepage = http://audacious-media-player.org/;
+  };
+}

pkgs/applications/audio/audacious/plugins.nix

@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, audacious, dbus_glib, gettext
+, libmad, xlibs, alsaLib, taglib, libmpcdec, libogg, libvorbis
+, libcdio, libcddb, libxml2
+}:
+
+stdenv.mkDerivation {
+  name = "audacious-plugins-1.5.1";
+  
+  src = fetchurl {
+    url = http://distfiles.atheme.org/audacious-plugins-1.5.1.tbz2;
+    sha256 = "1ki5bd50g4vi4d0qzxynyrgaq2n4cwhbsxln9rwk8ppphvk9pawc";
+  };
+
+  buildInputs = [
+    pkgconfig audacious dbus_glib gettext libmad
+    xlibs.libXcomposite alsaLib taglib libmpcdec
+    libogg libvorbis libcdio libcddb libxml2
+  ];
+
+  preBuild = ''
+    makeFlagsArray=(pluginlibdir=$out/lib/audacious)
+  '';
+
+  NIX_LDFLAGS = "-L${audacious}/lib/audacious"; # needed because we override pluginlibdir
+
+  # `--enable-amidiplug' is to prevent configure from looking in /proc/asound.
+  configureFlags = "--enable-amidiplug";
+  
+  meta = {
+    description = "Plugins for the Audacious media player";
+    homepage = http://audacious-media-player.org/;
+  };
+}

pkgs/applications/audio/audacity/default.nix

@@ -1,35 +1,22 @@
-args: with args;
-	let localDefs = builderDefs { 
-	  src = 
-		fetchurl {
-			url = mirror://sourceforge/audacity/audacity-src-1.3.3.tar.gz;
-			sha256 = "17bjc2rnqspg1mbay4b1hhgg08iadapwf6w98gbv3r84rv1mhgls";
-		};
+{ stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
+  libogg, libvorbis, libmad
+  }:
 
-  	buildInputs =[(wxGTK null) libogg libvorbis libsndfile libmad pkgconfig gtk 
-		gettext glib];
-	} null;
-	in with localDefs;
-let 
-	postInstall = FullDepEntry ("
-		old_rpath=$(patchelf --print-rpath \$out/bin/audacity);
-		patchelf --set-rpath \$old_rpath:${gtk}/lib:${glib}/lib \$out/bin/audacity;
-	") [minInit];
-	preBuild = FullDepEntry ("
-		sed -e '/\\/usr\\/local\\/lib\\/ladspa/awxGetApp()."+
-			"AddUniquePathToPathList(wxGetenv(wxT(\"HOME\"))+"+
-			"wxT(\"/.ladspa-plugins\"), pathList);'
-
-	") [minInit];
-in
 stdenv.mkDerivation {
-  name = "audacity-1.3.3";
+  name = "audacity-1.3.7";
 
-  builder = writeScript "audacity-1.3.3-builder"
-		(textClosure localDefs [addInputs (doDump "0") (noDepEntry "echo \$PATH; ar --version") doConfigure preBuild doMakeInstall postInstall doForceShare]);
+  NIX_CFLAGS_COMPILE = "-fPIC -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0 -lz";
+
+  src = fetchurl {
+    url = mirror://sourceforge/audacity/audacity-fullsrc-1.3.7.tar.bz2;
+    sha256 = "0b4arafpdyjjk52l6n7aw518hzm65iv9w5g39jqr2bmvn6a9qivi";
+  };
+  buildInputs = [ wxGTK pkgconfig gettext gtk glib zlib intltool perl 
+    libogg libvorbis libmad];
 
   meta = {
-    description = "Audacity sound editor.";
+    description = "Sound editor with graphical UI";
     homepage = http://audacity.sourceforge.net;
+    license = "GPLv2+";
   };
 }

pkgs/applications/audio/aumix/default.nix

@@ -16,8 +16,10 @@ stdenv.mkDerivation {
     ++ (if gtkGUI then [pkgconfig gtk] else []);
 
   meta = {
-    description = ''Aumix adjusts an audio mixer from X, the console,
-    		    a terminal, the command line or a script.'';
+    longDescription = ''
+      Aumix adjusts an audio mixer from X, the console, a terminal,
+      the command line or a script.
+    '';
     homepage = http://www.jpj.net/~trevor/aumix.html;
     license = "GPL";
   };

pkgs/applications/audio/beast/default.nix

@@ -0,0 +1,36 @@
+args: with args;
+args.stdenv.mkDerivation {
+  name = "beast-0.7.1";
+
+  src = args.fetchurl {
+    url = ftp://beast.gtk.org/pub/beast/v0.7/beast-0.7.1.tar.bz2;
+    sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l";
+  };
+
+  buildInputs =[zlib guile libart_lgpl pkgconfig intltool gtk glib
+      libogg libvorbis libgnomecanvas gettext
+      ];
+
+  inherit bash perl;
+
+  patchPhase = ''
+    unset patchPhase; patchPhase
+    sed 's=-DG_DISABLE_DEPRECATED==g' -i `find -type f` # the patches didn't remove all occurences
+    sed 's=/bin/bash=/$bash/bin/bash=g' -i `find -type f`
+    sed 's=/usr/bin/perl=/$perl/bin/bash=g' -i `find -type f`
+  '';
+
+  patches = [
+        (fetchurl {
+          url = mirror://gentoo/distfiles/beast-0.7.1-guile-1.8.diff.bz2;
+          sha256 = "dc5194deff4b0a0eec368a69090db682d0c3113044ce2c2ed017ddfec9d3814e";
+        })
+        ./patch.patch # patches taken from gentoo
+  ];
+
+  meta = { 
+      description = "BEAST - the Bedevilled Sound Engine";
+      homepage = http://beast.gtk.org;
+      license = ["GPL-2" "LGPL-2.1"];
+  };
+}

pkgs/applications/audio/beast/patch.patch

@@ -0,0 +1,187 @@
+Index: beast-0.7.1/shell/Makefile.in
+===================================================================
+--- beast-0.7.1.orig/shell/Makefile.in
++++ beast-0.7.1/shell/Makefile.in
+@@ -859,10 +859,7 @@ check-before: check-installation
+ check-installation:
+ 	@for p in $(bin_PROGRAMS) ; do					\
+ 	  pp="$(DESTDIR)$(bindir)/$$p" ;				\
+-	  echo "TEST: test -x \"$$pp\"" ;				\
+-	  test -x "$$pp" ||						\
+-	    { echo "Failed to verify installation of executable: $$pp";	\
+-	      exit 1 ; }						\
++	  echo "TEST: test -x \"$$pp\" Test disabled" ;				\
+ 	done
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: beast-0.7.1/shell/Makefile.am
+===================================================================
+--- beast-0.7.1.orig/shell/Makefile.am
++++ beast-0.7.1/shell/Makefile.am
+@@ -859,10 +859,7 @@ check-before: check-installation
+ check-installation:
+ 	@for p in $(bin_PROGRAMS) ; do					\
+ 	  pp="$(DESTDIR)$(bindir)/$$p" ;				\
+-	  echo "TEST: test -x \"$$pp\"" ;				\
+-	  test -x "$$pp" ||						\
+-	    { echo "Failed to verify installation of executable: $$pp";	\
+-	      exit 1 ; }						\
++	  echo "TEST: test -x \"$$pp\" Test disabled" ;				\
+ 	done
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: beast-0.7.1/birnet/birnettests.h
+===================================================================
+--- beast-0.7.1.orig/birnet/birnettests.h
++++ beast-0.7.1/birnet/birnettests.h
+@@ -27,6 +27,7 @@
+ 
+ #include <glib.h>
+ #include <string.h>
++#include <signal.h>
+ 
+ BIRNET_EXTERN_C_BEGIN();
+ 
+Index: beast-0.7.1/tools/bseloopfuncs.c
+===================================================================
+--- beast-0.7.1.orig/tools/bseloopfuncs.c
++++ beast-0.7.1/tools/bseloopfuncs.c
+@@ -21,6 +21,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <math.h>
++#include <signal.h>
+ 
+ typedef struct {
+   gdouble score;
+--- beast-0.7.1.orig/bse/Makefile.am	2008-06-01 13:12:28.116708321 +0200
++++ beast-0.7.1/bse/Makefile.am	2008-06-01 13:12:40.000000000 +0200
+@@ -10,7 +10,7 @@
+ # need -I$(top_builddir) for <sfi/sficonfig.h>
+ # need -I$(srcdir) for "bseserver.h" in .genprc.c
+ # need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc
+-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
++INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS
+ DEFS     += $(strip \
+ 	$(patsubst %, -DG_LOG_DOMAIN=\"BSE\" -DBSE_COMPILATION, \
+ 	              $(filter $(<F), $(bse_sources) $(bse_sources))) \
+--- beast-0.7.1.orig/bse/zintern/Makefile.am	2008-06-01 13:14:25.880028999 +0200
++++ beast-0.7.1/bse/zintern/Makefile.am	2008-06-01 13:14:38.000000000 +0200
+@@ -4,7 +4,7 @@
+ ## GNU Lesser General Public License version 2 or any later version.
+ include $(top_srcdir)/Makefile.decl
+ 
+-INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
++INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS
+ 
+ ZFILE_DEFS = $(strip \
+ 	wave-mono		$(srcdir)/wave-mono.bse		\
+--- a/configure.in	2008-06-01 15:19:46.000000000 +0200
++++ b/configure.in	2008-06-01 15:27:45.000000000 +0200
+@@ -159,39 +159,33 @@
+ dnl # Define package requirements.
+ dnl #
+ dnl ## include acintltool.m4 to provide IT_PROG_INTLTOOL
+-builtin(include, acintltool.m4)dnl
+-AC_DEFUN([AC_I18N_REQUIREMENTS],
+-[
+-    ALL_LINGUAS=`cat "$srcdir/po/LINGUAS" | grep -v '^#' | xargs echo -n `
+-    AC_SUBST(ALL_LINGUAS)
+-    AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/po/LINGUAS'])
+-
+-    dnl # versioned BEAST gettext domain (po/)
+-    BST_GETTEXT_DOMAIN=beast-v$BIN_VERSION    # version without -rcZ
+-    AC_SUBST(BST_GETTEXT_DOMAIN)
+-    AC_DEFINE_UNQUOTED(BST_GETTEXT_DOMAIN, "$BST_GETTEXT_DOMAIN", [Versioned BEAST gettext domain])
+-    GETTEXT_PACKAGE=$BST_GETTEXT_DOMAIN
+-    AC_SUBST(GETTEXT_PACKAGE)
+-
+-    dnl # locale directory for all domains
+-    dnl # (AM_GLIB_DEFINE_LOCALEDIR() could do this if it would do AC_SUBST())
+-    saved_prefix="$prefix"
+-    saved_exec_prefix="$exec_prefix"
+-    test "x$prefix" = xNONE && prefix=$ac_default_prefix
+-    test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+-    if test "x$CATOBJEXT" = "x.mo" ; then
+-      beastlocaledir=`eval echo "${libdir}/locale"`
+-    else
+-      beastlocaledir=`eval echo "${datadir}/locale"`
+-    fi
+-    exec_prefix="$saved_exec_prefix"
+-    prefix="$saved_prefix"
+-    AC_SUBST(beastlocaledir)
+-
+-    dnl # do gettext checks and prepare for intltool
+-    AM_GLIB_GNU_GETTEXT
+-    IT_PROG_INTLTOOL
+-])
++IT_PROG_INTLTOOL([0.35.0])
++
++dnl # versioned BEAST gettext domain (po/)
++BST_GETTEXT_DOMAIN=beast-v$BIN_VERSION    # version without -rcZ
++AC_SUBST(BST_GETTEXT_DOMAIN)
++AC_DEFINE_UNQUOTED(BST_GETTEXT_DOMAIN, "$BST_GETTEXT_DOMAIN", [Versioned BEAST gettext domain])
++GETTEXT_PACKAGE=$BST_GETTEXT_DOMAIN
++AC_SUBST(GETTEXT_PACKAGE)
++
++dnl # locale directory for all domains
++dnl # (AM_GLIB_DEFINE_LOCALEDIR() could do this if it would do AC_SUBST())
++saved_prefix="$prefix"
++saved_exec_prefix="$exec_prefix"
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++test "x$exec_prefix" = xNONE && exec_prefix=$prefix
++if test "x$CATOBJEXT" = "x.mo" ; then
++  beastlocaledir=`eval echo "${libdir}/locale"`
++else
++  beastlocaledir=`eval echo "${datadir}/locale"`
++fi
++exec_prefix="$saved_exec_prefix"
++prefix="$saved_prefix"
++AC_SUBST(beastlocaledir)
++
++dnl # do gettext checks and prepare for intltool
++AM_GLIB_GNU_GETTEXT
++
+ AC_DEFUN([AC_SFI_REQUIREMENTS],
+ [
+     dnl # check for GLib libs, libbirnet already provides gthread-2.0 and glib-2.0
+@@ -570,7 +564,6 @@
+ AC_BIRNET_REQUIREMENTS
+ 
+ # Check requirement sets
+-AC_I18N_REQUIREMENTS
+ AC_SFI_REQUIREMENTS
+ AC_BSE_REQUIREMENTS
+ AC_BSESCM_REQUIREMENTS
+--- a/po/POTFILES.in	2008-06-22 15:12:10.000000000 +0200
++++ b/po/POTFILES.in	2008-06-22 15:13:28.000000000 +0200
+@@ -131,3 +131,29 @@
+ plugins/davxtalstrings.c
+ plugins/freeverb/bsefreeverb.c
+ tools/bsewavetool.cc
++
++beast-gtk/bstgentypes.c
++birnet/birnetcpu.cc
++birnet/birnetutils.hh
++bse/bsebus.genprc.c
++bse/bsebusmodule.genidl.hh
++bse/bsecontainer.genprc.c
++bse/bsecore.genidl.hh
++bse/bseieee754.h
++bse/bseladspamodule.c
++bse/bseparasite.genprc.c
++bse/bsesong.genprc.c
++bse/bsesource.genprc.c
++bse/bsetrack.genprc.c
++plugins/artscompressor.genidl.hh
++plugins/bseamplifier.genidl.hh
++plugins/bsebalance.genidl.hh
++plugins/bsecontribsampleandhold.genidl.hh
++plugins/bsenoise.genidl.hh
++plugins/bsequantizer.genidl.hh
++plugins/bsesummation.genidl.hh
++plugins/davbassfilter.genidl.hh
++plugins/davchorus.genidl.hh
++plugins/standardguspatchenvelope.genidl.hh
++plugins/standardsaturator.genidl.hh
++tests/latency/bselatencytest.genidl.hh

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/cd-discid/default.nix

@@ -0,0 +1,31 @@
+{ fetchurl, stdenv }:
+
+let version = "0.9";
+in
+  stdenv.mkDerivation {
+    name = "cd-discid-${version}";
+    src = fetchurl {
+      url = "mirror://debian/pool/main/c/cd-discid/cd-discid_${version}.orig.tar.gz";
+      sha256 = "1fx2ky1pb07l1r0bldpw16wdsfzw7a0093ib9v66kmilwy2sq5s9";
+    };
+
+    patches = [ ./install.patch ];
+
+    configurePhase = ''
+      sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ;
+	      s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g"  \
+	  "Makefile";
+    '';
+
+    meta = {
+      homepage = http://lly.org/~rcw/cd-discid/;
+      licence = "GPLv2+";
+      description = "cd-discid, a command-line utility to retrieve a disc's CDDB ID";
+
+      longDescription = ''
+        cd-discid is a backend utility to get CDDB discid information
+        from a CD-ROM disc.  It was originally designed for cdgrab (now
+        abcde), but can be used for any purpose requiring CDDB data.
+      '';
+    };
+  }

pkgs/applications/audio/cd-discid/install.patch

@@ -0,0 +1,14 @@
+--- cd-discid-0.9/Makefile	2003-01-05 21:18:07.000000000 +0100
++++ cd-discid-0.9/Makefile	2008-05-26 22:14:56.000000000 +0200
+@@ -32,9 +32,9 @@ clean:
+ 
+ install: cd-discid
+ 	$(INSTALL) -d -m 755 $(bindir)
+-	$(INSTALL) -s -m 755 -o 0 cd-discid $(bindir)
++	$(INSTALL) -s -m 755 cd-discid $(bindir)
+ 	$(INSTALL) -d -m 755 $(mandir)
+-	$(INSTALL) -m 644 -o 0 cd-discid.1 $(mandir)
++	$(INSTALL) -m 644 cd-discid.1 $(mandir)
+ 
+ tarball:
+ 	@cd .. && tar czvf cd-discid_$(VERSION).orig.tar.gz \

pkgs/applications/audio/flac/default.nix

@@ -1,19 +1,24 @@
-args: with args;
-let
-	flacFun = version: hash:
-	stdenv.mkDerivation rec {
-		name = "flac-${version}";
-		src = fetchurl ({
-			url = "http://downloads.xiph.org/releases/flac/${name}.tar.gz";
-		} // hash);
-		buildInputs = [libogg];
-    meta = {
-      homepage = http://flac.sourceforge.net;
-    };
-	};
-in
-stdenv.lib.listOfListsToAttrs [
-	[ "default" (flacFun "1.2.1" { sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn"; }) ]
-	[ "1.2.1" (flacFun "1.2.1" { sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn"; }) ]
-	[ "1.1.2" (flacFun "1.1.2" { md5 = "2bfc127cdda02834d0491ab531a20960"; }) ]
-]
+{stdenv, fetchurl, libogg}:
+
+stdenv.mkDerivation rec {
+  name = "flac-1.2.1";
+  
+  src = fetchurl {
+    url = mirror://sourceforge/flac/flac-1.2.1.tar.gz;
+    sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn";
+  };
+
+  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

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser, libglade, flex, libid3tag, libvorbis }:
+
+stdenv.mkDerivation {
+  name = "gtkpod-0.99.14";
+
+  src = fetchurl {
+    url = mirror://sourceforge/gtkpod/gtkpod-0.99.14.tar.gz;
+    sha256 = "0ggcfyhcdlf3br88csdki215k4clxixa192afz6f16k7h8s2iqbk";
+  };
+
+  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";
+    homepage = http://gtkpod.sourceforge.net;
+    license = "GPLv2+";
+  };
+}

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

@@ -1,5 +1,5 @@
 args: with args;
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.passthru.function {
 		src = 
 		fetchurl {
 			url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz;
@@ -7,10 +7,10 @@ args: with args;
 		};
 		buildInputs = [fftw ladspaH pkgconfig];
 		configureFlags = [];
-	} null;
+	};
 	in with localDefs;
 let
-	postInstall = FullDepEntry ("
+	postInstall = fullDepEntry ("
 		ensureDir \$out/share/ladspa/
 		ln -s \$out/lib/ladspa \$out/share/ladspa/lib
 	") [minInit defEnsureDir];
@@ -21,8 +21,7 @@ stdenv.mkDerivation {
 		(textClosure localDefs [doConfigure doMakeInstall 
 			postInstall doForceShare]);
 	meta = {
-		description = "
-	LADSPA format audio plugins.
-";
+		description = "LADSPA format audio plugins";
+		inherit src;
 	};
 }

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

@@ -6,13 +6,13 @@ let
 		sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
 	};
 in
-	let localDefs = builderDefs {
+	let localDefs = builderDefs.passthru.function {
 		buildInputs = [];
 		inherit src;
-	} null;
+	};
 	in with localDefs;
 let
-	copyFile = FullDepEntry ("
+	copyFile = fullDepEntry ("
 		ensureDir \$out/include
 		cp ${src} \$out/include/ladspa.h
 	") [minInit defEnsureDir];
@@ -22,8 +22,7 @@ stdenv.mkDerivation {
 	builder = writeScript "ladspa.h-builder"
 		(textClosure localDefs [copyFile]);
 	meta = {
-		description = "
-	LADSPA format audio plugins.
-";
+		description = "LADSPA format audio plugins";
+		inherit src;
 	};
 }

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/qjackctl/default.nix

@@ -0,0 +1,20 @@
+args:
+args.stdenv.mkDerivation {
+
+  # some dependencies such as killall have to be installed additionally
+
+  name = "qjackctl-0.3.3";
+
+  src = args.fetchurl {
+    url = http://downloads.sourceforge.net/qjackctl/qjackctl-0.3.3.tar.gz;
+    sha256 = "1z9v208fs79ka6ni3p5v5xb0k5y1wqqm2a9cf903387b9p3fhpxj";
+  };
+
+  buildInputs =(with args; [qt4 alsaLib jackaudio]);
+
+  meta = { 
+      description = "qt jackd control gui tool";
+      homepage = http://qjackctl.sourceforge.net/;
+      license = "GPL";
+  };
+}

pkgs/applications/audio/snd/default.nix

@@ -1,36 +1,58 @@
-args : with args;
-	let localDefs = builderDefs {
-		src = 
-	fetchurl {
-		url = ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-9.4.tar.gz;
-		sha256 = "0zqgfnkvkqxby1k74mwba1r4pb520glcsz5jjmpzm9m41nqnghmm";
-	};
+args : 
+let 
+  lib = args.lib;
+  fetchurl = args.fetchurl;
+  fullDepEntry = args.fullDepEntry;
 
-		buildInputs = [gtk glib pkgconfig libXpm gmp gettext]
-			++ (lib.optional (args ? ruby) args.ruby)
-			++ (lib.optional (args ? mesa) args.mesa)
-			++ (lib.optional (args ? guile) args.guile)
-			++ (lib.optional (args ? libtool) args.libtool)
-			++ (lib.optional (args ? sndlib) args.sndlib)
-			;
-		configureFlags = ["--with-gtk" "--with-xpm"]
-			++ (lib.optional (args ? ruby)   "--with-ruby" )
-			++ (lib.optional (args ? mesa)   "--with-gl"   )
-			++ (lib.optional (args ? guile)  "--with-guile")
-			++ (lib.optional (args ? sndlib) "--with-midi" )
-			;
-	} null; /* null is a terminator for sumArgs */
-	in with localDefs;
-	let preBuild = FullDepEntry ("
-		cp config.log /tmp/snd-config.log
-	") [minInit doUnpack];
+  version = lib.attrByPath ["version"] "9.4" args; 
+  buildInputs = with args; [gtk glib pkgconfig 
+     libXpm gmp gettext libX11 fftw]
+      ++ (lib.optional (args ? ruby) args.ruby)
+      ++ (lib.optional (args ? mesa) args.mesa)
+      ++ (lib.optional (args ? guile) args.guile)
+      ++ (lib.optional (args ? libtool) args.libtool)
+      ++ (lib.optional (args ? sndlib) args.sndlib)
+      ++ (lib.optional (args ? alsaLib) args.alsaLib)
+      ++ (lib.optional (args ? jackaudio) args.jackaudio)
+      ;
+  configureFlags = ["--with-gtk" "--with-xpm"]
+    ++ (lib.optional (args ? ruby)   "--with-ruby" )
+    ++ (lib.optional (args ? mesa)   "--with-gl"   )
+    ++ (lib.optional (args ? guile)  "--with-guile")
+    ++ (lib.optional (args ? sndlib) "--with-midi" )
+    ++ (lib.optional (args ? alsaLib)  "--with-alsa")
+    ++ (lib.optional (args ? jackaudio) "--with-jack" )
+    ++ [ "--with-fftw" "--htmldir=$out/share/snd/html" "--with-doc-dir=$out/share/snd/html" ]
+    ;
 in
-stdenv.mkDerivation rec {
-	name = "Snd-9.4";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure preBuild doMakeInstall doForceShare]);
-	meta = {
-		description = "Snd sound editor.";
+rec {
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/snd/snd-${version}.tar.gz";
+    sha256 = "0zqgfnkvkqxby1k74mwba1r4pb520glcsz5jjmpzm9m41nqnghmm";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be specified separately */
+  phaseNames = ["doConfigure" "preBuild" "makeDocsWork" 
+    "doMakeInstall" "doForceShare"];
+
+  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 (''
+		export NIX_LDFLAGS="$NIX_LDFLAGS -L${args.libX11}/lib -lX11"
+            '') ["minInit" "doUnpack" "makeDocsWork"];
+
+  name = "snd-" + version;
+  meta = {
+    description = "Snd sound editor.";
     homepage = http://ccrma.stanford.edu/software/snd;
-	};
+    inherit src;
+  };
 }

pkgs/applications/audio/snd/doc.patch

@@ -0,0 +1,62 @@
+diff --git a/index.scm b/index.scm
+index 2148a58..713939c 100644
+--- a/index.scm
++++ b/index.scm
+@@ -18,24 +18,7 @@ and if one is found, and the Snd documentation can be found, calls (html-program
+ 	    (lambda (n)
+ 	      ;; look for doc on current dir, then html dir, then global dir
+ 	      ;; snd.html is what we'll search for
+-	      (let ((dir (if (file-exists? "snd.html") 
+-			     (getcwd)
+-			     (if (and (string? (html-dir))
+-				      (file-exists? (string-append (html-dir) "/snd.html")))
+-				 (html-dir)
+-				 (if (file-exists? "/usr/share/doc/snd-9/snd.html")
+-				     "/usr/share/doc/snd-9"
+-				     (if (file-exists? "/usr/local/share/doc/snd-9/snd.html")
+-					 "/usr/local/share/doc/snd-9"
+-					 (if (file-exists? "/usr/doc/snd-9/snd.html")
+-					     "/usr/doc/snd-9"
+-					     (if (file-exists? "/usr/share/doc/snd-8/snd.html")
+-						 "/usr/share/doc/snd-8"
+-						 (if (file-exists? "/usr/local/share/doc/snd-8/snd.html")
+-						     "/usr/local/share/doc/snd-8"
+-						     (if (file-exists? "/usr/doc/snd-8/snd.html")
+-							 "/usr/doc/snd-8"
+-							 #f))))))))))
++	      (let (dir "HTML-DIR")
+ 		(if dir
+ 		    (if (or (string=? (html-program) "netscape")
+ 			    (string=? (html-program) "mozilla")
+diff --git a/snd-help.c b/snd-help.c
+index a6557e0..a40a02e 100644
+--- a/snd-help.c
++++ b/snd-help.c
+@@ -3554,26 +3554,7 @@ static char *doc_files[DOC_DIRECTORIES] = {
+   
+ static char *html_directory(void)
+ {
+-  int i;
+-  if (mus_file_probe("snd.html"))
+-    return(mus_getcwd());
+-  if (html_dir(ss))
+-    {
+-      bool happy;
+-      char *hd = NULL;
+-      hd = (char *)CALLOC(snd_strlen(html_dir(ss)) + 16, sizeof(char));
+-      sprintf(hd, html_dir(ss), "/snd.html");
+-      happy = mus_file_probe(hd);
+-      FREE(hd);
+-      if (happy) return(copy_string(html_dir(ss)));
+-    }
+-#ifdef MUS_DEFAULT_DOC_DIR
+-  if (mus_file_probe(MUS_DEFAULT_DOC_DIR "/snd.html"))
+-    return(copy_string(MUS_DEFAULT_DOC_DIR "/snd.html"));
+-#endif
+-  for (i = 0; i < DOC_DIRECTORIES; i++)
+-    if (mus_file_probe(doc_files[i])) return(copy_string(doc_directories[i]));
+-  return(NULL);
++  return (copy_string ("HTML-DIR"));
+ }
+ 
+ 

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/vorbis-tools/default.nix

@@ -15,9 +15,10 @@ stdenv.mkDerivation {
   patches = [ ./ogg123-curlopt-mute.patch ];
 
   meta = {
-    description = ''A set of command-line tools to manipulate Ogg Vorbis
-                    audio files, notably the `ogg123' player and the
-		    `oggenc' encoder.'';
+    longDescription = ''
+      A set of command-line tools to manipulate Ogg Vorbis audio
+      files, notably the `ogg123' player and the `oggenc' encoder.
+    '';
     homepage = http://xiph.org/vorbis/;
     license = "GPLv2";
   };

pkgs/applications/audio/xmms/default.nix

@@ -2,8 +2,9 @@
 
 stdenv.mkDerivation {
   name = "xmms-1.2.10";
+  
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/xmms-1.2.10.tar.bz2;
+    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

@@ -1,25 +1,37 @@
 {stdenv, fetchurl, x11, libjpeg, libpng, libXmu, freetype, pam}:
 
-stdenv.mkDerivation {
-  name = "slim-1.2.6";
+stdenv.mkDerivation rec {
+  name = "slim-1.3.1";
+
   src = fetchurl {
-    url = http://download.berlios.de/slim/slim-1.2.6.tar.gz;
-    sha256 = "0plcmm955rnv67sx67ka6dccanr4rfzwzvsj6lnr8kqdip4522jg";
+    url = "http://download.berlios.de/slim/${name}.tar.gz";
+    sha256 = "0xqgzvg6h1bd29140mcgg9r16vcmskz7zmym7i7jlz7x9c1a9mxc";
   };
+
   patches = [
     # Allow the paths of the configuration file and theme directory to
     # be set at runtime.
     ./runtime-paths.patch
-    # PAM support from
-    # http://developer.berlios.de/patch/?func=detailpatch&patch_id=1979&group_id=2663
+
+    # Fix a bug in slim's PAM support: the "resp" argument to the
+    # conversation function is a pointer to a pointer to an array of
+    # 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];
+
   NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
-  preBuild = "
+
+  preBuild = ''
     substituteInPlace Makefile --replace /usr /no-such-path
-    makeFlagsArray=(CC=gcc CXX=g++ PREFIX=$out MANDIR=$out/share/man CFGDIR=$out/etc)
-  ";
+    makeFlagsArray=(CC=gcc CXX=g++ PREFIX=$out MANDIR=$out/share/man CFGDIR=$out/etc USE_PAM=1)
+  '';
 
   meta = {
     homepage = http://slim.berlios.de;

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

@@ -1,369 +1,89 @@
-diff -rc slim-1.2.6-orig/app.cpp slim-1.2.6/app.cpp
-*** slim-1.2.6-orig/app.cpp	2006-09-15 23:00:37.000000000 +0200
---- slim-1.2.6/app.cpp	2007-06-05 12:45:58.000000000 +0200
+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-02-17 19:50:06.000000000 +0100
 ***************
-*** 25,30 ****
---- 25,68 ----
-  #include "app.h"
-  #include "numlock.h"
-  
-+ #ifdef USE_PAM
-+ #include <security/pam_appl.h>
-+ #include <security/pam_misc.h>
-+ #include <string>
-+ 
-+ pam_handle_t* pamh;
-+ char const* PAM_service = "slim"; // <----- Change this, if the patch gets accepted upstream
-+ string password;
-+ 
-+ int conv(int num_msg, const struct pam_message **msg,
-+          struct pam_response **resp, void *appdata_ptr){
-+     *resp = (struct pam_response *) calloc(num_msg, sizeof(struct pam_response));
-+     for (int i=0; i<num_msg; i++){
-+         resp[i]->resp_retcode=0;
-+         switch(msg[i]->msg_style){
-+             case PAM_PROMPT_ECHO_ON:
-+                 // We assume PAM is asking for the username
-+ 				// As we should have given that already, this should never happen
-+ 				cerr << APPNAME << ": PAM send an unexpected PAM_PROMPT_ECHO_ON" << endl;
-+ 				cerr << APPNAME << ": " << msg[i]->msg << endl;
-+                 break;
-+ 
-+             case PAM_PROMPT_ECHO_OFF:
-+                 // We assume PAM is asking for the password
-+                 resp[i]->resp=x_strdup(password.c_str());
-+                 break;
-+ 
-+             case PAM_ERROR_MSG:
-+             case PAM_TEXT_INFO:
-+                 // We simply right these to the log
-+                 // TODO: Maybe we should simply ignore them
-+                 cerr << APPNAME << ": " << msg[i]->msg << endl;
-+                 break;
-+         }
-+     }
-+     return PAM_SUCCESS;
-+ }
-+ #endif
-  
-  extern App* LoginApp;
-  
+*** 41,48 ****
+      Panel* panel = *static_cast<Panel**>(appdata_ptr);
+      int result = PAM_SUCCESS;
+      for (int i=0; i<num_msg; i++){
+!         resp[i]->resp=0;
+!         resp[i]->resp_retcode=0;
+          switch(msg[i]->msg_style){
+              case PAM_PROMPT_ECHO_ON:
+                  // We assume PAM is asking for the username
+--- 41,48 ----
+      Panel* panel = *static_cast<Panel**>(appdata_ptr);
+      int result = PAM_SUCCESS;
+      for (int i=0; i<num_msg; i++){
+!         (*resp)[i].resp=0;
+!         (*resp)[i].resp_retcode=0;
+          switch(msg[i]->msg_style){
+              case PAM_PROMPT_ECHO_ON:
+                  // We assume PAM is asking for the username
 ***************
-*** 133,138 ****
---- 171,209 ----
-          }
+*** 51,63 ****
+                      case Panel::Suspend:
+                      case Panel::Halt:
+                      case Panel::Reboot:
+!                         resp[i]->resp=strdup("root");
+                          break;
+  
+                      case Panel::Console:
+                      case Panel::Exit:
+                      case Panel::Login:
+!                         resp[i]->resp=strdup(panel->GetName().c_str());
+                          break;
+                  }
+                  break;
+--- 51,63 ----
+                      case Panel::Suspend:
+                      case Panel::Halt:
+                      case Panel::Reboot:
+!                         (*resp)[i].resp=strdup("root");
+                          break;
+  
+                      case Panel::Console:
+                      case Panel::Exit:
+                      case Panel::Login:
+!                         (*resp)[i].resp=strdup(panel->GetName().c_str());
+                          break;
+                  }
+                  break;
+***************
+*** 73,79 ****
+  
+                      default:
+                          panel->EventHandler(Panel::Get_Passwd);
+!                         resp[i]->resp=strdup(panel->GetPasswd().c_str());
+                          break;
+                  }
+                  break;
+--- 73,79 ----
+  
+                      default:
+                          panel->EventHandler(Panel::Get_Passwd);
+!                         (*resp)[i].resp=strdup(panel->GetPasswd().c_str());
+                          break;
+                  }
+                  break;
+***************
+*** 89,97 ****
       }
-  
-+ #ifdef USE_PAM
-+     int last_result;
-+     struct pam_conv pam_conversation = {
-+         conv,
-+         NULL
-+     };
-+ 
-+     // Start the PAM session
-+     if ((last_result=pam_start(PAM_service, NULL, &pam_conversation, &pamh))!=PAM_SUCCESS){
-+         cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-+         exit(ERR_EXIT);
-+     }
-+ 
-+     // Setup some PAM items
-+     if ((last_result=pam_set_item(pamh, PAM_TTY, DisplayName))!=PAM_SUCCESS){
-+         cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-+ 	pam_end(pamh, last_result);
-+         exit(ERR_EXIT);
-+     }
-+     char* pam_ruser = "root\0"; // <---- We already checked for this in the constructor
-+     if ((last_result=pam_set_item(pamh, PAM_RUSER, pam_ruser))!=PAM_SUCCESS){
-+         cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-+ 	pam_end(pamh, last_result);
-+         exit(ERR_EXIT);
-+     }
-+     char* pam_rhost = "localhost\0"; // <---- This might not entirely correct
-+     if ((last_result=pam_set_item(pamh, PAM_RHOST, pam_rhost))!=PAM_SUCCESS){
-+         cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-+ 	pam_end(pamh, last_result);
-+         exit(ERR_EXIT);
-+     }
-+ #endif
-+ 
-      bool loaded = false;
-      while (!loaded) {
-          themedir =  themebase + themeName;
-***************
-*** 313,318 ****
---- 384,421 ----
-      struct passwd *pw;
-      pid_t pid;
-  
-+ #ifdef USE_PAM
-+      int last_result;
-+      switch ((last_result=pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT))){
-+         case PAM_SUCCESS:
-+             // Credentials was established successfully
-+             break;
-+ 
-+         case PAM_CRED_ERR:
-+         case PAM_CRED_EXPIRED:
-+         case PAM_CRED_UNAVAIL:
-+         case PAM_USER_UNKNOWN:
-+             // Credentials couldn't be established
-+             cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-+             return;
-+ 
-+         case PAM_BUF_ERR:
-+         case PAM_SYSTEM_ERR:
-+         default:
-+             // System error -> bail out!
-+             last_result=pam_setcred(pamh, PAM_DELETE_CRED);
-+             pam_end(pamh, last_result);
-+             exit(ERR_EXIT);
-+     }
-+ 
-+     if ((last_result=pam_open_session(pamh, PAM_SILENT))!=PAM_SUCCESS){
-+         cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-+     	pam_setcred(pamh, PAM_DELETE_CRED);
-+ 	// TODO: Do we need more serious actions?
-+         return;
-+     }
-+ #endif
-+ 
-      pw = LoginPanel->GetInput()->GetPasswdStruct();
-      if(pw == 0)
-          return;
-***************
-*** 320,325 ****
---- 423,433 ----
-      // Create new process
-      pid = fork();
-      if(pid == 0) {
-+ #ifdef USE_PAM
-+         // Close the child's copy of the PAM-handle
-+         pam_end(pamh, PAM_SUCCESS | PAM_DATA_SILENT);
-+ #endif
-+ 
-          // Login process starts here
-          SwitchUser Su(pw, cfg, DisplayName);
-          string session = LoginPanel->getSession();
-***************
-*** 355,361 ****
-          }
+      if (result!=PAM_SUCCESS){
+          for (int i=0; i<num_msg; i++){
+!             if (resp[i]->resp==0) continue;
+!             free(resp[i]->resp);
+!             resp[i]->resp=0;
+          };
+          free(*resp);
+          *resp=0;
+--- 89,97 ----
       }
-  
-!     // Close all clients
-      KillAllClients(False);
-      KillAllClients(True);
-  
---- 463,477 ----
-          }
-      }
-  
-! #ifdef USE_PAM
-!     if ((last_result=pam_close_session(pamh, PAM_SILENT))!=PAM_SUCCESS){
-!         cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-!     	last_result=pam_setcred(pamh, PAM_DELETE_CRED);	
-! 	// TODO: Do we need more serious actions?
-!     }
-! #endif
-! 
-! // Close all clients
-      KillAllClients(False);
-      KillAllClients(True);
-  
-***************
-*** 382,387 ****
---- 498,510 ----
-      // Stop alarm clock
-      alarm(0);
-  
-+ #ifdef USE_PAM
-+     int last_result;
-+     if ((last_result=pam_end(pamh, PAM_SUCCESS))!=PAM_SUCCESS){
-+         cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-+     }
-+ #endif
-+ 
-      // Write message
-      LoginPanel->Message((char*)cfg->getOption("reboot_msg").c_str());
-      sleep(3);
-***************
-*** 398,403 ****
---- 521,533 ----
-      // Stop alarm clock
-      alarm(0);
-  
-+ #ifdef USE_PAM
-+     int last_result;
-+     if ((last_result=pam_end(pamh, PAM_SUCCESS))!=PAM_SUCCESS){
-+         cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-+     }
-+ #endif
-+ 
-      // Write message
-      LoginPanel->Message((char*)cfg->getOption("shutdown_msg").c_str());
-      sleep(3);
-***************
-*** 433,438 ****
---- 563,575 ----
-  
-  
-  void App::Exit() {
-+ #ifdef USE_PAM
-+     int last_result;
-+     if ((last_result=pam_end(pamh, PAM_SUCCESS))!=PAM_SUCCESS){
-+         cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-+     }
-+ #endif
-+ 
-      if (testing) {
-          char* testmsg = "This is a test message :-)";
-          LoginPanel->Message(testmsg);
-***************
-*** 453,458 ****
---- 590,602 ----
-  }
-  
-  void App::RestartServer() {
-+ #ifdef USE_PAM
-+     int last_result;
-+     if ((last_result=pam_end(pamh, PAM_SUCCESS))!=PAM_SUCCESS){
-+         cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-+     }
-+ #endif
-+ 
-          StopServer(); 
-          RemoveLock();
-          Run();
-Only in slim-1.2.6/: app.cpp~
-diff -rc slim-1.2.6-orig/input.cpp slim-1.2.6/input.cpp
-*** slim-1.2.6-orig/input.cpp	2006-09-15 23:00:37.000000000 +0200
---- slim-1.2.6/input.cpp	2007-06-05 12:45:58.000000000 +0200
-***************
-*** 12,17 ****
---- 12,25 ----
-  #include "input.h"
-  #include <cstdlib>
-  
-+ #ifdef USE_PAM
-+ #include <security/pam_appl.h>
-+ #include <string>
-+ 
-+ extern pam_handle_t* pamh;
-+ extern string password;
-+ #endif
-+ 
-  Input::Input(Cfg* c) {
-      NameBuffer[0] = '\0';
-      PasswdBuffer[0] = '\0';
-***************
-*** 100,106 ****
---- 108,126 ----
-  
-  
-  struct passwd* Input::GetPasswdStruct() {
-+ #ifdef USE_PAM
-+     int last_result;
-+     char* username=NULL;
-+ 
-+     if ((last_result=pam_get_item(pamh, PAM_USER, (const void**)&username))!=PAM_SUCCESS){
-+         cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-+         pam_end(pamh, last_result);
-+         exit(ERR_EXIT);
-+     }
-+     struct passwd* pw = getpwnam(username);
-+ #else
-      struct passwd* pw = getpwnam(NameBuffer);
-+ #endif
-      endpwent();
-      if (pw->pw_shell[0] == '\0') {
-          setusershell();
-***************
-*** 183,188 ****
---- 203,240 ----
-  }
-  
-  int Input::Correct() {
-+ #ifdef USE_PAM
-+     int last_result;
-+ 
-+     // Store the password in global variables accessible
-+     // by the PAM-conversation function
-+     password=PasswdBuffer;
-+ 
-+ 	// Set the username in PAM
-+     if ((last_result=pam_set_item(pamh, PAM_USER, NameBuffer))!=PAM_SUCCESS){
-+         cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-+         pam_end(pamh, last_result);
-+         exit(ERR_EXIT);
-+     }    
-+ 
-+     // Authenticate the user
-+     if ((last_result=pam_authenticate(pamh, PAM_DISALLOW_NULL_AUTHTOK))!=PAM_SUCCESS){
-+         cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-+         if (last_result==PAM_ABORT){
-+             pam_end(pamh, last_result);
-+             exit(ERR_EXIT);
-+         }
-+ 	return 0;
-+     }
-+ 
-+     // Check the health of the account
-+     if ((last_result=pam_acct_mgmt(pamh, PAM_SILENT))!=PAM_SUCCESS){
-+         cerr << APPNAME << ": " << pam_strerror(pamh, last_result) << endl;
-+ 	return 0;
-+     }
-+ 
-+     return 1;
-+ #else
-      char *unencrypted, *encrypted, *correct;
-      struct passwd *pw;
-  
-***************
-*** 197,203 ****
-      if(sp)
-  	correct = sp->sp_pwdp;
-      else
-! #endif
-  	correct = pw->pw_passwd;
-  
-      if(correct == 0 || correct[0] == '\0')
---- 249,255 ----
-      if(sp)
-  	correct = sp->sp_pwdp;
-      else
-! #endif        /* HAVE_SHADOW */
-  	correct = pw->pw_passwd;
-  
-      if(correct == 0 || correct[0] == '\0')
-***************
-*** 207,212 ****
---- 259,265 ----
-      encrypted = crypt(unencrypted, correct);
-      memset(unencrypted, 0, strlen (unencrypted));
-      return (strcmp(encrypted, correct) == 0);
-+ #endif        /* USE_PAM */
-  }
-  
-  
-diff -rc slim-1.2.6-orig/Makefile slim-1.2.6/Makefile
-*** slim-1.2.6-orig/Makefile	2006-09-15 23:00:37.000000000 +0200
---- slim-1.2.6/Makefile	2007-06-05 12:45:58.000000000 +0200
-***************
-*** 6,13 ****
-  CXX=/usr/bin/g++
-  CC=/usr/bin/gcc
-  CFLAGS=-I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
-! LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
-! CUSTOM=-DHAVE_SHADOW
-  PREFIX=/usr
-  CFGDIR=/etc
-  MANDIR=/usr/man
---- 6,13 ----
-  CXX=/usr/bin/g++
-  CC=/usr/bin/gcc
-  CFLAGS=-I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
-! LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lpam
-! CUSTOM=-DHAVE_SHADOW -DUSE_PAM
-  PREFIX=/usr
-  CFGDIR=/etc
-  MANDIR=/usr/man
+      if (result!=PAM_SUCCESS){
+          for (int i=0; i<num_msg; i++){
+!             if ((*resp)[i].resp==0) continue;
+!             free((*resp)[i].resp);
+!             (*resp)[i].resp=0;
+          };
+          free(*resp);
+          *resp=0;

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-new/3.3.1.1.nix

@@ -0,0 +1,96 @@
+args: with args; let 
+
+  #  hint: eclipse -data <dir to save global eclipse settings>
+
+  eclipsePlugin = name : src : stdenv.mkDerivation {
+    inherit src;
+    name = "${name}-eclipse-plugin";
+    phases = "unpackPhase";
+    buildInputs = [ args.unzip ];
+    unpackPhase = ''
+      mkdir tmp; cd tmp
+      unpackFile "$src"
+      [ -d ./eclipse ] || { # if plugin doesn't contain the eclipse directory itself create it (eg viPlugin)
+        mkdir "$TMP/eclipse"
+        mv * "$TMP/eclipse"
+        cd "$TMP"
+      }
+      ensureDir $out;
+      mv eclipse "$out"
+    '';
+  };
+
+  eclipseEnv = {name, eclipse, links}: runCommand name { inherit links eclipse; } ''
+    ensureDir $out/eclipse/links;
+    cp -r "$eclipse/bin" "$out/bin"
+    for f in $eclipse/eclipse/*; do
+       # using ln eclipse doesn't take the correct link folder :-( (TODO)
+       # ln -s "$f" "$out/eclipse/$(basename "$f")"
+       cp -r "$f" "$out/eclipse/$(basename "$f")"
+    done
+    # create links
+    for link in $links; do
+      echo "path=$link" >> "$out/eclipse/links/$(basename "$link").link"
+    done
+  '';
+
+  # mmh, this derivation is superfluous. We could also create them directly
+  # instead of symlinking them into the final env build by buildEnv
+  linkFile = deriv : writeTextFile {
+    name = "${deriv.name}-eclipse-feature-link";
+    destination = "/eclipse/links/${deriv.name}.link";
+  };
+
+  attr = rec {
+    eclipse = import ( ../eclipse-new + "/${version}/eclipse.nix") args; # without any additional plugins, why can't I use ./ instead of ../eclipse-new ?
+
+    plugins = rec {
+
+      viPlugin = { # see its license!
+        plugin = eclipsePlugin "viPlugin_1.15.6" (fetchurl {
+          url = http://www.satokar.com/viplugin/files/viPlugin_1.15.6.zip;
+          sha256 = "0p53q45a754j143pnnp51rjwj7lzawcxfy9xzpjasdic4a2l0f96";
+          # license = "Other/Proprietary License with Free Trial";
+        });
+      };
+
+      # PHP developement
+      emfSdoXsdSDK232 = {
+        plugin = eclipsePlugin "emf-sdo-xsd-SDK-2.3.2" (fetchurl {
+          url = http://eclipsemirror.yoxos.com/eclipse.org/modeling/emf/emf/downloads/drops/2.3.2/R200802051830/emf-sdo-xsd-SDK-2.3.2.zip;
+          sha256 = "1k20fn47x1giwhc80rzkqaw3mn0p3861sjp7aw39842lv2hjwn1c";
+        });
+      };
+      gefSDK332 = {
+        plugin = eclipsePlugin "GEF-SDK-3.3.2" (fetchurl {
+          url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/tools/gef/downloads/drops/3.3.2/R200802211602/GEF-SDK-3.3.2.zip;
+          sha256 = "1pk5qlwk0iyvs85s966y96ks8vq1g81fivvbf4lh43155rg0z037";
+        });
+      };
+      wtpSdkR202X = {
+        plugin = eclipsePlugin "wtp-sdk-R-2.0.2-20080223205547" (fetchurl {
+          url = http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/webtools/downloads/drops/R2.0/R-2.0.2-20080223205547/wtp-sdk-R-2.0.2-20080223205547.zip;
+          sha256 = "0hmmmqzcd67jir2gmjd0xri5w2434xb2dk21hpgcv2qp0h9hhx0f";
+        });
+      };
+      pdt = {
+        deps = [ wtpSdkR202X gefSDK332 emfSdoXsdSDK232 ];
+        plugin = eclipsePlugin "pdt-runtime-1.0.3" (fetchurl {
+          url = http://sunsite.informatik.rwth-aachen.de:3080/eclipse/tools/pdt/downloads/drops/1.0.3/R200806030000/pdt-runtime-1.0.3.zip;
+          sha256 = "0wd2vc9bqrk5mqj5al2ichm8lxlf7gwifsb9lzv1d896j04ilm96";
+        });
+      };
+    };
+  }; 
+  pluginToList = a : [ a.plugin ] ++ lib.optionals (a ? deps ) (lib.concatMap pluginToList a.deps);
+  in
+  eclipseEnv { 
+    name = "eclipse-${version}-with-plugins";
+    inherit (attr) eclipse;
+    links =  
+        # example custom config: eclipse = {  plugins = {eclipse, version, plugins } : let p = plugins; in [p.pdt]; };
+        let userChosenPlugins = (getConfig [ "eclipse" "plugins" ] ( {eclipse, version, plugins} : [] ))
+                        { inherit (attr) eclipse plugins; inherit version; };
+        in # concatenate plugins and plugin dependencies
+           (lib.uniqList { inputList = lib.concatMap pluginToList userChosenPlugins; });
+  }

pkgs/applications/editors/eclipse-new/3.3.1.1/build-with-jdk-compiler.patch

@@ -0,0 +1,22 @@
+--- a/build.xml	2008-03-02 14:34:05.000000000 +0100
++++ b/build.xml	2008-03-02 14:34:57.000000000 +0100
+@@ -291,19 +291,6 @@
+ 		</condition>
+ 		<property name="bootclasspath" refid="default.bootclasspath" />
+ 
+-		<!--set the compiler and compiler arguments-->
+-		<!--the default compiler is set to the one used by eclipse rel. eng. -->
+-		<condition property="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter">
+-			<available file="${basedir}/ecj.jar" />
+-		</condition>
+-		<fail message="The Eclipse compiler (ecj.jar) cannot be found.">
+-			<condition>
+-				<not>
+-					<equals arg1="${build.compiler}" arg2="org.eclipse.jdt.core.JDTCompilerAdapter" />
+-				</not>
+-			</condition>
+-		</fail>
+-
+ 		<property name="compilerArg" value="-enableJavadoc -encoding ISO-8859-1" />
+ 		<property name="javacSource" value="1.6" />
+ 		<property name="javacTarget" value="1.6" />

pkgs/applications/editors/eclipse-new/3.3.1.1/eclipse.nix

@@ -0,0 +1,53 @@
+# Note, if you want to install plugins using the update manager you should
+# copy the store path to a local directory and chown -R $USER yourcopy
+# Then start your local copy
+
+args: with args;
+let arch = if stdenv.system == "x86_64-linux" then "x86_64"
+            else if stdenv.system == "i686-linux" then "x86"
+            else throw "not supported system";
+in
+args.stdenv.mkDerivation rec {
+  name = "eclipse-classic-3.3.1.1";
+
+  unpackPhase = "unzip \$src;     set -x ";
+  buildInputs = [ unzip jdk gtk glib libXtst ant  makeWrapper];
+
+
+  patches=./build-with-jdk-compiler.patch;
+
+  buildPhase = "./build -os linux -ws gtk -arch ${arch}";
+  
+  libraries = [gtk glib libXtst];
+
+  installPhase = "
+    t=\$out/share/${name}
+    ensureDir \$t \$out/bin
+    cd result
+    tar xfz linux-gtk-*.tar.gz
+    mv eclipse \$out
+    "
+    #copied from other eclipse expressions
+    +" rpath=
+    for i in \$libraries; do
+        rpath=\$rpath\${rpath:+:}\$i/lib
+    done
+    find \$out \\( -type f -a -perm +0100 \\) \\
+        -print \\
+        -exec patchelf --interpreter \"$(cat \$NIX_GCC/nix-support/dynamic-linker)\" \\
+        --set-rpath \"\$rpath\" {} \\;
+
+    # Make a wrapper script so that the proper JDK is found.
+    makeWrapper \$out/eclipse/eclipse \$out/bin/eclipse \\
+        --prefix PATH \":\" \"\$jdk/bin\" \\
+        --prefix LD_LIBRARY_PATH \":\" \"\$rpath\"
+    sed -e 's=exec.*=exec \$(dirname $0)/../eclipse/eclipse $@=' -i \$out/bin/eclipse
+  ";
+  # using dirname so that eclipse still runs after copying the whole store
+  # directory somewhere else (so that you can use the update manager
+
+  src = args.fetchurl {
+    url = http://mawercer.de/~nix/iyyx4hs1mgh1b1wa78j07pgq9k882m2k-eclipse-sourceBuild-srcIncluded-3.3.1.1.zip;
+    sha256 = "0n56i7ml816f839704qlkgs5ahl0iqgwc80kjq7n7g5rl9a4vhp4";
+  };
+}

pkgs/applications/editors/eclipse/build_with_jdk_compiler

@@ -0,0 +1,22 @@
+--- a/build.xml	2008-03-02 14:34:05.000000000 +0100
++++ b/build.xml	2008-03-02 14:34:57.000000000 +0100
+@@ -291,19 +291,6 @@
+ 		</condition>
+ 		<property name="bootclasspath" refid="default.bootclasspath" />
+ 
+-		<!--set the compiler and compiler arguments-->
+-		<!--the default compiler is set to the one used by eclipse rel. eng. -->
+-		<condition property="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter">
+-			<available file="${basedir}/ecj.jar" />
+-		</condition>
+-		<fail message="The Eclipse compiler (ecj.jar) cannot be found.">
+-			<condition>
+-				<not>
+-					<equals arg1="${build.compiler}" arg2="org.eclipse.jdt.core.JDTCompilerAdapter" />
+-				</not>
+-			</condition>
+-		</fail>
+-
+ 		<property name="compilerArg" value="-enableJavadoc -encoding ISO-8859-1" />
+ 		<property name="javacSource" value="1.6" />
+ 		<property name="javacTarget" value="1.6" />

pkgs/applications/editors/eclipse/builder.sh

@@ -15,9 +15,16 @@ find $out \( -type f -a -perm +0100 \) \
     --set-rpath "$rpath" {} \;
 
 # Make a wrapper script so that the proper JDK is found.
-makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
-    --prefix PATH ":" "$jdk/bin" \
-    --prefix LD_LIBRARY_PATH ":" "$rpath"
+# don't use makeWrapper in order to change the last line.
+
+ensureDir $out/bin
+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 $@
+EOF
+chmod +x $out/bin/eclipse
 
 ensureDir plugin-working-dir
 workingdir="$(pwd)/plugin-working-dir"

pkgs/applications/editors/eclipse/default.nix

@@ -1,22 +1,37 @@
-{fetchurl, stdenv, makeWrapper, jdk, gtk, glib, libXtst, plugins ? []}:
+# recommended installation:
+# nix-build -A eclipsesdk
+# then cp -r $store-path ~/my-eclipse; chmod -R 777 ~/my-eclipse # ugh! I'm to lazy to assign permissions properly
+# maybe also using a wrapper such as this (lower values should suffice for most needs)
+#  eclipseWrapper () {
+#     "$@" -vmargs -Xms2048m -Xmx2048m -XX:MaxPermSize=2048m
+# }
+#
+# Why use a local copy? This way it's easier to use the update manager to get plugins :-)
 
-let {
-  body =
+
+{fetchurl, stdenv, jdk, gtk, glib, libXtst, makeOverridable, plugins ? [], unzip}:
+
+let eclipseFun = 
+  makeOverridable ({name, bindist} :
     stdenv.mkDerivation {
-      name = "eclipse-sdk-3.3.3.1";
+      inherit name;
       builder = ./builder.sh;
       src = bindist;
-      buildInputs = [makeWrapper];
+      buildInputs = [ unzip /* unzip required by eclipseCDT */ ];
       inherit jdk plugins;
       libraries = [gtk glib libXtst];
-   };
+   }); in
 
-  bindist = 
-    if (stdenv.system == "x86_64-linux") then fetchurl {
-      url = "http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-3.3.1.1-200710231652/eclipse-SDK-3.3.1.1-linux-gtk-x86_64.tar.gz";
-      sha256 = "3fec49e95c45b56ad77b2bd15616af9d1fa6c3b338d4c70b497ecdc974c0b030";
-    } else fetchurl {
-      url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-3.3.1.1-200710231652/eclipse-SDK-3.3.1.1-linux-gtk.tar.gz;
-      sha256 = "409e47745c92ff8ea8b2037104ec90c2f8ce3edb3563fdb312d55e1bbd2ada01";
-    };
-}
+  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/0.3.10.nix

@@ -1,6 +1,6 @@
 {stdenv, fetchurl}:
 
 fetchurl {
-  url = http://nix.cs.uu.nl/dist/tarballs/org.spoofax.editor_0.3.10.jar;
+  url = http://nixos.org/tarballs/org.spoofax.editor_0.3.10.jar;
   md5 = "ff77853e750e19a9b8d380c17ea27f3d";
 }

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

@@ -0,0 +1,33 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "ed-1.4";
+
+  src = fetchurl {
+    url = "mirror://gnu/ed/${name}.tar.gz";
+    sha256 = "1njgcghms1377csldi1yqjhcpghiii6bshdhnjpqp78sxs2xldnv";
+  };
+
+  doCheck = true;
+
+  meta = {
+    description = "GNU ed, an implementation of the standard Unix editor";
+
+    longDescription = ''
+      GNU ed is a line-oriented text editor.  It is used to create,
+      display, modify and otherwise manipulate text files, both
+      interactively and via shell scripts.  A restricted version of ed,
+      red, can only edit files in the current directory and cannot
+      execute shell commands.  Ed is the "standard" text editor in the
+      sense that it is the original editor for Unix, and thus widely
+      available.  For most purposes, however, it is superseded by
+      full-screen editors such as GNU Emacs or GNU Moe.
+    '';
+
+    license = "GPLv3+";
+
+    homepage = http://www.gnu.org/software/ed/;
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}

pkgs/applications/editors/elvis/default.nix

@@ -0,0 +1,40 @@
+{ fetchurl, stdenv, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "elvis-2.2_0";
+
+  src = fetchurl {
+    url = ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz;
+    sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s";
+  };
+
+  buildInputs = [ ncurses ];
+
+  patchPhase = ''
+    sed -i s/-lcurses/-lncurses/ configure
+  '';
+
+  preConfigure = ''
+    ensureDir $out/share/man/man1
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin $out/share/elvis $out/share/elvis/doc
+    cp elvis ref elvtags elvfmt $out/bin
+    cp -R data/* $out/share/elvis
+    cp doc/* $out/share/elvis/doc
+
+    ensureDir $out/share/man/man1
+    for a in doc/*.man; do
+      cp $a $out/share/man/man1/`basename $a .man`.1
+    done
+  '';
+
+  configureFlags = "--ioctl=termios";
+
+  meta = {
+    homepage = http://elvis.vi-editor.org/;
+    description = "A vi clone for Unix and other operating systems";
+    license = "free";
+  };
+}

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-21/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   name = "emacs-21.4a";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/emacs-21.4a.tar.gz;
+    url = http://nixos.org/tarballs/emacs-21.4a.tar.gz;
     md5 = "8f9d97cbd126121bd5d97e5e31168a87";
   };
   patches = [./crt.patch];

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

@@ -1,13 +1,27 @@
 source $stdenv/setup
 
-myglibc=`cat ${NIX_GCC}/nix-support/orig-libc`
-echo "glibc: $myglibc" 
+preConfigure() {
+    libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
+    echo "libc: $libc"
 
-postConfigure() {
-  cp $myglibc/lib/crt1.o src
-  cp $myglibc/lib/crti.o src
-  cp $myglibc/lib/crtn.o src
+    case "${system}" in
+	x86_64-*)	glibclibdir=lib64 ;;
+	*)		glibclibdir=lib ;;
+    esac
+
+    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
 }
-postConfigure=postConfigure
 
 genericBuild

pkgs/applications/editors/emacs-22/crt.patch

@@ -1,41 +0,0 @@
-Only in emacs-21.3: configure.in~
-Only in emacs-21.3: patchfile
-Only in emacs-21.3/src: Makefile.in~
-diff -rc emacs-orig/src/s/gnu-linux.h emacs-21.3/src/s/gnu-linux.h
-*** emacs-orig/src/s/gnu-linux.h	2001-09-28 17:50:04.000000000 +0200
---- emacs-21.3/src/s/gnu-linux.h	2004-10-06 13:13:19.000000000 +0200
-***************
-*** 173,179 ****
-  /* GNU/Linux usually has crt0.o in a non-standard place */
-  #define START_FILES pre-crt0.o /usr/lib/crt0.o
-  #else
-! #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
-  #endif
-  
-  #ifdef __ELF__
---- 173,179 ----
-  /* GNU/Linux usually has crt0.o in a non-standard place */
-  #define START_FILES pre-crt0.o /usr/lib/crt0.o
-  #else
-! #define START_FILES pre-crt0.o crt1.o crti.o
-  #endif
-  
-  #ifdef __ELF__
-***************
-*** 225,231 ****
-  #else
-  #undef LIB_GCC
-  #define LIB_GCC
-! #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
-  #endif
-  
-  /* Don't use -g in test compiles in configure.
---- 225,231 ----
-  #else
-  #undef LIB_GCC
-  #define LIB_GCC
-! #define LIB_STANDARD -lgcc -lc -lgcc crtn.o
-  #endif
-  
-  /* Don't use -g in test compiles in configure.
-Only in emacs-21.3/src/s: gnu-linux.h~

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

@@ -12,20 +12,37 @@ assert xawSupport && xaw3dSupport -> Xaw3d != null;
 assert xpmSupport -> libXpm != null;
 assert gtkGUI -> pkgconfig != null && gtk != null;
 
-stdenv.mkDerivation {
-  name = "emacs-22.1";
+stdenv.mkDerivation rec {
+  name = "emacs-22.3";
 
   builder = ./builder.sh;
+  
   src = fetchurl {
-    url = mirror://gnu/emacs/emacs-22.1.tar.gz;
-    sha256 = "1l1y3il98pq3cz464p244wz2d3nga5lq8fkw5pwp5r97f7pkpi0y";
+    url = "mirror://gnu/emacs/${name}.tar.gz";
+    sha256 = "05hd89bchcpwzcx5la0alcp0wb7xywvnf98dxrshrqlfvccvgnbv";
   };
-  patches = [./crt.patch ./makefile-pwd.patch];
-  buildInputs = [
-    ncurses x11
-    (if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null)
-    (if xpmSupport then libXpm else null)
-  ] ++ (if gtkGUI then [pkgconfig gtk] else []);
+  
+  buildInputs = [ncurses x11]
+    ++ stdenv.lib.optional xawSupport (if xaw3dSupport then Xaw3d else libXaw)
+    ++ stdenv.lib.optional xpmSupport libXpm
+    ++ stdenv.lib.optionals gtkGUI [pkgconfig gtk];
+  
   configureFlags =
-    if gtkGUI then ["--with-x-toolkit=gtk"] else [];
+    stdenv.lib.optional gtkGUI "--with-x-toolkit=gtk";
+
+  meta = {
+    description = "GNU Emacs, *the* 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.
+    '';
+
+    homepage = http://www.gnu.org/software/emacs/;
+    license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.linux;  # GTK & co. are needed.
+  };
 }

pkgs/applications/editors/emacs-22/makefile-pwd.patch

@@ -1,129 +0,0 @@
---- emacs-22.1/Makefile.in	2008-02-10 23:56:29.000000000 +0100
-+++ emacs-22.1/Makefile.in	2008-02-10 23:55:55.000000000 +0100
-@@ -420,7 +420,7 @@
- 	-set ${COPYDESTS} ; \
- 	unset CDPATH; \
- 	for dir in ${COPYDIR} ; do \
--	  if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
-+	  if [ `(cd $$1 && pwd)` != `(cd $${dir} && pwd)` ] ; then \
- 	    rm -rf $$1 ; \
- 	  fi ; \
- 	  shift ; \
-@@ -432,7 +432,7 @@
- 	for dir in ${COPYDIR} ; do \
- 	  dest=$$1 ; shift ; \
- 	  [ -d $${dir} ] \
--	  && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \
-+	  && [ `(cd $${dir} && pwd)` != `(cd $${dest} && pwd)` ] \
- 	  && (echo "Copying $${dir} to $${dest}..." ; \
- 	      (cd $${dir}; tar -chf - . ) \
- 		| (cd $${dest}; umask 022; \
-@@ -472,7 +472,7 @@
- 	fi
- 	-chmod a+r $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el
- 	-unset CDPATH; \
--	if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \
-+	if [ `(cd ./etc; pwd)` != `(cd $(DESTDIR)${docdir}; pwd)` ]; \
- 	then \
- 	   echo "Copying etc/DOC-* to $(DESTDIR)${docdir} ..." ; \
- 	   (cd ./etc; tar -chf - DOC*) \
-@@ -483,8 +483,8 @@
- 	-unset CDPATH; \
- 	if [ -r ./lisp ] \
- 	   && [ -r ./lisp/simple.el ] \
--	   && [ x`(cd ./lisp; /bin/pwd)` != x`(cd $(DESTDIR)${lispdir}; /bin/pwd)` ] \
--	   && [ x`(cd ${srcdir}/lisp; /bin/pwd)` != x`(cd ./lisp; /bin/pwd)` ]; \
-+	   && [ x`(cd ./lisp; pwd)` != x`(cd $(DESTDIR)${lispdir}; pwd)` ] \
-+	   && [ x`(cd ${srcdir}/lisp; pwd)` != x`(cd ./lisp; pwd)` ]; \
- 	then \
- 	   echo "Copying lisp/*.el and lisp/*.elc to $(DESTDIR)${lispdir} ..." ; \
- 	   (cd lisp; tar -chf - *.el *.elc) \
-@@ -500,8 +500,8 @@
- 	    done) \
- 	else true; fi
- 	-unset CDPATH; \
--	thisdir=`/bin/pwd`; \
--	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
-+	thisdir=`pwd`; \
-+	if [ `(cd ${srcdir}/info && pwd)` != `(cd $(DESTDIR)${infodir} && pwd)` ]; \
- 	then \
- 	  (cd $(DESTDIR)${infodir};  \
- 	   if [ -f dir ]; then true; \
-@@ -519,8 +519,8 @@
- 	   done); \
- 	else true; fi
- 	-unset CDPATH; \
--	thisdir=`/bin/pwd`; \
--	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
-+	thisdir=`pwd`; \
-+	if [ `(cd ${srcdir}/info && pwd)` != `(cd $(DESTDIR)${infodir} && pwd)` ]; \
- 	then \
- 	  for elt in $(INFO_FILES); do \
- 	    (cd $${thisdir}; \
-@@ -528,7 +528,7 @@
- 	  done; \
- 	else true; fi
- 	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
--	thisdir=`/bin/pwd`; \
-+	thisdir=`pwd`; \
- 	cd ${srcdir}/etc; \
- 	for page in emacs emacsclient etags ctags ; do \
- 	  (cd $${thisdir}; \
-@@ -575,8 +575,8 @@
- 	-unset CDPATH; \
- 	for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do 	\
- 	  if [ -d $${dir} ]; then			\
--	    case `(cd $${dir} ; /bin/pwd)` in		\
--	      `(cd ${srcdir} ; /bin/pwd)`* ) ;;		\
-+	    case `(cd $${dir} ; pwd)` in		\
-+	      `(cd ${srcdir} ; pwd)`* ) ;;		\
- 	      * ) rm -rf $${dir} ;;			\
- 	    esac ;					\
- 	    case $${dir} in				\
---- emacs-22.1/leim/Makefile.in	2008-02-10 23:55:31.000000000 +0100
-+++ emacs-22.1/leim/Makefile.in	2008-02-10 23:55:41.000000000 +0100
-@@ -207,7 +207,7 @@
- leim-list.el: ${SUBDIRS} ${TIT-MISC} changed.tit changed.misc ${srcdir}/leim-ext.el
- 	${RUN-EMACS}  -l ${buildlisppath}/international/quail \
- 	  -f batch-byte-compile-if-not-done ${TIT-MISC:.elc=.el}
--	if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
-+	if [ x`(cd ${srcdir} && pwd)` = x`(pwd)` ] ; then \
- 	  ${RUN-EMACS} -l ${buildlisppath}/international/quail \
- 	    --eval "(update-leim-list-file \".\")" ; \
- 	else \
-@@ -220,11 +220,11 @@
- 	if [ ! -d ${INSTALLDIR} ] ; then \
-           ${srcdir}/${dot}${dot}/mkinstalldirs ${INSTALLDIR}; \
- 	else true; fi
--	if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
-+	if [ x`(cd ${INSTALLDIR} && pwd)` != x`(pwd)` ] ; then \
- 	  rm -rf ${INSTALLDIR}/leim-list.el; \
- 	  rm -rf ${INSTALLDIR}/quail ${INSTALLDIR}/ja-dic ; \
- 	  echo "Copying leim files to ${INSTALLDIR} ..." ; \
--	  if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
-+	  if [ x`(cd ${srcdir} && pwd)` = x`(pwd)` ] ; then \
- 	    tar -chf - leim-list.el quail ja-dic \
- 		| (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
- 	  else \
---- emacs-22.1/lib-src/Makefile.in	2008-02-10 23:59:08.000000000 +0100
-+++ emacs-22.1/lib-src/Makefile.in	2008-02-10 23:59:13.000000000 +0100
-@@ -306,7 +306,7 @@
- 	@echo
- 	@echo "Installing utilities run internally by Emacs."
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)${archlibdir}
--	if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
-+	if [ `(cd $(DESTDIR)${archlibdir} && pwd)` != `pwd` ]; then \
- 	  for file in ${UTILITIES}; do \
- 	    $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
- 	  done ; \
-@@ -321,8 +321,8 @@
- 	  chown ${gameuser} $(DESTDIR)${gamedir}; \
- 	  chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \
- 	fi
--        if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
--             != `(cd ${srcdir} && /bin/pwd)` ]; then \
-+        if [ `(cd $(DESTDIR)${archlibdir} && pwd)` \
-+             != `(cd ${srcdir} && pwd)` ]; then \
- 	  for file in ${SCRIPTS}; do \
- 	    $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
- 	  done ; \

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/bbdb/default.nix

@@ -14,8 +14,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   meta = {
-    description = ''The Insidious Big Brother Database (BBDB), a
-                    contact management utility for Emacs.'';
+    description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs";
     homepage = http://bbdb.sourceforge.net/;
     license = "GPL";
   };

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

@@ -0,0 +1,48 @@
+{ fetchurl, stdenv, emacs }:
+
+stdenv.mkDerivation rec {
+  name = "cedet-1.0pre6";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cedet/${name}.tar.gz";
+    sha256 = "0pvd54rjlba12cxgqibm8v4i8x43r5c239z891lgcbafjvkzpdxb";
+  };
+
+  buildInputs = [ emacs ];
+
+  doCheck = true;
+  checkPhase = "make utest";
+
+  installPhase = ''
+    ensureDir "$out/share/emacs/site-lisp"
+    cp -v */*.el */*/*.el */*.elc */*/*.elc "$out/share/emacs/site-lisp"
+    chmod a-x "$out/share/emacs/site-lisp/"*
+
+    ensureDir "$out/share/info"
+    cp -v */*.info* */*/*.info* "$out/share/info"
+  '';
+
+  meta = {
+    description = "CEDET, a Collection of Emacs Development Environment Tools";
+
+    longDescription = ''
+      CEDET is a collection of tools written with the end goal of
+      creating an advanced development environment in Emacs.
+
+      Emacs already is a great environment for writing software, but
+      there are additional areas that need improvement.  Many new
+      ideas for integrated environments have been developed in newer
+      products, such as JBuilder, Eclipse, or KDevelop.  CEDET is a
+      project which brings together several different tools needed to
+      implement advanced features.
+
+      CEDET includes EIEIO (Enhanced Implementation of Emacs
+      Interpreted Objects), Semantic, SRecode, Speedbar, EDE (Emacs
+      Development Environment), and COGRE (COnnected GRaph Editor).
+    '';
+
+    license = "GPLv2+";
+
+    homepage = http://cedet.sourceforge.net/;
+  };
+}

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

@@ -2,7 +2,7 @@
   name = "cua-mode-2.10";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/cua-mode-2.10.el;
+    url = http://nixos.org/tarballs/cua-mode-2.10.el;
     md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
   };
 }

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/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/emms/default.nix

@@ -0,0 +1,62 @@
+{ stdenv, fetchurl, emacs, texinfo
+, mpg321, vorbisTools, taglib, alsaUtils }:
+
+# XXX: EMMS also supports Xine, MPlayer, Jack, etc.
+
+stdenv.mkDerivation rec {
+  name = "emms-3.0";
+
+  src = fetchurl {
+    # These guys don't use ftp.gnu.org...
+    url = "http://www.gnu.org/software/emms/download/${name}.tar.gz";
+    sha256 = "151mfx97x15lfpd1qc2sqbvhwhvg46axgh15qyqmdy42vh906xav";
+  };
+
+  buildInputs = [ emacs texinfo ];
+
+  configurePhase = ''
+    sed -i "Makefile" -e "s|PREFIX *=.*\$|PREFIX = $out|g ;
+                          s|/usr/sbin/install-info|install-info|g ;
+                          s|/usr/include/taglib|${taglib}/include/taglib|g ;
+                          s|/usr/lib|${taglib}/lib|g ;
+                          s|^all:\(.*\)\$|all:\1 emms-print-metadata|g"
+    ensureDir "$out/share/man/man1"
+
+    sed -i "emms-player-mpg321-remote.el" \
+        -e 's|emms-player-mpg321-remote-command[[:blank:]]\+"mpg321"|emms-player-mpg321-remote-command "${mpg321}/bin/mpg321"|g'
+    sed -i "emms-player-simple.el" \
+        -e 's|"ogg123"|"${vorbisTools}/bin/ogg123"|g'
+    sed -i "emms-info-ogginfo.el" \
+        -e 's|emms-info-ogginfo-program-name[[:blank:]]\+"ogginfo"|emms-info-ogginfo-program-name "${vorbisTools}/bin/ogginfo"|g'
+    sed -i "emms-info-libtag.el" \
+        -e "s|\"emms-print-metadata\"|\"$out/bin/emms-print-metadata\"|g"
+    sed -i "emms-volume-amixer.el" \
+        -e 's|"amixer"|"${alsaUtils}/bin/amixer"|g'
+
+    # Use the libtag info back-end for MP3s since we're building it.
+    sed -i "emms-setup.el" \
+        -e 's|emms-info-mp3info|emms-info-libtag|g'
+  '';
+
+  postInstall = ''
+    ensureDir "$out/bin" && cp emms-print-metadata "$out/bin"
+  '';
+  
+  meta = {
+    description = "GNU EMMS, The Emacs Multimedia System";
+
+    longDescription = ''
+      EMMS is the Emacs Multimedia System.  It tries to be a clean and
+      small application to play multimedia files from Emacs using
+      external players.  Many of it's ideas are derived from
+      MpthreePlayer, but it tries to be more general and cleaner.
+
+      The fact that EMMS is based on external players makes it
+      powerful, because it supports all formats that those players
+      support, with no effort from your side.
+    '';
+
+    homepage = http://www.gnu.org/software/emms/;
+    license = "GPLv3+";
+  };
+}

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

@@ -1,6 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/emacs/site-lisp
-tar zxvf $src
-cp haskell-mode*/*.el $out/emacs/site-lisp
-cp haskell-mode*/*.hs $out/emacs/site-lisp

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

@@ -1,8 +1,17 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "haskell-mode-1.45";
-  builder = ./builder.sh;
+{stdenv, fetchurl, emacs}:
+
+stdenv.mkDerivation rec {
+  name = "haskell-mode-2.6.1";
+
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/haskell-mode-1.45.tar.gz;
-    md5 = "c609998580cdb9ca8888c7d47d22ca3b";
+    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/maude/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, emacs}:
+
+stdenv.mkDerivation
+{
+  name = "maude-mode-0.1";
+  src = fetchurl
+  {
+    url = "mirror://sourceforge/maude-mode/maude-mode.tar.gz";
+    sha256 = "12555j01mar48da2jy3ay93xfn7ybl23bpvhp0srzg8858gisx5g";
+  };
+  buildInputs = [emacs];
+  configureFlags = "--with-lispdir=$$out/share/emacs/site-lisp";
+}

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

@@ -2,7 +2,7 @@
   name = "nxml-mode-20041004";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/nxml-mode-20041004.tar.gz;
+    url = http://nixos.org/tarballs/nxml-mode-20041004.tar.gz;
     md5 = "ac137024cf337d6f11d8ab278d39b4db";
   };
 }

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

@@ -0,0 +1,32 @@
+{ fetchurl, stdenv, emacs }:
+
+stdenv.mkDerivation {
+  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 = "1q5442cpvw2i0qhmhn7mh45jnmzg0cmd01k5zp4gvg1526c0hbcc";
+  };
+
+  buildInputs = [ emacs ];
+
+  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/remember/default.nix

@@ -0,0 +1,45 @@
+{ fetchurl, stdenv, texinfo, emacs, bbdb }:
+
+stdenv.mkDerivation rec {
+  # Note: Remember is part of GNU Emacs 23.
+  name = "remember-2.0";
+
+  src = fetchurl {
+    url = "http://download.gna.org/remember-el/${name}.tar.gz";
+    sha256 = "04bp071xjbb6mbspjpwcza0krgx2827v6rfxbsdcpn0qcjgad9wm";
+  };
+
+  # FIXME: It also has a (soft) dependency on Planner and Bibl-mode.
+  buildInputs = [ emacs bbdb texinfo ];
+
+  patchPhase = ''
+    sed -i "Makefile.defs" \
+         -e"s|^ *PREFIX *=.*$|PREFIX = $out|g ;
+	    s|^ *ELISPDIR *=.*$|ELISPDIR = $out/share/emacs/site-lisp|g ;
+	    s|^ *EMACS *=.*$|EMACS = emacs -L \"${bbdb}/share/emacs/site-lisp\"|g"
+  '';
+
+  meta = {
+    description = "Remember, an Emacs mode for quickly remembering data";
+
+    longDescription = ''
+      Remember is an Emacs mode for quickly remembering data.  It uses
+      whatever back-end is appropriate to record and correlate the
+      data, but its main intention is to allow you to express as
+      little structure as possible up front.
+
+      When you enter data, either by typing it into a buffer, or using
+      the contents of the selected region, Remember will store that
+      data -- unindexed, uninterpreted -- in a data pool.  It will
+      also try to remember as much context information as possible
+      (any text properties that were set, where you copied it from,
+      when, how, etc).  Later, you can walk through your accumulated
+      set of data (both organized, and unorganized) and easily begin
+      moving things around, and making annotations that will express
+      the full meaning of that data, as far as you know it.
+    '';
+
+    homepage = http://gna.org/projects/remember-el/;
+    license = "GPLv2+";
+  };
+}

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/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,16 +1,17 @@
 source $stdenv/setup
 
-preConfigure=preConfigure
 preConfigure() {
     libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
     echo "libc: $libc"
 
-    substituteInPlace src/s/gnu-linux.h \
-        --replace /usr/lib/crt1.o $libc/lib/crt1.o \
-        --replace /usr/lib/crti.o $libc/lib/crti.o \
-        --replace /usr/lib/crtn.o $libc/lib/crtn.o
+    for i in src/s/*.h src/m/*.h; do
+        substituteInPlace $i \
+            --replace /usr/lib/crt1.o $libc/lib/crt1.o \
+            --replace /usr/lib/crti.o $libc/lib/crti.o \
+            --replace /usr/lib/crtn.o $libc/lib/crtn.o
+    done
     
-    for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in ./admin/unidata/Makefile; do
+    for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
         substituteInPlace $i --replace /bin/pwd pwd
     done
 }

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

@@ -0,0 +1,58 @@
+{ xawSupport ? true
+, xpmSupport ? true
+, dbusSupport ? true
+, xaw3dSupport ? false
+, gtkGUI ? false
+, xftSupport ? false
+, stdenv, fetchcvs, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
+, pkgconfig ? null, gtk ? null, libXft ? null, dbus ? null
+, libpng, libjpeg, libungif, libtiff, texinfo
+, autoconf, automake
+}:
+
+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
+
+let date = "2009-06-26"; in
+stdenv.mkDerivation {
+  name = "emacs-snapshot-23-${date}";
+  
+  builder = ./builder.sh;
+  
+  src = fetchcvs {
+    inherit date;
+    cvsRoot = ":pserver:anonymous@cvs.savannah.gnu.org:/sources/emacs";
+    module = "emacs";
+    sha256 = "bf9b21a0634f45474a1ce91e6153ced69194f1e9c0acd6626a931198f4a5972f";
+  };
+
+  preConfigure = "autoreconf -vfi";
+  
+  buildInputs = [
+    autoconf automake
+    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 ""}
+  ";
+
+  meta = {
+    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/emacs-unicode/default.nix

@@ -1,50 +0,0 @@
-{ xawSupport ? true
-, xpmSupport ? true
-, xaw3dSupport ? false
-, gtkGUI ? false
-, xftSupport ? false
-, stdenv, fetchurl, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
-, pkgconfig ? null, gtk ? null, libXft ? null
-, libpng, libjpeg, libungif, libtiff
-}:
-
-assert xawSupport -> libXaw != null;
-assert xpmSupport -> libXpm != null;
-assert xaw3dSupport -> Xaw3d != null;
-assert gtkGUI -> pkgconfig != null && gtk != null;
-assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug
-
-stdenv.mkDerivation {
-  name = "emacs-23.0.0.1-pre20070705";
-  
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = http://debs.peadrop.com/pool/edgy/backports/emacs-snapshot_20070705.orig.tar.gz;
-    sha256 = "1blybacpsxha2v24kj482wl3g1z93rwddfc8rsqsk6dr6f5kdj5q";
-  };
-
-#  patches = [
-#    ./crt.patch
-#  ];
-  
-  buildInputs = [
-    ncurses x11
-    (if xawSupport then libXaw else null)
-    (if xpmSupport then libXpm 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-gtk --enable-font-backend --with-xft" else ""}
-  ";
-
-  meta = {
-    description = "Emacs with Unicode, GTK and Xft support (23.x alpha)";
-    homepage = http://www.emacswiki.org/cgi-bin/wiki/XftGnuEmacs;
-    license = "GPL";
-  };
-}

pkgs/applications/editors/kile/default.nix

@@ -0,0 +1,21 @@
+{stdenv, fetchurl, perl, arts, qt, kdelibs,
+ libX11, libXt, libXext, libXrender, libXft,
+ zlib, libpng, libjpeg, freetype, expat }:
+
+stdenv.mkDerivation {
+  name = "kile-2.0.3";
+
+  src = fetchurl {
+    url = mirror://sourceforge/kile/kile-2.0.3.tar.bz2;
+    md5 = "f0296547d3e916dd385e0b8913918852";
+  };
+
+  buildInputs = [ perl arts qt kdelibs libX11 libXt libXext libXrender libXft
+                  zlib libpng libjpeg freetype expat ];
+
+  meta = {
+    description = "An integrated LaTeX editor for KDE";
+    homepage = http://kile.sourceforge.net;
+    license = "GPLv2";
+  };
+}