svn path=/nixpkgs/branches/0.12-release/; revision=15292

.gitignore

@@ -1,4 +0,0 @@
-*~
-,*
-.*.swp
-.*.swo

STABLE

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

VERSION

@@ -1 +1 @@
-1.0
+0.12

doc/Makefile

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

doc/coding-conventions.xml

@@ -1,605 +0,0 @@
-<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>
-
-  <listitem><para>Functions should list their expected arguments as
-  precisely as possible.  That is, write
-
-<programlisting>
-{ stdenv, fetchurl, perl }: <replaceable>...</replaceable>
-</programlisting>
-
-  instead of
-
-<programlisting>
-args: with args; <replaceable>...</replaceable>
-</programlisting>
-
-  or 
-  
-<programlisting>
-{ stdenv, fetchurl, perl, ... }: <replaceable>...</replaceable>
-</programlisting>
-
-  </para>
-
-  <para>For functions that are truly generic in the number of
-  arguments (such as wrappers around <varname>mkDerivation</varname>)
-  that have some required arguments, you should write them using an
-  <literal>@</literal>-pattern:
-
-<programlisting>
-{ stdenv, doCoverageAnalysis ? false, ... } @ args:
-
-stdenv.mkDerivation (args // {
-  <replaceable>...</replaceable> if doCoverageAnalysis then "bla" else "" <replaceable>...</replaceable>
-})
-</programlisting>
-
-  instead of
-
-<programlisting>
-args:
-
-args.stdenv.mkDerivation (args // {
-  <replaceable>...</replaceable> if args ? doCoverageAnalysis &amp;&amp; args.doCoverageAnalysis then "bla" else "" <replaceable>...</replaceable>
-})
-</programlisting>
-
-  </para></listitem>
-
-</itemizedlist>
-
-</section>
-
-
-<section><title>Package naming</title>
-
-<para>In Nixpkgs, there are generally three different names associated with a package:
-
-<itemizedlist>
-
-  <listitem><para>The <varname>name</varname> attribute of the
-  derivation (excluding the version part).  This is what most users
-  see, in particular when using
-  <command>nix-env</command>.</para></listitem>
-
-  <listitem><para>The variable name used for the instantiated package
-  in <filename>all-packages.nix</filename>, and when passing it as a
-  dependency to other functions.  This is what Nix expression authors
-  see.  It can also be used when installing using <command>nix-env
-  -iA</command>.</para></listitem>
-
-  <listitem><para>The filename for (the directory containing) the Nix
-  expression.</para></listitem>
-
-</itemizedlist>
-
-Most of the time, these are the same.  For instance, the package
-<literal>e2fsprogs</literal> has a <varname>name</varname> attribute
-<literal>"e2fsprogs-<replaceable>version</replaceable>"</literal>, is
-bound to the variable name <varname>e2fsprogs</varname> in
-<filename>all-packages.nix</filename>, and the Nix expression is in
-<filename>pkgs/os-specific/linux/e2fsprogs/default.nix</filename>.
-However, identifiers in the Nix language don’t allow certain
-characters (e.g. dashes), so sometimes a different variable name
-should be used.  For instance, the
-<literal>module-init-tools</literal> package is bound to the
-<literal>module_init_tools</literal> variable in
-<filename>all-packages.nix</filename>.</para>
-
-<para>There are a few naming guidelines:
-
-<itemizedlist>
-
-  <listitem><para>Generally, try to stick to the upstream package
-  name.</para></listitem>
-
-  <listitem><para>Don’t use uppercase letters in the
-  <literal>name</literal> attribute — e.g.,
-  <literal>"mplayer-1.0rc2"</literal> instead of
-  <literal>"MPlayer-1.0rc2"</literal>.</para></listitem>
-
-  <listitem><para>The version part of the <literal>name</literal>
-  attribute <emphasis>must</emphasis> start with a digit (following a
-  dash) — e.g., <literal>"hello-0.3-pre-r3910"</literal> instead of
-  <literal>"hello-svn-r3910"</literal>, as the latter would be seen as
-  a package named <literal>hello-svn</literal> by
-  <command>nix-env</command>.</para></listitem>
-
-  <listitem><para>Dashes in the package name should be changed to
-  underscores in variable names, rather than to camel case — e.g.,
-  <varname>module_init_tools</varname> instead of
-  <varname>moduleInitTools</varname>.</para></listitem>
-
-  <listitem><para>If there are multiple versions of a package, this
-  should be reflected in the variable names in
-  <filename>all-packages.nix</filename>,
-  e.g. <varname>hello_0_3</varname> and <varname>hello_0_4</varname>.
-  If there is an obvious “default” version, make an attribute like
-  <literal>hello = hello_0_4;</literal>.</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-</section>
-
-
-<section xml:id="sec-organisation"><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><title>Hierachy</title>
-
-<para>Each package should be stored in its own directory somewhere in
-the <filename>pkgs/</filename> tree, i.e. in
-<filename>pkgs/<replaceable>category</replaceable>/<replaceable>subcategory</replaceable>/<replaceable>...</replaceable>/<replaceable>pkgname</replaceable></filename>.
-Below are some rules for picking the right category for a package.
-Many packages fall under several categories; what matters is the
-<emphasis>primary</emphasis> purpose of a package.  For example, the
-<literal>libxml2</literal> package builds both a library and some
-tools; but it’s a library foremost, so it goes under
-<filename>pkgs/development/libraries</filename>.</para>
-
-<para>When in doubt, consider refactoring the
-<filename>pkgs/</filename> tree, e.g. creating new categories or
-splitting up an existing category.</para>
-
-<variablelist>
-  <varlistentry>
-    <term>If it’s used to support <emphasis>software development</emphasis>:</term>
-    <listitem>
-      <variablelist>
-        <varlistentry>
-          <term>If it’s a <emphasis>library</emphasis> used by other packages:</term>
-          <listitem>
-            <para><filename>development/libraries</filename> (e.g. <filename>libxml2</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s a <emphasis>compiler</emphasis>:</term>
-          <listitem>
-            <para><filename>development/compilers</filename> (e.g. <filename>gcc</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s an <emphasis>interpreter</emphasis>:</term>
-          <listitem>
-            <para><filename>development/interpreters</filename> (e.g. <filename>guile</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s a (set of) development <emphasis>tool(s)</emphasis>:</term>
-          <listitem>
-            <variablelist>
-              <varlistentry>
-                <term>If it’s a <emphasis>parser generator</emphasis> (including lexers):</term>
-                <listitem>
-                  <para><filename>development/tools/parsing</filename> (e.g. <filename>bison</filename>, <filename>flex</filename>)</para>
-                </listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>If it’s a <emphasis>build manager</emphasis>:</term>
-                <listitem>
-                  <para><filename>development/tools/build-managers</filename> (e.g. <filename>gnumake</filename>)</para>
-                </listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>Else:</term>
-                <listitem>
-                  <para><filename>development/tools/misc</filename> (e.g. <filename>binutils</filename>)</para>
-                </listitem>
-              </varlistentry>
-            </variablelist>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Else:</term>
-          <listitem>
-            <para><filename>development/misc</filename></para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s a (set of) <emphasis>tool(s)</emphasis>:</term>
-    <listitem>
-      <para>(A tool is a relatively small program, especially one intented
-      to be used non-interactively.)</para>
-      <variablelist>
-        <varlistentry>
-          <term>If it’s for <emphasis>networking</emphasis>:</term>
-          <listitem>
-            <para><filename>tools/networking</filename> (e.g. <filename>wget</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s for <emphasis>text processing</emphasis>:</term>
-          <listitem>
-            <para><filename>tools/text</filename> (e.g. <filename>diffutils</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s a <emphasis>system utility</emphasis>, i.e.,
-          something related or essential to the operation of a
-          system:</term>
-          <listitem>
-            <para><filename>tools/system</filename> (e.g. <filename>cron</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s an <emphasis>archiver</emphasis> (which may
-          include a compression function):</term>
-          <listitem>
-            <para><filename>tools/archivers</filename> (e.g. <filename>zip</filename>, <filename>tar</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s a <emphasis>compression</emphasis> program:</term>
-          <listitem>
-            <para><filename>tools/compression</filename> (e.g. <filename>gzip</filename>, <filename>bzip2</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s a <emphasis>security</emphasis>-related program:</term>
-          <listitem>
-            <para><filename>tools/security</filename> (e.g. <filename>nmap</filename>, <filename>gnupg</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Else:</term>
-          <listitem>
-            <para><filename>tools/misc</filename></para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s a <emphasis>shell</emphasis>:</term>
-    <listitem>
-      <para><filename>shells</filename> (e.g. <filename>bash</filename>)</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s a <emphasis>server</emphasis>:</term>
-    <listitem>
-      <variablelist>
-        <varlistentry>
-          <term>If it’s a web server:</term>
-          <listitem>
-            <para><filename>servers/http</filename> (e.g. <filename>apache-httpd</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s an implementation of the X Windowing System:</term>
-          <listitem>
-            <para><filename>servers/x11</filename> (e.g. <filename>xorg</filename> — this includes the client libraries and programs)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Else:</term>
-          <listitem>
-            <para><filename>servers/misc</filename></para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s a <emphasis>desktop environment</emphasis>
-    (including <emphasis>window managers</emphasis>):</term>
-    <listitem>
-      <para><filename>desktops</filename> (e.g. <filename>kde</filename>, <filename>gnome</filename>, <filename>enlightenment</filename>)</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s an <emphasis>application</emphasis>:</term>
-    <listitem>
-      <para>A (typically large) program with a distinct user
-      interface, primarily used interactively.</para>
-      <variablelist>
-        <varlistentry>
-          <term>If it’s a <emphasis>version management system</emphasis>:</term>
-          <listitem>
-            <para><filename>applications/version-management</filename> (e.g. <filename>subversion</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s for <emphasis>video playback / editing</emphasis>:</term>
-          <listitem>
-            <para><filename>applications/video</filename> (e.g. <filename>vlc</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s for <emphasis>graphics viewing / editing</emphasis>:</term>
-          <listitem>
-            <para><filename>applications/graphics</filename> (e.g. <filename>gimp</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s for <emphasis>networking</emphasis>:</term>
-          <listitem>
-            <variablelist>
-              <varlistentry>
-                <term>If it’s a <emphasis>mailreader</emphasis>:</term>
-                <listitem>
-                  <para><filename>applications/networking/mailreaders</filename> (e.g. <filename>thunderbird</filename>)</para>
-                </listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>If it’s a <emphasis>newsreader</emphasis>:</term>
-                <listitem>
-                  <para><filename>applications/networking/newsreaders</filename> (e.g. <filename>pan</filename>)</para>
-                </listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>If it’s a <emphasis>web browser</emphasis>:</term>
-                <listitem>
-                  <para><filename>applications/networking/browsers</filename> (e.g. <filename>firefox</filename>)</para>
-                </listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>Else:</term>
-                <listitem>
-                  <para><filename>applications/networking/misc</filename></para>
-                </listitem>
-              </varlistentry>
-            </variablelist>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Else:</term>
-          <listitem>
-            <para><filename>applications/misc</filename></para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s <emphasis>data</emphasis> (i.e., does not have a
-    straight-forward executable semantics):</term>
-    <listitem>
-      <variablelist>
-        <varlistentry>
-          <term>If it’s a <emphasis>font</emphasis>:</term>
-          <listitem>
-            <para><filename>data/fonts</filename></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s related to <emphasis>SGML/XML processing</emphasis>:</term>
-          <listitem>
-            <variablelist>
-              <varlistentry>
-                <term>If it’s an <emphasis>XML DTD</emphasis>:</term>
-                <listitem>
-                  <para><filename>data/sgml+xml/schemas/xml-dtd</filename> (e.g. <filename>docbook</filename>)</para>
-                </listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>If it’s an <emphasis>XSLT stylesheet</emphasis>:</term>
-                <listitem>
-                  <para>(Okay, these are executable...)</para>
-                  <para><filename>data/sgml+xml/stylesheets/xslt</filename> (e.g. <filename>docbook-xsl</filename>)</para>
-                </listitem>
-              </varlistentry>
-            </variablelist>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s a <emphasis>game</emphasis>:</term>
-    <listitem>
-      <para><filename>games</filename></para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>Else:</term>
-    <listitem>
-      <para><filename>misc</filename></para>
-    </listitem>
-  </varlistentry>
-</variablelist>
-
-</section>
-
-<section><title>Versioning</title>
-
-<para>Because every version of a package in Nixpkgs creates a
-potential maintenance burden, old versions of a package should not be
-kept unless there is a good reason to do so.  For instance, Nixpkgs
-contains several versions of GCC because other packages don’t build
-with the latest version of GCC.  Other examples are having both the
-latest stable and latest pre-release version of a package, or to keep
-several major releases of an application that differ significantly in
-functionality.</para>
-
-<para>If there is only one version of a package, its Nix expression
-should be named <filename>e2fsprogs/default.nix</filename>.  If there
-are multiple versions, this should be reflected in the filename,
-e.g. <filename>e2fsprogs/1.41.8.nix</filename> and
-<filename>e2fsprogs/1.41.9.nix</filename>.  The version in the
-filename should leave out unnecessary detail.  For instance, if we
-keep the latest Firefox 2.0.x and 3.5.x versions in Nixpkgs, they
-should be named <filename>firefox/2.0.nix</filename> and
-<filename>firefox/3.5.nix</filename>, respectively (which, at a given
-point, might contain versions <literal>2.0.0.20</literal> and
-<literal>3.5.4</literal>).  If a version requires many auxiliary
-files, you can use a subdirectory for each version,
-e.g. <filename>firefox/2.0/default.nix</filename> and
-<filename>firefox/3.5/default.nix</filename>.</para>
-
-<para>All versions of a package <emphasis>must</emphasis> be included
-in <filename>all-packages.nix</filename> to make sure that they
-evaluate correctly.</para>
-
-</section>
-
-</section>
-
-
-</chapter>

doc/introduction.xml

@@ -7,13 +7,13 @@
 <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://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual">Nix
+<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://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter
+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>

doc/language-support.xml

@@ -1,6 +1,6 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="chap-language-support">
+         xml:id="chap-meta">
 
 <title>Support for specific programming languages</title>
 
@@ -13,15 +13,15 @@ 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>
+<section><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://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.</para>
+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://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/perl-packages.nix</filename></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
@@ -156,58 +156,21 @@ ClassC3Componentised = buildPerlPackage rec {
 
 <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://github.com/NixOS/nixpkgs/blob/master/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>TODO</para>
 
-<para>
-  Python packages that use <varname>buildPythonPackage</varname> are
-  defined
-  in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>.
-  Most of them are simple.  For example:
+</section>
 
-  <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";
-  };
+<section><title>Haskell</title>
 
-  propagatedBuildInputs = [ pkgs.ZopeInterface ];
-
-  meta = {
-    homepage = http://twistedmatrix.com/;
-    description = "Twisted, an event-driven networking engine written in Python";
-    license = "MIT";
-  };
-};
-  </programlisting>
-</para>
+<para>TODO</para>
 
 </section>
 
 
 <section><title>Java</title>
 
-<para>Java packages should install JAR files in
-<filename>$out/lib/java</filename>.</para>
-
-</section>
-
-
-<!--
-<section><title>Haskell</title>
-
-<para>TODO</para>
+<para>TODO; Java support needs lots of improvement</para>
 
 </section>
 
@@ -217,7 +180,6 @@ twisted = buildPythonPackage {
 <para>* Special support for building TeX documents</para>
 
 </section>
--->
 
 
-</chapter>
+</chapter>

doc/manual.xml

@@ -14,15 +14,18 @@
         <surname>Dolstra</surname>
       </personname>
       <affiliation>
-        <orgname>LogicBlox</orgname>
+        <orgname>Delft University of Technology</orgname>
+        <orgdiv>Department of Software Technology</orgdiv>
       </affiliation>
     </author>
 
     <copyright>
-      <year>2008-2012</year>
+      <year>2008</year>
       <holder>Eelco Dolstra</holder>
     </copyright>
 
+    <date>June 2008</date>
+    
   </info>
 
   <xi:include href="introduction.xml" />
@@ -31,7 +34,6 @@
   <xi:include href="meta.xml" />
   <xi:include href="language-support.xml" />
   <xi:include href="package-notes.xml" />
-  <xi:include href="coding-conventions.xml" />
   
         
 </book>

doc/meta.xml

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

doc/package-notes.xml

@@ -1,6 +1,6 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="chap-package-notes">
+         xml:id="chap-introduction">
 
 <title>Package Notes</title>
 
@@ -11,12 +11,12 @@ Linux kernel or X.org.</para>
 
 <!--============================================================-->
 
-<section xml:id="sec-linux-kernel">
+<section>
 
 <title>Linux kernel</title>
 
 <para>The Nix expressions to build the Linux kernel are in <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel"><filename>pkgs/os-specific/linux/kernel</filename></link>.</para>
+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
@@ -49,7 +49,7 @@ modulesTree = [kernel]
 <orderedlist>
 
   <listitem>
-    <para>Copy the old Nix expression
+    <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>
@@ -69,7 +69,7 @@ modulesTree = [kernel]
       <orderedlist>
 
         <listitem>
-          <para>Make an copy from the old
+          <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>
@@ -170,18 +170,15 @@ splashutils_15 = ...;</programlisting>
 
 <para>The Nix expressions for the X.org packages reside in
 <filename>pkgs/servers/x11/xorg/default.nix</filename>.  This file is
-automatically generated from lists of tarballs in an X.org release.
-As such it should not be modified directly; rather, you should modify
-the lists, 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>
+automatically generated from lists of tarballs in an X.org
+release.  As such it should not be modified directly; rather, you
+should modify the lists or the generator script.</para>
 
 <para>The generator is invoked as follows:
 
 <screen>
 $ cd pkgs/servers/x11/xorg
-$ cat tarballs-7.5.list extra.list old.list \
+$ cat tarballs-7.4.list extra.list old.list \
   | perl ./generate-expr-from-tarballs.pl
 </screen>
 
@@ -195,7 +192,7 @@ tarballs between runs.  Pay close attention to the <literal>NOT FOUND:
 run, since they may indicate missing dependencies.  (Some might be
 optional dependencies, however.)</para>
 
-<para>A file like <filename>tarballs-7.5.list</filename> contains all
+<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>
@@ -215,8 +212,8 @@ some people or by other packages (such as
 <para>If the expression for a package requires derivation attributes
 that the generator cannot figure out automatically (say,
 <varname>patches</varname> or a <varname>postInstall</varname> hook),
-you should modify
-<filename>pkgs/servers/x11/xorg/overrides.nix</filename>.</para>
+you should modify the generator script
+(<varname>generate-expr-from-tarballs.pl</varname>).</para>
 
 </section>
 
@@ -224,23 +221,19 @@ you should modify
 
 <!--============================================================-->
 
-<!--
 <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

@@ -1,6 +1,6 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="chap-quick-start">
+         xml:id="chap-overvie">
 
 <title>Quick Start to Adding a Package</title>
 
@@ -12,7 +12,7 @@
     <para>Checkout the Nixpkgs source tree:
 
 <screen>
-$ git clone git://github.com/NixOS/nixpkgs.git 
+$ svn checkout https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs
 $ cd nixpkgs</screen>
 
     </para>
@@ -25,11 +25,11 @@ $ cd nixpkgs</screen>
     <filename>pkgs/development/libraries/<replaceable>pkgname</replaceable></filename>,
     while a web browser goes into
     <filename>pkgs/applications/networking/browsers/<replaceable>pkgname</replaceable></filename>.
-    See <xref linkend="sec-organisation" /> for some hints on the tree
-    organisation.  Create a directory for your package, e.g.
+    See Section XXX for some hints on the tree organisation.  Create a
+    directory for your package, e.g.
 
 <screen>
-$ mkdir pkgs/development/libraries/libfoo</screen>
+$ svn mkdir pkgs/development/libraries/libfoo</screen>
   
     </para>
   </listitem>
@@ -44,7 +44,7 @@ $ mkdir pkgs/development/libraries/libfoo</screen>
 
 <screen>
 $ emacs pkgs/development/libraries/libfoo/default.nix
-$ git add pkgs/development/libraries/libfoo/default.nix</screen>
+$ svn add pkgs/development/libraries/libfoo/default.nix</screen>
 
     </para>
 
@@ -56,7 +56,7 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
 
         <listitem>
           <para>GNU cpio: <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></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>
@@ -64,21 +64,21 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
 
         <listitem>
           <para>GNU Hello: <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/ex-2/default.nix"><filename>pkgs/applications/misc/hello/ex-2/default.nix</filename></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://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/default.nix"><filename>pkgs/development/libraries/gmp/default.nix</filename></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://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></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>
@@ -86,7 +86,7 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
 
         <listitem>
           <para>Apache HTTPD: <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/default.nix"><filename>pkgs/servers/http/apache-httpd/default.nix</filename></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>
@@ -94,9 +94,9 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
 
         <listitem>
           <para>BitTorrent (wxPython-based): <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/default.nix"><filename>pkgs/tools/networking/p2p/bittorrent/default.nix</filename></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://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/builder.sh">build
+          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.
@@ -104,35 +104,36 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
         </listitem>
 
         <listitem>
-          <para>Thunderbird: <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/3.x.nix</filename></link>.
+          <para>Firefox: <link
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/networking/browsers/firefox-3/default.nix"><filename>pkgs/applications/networking/browsers/firefox-3/default.nix</filename></link>.
           Lots of dependencies.</para>
         </listitem>
 
         <listitem>
           <para>JDiskReport, a Java utility: <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></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://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder</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://github.com/NixOS/nixpkgs/blob/master/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>
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></link>
+          (search for the <varname>perlXMLSimple</varname>
+          attribute).  Most Perl modules are so simple to build that
+          they are defined directly in
+          <filename>all-packages.nix</filename>, no need to make a
+          separate file for them.</para>
         </listitem>
 
         <listitem>
           <para>Adobe Reader: <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>.
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/acrobat-reader/default.nix"><filename>pkgs/applications/misc/acrobat-reader/default.nix</filename></link>.
           Shows how binary-only packages can be supported.  In
           particular the <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder</link>
+          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/acrobat-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>
@@ -147,11 +148,10 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
       <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>
+          <para>All <varname>meta</varname> attributes are optional,
+          but it’s still a good idea to provide at least the
+          <varname>description</varname> and
+          <varname>homepage</varname>.</para>
         </listitem>
 
         <listitem>
@@ -163,7 +163,7 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
         <listitem>
           <para>A list of schemes for <literal>mirror://</literal>
           URLs can be found in <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>.</para>
+          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>
@@ -173,7 +173,7 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
     <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://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter
+    xlink:href="http://nixos.org/releases/nix/unstable/manual/#chap-writing-nix-expressions">chapter
     on writing Nix expressions</link>.</para>
     
   </listitem>
@@ -181,7 +181,7 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
   <listitem>
     <para>Add a call to the function defined in the previous step to
     <link
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></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>.
 
@@ -220,7 +220,8 @@ $ nix-env -f . -iA libfoo</screen>
   </listitem>
 
   <listitem>
-    <para>Optionally commit the new package, or send a patch to
+    <para>Optionally commit the new package (<command>svn
+    ci</command>) or send a patch to
     <literal>nix-dev@cs.uu.nl</literal>.</para>
   </listitem>
 
@@ -229,11 +230,11 @@ $ nix-env -f . -iA libfoo</screen>
     package and make them available in the <link
     xlink:href="http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/"><literal>nixpkgs</literal>
     channel</link>, add it to <link
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/release.nix"><filename>pkgs/top-level/release.nix</filename></link>.</para>
+    xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/build-for-release.nix"><filename>pkgs/top-level/build-for-release.nix</filename></link>.</para>
   </listitem>
 
 </orderedlist>
 
 </para>
 
-</chapter>
+</chapter>

doc/release-notes.xml

@@ -5,46 +5,6 @@
 <title>Nixpkgs Release Notes</title>
 
 
-<section><title>Release 0.14 (June 4, 2012)</title>
-
-<para>In preparation for the switch from Subversion to Git, this
-release is mainly the prevent the Nixpkgs version number from going
-backwards.  (This would happen because prerelease version numbers
-produced for the Git repository are lower than those for the
-Subversion repository.)</para>
-
-<para>Since the last release, there have been thousands of changes and
-new packages by numerous contributors.  For details, see the commit
-logs.</para>
-
-</section>
-
-
-<section><title>Release 0.13 (February 5, 2010)</title>
-
-<para>As always, there are many changes.  Some of the most important
-updates are:
-
-<itemizedlist>
-
-  <listitem><para>Glibc 2.9.</para></listitem>
-
-  <listitem><para>GCC 4.3.3.</para></listitem>
-
-  <listitem><para>Linux 2.6.32.</para></listitem>
-
-  <listitem><para>X.org 7.5.</para></listitem>
-
-  <listitem><para>KDE 4.3.4.</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-
-</section>
-
-
 <section><title>Release 0.12 (April 24, 2009)</title>
 
 <para>There are way too many additions to Nixpkgs since the last
@@ -95,7 +55,7 @@ worth listing:
   <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
+  <filename>pkgs/build-support/vm.default.nix</filename> for
   details.</para></listitem>
 
   <listitem><para>Improved support for building Haskell

doc/stdenv.xml

@@ -70,7 +70,7 @@ stdenv.mkDerivation {
     gcc foo.c -o foo
   '';
   installPhase = ''
-    mkdir -p $out/bin
+    ensureDir $out/bin
     cp foo $out/bin
   '';
 }</programlisting>
@@ -112,7 +112,7 @@ buildPhase() {
 }
 
 installPhase() {
-  mkdir -p $out/bin
+  ensureDir $out/bin
   cp foo $out/bin
 }
 
@@ -470,7 +470,7 @@ Additional file types can be supported by setting the
 <section><title>The configure phase</title>
 
 <para>The configure phase prepares the source tree for building.  The
-default <function>configurePhase</function> runs
+default <function>unpackPhase</function> runs
 <filename>./configure</filename> (typically an Autoconf-generated
 script) if it exists.</para>
 
@@ -879,7 +879,7 @@ distribution of the package.  The default
 <function>distPhase</function> first calls <command>make
 dist</command>, then it copies the resulting source tarballs to
 <filename>$out/tarballs/</filename>.  This phase is only executed if
-the attribute <varname>doDist</varname> is set.</para>
+the <varname>doDist</varname> is not set.</para>
 
 <variablelist>
   <title>Variables controlling the distribution phase</title>
@@ -939,6 +939,14 @@ functions.</para>
 <variablelist>
 
   
+  <varlistentry xml:id='fun-ensureDir'>
+    <term><function>ensureDir</function> <replaceable>args</replaceable></term>
+    <listitem><para>Creates the specified directories, including all
+    necessary parent directories, if they do not already
+    exist.</para></listitem>
+  </varlistentry>
+  
+
   <varlistentry xml:id='fun-substitute'>
     <term><function>substitute</function>
     <replaceable>infile</replaceable>
@@ -1054,16 +1062,7 @@ echo @foo@
     That is, no substitution is performed for undefined variables.</para></listitem>
   </varlistentry>
 
-
-  <varlistentry xml:id='fun-substituteAllInPlace'>
-    <term><function>substituteAllInPlace</function>
-    <replaceable>file</replaceable></term>
-    <listitem><para>Like <function>substituteAll</function>, but performs
-    the substitutions in place on the file
-    <replaceable>file</replaceable>.</para></listitem>
-  </varlistentry>
-
-
+  
   <varlistentry xml:id='fun-stripHash'>
     <term><function>stripHash</function>
     <replaceable>path</replaceable></term>

doc/style.css

@@ -8,14 +8,15 @@
 
 body
 {
-    font-family: "Nimbus Sans L", sans-serif;
+    font-family: sans-serif;
     background: white;
     margin: 2em 1em 2em 1em;
 }
 
-h1, h2, h3, h4
+h1,h2,h3
 {
     color: #005aa0;
+    text-align: left;
 }
 
 h1 /* title */
@@ -45,11 +46,6 @@ h3 /* subsections */
     font-size: 125%;
 }
 
-div.simplesect h2
-{
-    font-size: 110%;
-}
-
 div.appendix h3
 {
     font-size: 150%;
@@ -74,13 +70,11 @@ div.refsection h3
 
 div.example
 {
-    border: 1px solid #b0b0b0;
+    border: 1px solid #6185a0;
     padding: 6px 6px;
     margin-left: 1.5em;
     margin-right: 1.5em;
     background: #f4f4f8;
-    border-radius: 0.4em;
-    box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
 div.example p.title
@@ -88,11 +82,6 @@ div.example p.title
     margin-top: 0em;
 }
 
-div.example pre
-{
-    box-shadow: none;
-}
-
 
 /***************************************************************************
                             Screen dumps:
@@ -100,15 +89,14 @@ div.example pre
 
 pre.screen, pre.programlisting
 {
-    border: 1px solid #b0b0b0;
+    border: 1px solid #6185a0;
     padding: 3px 3px;
     margin-left: 1.5em;
     margin-right: 1.5em;
     color: #600000;
     background: #f4f4f8;
     font-family: monospace;
-    border-radius: 0.4em;
-    box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
+    /* font-size: 90%; */
 }
 
 div.example pre.programlisting
@@ -125,15 +113,13 @@ div.example pre.programlisting
 
 .note, .warning
 {
-    border: 1px solid #b0b0b0;
+    border: 1px solid #6185a0;
     padding: 3px 3px;
     margin-left: 1.5em;
     margin-right: 1.5em;
     margin-bottom: 1em;
     padding: 0.3em 0.3em 0.3em 0.3em;
     background: #fffff5;
-    border-radius: 0.4em;
-    box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
 div.note, div.warning
@@ -145,6 +131,7 @@ div.note h3, div.warning h3
 {
     color: red;
     font-size: 100%;
+//    margin: 0 0 0 0;
     padding-right: 0.5em;
     display: inline;
 }
@@ -175,26 +162,20 @@ div.navfooter *
                         Links colors and highlighting: 
  ***************************************************************************/
 
-a { text-decoration: none; }
-a:hover { text-decoration: underline; }
 a:link { color: #0048b3; }
 a:visited { color: #002a6a; }
+a:hover { background: #ffffcd; }
 
 
 /***************************************************************************
                               Table of contents:
  ***************************************************************************/
 
-div.toc
+.toc
 {
     font-size: 90%;
 }
 
-div.toc dl
-{
-    margin-top: 0em;
-    margin-bottom: 0em;
-}
 
 
 /***************************************************************************
@@ -227,29 +208,76 @@ div.glosslist dt
     font-style: italic;
 }
 
+.default
+{
+    font-style: italic;
+}
+
+.availability
+{
+    font-style: italic;
+}
+
 .varname
 {
     color: #400000;
 }
 
-span.command strong
+
+div.informaltable table
 {
-    font-weight: normal;
+  border: 1px solid #6185a0;
+  width: 100%;
+}
+
+div.informaltable td
+{
+  border: 0;
+  padding: 5px;
+}
+
+div.informaltable td.default
+{
+  text-align: right;
+}
+
+div.informaltable th
+{
+  text-align: left;
+  color: #005aa0;
+  border: 0;
+  padding: 5px;
+  background: #fffff5;
+  font-weight: normal;
+  font-style: italic;
+}
+
+td.varname, td.tagname, td.paramname
+{
+  font-weight: bold;
+  vertical-align: top;
+}
+
+div.epigraph
+{
+    font-style: italic;
+    text-align: right;
+}
+
+table.productionset table.productionset
+{
+    font-family: monospace;
+}
+
+strong.command
+{
+//    font-family: monospace;
+//    font-style: italic;
+//    font-weight: normal;
     color: #400000;
 }
 
-div.calloutlist table
+div.calloutlist td
 {
-    box-shadow: none;
+    padding-bottom: 1em;
 }
-
-table
-{
-    border-collapse: collapse;
-    box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
-}
-
-div.affiliation
-{
-    font-style: italic;
-}

maintainers/docs/bugs.txt

@@ -0,0 +1,49 @@
+*** 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/classification.txt

@@ -0,0 +1,116 @@
+* Classification scheme for packages
+
+- many packages fall under several categories; what matters is the
+  *primary* purpose of a package.  For example, the libxml2 package
+  builds both a library and some tools; but it's a library foremost,
+  so it goes under ./development/libraries. 
+
+- when in doubt, refactor.
+
+IF it's used to support SOFTWARE DEVELOPMENT:
+
+  IF it's a LIBRARY used by other packages:
+    IF it's directly related to GTK:
+      ./development/libraries/gtk+
+    ELSE
+      ./development/libraries
+      (e.g., libxml2)
+  ELSE IF it's a COMPILER:
+    ./development/compilers
+    (e.g., gcc)
+  ELSE IF it's an INTERPRETER:
+    ./development/interpreters
+  ELSE IF it's a development TOOL (or set of):
+    IF it's a PARSER GENERATOR (incl. lexers):
+      ./development/tools/parsing
+      (e.g., bison, flex)
+    ELSE IF it's a BUILD MANAGER:
+      ./development/tools/build-managers
+      (e.g., gnumake
+    ELSE
+      ./development/tools/misc
+      (e.g., binutils)
+  ELSE
+    ./development/misc
+
+ELSE IF it's a TOOL (or set of):
+  # a tool is a relatively *small* program, esp. one intented to be
+  # used non-interactively
+
+  IF it's for NETWORKING:
+    ./tools/networking
+    (e.g., wget)
+  ELSE IF it's for TEXT PROCESSING:
+    ./tools/text
+    (e.g., diffutils)
+  ELSE IF it's a SYSTEM utility, i.e., something related or essential
+    to the operation of a system:
+    ./tools/system
+    (e.g., init)
+  ELSE IF it's an ARCHIVER (which may include a compression function):
+    ./tools/archivers
+    (e.g., zip, tar)
+  ELSE IF it's a COMPRESSION program:
+    ./tools/compression
+    (e.g., gzip, bzip2)
+  ELSE IF it's a SECURITY program:
+    ./tools/security
+    (e.g., nmap, gnupg)
+  ELSE
+    ./tools/misc
+
+ELSE IF it's a SHELL:
+
+  ./shells
+
+ELSE IF it's a SERVER:
+
+  IF it's a HTTP server:
+    ./servers/http
+    (e.g., apache)
+  IF it's a X11 server:
+    ./servers/x11
+    (e.g., xfree86)
+  ELSE
+    ./servers/misc
+
+ELSE IF it's a DESKTOP ENVIRONMENT (incl. WINDOW MANAGERS):
+
+  ./desktops
+  (e.g., kde, gnome, fvwm)
+
+ELSE IF it's an APPLICATION:
+  # a (typically large) program with a distinct user interface,
+  # primarily used interactively
+
+  IF it's a VERSION MANAGEMENT system:
+    ./applications/version-management
+  ELSE IF it's for VIDEO playback/etc:
+    ./applications/video
+  ELSE IF it's for GRAPHICS viewing/editing/etc:
+    ./applications/graphics
+  ELSE IF it's for NETWORKING:
+    IF it's a MAILREADER:
+      ./applications/networking/mailreaders
+    IF it's a NEWSREADER:
+      ./applications/networking/newsreaders
+    ELSE
+      ./applications/networking/misc
+  ELSE
+    ./applications/misc
+
+ELSE IF it's DATA (i.e., does not have a straight-forward executable semantics):
+
+  IF it's related to SGML/XML processing:
+    IF it's a XML DTD:
+      ./data/sgml+xml/schemas/xml-dtd
+    ELSE IF it's an XSLT stylesheet (okay, these are executable...):
+      ./data/sgml+xml/stylesheets/xslt
+
+ELSE IF it's a GAME:
+
+  ./games
+
+ELSE:
+
+  ./misc

maintainers/docs/coding-conventions.txt

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

maintainers/docs/create-new-static-env

@@ -0,0 +1,31 @@
+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/cross.txt

@@ -233,9 +233,9 @@ preConfigure() {
     fi
 
     # Cross compiler evilness
-    mkdir -p $out
-    mkdir -p $out/arm-linux
-    mkdir -p $out/arm-linux/bin
+    ensureDir $out
+    ensureDir $out/arm-linux
+    ensureDir $out/arm-linux/bin
     ln -s $binutilsArm/arm-linux/bin/as $out/arm-linux/bin/as
     ln -s $binutilsArm/arm-linux/bin/ld $out/arm-linux/bin/ld
     ln -s $binutilsArm/arm-linux/bin/ar $out/arm-linux/bin/ar

maintainers/docs/static-initial-env

@@ -0,0 +1,35 @@
+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

@@ -0,0 +1,12 @@
+* 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/docs/update-upstream-data.txt

@@ -1,14 +0,0 @@
-Semi-automatic source information updating using "update-upstream-data.sh" script and "src-{,info-}for-*.nix"
-
-1. Recognizing when a pre-existing package uses this mechanism.
-
-Packages using this automatical update mechanism have src-info-for-default.nix and src-for-default.nix next to default.nix. src-info-for-default.nix describes getting the freshest source from upstream web site; src-for-default.nix is a generated file with the current data about used source. Both files define a simple attrSet. 
-
-src-info-for-default.nix (for a file grabbed via http) contains at least downloadPage attribute - it is the page we need to look at to find out the latest version. It also contains baseName that is used for automatical generation of package name containing version. It can contain extra data for trickier cases.
-
-src-for-default.nix will contain advertisedUrl (raw URL chosen on the site; its change prompts regeneration of source data), url for fetchurl, hash, version retrieved from the download URL and suggested package name.
-
-2. Updating a package
-
-nixpkgs/pkgs/build-support/upstream-updater directory contains some scripts. The worker script is called update-upstream-data.sh. This script requires main expression name (e.g. default.nix). It can optionally accpet a second parameter, URL which will be used instead of getting one by parsing the downloadPage (version extraction, mirror URL creation etc. will still be run). After running the script, check src-for-default.nix (or replace default.nix with expression name, if there are seceral expressions in the directory) for new version information.
-

maintainers/scripts/copy-tarball.sh

@@ -1,45 +0,0 @@
-#! /bin/sh -e
-
-distDir=/data/webserver/tarballs
-
-url="$1"
-file="$2"
-if [ -z "$url" ]; then echo "syntax: $0 URL"; exit 0; fi
-
-base="$(basename "$url")"
-if [ -z "$base" ]; then echo "bad URL"; exit 1; fi
-dstPath="$distDir/$base"
-
-if [ -e "$dstPath" ]; then if [ -n "$VERBOSE" ]; then echo "$dstPath already exists"; fi; exit 0; fi
-
-if [ -z "$file" ]; then
-
-    echo "downloading $url to $dstPath"
-
-    if [ -n "$DRY_RUN" ]; then exit 0; fi
-
-    declare -a res
-    if ! res=($(PRINT_PATH=1 nix-prefetch-url "$url")); then
-        exit
-    fi
-
-    storePath=${res[1]}
-
-else
-    storePath="$file"
-fi
-
-cp $storePath "$dstPath.tmp.$$"
-mv -f "$dstPath.tmp.$$" "$dstPath"
-
-echo "hashing $dstPath"
-
-md5=$(nix-hash --flat --type md5 "$dstPath")
-ln -sfn "../$base" $distDir/md5/$md5
-
-sha1=$(nix-hash --flat --type sha1 "$dstPath")
-ln -sfn "../$base" $distDir/sha1/$sha1
-
-sha256=$(nix-hash --flat --type sha256 "$dstPath")
-ln -sfn "../$base" $distDir/sha256/$sha256
-ln -sfn "../$base" $distDir/sha256/$(nix-hash --type sha256 --to-base32 "$sha256")

maintainers/scripts/copy-tarballs.sh

@@ -1,27 +0,0 @@
-#! /bin/sh -e
-
-urls=$(nix-instantiate --eval-only --xml --strict '<nixpkgs/maintainers/scripts/eval-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
-
-    # Check the URL scheme.
-    if ! echo "$url" | grep -q -E "^[a-z]+://"; then echo "skipping $url (no URL scheme)"; continue; fi
-
-    # Check the basename.  It should include something resembling a version.
-    base="$(basename "$url")"
-    #if ! echo "$base" | grep -q -E "[-_].*[0-9].*"; then echo "skipping $url (no version)"; continue; fi
-    if ! echo "$base" | grep -q -E "[a-zA-Z]"; then echo "skipping $url (no letter in name)"; continue; fi
-    if ! echo "$base" | grep -q -E "[0-9]"; then echo "skipping $url (no digit in name)"; continue; fi
-    if ! echo "$base" | grep -q -E "[-_\.]"; then echo "skipping $url (no dot/underscore in name)"; continue; fi
-    if echo "$base" | grep -q -E "[&?=%]"; then echo "skipping $url (bad character in name)"; continue; fi
-    if [ "${base:0:1}" = "." ]; then echo "skipping $url (starts with a dot)"; continue; fi
-
-    $(dirname $0)/copy-tarball.sh "$url"
-done
-
-echo DONE

maintainers/scripts/debian-patches.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# Download patches from debian project
-# Usage $0 debian-patches.txt debian-patches.nix
-# An example input and output files can be found in applications/graphics/xara/
-
-DEB_URL=http://patch-tracker.debian.org/patch/series/dl
-declare -a deb_patches
-mapfile -t deb_patches < $1
-
-prefix="${DEB_URL}/${deb_patches[0]}"
-
-if [[ -n "$2" ]]; then
-    exec 1> $2
-fi
-
-cat <<EOF
-# Generated by $(basename $0) from $(basename $1)
-let
-  prefix = "${prefix}";
-in
-[
-EOF
-for ((i=1;i < ${#deb_patches[@]}; ++i)); do
-    url="${prefix}/${deb_patches[$i]}"
-    sha256=$(nix-prefetch-url $url)
-    echo "  {"
-    echo "    url = \"\${prefix}/${deb_patches[$i]}\";"
-    echo "    sha256 = \"$sha256\";"
-    echo "  }"
-done
-echo "]"

maintainers/scripts/dep-licenses.sh

@@ -1,57 +0,0 @@
-#!/bin/sh
-
-attr=$1
-
-: ${NIXPKGS=/etc/nixos/nixpkgs}
-
-tmp=$(mktemp --tmpdir -d nixpkgs-dep-license.XXXXXX)
-
-exitHandler() {
-    exitCode=$?
-    rm -rf "$tmp"
-    exit $exitCode
-}
-
-trap "exitHandler" EXIT
-
-# fetch the trace and the drvPath of the attribute.
-nix-instantiate $NIXPKGS -A $attr --show-trace > "$tmp/drvPath" 2> "$tmp/trace" || {
-  cat 1>&2 - "$tmp/trace" <<EOF
-An error occured while evaluating $attr.
-EOF
-  exit 1
-}
-
-# generate a sed script based on the trace output.
-sed '
-  \,@:.*:@, {
-    # \1  *.drv file
-    # \2  License terms
-    s,.*@:drv:\(.*\):\(.*\):@.*,s!\1!\1: \2!; t;,
-    s!Str(\\\"\([^,]*\)\\\",\[\])!\1!g
-    b
-  }
-  d
-' "$tmp/trace" > "$tmp/filter.sed"
-
-if test $(wc -l "$tmp/filter.sed" | sed 's/ .*//') == 0; then
-  echo 1>&2 "
-No derivation mentionned in the stack trace.  Either your derivation does
-not use stdenv.mkDerivation or you forgot to use the stdenv adapter named
-traceDrvLicenses.
-
--  defaultStdenv = allStdenvs.stdenv;
-+  defaultStdenv = traceDrvLicenses allStdenvs.stdenv;
-"
-  exit 1
-fi
-
-
-# remove all dependencies which are using stdenv.mkDerivation
-echo '
-d
-' >> "$tmp/filter.sed"
-
-nix-store -q --tree $(cat "$tmp/drvPath") | sed -f "$tmp/filter.sed"
-
-exit 0;

maintainers/scripts/evacuate-urls.sh

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

maintainers/scripts/eval-release.nix

@@ -1,32 +0,0 @@
-# Evaluate `release.nix' like Hydra would (i.e. call each job
-# attribute with the expected `system' argument).  Too bad
-# nix-instantiate can't to do this.
-
-with import ../../pkgs/lib;
-
-let
-  trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y);
-
-  rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ];
-
-  seqList = xs: res: fold (x: xs: seq x xs) res xs;
-  
-  strictAttrs = as: seqList (attrValues as) as;
-
-  maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" {};
-
-  call = attrs: flip mapAttrs attrs
-    (n: v: trace n (
-      if builtins.isFunction v then maybe (v { system = "x86_64-linux"; })
-      else if builtins.isAttrs v then call v
-      else null
-    ));
-
-  # Add the ‘recurseForDerivations’ attribute to ensure that
-  # nix-instantiate recurses into nested attribute sets.
-  recurse = attrs:
-    if isDerivation attrs
-    then attrs
-    else { recurseForDerivations = true; } // mapAttrs (n: v: recurse v) attrs;
-
-in recurse (call rel)

maintainers/scripts/generate-cpan-package

@@ -1,122 +0,0 @@
-#! /bin/sh -e
-
-export PERL5LIB=/nix/var/nix/profiles/per-user/eelco/cpan-generator/lib/perl5/site_perl
-
-name="$1"
-[ -n "$name" ] || { echo "no name"; exit 1; }
-
-cpan -D "$name" > cpan-info
-
-url="$(echo $(cat cpan-info | sed '6!d'))"
-[ -n "$url" ] || { echo "no URL"; exit 1; }
-url="mirror://cpan/authors/id/$url"
-echo "URL = $url" >&2
-
-version=$(cat cpan-info | grep 'CPAN: ' | awk '{ print $2 }')
-echo "VERSION = $version"
-
-declare -a xs=($(PRINT_PATH=1 nix-prefetch-url "$url"))
-hash=${xs[0]}
-path=${xs[1]}
-echo "HASH = $hash" >&2
-
-namedash="$(echo $name | sed s/::/-/g)-$version"
-
-attr=$(echo $name | sed s/:://g)
-
-rm -rf cpan_tmp
-mkdir cpan_tmp
-tar xf "$path" -C cpan_tmp
-
-shopt -s nullglob
-meta=$(echo cpan_tmp/*/META.json)
-if [ -z "$meta" ]; then
-    yaml=$(echo cpan_tmp/*/META.yml)
-    [ -n "$yaml" ] || { echo "no meta file"; exit 1; }
-    meta=$(echo $yaml | sed s/\.yml$/.json/)
-    perl -e '
-      use YAML;
-      use JSON;
-      local $/;
-      $x = YAML::Load(<>);
-      print encode_json $x;
-    ' < $yaml > $meta
-fi
-
-description="$(json abstract < $meta | perl -e '$x = <>; print uc(substr($x, 0, 1)), substr($x, 1);')"
-homepage="$(json resources.homepage < $meta)"
-if [ -z "$homepage" ]; then
-    #homepage="$(json meta-spec.url < $meta)"
-    true
-fi
-
-license="$(json license < $meta | json -a 2> /dev/null || true)"
-if [ -z "$license" ]; then
-    license="$(json -a license < $meta)"
-fi
-license="$(echo $license | sed s/perl_5/perl5/)"
-
-f() {
-    local type="$1"
-    perl -e '
-      use JSON;
-      local $/;
-      $x = decode_json <>;
-      if (defined $x->{prereqs}) {
-        $x2 = $x->{prereqs}->{'$type'}->{requires};
-      } elsif ("'$type'" eq "runtime") {
-        $x2 = $x->{requires};
-      } elsif ("'$type'" eq "configure") {
-        $x2 = $x->{configure_requires};
-      } elsif ("'$type'" eq "build") {
-        $x2 = $x->{build_requires};
-      }
-      foreach my $y (keys %{$x2}) {
-        next if $y eq "perl";
-        eval "use $y;";
-        if (!$@) {
-          print STDERR "skipping Perl-builtin module $y\n";
-          next;
-        }
-        print $y, "\n";
-      };
-    ' < $meta | sed s/:://g
-}
-
-confdeps=$(f configure)
-builddeps=$(f build)
-testdeps=$(f test)
-runtimedeps=$(f runtime)
-
-buildInputs=$(echo $(for i in $confdeps $builddeps $testdeps; do echo $i; done | sort | uniq))
-propagatedBuildInputs=$(echo $(for i in $runtimedeps; do echo $i; done | sort | uniq))
-
-echo "===" >&2
-
-cat <<EOF
-  $attr = buildPerlPackage {
-    name = "$namedash";
-    src = fetchurl {
-      url = $url;
-      sha256 = "$hash";
-    };
-EOF
-if [ -n "$buildInputs" ]; then
-    cat <<EOF
-    buildInputs = [ $buildInputs ];
-EOF
-fi
-if [ -n "$propagatedBuildInputs" ]; then
-    cat <<EOF
-    propagatedBuildInputs = [ $propagatedBuildInputs ];
-EOF
-fi
-cat <<EOF
-    meta = {
-      homepage = $homepage;
-      description = "$description";
-      license = "$license";
-    };
-  };
-EOF
-

maintainers/scripts/gnome-latest.sh

@@ -1,95 +0,0 @@
-#!/bin/sh
-
-GNOME_FTP="ftp.gnome.org/pub/GNOME/sources"
-
-project=$1
-
-if [ "$project" == "--help" ]; then
-  echo "Usage: $0 project [major.minor]"
-  exit 0
-fi
-
-baseVersion=$2
-
-if [ -z "$project" ]; then
-  echo "No project specified, exiting"
-  exit 1
-fi
-
-# curl -l ftp://... doesn't work from my office in HSE, and I don't want to have
-# any conversations with sysadmin. Somehow lftp works.
-if [ "$FTP_CLIENT" = "lftp" ]; then
-  ls_ftp() {
-    lftp -c "open $1; cls"
-  }
-else
-  ls_ftp() {
-    curl -l "$1"/
-  }
-fi
-
-if [ -z "$baseVersion" ]; then
-  echo "Looking for available versions..." >&2
-  available_baseversions=( `ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n` )
-  echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2
-  echo -en "Choose one of them: " >&2
-  read baseVersion
-fi
-
-FTPDIR="${GNOME_FTP}/${project}/${baseVersion}"
-
-#version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//`
-# gnome's LATEST-IS is broken. Do not trust it.
-
-files=$(ls_ftp "${FTPDIR}")
-declare -A versions
-
-for f in $files; do
-  case $f in
-    (LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*):
-      ;;
-    ($project-*.*.9*.tar.*):
-      tmp=${f#$project-}
-      tmp=${tmp%.tar*}
-      echo "Ignored unstable version ${tmp}" >&2
-      ;;
-    ($project-*.tar.*):
-      tmp=${f#$project-}
-      tmp=${tmp%.tar*}
-      versions[${tmp}]=1
-      ;;
-    (*):
-      echo "UNKNOWN FILE $f"
-      ;;
-  esac
-done
-echo "Found versions ${!versions[@]}" >&2
-version=`echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1`
-echo "Latest version is: ${version}" >&2
-
-name=${project}-${version}
-echo "Fetching .sha256 file" >&2
-curl -O http://${FTPDIR}/${name}.sha256sum
-
-extensions=( "xz" "bz2" "gz" )
-echo "Choosing archive extension (known are ${extensions[@]})..." >&2
-for ext in ${extensions[@]}; do
-  if grep "\\.tar\\.${ext}$" ${name}.sha256sum >& /dev/null; then
-    ext_pref=$ext
-    sha256=$(grep "\\.tar\\.${ext}$" ${name}.sha256sum | cut -f1 -d\ )
-    break
-  fi
-done
-sha256=`nix-hash --to-base32 --type sha256 $sha256`
-echo "Chosen ${ext_pref}, hash is ${sha256}" >&2
-
-cat <<EOF
-  name = "${project}-${version}";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/${project}/${baseVersion}/${project}-${version}.tar.${ext_pref};
-    sha256 = "${sha256}";
-  };
-EOF
-
-rm -v ${name}.sha256sum >&2

maintainers/scripts/hydra_eval_check

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-# give absolute path of release.nix as argument
-hydra_eval_jobs \
-  --argstr system x86_64-linux \
-  --argstr system i686-linux \
-  --argstr system x86_64-darwin \
-  --argstr system i686-cygwin \
-  --argstr system i686-freebsd \
-  --arg officialRelease false \
-  --arg nixpkgs "{ outPath = builtins.storePath ./. ; rev = 1234; }" \
-  $@

maintainers/scripts/nix-call-package

@@ -1,5 +0,0 @@
-#! /bin/sh
-
-echo "let pkgs = import /etc/nixos/nixpkgs$2 {}; x = pkgs.callPackage $1 { $3 }; in ${4:-x}" |
-nix-instantiate --show-trace - |
-xargs nix-store -r -K

maintainers/scripts/patchelf-hints.sh

@@ -1,84 +0,0 @@
-
-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

@@ -1,260 +0,0 @@
-#!/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

maintainers/scripts/test-eval-release.sh

@@ -1,7 +0,0 @@
-#! /bin/sh
-
-if [[ -z "$VERBOSE" ]]; then
-  echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent"
-fi
-unset HOME NIXPKGS_CONFIG # Force empty config
-nix-instantiate --strict --eval-only --xml --show-trace "$(dirname "$0")"/eval-release.nix 2>&1 > /dev/null

pkgs/applications/audio/GStreamer/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, perl
+, bison, flex, glib
+, pkgconfig, libxml2}:
+
+stdenv.mkDerivation {
+  name = "GStreamer-0.10.10";
+  src = fetchurl {
+    url = http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.10.tar.bz2;
+    md5 = "6875bf0bd3cf38b9ae1362b9e644e6fc";
+  };
+
+  buildInputs = [perl bison flex glib pkgconfig libxml2];
+}

pkgs/applications/audio/a2jmidid/default.nix

@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, alsaLib, dbus, jackaudio, pkgconfig, python }:
-
-stdenv.mkDerivation rec {
-  name = "a2jmidid-${version}";
-  version = "7";
-
-  src = fetchurl {
-    url = "http://download.gna.org/a2jmidid/${name}.tar.bz2";
-    sha256 = "1pl91y7npirhmikzlizpbyx2vkfvdkvc6qvc2lv4capj3cp6ypx7";
-  };
-
-  buildInputs = [ alsaLib dbus jackaudio pkgconfig python ];
-
-  configurePhase = "python waf configure --prefix=$out";
-
-  buildPhase = "python waf";
-
-  installPhase = "python waf install";
-
-  meta = with stdenv.lib; {
-    homepage = http://home.gna.org/a2jmidid;
-    description = "daemon for exposing legacy ALSA sequencer applications in JACK MIDI system";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.goibhniu ];
-
-  };
-}

pkgs/applications/audio/abcde/abcde.patch

@@ -1,30 +0,0 @@
-Two changes:
-
-* Add an alias for `which', so abcde can find things in store
-* Choose the right CDROM reader syntax for `cd-paranoia'
-
---- abcde-2.5.4/abcde~	2012-09-18 06:09:31.000000000 -0700
-+++ abcde-2.5.4/abcde	2012-10-27 00:08:48.000862364 -0700
-@@ -17,6 +17,11 @@
- 
- VERSION='2.5.4'
- 
-+which ()
-+{
-+  type -P $1
-+}
-+
- usage ()
- {
- echo "This is abcde v$VERSION."
-@@ -3497,6 +3502,10 @@
- 	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/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

@@ -1,20 +1,19 @@
-{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, lame, flac, eject, mkcue
-, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
+{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools
 , makeWrapper }:
 
-let version = "2.5.4";
+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 = "14g5lsgh53hza9848351kwpygc0yqpvvzp3s923aja77f2wpkdl5";
+      sha256 = "1wl4ygj1cf1d6g05gwwygsd5g83l039fzi011r30ma5lnm763lyb";
     };
 
     # FIXME: This package does not support MP3 encoding (only Ogg),
     # nor `distmp3', `eject', etc.
 
-    patches = [ ./abcde.patch ];
+    patches = [ ./install.patch ./which.patch ./cd-paranoia.patch ];
 
     configurePhase = ''
       sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ;
@@ -30,37 +29,25 @@ in
 
       substituteInPlace "abcde"					\
 	--replace "/etc/abcde.conf" "$out/etc/abcde.conf"
-
     '';
 
-    # no ELFs in this package, only scripts
-    dontStrip = true;
-    dontPatchELF = true;
-
     buildInputs = [ makeWrapper ];
 
     postInstall = ''
-    #   substituteInPlace "$out/bin/cddb-tool" \
-    #      --replace '#!/bin/sh' '#!${bash}/bin/sh'
-    #   substituteInPlace "$out/bin/abcde" \
-    #      --replace '#!/bin/bash' '#!${bash}/bin/bash'
-
-      # generic fixup script should be doing this, but it ignores this file for some reason
-      substituteInPlace "$out/bin/abcde-musicbrainz-tool" \
-         --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
+      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:${id3v2}/bin:${lame}/bin"
+        "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin"
 
       wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
         "${wget}/bin"
-
-      wrapProgram "$out/bin/abcde-musicbrainz-tool" --prefix PATH ":" \
-        "${wget}/bin"
     '';
 
     meta = {
-      homepage = "http://lly.org/~rcw/abcde/page/";
+      homepage = http://www.hispalinux.es/~data/abcde.php;
       licence = "GPLv2+";
       description = "A Better CD Encoder (ABCDE)";
 
@@ -71,4 +58,4 @@ in
         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/amarok/default.nix

@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl
-, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs
-, qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon
-, strigi, soprano, qjson, ffmpeg, libofa }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  pname = "amarok";
-  version = "2.6.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "1h6jzl0jnn8g05pz4mw01kz20wjjxwwz6iki7lvgj70qi3jq04m9";
-  };
-
-  QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
-  patches = ./find-mysql.patch;
-  buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl
-    libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
-    soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa ];
-
-  postInstall = ''
-    mkdir -p $out/nix-support
-    echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages
-  '';
-
-  meta = {
-    description = "Popular music player for KDE";
-    license = "GPL";
-    homepage = http://amarok.kde.org;
-    inherit (kdelibs.meta) platforms maintainers;
-  };
-}

pkgs/applications/audio/amarok/find-mysql.patch

@@ -1,46 +0,0 @@
-commit 9979970f05f25329100168d85a5c4cdc8c084b7a
-Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
-Date:   Thu Aug 30 12:32:53 2012 +0400
-
-    FindMySQLAmarok.cmake: use PATH_SUFFIXES
-
-diff --git a/cmake/modules/FindMySQLAmarok.cmake b/cmake/modules/FindMySQLAmarok.cmake
-index 910b434..4c8b8e8 100644
---- a/cmake/modules/FindMySQLAmarok.cmake
-+++ b/cmake/modules/FindMySQLAmarok.cmake
-@@ -13,18 +13,17 @@
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
- if(NOT WIN32)
--    find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 PATHS ${BIN_INSTALL_DIR} ~/usr/bin /usr/local/bin)
-+    find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 HINTS ${BIN_INSTALL_DIR})
- endif(NOT WIN32)
- 
- find_path(MYSQL_INCLUDE_DIR mysql.h
--    /opt/local/include/mysql5/mysql
-+    PATHS
-+    /opt/local/include
-     /opt/mysql/mysql/include
--    /opt/mysqle/include/mysql
--    /opt/ports/include/mysql5/mysql
--    /usr/include/mysql
--    /usr/local/include/mysql
--    /usr/mysql/include/mysql
--    ~/usr/include/mysql
-+    /opt/mysqle/include
-+    /opt/ports/include
-+    /usr/mysql/include
-+    PATH_SUFFIXES mysql mysql5/mysql
- )
- 
- if(MYSQLCONFIG_EXECUTABLE)
-@@ -40,8 +39,7 @@ if(MYSQLCONFIG_EXECUTABLE)
- 
-     find_library(MYSQLD_PIC_SEPARATE
-         mysqld_pic
--        PATHS
--        /usr/lib/mysql
-+        PATH_SUFFIXES mysql
-     )
- 
-     if(MYSQLD_PIC_SEPARATE)

pkgs/applications/audio/ardour/ardour3.nix

@@ -1,59 +0,0 @@
-{ stdenv, fetchsvn, alsaLib, aubio, boost, cairomm, curl, fftw
-, fftwSinglePrec, flac, glib, glibmm, gtk, gtkmm, jackaudio
-, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
-, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
-, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
-, perl, pkgconfig, python, serd, sord, sratom, suil }:
-
-let
-  # Ardour 3 Beta 5
-  rev = "13072";
-in
-
-stdenv.mkDerivation {
-  name = "ardour3-svn-${rev}";
-
-  src = fetchsvn {
-    url = http://subversion.ardour.org/svn/ardour2/branches/3.0;
-    inherit rev;
-    sha256 = "17k990kdb5q17z6jcz5b60imvvfbjw9zfxzy9fk0vg8gd6yq7736";
-  };
-
-  buildInputs = 
-    [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec
-      flac glib glibmm gtk gtkmm jackaudio libgnomecanvas
-      libgnomecanvasmm liblo libmad libogg librdf librdf_raptor
-      librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid
-      libxml2 libxslt lilv lv2 pango perl pkgconfig python serd sord
-      sratom suil
-    ];
-
-  patchPhase = ''
-    printf '#include "ardour/svn_revision.h"\nnamespace ARDOUR { const char* svn_revision = \"${rev}\"; }\n' > libs/ardour/svn_revision.cc
-    sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
-    sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
-  '';
-
-  configurePhase = "python waf configure --prefix=$out";
-
-  buildPhase = "python waf";
-
-  installPhase = "python waf install";
-
-  postInstall = ''
-    mkdir -pv $out/gtk-2.0/2.10.0/engines
-    mv lib/ardour3/libclearlooks.so $out/gtk-2.0/2.10.0/engines/
-    wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk-2.0
-    '';
-
-  meta = with stdenv.lib; {
-    description = "Multi-track hard disk recording software";
-    longDescription = ''
-      Also read "The importance of Paying Something" on their homepage, please!
-    '';
-    homepage = http://ardour.org/;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}

pkgs/applications/audio/ardour/default.nix

@@ -1,57 +0,0 @@
-{ stdenv, fetchsvn, scons, boost, pkgconfig, fftw, librdf_raptor
-, librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
-, libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
-, gtk, glibmm, gtkmm, libgnomecanvas,  liblo, aubio
-, fftwSinglePrec, libmad, automake, autoconf, libtool, liblrdf }:
-
-stdenv.mkDerivation rec {
-  name = "ardour-${version}";
-  version = "2.8.12";
-
-  # 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 ?
-
-  # TODO: see if this is also true when using a tag (~goibhniu)
-
-  # This version does not run it exits with the following error:
-  # raptor_new_uri_for_rdf_concept called with Raptor V1 world object
-  # raptor_general.c:240:raptor_init: fatal error: raptor_init() failedAborted
-  src = fetchsvn {
-    url = "http://subversion.ardour.org/svn/ardour2/tags/${version}";
-    sha256 = "0d4y8bv12kb0yd2srvxn5388sa4cl5d5rk381saj9f3jgpiciyky";
-  };
-
-  patchPhase = ''
-    sed -e "s#/usr/bin/which#type -P#" -i libs/glibmm2/autogen.sh
-    echo '#include "ardour/svn_revision.h"' > libs/ardour/svn_revision.cc
-    echo -e 'namespace ARDOUR {\n extern const char* svn_revision = "2.8.12";\n }\n' >> libs/ardour/svn_revision.cc
-  '';
-
-  buildInputs = [
-    scons boost pkgconfig fftw librdf_raptor librdf_rasqal jackaudio
-    flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
-    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas liblrdf
-    liblo aubio fftwSinglePrec libmad autoconf automake libtool
-  ];
-
-  buildPhase = ''
-    mkdir -p $out
-    export CXX=g++
-    scons PREFIX=$out install
-  '';
-  
-  installPhase = ":";
-
-  meta = { 
-    description = "Multi-track hard disk recording software";
-    longDescription = ''
-      Broken: use ardour3-svn instead
-      Also read "The importance of Paying Something" on their homepage, please!
-    '';
-    homepage = http://ardour.org/;
-    license = "GPLv2";
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

pkgs/applications/audio/audacious/default.nix

@@ -1,59 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk, libmowgli, libmcs
-, gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg
-, libvorbis, libcdio, libcddb, flac, ffmpeg
-}:
-
-let
-  version = "3.2.2";
-in
-stdenv.mkDerivation {
-  name = "audacious-${version}";
-
-  src = fetchurl {
-    url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
-    sha256 = "1vj2f3jq67r9wc3s8p51w8338cjhidj3lpxmzyh31lrfikj21766";
-  };
-
-  pluginsSrc = fetchurl {
-    url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
-    sha256 = "1z5p4ny0kzszaki4f1fgrvcr0q1j6i19847jhplc07nl1rvycdy6";
-  };
-
-  # `--enable-amidiplug' is to prevent configure from looking in /proc/asound.
-  configureFlags = "--enable-amidiplug --disable-oss";
-
-  buildInputs =
-    [ gettext pkgconfig glib gtk libmowgli libmcs libxml2 dbus_glib
-      libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio
-      libcddb ffmpeg
-    ];
-
-  # Here we build bouth audacious and audacious-plugins in one
-  # derivations, since they really expect to be in the same prefix.
-  # This is slighly tricky.
-  builder = builtins.toFile "builder.sh"
-    ''
-      # First build audacious.
-      (
-        source $stdenv/setup
-        genericBuild
-      )
-
-      # Then build the plugins.
-      (
-        buildNativeInputs="$out $buildNativeInputs" # to find audacious
-        source $stdenv/setup
-        rm -rfv audacious-*
-        src=$pluginsSrc
-        genericBuild
-      )
-    '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork";
-    homepage = http://audacious-media-player.org/;
-    maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ];
-  };
-}

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
+}:
+
+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
+  ];
+
+  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,25 +1,19 @@
-{ stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
-  libogg, libvorbis, libmad, alsaLib, libsndfile, libsamplerate, flac, lame,
-  expat, id3lib, ffmpeg, portaudio
-  }:
+{ stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib }:
 
-stdenv.mkDerivation rec {
-  version = "2.0.2";
-  name = "audacity-${version}";
+stdenv.mkDerivation {
+  name = "audacity-1.3.7";
+
+  NIX_CFLAGS_COMPILE = "-fPIC -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0 -lz";
 
   src = fetchurl {
-    url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.bz2";
-    sha256 = "17c7p5jww5zcg2k2fs1751mv5kbadcmgicszi1zxwj2p5b35x2mc";
+    url = mirror://sourceforge/audacity/audacity-fullsrc-1.3.7.tar.bz2;
+    sha256 = "1kashc6cc6d5g6i59nqcrl795x1jqdh0lpg3msa1wckfj3hpljmy";
   };
-  buildInputs = [ pkgconfig wxGTK libsndfile expat alsaLib libsamplerate
-                  libvorbis libmad flac id3lib ffmpeg gettext ];
-
-  dontDisableStatic = true;
+  buildInputs = [ wxGTK pkgconfig gettext gtk glib zlib ];
 
   meta = {
     description = "Sound editor with graphical UI";
     homepage = http://audacity.sourceforge.net;
     license = "GPLv2+";
-    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/applications/audio/aumix/default.nix

@@ -5,26 +5,22 @@
 
 assert gtkGUI -> pkgconfig != null && gtk != null;
 
-stdenv.mkDerivation rec {
-  name = "aumix-2.9.1";
+stdenv.mkDerivation {
+  name = "aumix-2.8";
   src = fetchurl {
-    url = "http://www.jpj.net/~trevor/aumix/releases/${name}.tar.bz2";
-    sha256 = "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj";
+    url = http://www.jpj.net/~trevor/aumix/aumix-2.8.tar.bz2;
+    sha256 = "636eef7f400c2f3df489c0d2fa21507e88692113561e75a40a26c52bc422d7fc";
   };
 
   buildInputs = [ gettext ncurses ]
     ++ (if gtkGUI then [pkgconfig gtk] else []);
 
   meta = {
-    description = "Aumix, an audio mixer for X and the console";
     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 = "GPLv2+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.linux;
+    license = "GPL";
   };
 }

pkgs/applications/audio/beast/default.nix

@@ -1,37 +1,36 @@
-{ stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool
-, gtk, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }:
-
-stdenv.mkDerivation {
+args: with args;
+args.stdenv.mkDerivation {
   name = "beast-0.7.1";
 
-  src = fetchurl {
+  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
+  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=/${stdenv.shell}=g' -i `find -type f`
-    sed 's=/usr/bin/perl=/${perl}/bin/perl=g' -i `find -type f`
+    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
-    ];
+  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"];
+      description = "BEAST - the Bedevilled Sound Engine";
+      homepage = http://beast.gtk.org;
+      license = ["GPL-2" "LGPL-2.1"];
   };
 }

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

@@ -0,0 +1,6 @@
+source $stdenv/setup
+
+ensureDir "$out/lib/bmp/Input"
+installFlags="install libdir=$out/lib/bmp/Input"
+
+genericBuild

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

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, pkgconfig, bmp, libmpcdec, taglib}:
+
+stdenv.mkDerivation {
+  name = "bmp-plugin-musepack-1.2";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://files2.musepack.net/linux/plugins/bmp-musepack-1.2.tar.bz2;
+    md5 = "5fe0c9d341ca37d05c780a478f829a5f";
+  };
+  buildInputs = [pkgconfig bmp libmpcdec taglib];
+}

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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, pkgconfig, bmp}:
+
+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];
+}

pkgs/applications/audio/bmp/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, alsaLib, esound, libogg, libvorbis, id3lib
+, glib, gtk, libglade
+}:
+
+stdenv.mkDerivation {
+  name = "bmp-0.9.7.1";
+  src = fetchurl {
+    url = mirror://sourceforge/beepmp/bmp-0.9.7.1.tar.gz;
+    md5 = "c25d5a8d49cc5851d13d525a20023c4c";
+  };
+
+  buildInputs = [
+    pkgconfig alsaLib esound libogg libvorbis id3lib libglade
+  ];
+
+  meta = {
+    description = "Beep Media Player, an XMMS fork";
+  };
+
+  propagatedBuildInputs = [glib gtk];
+}

pkgs/applications/audio/bristol/default.nix

@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, alsaLib, jackaudio, pkgconfig, pulseaudio, xlibs }:
-
-stdenv.mkDerivation  rec {
-  name = "bristol-${version}";
-  version = "0.60.10";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/bristol/${name}.tar.gz";
-    sha256 = "070rn5zdx6vrqmq7w1rrpxig3bxlylbsw82nlmkjnhjrgm6yx753";
-  };
-
-  buildInputs = [
-    alsaLib jackaudio pkgconfig pulseaudio xlibs.libX11 xlibs.libXext
-    xlibs.xproto
-  ];
-
-  preInstall = ''
-    sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol
-    sed -e "s@\`which brighton\`@$out/bin/brighton@g" -i bin/startBristol
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A range of synthesiser, electric piano and organ emulations";
-    homepage = http://bristol.sourceforge.net;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}

pkgs/applications/audio/calf/default.nix

@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib
-, gtk, jackaudio, ladspaH , libglade, lv2, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "calf-${version}";
-  version = "0.0.19-rc7";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/calf/${name}.tar.gz";
-    sha256 = "0515pzc7ishrq0j5hza83s0yp3x34r977h776lpky389whcyf45j";
-  };
-
-  buildInputs = [ 
-    cairo expat fftwSinglePrec fluidsynth glib gtk jackaudio ladspaH
-    libglade lv2 pkgconfig
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = http://calf.sourceforge.net;
-    description = "A set of high quality open source audio plugins for musicians";
-    license = licenses.lgpl2;
-    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
-  };
-}

pkgs/applications/audio/cdparanoia/default.nix

@@ -1,15 +1,15 @@
-{ stdenv, fetchurl }:
+{stdenv, fetchurl}:
 
-stdenv.mkDerivation rec {
-  name = "cdparanoia-III-10.2";
-  
+stdenv.mkDerivation {
+  name = "cdparanoia-III-alpha9.8";
   src = fetchurl {
-    url = "http://downloads.xiph.org/releases/cdparanoia/${name}.src.tgz";
-    sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80";
+    url = http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz;
+    md5 = "7218e778b5970a86c958e597f952f193";
   };
   
+  patches = [./fix.patch];
+
   meta = {
     homepage = http://xiph.org/paranoia;
-    description = "A tool and library for reading digital audio from CDs";
   };
 }

pkgs/applications/audio/cdparanoia/fix.patch

@@ -0,0 +1,46 @@
+*** cdparanoia-III-alpha9.8/interface/utils.h	Thu Apr 20 00:41:04 2000
+--- cdparanoia-III-alpha9.8-old/interface/utils.h	Wed Jan 19 21:44:08 2005
+***************
+*** 110,117 ****
+      case CDDA_MESSAGE_LOGIT:
+        d->errorbuf=catstring(d->errorbuf,s);
+        break;
+-     case CDDA_MESSAGE_FORGETIT:
+-     default:
+      }
+    }
+  }
+--- 110,115 ----
+***************
+*** 125,132 ****
+      case CDDA_MESSAGE_LOGIT:
+        d->messagebuf=catstring(d->messagebuf,s);
+        break;
+-     case CDDA_MESSAGE_FORGETIT:
+-     default:
+      }
+    }
+  }
+--- 123,128 ----
+***************
+*** 167,174 ****
+  	}
+        }
+        break;
+-     case CDDA_MESSAGE_FORGETIT:
+-     default:
+      }
+    }
+    if(malloced)free(buffer);
+--- 163,168 ----
+***************
+*** 203,210 ****
+  	if(!malloced)*messages=catstring(*messages,"\n");
+  	}
+        break;
+-     case CDDA_MESSAGE_FORGETIT:
+-     default:
+      }
+    }
+    if(malloced)free(buffer);
+--- 197,202 ----

