* Fix various broken URLs / mirrors.

* Updated tcpdump, ImageMagick, lsof.

svn path=/nixpkgs/trunk/; revision=19847

doc/coding-conventions.xml

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

doc/language-support.xml

@@ -1,6 +1,6 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="chap-meta">
+         xml:id="chap-language-support">
 
 <title>Support for specific programming languages</title>
 

doc/meta.xml

@@ -124,7 +124,7 @@ interpretation:</para>
 </section>
 
 
-<section><title>Licenses</title>
+<section xml:id="sec-meta-license"><title>Licenses</title>
 
 <note><para>This is just a first attempt at standardising the license
 attribute.</para></note>
@@ -164,6 +164,18 @@ following:
     3 or higher.</para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>bsd</varname></term>
+    <listitem><para>Catch-all for licenses that are essentially
+    similar to <link
+    xlink:href="http://www.gnu.org/licenses/license-list.html#ModifiedBSD">the
+    original BSD license with the advertising clause removed</link>,
+    i.e. permissive non-copyleft free software licenses.  This
+    includes the <link
+    xlink:href="http://www.gnu.org/licenses/license-list.html#X11License">X11
+    (“MIT”) License</link>.</para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>free</varname></term>
     <listitem><para>Catch-all for free software licenses not listed
@@ -176,6 +188,12 @@ following:
     listed above.</para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>free-non-copyleft</varname></term>
+    <listitem><para>Catch-all for free, non-copyleft software licenses
+    not listed above.</para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>unfree-redistributable</varname></term>
     <listitem><para>Unfree package that can be redistributed in binary

doc/package-notes.xml

@@ -11,7 +11,7 @@ Linux kernel or X.org.</para>
 
 <!--============================================================-->
 
-<section>
+<section xml:id="sec-linux-kernel">
 
 <title>Linux kernel</title>
 
@@ -181,7 +181,7 @@ generator.</para>
 
 <screen>
 $ cd pkgs/servers/x11/xorg
-$ cat tarballs-7.4.list extra.list old.list \
+$ cat tarballs-7.5.list extra.list old.list \
   | perl ./generate-expr-from-tarballs.pl
 </screen>
 
@@ -195,7 +195,7 @@ tarballs between runs.  Pay close attention to the <literal>NOT FOUND:
 run, since they may indicate missing dependencies.  (Some might be
 optional dependencies, however.)</para>
 
-<para>A file like <filename>tarballs-7.4.list</filename> contains all
+<para>A file like <filename>tarballs-7.5.list</filename> contains all
 tarballs in a X.org release.  It can be generated like this:
 
 <screen>

doc/quick-start.xml

@@ -25,8 +25,8 @@ $ cd nixpkgs</screen>
     <filename>pkgs/development/libraries/<replaceable>pkgname</replaceable></filename>,
     while a web browser goes into
     <filename>pkgs/applications/networking/browsers/<replaceable>pkgname</replaceable></filename>.
-    See Section XXX for some hints on the tree organisation.  Create a
-    directory for your package, e.g.
+    See <xref linkend="sec-organisation" /> for some hints on the tree
+    organisation.  Create a directory for your package, e.g.
 
 <screen>
 $ svn mkdir pkgs/development/libraries/libfoo</screen>
@@ -147,10 +147,11 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
       <itemizedlist>
 
         <listitem>
-          <para>All <varname>meta</varname> attributes are optional,
-          but it’s still a good idea to provide at least the
-          <varname>description</varname> and
-          <varname>homepage</varname>.</para>
+          <para>All <varname linkend="chap-meta">meta</varname>
+          attributes are optional, but it’s still a good idea to
+          provide at least the <varname>description</varname>,
+          <varname>homepage</varname> and <varname
+          linkend="sec-meta-license">license</varname>.</para>
         </listitem>
 
         <listitem>

doc/release-notes.xml

@@ -5,6 +5,31 @@
 <title>Nixpkgs Release Notes</title>
 
 
+<section><title>Release 0.13 (February 5, 2010)</title>
+
+<para>As always, there are many changes.  Some of the most important
+updates are:
+
+<itemizedlist>
+
+  <listitem><para>Glibc 2.9.</para></listitem>
+
+  <listitem><para>GCC 4.3.3.</para></listitem>
+
+  <listitem><para>Linux 2.6.32.</para></listitem>
+
+  <listitem><para>X.org 7.5.</para></listitem>
+
+  <listitem><para>KDE 4.3.4.</para></listitem>
+
+</itemizedlist>
+
+</para>
+
+
+</section>
+
+
 <section><title>Release 0.12 (April 24, 2009)</title>
 
 <para>There are way too many additions to Nixpkgs since the last

doc/stdenv.xml

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

maintainers/docs/classification.txt

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

maintainers/scripts/copy-tarballs.sh

@@ -2,7 +2,7 @@
 
 distDir=/data/webserver/tarballs
 
