Add fping, a more scriptable ping

Move librdf_raptor to propagatedBuildInputs.

.gitignore

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

VERSION

@@ -1 +1 @@
-0.14
+1.0

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://nixos.org/releases/nix/unstable/manual/">Nix
+<link xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual">Nix
 manual</link>.</para>
 
 <para>This manual does not describe the syntax and semantics of the
 Nix expression language, which are given in the Nix manual in the
 <link
-xlink:href="http://nixos.org/releases/nix/unstable/manual/#chap-writing-nix-expressions">chapter
+xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/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

@@ -18,10 +18,10 @@ such as Perl or Haskell.  These are described in this chapter.</para>
 <para>Nixpkgs provides a function <varname>buildPerlPackage</varname>,
 a generic package builder function for any Perl package that has a
 standard <varname>Makefile.PL</varname>.  It’s implemented in <link
-xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.</para>
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.</para>
 
 <para>Perl packages from CPAN are defined in <link
-xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/perl-packages.nix"><filename>pkgs/perl-packages.nix</filename></link>,
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/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
@@ -162,7 +162,7 @@ ClassC3Componentised = buildPerlPackage rec {
   which many Python packages do nowadays, can be built very simply using
   the <varname>buildPythonPackage</varname> function.  This function is
   implemented
-  in <link xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/development/python-modules/generic/default.nix"><filename>pkgs/development/python-modules/generic/default.nix</filename></link>
+  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>
@@ -170,7 +170,7 @@ ClassC3Componentised = buildPerlPackage rec {
 <para>
   Python packages that use <varname>buildPythonPackage</varname> are
   defined
-  in <link xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>.
+  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:
 
   <programlisting>
@@ -196,16 +196,18 @@ twisted = buildPythonPackage {
 </section>
 
 
-<section><title>Haskell</title>
+<section><title>Java</title>
 
-<para>TODO</para>
+<para>Java packages should install JAR files in
+<filename>$out/lib/java</filename>.</para>
 
 </section>
 
 
-<section><title>Java</title>
+<!--
+<section><title>Haskell</title>
 
-<para>TODO; Java support needs lots of improvement</para>
+<para>TODO</para>
 
 </section>
 
@@ -215,6 +217,7 @@ twisted = buildPythonPackage {
 <para>* Special support for building TeX documents</para>
 
 </section>
+-->
 
 
 </chapter>

doc/manual.xml

@@ -14,14 +14,12 @@
         <surname>Dolstra</surname>
       </personname>
       <affiliation>
-        <orgname>Delft University of Technology</orgname>
-        <orgdiv>Department of Software Technology</orgdiv>
+        <orgname>LogicBlox</orgname>
       </affiliation>
     </author>
 
     <copyright>
-      <year>2008</year>
-      <year>2009</year>
+      <year>2008-2012</year>
       <holder>Eelco Dolstra</holder>
     </copyright>
 

doc/meta.xml

@@ -103,7 +103,7 @@ interpretation:</para>
     &lt;alice@example.org>" "Bob &lt;bob@example.com>"]</literal>.  If
     you are the maintainer of multiple packages, you may want to add
     yourself to <link
-    xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/lib/maintainers.nix"><filename>pkgs/lib/maintainers.nix</filename></link>
+    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>
@@ -176,6 +176,12 @@ following:
     (“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

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-introduction">
+         xml:id="chap-package-notes">
 
 <title>Package Notes</title>
 
@@ -16,7 +16,7 @@ Linux kernel or X.org.</para>
 <title>Linux kernel</title>
 
 <para>The Nix expressions to build the Linux kernel are in <link
-xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/os-specific/linux/kernel"><filename>pkgs/os-specific/linux/kernel</filename></link>.</para>
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/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 (<command>svn cp</command>) the old Nix expression
+    <para>Copy 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 <command>svn copy</command> from the old
+          <para>Make an copy 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>
@@ -224,19 +224,23 @@ 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

@@ -12,7 +12,7 @@
     <para>Checkout the Nixpkgs source tree:
 
 <screen>
-$ svn checkout https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs
+$ git clone git://github.com/NixOS/nixpkgs.git 
 $ cd nixpkgs</screen>
 
     </para>
@@ -29,7 +29,7 @@ $ cd nixpkgs</screen>
     organisation.  Create a directory for your package, e.g.
 
 <screen>
-$ svn mkdir pkgs/development/libraries/libfoo</screen>
+$ mkdir pkgs/development/libraries/libfoo</screen>
   
     </para>
   </listitem>
@@ -44,7 +44,7 @@ $ svn mkdir pkgs/development/libraries/libfoo</screen>
 
 <screen>
 $ emacs pkgs/development/libraries/libfoo/default.nix
-$ svn add pkgs/development/libraries/libfoo/default.nix</screen>
+$ git add pkgs/development/libraries/libfoo/default.nix</screen>
 
     </para>
 
@@ -56,7 +56,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
 
         <listitem>
           <para>GNU cpio: <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>.
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/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 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
 
         <listitem>
           <para>GNU Hello: <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/hello/ex-2/default.nix"><filename>pkgs/applications/misc/hello/ex-2/default.nix</filename></link>.
+          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>.
           Also trivial, but it specifies some <varname>meta</varname>
           attributes which is good practice.</para>
         </listitem>
 
         <listitem>
           <para>GNU Multiple Precision arithmetic library (GMP): <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/development/libraries/gmp/default.nix"><filename>pkgs/development/libraries/gmp/default.nix</filename></link>.
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/default.nix"><filename>pkgs/development/libraries/gmp/default.nix</filename></link>.
           Also done by the generic builder, but has a dependency on
           <varname>m4</varname>.</para>
         </listitem>
 
         <listitem>
           <para>Pan, a GTK-based newsreader: <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></link>.
+          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>.
           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 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
 
         <listitem>
           <para>Apache HTTPD: <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nix"><filename>pkgs/servers/http/apache-httpd/default.nix</filename></link>.
+          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>.
           A bunch of optional features, variable substitutions in the
           configure flags, a post-install hook, and miscellaneous
           hackery.</para>
@@ -94,9 +94,9 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
 
         <listitem>
           <para>BitTorrent (wxPython-based): <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/networking/p2p/bittorrent/default.nix"><filename>pkgs/tools/networking/p2p/bittorrent/default.nix</filename></link>.
+          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>.
           Uses an external <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/networking/p2p/bittorrent/builder.sh">build
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/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.
@@ -105,22 +105,22 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
 
         <listitem>
           <para>Thunderbird: <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/3.x.nix</filename></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>.
           Lots of dependencies.</para>
         </listitem>
 
         <listitem>
           <para>JDiskReport, a Java utility: <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link>
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link>
           (and the <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>).
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>).
           Nixpkgs doesn’t have a decent <varname>stdenv</varname> for
           Java yet so this is pretty ad-hoc.</para>
         </listitem>
 
         <listitem>
           <para>XML::Simple, a Perl module: <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>
+          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>;
@@ -129,10 +129,10 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
 
         <listitem>
           <para>Adobe Reader: <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>.
+          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>.
           Shows how binary-only packages can be supported.  In
           particular the <link
-          xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/adobe-reader/builder.sh">builder</link>
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder</link>
           uses <command>patchelf</command> to set the RUNPATH and ELF
           interpreter of the executables so that the right libraries
           are found at runtime.</para>
@@ -163,7 +163,7 @@ $ svn 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://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>.</para>
+          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>
         </listitem>
 
       </itemizedlist>
@@ -173,7 +173,7 @@ $ svn 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://nixos.org/releases/nix/unstable/manual/#chap-writing-nix-expressions">chapter
+    xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter
     on writing Nix expressions</link>.</para>
     
   </listitem>
@@ -181,7 +181,7 @@ $ svn 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://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></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>
     with some descriptive name for the variable,
     e.g. <varname>libfoo</varname>.
 
@@ -220,8 +220,7 @@ $ nix-env -f . -iA libfoo</screen>
   </listitem>
 
   <listitem>
-    <para>Optionally commit the new package (<command>svn
-    ci</command>) or send a patch to
+    <para>Optionally commit the new package, or send a patch to
     <literal>nix-dev@cs.uu.nl</literal>.</para>
   </listitem>
 
@@ -230,7 +229,7 @@ $ nix-env -f . -iA libfoo</screen>
     package and make them available in the <link
     xlink:href="http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/"><literal>nixpkgs</literal>
     channel</link>, add it to <link
-    xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/release.nix"><filename>pkgs/top-level/release.nix</filename></link>.</para>
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/release.nix"><filename>pkgs/top-level/release.nix</filename></link>.</para>
   </listitem>
 
 </orderedlist>

doc/release-notes.xml

@@ -5,6 +5,21 @@
 <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

doc/style.css

@@ -8,15 +8,14 @@
 
 body
 {
-    font-family: sans-serif;
+    font-family: "Nimbus Sans L", sans-serif;
     background: white;
     margin: 2em 1em 2em 1em;
 }
 
-h1,h2,h3
+h1, h2, h3, h4
 {
     color: #005aa0;
-    text-align: left;
 }
 
 h1 /* title */
@@ -46,6 +45,11 @@ h3 /* subsections */
     font-size: 125%;
 }
 
+div.simplesect h2
+{
+    font-size: 110%;
+}
+
 div.appendix h3
 {
     font-size: 150%;
@@ -70,11 +74,13 @@ div.refsection h3
 
 div.example
 {
-    border: 1px solid #6185a0;
+    border: 1px solid #b0b0b0;
     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
@@ -82,6 +88,11 @@ div.example p.title
     margin-top: 0em;
 }
 
+div.example pre
+{
+    box-shadow: none;
+}
+
 
 /***************************************************************************
                             Screen dumps:
@@ -89,14 +100,15 @@ div.example p.title
 
 pre.screen, pre.programlisting
 {
-    border: 1px solid #6185a0;
+    border: 1px solid #b0b0b0;
     padding: 3px 3px;
     margin-left: 1.5em;
     margin-right: 1.5em;
     color: #600000;
     background: #f4f4f8;
     font-family: monospace;
-    /* font-size: 90%; */
+    border-radius: 0.4em;
+    box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
 div.example pre.programlisting
@@ -113,13 +125,15 @@ div.example pre.programlisting
 
 .note, .warning
 {
-    border: 1px solid #6185a0;
+    border: 1px solid #b0b0b0;
     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
@@ -131,7 +145,6 @@ div.note h3, div.warning h3
 {
     color: red;
     font-size: 100%;
-//    margin: 0 0 0 0;
     padding-right: 0.5em;
     display: inline;
 }
@@ -162,20 +175,26 @@ 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:
  ***************************************************************************/
 
-.toc
+div.toc
 {
     font-size: 90%;
 }
 
+div.toc dl
+{
+    margin-top: 0em;
+    margin-bottom: 0em;
+}
 
 
 /***************************************************************************
@@ -208,76 +227,29 @@ div.glosslist dt
     font-style: italic;
 }
 
-.default
-{
-    font-style: italic;
-}
-
-.availability
-{
-    font-style: italic;
-}
-
 .varname
 {
     color: #400000;
 }
 
-
-div.informaltable table
+span.command strong
 {
-  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;
+    font-weight: normal;
     color: #400000;
 }
 
-div.calloutlist td
+div.calloutlist table
 {
-    padding-bottom: 1em;
+    box-shadow: none;
 }
+
+table
+{
+    border-collapse: collapse;
+    box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
+}
+
+div.affiliation
+{
+    font-style: italic;
+}

maintainers/scripts/copy-tarball.sh

@@ -10,25 +10,25 @@ base="$(basename "$url")"
 if [ -z "$base" ]; then echo "bad URL"; exit 1; fi
 dstPath="$distDir/$base"
 
-if [ -e "$dstPath" ]; then echo "$dstPath already exists"; exit 0; fi
+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 "$dryRun" ]; then exit 0; fi
+    if [ -n "$DRY_RUN" ]; then exit 0; fi
 
     declare -a res
     if ! res=($(PRINT_PATH=1 nix-prefetch-url "$url")); then
-        continue
+        exit
     fi
-    
+
     storePath=${res[1]}
 
 else
     storePath="$file"
 fi
-    
+
 cp $storePath "$dstPath.tmp.$$"
 mv -f "$dstPath.tmp.$$" "$dstPath"
 

maintainers/scripts/copy-tarballs.sh

@@ -8,7 +8,19 @@ urls=$(nix-instantiate --eval-only --xml --strict '<nixpkgs/maintainers/scripts/
 
 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
-    if ! echo "$url" | grep -q -E "\-.*[0-9].*"; then echo "skipping $url"; 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
 

maintainers/scripts/eval-release.nix

@@ -5,7 +5,7 @@
 with import ../../pkgs/lib;
 
 let
-  trace = if (builtins.getEnv "VERBOSE") == "1" then builtins.trace else (x: y: y);
+  trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y);
 
   rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ];
 
@@ -13,7 +13,7 @@ let
   
   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" null;
+  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 (

maintainers/scripts/generate-cpan-package

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

@@ -5,7 +5,6 @@ hydra_eval_jobs \
   --argstr system x86_64-linux \
   --argstr system i686-linux \
   --argstr system x86_64-darwin \
-  --argstr system i686-darwin \
   --argstr system i686-cygwin \
   --argstr system i686-freebsd \
   --arg officialRelease false \

pkgs/applications/audio/abcde/abcde.patch

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

@@ -1,16 +0,0 @@
-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,19 +1,20 @@
-{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, lame
+{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, lame, flac, eject, mkcue
+, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
 
-let version = "2.3.99.6";
+let version = "2.5.4";
 in
   stdenv.mkDerivation {
     name = "abcde-${version}";
     src = fetchurl {
       url = "mirror://debian/pool/main/a/abcde/abcde_${version}.orig.tar.gz";
-      sha256 = "1wl4ygj1cf1d6g05gwwygsd5g83l039fzi011r30ma5lnm763lyb";
+      sha256 = "14g5lsgh53hza9848351kwpygc0yqpvvzp3s923aja77f2wpkdl5";
     };
 
     # FIXME: This package does not support MP3 encoding (only Ogg),
     # nor `distmp3', `eject', etc.
 
-    patches = [ ./install.patch ./which.patch ./cd-paranoia.patch ];
+    patches = [ ./abcde.patch ];
 
     configurePhase = ''
       sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ;
@@ -29,25 +30,37 @@ 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'
+    #   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'
 
       wrapProgram "$out/bin/abcde" --prefix PATH ":" \
         "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin:${id3v2}/bin:${lame}/bin"
 
       wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
         "${wget}/bin"
+
+      wrapProgram "$out/bin/abcde-musicbrainz-tool" --prefix PATH ":" \
+        "${wget}/bin"
     '';
 
     meta = {
-      homepage = http://www.hispalinux.es/~data/abcde.php;
+      homepage = "http://lly.org/~rcw/abcde/page/";
       licence = "GPLv2+";
       description = "A Better CD Encoder (ABCDE)";
 

pkgs/applications/audio/abcde/install.patch

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

@@ -1,16 +0,0 @@
-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,28 +1,30 @@
 { stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl
 , libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs
 , qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon
-, strigi, soprano }:
+, strigi, soprano, qjson, ffmpeg, libofa }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   pname = "amarok";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "0jc8fsrhshgfv441b2dgqk0wz3ms5bzjqchcj5ydxphg57dr3l8y";
+    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 ];
+    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";

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

@@ -0,0 +1,46 @@
+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/amarok/live.nix

@@ -1,37 +0,0 @@
-{ stdenv, fetchgit, fetchgitrevision
-, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl
-, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon
-, strigi, soprano, qca2, libmtp, liblastfm, libgpod, pkgconfig
-, repository ? "git://git.kde.org/amarok"
-, branch ? "heads/master"
-, rev ? fetchgitrevision repository branch
-, src ? fetchgit {
-    url = repository;
-    rev = rev;
-  }
-}:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  pname = "amarok";
-  version = "live";
-
-  inherit src;
-
-  QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
-  buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl
-    libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
-    soprano qca2 libmtp liblastfm libgpod pkgconfig ];
-
-  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) maintainers;
-  };
-}

pkgs/applications/audio/ardour/ardour3.nix

@@ -2,27 +2,31 @@
 , fftwSinglePrec, flac, glib, glibmm, gtk, gtkmm, jackaudio
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
-, libusb, libuuid, libxml2, libxslt, makeWrapper, pango, perl, pkgconfig
-, python }:
+, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
+, perl, pkgconfig, python, serd, sord, sratom, suil }:
 
 let
-  rev = "11483";
+  # Ardour 3 Beta 5
+  rev = "13072";
 in
 
 stdenv.mkDerivation {
   name = "ardour3-svn-${rev}";
 
   src = fetchsvn {
-    url = http://subversion.ardour.org/svn/ardour2/tags/3.0-beta3;
+    url = http://subversion.ardour.org/svn/ardour2/branches/3.0;
     inherit rev;
-    sha256 = "02az11lvfbln475np9jyfkdlrkpp1pszjmk6gl75wq6ws08dd7rd";
+    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 pango perl pkgconfig python ];
+  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

pkgs/applications/audio/audacious/default.nix

@@ -4,19 +4,19 @@
 }:
 
 let
-  version = "3.2.1";
+  version = "3.2.2";
 in
 stdenv.mkDerivation {
   name = "audacious-${version}";
 
   src = fetchurl {
     url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
-    sha256 = "064a8d2887a0f92a1637df9d71b8eefa8064199c04eccfaac725f840cff6eac3";
+    sha256 = "1vj2f3jq67r9wc3s8p51w8338cjhidj3lpxmzyh31lrfikj21766";
   };
 
   pluginsSrc = fetchurl {
     url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
-    sha256 = "5b7d3e52f6b8903bc01ae15651817e990d3348ae6b9734767f354eb2dbfc8c2d";
+    sha256 = "1z5p4ny0kzszaki4f1fgrvcr0q1j6i19847jhplc07nl1rvycdy6";
   };
 
   # `--enable-amidiplug' is to prevent configure from looking in /proc/asound.

pkgs/applications/audio/audacity/default.nix

@@ -4,12 +4,12 @@
   }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.0";
+  version = "2.0.2";
   name = "audacity-${version}";
 
   src = fetchurl {
     url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.bz2";
-    sha256 = "0spbib3f86b4qri0g13idyxvysg28hkpsglmjza681zrln62hjfq";
+    sha256 = "17c7p5jww5zcg2k2fs1751mv5kbadcmgicszi1zxwj2p5b35x2mc";
   };
   buildInputs = [ pkgconfig wxGTK libsndfile expat alsaLib libsamplerate
                   libvorbis libmad flac id3lib ffmpeg gettext ];

pkgs/applications/audio/bristol/default.nix

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

@@ -0,0 +1,25 @@
+{ 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/csound/default.nix

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

@@ -0,0 +1,67 @@
+{ 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/espeak/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, unzip, portaudio }:
 
 stdenv.mkDerivation {
-  name = "espeak-1.44.03";
+  name = "espeak-1.46.02";
   src = fetchurl {
-    url = mirror://sourceforge/espeak/espeak-1.44.03-source.zip;
-    sha256 = "0lnv89xmsq3bax0qpabd0z2adaag7mdl973bkw3gdszidafmfyx4";
+    url = mirror://sourceforge/espeak/espeak-1.46.02-source.zip;
+    sha256 = "1fjlv5fm0gzvr5wzy1dp4nspw04k0bqv3jymha2p2qfjbfifp2zg";
   };
 
   buildInputs = [ unzip portaudio ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   configurePhase = ''
     cd src
-    makeFlags="PREFIX=$out"
+    makeFlags="PREFIX=$out DATADIR=$out/share/espeak-data"
   '';
 
   meta = {

pkgs/applications/audio/espeak/edit.nix

@@ -0,0 +1,31 @@
+{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,24 +1,25 @@
-{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];
+  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";
+      })
+    ];
 
-  patches = [
-    # Fix for building on GCC 4.3.
-    (fetchurl {
-      url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1";
-      sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr";
-    })
-  ];
-  
   meta = {
     homepage = http://flac.sourceforge.net;
+    description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
   };
 }

pkgs/applications/audio/guitarix/default.nix

@@ -0,0 +1,53 @@
+{ 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/jack-capture/default.nix

@@ -0,0 +1,28 @@
+{ 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/lastwatch/default.nix

@@ -0,0 +1,29 @@
+{ 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/linuxsampler/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison
-, jackaudio, libgig, libsndfile, libtool , pkgconfig }:
+, jackaudio, libgig, libsndfile, libtool, lv2, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "linuxsampler-svn-${version}";
@@ -11,13 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7";
   };
 
-  patchPhase = "sed -e 's/which/type -P/g' -i scripts/generate_parser.sh";
+  patches = ./linuxsampler_lv2_sfz_fix.diff;
 
-  preConfigure = "make -f Makefile.cvs";
+  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 pkgconfig 
+   libtool lv2 pkgconfig
   ];
 
   meta = with stdenv.lib; {
@@ -34,7 +37,8 @@ stdenv.mkDerivation rec {
       have questions on the subject, that are not yet covered by the
       FAQ, please contact us.
     ''; 
-    license = licenses.gpl2;
+    license = licenses.proprietary;
     maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }

pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff

@@ -0,0 +1,50 @@
+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/mikmod/default.nix

@@ -0,0 +1,19 @@
+{ 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/ncmpcpp/default.nix

@@ -1,12 +1,12 @@
 {stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  version = "0.5.8";
+  version = "0.5.10";
   name = "ncmpcpp-${version}";
 
   src = fetchurl {
-    url = "http://unkart.ovh.org/ncmpcpp/ncmpcpp-${version}.tar.bz2";
-    sha256 = "1kbkngs4fhf9z53awskqiwdl94i5slvxmjiajkrayi99373fallx";
+    url = "http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2";
+    sha256 = "ff6d5376a2d9caba6f5bb78e68af77cefbdb2f04cd256f738e39f8ac9a79a4a8";
   };
 
   buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ];

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

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

@@ -2,17 +2,17 @@
 , libglademm, libcanberra, intltool, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "pavucontrol-0.9.10";
+  name = "pavucontrol-1.0";
 
   src = fetchurl {
-    url = "http://0pointer.de/lennart/projects/pavucontrol/${name}.tar.gz";
-    sha256 = "0g2sd9smwwpnyq8yc65dl9z0iafj2rrimi8v58wkxx98vhnnvsby";
+    url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz";
+    sha256 = "1plcyrc7p6gqxjhxx2xh6162bkb29wixjrqrjnl9b8g3nrjjigix";
   };
 
   buildInputs = [ pkgconfig pulseaudio gtkmm libsigcxx libglademm libcanberra
     intltool gettext ];
 
-  configureFlags = "--disable-lynx";
+  configureFlags = "--disable-lynx --disable-gtk3";
 
   meta = {
     description = "PulseAudio Volume Control";

pkgs/applications/audio/picard/default.nix

@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, pythonPackages, gettext, pyqt4
+, pkgconfig, libdiscid, libofa, ffmpeg }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "picard-${version}";
+  namePrefix = "";
+  version = "1.1";
+
+  src = fetchurl {
+    url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/${name}.tar.gz";
+    md5 = "57abb76632a423760f336ac11da5c149";
+  };
+
+  buildInputs = [
+    pkgconfig
+    ffmpeg
+    libofa
+    gettext
+  ];
+
+  propagatedBuildInputs = [
+    pythonPackages.mutagen
+    pyqt4
+    libdiscid
+  ];
+
+  configurePhase = ''
+    python setup.py config
+  '';
+
+  buildPhase = ''
+    python setup.py build
+  '';
+
+  installPhase = ''
+    python setup.py install --prefix="$out"
+  '';
+
+  doCheck = false;
+
+  meta = {
+    homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard";
+    description = "The official MusicBrainz tagger";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}

pkgs/applications/audio/praat/default.nix

@@ -0,0 +1,26 @@
+{stdenv, fetchurl, alsaLib, gtk, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "praat-5323";
+  src = fetchurl {
+    url = http://www.fon.hum.uva.nl/praat/praat5323_sources.tar.gz;
+    sha256 = "1m0m5165h74mw5xhmnnyzh5ans3cn78w5rs9572sa1512cams203";
+  };
+
+  configurePhase = ''
+    cp makefiles/makefile.defs.linux makefile.defs
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp praat $out/bin
+  '';
+
+  buildInputs = [ alsaLib gtk pkgconfig ];
+
+  meta = {
+    description = "Doing phonetics by computer";
+    homepage = http://www.fon.hum.uva.nl/praat/;
+    license = "GPLv2+"; # Has some 3rd-party code in it though
+  };
+}

pkgs/applications/audio/qjackctl/default.nix

@@ -1,20 +1,22 @@
 { stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.8";
+  version = "0.3.9";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "1rbipbknq7f8qfma33vwfv2ar3vxkz1p1ykp5mx6nirmcn1nj247";
+    sha256 = "0a4s7lwd5b67qbwv1yck8bw6zz8ffx1gza5fwflfqrfcfl3dds2y";
   };
 
   buildInputs = [ qt4 alsaLib jackaudio dbus ];
 
+  configureFlags = "--enable-jack-version";
+
   meta = {
-    description = "qt jackd control gui tool";
+    description = "A Qt application to control the JACK sound server daemon";
     homepage = http://qjackctl.sourceforge.net/;
     license = "GPL";
   };

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

@@ -1,21 +1,24 @@
 # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
 
-{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo,
-libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate,
-libsndfile, makeWrapper, pulseaudio, qt4, redland, rubberband, vampSDK
+{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo
+, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
+, libsndfile, makeWrapper, pkgconfig, pulseaudio, qt4, redland
+, rubberband, vampSDK 
 }:
 
-stdenv.mkDerivation {
-  name = "sonic-visualiser-1.8";
+stdenv.mkDerivation rec {
+  name = "sonic-visualiser-${version}";
+  version = "1.9";
 
   src = fetchurl {
-    url = http://downloads.sourceforge.net/sv1/sonic-visualiser-1.8.tar.gz;
-    sha256 = "16ik6q9n92wljvnqcv7hyzb9v3yp3ixxp6df9kasf53fii973dh7";
+    url = "http://code.soundsoftware.ac.uk/attachments/download/194/${name}.tar.gz";
+    sha256 = "00igf7j6s8xfyxnlkbqma0yby9pknxqzy8cmh0aw95ix80cw56fq";
   };
 
   buildInputs =
     [ libsndfile qt4 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
       libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
+      pkgconfig
       # optional
       jackaudio
       # portaudio
@@ -46,8 +49,10 @@ stdenv.mkDerivation {
     description = "View and analyse contents of music audio files";
     homepage = http://www.sonicvisualiser.org/;
     license = "GPLv2";
-    maintainers = [ stdenv.lib.maintainers.marcweber 
-      stdenv.lib.maintainers.goibhniu ];
+    maintainers = 
+      [ stdenv.lib.maintainers.marcweber 
+        stdenv.lib.maintainers.goibhniu 
+      ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/audio/spotify/default.nix

@@ -2,7 +2,7 @@
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
-let version = "0.6.6.10"; in
+let version = "0.8.3.278"; in
 
 stdenv.mkDerivation {
   name = "spotify-${version}";
@@ -10,13 +10,13 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then 
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gbd39032.58-1_i386.deb";
-        sha256 = "184wvw2jqihw7bbmd7pgz51nkzvk777imz9pvknv52mggai61523";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g21c7566.632-1_i386.deb";
+        sha256 = "7f587585365498c5182bd7f3beafaf511d883102f5cece66cf84f4f94077765b";
       }
     else if stdenv.system == "x86_64-linux" then 
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gbd39032.58-1_amd64.deb";
-        sha256 = "0qy4dgcl4y8ymqk8i9vgabik7mq0niqpbkwl3sk8z66znax4am4c";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g21c7566.632-1_amd64.deb";
+        sha256 = "a37a13b1c1a8088a811054c732d85b9d6ccf0bd92ad4da75bfee6d70dc344b5e";
       }
     else throw "Spotify not supported on this platform.";
 

pkgs/applications/audio/swh-lv2/default.nix

@@ -0,0 +1,39 @@
+{ stdenv, fetchgit, fftwSinglePrec, libxslt, lv2, pkgconfig }:
+
+let
+  rev = "ec6b85e19e24ed";
+in
+stdenv.mkDerivation rec {
+  name = "swh-lv2-${rev}";
+
+  src = fetchgit {
+    url = "git://github.com/swh/lv2.git";
+    inherit rev;
+    sha256 = "d0d918ee642cd9649215737fcc008ce2bf55f4ea893a1897138b33775ea60d17";
+  };
+
+  patchPhase = ''
+    sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile
+    sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile
+  '';
+
+  buildInputs = [ fftwSinglePrec lv2 pkgconfig ];
+
+  installPhase = "make install-system";
+
+  meta = with stdenv.lib; {
+    homepage = http://plugin.org.uk;
+    description = "LV2 version of Steve Harris' SWH plugins";
+    longDescription = ''
+      SWH plugins include:
+      amp, fast overdrive, overdrive (with colourisation), comb
+      filter, waveshaper, ringmod, divider, diode, decliper, pitch
+      scaler, 16 band equaliser, sinus wavewrapper, hermes filter,
+      chorus, flanger, decimater, oscillator, gverb, phasers, harmonic
+      generators, surround encoders and more.
+    '';
+    license = licenses.gpl3;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}

pkgs/applications/audio/yoshimi/default.nix

@@ -5,11 +5,11 @@ assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   name = "yoshimi-${version}";
-  version = "0.060.10";
+  version = "0.060.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "0y67w7y515hx2bi5gfjgsw1hdah1bdrrvcfmqyjsvn7jbd0q47v1";
+    sha256 = "14javywkw6af9z9c7jr06rzdgzncyaz2ab6f0v0k6bgdndlcgslc";
   };
 
   buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa
@@ -18,13 +18,6 @@ stdenv.mkDerivation  rec {
 
   preConfigure = "cd src";
 
-  patches = [
-    (fetchurl {
-      url = http://patch-tracker.debian.org/patch/series/dl/yoshimi/0.060.10-3/02-fluid_1.3.patch;
-      sha256 = "1sywirbaaw4zhn5ypga27j02qvrvqjwv3lw8kvzyj575q4c4qnri";
-    })
-  ];
-
   cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so" ];
 
   meta = with stdenv.lib; {

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

@@ -1,39 +1,33 @@
-{stdenv, fetchurl, x11, libjpeg, libpng12, libXmu, freetype, pam}:
+{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu
+, fontconfig, freetype, pam, dbus_libs }:
 
 stdenv.mkDerivation rec {
-  name = "slim-1.3.2";
+  name = "slim-1.3.4";
 
   src = fetchurl {
     url = "http://download.berlios.de/slim/${name}.tar.gz";
-    sha256 = "1f42skdp5k1zrb364s3i0ps5wmx9szz9h192i2dkn9az00jh2mpi";
+    sha256 = "00fmrg2v41jnqhx0yc1kv97xxh5gai18n0i4as9g1fcq1i32cp0m";
   };
 
   patches = [
     # Allow the paths of the configuration file and theme directory to
     # be set at runtime.
     ./runtime-paths.patch
-
-    # Fix a bug in slim's PAM support: the "resp" argument to the
-    # conversation function is a pointer to a pointer to an array of
-    # pam_response structures, not a pointer to an array of pointers to
-    # pam_response structures.  Of course C can't tell the difference...
-    ./pam.patch
-
-    # Don't set PAM_RHOST to "localhost", it confuses ConsoleKit
-    # (which assumes that a non-empty string means a remote session).
-    ./pam2.patch
   ];
 
-  buildInputs = [x11 libjpeg libpng12 libXmu freetype pam];
+  buildInputs =
+    [ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype
+      pam dbus_libs
+    ];
 
-  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
+  preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc";
 
-  preBuild = ''
-    substituteInPlace Makefile --replace /usr /no-such-path
-    makeFlagsArray=(CC=gcc CXX=g++ PREFIX=$out MANDIR=$out/share/man CFGDIR=$out/etc USE_PAM=1)
-  '';
+  cmakeFlags = [ "-DUSE_PAM=1" ];
+
+  NIX_CFLAGS_LINK = "-lXmu";
 
   meta = {
     homepage = http://slim.berlios.de;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

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

@@ -1,89 +0,0 @@
-diff -rc slim-1.3.1-orig/app.cpp slim-1.3.1/app.cpp
-*** slim-1.3.1-orig/app.cpp	2008-09-26 02:54:15.000000000 +0200
---- slim-1.3.1/app.cpp	2009-02-17 19:50:06.000000000 +0100
-***************
-*** 41,48 ****
-      Panel* panel = *static_cast<Panel**>(appdata_ptr);
-      int result = PAM_SUCCESS;
-      for (int i=0; i<num_msg; i++){
-!         resp[i]->resp=0;
-!         resp[i]->resp_retcode=0;
-          switch(msg[i]->msg_style){
-              case PAM_PROMPT_ECHO_ON:
-                  // We assume PAM is asking for the username
---- 41,48 ----
-      Panel* panel = *static_cast<Panel**>(appdata_ptr);
-      int result = PAM_SUCCESS;
-      for (int i=0; i<num_msg; i++){
-!         (*resp)[i].resp=0;
-!         (*resp)[i].resp_retcode=0;
-          switch(msg[i]->msg_style){
-              case PAM_PROMPT_ECHO_ON:
-                  // We assume PAM is asking for the username
-***************
-*** 51,63 ****
-                      case Panel::Suspend:
-                      case Panel::Halt:
-                      case Panel::Reboot:
-!                         resp[i]->resp=strdup("root");
-                          break;
-  
-                      case Panel::Console:
-                      case Panel::Exit:
-                      case Panel::Login:
-!                         resp[i]->resp=strdup(panel->GetName().c_str());
-                          break;
-                  }
-                  break;
---- 51,63 ----
-                      case Panel::Suspend:
-                      case Panel::Halt:
-                      case Panel::Reboot:
-!                         (*resp)[i].resp=strdup("root");
-                          break;
-  
-                      case Panel::Console:
-                      case Panel::Exit:
-                      case Panel::Login:
-!                         (*resp)[i].resp=strdup(panel->GetName().c_str());
-                          break;
-                  }
-                  break;
-***************
-*** 73,79 ****
-  
-                      default:
-                          panel->EventHandler(Panel::Get_Passwd);
-!                         resp[i]->resp=strdup(panel->GetPasswd().c_str());
-                          break;
-                  }
-                  break;
---- 73,79 ----
-  
-                      default:
-                          panel->EventHandler(Panel::Get_Passwd);
-!                         (*resp)[i].resp=strdup(panel->GetPasswd().c_str());
-                          break;
-                  }
-                  break;
-***************
-*** 89,97 ****
-      }
-      if (result!=PAM_SUCCESS){
-          for (int i=0; i<num_msg; i++){
-!             if (resp[i]->resp==0) continue;
-!             free(resp[i]->resp);
-!             resp[i]->resp=0;
-          };
-          free(*resp);
-          *resp=0;
---- 89,97 ----
-      }
-      if (result!=PAM_SUCCESS){
-          for (int i=0; i<num_msg; i++){
-!             if ((*resp)[i].resp==0) continue;
-!             free((*resp)[i].resp);
-!             (*resp)[i].resp=0;
-          };
-          free(*resp);
-          *resp=0;

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

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

pkgs/applications/editors/aewan/default.nix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, zlib, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "aewan-${version}";
+  version = "1.0.01";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/aewan/${name}.tar.gz";
+    sha256 = "5266dec5e185e530b792522821c97dfa5f9e3892d0dca5e881d0c30ceac21817";
+  };
+
+  buildInputs = [ zlib ncurses ];
+
+  meta = {
+    description = "Ascii-art Editor Without A Name";
+    homepage = "http://aewan.sourceforge.net/";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}

pkgs/applications/editors/eclipse/default.nix

@@ -49,6 +49,8 @@ let
         # Create desktop item.
         mkdir -p $out/share/applications
         cp ${desktopItem}/share/applications/* $out/share/applications
+        mkdir -p $out/share/pixmaps
+        ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm
       ''; # */
 
       meta = {
@@ -158,6 +160,19 @@ in {
         };
   };
 
-
+  eclipse_sdk_42 = buildEclipse {
+    name = "eclipse-sdk-4.2";
+    description = "Eclipse Classic";
+    src =
+      if stdenv.system == "x86_64-linux" then
+        fetchurl {
+          url = http://eclipse.ialto.com/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk-x86_64.tar.gz;
+          sha256 = "1mlyy90lk08lb2971ynglgi3nqvqfq1k70md2kb39jk160wd1xrk";
+        }
+      else
+        fetchurl {
+          url = http://eclipse.ialto.com/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk.tar.gz;
+          sha256 = "1av6qm9wkbyk123qqf38f0jq4jv2bj9wp6fmpnl55zg6qr463c1w";
+        };
+    };
 }
-

pkgs/applications/editors/ed/default.nix

@@ -8,7 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "18gvhyhwpabmgv4lh21lg8vl3z7acdyhh2mr2kj9g75wksj39pcp";
   };
 
-  doCheck = true;
+  /* FIXME: Tests currently fail on Darwin:
+
+       building test scripts for ed-1.5...
+       testing ed-1.5...
+       *** Output e1.o of script e1.ed is incorrect ***
+       *** Output r3.o of script r3.ed is incorrect ***
+       make: *** [check] Error 127
+
+    */
+  doCheck = !stdenv.isDarwin;
 
   crossAttrs = {
     compileFlags = [ "CC=${stdenv.cross.config}-gcc" ];

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

@@ -9,19 +9,19 @@ assert (libXft != null) -> libpng != null;	# probably a bug
 assert stdenv.isDarwin -> libXaw != null;	# fails to link otherwise
 
 stdenv.mkDerivation rec {
-  name = "emacs-24.0.94";
+  name = "emacs-24.2";
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "http://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.gz";
-    sha256 = "1dgy53dxpnwrn6h3i3z8fpcyasms0wlvhqfyih4cwkz712var393";
+    url = "mirror://gnu/emacs/${name}.tar.bz2";
+    sha256 = "13wbjfjmz13qpjwssy44nw2230lllmkkgjsy0rqfm6am2cf87n3k";
   };
 
-  buildInputs = 
+  buildInputs =
     [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
       libtiff librsvg libXft gconf libxml2 imagemagick gnutls alsaLib
-    ] 
+    ]
     ++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
     ++ stdenv.lib.optional stdenv.isLinux dbus;
 
@@ -45,7 +45,7 @@ EOF
   doCheck = true;
 
   meta = {
-    description = "PRETEST: GNU Emacs 24.x, the extensible, customizable text editor";
+    description = "GNU Emacs 24, the extensible, customizable text editor";
 
     longDescription = ''
       GNU Emacs is an extensible, customizable text editor—and more.  At its
@@ -64,7 +64,7 @@ EOF
       separately.
     '';
 
-    homepage = http://www.gnu.org/software/emacs/;
+    homepage = "http://www.gnu.org/software/emacs/";
     license = "GPLv3+";
 
     maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ];

pkgs/applications/editors/emacs-modes/auto-complete/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, emacs }:
+
+stdenv.mkDerivation rec {
+  name = "auto-complete-1.3.1";
+
+  src = fetchurl {
+    url = "http://cx4a.org/pub/auto-complete/${name}.tar.bz2";
+    sha256 = "124qxfp0pcphwlmrasbfrci48brxnrzc38h4wcf2sn20x1mvcrlj";
+  };
+
+  buildInputs = [ emacs ];
+
+  preInstall = ''
+    install -d $out/share/emacs/site-lisp
+  '';
+
+  installFlags = "DIR=$(out)/share/emacs/site-lisp";
+
+  postInstall = ''
+    ln -s javascript-mode $out/share/emacs/site-lisp/ac-dict/js2-mode
+  '';
+
+  meta = {
+    description = "Auto-complete extension for Emacs";
+    homepage = http://cx4a.org/software/auto-complete/;
+    license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

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

@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, emacs }:
+
+stdenv.mkDerivation rec {
+  name = "coffee-mode-0.4.1";
+
+  src = fetchgit {
+    url = "https://github.com/defunkt/coffee-mode.git";
+    rev = "c45c5f7a529363bc7aa57db0f3df26389fd233d8";
+    sha256 = "36a7792b5ffbcc5a580e8d5b2425494c60a8015cfde0e3f8a946a685da231ce2";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs --batch -f batch-byte-compile coffee-mode.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install coffee-mode.el coffee-mode.elc $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "An Emacs major mode for CoffeeScript, unfancy JavaScript.";
+    homepage = https://github.com/defunkt/coffee-mode;
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/applications/editors/emacs-modes/color-theme/default.nix

@@ -0,0 +1,26 @@
+{stdenv, fetchurl, emacs}:
+
+stdenv.mkDerivation rec {
+  name = "color-theme-6.6.0";
+
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/color-theme/${name}.tar.gz";
+    sha256 = "0yx1ghcjc66s1rl0v3d4r1k88ifw591hf814ly3d73acvh15zlsn";
+  };
+
+  # patches from http://aur.archlinux.org/packages.php?ID=54883
+  patches = [ ./fix-build.patch ./gnus-bug.diff ];
+
+  buildInputs = [ emacs ];
+
+  installFlags = [ "ELISPDIR=$(out)/share/emacs/site-lisp" ];
+  installTargets = "install-bin";
+
+  meta = {
+    description = "An emacs-lisp mode for skinning your emacs.";
+    homepage = http://www.nongnu.org/color-theme;
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch

@@ -0,0 +1,19 @@
+--- a/Makefile	2009-05-15 18:22:49.000000000 +0200
++++ b/Makefile	2009-05-16 08:59:36.000000000 +0200
+@@ -15,6 +15,7 @@
+ TARGET	= $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
+ MANUAL  = color-theme
+ MISC	= AUTHORS COPYING ChangeLog Makefile.defs Makefile $(AUTOLOADFILE).in
++LOADPATH = "$(shell pwd)" "$(shell pwd)/themes"
+ #AUTHORS CREDITS HISTORY NEWS README Makefile ChangeLog \
+ #ChangeLog.2005 ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \
+ #ChangeLog.2001 servers.pl color-theme-auto.in color-theme.texi
+@@ -47,7 +48,7 @@
+ 
+ %.elc: %.el
+ 	@$(EMACS) $(OPTIONCOMPILE) \
+-	--eval '(setq load-path (cons "." load-path))' \
++	--eval '(setq load-path (append load-path (list $(LOADPATH))))' \
+ 	-f batch-byte-compile $<
+ 
+ %.info: %.texi

pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff

@@ -0,0 +1,28 @@
+diff -Naur color-theme-6.6.0.orig/color-theme.el color-theme-6.6.0.new/color-theme.el
+--- color-theme-6.6.0.orig/color-theme.el	2011-11-18 01:17:29.000000000 +0100
++++ color-theme-6.6.0.new/color-theme.el	2011-11-18 01:24:07.000000000 +0100
+@@ -73,9 +73,10 @@
+   "Non-nil if running XEmacs.")
+ 
+ ;; Add this since it appears to miss in emacs-2x
+-(or (fboundp 'replace-in-string)
+-    (defun replace-in-string (target old new)
+-      (replace-regexp-in-string old new  target)))
++(if (fboundp 'replace-in-string)
++    (defalias 'color-theme-replace-in-string 'replace-in-string)
++  (defsubst color-theme-replace-in-string (target old new &optional literal)
++    (replace-regexp-in-string old new target nil literal)))
+ 
+ ;; face-attr-construct has a problem in Emacs 20.7 and older when
+ ;; dealing with inverse-video faces.  Here is a short test to check
+@@ -1626,8 +1627,8 @@
+        (add-to-list 'color-themes
+                     (list ',n
+                           (upcase-initials
+-                           (replace-in-string
+-                            (replace-in-string 
++                           (color-theme-replace-in-string
++                            (color-theme-replace-in-string 
+                              (symbol-name ',n) "^color-theme-" "") "-" " "))
+                           ,author))
+        (defun ,n ()

pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, emacs }:
+
+stdenv.mkDerivation rec {
+  name = "flymake-cursor-0.1.5";
+
+  src = fetchurl {
+    url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el";
+    sha256 = "1qqppd1786w8pl1avjb01n23lwihb7m0hr23abjklsxz03gmp4qz";
+  };
+
+  phases = [ "buildPhase" "installPhase"];
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    cp $src flymake-cursor.el
+    emacs --batch -f batch-byte-compile flymake-cursor.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install flymake-cursor.el flymake-cursor.elc $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Displays flymake error msg in minibuffer after delay.";
+    homepage = http://www.emacswiki.org/emacs/flymake-cursor.el;
+    license = stdenv.lib.licenses.publicDomain;
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

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

@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, emacs, pcache, logito }:
+
+stdenv.mkDerivation rec {
+  name = "gh-0.5.3";
+
+  src = fetchgit {
+    url = "https://github.com/sigma/gh.el.git";
+    rev = "ef03b63d063ec22f03af449aa955c98dfad7f80e";
+    sha256 = "efa231e0091e8c7785385149dc97b2d8dc24aba65f4b0974b8ed7f62b7596ad3";
+  };
+
+  buildInputs = [ emacs ];
+  propagatedUserEnvPkgs = [ pcache logito ];
+
+  patchPhase = ''
+    sed -i Makefile \
+      -e "s|^ *EFLAGS *=|& -L ${pcache}/share/emacs/site-lisp -L ${logito}/share/emacs/site-lisp --eval '(setq user-emacs-directory \"./\")'|" \
+      -e "s|/usr/local|$out|" \
+      -e "s|/site-lisp/\$(PKGNAME)|/site-lisp|"
+  '';
+
+  buildPhase = "make lisp";
+
+  meta = {
+    description = "A (very early) GitHub client library for Emacs";
+    homepage = https://github.com/sigma/gh.el;
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

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

@@ -0,0 +1,36 @@
+{ stdenv, fetchgit, emacs, gh, pcache, logito }:
+
+stdenv.mkDerivation rec {
+  name = "gist-1.0";
+
+  src = fetchgit {
+    url = "https://github.com/sigma/gist.el.git";
+    rev = "bbb457e4eaaf5f96cfaaa4f63021e3e542bfbfed";
+    sha256 = "469f9df52076d0c6038183cff4b9415bca98de66c08814a60b69729b44bdf294";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs -L ${gh}/share/emacs/site-lisp \
+          -L ${pcache}/share/emacs/site-lisp \
+          -L ${logito}/share/emacs/site-lisp \
+          --eval '(setq user-emacs-directory "./")' \
+          --batch -f batch-byte-compile gist.el
+  '';
+
+  propagatedUserEnvPkgs = [ gh pcache logito ];
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install gist.el gist.elc $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Emacs integration for gist.github.com";
+    homepage = https://github.com/sigma/gist.el;
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, emacs }:
+
+stdenv.mkDerivation rec {
+  name = "graphviz-dot-mode-0.3.3";
+
+  src = fetchurl {
+    url = "http://www.graphviz.org/Misc/graphviz-dot-mode.el";
+    sha256 = "6465c18cfaa519a063cf664207613f70b0a17ac5eabcfaa949b3c4c289842953";
+  };
+
+  buildInputs = [ emacs ];
+
+  unpackPhase = ":";
+
+  installPhase = ''
+    mkdir -p "$out/share/emacs/site-lisp"
+    cp -v ${src} "$out/share/emacs/site-lisp/graphviz-dot-mode.el"
+    emacs -batch --eval '(setq load-path (cons "." load-path))' -f batch-byte-compile "$out/share/emacs/site-lisp/graphviz-dot-mode.el"
+  '';
+
+  meta = {
+    homepage = "http://www.graphviz.org/";
+    description = "An emacs mode for the DOT Language, used by graphviz";
+  };
+}

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

@@ -1,12 +1,12 @@
 { stdenv, fetchgit, emacs }:
 
 stdenv.mkDerivation {
-  name = "haskell-mode-2.8.0.29-g7682f99";
+  name = "haskell-mode-2.8.0.29-gae3e4499d2";
 
   src = fetchgit {
     url = "http://github.com/haskell/haskell-mode.git";
-    rev = "7682f991acd63d9400597d5f4980f62d7b1c4c0b";
-    sha256 = "f4508a11fa65ece237c9ee9f623bc4e9ad3d3d58ab2fcacc8ddb080c29aac717";
+    rev = "ae3e4499d27a1468bdf88ffe0ce15cd7e4bb9f2a";
+    sha256 = "29a1725da620c13ff2b3b56906e76dd9f19317eee92bd5750b3aa9a4264effae";
   };
 
   buildInputs = [emacs];

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

@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "htmlize-1.37";
+  name = "htmlize-1.43";
 
   builder = ./builder.sh;
 
   src = fetchurl {
     url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi;
-    sha256 = "70cf41a2ea6a478a45143a8cd672381c01ed894448200e602531acbf2b1fd160";
+    sha256 = "0bdaxh3pjf4z55i7vz4yz3yz45720h8aalhmx13bgkrpijzn93bi";
   };
 
   meta = {

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

@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, emacs }:
+
+stdenv.mkDerivation {
+  name = "jade-mode-0-20120802";
+
+  src = fetchgit {
+    url = "https://github.com/brianc/jade-mode.git";
+    rev = "275ab149edb0f6bcfae6ac17ba456f3351191604";
+    sha256 = "3cd2bebcd66e59d60b8e5e538e65a8ffdfc9a53b86443090a284e8329d7cb09b";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs --batch -L . -f batch-byte-compile *.el
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/emacs/site-lisp
+    cp *.el *.elc $out/share/emacs/site-lisp/
+  '';
+
+  meta = {
+    description = "Emacs major mode for jade and stylus.";
+    homepage = https://github.com/brianc/jade-mode;
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

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

@@ -1,12 +1,12 @@
 { stdenv, fetchgit, emacs }:
 
 stdenv.mkDerivation {
-  name = "js2-mode-0-20120130";
+  name = "js2-mode-0-20120712";
 
   src = fetchgit {
     url = "git://github.com/mooz/js2-mode.git";
-    rev = "4c008b1987aa53769899e24808b6d74b41b4ff40";
-    sha256 = "6af5f52e46ffe85b7610e2db19a96afbef60a6f5374f1c5db3653448e30160be";
+    rev = "f8cb9c52614e0a8e477f1ac557585ed950246c9b";
+    sha256 = "37055b7e8c1d9eee6b86f6b9b9d74ad196cc43701bc2263ffd539a3e44025047";
   };
 
   buildInputs = [ emacs ];

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

@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, emacs }:
+
+stdenv.mkDerivation rec {
+  name = "logito-0.1";
+
+  src = fetchgit {
+    url = "https://github.com/sigma/logito.git";
+    rev = "824acb89d2cc18cb47281a4fbddd81ad244a2052";
+    sha256 = "b9a7433417eafc5bc158f63dddf559b2044368eb3061f0264169de319c68fe4a";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs --batch -f batch-byte-compile logito.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install logito.el logito.elc $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "tiny logging framework for Emacs";
+    homepage = https://github.com/sigma/logito;
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, emacs }:
+
+stdenv.mkDerivation rec {
+  name = "lorem-ipsum-0.1";
+
+  src = fetchurl {
+    url = "http://www.emacswiki.org/emacs/download/lorem-ipsum.el";
+    sha256 = "122d0z3xqfaikgk34l7bh989mfxddin2ljinysp2lqw8djfi7jsl";
+  };
+
+  phases = [ "buildPhase" "installPhase"];
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    cp $src lorem-ipsum.el
+    emacs --batch -f batch-byte-compile lorem-ipsum.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install lorem-ipsum.el lorem-ipsum.elc $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Insert dummy pseudo Latin text for emacs.";
+    homepage = http://www.emacswiki.org/emacs/LoremIpsum;
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

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

@@ -1,22 +1,32 @@
-{ stdenv, fetchurl, emacs, texinfo }:
+{ stdenv, fetchurl, emacs, texinfo, unzip }:
 
 let
-  version = "1.1.1";
+  version = "1.2.0";
 in
 stdenv.mkDerivation {
   name = "magit-${version}";
 
   src = fetchurl {
-    url = "http://github.com/downloads/magit/magit/magit-${version}.tar.gz";
-    sha256 = "0zp5qxippmalin2fr73w2alf2w7ilcahmybzdvgn4ch2s3dgvzcz";
+    url = "https://github.com/magit/magit/zipball/${version}";
+    sha256 = "1877s8ikvcb457mmljmw366h6pgg4zzx98qfazhqj8snl4yqsj4i";
+    name = "magit-${version}.zip";
   };
 
-  buildInputs = [emacs texinfo];
+  buildInputs = [ emacs texinfo unzip ];
 
   configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )";
 
+  # Add (require 'magit-site-init) to your ~/.emacs file to set-up magit mode.
+  postInstall = ''
+    mv $out/etc/emacs/site-start.d/50magit.el $out/share/emacs/site-lisp/magit-site-init.el
+    sed -i -e 's|50magit|magit-site-init|' $out/share/emacs/site-lisp/magit-site-init.el
+    rmdir $out/etc/emacs/site-start.d $out/etc/emacs $out/etc
+  '';
+
   meta = {
+    homepage = "https://github.com/magit/magit";
     description = "Magit, an Emacs interface to Git";
+    license = "GPLv3+";
 
     longDescription = ''
       With Magit, you can inspect and modify your Git repositories with
@@ -30,8 +40,6 @@ stdenv.mkDerivation {
       save you from learning Git itself.
     '';
 
-    license = "GPLv3+";
-    homepage = "https://github.com/magit/magit";
     platforms = stdenv.lib.platforms.all;
     maintainers = with stdenv.lib.maintainers; [ simons ludo ];
   };

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

@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/emacs/site-lisp
-cd $out/emacs/site-lisp
-tar xvfz $src
-mv nxml-mode-*/* .
-rmdir nxml-mode-*

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

@@ -1,8 +0,0 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "nxml-mode-20041004";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nixos.org/tarballs/nxml-mode-20041004.tar.gz;
-    md5 = "ac137024cf337d6f11d8ab278d39b4db";
-  };
-}

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

@@ -1,30 +1,24 @@
-{ fetchurl, stdenv, emacs, texinfo, which }:
+{ fetchurl, stdenv, emacs, texinfo, which, texLive }:
 
 stdenv.mkDerivation rec {
-  name = "org-7.8.03";
+  name = "org-7.9.1";
 
   src = fetchurl {
     url = "http://orgmode.org/${name}.tar.gz";
-    sha256 = "49357cca7d892e70cd2dfcc0b5d96d9fd164ef5a1f251ace3865ecb27dc1e958";
+    sha256 = "0kz1dnzfpmmslwal150z9rxrnddjpaw2glx26qihpxzs0zzpw201";
   };
 
-  buildInputs = [ emacs texinfo ];
-
-  patchPhase =
-    '' sed -i "lisp/org-clock.el" -e's|"which"|"${which}/bin/which"|g'
-    '';
+  buildInputs = [ emacs ];
+  buildNativeInputs = [ texinfo texLive ];
 
   configurePhase =
-    '' sed -i Makefile \
-           -e "s|^prefix=.*$|prefix=$out|g"
+    '' sed -i mk/default.mk \
+           -e "s|^prefix\t=.*$|prefix=$out|g"
     '';
 
-  #XXX: fails because of missing UTILITIES/manfull.pl, currently not
-  # included in the release tarball, but git.
-
-  #postBuild =
-  #  '' make doc
-  #  '';
+  postBuild =
+    '' make doc
+    '';
 
   installPhase =
     '' make install install-info

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

@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, emacs, xmlRpc }:
+
+stdenv.mkDerivation rec {
+  name = "org2blog-0.5";
+
+  src = fetchgit {
+    url = https://github.com/punchagan/org2blog.git;
+    rev = "338abe30e9bc89684f8384f8deaf826b63844da6";
+    sha256 = "46ab31e90d0d54071c126b7d5599a3e82062baa79ddf26b988bcb88d306d6827";
+  };
+
+  buildInputs = [ emacs ];
+  propagatedUserEnvPkgs = [ xmlRpc ];
+
+  buildPhase = ''
+    emacs -L . -L ${xmlRpc}/share/emacs/site-lisp --batch -f batch-byte-compile *.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install *.el* $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "A tool to publish directly from Emacs’ org-mode to WordPress blogs.";
+    homepage = https://github.com/punchagan/org2blog;
+    license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

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

@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, emacs }:
+
+stdenv.mkDerivation rec {
+  name = "pcache-0.2.3";
+
+  src = fetchgit {
+    url = "https://github.com/sigma/pcache.git";
+    rev = "fa8f863546e2e8f2fc0a70f5cc766a7f584e01b6";
+    sha256 = "f7cdad5a729b24f96ec69db4adfd19daf45c27aaf3a0267385b252cb2e59daa0";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs --batch -f batch-byte-compile pcache.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install pcache.el pcache.elc $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Persistent caching for Emacs";
+    homepage = https://github.com/sigma/pcache.el;
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

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

@@ -22,6 +22,9 @@ stdenv.mkDerivation (rec {
        # @image{ProofGeneral} fails, so remove it.
        sed -i '94d' doc/PG-adapting.texi
        sed -i '101d' doc/ProofGeneral.texi
+
+       # Emacs 24 compatibility.
+       sed -i 's|interactive-p|called-interactively-p '\'''any|' isar/isabelle-system.el generic/proof-{menu,script,splash}.el lib/scomint.el
     '';
 
   preBuild = ''

pkgs/applications/editors/emacs-modes/rect-mark/default.nix

@@ -0,0 +1,32 @@
+{stdenv, fetchurl, emacs}:
+
+stdenv.mkDerivation rec {
+  name = "rect-mark-1.4";
+
+  src = fetchurl {
+    url = "http://emacswiki.org/emacs/download/rect-mark.el";
+    sha256 = "0pyyg53z9irh5jdfvh2qp4pm8qrml9r7lh42wfmdw6c7f56qryh8";
+  };
+
+  phases = [ "buildPhase" "installPhase"];
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    cp $src rect-mark.el
+    emacs --batch -f batch-byte-compile rect-mark.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install rect-mark.el* $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Mark a rectangle of text with highlighting.";
+    homepage = http://emacswiki.org/emacs/RectangleMark;
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix

@@ -0,0 +1,30 @@
+{stdenv, fetchgit, emacs}:
+
+stdenv.mkDerivation rec {
+  name = "sunrise-commander-6r435";
+
+  src = fetchgit {
+    url = https://github.com/escherdragon/sunrise-commander.git;
+    rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1";
+    sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs -L . --batch -f batch-byte-compile *.el
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/emacs/site-lisp
+    install *.el* $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Two-pane file manager for Emacs based on Dired and inspired by MC.";
+    homepage = http://www.emacswiki.org/emacs/Sunrise_Commander;
+    license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/applications/editors/emacs-modes/xml-rpc/default.nix

@@ -0,0 +1,32 @@
+{stdenv, fetchurl, emacs}:
+
+stdenv.mkDerivation rec {
+  name = "xml-rpc-1.6.8";
+
+  src = fetchurl {
+    url = https://launchpadlibrarian.net/40270196/xml-rpc.el;
+    sha256 = "0i8hf90yhrjwqrv7q1f2g1cff6ld8apqkka42fh01wkdys1fbm7b";
+  };
+
+  phases = [ "buildPhase" "installPhase"];
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    cp $src xml-rpc.el
+    emacs --batch -f batch-byte-compile xml-rpc.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install xml-rpc.el* $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "An elisp implementation of clientside XML-RPC.";
+    homepage = https://launchpad.net/xml-rpc-el;
+    license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/applications/editors/geany/default.nix

@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool }:
+
+let
+  version = "1.22";
+in
+
+stdenv.mkDerivation rec {
+  name = "geany-${version}";
+
+  src = fetchurl {
+    url = "http://download.geany.org/${name}.tar.gz";
+    md5 = "1cb7f6cea8e301c416211786cec474fa";
+  };
+
+  buildInputs = [ gtk2 which pkgconfig intltool ];
+
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
+  # It have no reasons to exist in a redistribuable package
+  postInstall = "rm $out/share/icons/hicolor/icon-theme.cache";
+
+  meta = {
+    description = "A GTK2 small and ligthweight IDE.";
+    longDescription = ''
+      Geany is a small and lightweight Integrated Development Environment.
+      It was developed to provide a small and fast IDE, which has only a few dependencies from other packages.
+      Another goal was to be as independent as possible from a special Desktop Environment like KDE or GNOME.
+      Geany only requires the GTK2 runtime libraries.
+      Some basic features of Geany:
+      - Syntax highlighting
+      - Code folding
+      - Symbol name auto-completion
+      - Construct completion/snippets
+      - Auto-closing of XML and HTML tags
+      - Call tips
+      - Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal (full list)
+      - Symbol lists
+      - Code navigation
+      - Build system to compile and execute your code
+      - Simple project management
+      - Plugin interface
+    '';
+    homepage = "http://www.geany.org/";
+    license = "GPL";
+    maintainers = [ stdenv.lib.maintainers.bbenoist ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/applications/editors/gobby/default.nix

@@ -9,10 +9,10 @@ let
   
 in stdenv.mkDerivation rec {
 
-  name = "gobby-0.4.93";
+  name = "gobby-0.4.94";
   src = fetchurl {
     url = "http://releases.0x539.de/gobby/${name}.tar.gz";
-    sha256 = "1zk6p0kdp9vcvrr3kx0kw106ln309hd7bbsq8li1g0pcnkgrf4q4";
+    sha256 = "b9798808447cd94178430f0fb273d0e45d0ca30ab04560e3790bac469e03bb00";
   };
 
   buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ]

pkgs/applications/editors/hexedit/default.nix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "hexedit-${version}";
+  version = "1.2.12";
+
+  src = fetchurl {
+    url = "http://rigaux.org/${name}.src.tgz";
+    sha256 = "bcffbf3d128516cc4e1da64485866fbb5f62754f2af8327e7a527855186ba10f";
+  };
+
+  buildInputs = [ ncurses ];
+
+  meta = {
+    description = "View and edit files in hexadecimal or in ASCII";
+    homepage = "http://prigaux.chez.com/hexedit.html";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}

pkgs/applications/editors/jedit/default.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "jedit-4.4.2";
 
   src = fetchurl {
-    url = mirror://sf/jedit/jedit4.4.2source.tar.bz2;
+    url = mirror://sourceforge/jedit/jedit4.4.2source.tar.bz2;
     sha256 = "5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb";
   };
 

pkgs/applications/editors/jedit/wrapper.nix

@@ -1,18 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-    name = jedit.name+"_startscript";
-
-    java = jre+"/bin/java";
-    jeditjar = jedit+"/lib/jedit.jar";
-
-    phases = "buildPhase";
-
-    buildPhase = "
-mkdir -p \$out/bin
-cat > \$out/bin/${jedit.name} << EOF
-#!/bin/sh
-exec $java -jar $jeditjar \\$*
-EOF
-  chmod +x \$out/bin/${jedit.name}
-";
-}

pkgs/applications/editors/joe/default.nix

@@ -1,10 +1,11 @@
 {stdenv, fetchurl} :
 
-stdenv.mkDerivation {
-  name = "joe-3.3";
+stdenv.mkDerivation rec {
+  name = "joe-3.7";
+
   src = fetchurl {
-    url = mirror://sourceforge/joe-editor/joe-3.3.tar.gz;
-    md5 = "02221716679c039c5da00c275d61dbf4";
+    url = "mirror://sourceforge/joe-editor/${name}.tar.gz";
+    sha256 = "0vqhffdjn3xwsfa383i6kdrpfwilq8b382ljjhy1v32smphmdr6a";
   };
 
   meta = {

pkgs/applications/editors/kdevelop/default.nix

@@ -3,18 +3,26 @@
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "4.3.0";
+  version = "4.3.1";
   pname = "kdevelop";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "0vb2f5922r1da4va8sx2qn2i1lf2gqg7nfg594kncy98a9b1avnr";
+    sha256 = "0015hv39rqhyq1w6jw65lx7ls4l5pc3a2asvd5zsd65831vrfxxs";
   };
 
   buildInputs = [ kdevplatform kdebase_workspace okteta ];
 
   buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
 
+  patches =
+    [ ( fetchurl {
+        url = https://git.reviewboard.kde.org/r/105211/diff/raw/;
+        name = "okteta-0.9.patch"; # fixes build with KDE-4.9.x
+        sha256 = "1mvqhw7jr1vi66l3jgam3slyfafcvwy4g3iapfi69dpfnzhmcxl0";
+      } )
+    ];
+
   NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
 
   meta = with stdenv.lib; {

pkgs/applications/editors/kile/default.nix

@@ -1,16 +1,19 @@
 {stdenv, fetchurl, kdelibs, cmake, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "kile-2.1";
+  name = "kile-2.1.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/kile/${name}.tar.bz2";
-    sha256 = "0ag6ya0625w34hpk0bpkjyi0ydw699zbkf86vwc19mh9cb0n0aic";
+    sha256 = "0nx5fmjrxrndnzvknxnybd8qh15jzfxzbny2rljq3amjw02y9lc2";
   };
 
   buildNativeInputs = [ cmake gettext ];
   buildInputs = [ kdelibs ];
 
+  # for KDE 4.7 the nl translations fail since kile-2.1.2
+  preConfigure = "rm -r translations/nl";
+
   meta = {
     description = "An integrated LaTeX editor for KDE";
     homepage = http://kile.sourceforge.net;

pkgs/applications/editors/leksah/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "leksah";
-  version = "0.12.0.3";
-  sha256 = "1374ffwban58kabnynacl0fyzs6756kd5q1lcfya46mp26l7syrd";
+  version = "0.12.1.3";
+  sha256 = "1w61wnd0nq9iqh0pwn9dz3m4qn3m0zasv0m3ki4k7plcdrmkqb3y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/applications/editors/monodevelop/default.nix

@@ -2,7 +2,7 @@
 , gtkmozembedsharp, monodoc
 , perl, perlXMLParser, pkgconfig
 , glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome
-, mozilla
+, mozilla, makeWrapper
 }:
 
 stdenv.mkDerivation {
@@ -14,8 +14,6 @@ stdenv.mkDerivation {
     md5 = "8c33df5629b0676b7ab552854c1de6fd";
   };
 
-  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
-  
   patches = [./prefix.patch];
   
   buildInputs = [
@@ -24,5 +22,5 @@ stdenv.mkDerivation {
     gtkmozembedsharp monodoc
   ];
   
-  inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp;
+  inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp makeWrapper;
 }

pkgs/applications/editors/monodoc/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, mono, gtksharp, pkgconfig}:
+{stdenv, fetchurl, mono, gtksharp, pkgconfig, makeWrapper}:
 
 stdenv.mkDerivation {
   name = "monodoc-1.0.6";
@@ -9,9 +9,7 @@ stdenv.mkDerivation {
     md5 = "f2fc27e8e4717d90dc7efa2450625693";
   };
 
-  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
-
   buildInputs = [mono gtksharp pkgconfig];
 
-  inherit gtksharp;
+  inherit gtksharp makeWrapper;
 }

pkgs/applications/editors/nano/default.nix

@@ -2,27 +2,16 @@
 
 stdenv.mkDerivation (rec {
   pname = "nano";
-  version = "2.2.3";
+  version = "2.2.6";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.gz";
-    sha256 = "1vpl993xrpj8bqi1ayga8fc0j2jag90xp6rqakzwm3bxw71hmwi2";
+    sha256 = "0yp6pid67k8h7394spzw0067fl2r7rxm2b6kfccg87g8nlry2s5y";
   };
-  
+
   buildInputs = [ ncurses gettext ];
-  
-  configureFlags = ''
-    --disable-browser 
-    --disable-help 
-    --disable-justify 
-    --disable-mouse 
-    --disable-operatingdir
-    --disable-speller
-    --disable-tabcomp
-    --disable-wrapping
-  '';
 
   meta = {
     homepage = http://www.nano-editor.org/;

pkgs/applications/editors/nedit/default.nix

@@ -1,6 +1,6 @@
 {stdenv, fetchurl, x11, motif, libXpm}:
 
-assert stdenv.system == "i686-linux";
+assert stdenv.isLinux;
 
 stdenv.mkDerivation {
   name = "nedit-5.5";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   inherit motif;
   buildInputs = [x11 motif libXpm];
 
-  buildFlags = if stdenv.system == "i686-linux" then "linux" else "";
+  buildFlags = if stdenv.isLinux then "linux" else "";
 
   meta = {
     homepage = http://www.nedit.org;

pkgs/applications/editors/netbeans/default.nix

@@ -0,0 +1,41 @@
+{stdenv, fetchurl, jdk, unzip, which, makeWrapper, makeDesktopItem}:
+
+let
+  desktopItem = makeDesktopItem {
+    name = "netbeans";
+    exec = "netbeans";
+    comment = "Integrated Development Environment";
+    desktopName = "Netbeans IDE";
+    genericName = "Integrated Development Environment";
+    categories = "Application;Development;";
+  };
+in
+stdenv.mkDerivation {
+  name = "netbeans-7.2";
+  src = fetchurl {
+    url = http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-ml.zip;
+    sha256 = "18ya1w291hdnc35vb12yqnai82wmqm7351wn82fax12kzha5fmci";
+  };
+  buildCommand = ''
+    # Unpack and copy the stuff
+    unzip $src
+    mkdir -p $out
+    cp -a netbeans $out
+    
+    # Create a wrapper capable of starting it
+    mkdir -p $out/bin
+    makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
+      --prefix PATH : ${jdk}/bin:${which}/bin
+      
+    # Create desktop item, so we can pick it from the KDE/GNOME menu
+    mkdir -p $out/share/applications
+    cp ${desktopItem}/share/applications/* $out/share/applications
+  '';
+  
+  buildInputs = [ unzip makeWrapper ];
+  
+  meta = {
+    description = "An integrated development environment for Java, C, C++ and PHP";
+    maintainers = [ stdenv.lib.maintainers.sander ];
+  };
+}

pkgs/applications/editors/sublime/default.nix

@@ -0,0 +1,39 @@
+{ fetchurl, stdenv, glib, xlibs, cairo, gtk}:
+let
+  libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo];
+in
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+
+stdenv.mkDerivation rec {
+  name = "sublimetext-2.0.1";
+  src = 
+    if stdenv.system == "i686-linux" then
+      fetchurl {
+        name = "sublimetext-2.0.1.tar.bz2";
+        url = http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.1.tar.bz2;
+        sha256 = "1x6vmlfn5mdbf23nyfr7dhhi6y60lnpcmqj59svl3bzvayijsxaf";
+      }
+    else
+      fetchurl {
+        name = "sublimetext-2.0.1.tar.bz2";
+        url = http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.1%20x64.tar.bz2;
+        sha256 = "0174dnp9zika5as25mcls5y0qzhh8mnc5ajxsxz7qjrk4lrzk3c5";
+      };
+  buildCommand = ''
+    tar xvf ${src}
+    mkdir -p $out/bin
+    mv Sublime* $out/sublime
+    ln -s $out/sublime/sublime_text $out/bin/sublime
+
+    echo ${libPath}
+    patchelf \
+      --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+      --set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
+      $out/sublime/sublime_text
+  '';
+
+  meta = {
+    description = "Sublime Text is a sophisticated text editor for code, markup and prose.";
+    license = "unfree";
+  };
+}

pkgs/applications/editors/vbindiff/default.nix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "vbindiff-${version}";
+  version = "3.0_beta4";
+
+  buildInputs = [ ncurses ];
+
+  src = fetchurl {
+    url = "http://www.cjmweb.net/vbindiff/${name}.tar.gz";
+    sha256 = "0gcqy4ggp60qc6blq1q1gc90xmhip1m6yvvli4hdqlz9zn3mlpbx";
+  };
+
+  meta = {
+    description = "A terminal visual binary diff viewer";
+    homepage = "http://www.cjmweb.net/vbindiff/";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}

pkgs/applications/editors/vim/configurable.nix

@@ -46,14 +46,14 @@ composableDerivation {} {
       ;
 
   cfg = {
-    pythonSupport    = getConfig [ "vim" "python" ] true;
-    darwinSupport    = getConfig [ "vim" "darwin" ] false;
-    nlsSupport       = getConfig [ "vim" "nls" ] false;
-    tclSupport       = getConfig [ "vim" "tcl" ] false;
-    multibyteSupport = getConfig [ "vim" "multibyte" ] false;
-    cscopeSupport    = getConfig [ "vim" "cscope" ] false;
+    pythonSupport    = config.vim.python or true;
+    darwinSupport    = config.vim.darwin or false;
+    nlsSupport       = config.vim.nls or false;
+    tclSupport       = config.vim.tcl or false;
+    multibyteSupport = config.vim.multibyte or false;
+    cscopeSupport    = config.vim.cscope or false;
     # add .nix filetype detection and minimal syntax highlighting support
-    ftNixSupport     = getConfig [ "vim" "ftNix" ] true;
+    ftNixSupport     = config.vim.ftNix or true;
   };
 
   #--enable-gui=OPTS     X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon

pkgs/applications/editors/zile/default.nix

@@ -1,16 +1,19 @@
 { fetchurl, stdenv, ncurses, boehmgc, perl, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "zile-2.4.7";
+  name = "zile-2.4.9";
 
   src = fetchurl {
     url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "1ak7qjb7s4whxg8qpkg7yixfnhinwfmzgav7rzi0kjmm93z35xcc";
+    sha256 = "0j801c28ypm924rw3lqyb6khxyslg6ycrv16wmmwcam0mk3mj6f7";
   };
 
   buildInputs = [ ncurses boehmgc ];
   buildNativeInputs = [ help2man perl ];
 
+  # `help2man' wants to run Zile, which fails when cross-compiling.
+  crossAttrs.buildNativeInputs = [];
+
   # Tests can't be run because most of them rely on the ability to
   # fiddle with the terminal.
   doCheck = false;

pkgs/applications/graphics/ImageMagick/default.nix

@@ -3,7 +3,7 @@
 , bzip2
 , freetype
 , graphviz
-, ghostscript
+, ghostscript ? null
 , libjpeg
 , libpng
 , libtiff
@@ -27,16 +27,17 @@ stdenv.mkDerivation rec {
     sha256 = "0m0sa4jxsvm8pf9nfvkzlbzq13d1lj15lfz6jif12l6ywyh2c1cs";
   };
 
-  configureFlags = ''
+  configureFlags = "" + stdenv.lib.optionalString (ghostscript != null && stdenv.system != "x86_64-darwin") ''
     --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts
     --with-gslib
+  '' + ''
     --with-frozenpaths
     ${if librsvg != null then "--with-rsvg" else ""}
   '';
 
   propagatedBuildInputs =
-    [ bzip2 freetype ghostscript libjpeg libpng libtiff libxml2 zlib librsvg
-    libtool jasper libX11 ];
+    [ bzip2 freetype libjpeg libpng libtiff libxml2 zlib librsvg
+    libtool jasper libX11 ] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript;
 
   buildInputs = [ tetex graphviz ];
 
@@ -46,6 +47,8 @@ stdenv.mkDerivation rec {
     '' else "";
 
   meta = {
-    homepage = http://www.imagemagick.org;
+    homepage = http://www.imagemagick.org/;
+    description = "A software suite to create, edit, compose, or convert bitmap images";
+    platforms = stdenv.lib.platforms.linux;
   };
 }