pkgs/applications/audio/cmus/default.nix

@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, mpc, mp4v2 }:
-
-stdenv.mkDerivation rec {
-  name = "cmus-${version}";
-  version = "2.3.3";
-
-  configurePhase = "./configure prefix=$out";
-
-  buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 ];
-
-  src = fetchurl {
-    url = "mirror://sourceforge/cmus/cmus-v${version}.tar.bz2";
-    sha256 = "13hc5d7h2ayjwnip345hc59rpjj9fgrp1i5spjw3s14prdqr733v";
-  };
-
-  meta = {
-    description = "cmus is a small, fast and powerful console music player for Linux and *BSD";
-    homepage = http://cmus.sourceforge.net;
-    license = stdenv.lib.licenses.gpl2;
-  };
-}

pkgs/applications/audio/csound/default.nix

@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, cmake, libsndfile, flex, bison
-, alsaLib ? null
-, pulseaudio ? null
-, tcltk ? null
-
-# maybe csound can be compiled with support for those, see configure output
-# , ladspa ? null
-# , fluidsynth ? null
-# , jack ? null
-# , gmm ? null
-# , wiiuse ? null
-}:
-
-stdenv.mkDerivation {
-  name = "csound5.18.02";
-
-  enableParallelBuilding = true;
-
-  src = fetchurl {
-    url = http://netcologne.dl.sourceforge.net/project/csound/csound5/csound5.18/Csound5.18.02.tar.gz;
-    sha256 = "4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8";
-  };
-
-  buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ];
-
-  meta = {
-    description = "sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms";
-    homepage = http://www.csounds.com/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
-

pkgs/applications/audio/distrho/default.nix

@@ -1,67 +0,0 @@
-{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jackaudio
-, libxslt, lv2, pkgconfig, premake, xlibs }:
-
-let
-  rev = "7815b3545978e";
-in
-stdenv.mkDerivation rec {
-  name = "distrho-${rev}";
-
-  src = fetchgit {
-    url = "git://distrho.git.sf.net/gitroot/distrho/distrho";
-    inherit rev;
-    sha256 = "2e260f16ee67b1166c39e2d55c8dd5593902c8b3d8d86485545ef83139e1e844";
-  };
-
-  patchPhase = ''
-    sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile
-    sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile
-    sed -e "s#/etc/HybridReverb2#$out/etc/Hybridreverb2#" \
-      -i ports/hybridreverb2/source/SystemConfig.cpp
-    sed -e "s#/usr#$out#" -i ports/hybridreverb2/data/HybridReverb2.conf
-  '';
-
-  buildInputs = [
-    alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake
-    xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext
-    xlibs.libXinerama xlibs.libXrender
-  ];
-
-  buildPhase = ''
-    sh ./scripts/premake-update.sh linux
-    make standalone
-    make lv2
-
-    # generate lv2 ttl
-    sh scripts/generate-ttl.sh
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/standalone/* $out/bin/
-    mkdir -p $out/lib/lv2
-    cp -a bin/lv2/* $out/lib/lv2/
-
-    # HybridReverb2 data
-    mkdir -p $out/etc/HybridReverb2
-    cp ports/hybridreverb2/data/HybridReverb2.conf $out/etc/HybridReverb2/
-    mkdir -p $out/share
-    cp -a ports/hybridreverb2/data/HybridReverb2 $out/share/
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://distrho.sourceforge.net;
-    description = "A collection of cross-platform audio effects and plugins";
-    longDescription = ''
-      Includes:
-      3BandEQ bitmangler drowaudio-distortion drowaudio-flanger
-      drowaudio-tremolo eqinox HybridReverb2 juce_pitcher sDelay
-      TAL-Filter TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim
-      Wolpertinger argotlunar capsaicin drowaudio-distortionshaper
-      drowaudio-reverb drumsynth highlife JuceDemoPlugin PingPongPan
-      TAL-Dub-3 TAL-Filter-2 TAL-Reverb TAL-Reverb-3 TheFunction vex
-    '';
-    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
-  };
-}

pkgs/applications/audio/easytag/default.nix

@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, libid3tag, id3lib, libvorbis, libogg, flac }:
-
-let
-
-  version = "2.1.7";
-  sha256 = "bfed34cbdce96aca299a0db2b531dbc66feb489b911a34f0a9c67f2eb6ee9301";
-
-in stdenv.mkDerivation {
-  name = "easytag-${version}";
-  src = fetchurl {
-    url = "mirror://sourceforge/easytag/easytag-${version}.tar.bz2";
-    inherit sha256;
-  };
-
-  buildInputs = [ pkgconfig gtk libid3tag id3lib libvorbis libogg flac ];
-
-  meta = {
-    description = "an utility for viewing and editing tags for various audio files";
-    homepage = http://http://easytag.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2;
-  };
-}

pkgs/applications/audio/espeak/default.nix

@@ -1,29 +0,0 @@
-{stdenv, fetchurl, unzip, portaudio }:
-
-stdenv.mkDerivation {
-  name = "espeak-1.46.02";
-  src = fetchurl {
-    url = mirror://sourceforge/espeak/espeak-1.46.02-source.zip;
-    sha256 = "1fjlv5fm0gzvr5wzy1dp4nspw04k0bqv3jymha2p2qfjbfifp2zg";
-  };
-
-  buildInputs = [ unzip portaudio ];
-
-  patchPhase = ''
-    sed -e s,/bin/ln,ln,g -i src/Makefile
-    sed -e 's,^CXXFLAGS=-O2,CXXFLAGS=-O2 -D PATH_ESPEAK_DATA=\\\"$(DATADIR)\\\",' -i src/Makefile
-  '' + (if portaudio.api_version == 19 then ''
-    cp src/portaudio19.h src/portaudio.h
-  '' else "");
-
-  configurePhase = ''
-    cd src
-    makeFlags="PREFIX=$out DATADIR=$out/share/espeak-data"
-  '';
-
-  meta = {
-    description = "Compact open source software speech synthesizer";
-    homepage = http://espeak.sourceforge.net/;
-    license = "GPLv3+";
-  };
-}

pkgs/applications/audio/espeak/edit.nix

@@ -1,31 +0,0 @@
-{stdenv, fetchurl, unzip, portaudio, wxGTK}:
-
-stdenv.mkDerivation {
-  name = "espeakedit-1.46.02";
-  src = fetchurl {
-    url = mirror://sourceforge/espeak/espeakedit-1.46.02.zip;
-    sha256 = "1cc5r89sn8zz7b8wj4grx9xb7aqyi0ybj0li9hpy7hd67r56kqkl";
-  };
-
-  buildInputs = [ unzip portaudio wxGTK ];
-
-  patchPhase = if portaudio.api_version == 19 then ''
-    cp src/portaudio19.h src/portaudio.h
-  '' else "";
-
-  buildPhase = ''
-    cd src
-    gcc -o espeakedit *.cpp `wx-config --cxxflags --libs`
-  '';
-
-  installPhase = ''
-    ensureDir $out/bin
-    cp espeakedit $out/bin
-  '';
-
-  meta = {
-    description = "Phoneme editor for espeak";
-    homepage = http://espeak.sourceforge.net/;
-    license = "GPLv3+";
-  };
-}

pkgs/applications/audio/flac/default.nix

@@ -1,25 +1,16 @@
-{ stdenv, fetchurl, libogg }:
+{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";
-      })
-    ];
-
+  buildInputs = [libogg];
+  
   meta = {
     homepage = http://flac.sourceforge.net;
-    description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
   };
 }

pkgs/applications/audio/fluidsynth/default.nix

@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, alsaLib, glib, jackaudio, libsndfile, pkgconfig
-, pulseaudio }:
-
-stdenv.mkDerivation  rec {
-  name = "fluidsynth-${version}";
-  version = "1.1.5";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/fluidsynth/${name}.tar.bz2";
-    sha256 = "1x73a5rsyvfmh1j0484kzgnk251q61g1g2jdja673l8fizi0xd24";
-  };
-
-  buildInputs = [ alsaLib glib jackaudio libsndfile pkgconfig pulseaudio ];
-
-  meta = with stdenv.lib; {
-    description = "real-time software synthesizer based on the SoundFont 2 specifications";
-    homepage = http://www.fluidsynth.org;
-    license = licenses.lgpl2;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}

pkgs/applications/audio/gigedit/default.nix

@@ -1,30 +0,0 @@
-{ stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45
-, docbook_xsl, gtkmm, intltool, libgig, libsndfile, libtool, libxslt
-, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "gigedit-svn-${version}";
-  version = "2342";
-
-  src = fetchsvn {
-    url = "https://svn.linuxsampler.org/svn/gigedit/trunk";
-    rev = "${version}";
-    sha256 = "0wi94gymj0ns5ck9lq1d970gb4gnzrq4b57j5j7k3d6185yg2gjs";
-  };
-
-  patchPhase = "sed -e 's/which/type -P/g' -i Makefile.cvs";
-
-  preConfigure = "make -f Makefile.cvs";
-
-  buildInputs = [ 
-    autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm intltool
-    libgig libsndfile libtool libxslt pkgconfig 
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = http://www.linuxsampler.org;
-    description = "Gigasampler file access library";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}

pkgs/applications/audio/gmu/default.nix

@@ -1,35 +0,0 @@
-{stdenv, fetchurl, SDL, SDL_gfx, SDL_image, tremor, flac, mpg123, libmikmod
-, speex
-, keymap ? "newdefault"
-, conf ? "unknown"
-}:
-
-stdenv.mkDerivation rec {
-  name = "gmu-0.7.2";
-  
-  src = fetchurl {
-    url = http://wejp.k.vu/files/gmu-0.7.2.tar.gz;
-    sha256 = "0gvhwhhlj64lc425wqch4g6v59ldd5i3rxll3zdcrdgk2vkh8nys";
-  };
-
-  buildInputs = [ SDL SDL_gfx SDL_image tremor flac mpg123 libmikmod speex ];
-
-  NIX_LDFLAGS = "-lgcc_s";
-
-  preBuild = ''
-    makeFlags="$makeFlags PREFIX=$out"
-  '';
-
-  postInstall = ''
-    cp ${keymap}.keymap $out/share/gmu/default.keymap
-    cp gmuinput.${conf}.conf $out/share/gmu/gmuinput.conf
-    mkdir -p $out/etc/gmu
-    cp gmu.${conf}.conf $out/etc/gmu/gmu.conf
-  '';
-
-  meta = {
-    homepage = http://wejp.k.vu/projects/gmu;
-    description = "Open source music player for portable gaming consoles and handhelds";
-    license = "GPLv2";
-  };
-}

pkgs/applications/audio/gtkpod/default.nix

@@ -1,25 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser
-, libglade, flex, libid3tag, libvorbis, intltool }:
+{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser, libglade, flex, libid3tag }:
 
 stdenv.mkDerivation {
-  name = "gtkpod-1.0.0";
+  name = "gtkpod-0.99.14";
 
   src = fetchurl {
-    url = mirror://sourceforge/gtkpod/gtkpod-1.0.0.tar.gz;
-    sha256 = "04jzybs55c27kyp7r9c58prcq0q4ssvj5iggva857f49s1ar826q";
+    url = mirror://sourceforge/gtkpod/gtkpod-0.99.14.tar.gz;
+    sha256 = "0ggcfyhcdlf3br88csdki215k4clxixa192afz6f16k7h8s2iqbk";
   };
-
-  buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex
-    libid3tag libvorbis intltool ];
-
-  patchPhase = ''
-    sed -i 's/which/type -P/' scripts/*.sh
-  '';
+  buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex libid3tag];
 
   meta = {
     description = "GTK Manager for an Apple ipod";
     homepage = http://gtkpod.sourceforge.net;
     license = "GPLv2+";
-    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/applications/audio/guitarix/default.nix

@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, jackaudio, libsndfile
-, glib, gtk, glibmm, gtkmm, fftw, librdf, ladspaH, boost }:
-
-stdenv.mkDerivation rec {
-  name = "guitarix-${version}";
-  version = "0.25.2";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
-    sha256 = "1wcg3yc2iy72hj6z9l88393f00by0iwhhn8xrc3q55p4rj0mnrga";
-  };
-
-  buildInputs =
-    [ python gettext intltool pkgconfig jackaudio libsndfile glib gtk glibmm
-      gtkmm fftw librdf ladspaH boost
-    ];
-
-  configurePhase = "python waf configure --prefix=$out";
-
-  buildPhase = "python waf build";
-
-  installPhase = "python waf install";
-
-  meta = { 
-    description = "A virtual guitar amplifier for Linux running with JACK";
-    longDescription = ''
-        guitarix is a virtual guitar amplifier for Linux running with
-      JACK (Jack Audio Connection Kit). It is free as in speech and
-      free as in beer. Its free sourcecode allows to build it for
-      other UNIX-like systems also, namely for BSD and for MacOSX.
-
-        It takes the signal from your guitar as any real amp would do:
-      as a mono-signal from your sound card. Your tone is processed by
-      a main amp and a rack-section. Both can be routed separately and
-      deliver a processed stereo-signal via JACK. You may fill the
-      rack with effects from more than 25 built-in modules spanning
-      from a simple noise-gate to brain-slashing modulation-fx like
-      flanger, phaser or auto-wah. Your signal is processed with
-      minimum latency. On any properly set-up Linux-system you do not
-      need to wait for more than 10 milli-seconds for your playing to
-      be delivered, processed by guitarix.
-
-        guitarix offers the range of sounds you would expect from a
-      full-featured universal guitar-amp. You can get crisp
-      clean-sounds, nice overdrive, fat distortion and a diversity of
-      crazy sounds never heard before.
-    '';
-    homepage = http://guitarix.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.astsmtl ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

pkgs/applications/audio/hydrogen/default.nix

@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, alsaLib, boost, glib, jackaudio, ladspaPlugins
-, libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }:
-
-stdenv.mkDerivation rec {
-  version = "0.9.5";
-  name = "hydrogen-${version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/hydrogen/hydrogen-${version}.tar.gz";
-    sha256 = "1hyri49va2ss26skd6p9swkx0kbr7ggifbahkrcfgj8yj7pp6g4n";
-  };
-
-  buildInputs = [ 
-    alsaLib boost glib jackaudio ladspaPlugins libarchive liblrdf
-    libsndfile pkgconfig qt4 scons subversion
-  ];
-
-  patches = [ ./scons-env.patch ];
-
-  postPatch = ''
-    sed -e 's#/usr/lib/ladspa#${ladspaPlugins}/lib/ladspa#' -i libs/hydrogen/src/preferences.cpp
-    sed '/\/usr/d' -i libs/hydrogen/src/preferences.cpp
-    '';
-
-  # why doesn't scons find librdf?
-  buildPhase = ''
-    scons prefix=$out libarchive=1 lrdf=0 install
-  '';
-
-  installPhase = ":";
-
-  meta = with stdenv.lib; {
-    description = "Advanced drum machine";
-    homepage = http://www.hydrogen-music.org;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}

pkgs/applications/audio/hydrogen/scons-env.patch

@@ -1,28 +0,0 @@
---- hydrogen-0.9.5/Sconstruct	2011-03-15 13:22:35.000000000 +0100
-+++ hydrogen-0.9.5/Sconstruct	2011-04-17 16:06:54.000000000 +0200
-@@ -178,7 +178,7 @@
- 
- 	includes.append( "libs/hydrogen/include" )
- 	
--	env = Environment( options = opts ) 
-+	env = Environment( options = opts, ENV = os.environ ) 
- 
- 
- 	#location of qt4.py
-@@ -298,7 +298,6 @@
- 
-         for N in glob.glob('./data/i18n/hydrogen.*'):
-             env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
--	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
- 
- 	#add every img in ./data/img to the install list. 
- 	os.path.walk("./data/img/",install_images,env) 
-@@ -379,7 +379,7 @@
- 
- includes, a , b = get_platform_flags( opts )
- 
--env = Environment(options = opts, CPPPATH = includes)
-+env = Environment(options = opts, ENV = os.environ)
- 
- 
- Help(opts.GenerateHelpText(env))

pkgs/applications/audio/id3v2/default.nix

@@ -1,28 +0,0 @@
-{stdenv, fetchurl, id3lib, groff}:
-
-stdenv.mkDerivation rec {
-  name = "id3v2-0.1.11";
-  src = fetchurl {
-    url = "mirror://sourceforge/id3v2/${name}.tar.gz";
-    sha256 = "00r6f9yzmkrqa62dnkm8njg5cjzhmy0l17nj1ba15nrrm0mnand4";
-  };
-
-  patches = [ ./id3v2-0.1.11-track-bad-free.patch ];
-
-  buildNativeInputs = [ groff ];
-  buildInputs = [ id3lib ];
-
-  configurePhase = ''
-    export makeFlags=PREFIX=$out
-  '';
-
-  preInstall = ''
-    mkdir -p $out/bin $out/man/man1
-  '';
-
-  meta = {
-    description = "A command line editor for id3v2 tags";
-    homepage = http://id3v2.sourceforge.net/;
-    license = "GPLv2+";
-  };
-}

pkgs/applications/audio/id3v2/id3v2-0.1.11-track-bad-free.patch

@@ -1,14 +0,0 @@
-http://sourceforge.net/tracker/index.php?func=detail&aid=1252035&group_id=4193&atid=304193
-
-diff -up id3v2-0.1.11/id3v2.cpp~ id3v2-0.1.11/id3v2.cpp
---- id3v2-0.1.11/id3v2.cpp~	2004-05-04 21:30:15.000000000 +0300
-+++ id3v2-0.1.11/id3v2.cpp	2008-01-03 21:22:02.000000000 +0200
-@@ -423,7 +423,7 @@ int main( int argc, char *argv[])
-         {
-           // check if there is a total track number and if we only have 
-           // the track number for this file.  In this case combine them.
--          char *currentTrackNum, *newTrackNum;
-+          char *currentTrackNum, *newTrackNum = NULL;
- 
-           if (pFrame != NULL) 
-           {

pkgs/applications/audio/jack-capture/default.nix

@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, jackaudio, libsndfile, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "jack_capture-${version}";
-  version = "0.9.69";
-
-  src = fetchurl {
-    url = "http://archive.notam02.no/arkiv/src/${name}.tar.gz";
-    sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv";
-  };
-
-  buildInputs = [ jackaudio libsndfile pkgconfig ];
-
-  buildPhase = "PREFIX=$out make jack_capture";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp jack_capture $out/bin/
-  '';
-
-  meta = with stdenv.lib; { 
-    description = "A program for recording soundfiles with jack";
-    homepage = http://archive.notam02.no/arkiv/src;
-    license = licenses.gpl2;
-    maintainers = [ maintainers.goibhniu ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

pkgs/applications/audio/jackmeter/default.nix

@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, jackaudio, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "jackmeter-0.3";
-
-  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 = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

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

@@ -1,22 +1,27 @@
-{ stdenv, fetchurl, fftw, ladspaH, pkgconfig }:
-
+args: with args;
+	let localDefs = builderDefs.passthru.function {
+		src = 
+		fetchurl {
+			url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz;
+			sha256 = "0h462s4mmqg4iw7zdsihnrmz2vjg0fd49qxw2a284bnryjjfhpnh";
+		};
+		buildInputs = [fftw ladspaH pkgconfig];
+		configureFlags = [];
+	};
+	in with localDefs;
+let
+	postInstall = FullDepEntry ("
+		ensureDir \$out/share/ladspa/
+		ln -s \$out/lib/ladspa \$out/share/ladspa/lib
+	") [minInit defEnsureDir];
+in
 stdenv.mkDerivation {
-  name = "swh-plugins-0.4.15";
-
-  src = fetchurl {
-    url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz;
-    sha256 = "0h462s4mmqg4iw7zdsihnrmz2vjg0fd49qxw2a284bnryjjfhpnh";
-  };
-  
-  buildInputs = [fftw ladspaH pkgconfig];
-
-  postInstall =
-    ''
-      mkdir -p $out/share/ladspa/
-      ln -sv $out/lib/ladspa $out/share/ladspa/lib
-    '';
-
-  meta = {
-    description = "LADSPA format audio plugins";
-  };
+	name = "swh-plugins-0.4.15";
+	builder = writeScript "swh-plugins-0.4.15-builder"
+		(textClosure localDefs [doConfigure doMakeInstall 
+			postInstall doForceShare]);
+	meta = {
+		description = "LADSPA format audio plugins";
+		inherit src;
+	};
 }

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

@@ -1,28 +1,28 @@
-{ stdenv, fetchurl, builderDefs }:
-
+args: with args;
 let 
-  src = fetchurl {
-    url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt;
-    sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
-  };
+	src = 
+	fetchurl {
+		url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt;
+		sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
+	};
 in
-  let localDefs = builderDefs.passthru.function {
-    buildInputs = [];
-    inherit src;
-  };
-  in with localDefs;
+	let localDefs = builderDefs.passthru.function {
+		buildInputs = [];
+		inherit src;
+	};
+	in with localDefs;
 let
-  copyFile = fullDepEntry ("
-    mkdir -p \$out/include
-    cp ${src} \$out/include/ladspa.h
-  ") [minInit defEnsureDir];
+	copyFile = FullDepEntry ("
+		ensureDir \$out/include
+		cp ${src} \$out/include/ladspa.h
+	") [minInit defEnsureDir];
 in
 stdenv.mkDerivation {
-  name = "ladspa.h";
-  builder = writeScript "ladspa.h-builder"
-    (textClosure localDefs [copyFile]);
-  meta = {
-    description = "LADSPA format audio plugins";
-    inherit src;
-  };
+	name = "ladspa.h";
+	builder = writeScript "ladspa.h-builder"
+		(textClosure localDefs [copyFile]);
+	meta = {
+		description = "LADSPA format audio plugins";
+		inherit src;
+	};
 }

pkgs/applications/audio/lame/default.nix

@@ -1,17 +1,9 @@
-{stdenv, fetchurl, nasm}:
+{stdenv, fetchurl}:
 
-stdenv.mkDerivation rec {
-  name = "lame-3.98.4";
+stdenv.mkDerivation {
+  name = "lame-3.97";
   src = fetchurl {
-    url = "mirror://sourceforge/lame/${name}.tar.gz";
-    sha256 = "1j3jywv6ic2cy0x0q1a1h6rcl6xmcs5f58xawjdkl8hpcv3l8cdc";
+    url = mirror://sourceforge/lame/lame-3.97.tar.gz ;
+    sha256 = "05xy9lv6m9s013lzlvhxwvr1586c239xaiiwka52k18hs6k388qa";
   };
-
-  buildInputs = [ nasm ];
-
-  configureFlags = [ "--enable-nasm" ];
-
-  # Either disable static, or fix the rpath of 'lame' for it to point
-  # properly to the libmp3lame shared object.
-  dontDisableStatic = true;
 }

pkgs/applications/audio/lash/default.nix

@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, alsaLib, gtk, jackaudio, libuuid, libxml2
-, makeWrapper, pkgconfig, readline }:
-
-assert libuuid != null;
-
-stdenv.mkDerivation  rec {
-  name = "lash-${version}";
-  version = "0.5.4";
-
-  src = fetchurl {
-    url = "mirror://savannah/lash/${name}.tar.gz";
-    sha256 = "05kc4brcx8mncai0rj2gz4s4bsrsy9q8xlnaddf75i0m8jl7snhh";
-  };
-
-  patches = [ ./socket.patch ];
-
-  buildInputs = [ alsaLib gtk jackaudio libuuid libxml2 makeWrapper
-    pkgconfig readline ];
-
-  postInstall = ''
-    for i in lash_control lash_panel
-      do wrapProgram "$out/bin/$i" --prefix LD_LIBRARY_PATH ":" "${libuuid}/lib"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "LASH Audio Session Handler";
-    longDescription = ''
-      Session management system for GNU/Linux audio applications.
-    '';
-    homepage = http://www.nongnu.org/lash;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}

pkgs/applications/audio/lash/socket.patch

@@ -1,16 +0,0 @@
-Via http://bugs.gentoo.org/show_bug.cgi?id=229603
-
---- lash-0.5.4/liblash/socket.c	2008-06-26 15:20:44.227064193 +0200
-+++ lash-0.5.4/liblash/socket.c	2008-06-26 15:21:18.245063129 +0200
-@@ -20,6 +20,11 @@ 
- 
- #define _POSIX_SOURCE /* addrinfo */
- 
-+#ifdef LASH_BUILD
-+#define _GNU_SOURCE
-+#include "config.h"
-+#endif /* LASH_BUILD */
-+
- #include <stdint.h>
- #include <sys/types.h>
- #include <sys/socket.h>

pkgs/applications/audio/lastwatch/default.nix

@@ -1,29 +0,0 @@
-{ stdenv, fetchgit, pythonPackages }:
-
-pythonPackages.buildPythonPackage rec {
-  name = "lastwatch-${version}";
-  namePrefix = "";
-  version = "0.4.1";
-
-  src = fetchgit {
-    url = "git://github.com/aszlig/LastWatch.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "c43f0fd87e9f3daafc7e8676daf2e89c8e21fbabc278eb1455e28d2997587a92";
-  };
-
-  pythonPath = [
-    pythonPackages.pyinotify
-    pythonPackages.pylast
-    pythonPackages.mutagen
-  ];
-
-  propagatedBuildInputs = pythonPath;
-
-  installCommand = "python setup.py install --prefix=$out";
-
-  meta = {
-    homepage = "https://github.com/aszlig/LastWatch";
-    description = "An inotify-based last.fm audio scrobbler";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}

pkgs/applications/audio/lingot/default.nix

@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, alsaLib, libglade }:
-
-stdenv.mkDerivation {
-  name = "lingot-0.9.0";
-
-  src = fetchurl {
-    url = http://download.savannah.gnu.org/releases/lingot/lingot-0.9.0.tar.gz;
-    sha256 = "07z129lp8m4sz608q409wb11c639w7cbn497r7bscgg08p6c07xb";
-  };
-
-  buildInputs = [ pkgconfig intltool gtk alsaLib libglade ];
-
-  configureFlags = "--disable-jack";
-
-  meta = {
-    description = "Not a Guitar-Only tuner";
-    homepage = http://www.nongnu.org/lingot/;
-    license = "GPLv2+";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [viric];
-  };
-}

pkgs/applications/audio/linuxsampler/default.nix

@@ -1,44 +0,0 @@
-{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison
-, jackaudio, libgig, libsndfile, libtool, lv2, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "linuxsampler-svn-${version}";
-  version = "2340";
-
-  src = fetchsvn {
-    url = "https://svn.linuxsampler.org/svn/linuxsampler/trunk";
-    rev = "${version}";
-    sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7";
-  };
-
-  patches = ./linuxsampler_lv2_sfz_fix.diff;
-
-  preConfigure = ''
-    sed -e 's/which/type -P/g' -i scripts/generate_parser.sh
-    make -f Makefile.cvs
-  '';
-
-  buildInputs = [ 
-   alsaLib asio autoconf automake bison jackaudio libgig libsndfile
-   libtool lv2 pkgconfig
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = http://www.linuxsampler.org;
-    description = "Sampler backend";
-    longDescription = ''
-      Includes sampler engine, audio and MIDI drivers, network layer
-      (LSCP) API and native C++ API.
-
-      LinuxSampler is licensed under the GNU GPL with the exception
-      that USAGE of the source code, libraries and applications FOR
-      COMMERCIAL HARDWARE OR SOFTWARE PRODUCTS IS NOT ALLOWED without
-      prior written permission by the LinuxSampler authors. If you
-      have questions on the subject, that are not yet covered by the
-      FAQ, please contact us.
-    ''; 
-    license = licenses.proprietary;
-    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
-  };
-}

pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff

@@ -1,50 +0,0 @@
-Index: linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp
-===================================================================
---- linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp	(revision 2359)
-+++ linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp	(working copy)
-@@ -18,6 +18,8 @@
-  *   MA  02110-1301  USA                                                   *
-  ***************************************************************************/
- 
-+#define _BSD_SOURCE 1  /* for realpath() */
-+
- #include <algorithm>
- #include <cassert>
- #include <cstdio>
-@@ -118,6 +120,23 @@
-         dmsg(2, ("linuxsampler: Deactivate\n"));
-     }
- 
-+    static String RealPath(const String& path)
-+    {
-+        String out   = path;
-+        char*  cpath = NULL;
-+#ifdef _WIN32
-+        cpath = (char*)malloc(MAX_PATH);
-+        GetFullPathName(path.c_str(), MAX_PATH, cpath, NULL);
-+#else
-+        cpath = realpath(path.c_str(), NULL);
-+#endif
-+        if (cpath) {
-+            out = cpath;
-+            free(cpath);
-+        }
-+        return out;
-+    }
-+
-     String PluginLv2::PathToState(const String& path) {
-         if (MapPath) {
-             char* cstr = MapPath->abstract_path(MapPath->handle, path.c_str());
-@@ -131,9 +150,10 @@
-     String PluginLv2::PathFromState(const String& path) {
-         if (MapPath) {
-             char* cstr = MapPath->absolute_path(MapPath->handle, path.c_str());
--            const String abstract_path(cstr);
-+            // Resolve symbolic links so SFZ sample paths load correctly
-+            const String absolute_path(RealPath(cstr));
-             free(cstr);
--            return abstract_path;
-+            return absolute_path;
-         }
-         return path;
-     }

pkgs/applications/audio/lmms/default.nix

@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, SDL, alsaLib, cmake, fftw, jackaudio, libogg,
-libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4 }:
-
-stdenv.mkDerivation  rec {
-  name = "lmms-${version}";
-  version = "0.4.10";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/lmms/${name}.tar.bz2";
-    sha256 = "035cqmxcbr9ipnicdv5l7h05q2hqbavxkbaxyq06ppnv2y7fxwrb";
-  };
-
-  buildInputs = [ SDL alsaLib cmake fftw jackaudio libogg
-    libsamplerate libsndfile pkgconfig pulseaudio qt4 ];
-
-  meta = with stdenv.lib; {
-    description = "Linux MultiMedia Studio";
-    homepage = "http://lmms.sourceforge.net";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}

pkgs/applications/audio/mhwaveedit/default.nix

@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, SDL , alsaLib, gtk, jackaudio, ladspaH
-, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }:
-
-stdenv.mkDerivation  rec {
-  name = "mhwaveedit-${version}";
-  version = "1.4.21";
-
-  src = fetchurl {
-    url = "http://download.gna.org/mhwaveedit/${name}.tar.bz2";
-    sha256 = "0jl7gvhwsz4fcn5d146h4m6i3hlxdsw4mmj280cv9g70p6zqi1w7";
-  };
-
-  buildInputs =
-   [ SDL alsaLib gtk jackaudio ladspaH libsamplerate libsndfile
-     pkgconfig pulseaudio
-   ];
-
-  configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa";
-
-  meta = with stdenv.lib; {
-    description = "graphical program for editing, playing and recording sound files";
-    homepage = https://gna.org/projects/mhwaveedit;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}

pkgs/applications/audio/mikmod/default.nix

@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, libmikmod, ncurses }:
-
-stdenv.mkDerivation rec {
-  name = "mikmod-3.2.2";
-  src = fetchurl {
-    url = "http://mikmod.shlomifish.org/files/${name}.tar.gz";
-    sha256 = "105vl1kyah588wpbpq6ck1wlr0jj55l2ps72q5i01gs9px8ncmp8";
-  };
-
-  buildInputs = [ libmikmod ncurses ];
-
-  meta = {
-    description = "Tracker music player for the terminal";
-    homepage = http://mikmod.shlomifish.org/;
-    license = "GPLv2+";
-    maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}

pkgs/applications/audio/mp3info/default.nix

@@ -1,42 +0,0 @@
-{ fetchurl, stdenv, ncurses, pkgconfig, gtk }:
-
-stdenv.mkDerivation rec {
-  name = "mp3info-0.8.5a";
-
-  src = fetchurl {
-    url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/${name}.tgz";
-    sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04";
-  };
-
-  buildInputs = [ ncurses pkgconfig gtk ];
-
-  configurePhase =
-    '' sed -i Makefile \
-           -e "s|^prefix=.*$|prefix=$out|g ;
-               s|/bin/rm|rm|g ;
-               s|/usr/bin/install|install|g"
-    '';
-
-  preInstall =
-    '' mkdir -p "$out/bin"
-       mkdir -p "$out/man/man1"
-    '';
-
-  meta = {
-    description = "MP3Info, an MP3 technical info viewer and ID3 1.x tag editor";
-
-    longDescription =
-      '' MP3Info is a little utility used to read and modify the ID3 tags of
-         MP3 files.  MP3Info can also display various techincal aspects of an
-         MP3 file including playing time, bit-rate, sampling frequency and
-         other attributes in a pre-defined or user-specifiable output format.
-      '';
-
-    homepage = http://www.ibiblio.org/mp3info/;
-
-    license = "GPLv2+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.unix;
-  };
-}

pkgs/applications/audio/mpc123/default.nix

@@ -1,32 +0,0 @@
-{ fetchurl, stdenv, gettext, libmpcdec, libao }:
-
-let version = "0.2.4"; in
-stdenv.mkDerivation rec {
-  name = "mpc123-${version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/mpc123/version%20${version}/${name}.tar.gz";
-    sha256 = "0sf4pns0245009z6mbxpx7kqy4kwl69bc95wz9v23wgappsvxgy1";
-  };
-
-  patches = [ ./use-gcc.patch ];
-
-  buildInputs = [ gettext libmpcdec libao ];
-
-  installPhase =
-    # XXX: Should install locales too (though there's only 1 available).
-    '' mkdir -p "$out/bin"
-       cp -v mpc123 "$out/bin"
-    '';
-
-  meta = {
-    homepage = http://mpc123.sourceforge.net/;
-
-    description = "mpc123, a Musepack (.mpc) audio player";
-
-    license = "GPLv2+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu; # arbitrary choice
-  };
-}

pkgs/applications/audio/mpc123/use-gcc.patch

@@ -1,13 +0,0 @@
-Don't worry, just use GCC and everything's gonna be alright.
-
---- mpc123-0.2.4/Makefile	2008-03-21 22:14:38.000000000 +0100
-+++ mpc123-0.2.4/Makefile	2010-01-28 23:26:49.000000000 +0100
-@@ -17,7 +17,7 @@
- # along with this program; if not, write to the Free Software Foundation,
- # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
--CC := $(shell which colorgcc || which cc)
-+CC := gcc
- 
- TAGSPRG := ctags
- 

pkgs/applications/audio/mpg123/default.nix

@@ -1,23 +0,0 @@
-{stdenv, fetchurl, alsaLib }:
-
-stdenv.mkDerivation {
-  name = "mpg123-1.12.3";
-
-  src = fetchurl {
-    url = mirror://sourceforge/mpg123/mpg123-1.12.3.tar.bz2;
-    sha256 = "1ij689s7jch3d4g0ja3jylaphallc8vgrsrm9b12254phnyy23xf";
-  };
-
-  buildInputs = [ alsaLib ];
-
-  crossAttrs = {
-    configureFlags = if stdenv.cross ? mpg123 then
-      "--with-cpu=${stdenv.cross.mpg123.cpu}" else "";
-  };
-
-  meta = {
-    description = "Command-line MP3 player";
-    homepage = http://mpg123.sourceforge.net/;
-    license = "LGPL";
-  };
-}

pkgs/applications/audio/mpg321/default.nix

@@ -1,20 +1,17 @@
 {stdenv, fetchurl, libao, libmad, libid3tag, zlib}:
 
-stdenv.mkDerivation rec {
-  name = "mpg321-0.2.13-2";
-
+stdenv.mkDerivation {
+  name = "mpg321-0.2.10";
   src = fetchurl {
-    url = "mirror://sourceforge/mpg321/0.2.13/${name}.tar.gz";
-    sha256 = "0zx9xyr97frlyrwyk2msm9h1sn2b84vqaxcy5drbzcd2n585lwlx";
+    url = mirror://sourceforge/mpg321/mpg321-0.2.10.tar.gz;
+    sha256 = "db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4";
   };
 
   buildInputs = [libao libid3tag libmad zlib];
 
   meta = {
-    description = "mpg321, a command-line MP3 player";
+    description = "Command-line MP3 player.";
     homepage = http://mpg321.sourceforge.net/;
     license = "GPLv2";
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;
   };
 }

pkgs/applications/audio/ncmpcpp/default.nix

@@ -1,21 +0,0 @@
-{stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig}:
-
-stdenv.mkDerivation rec {
-  version = "0.5.10";
-  name = "ncmpcpp-${version}";
-
-  src = fetchurl {
-    url = "http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2";
-    sha256 = "ff6d5376a2d9caba6f5bb78e68af77cefbdb2f04cd256f738e39f8ac9a79a4a8";
-  };
-
-  buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ];
-
-  meta = {
-    description = "Curses-based interface for MPD (music player daemon)";
-    homepage = http://unkart.ovh.org/ncmpcpp/;
-    license = "GPLv2+";
-    maintainers = [ stdenv.lib.maintainers.mornfall ];
-  };
-}
-

pkgs/applications/audio/opus-tools/default.nix

@@ -1,17 +0,0 @@
-{stdenv, fetchurl, libogg, libao, pkgconfig, libopus}:
-
-stdenv.mkDerivation rec {
-  name = "opus-tools-0.1.5";
-  src = fetchurl {
-    url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
-    sha256 = "0184zfamg3qcjknk4liz4smws3mbv77gjhq2pn9xgcx9nw78srvn";
-  };
-
-  buildInputs = [ libogg libao pkgconfig libopus ];
-
-  meta = {
-    description = "Tools to work with opus encoded audio streams";
-    homepage = http://www.opus-codec.org/;
-    license = "BSD";
-  };
-}

pkgs/applications/audio/pavucontrol/default.nix

@@ -1,33 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libsigcxx
-, libglademm, libcanberra, intltool, gettext }:
-
-stdenv.mkDerivation rec {
-  name = "pavucontrol-1.0";
-
-  src = fetchurl {
-    url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz";
-    sha256 = "1plcyrc7p6gqxjhxx2xh6162bkb29wixjrqrjnl9b8g3nrjjigix";
-  };
-
-  buildInputs = [ pkgconfig pulseaudio gtkmm libsigcxx libglademm libcanberra
-    intltool gettext ];
-
-  configureFlags = "--disable-lynx --disable-gtk3";
-
-  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+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}