-urls=$(nix-instantiate --eval-only --xml --strict pkgs/top-level/build-for-release.nix \
+urls=$(nix-instantiate --eval-only --xml --strict ./eval-release.nix \
     | grep -A2 'name="urls"' \
     | grep '<string value=' \
     | sed 's/.*"\(.*\)".*/\1/' \

maintainers/scripts/dep-licenses.sh

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

maintainers/scripts/eval-release.nix

@@ -0,0 +1,20 @@
+# Evaluate `release.nix' like Hydra would (i.e. call each job
+# attribute with the expected `system' argument).  Too bad
+# nix-instantiate can't to do this.
+
+let
+
+  lib = (import ../.. {}).lib;
+
+  rel = removeAttrs (import ../../pkgs/top-level/release.nix) ["tarball"];
+
+  maybe = x: let y = builtins.tryEval x; in if y.success then y.value else null;
+
+  call = attrs: lib.flip lib.mapAttrs attrs
+    (n: v: builtins.trace n (
+      if builtins.isFunction v then maybe (v { system = "i686-linux"; })
+      else if builtins.isAttrs v then call v
+      else null
+    ));
+
+in call rel

maintainers/scripts/rebuild-amount.sh

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

pkgs/applications/audio/gtkpod/default.nix

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

pkgs/applications/audio/lame/default.nix

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

pkgs/applications/audio/mpc123/default.nix

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

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

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

pkgs/applications/audio/snd/default.nix

@@ -46,12 +46,10 @@ rec {
             '' ["defEnsureDir"];
 
   preBuild = fullDepEntry (''
-		cp config.log /tmp/snd-config.log
 		export NIX_LDFLAGS="$NIX_LDFLAGS -L${args.libX11}/lib -lX11"
-                
             '') ["minInit" "doUnpack" "makeDocsWork"];
 
-  name = "Snd-" + version;
+  name = "snd-" + version;
   meta = {
     description = "Snd sound editor.";
     homepage = http://ccrma.stanford.edu/software/snd;

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

@@ -1,11 +1,12 @@
 # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
 
 args: with args;
+
 stdenv.mkDerivation {
 
 #TODO add plugins!
 
-  name = "sonic-visualizer";
+  name = "sonic-visualizer-1.6";
 
   src = fetchurl {
     url = http://downloads.sourceforge.net/sv1/sonic-visualiser-1.6.tar.bz2;
@@ -19,7 +20,6 @@ stdenv.mkDerivation {
     # portaudio
     pulseaudio
     libmad
-
     libogg # ?
     # fishsound
     liblo
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   '';
 
   meta = { 
-    description = "view and analyse contents of music audio files";
+    description = "View and analyse contents of music audio files";
     homepage = http://www.sonicvisualiser.org/;
     license = "GPLv2";
     maintainers = [args.lib.maintainers.marcweber];

pkgs/applications/audio/xmms/default.nix

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

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

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

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

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

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

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

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

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

pkgs/applications/editors/eclipse/build_with_jdk_compiler

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

pkgs/applications/editors/eclipse/builder.sh

@@ -1,40 +0,0 @@
-source $stdenv/setup
-
-unpackFile $src 
-ensureDir $out
-mv eclipse $out/
-
-# Set the dynamic linker and RPATH.
-rpath=
-for i in $libraries; do
-    rpath=$rpath${rpath:+:}$i/lib
-done
-find $out \( -type f -a -perm +0100 \) \
-    -print \
-    -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-    --set-rpath "$rpath" {} \;
-
-# Make a wrapper script so that the proper JDK is found.
-# don't use makeWrapper in order to change the last line.
-
-ensureDir $out/bin
-cat >> $out/bin/eclipse << EOF
-#! /bin/sh -e
-export PATH=${jdk}/bin\${PATH:+:}\$PATH
-export LD_LIBRARY_PATH=$rpath\${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH
-exec \$(dirname \$0)/../eclipse/eclipse $@
-EOF
-chmod +x $out/bin/eclipse
-
-ensureDir plugin-working-dir
-workingdir="$(pwd)/plugin-working-dir"
-for plugin in $plugins; do
-    if test -e $plugin/install; then
-      cd $workingdir
-      $plugin/install "$out/eclipse"
-      rm -rf $workingdir/*
-    else
-      # assume that it is a file
-      cp $plugin $out/eclipse/plugins
-    fi
-done

pkgs/applications/editors/eclipse/default.nix

@@ -1,37 +1,59 @@
-# recommended installation:
-# nix-build -A eclipsesdk
-# then cp -r $store-path ~/my-eclipse; chmod -R 777 ~/my-eclipse # ugh! I'm to lazy to assign permissions properly
-# maybe also using a wrapper such as this (lower values should suffice for most needs)
-#  eclipseWrapper () {
-#     "$@" -vmargs -Xms2048m -Xmx2048m -XX:MaxPermSize=2048m
-# }
-#
-# Why use a local copy? This way it's easier to use the update manager to get plugins :-)
+{ stdenv, fetchurl, patchelf, makeDesktopItem, makeWrapper
+, freetype, fontconfig, libX11, libXext, libXrender, zlib
+, glib, gtk, libXtst, jre
+}:
 
+assert stdenv ? glibc;
 
-{fetchurl, stdenv, jdk, gtk, glib, libXtst, makeOverridable, plugins ? [], unzip}:
-
-let eclipseFun = 
-  makeOverridable ({name, bindist} :
-    stdenv.mkDerivation {
-      inherit name;
-      builder = ./builder.sh;
-      src = bindist;
-      buildInputs = [ unzip /* unzip required by eclipseCDT */ ];
-      inherit jdk plugins;
-      libraries = [gtk glib libXtst];
-   }); in
-
-  eclipseFun {
-    # you can override these settings usnig .override {...} 
-    name = "eclipse-sdk-3.5M6";
-
-    bindist = 
-      if (stdenv.system == "x86_64-linux") then fetchurl {
-        url = ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/eclipse/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk-x86_64.tar.gz;
-        sha256 = "10p4idp5rcdf7xqwfk3kvmjxhi8x1v835m0y4pn9q4nhfb5643pi";
-      } else fetchurl {
-        url = ftp://mirror.micromata.de/eclipse/eclipse/downloads/drops/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk.tar.gz;
-        sha256 = "1z8j26b632ydhqrmwgbcqgiq7f1a542jam06z2h62mcbqazrcyah";
+stdenv.mkDerivation rec {
+  name = "eclipse-3.5.1";
+  
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz;
+        sha256 = "132zd7q9q29h978wnlsfbrlszc85r1wj30yqs2aqbv3l5xgny1kk";
+      }
+    else
+      fetchurl {
+        url = http://mirrors.linux-bg.org/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk.tar.gz;
+        sha256 = "0a0lpa7gxg91zswpahi6fvg3csl4csvlym4z2ad5cc1d4yvicp56";
       };
-  }
+
+  desktopItem = makeDesktopItem {
+    name = "Eclipse";
+    exec = "eclipse";
+    icon = "eclipse";
+    comment = "Integrated Development Environment";
+    desktopName = "Eclipse IDE";
+    genericName = "Integrated Development Environment";
+    categories = "Application;Development;";
+  };
+
+  buildInputs = [ makeWrapper patchelf ];
+  
+  buildCommand = ''
+    # Unpack tarball
+    ensureDir $out
+    tar xfvz $src -C $out
+    
+    # Patch binaries
+    interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
+    patchelf --set-interpreter $interpreter $out/eclipse/eclipse
+    patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $out/eclipse/libcairo-swt.so
+
+    # Create wrapper script
+    makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
+      --prefix PATH : ${jre}/bin \
+      --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
+    
+    # Create desktop item
+    ensureDir $out/share/applications
+    cp ${desktopItem}/share/applications/* $out/share/applications
+  '';
+
+  meta = {
+    homepage = http://www.eclipse.org/;
+    description = "A extensible multi-language software development environment";
+  };
+}

pkgs/applications/editors/eclipse/eclipse-sdk-3.1.2.nix

@@ -1,18 +0,0 @@
-{fetchurl, stdenv, makeWrapper, jdk, gtk, glib, libXtst, plugins ? []}:
-
-let {
-  body =
-    stdenv.mkDerivation {
-      name = "eclipse-sdk-3.1.2";
-      builder = ./builder.sh;
-      src = bindist;
-      inherit makeWrapper jdk plugins;
-      libraries = [gtk glib libXtst];
-   };
-
-  bindist = 
-    fetchurl {
-      url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-SDK-3.1.2-linux-gtk.tar.gz;
-      md5 = "ece50ed4d6d48dac839bfe8fa719fcff";
-    };
-}

pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix

@@ -1,18 +0,0 @@
-{fetchurl, stdenv, makeWrapper, jdk, gtk, glib, libXtst}:
-
-let {
-  body =
-    stdenv.mkDerivation {
-      name = "eclipse-sdk-3.1";
-      builder = ./builder.sh;
-      src = bindist;
-      inherit makeWrapper jdk;
-      libraries = [gtk glib libXtst];
-   };
-
-  bindist = 
-    fetchurl {
-      url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1-200506271435/eclipse-SDK-3.1-linux-gtk.tar.gz;
-      md5 = "0441c11cc5af1e84ed3be322929899e8";
-    };
-}

pkgs/applications/editors/eclipse/plugins/installers/builder.sh

@@ -1,21 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out
-cat >> $out/install <<EOF
-#! /bin/sh
-
-PLUGIN=$plugin
-UNZIP=$unzip/bin/unzip
-ECLIPSE=\$1
-
-\$UNZIP \$PLUGIN
-
-if test -e plugins; then
-  cp -prd * \$ECLIPSE
-else
-  cd *
-  cp -prd * \$ECLIPSE
-fi
-EOF
-
-chmod u+x $out/install

pkgs/applications/editors/eclipse/plugins/installers/zip.nix

@@ -1,10 +0,0 @@
-{stdenv, unzip, plugin}:
-
-let {
-  body =
-    stdenv.mkDerivation {
-      name = "eclipse-zip-plugin-installer";
-      builder = ./builder.sh;
-      inherit plugin unzip;
-   };
-}

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

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

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

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

pkgs/applications/editors/eclipse/runner.nix

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

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

@@ -1,12 +0,0 @@
-source $stdenv/setup
-
-myglibc=`cat ${NIX_GCC}/nix-support/orig-libc`
-echo "glibc: $myglibc" 
-
-postConfigure() {
-  cp $myglibc/lib/crt1.o src
-  cp $myglibc/lib/crti.o src
-  cp $myglibc/lib/crtn.o src
-}
-
-genericBuild

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

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

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

@@ -1,28 +0,0 @@
-{ xawSupport ? true
-, xpmSupport ? true
-, xaw3dSupport ? false
-, stdenv, fetchurl, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
-}:
-
-assert xawSupport && !xaw3dSupport -> libXaw != null;
-assert xawSupport && xaw3dSupport -> Xaw3d != null;
-assert xpmSupport -> libXpm != null;
-
-stdenv.mkDerivation {
-  name = "emacs-21.4a";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nixos.org/tarballs/emacs-21.4a.tar.gz;
-    md5 = "8f9d97cbd126121bd5d97e5e31168a87";
-  };
-  patches = [./crt.patch];
-  buildInputs = [
-    ncurses x11
-    (if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null)
-    (if xpmSupport then libXpm else null)
-  ];
-
-  meta = {
-    description = "All Hail Emacs, the ultimate editor";
-  };
-}

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

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

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

@@ -15,6 +15,7 @@ assert dbusSupport -> dbus != null;
 assert xaw3dSupport -> Xaw3d != null;
 assert gtkGUI -> pkgconfig != null && gtk != null;
 assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug
+assert stdenv.system == "i686-darwin" -> xawSupport; # fails to link otherwise
 
 stdenv.mkDerivation rec {
   name = "emacs-23.1";

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

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

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

@@ -0,0 +1,19 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation
+{
+  name = "prolog-mode-1.22";
+  src = fetchurl
+  {
+    url = "http://bruda.ca/emacs-prolog/prolog.el";
+    sha256 = "f46915b2436642bb3302cb38cc457d3c121d0c3e95aecdf128fedc2ae5ea0c87";
+  };
+
+  buildCommand = "install -v -D -m644 $src $out/share/emacs/site-lisp/prolog.el";
+
+  meta = {
+    homepage = "http://turing.ubishops.ca/home/bruda/emacs-prolog/";
+    description = "Prolog mode for Emacs";
+    license = "GPL";
+  };
+}

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

@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, emacs, perl }:
+
+let
+  pname = "ProofGeneral";
+  version = "3.7.1.1";
+  name = "${pname}-${version}";
+  website = "http://proofgeneral.inf.ed.ac.uk";
+in
+
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "http://www.cl.cam.ac.uk/research/hvg/Isabelle/dist/contrib/${name}.tar.gz";
+    sha256 = "ae430590d6763618df50a662a37f0627d3c3c8f31372f6f0bb2116b738fc92d8";
+  };
+
+  buildInputs = [ emacs perl ];
+
+  sourceRoot = name;
+
+  postPatch = "EMACS=emacs make clean";
+
+  # Skip building ...
+  buildPhase = "true";
+
+  installPhase = ''
+    DEST=$out/share/emacs/site-lisp/ProofGeneral
+    ensureDir $DEST
+    cp -a * $DEST
+  '';
+
+  meta = {
+    description = "A generic front-end for proof assistants";
+    longDescription = ''
+      Proof General is a generic front-end for proof assistants (also known as
+      interactive theorem provers), based on the customizable text editor Emacs.
+    '';
+    homepage = website;
+    license = "GPL";
+  };
+}

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

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

pkgs/applications/editors/nano/default.nix

@@ -1,13 +1,13 @@
 args: with args;
 stdenv.mkDerivation (rec {
   pname = "nano";
-  version = "2.0.7";
+  version = "2.2.1";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.gz";
-    sha256 = "5dc783c412c4d1ff463c450d2a2f9e1ea53a43d9ba1dda92bbf5182f60db532f";
+    sha256 = "1xqldl7ipsmz5x8q3fw9s6yshxfp39kly96kb15l1kawng1wfcfq";
   };
   buildInputs = [ncurses gettext];
 #  configureFlags = "--enable-tiny";

pkgs/applications/editors/vim/default.nix

@@ -24,9 +24,9 @@ let
 	"ximSupport" "-xim"
 	];
 	configFlags = [
-	"true" " "
+	"true" " --enable-multibyte "
 	"x11Support" " --enable-gui=auto "
-	"hugeFeatures" "--with-features=huge --enable-cscope --enable-multibyte --enable-xsmp "
+	"hugeFeatures" "--with-features=huge --enable-cscope --enable-xsmp "
 	"pythonSupport" " --enable-pythoninterp "
 	"perlSupport" " --enable-perlinterp "
 	"tclSupport" " --enable-tclinterp "

pkgs/applications/editors/zile/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ncurses, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "zile-2.3.12";
+  name = "zile-2.3.13";
 
   src = fetchurl {
     url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "0ff9k9vr7sl463yhz0pi875lyaia02yhmb79dlkj356rdq8213nf";
+    sha256 = "13nvrlns4vjngwjwg110r3djmpwq34q22crr4x8wpzf9c0chp8i4";
   };
 
   buildInputs = [ ncurses help2man ];

pkgs/applications/graphics/ImageMagick/default.nix

@@ -1,13 +1,13 @@
 args: with args;
 
-let version = "6.5.5-6"; in
+let version = "6.5.9-1"; in
 
 stdenv.mkDerivation (rec {
   name = "ImageMagick-${version}";
 
   src = fetchurl {
     url = "mirror://imagemagick/${name}.tar.bz2";
-    sha256 = "1037nsvfpw7wdgsvvzvi0bn1n5d667d8aj1xam7zgmf7xi6xha3q";
+    sha256 = "0a4yhhfqagz28yccydngi31050101jfmq5ljln61g69yy6m47ifg";
   };
 
   configureFlags = ''

pkgs/applications/graphics/autopanosiftc/default.nix

@@ -10,27 +10,6 @@ stdenv.mkDerivation {
 
   buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ];
 
-  # I added these flags to get all the rpaths right, which I guess they are
-  # taken from the qt4 sources. Not very nice.
-  cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" +
-    " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib" +
-    " -lpng12 -lpano13 -ljpeg -ltiff -lz -lxml2 \"" +
-    " -DCMAKE_SKIP_BUILD_RPATH=ON" +
-    " -DCMAKE_BUILD_TYPE=Release" +
-    " -DCMAKE_INSTALL_PREFIX=$out";
-
-  dontUseCmakeConfigure = true;
-
-  # I rewrote the configure phase to get the $out references evaluated in
-  # cmakeFlags
-  configurePhase = ''
-    set -x
-    mkdir -p build;
-    cd build
-    eval -- "cmake .. $cmakeFlags"
-    set +x
-    '';
-
   meta = {
     homepage = http://hugin.sourceforge.net/;
     description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas";

pkgs/applications/graphics/cinepaint/default.nix

@@ -11,8 +11,8 @@ stdenv.mkDerivation {
   src = fetchcvs {
     cvsRoot = ":pserver:anonymous@cinepaint.cvs.sourceforge.net:/cvsroot/cinepaint";
     module = "cinepaint-project";
-    date = "2004-03-01";
-    sha256 = "bf6dc04f3ea2094b7ef6f87f40f2c90d75a557e40a773f8eb76e8a71f14362cf";
+    date = "2008-11-06";
+    sha256 = "f5ac249628ffe04349d1bb3b1e078be0cda7575dd71d12ae74143baa006acb6d";
   };
 
   buildInputs = [ cmake pkgconfig gtk freetype fontconfig lcms fltk flex libtiff
@@ -35,5 +35,7 @@ stdenv.mkDerivation {
     homepage = http://www.cinepaint.org/;
     license = "free";
     description = "Image editor which supports images over 8bpp and ICC profiles";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/applications/graphics/comical/default.nix

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

pkgs/applications/graphics/dia/default.nix

@@ -1,16 +1,19 @@
-{stdenv, fetchurl, gtk, pkgconfig, glib, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt }:
+{stdenv, fetchurl, gtk, pkgconfig, glib, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool }:
 stdenv.mkDerivation {
-  name = "dia-0.96";
+  name = "dia-0.97";
 
   src = fetchurl {
-    url = http://ftp.gnome.org.nyud.net:8080/pub/gnome/sources/dia/0.96/dia-0.96.1.tar.bz2;
-    md5 = "7b81b22baa2df55efe4845865dddc7b6";
+    url = mirror://gnome/sources/dia/0.97/dia-0.97.tar.bz2;
+    sha256 = "0nngdjklap3x1b7cxnwawh29axbwk8siyq7w4iinsns3slmki0wh";
   };
 
-  buildInputs = [gtk glib perl pkgconfig perlXMLParser libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl];
+  buildInputs = [gtk glib perl pkgconfig perlXMLParser libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl intltool];
 
   meta = {
     description = "Gnome Diagram drawing software.";
-    homepage = http://www.gnome.org/projects/dia;
+    homepage = http://live.gnome.org/Dia;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = with stdenv.lib.platforms;
+      linux;
   };
 }

pkgs/applications/graphics/digikam/default.nix

@@ -0,0 +1,25 @@
+{stdenv, fetchurl, kdelibs, exiv2, libXt, libXext, zlib, libjpeg, perl, qt3, 
+  libpng, expat, cmake }:
+
+stdenv.mkDerivation {
+  name = "digikam-1.0.0";
+
+  src = fetchurl {
+    url = mirror://sourceforge/digikam/digikam-1.0.0.tar.bz2;
+    sha256 = "0qblqyjn0vas8hyqn5s9rr401d93cagk53y3j8kch0mr0bk706bk";
+  };
+
+/*
+  configurePhase = ''
+    LDFLAGS="$LDFLAGS -ljpeg" ./configure --without-arts --prefix=$out
+    '';
+*/
+
+  buildInputs = [ kdelibs exiv2 libXt libXext zlib libjpeg perl qt3 libpng expat cmake ];
+
+  meta = {
+    homepage = http://digikam.sourceforge.net/;
+    description = "KDE 3.x photo viewer";
+    # license = "GPLv2+";
+  };
+}

pkgs/applications/graphics/freepv/default.nix

@@ -17,26 +17,6 @@ stdenv.mkDerivation {
     sed -i -e '/mozilla/d' src/CMakeLists.txt
   '';
 
-  # I added these flags to get all the rpaths right, which I guess they are
-  # taken from the qt4 sources. Not very nice.
-  cmakeFlags = " -DCMAKE_EXE_LINKER_FLAGS=\"" +
-    " -lpng12 -lXxf86vm -ljpeg -lz -lglut -lGLU -lxml2 -lX11\"" +
-    " -DCMAKE_SKIP_BUILD_RPATH=ON" +
-    " -DCMAKE_BUILD_TYPE=Release" +
-    " -DCMAKE_INSTALL_PREFIX=$out";
-
-  dontUseCmakeConfigure = true;
-
-  # I rewrote the configure phase to get the $out references evaluated in
-  # cmakeFlags
-  configurePhase = ''
-    set -x
-    mkdir -p build;
-    cd build
-    eval -- "cmake .. $cmakeFlags"
-    set +x
-    '';
-
   meta = {
     description = "Open source panorama viewer using GL";
     homepage = http://freepv.sourceforge.net/;

pkgs/applications/graphics/geeqie/default.nix

@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms
+, intltool, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "geeqie-1.0beta2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/geeqie/${name}.tar.gz";
+    sha256 = "13h924iykmxwgpx562lrsh2j78fnzyyfmg4w7qgj9vbjq18nq7fd";
+  };
+
+  buildInputs = [ pkgconfig gtk libpng exiv2 lcms intltool gettext ];
+
+  meta = {
+    description = "Geeqie, a lightweight GTK+ based image viewer";
+
+    longDescription =
+      '' Geeqie is a lightweight GTK+ based image viewer for Unix like
+         operating systems.  It features: EXIF, IPTC and XMP metadata
+         browsing and editing interoperability; easy integration with other
+         software; geeqie works on files and directories, there is no need to
+         import images; fast preview for many raw image formats; tools for
+         image comparison, sorting and managing photo collection.  Geeqie was
+         initially based on GQview.
+      '';
+
+    license = "GPLv2+";
+
+    homepage = http://geeqie.sourceforge.net;
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;
+  };
+}

pkgs/applications/graphics/gimp/default.nix

@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, gtk, libgtkhtml, freetype
+{ stdenv, fetchurl, pkgconfig, gtk, freetype
 , fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
 , perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl, gegl
 }:
 
-stdenv.mkDerivation {
-  name = "gimp-2.6.6";
+stdenv.mkDerivation rec {
+  name = "gimp-2.6.8";
   
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gimp/v2.6/gimp-2.6.6.tar.bz2;
-    sha256 = "0l875y4krqxxappnbw08s44bp3njjjriwyl8br5wmx25a3x63hjk";
+    url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
+    sha256 = "0cikkb4l6psankz9yhgal934b41nwk6d5a93r9zib413fj5j3m6m";
   };
   
   buildInputs = [
-    pkgconfig gtk libgtkhtml freetype fontconfig
+    pkgconfig gtk freetype fontconfig
     libart_lgpl libtiff libjpeg libpng libexif zlib perl
     perlXMLParser python pygtk gettext intltool babl gegl
   ];

pkgs/applications/graphics/hugin/default.nix

@@ -1,43 +1,24 @@
 {stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost,
-  pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc }:
+  pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa, freeglut,
+ glew, libXmu, libXi }:
 
-stdenv.mkDerivation {
-  name = "hugin-0.7.0";
+stdenv.mkDerivation rec {
+  name = "hugin-2009.4.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/hugin/hugin-0.7.0.tar.gz;
-    sha256 = "0nbrvzz94gqgk2v1900lly101g0wjz4zksnh5718226n2g8zlccf";
+    url = "mirror://sourceforge/hugin/${name}.tar.gz";
+    sha256 = "1xa7rnpwlv68wfkikmlrs74hqylpkh837p3narqljr2a7fxf04r9";
   };
 
-  patches = [ ./levmar-64-bit-alignment.patch ];
+#   patches = [ ./levmar-64-bit-alignment.patch ];
 
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
 
   NIX_LDFLAGS = "-lrt";
 
-  # I added these flags to get all the rpaths right, which I guess they are
-  # taken from the qt4 sources. Not very nice.
-  cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" +
-    " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib" +
-    " -lpng12 -lpano13 -lImath -lIlmImf -lIex -lHalf -lIlmThread" +
-    " -ljpeg -ltiff -lz -lexiv2 -lboost_thread-mt\"" +
-    " -DCMAKE_SKIP_BUILD_RPATH=ON" +
-    " -DCMAKE_BUILD_TYPE=Release" +
-    " -DCMAKE_INSTALL_PREFIX=$out";
+  buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig
+    exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ];
 
-  buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig exiv2 gettext ilmbase ];
-
-  dontUseCmakeConfigure = true;
-
-  # I rewrote the configure phase to get the $out references evaluated in
-  # cmakeFlags
-  configurePhase = ''
-    set -x
-    mkdir -p build;
-    cd build
-    eval -- "cmake .. $cmakeFlags"
-    set +x
-    '';
   postInstall = ''
     ensureDir "$out/nix-support"
     echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages
@@ -47,5 +28,7 @@ stdenv.mkDerivation {
     homepage = http://hugin.sourceforge.net/;
     description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end";
     license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/applications/graphics/inkscape/default.nix

@@ -1,57 +1,50 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "inkscape-0.46";
+  name = "inkscape-0.47";
 
   src = fetchurl {
-    url = "mirror://sf/inkscape/${name}.tar.gz";
-    sha256 = "0flrjqa68vnnn8lrhj86xpa6h2cyzrvjy6873v9id092f86ix1li";
+    url = "mirror://sourceforge/inkscape/${name}.tar.gz";
+    sha256 = "15wvcllq0nj69hkyanzvxbjhlq06cwabqabaa54n5n4307hrp2g5";
   };
 
-  patches = [ ./configure-python-libs.patch ./libpng-setjmp.patch ./gtk-clist.patch ]; 
+  patches = [ ./configure-python-libs.patch ]; 
 
   propagatedBuildInputs = [
     # Python is used at run-time to execute scripts, e.g., those from
     # the "Effects" menu.
-    python pyxml
+    python pyxml lxml
   ];
 
   buildInputs = [
-    pkgconfig perl perlXMLParser gtk libXft fontconfig libpng zlib popt boehmgc
+    pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext
-    makeWrapper
+    makeWrapper intltool gsl
   ];
 
   configureFlags = "--with-python";
 
-  # Fix compilation on glibc 2.9 by adding missing string header
-  preConfigure = ''
-    echo "#include <string.h>" > tmp.cpp
-    cat tmp.cpp src/dom/io/uristream.cpp > src/dom/io/uristream.cpp.new
-    rm tmp.cpp
-    mv src/dom/io/uristream.cpp.new src/dom/io/uristream.cpp
-  '';
-
-  preBuild = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I./extension/script"
-  '';
-
   postInstall = ''
     # Make sure PyXML modules can be found at run-time.
     for i in "$out/bin/"*
     do
       wrapProgram "$i" --prefix PYTHONPATH :      \
-       "$(toPythonPath ${pyxml})" ||  \
+       "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml})" ||  \
         exit 2
     done
   '';
 
+  NIX_LDFLAGS = "-lX11";
+
   meta = {
     license = "GPL";
     homepage = http://www.inkscape.org;
     longDescription = ''
       Inkscape is a feature-rich vector graphics editor that edits
       files in the W3C SVG (Scalable Vector Graphics) file format.
+
+      If you want to import .eps files install ps2edit.
     '';
+
   };
 }

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

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

pkgs/applications/graphics/inkscape/libpng-setjmp.patch

@@ -1,62 +0,0 @@
-Include <png.h> as early as possible to make sure <setjmp.h> is not
-included before it.
-
-See http://thread.gmane.org/gmane.linux.distributions.nixos/1501 .
-
---- inkscape-0.46/src/sp-image.cpp	2008-03-11 05:19:56.000000000 +0100
-+++ inkscape-0.46/src/sp-image.cpp	2009-01-26 15:34:33.000000000 +0100
-@@ -17,6 +17,8 @@
- # include "config.h"
- #endif
- 
-+#include <png.h>
-+
- #include <cstring>
- #include <string>
- #include <libnr/nr-matrix-fns.h>
-@@ -41,7 +43,6 @@
- #include "libnr/nr-matrix-fns.h"
- 
- #include "io/sys.h"
--#include <png.h>
- #if ENABLE_LCMS
- #include "color-profile-fns.h"
- #include "color-profile.h"
-
---- inkscape-0.46/src/dialogs/export.cpp	2008-03-11 05:19:54.000000000 +0100
-+++ inkscape-0.46/src/dialogs/export.cpp	2009-01-26 17:01:13.000000000 +0100
-@@ -20,6 +20,7 @@
- # include "config.h"
- #endif
- 
-+#include <png.h>
- #include <gtk/gtk.h>
- #include <gtkmm/box.h>
- #include <gtkmm/buttonbox.h>
-@@ -60,7 +61,6 @@
- #include "io/sys.h"
- 
- #include "helper/png-write.h"
--#include <png.h>
- 
- 
- #define SP_EXPORT_MIN_SIZE 1.0
-
---- inkscape-0.46/src/main.cpp	2008-03-11 05:20:50.000000000 +0100
-+++ inkscape-0.46/src/main.cpp	2009-01-26 17:57:12.000000000 +0100
-@@ -26,6 +26,7 @@
- #ifdef HAVE_CONFIG_H
- # include "config.h"
- #endif
-+#include <png.h>
- #include "path-prefix.h"
- 
- #include <gtk/gtkmessagedialog.h>
-@@ -111,7 +112,6 @@ using Inkscape::Extension::Internal::Pri
- 
- #include "main-cmdlineact.h"
- 
--#include <png.h>
- #include <errno.h>
- 
- enum {

pkgs/applications/graphics/meshlab/default.nix

@@ -1,21 +1,36 @@
-{stdenv, fetchurl, qt, bzip2}:
+{stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}:
 
-stdenv.mkDerivation {
-  name = "meshlab-1.2.0";
+stdenv.mkDerivation rec {
+  name = "meshlab-1.2.2";
 
   src = fetchurl {
-    url = mirror://sourceforge/meshlab/MeshLabSrc_v120.tgz;
-    sha256 = "0iidp2pzwq96v8zbm8gc67wi1f41anpkncp17ajkv1rrh653nila";
+    url = mirror://sourceforge/meshlab/MeshLabSrc_v122.tar.gz;
+    sha256 = "166a8mx72wf3r84pnpr0ssqkd2xw6y5brviywlj8rjk6w9cy8fdc";
+  };
+
+  srcGlew151 = fetchurl {
+    url = http://dfn.dl.sourceforge.net/sourceforge/glew/glew-1.5.1-src.tgz;
+    sha256 = "02n1p6s6sia92fgng9iq0kqq890rga8d8g0y34mc6qxmbh43vrl9";
+  };
+
+  srcQHull20031 = fetchurl {
+    url = http://www.qhull.org/download/qhull-2003.1.zip;
+    sha256 = "07mh371i6xs691qz6wwzkqk9h0d2dkih2q818is2b041w1l79b46";
   };
 
 
-  setSourceRoot = "sourceRoot=`pwd`/meshlab/src";
+  patchPhase = ''
+    cd meshlab/src
+    mkdir external
+    pushd external
+    tar xf ${srcGlew151}
+    mv glew glew-1.5.1
+    unzip ${srcQHull20031}
+    popd
+  '';
 
   buildPhase = ''
-    pushd external
-    qmake -recursive external.pro
-    make
-    popd
+    pwd
     qmake -recursive meshlabv12.pro
     make
   '';
@@ -28,11 +43,13 @@ stdenv.mkDerivation {
     ln -s $out/opt/meshlab/meshlab $out/bin/meshlab
   '';
 
-  buildInputs = [ qt bzip2 ];
+  buildInputs = [ qt bzip2 lib3ds levmar muparser unzip ];
 
   meta = {
     description = "System for the processing and editing of unstructured 3D triangular meshes";
     homepage = http://meshlab.sourceforge.net/;
     license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/applications/graphics/paraview/default.nix

@@ -1,36 +1,24 @@
 { fetchurl, stdenv, cmake, qt4 }:
 
-stdenv.mkDerivation {
-  name = "paraview-3.4.0";
+stdenv.mkDerivation rec {
+  name = "paraview-3.6.2";
   src = fetchurl {
-    url = http://www.paraview.org/files/v3.4/paraview-3.4.0.tar.gz;
-    sha256 = "27544f442e957e9aa60b32c674f2dcd84fffeecc9a40071ef6e305333413187d";
+    url = "http://www.paraview.org/files/v3.6/${name}.tar.gz";
+    sha256 = "017axalkiaqd13jfbb4awcxvpndnzaq35ys7svm5rnizdwd5hbq6";
   };
 
-  patches = [ ./include-qobject.patch ];
-
-  # I added these flags to get all the rpaths right, which I guess they are
-  # taken from the qt4 sources. Not very nice.
-  cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/paraview-3.4\"" +
-    " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/paraview-3.4" +
-    " -lpng12 -lSM -lICE -lXrender -lXrandr -lXcursor -lXinerama" +
-    " -lXfixes -lfreetype -lfontconfig -lXext -lX11 -lssl -lXt -lz\"" +
-    " -DCMAKE_SKIP_BUILD_RPATH=ON" +
-    " -DCMAKE_BUILD_TYPE=Release" +
-    " -DCMAKE_INSTALL_PREFIX=$out";
-
-  dontUseCmakeConfigure = true;
-
-  # I rewrote the configure phase to get the $out references evaluated in
-  # cmakeFlags
-  configurePhase = ''
-    set -x
-    mkdir -p build;
-    cd build
-    eval -- "cmake .. $cmakeFlags"
-    set +x
-    '';
+  preConfigure = ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.6"
+  '';
 
   buildInputs = [ cmake qt4 ];
+
+  meta = {
+    homepage = "http://www.paraview.org/";
+    description = "3D Data analysis and visualization application";
+    license = "free";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
 }
 

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

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

pkgs/applications/graphics/qtpfsgui/default.nix

@@ -1,27 +1,35 @@
 {stdenv, fetchurl, qt4, exiv2, openexr, fftw, libtiff, ilmbase }:
 
-stdenv.mkDerivation {
-  name = "qtpfsgui-1.9.2";
+stdenv.mkDerivation rec {
+  name = "qtpfsgui-1.9.3";
 
   src = fetchurl {
-    url = mirror://sourceforge/qtpfsgui/qtpfsgui-1.9.2.tar.gz;
-    sha256 = "13kcw760136zpg3b5qhd1sw3kqplicvlsqmy3rxxn5ygm0zfqqj4";
+    url = "mirror://sourceforge/qtpfsgui/${name}.tar.gz";
+    sha256 = "1mlg9dry4mfnnjlnwsw375hzsiagssdhccfmapx5nh6ykqrslsh1";
   };
 
   buildInputs = [ qt4 exiv2 openexr fftw libtiff ];
 
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-
   configurePhase = ''
-    qmake PREFIX=$out EXIV2PATH=${exiv2}/include/exiv2 \
-      OPENEXRDIR=${openexr}/include/OpenEXR \
-      FFTW3DIR=${fftw}/include \
-      LIBTIFFDIR=${libtiff}/include \
+    export CPATH="${ilmbase}/include/OpenEXR:$CPATH"
+    qmake PREFIX=$out EXIV2PATH=${exiv2}/include/exiv2  \
+      OPENEXRDIR=${openexr}/include/OpenEXR             \
+      FFTW3DIR=${fftw}/include                          \
+      LIBTIFFDIR=${libtiff}/include
   '';
 
   meta = {
     homepage = http://qtpfsgui.sourceforge.net/;
-    description = "GUI frontend for some pfstools";
-    license = "GPLv2";
+    description = "Qtpfsqui, a graphical application for high dynamic range (HDR) imaging";
+
+    longDescription =
+      '' Qtpfsgui is an open source graphical user interface application that
+         aims to provide a workflow for high dynamic range (HDR) imaging.
+      '';
+
+    license = "GPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;
   };
 }

pkgs/applications/graphics/rawtherapee/default.nix

@@ -0,0 +1,41 @@
+{ stdenv, fetchsvn, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau,
+libXdmcp, lcms, libiptcdata
+}:
+
+stdenv.mkDerivation rec {
+  name = "rawtherapee-svn-25";
+  
+  src = fetchsvn {
+    url = "http://rawtherapee.googlecode.com/svn/trunk";
+    rev = 25;
+    sha256 = "09jg47rs09lly70x1zlrb3qcwi2rry1m7gjzs39iqzp53hi9j9mh";
+  };
+  
+  buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
+    lcms libiptcdata ];
+
+  # Rawtherapee died if the default setting for the icc directory pointed to a
+  # non existant place
+  patchPhase = ''
+    sed -i s,/usr/share/color/icc,/tmp/, rtgui/options.cc
+  '';
+
+  # Disable the use of the RAWZOR propietary libraries
+  cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
+
+  installPhase = ''
+    ensureDir $out/bin $out/lib
+    cp rtgui/rt $out/bin
+    # Weird kind of path reference
+    cp -r ../release/* $out/bin
+    cp rtengine/*.so $out/lib
+  '';
+
+  meta = {
+    description = "RAW converter and digital photo processing software";
+    homepage = http://www.rawtherapee.com/;
+    license = "GPLv3+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/graphics/rawtherapee/optional-rawzor.patch

@@ -0,0 +1,83 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ cmake_minimum_required(VERSION 2.6)
+ 
++option (WITH_RAWZOR "Build with Rawzor support" ON)
++
+ add_subdirectory (rtexif)
+ add_subdirectory (rtengine)
+ add_subdirectory (rtgui)
+--- a/rtengine/CMakeLists.txt
++++ b/rtengine/CMakeLists.txt
+@@ -9,9 +9,13 @@
+ IF (WIN32)
+     SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../lib; ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win")
+     SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../winclude; ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win")
+-    SET (EXTRA_LIB "ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libiptcdata.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libjpeg.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libpng.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libtiff.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libz.a ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win/rwz_sdk_s.a")
++    SET (EXTRA_LIB "ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libiptcdata.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libjpeg.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libpng.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libtiff.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libz.a")
++    if (WITH_RAWZOR)
+     ADD_DEFINITIONS (-DRAWZOR_SUPPORT)
++    SET (EXTRA_LIB "${EXTRA_LIB} ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win/rwz_sdk_s.a")
++    endif (WITH_RAWZOR)
+ ELSE (WIN32)
++    if (WITH_RAWZOR)
+     IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
+         SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32")
+ 	SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32")
+@@ -19,10 +23,11 @@
+         SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64")
+ 	SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64")
+     ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4)
+-    pkg_check_modules (IPTCDATA REQUIRED libiptcdata)
+-    pkg_check_modules (LCMS REQUIRED lcms)
+     SET (EXTRA_LIB "-lrwz_sdk")
+     ADD_DEFINITIONS (-DRAWZOR_SUPPORT)
++    endif (WITH_RAWZOR)
++    pkg_check_modules (IPTCDATA REQUIRED libiptcdata)
++    pkg_check_modules (LCMS REQUIRED lcms)
+ ENDIF (WIN32)
+ 
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_INCDIR} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS})
+--- a/rtengine/imagedata.cc
++++ b/rtengine/imagedata.cc
+@@ -19,7 +19,9 @@
+ #include <imagedata.h>
+ #include <iptcpairs.h>
+ #include <glib/gstdio.h>
++#ifdef RAWZOR_SUPPORT
+ #include <rwz_sdk.h>
++#endif
+ 
+ using namespace rtengine;
+ 
+--- a/rtengine/myfile.cc
++++ b/rtengine/myfile.cc
+@@ -19,7 +19,9 @@
+ #include <myfile.h>
+ #include <cstdarg>
+ #include <glibmm.h>
++#ifdef RAWZOR_SUPPORT
+ #include <rwz_sdk.h>
++#endif
+ 
+ IMFILE* fopen (const char* fname) {
+ 
+--- a/rtgui/CMakeLists.txt
++++ b/rtgui/CMakeLists.txt
+@@ -75,6 +75,7 @@
+     if (NOT ZLIB_LIBRARIES)
+         message(SEND_ERROR "libz was not found!")
+     endif (NOT ZLIB_LIBRARIES)
++    if (WITH_RAWZOR)
+     IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
+         SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32")
+ 	    SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32")
+@@ -82,6 +83,7 @@
+         SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64")
+ 	    SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64")
+     ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4)
++    endif (WITH_RAWZOR)
+ 
+ include_directories (/usr/local/lib ${CMAKE_CURRENT_SOURCE_DIR}/../rtengine . ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS}
+     ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ${GIOMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS} )

pkgs/applications/graphics/ufraw/default.nix

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

pkgs/applications/graphics/xaos/default.nix

@@ -2,7 +2,7 @@ a :
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "3.4" a; 
+  version = a.lib.attrByPath ["version"] "3.5" a; 
   buildInputs = with a; [
     aalib gsl libpng libX11 xproto libXext xextproto 
     libXt zlib gettext intltool perl
@@ -10,8 +10,8 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/xaos/XaoS-${version}.tar.gz";
-    sha256 = "004cdb0xv14shyixs79bf95s52s7aidr5bqfn9wb49gpasrsknrc";
+    url = "mirror://sourceforge/xaos/xaos-${version}.tar.gz";
+    sha256 = "0hj8sxya4s9rc1m4xvxj00jgiczi3ljf2zvrhx34r3ja2m9af7s7";
   };
 
   inherit buildInputs;
@@ -27,6 +27,8 @@ rec {
       
   name = "xaos-" + version;
   meta = {
+    homepage = http://xaos.sourceforge.net/;
     description = "XaoS - fractal viewer";
+    license = "GPLv2+";
   };
 }

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

@@ -3,13 +3,13 @@
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
-  name = "adobe-reader-9.1.1-1";
+  name = "adobe-reader-9.2-1";
   
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1.1/enu/AdbeRdr9.1.1-1_i486linux_enu.tar.bz2;
-    sha256 = "1j3f7d5s7yfm6vg1628f6as462sbm1ika79v0flq0zgljc111vna";
+    url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.2/enu/AdbeRdr9.2-1_i486linux_enu.tar.bz2;
+    sha256 = "0067w0kjj2c04342g8c9qvcs49kkiqlxn2zyx9qzlg7a32qfc9l2";
   };
 
   # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.

pkgs/applications/misc/audio/sox/default.nix

@@ -2,11 +2,11 @@ args: with args;
 let inherit (args.composableDerivation) composableDerivation edf; in
 composableDerivation {} {
 
-    name = "sox-14.0.0";
+    name = "sox-14.3.0";
 
     src = args.fetchurl {
-      url = mirror://sourceforge/sox/sox-14.0.0.tar.gz;
-      sha256 = "1l7v04nlvb96y0w9crvm6nq8g50yxp3bkv6nb1c205s982inlalc";
+      url = mirror://sourceforge/sox/sox-14.3.0.tar.gz;
+      sha256 = "15r39dq9nlwrypm0vpxmbxyqqv0bd6284djbi1fdfrlkjhf43gws";
     };
 
     flags =
@@ -17,7 +17,12 @@ composableDerivation {} {
     edf { name = "alsa"; enable = { buildInputs = [alsaLib]; }; }
     // edf { name = "libao"; enable = { buildInputs = [libao]; }; }
     // edf { name = "oss"; }
-    // edf { name = "sun_audio"; };
+    // edf { name = "sun_audio"; }
+    // edf { name = "dl-lame"; enable.buildInputs = [ lame ]; } # use shared library
+    // edf { name = "lame";    enable.buildInputs = [ lame ]; }
+    // edf { name = "dl-mad"; enable.buildInputs = [ libmad ]; } # use shared library
+    // edf { name = "mad";    enable.buildInputs =[ libmad ]; }
+    ;
     # These options should be autodetected by the configure script
     /*
     --without-sndfile       Don't try to use libsndfile
@@ -38,7 +43,12 @@ composableDerivation {} {
   cfg = {
     ossSupport = false;
     sun_audioSupport = false;
-  };
+  } // lib.listToAttrs [
+      { name = "dl-lameSupport"; value = true; }
+      { name = "dl-madSupport"; value = true; }
+  ];
+
+  configureFlags = ["-enable-dl-lame"];
 
 
   optionals = [ "libsndfile" "libogg" "flac" "ffmpeg" "libmad" "lame"
@@ -49,6 +59,7 @@ composableDerivation {} {
   meta = {
     description = "Sample Rate Converter for audio";
     homepage = http://www.mega-nerd.com/SRC/index.html;
+    maintainers = [lib.maintainers.marcweber];
     # you can choose one of the following licenses:
     license = [
       "GPL"

pkgs/applications/misc/calibre/default.nix

@@ -0,0 +1,46 @@
+{stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng,
+imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil,
+pil, makeWrapper, unrar}:
+
+stdenv.mkDerivation rec {
+  name = "calibre-0.6.32";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/calibre/${name}.tar.gz";
+    sha256 = "0r646k5yig9y139jpajsr5scwsqjbgyq94klj7f2b8wjw79qpsmz";
+  };
+
+  inherit python;
+
+  buildInputs = [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick
+    libjpeg fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper ];
+
+  installPhase = ''
+    export POPPLER_INC_DIR=${popplerQt4}/include/poppler
+    export POPPLER_LIB_DIR=${popplerQt4}/lib
+    export MAGICK_INC=${imagemagick}/include/ImageMagick
+    export MAGICK_LIB=${imagemagick}/lib
+    export FC_INC_DIR=${fontconfig}/include/fontconfig
+    export FC_LIB_DIR=${fontconfig}/lib
+    export PODOFO_INC_DIR=${podofo}/include/podofo
+    export PODOFO_LIB_DIR=${podofo}/lib
+    python setup.py install --prefix=$out
+
+    PYFILES="$out/bin/* $out/lib/calibre/calibre/web/feeds/*.py
+      $out/lib/calibre/calibre/ebooks/metadata/*.py
+      $out/lib/calibre/calibre/ebooks/rtf2xml/*.py"
+
+    sed -i "s/env python/python/" $PYFILES
+    for a in $out/bin/*; do
+      wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH --prefix LD_LIBRARY_PATH : ${unrar}/lib
+    done
+  '';
+
+  meta = { 
+    description = "Comprehensive e-book software";
+    homepage = http://calibre-ebook.com;
+    license = "GPLv3";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/misc/eaglemode/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, libX11, xineLib, libjpeg, libpng, libtiff }:
 
 stdenv.mkDerivation {
-  name = "eaglemode-0.75";
+  name = "eaglemode-0.76.0";
  
   src = fetchurl {
-    url = mirror://sourceforge/eaglemode/eaglemode-0.75.0.tar.bz2;
-    sha256 = "0iqdf55ff0il5frkl3yq3r27yk9xl30b9ygf3fvrv78a5bzpq8r7";
+    url = mirror://sourceforge/eaglemode/eaglemode-0.76.0.tar.bz2;
+    sha256 = "152v7p9dicm8shwncpcifg4b2l4c61c1qn00469cz38vja67npww";
   };
  
   buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff ];
@@ -20,8 +20,11 @@ stdenv.mkDerivation {
     ln -s $out/eaglemode.sh $out/bin/eaglemode.sh
   '';
  
-  meta = { homepage = "http://eaglemode.sourceforge.net";
-           description = "Zoomable User Interface";
-           license="GPLv3";
-         };
+  meta = {
+    homepage = "http://eaglemode.sourceforge.net";
+    description = "Zoomable User Interface";
+    license="GPLv3";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
 }

pkgs/applications/misc/epdfview/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, gtk, poppler }:
+stdenv.mkDerivation rec {
+  name = "epdfview-0.1.7";
+  src = fetchurl {
+    url = "http://trac.emma-soft.com/epdfview/chrome/site/releases/${name}.tar.bz2";
+    sha256 = "1s2af09ij5jjqryv4dl10flsdk5p953qp94dymn93fnl93rv1yqa";
+  };
+  buildInputs = [ pkgconfig gtk poppler ];
+  meta = {
+    homepage = http://trac.emma-soft.com/epdfview/;
+    description = "A lightweight PDF document viewer using Poppler and GTK+";
+    longDescription = ''
+        ePDFView is a free lightweight PDF document viewer using Poppler and
+        GTK+ libraries. The aim of ePDFView is to make a simple PDF document
+        viewer, in the lines of Evince but without using the Gnome libraries. 
+    '';
+    license = "GPLv2";
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/misc/evince/default.nix

@@ -1,7 +1,7 @@
 { fetchurl, stdenv, perl, perlXMLParser, gettext, intltool
 , pkgconfig, glib, gtk, gnomedocutils, gnomeicontheme
 , libgnome, libgnomeui, scrollkeeper, libxslt
-, libglade, dbus, dbus_glib
+, libglade, gnome_keyring, dbus, dbus_glib
 , poppler, libspectre, djvulibre, shared_mime_info
 , makeWrapper, which
 , recentListSize ? null # 5 is not enough, allow passing a different number
@@ -16,13 +16,11 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    perl perlXMLParser gettext intltool
-    pkgconfig glib gtk gnomedocutils gnomeicontheme
-    libgnome libgnomeui libglade scrollkeeper
+    perl perlXMLParser gettext intltool pkgconfig glib gtk
+    gnomedocutils gnomeicontheme libgnome libgnomeui libglade
+    scrollkeeper gnome_keyring
     libxslt  # for `xsltproc'
-    dbus dbus_glib
-    poppler libspectre djvulibre
-    makeWrapper which
+    dbus dbus_glib poppler libspectre djvulibre makeWrapper which
   ];
 
   configureFlags = "--with-libgnome --enable-dbus --enable-pixbuf "

pkgs/applications/misc/freemind/default.nix

@@ -9,8 +9,6 @@ stdenv.mkDerivation {
 
   buildInputs = [jdk ant];
 
-  inherit jre;
-
   phases="unpackPhase buildPhase installPhase";
 
   buildPhase="ant dist";
@@ -29,13 +27,10 @@ stdenv.mkDerivation {
     sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh
     cat > $out/bin/freemind << EOF
     #!/bin/sh
-    # using pure env has removed the segfault for me :-)
-    exec env -i  sh -c "
-      export PATH=\"${args.coreutils}/bin:${args.gnugrep}/bin\";
-      export DISPLAY=\"\$DISPLAY\";
-      export JAVA_HOME=\"$jre\";
-      export LIBXCB_ALLOW_SLOPPY_LOCK=true;
-      $out/nix-support/dist/freemind.sh"
+    export PATH=${args.coreutils}/bin:${args.gnugrep}/bin:"$PATH"
+    export JAVA_HOME="${jre}"
+    export LIBXCB_ALLOW_SLOPPY_LOCK=true
+    $out/nix-support/dist/freemind.sh
     EOF
 
     chmod +x $out/{bin/freemind,nix-support/dist/freemind.sh}

pkgs/applications/misc/googleearth/default.nix

@@ -1,15 +1,16 @@
 { stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv,
-libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11 }:
+libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11,
+zlib, patchelf05 }:
 
 /* I haven't found any x86_64 package from them */
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
-  name = "googleearth-5.11337.1968";
+  name = "googleearth-5.1.3533.1731";
 
   src = fetchurl {
     url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin;
-    sha256 = "1h090rbdkp3pa97xkkjzj71k343ic8dlngj2cihw5cd1hh3f9idc";
+    sha256 = "1sxs1nwb2zh2j8dbwm65r04byn66yn79kpzhilhswly6r8d7yivg";
   };
 
   buildInputs = [
@@ -29,6 +30,7 @@ stdenv.mkDerivation {
     freetype 
     libXext 
     libX11 
+    zlib
   ];
 
   phases = "unpackPhase installPhase";
@@ -40,8 +42,6 @@ stdenv.mkDerivation {
     ensureDir $out/{opt/googleearth/,bin};
     tar xf googleearth-data.tar -C $out/opt/googleearth
     tar xf googleearth-linux-x86.tar -C $out/opt/googleearth
-    rm $out/opt/googleearth/libstdc+*
-    rm $out/opt/googleearth/libgcc*
     cp bin/googleearth $out/opt/googleearth
     cat > $out/bin/googleearth << EOF
     #!/bin/sh
@@ -55,18 +55,19 @@ stdenv.mkDerivation {
       fullPath=$fullPath:$i/lib
     done
           
-    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+    ${patchelf05}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
       --set-rpath $fullPath \
       $out/opt/googleearth/googleearth-bin
 
     for a in $out/opt/googleearth/*.so* ; do
-      patchelf --set-rpath $fullPath $a
+      ${patchelf05}/bin/patchelf --set-rpath $fullPath $a
     done
   '';
 
   meta = {
-      description = "A world sphere viewer";
-      homepage = http://earth.google.com;
-      license = "unfree";
+    description = "A world sphere viewer";
+    homepage = http://earth.google.com;
+    license = "unfree";
+    maintainers = [ stdenv.lib.maintainers.viric ];
   };
 }

pkgs/applications/misc/grip/default.nix

@@ -15,6 +15,6 @@ stdenv.mkDerivation {
     homepage = http://nostatic.org/grip;
     license = "GPLv2";
     maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    #platforms = args.lib.platforms.linux;
   };
 }

pkgs/applications/misc/gv/default.nix

@@ -1,18 +1,18 @@
 { stdenv, fetchurl, Xaw3d, ghostscriptX }:
 
 stdenv.mkDerivation rec {
-  name = "gv-3.6.7";
+  name = "gv-3.6.8";
 
   src = fetchurl {
     url = "mirror://gnu/gv/${name}.tar.gz";
-    sha256 = "1cdkkxamsicpk0jdbrkjpxhcsrx0b82kqgrc4j407q2gc3qs8wgf";
+    sha256 = "1i86a4wfswp908gp4i0f6jbksn8bqqzkfy58r9ishspzkp2fb510";
   };
 
   buildInputs = [ Xaw3d ghostscriptX ];
-  
+
   patchPhase = ''
-    sed 's|\<gs\>|${ghostscriptX}/bin/gs|g' -i src/*.in
-    sed 's|"gs"|"${ghostscriptX}/bin/gs"|g' -i src/*.c
+    sed 's|\<gs\>|${ghostscriptX}/bin/gs|g' -i "src/"*.in
+    sed 's|"gs"|"${ghostscriptX}/bin/gs"|g' -i "src/"*.c
   '';
 
   doCheck = true;
@@ -28,5 +28,7 @@ stdenv.mkDerivation rec {
     '';
 
     license = "GPLv3+";
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }

pkgs/applications/misc/hello/ex-2/default.nix

@@ -1,13 +1,13 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "hello-2.3";
+  name = "hello-2.3x26";
   
   src = fetchurl {
     url = mirror://gnu/hello/hello-2.3.tar.bz2;
     sha256 = "0c7vijq8y68bpr7g6dh1gny0bff8qq81vnp4ch8pjzvg56wb3js1";
   };
-  
+
   meta = {
     description = "A program that produces a familiar, friendly greeting";
     longDescription = ''

pkgs/applications/misc/ikiwiki/default.nix

@@ -0,0 +1,51 @@
+{stdenv, fetchurl, perl, gettext, makeWrapper, lib,
+  TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate,
+  CGISession, CGIFormBuilder, DBFile
+  , git ? null
+  , monotone ? null
+  , extraUtils ? []
+  }:
+
+stdenv.mkDerivation rec {
+  name = "ikiwiki_3.20100102.3";
+
+  src = fetchurl {
+    url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}.tar.gz";
+    sha256 = "0vb54z7hwb6iwd0j96vhr8ypzwc8l4hd98wbp5wsxkx5bgc38nsp";
+  };
+
+  buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
+    TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder ]
+    ++
+    (lib.optional (monotone != null) monotone)
+    ;
+
+  patchPhase = ''
+    sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man
+    sed -i s@/etc/ikiwiki@$out/etc@ Makefile.PL
+    sed -i /ENV{PATH}/d ikiwiki.in
+    # State the gcc dependency, and make the cgi use our wrapper
+    sed -i -e 's@$0@"'$out/bin/ikiwiki'"@' \
+        -e "s@'cc'@'${stdenv.gcc}/bin/gcc'@" IkiWiki/Wrapper.pm
+  '';
+
+  configurePhase = "perl Makefile.PL PREFIX=$out";
+
+  postInstall = ''
+    for a in $out/bin/*; do
+      wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin \
+      ${lib.optionalString (git != null) 
+        ''--prefix PATH : ${git}/bin \''}
+      ${lib.optionalString (monotone != null) 
+        ''--prefix PATH : ${monotone}/bin \''}
+      ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
+
+    done
+  '';
+
+  meta = { 
+    description = "Wiki compiler, storing pages and history in a RCS";
+    homepage = http://ikiwiki.info/;
+    license = "GPLv2+";
+  };
+}

pkgs/applications/misc/kbasket/default.nix

@@ -0,0 +1,23 @@
+{stdenv, fetchurl, kdelibs, x11, zlib, libpng, libjpeg, perl, qt3, gpgme,
+libgpgerror}:
+
+stdenv.mkDerivation {
+  name = "kbasket-1.0.3.1";
+  
+  src = fetchurl {
+    url = http://basket.kde.org/downloads/basket-1.0.3.1.tar.gz;
+    sha256 = "1dgghxmabc3bz1644p6dfnjdjbm80jj6fh343r22nkp703q6fqbk";
+  };
+  
+  buildInputs = [kdelibs x11 zlib libjpeg libpng perl qt3 gpgme libgpgerror];
+
+  configureFlags = [ "--without-arts" "--with-extra-includes=${libjpeg}/include" "--x-libraries=${x11}/lib" ];
+
+  meta = {
+    description = "Multi-purpose note-taking application";
+    homepage = http://kbasket.kde.org/;
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+    license = "GPLv2+";
+  };
+}

pkgs/applications/misc/lyx/default.nix

@@ -1,11 +1,12 @@
 # I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc
 args: with args;
-stdenv.mkDerivation {
-  name = "lyx-1.5.4";
+stdenv.mkDerivation rec {
+  version = "1.6.4";
+  name = "lyx-${version}";
 
   src = fetchurl {
-    url = http://lyx.cybermirror.org/stable/lyx-1.5.4.tar.bz2;
-    sha256 = "6c8b9aafc287ee683b68ebb08166e660e27af9942a30291f14c18de39aca8f2b";
+    url = "ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/${name}.tar.bz2";
+    sha256 = "1b56e53e6884a9f1417811c03e5c986d79955444e8169244a2b80b0709223d15";
   };
 
   buildInputs = [texLive qt python];

pkgs/applications/misc/pgadmin/default.nix

@@ -1,11 +1,10 @@
 args: with args;
-stdenv.mkDerivation {
-  name = "pgadmin3-1.8.1";
+stdenv.mkDerivation rec {
+  name = "pgadmin3-1.10.0";
 
   src = fetchurl {
-    name = "pgadmin3-v1.8.1.tar.gz";
-    url = "http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org//pgadmin3/release/v1.8.1/src/pgadmin3-1.8.1.tar.gz";
-    sha256 = "1vnpbgb2ksvcgbzab4jjspwvs5cvam53azinfavjad4kpjczdywb";
+    url = "http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/pgadmin3/release/v1.10.0/src/pgadmin3-1.10.0.tar.gz";
+    sha256 = "1ndi951da3jw5800fjdgkbvl8n6k71x7x16ghihi1l88bilf2a16";
   };
 
   buildInputs = [postgresql wxGTK libxml2 libxslt openssl];

pkgs/applications/misc/pstree/default.nix

@@ -1,21 +1,21 @@
 args: with args;
-stdenv.mkDerivation {
-  name = "pstree-2.31";
+stdenv.mkDerivation rec {
+  name = "pstree-2.33";
 
   src = fetchurl {
-    url = http://fresh.t-systems-sfr.com/unix/src/misc/pstree-2.31.tar.gz;
-    sha256 = "1zzz29gsyra8csk54cyq0pcdxxg3l4gmksq8q1skv2z84g2yxdhh";
+    url = "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz";
+    sha256 = "1469lrhpy6wghlvbjx6lmvh27rakq00x11cpz4n965fg11i121hg";
   };
 
   unpackPhase="unpackFile \$src; sourceRoot=.";
-  
+
   buildPhase="pwd; gcc -o pstree pstree.c";
   installPhase="ensureDir \$out/bin; cp pstree \$out/bin";
 
-  meta = { 
+  meta = {
       description = "show the running processes as tree";
       # don't know the correct homepage..
-      homepage = http://fresh.t-systems-sfr.com/unix/src/misc/pstree-2.31.tar.gz;
+      homepage = http://fresh.t-systems-sfr.com/unix/src/misc/pstree-2.32.tar.gz;
       license = "GPL";
-    }; 
+    };
 }

pkgs/applications/misc/qgis/1.0.1-2.nix

@@ -12,12 +12,12 @@ composableDerivation.composableDerivation {} {
                   "-DWITH_INTERNAL_SQLITE3=TRUE"
                 ];
 
-  name = "qgis-${version}";
+  name = "qgis-1.0.1-2";
 
   # src = args.fetchsvn { url=https://svn.qgis.org/repos/qgis/trunk/qgis;
   #                md5="ac0560e0a2d4e6258c8639f1e9b56df3"; rev="7704"; };
   src = fetchurl {
-    url = "http://download.osgeo.org/qgis/src/qgis_${version}.tar.gz";
+    url = "http://download.osgeo.org/qgis/src/qgis_1.0.1-2.tar.gz";
     sha256 = "07yyic9sn1pz20wjk7k560jwqz6b19rhf2gawybz38xq1f8rjwd4";
   };
 

pkgs/applications/misc/synergy/default.nix

@@ -2,21 +2,21 @@ args: with args;
 stdenv.mkDerivation {
   name = "synergy-cvs";
 
-  src = bleedingEdgeRepos.sourceByName "synergy";
-  /*
-  fetchcvs {
-    cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2";
-    module = "synergy";
-    date = "NOW";
-    sha256 = "0a52b3adaae5f41cf16c5911c9037c5f2ee704a27bcaa9f874e3a4ff58d773c1";
-  };
-  */
+  # note: There is a fork:
+  # http://code.google.com/p/synergy-plus
 
-  buildInputs = [x11 xextproto libXtst inputproto];
+  # REGION AUTO UPDATE:            { name="synergy"; type = "cvs"; cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2"; module="syngery"; }
+  src= sourceFromHead "synergy-F_23-55-02.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/synergy-F_23-55-02.tar.gz"; sha256 = "ae16a9b59039a32e383e71397405d7b610de6c6902c03177c2496bac440d3e28"; });
+  # END
+
+  buildInputs = [x11 xextproto libXtst inputproto libXi automake autoconf autoconf];
+
+  preConfigure = "autoreconf; ";
 
   patches = [ (fetchurl {
-    url = http://mawercer.de/~nix/syncergy-gcc43.patch.gz;
-    sha256 = "12kla0nii6qc9fy5x4dc4qisfcyl9dqnrj5y911davnvwkwlj18h";
+    url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz;
+    sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7";
   }) ];
 
   meta= { 

pkgs/applications/misc/tangogps/default.nix

@@ -1,15 +1,15 @@
 { fetchurl, stdenv, pkgconfig, gettext, gtk, gconf
-, curl, libexif, sqlite }:
+, curl, libexif, sqlite, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "tangogps-0.9.6";
+  name = "tangogps-0.99.2";
 
   src = fetchurl {
     url = "http://www.tangogps.org/downloads/${name}.tar.gz";
-    sha256 = "04vfbr7skjcfadv9206q2pxbm74i8yypkjwzldsc5a6ybhr7fsp5";
+    sha256 = "15q2kkrv4mfsivfdzjgpxr7s2amw7d501q2ayjl3ff4vmvfn5516";
   };
 
-  buildInputs = [ pkgconfig gettext gtk gconf curl libexif sqlite ];
+  buildInputs = [ pkgconfig gettext gtk gconf curl libexif sqlite libxml2 ];
 
   meta = {
     description = "tangoGPS, a user friendly map and GPS user interface";

pkgs/applications/misc/truecrypt/default.nix

@@ -40,16 +40,17 @@ library, use the 'NOGUI' parameter:
    $ make NOGUI=1
 */
 
-{ fetchurl, stdenv, pkgconfig, fuse, wxGTK, devicemapper
+{ fetchurl, stdenv, pkgconfig, fuse, wxGTK, devicemapper,
+  wxGUI ? true
 }:
 
 stdenv.mkDerivation {
-  name = "trueCrypt-6.1a";
+  name = "truecrypt-6.3a";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://www.sfr-fresh.com/unix/misc/TrueCrypt-6.1a-Source.tar.gz;
-    sha256 = "a2bb8273edcb3c3d10d9819daac853f940033deb1f9726986311356bd5b88c4a";
+    url = http://www.sfr-fresh.com/unix/misc/TrueCrypt_6.3a_Source.tar.gz;
+    sha256 = "1vwnzay9gjlldqbdb20rhq2arhyzhdy347qc00hkpqmv2b8z070y";
   };
 
   pkcs11h = fetchurl {
@@ -67,11 +68,14 @@ stdenv.mkDerivation {
     sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8";
   };
 
-  buildInputs = [pkgconfig fuse wxGTK devicemapper];
+  buildInputs = [ pkgconfig fuse devicemapper wxGTK ]; 
+  makeFlags = if (wxGUI) then "" else "NOGUI=1";
 
   meta = {
     description = "Free Open-Source filesystem on-the-fly encryption";
     homepage = http://www.truecrypt.org/;
     license = "TrueCrypt License Version 2.6";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/applications/misc/xchm/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, wxGTK, chmlib}:
 
 stdenv.mkDerivation {
-  name = "xchm-1.9";
+  name = "xchm-1.17";
   src = fetchurl {
-    url = mirror://sourceforge/xchm/xchm-1.14.tar.gz;
-    sha256 = "0gx8h8iabfrawx86f3im36favwl18afwx6z7w9gkjamihcm1an1w";
+    url = mirror://sourceforge/xchm/xchm-1.17.tar.gz;
+    sha256 = "0yizisn4833nnpd4apallyg8iv334y00hv3awbsbc0ks2zf93x0n";
   };
   buildInputs = [wxGTK chmlib];
 

pkgs/applications/misc/xfontsel/default.nix

@@ -0,0 +1,30 @@
+# This program used to come with xorg releases, but now I could only find it
+# at http://www.x.org/releases/individual/.
+# That is why this expression is not inside pkgs.xorg
+
+{stdenv, fetchurl, libX11, pkgconfig, libXaw}:
+stdenv.mkDerivation rec {
+  name = "xfontsel-1.0.2";
+
+  src = fetchurl {
+    url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
+    sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks";
+  };
+
+  buildInputs = [libX11 pkgconfig libXaw];
+
+  # This will not make xfontsel find its app-defaults, but at least the $out
+  # directory will contain them.
+  # hack: Copying the XFontSel app-defaults file to $HOME makes xfontsel work.
+  preInstall = ''
+    installFlags="appdefaultdir=$out/share/X11/app-defaults"
+  '';
+
+  meta = {
+    homepage = http://www.x.org/;
+    description = "Allows testing the fonts available in an X server";
+    licesnse = "free";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/misc/xlsfonts/default.nix

@@ -0,0 +1,23 @@
+# This program used to come with xorg releases, but now I could only find it
+# at http://www.x.org/releases/individual/.
+# That is why this expression is not inside pkgs.xorg
+
+{stdenv, fetchurl, libX11, pkgconfig}:
+stdenv.mkDerivation rec {
+  name = "xlsfonts-1.0.2";
+
+  src = fetchurl {
+    url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
+    sha256 = "070iym754g3mf9x6xczl4gdnpvlk6rdyl1ndwhpjl21vg2dm2vnc";
+  };
+
+  buildInputs = [libX11 pkgconfig];
+
+  meta = {
+    homepage = http://www.x.org/;
+    description = "Lists the fonts available in the X server";
+    licesnse = "free";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/misc/xneur/0.8.nix

@@ -1,7 +1,7 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name="xneur";
+  name = "xneur-0.8.0";
   src = fetchurl {
     url = http://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2;
     sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8";

pkgs/applications/misc/yate/default.nix

@@ -0,0 +1,39 @@
+args: with args;
+
+let inherit (args.composableDerivation) composableDerivation edf wwf; in
+
+composableDerivation {} ( fixed : {
+
+  name = "yate2";
+
+  src = fetchurl {
+    url = http://yate.null.ro/tarballs/yate2/yate2.tar.gz;
+    sha256 = "0nniicfal3nqkz9swzrxsmyq04cy6xd2dwrngwbjzv0ra5x2p415";
+  };
+
+  # TODO zaptel ? postgres ?
+  buildInputs = [qt openssl autoconf automake pkgconfig];
+
+  # /dev/null is used when linking which is a impure path for the wrapper
+  preConfigure = "
+  
+  sed -i 's@,/dev/null@@' configure
+  "; 
+
+  # --unresolved-symbols=ignore-in-shared-libs makes ld no longer find --library=yate? Why?
+  preBuild = ''
+    export NIX_LDFLAGS="-L$TMP/yate $NIX_LDFLAGS"
+    find . -type f -iname Makefile | xargs sed -i \
+      -e 's@-Wl,--unresolved-symbols=ignore-in-shared-libs@@' \
+      -e 's@-Wl,--retain-symbols-file@@'
+  '';
+
+  meta = { 
+    description = "YATE - Yet Another Telephony Engine";
+    homepage = http://yate.null.ro/;
+    license = ["GPL" "MPL"]; # Yate's license is GPL with an exception for linking with OpenH323 and PWlib (licensed under MPL).
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+
+} )

pkgs/applications/networking/browsers/chromium/default.nix

@@ -0,0 +1,76 @@
+{ stdenv
+, fetchurl
+, ffmpeg
+, cairo
+, pango
+, glib
+, libXrender
+, gtk
+, nspr
+, nss
+, fontconfig
+, freetype
+, alsaLib
+, libX11
+, GConf
+, libXext
+, libXt
+, atk
+, makeWrapper
+, unzip
+, expat
+, zlib
+, libjpeg
+, bzip2
+, libpng
+}:
+
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
+
+stdenv.mkDerivation rec {
+  name = "chrome-${version}";
+  version = "35449";
+  src = 
+    if stdenv.system == "x86_64-linux" then 
+      fetchurl {
+        url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip";
+        sha256 = "0fdm1hs67vcr68r290ami3zlyypcvd88rm059622qyadqz49yvcj";
+      } 
+    else if stdenv.system == "i686-linux" then 
+      fetchurl {
+        url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
+        sha256 = "1indm0s87yz9zsg4archsywvp4yd0ff83azkjbwszj0snggk16pg";
+      } 
+    else null;
+
+  phases="unpackPhase installPhase";
+
+  buildInputs = [makeWrapper unzip];
+
+  libPath = 
+    stdenv.lib.makeLibraryPath
+       [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng] ;
+
+  installPhase = ''
+    ensureDir $out/bin
+    ensureDir $out/chrome
+    ensureDir $out/lib
+
+    cp -R * $out/chrome
+    ln -s $out/chrome/chrome $out/bin/chrome
+  
+    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/chrome/chrome 
+
+    ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d
+    ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d
+    ln -s ${nss}/lib/libssl3.so $out/lib/libssl3.so.1d
+    ln -s ${nss}/lib/libnss3.so $out/lib/libnss3.so.1d
+    ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so.0d
+    ln -s ${nspr}/lib/libplds4.so $out/lib/libplds4.so.0d
+    ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d
+  '';
+
+  meta = {
+    description = "";
+  };
+}

pkgs/applications/networking/browsers/firefox/2.0-builder.sh

@@ -1,35 +0,0 @@
-source $stdenv/setup
-
-postInstall() {
-
-    # Strip some more stuff
-    strip -S $out/lib/*/* || true
-
-    # Fix some references to /bin paths in the Firefox shell script.
-    substituteInPlace $out/bin/firefox \
-        --replace /bin/pwd "$(type -tP pwd)" \
-        --replace /bin/ls "$(type -tP ls)"
-    
-    # This fixes starting Firefox when there already is a running
-    # instance.  The `firefox' wrapper script actually expects to be
-    # in the same directory as `run-mozilla.sh', apparently.
-    libDir=$(cd $out/lib && ls -d firefox-*)
-    test -n "$libDir"
-    cd $out/bin
-    mv firefox ../lib/$libDir/
-    ln -s ../lib/$libDir/firefox .
-
-    # Register extensions etc.
-    echo "running firefox -register..."
-    (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./firefox-bin -register) || false
-
-    echo "running regxpcom..."
-    (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./regxpcom) || false
-
-    # Put the Firefox icon in the right place.
-    ensureDir $out/lib/$libDir/chrome/icons/default
-    ln -s ../../../icons/default.xpm  $out/lib/$libDir/chrome/icons/default/
-    
-}
-
-genericBuild

pkgs/applications/networking/browsers/firefox/2.0.nix

@@ -1,57 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi
-, libjpeg, libpng, zlib, cairo
-
-, # If you want the resulting program to call itself "Firefox" instead
-  # of "Deer Park", enable this option.  However, those binaries may
-  # not be distributed without permission from the Mozilla Foundation,
-  # see http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-    
-}:
-
-stdenv.mkDerivation {
-  name = "firefox-2.0.0.20";
-
-  builder = ./2.0-builder.sh;
-
-  src = fetchurl {
-    url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/source/firefox-2.0.0.20-source.tar.bz2;
-    sha1 = "16601fdbbb0a83b85fd053e76350f7da397f525e";
-  };
-
-  buildInputs = [
-    pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo
-  ];
-
-  patches = [
-    ./writable-copies.patch
-    # Ugh, inexplicable problem since GTK+ 2.10.  Probably a Firefox
-    # bug, but I don't know.  See
-    # http://lists.gobolinux.org/pipermail/gobolinux-users/2007-January/004344.html
-    ./xlibs.patch
-  ];
-
-  configureFlags = [
-    "--enable-application=browser"
-    "--enable-optimize"
-    "--disable-debug"
-    "--enable-xft"
-    "--disable-freetype2"
-    "--enable-svg"
-    "--enable-canvas"
-    "--enable-strip"
-    "--enable-default-toolkit=gtk2"
-    "--with-system-jpeg"
-    "--with-system-png"
-    "--with-system-zlib"
-    "--enable-system-cairo"
-  ]
-  ++ (if enableOfficialBranding then ["--enable-official-branding"] else []);
-
-  meta = {
-    description = "Mozilla Firefox - the browser, reloaded";
-    homepage = http://www.mozilla.com/en-US/firefox/;
-  };
-
-  passthru = {inherit gtk;};
-}

pkgs/applications/networking/browsers/firefox/3.5.nix

@@ -12,14 +12,14 @@
 
 rec {
 
-  firefoxVersion = "3.5.3";
+  firefoxVersion = "3.5.7";
   
-  xulVersion = "1.9.1.3"; # this attribute is used by other packages
+  xulVersion = "1.9.1.7"; # this attribute is used by other packages
 
   
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "83b2625eb74e81b473ac40ac52505e5fc9a497eb";
+    sha1 = "7605d89b3d3e458db74dea4d227dd86d0d12ba1b";
   };
 
 

pkgs/applications/networking/browsers/firefox/3.6.nix

@@ -1,24 +1,25 @@
 { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
 , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file
+, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 
 , # If you want the resulting program to call itself "Firefox" instead
-  # of "Deer Park", enable this option.  However, those binaries may
-  # not be distributed without permission from the Mozilla Foundation,
-  # see http://www.mozilla.org/foundation/trademarks/.
+  # of "Shiretoko" or whatever, enable this option.  However, those
+  # binaries may not be distributed without permission from the
+  # Mozilla Foundation, see
+  # http://www.mozilla.org/foundation/trademarks/.
   enableOfficialBranding ? false
 }:
 
 rec {
 
-  firefoxVersion = "3.0.11";
+  firefoxVersion = "3.6";
   
-  xulVersion = "1.9.0.11"; # this attribute is used by other packages
+  xulVersion = "1.9.2"; # this attribute is used by other packages
 
   
   src = fetchurl {
-    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}-source.tar.bz2";
-    sha1 = "ca792dcdb67af40c91a4fcece25d6adfb6fef2c3";
+    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
+    sha1 = "33226b45a0bcd795545a980cab475c5492f0ea69";
   };
 
 
@@ -29,10 +30,14 @@ rec {
       "--with-system-jpeg"
       "--with-system-zlib"
       "--with-system-bz2"
+      "--with-system-nspr"
+      #"--with-system-nss"
       # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
       "--enable-system-cairo"
       #"--enable-system-sqlite" # <-- this seems to be discouraged
       "--disable-crashreporter"
+      "--disable-tests"
+      "--disable-necko-wifi" # maybe we want to enable this at some point
     ];
 
 
@@ -45,6 +50,7 @@ rec {
       [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
         python dbus dbus_glib pango freetype fontconfig xlibs.libXi
         xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
+        alsaLib nspr /* nss */ libnotify
       ];
 
     configureFlags =
@@ -52,11 +58,14 @@ rec {
         "--disable-javaxpcom"
       ] ++ commonConfigureFlags;
 
+    # !!! Temporary hack.
+    preBuild = ''
+     export NIX_ENFORCE_PURITY=
+    '';
+
     installFlags = "SKIP_GRE_REGISTRATION=1";
 
     postInstall = ''
-      export dontPatchELF=1
-
       # Fix some references to /bin paths in the Xulrunner shell script.
       substituteInPlace $out/bin/xulrunner \
           --replace /bin/pwd "$(type -tP pwd)" \
@@ -75,7 +84,7 @@ rec {
               ln -s $i $out/bin
           fi;
       done;
-      rm $out/bin/run-mozilla.sh || true
+      rm -f $out/bin/run-mozilla.sh
     ''; # */
 
     meta = {
@@ -88,13 +97,13 @@ rec {
 
 
   firefox = stdenv.mkDerivation rec {
-    name = "firefox-3.0.11";
+    name = "firefox-${firefoxVersion}";
 
     inherit src;
 
     buildInputs =
       [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
-        dbus dbus_glib pango freetype fontconfig
+        dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
       ];
 
     propagatedBuildInputs = [xulrunner];
@@ -123,7 +132,7 @@ rec {
     };
 
     passthru = {
-      inherit gtk;
+      inherit gtk xulrunner nspr;
       isFirefox3Like = true;
     };
   };

pkgs/applications/networking/browsers/icecat-3/default.nix

@@ -1,54 +1,59 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
+{ fetchurl, stdenv, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
 , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
-, gnomevfs, libgnomeui
-, freetype, fontconfig
+, libnotify, gnomevfs, libgnomeui
+, freetype, fontconfig, wirelesstools ? null
 , application ? "browser" }:
 
-let version = "3.5.3"; in
+# Build the WiFi stuff on Linux-based systems.
+# FIXME: Disable for now until it can actually be built:
+# http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 .
+#assert stdenv.isLinux -> (wirelesstools != null);
+
+let version = "3.6"; in
 stdenv.mkDerivation {
   name = "icecat-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2";
-    sha256 = "0cjf75crk4g84swya57ixm7152v774hsxif3xrws4yz9dasqlz5j";
+    sha256 = "0fsf8zd8nncg1w1gg2jhlxwkbljvrx4mm9pywasklyi0gvi939ds";
   };
 
-  buildInputs = [
-    libgnomeui gnomevfs alsaLib
-    pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
-    python ply dbus dbus_glib pango freetype fontconfig
-    xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
-  ];
+  buildInputs =
+    [ libgnomeui libnotify gnomevfs alsaLib
+      pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
+      python ply dbus dbus_glib pango freetype fontconfig
+      xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
+    ]
+    ++ (stdenv.lib.optional false /* stdenv.isLinux */ wirelesstools);
 
   patches = [
     ./skip-gre-registration.patch ./rpath-link.patch
   ];
 
-  configureFlags = [
-    "--enable-application=${application}"
-    "--enable-libxul"
-    "--disable-javaxpcom"
+  configureFlags =
+    [ "--enable-application=${application}"
+      "--enable-libxul"
+      "--disable-javaxpcom"
 
-    "--enable-optimize"
-    "--disable-debug"
-    "--enable-strip"
-    "--with-system-jpeg"
-    "--with-system-zlib"
-    "--with-system-bz2"
-    # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-    "--enable-system-cairo"
-    #"--enable-system-sqlite" # <-- this seems to be discouraged
-    "--disable-crashreporter"
-  ];
-
-  preConfigure = ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"'';
+      "--enable-optimize"
+      "--disable-debug"
+      "--enable-strip"
+      "--with-system-jpeg"
+      "--with-system-zlib"
+      "--with-system-bz2"
+      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
+      "--enable-system-cairo"
+      #"--enable-system-sqlite" # <-- this seems to be discouraged
+      "--disable-crashreporter"
+    ]
+    ++ (stdenv.lib.optional true /* (!stdenv.isLinux) */ "--disable-necko-wifi");
 
   postInstall = ''
     export dontPatchELF=1;
 
     # Strip some more stuff
-    strip -S $out/lib/*/* || true
-    
+    strip -S "$out/lib/"*"/"* || true
+
     # This fixes starting IceCat when there already is a running
     # instance.  The `icecat' wrapper script actually expects to be
     # in the same directory as `run-mozilla.sh', apparently.
@@ -79,9 +84,9 @@ stdenv.mkDerivation {
     fi
 
     # Put the GNU IceCat icon in the right place.
-    ensureDir $out/lib/$libDir/chrome/icons/default
-    ln -s ../../../icons/default.xpm  $out/lib/$libDir/chrome/icons/default/
-  ''; # */
+    ensureDir "$out/lib/$libDir/chrome/icons/default"
+    ln -s ../../../icons/default.xpm  "$out/lib/$libDir/chrome/icons/default/"
+  '';
 
   meta = {
     description = "GNU IceCat, a free web browser based on Mozilla Firefox";
@@ -109,5 +114,3 @@ stdenv.mkDerivation {
     isFirefox3Like = true;
   };
 }
-
-

pkgs/applications/networking/browsers/links2/default.nix

@@ -0,0 +1,33 @@
+a :  
+let 
+  s = import ./src-for-default.nix;
+  buildInputs = with a; [
+    libpng libjpeg bzip2 zlib libtiff
+    libX11 libXau xproto gpm
+    openssl libXt pkgconfig
+  ];
+in
+rec {
+  src = a.fetchUrlFromSrcInfo s;
+
+  inherit (s) name;
+  inherit buildInputs;
+  configureFlags = [
+    "--enable-graphics"
+    "--with-ssl"
+    "--with-x"
+    "--with-fb"
+    ];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "A small browser with some graphics support";
+    maintainers = [
+      a.lib.maintainers.raskin
+    ];
+    platforms = with a.lib.platforms; 
+      linux;
+  };
+}

pkgs/applications/networking/browsers/links2/src-for-default.nix

@@ -0,0 +1,9 @@
+rec {
+   version="2.2";
+   name="links2-2.2";
+   hash="188y37rw4s9brl55ncc12q1b45w0caxcnsq1gqyby9byw1sawnq9";
+   url="http://links.twibright.com/download/links-${version}.tar.gz";
+   advertisedUrl="http://links.twibright.com/download/links-2.2.tar.gz";
+  
+  
+}

pkgs/applications/networking/browsers/links2/src-info-for-default.nix

@@ -0,0 +1,4 @@
+{
+  downloadPage = "http://links.twibright.com/download.php";
+  baseName = "links2";
+}