* Linux 2.6.32.1.

svn path=/nixpkgs/branches/kernel-config/; revision=19000

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/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>

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/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;

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

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

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

@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   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\"" +
+    " -ljpeg -ltiff -lz -lexiv2 -lboost_thread\"" +
     " -DCMAKE_SKIP_BUILD_RPATH=ON" +
     " -DCMAKE_BUILD_TYPE=Release" +
     " -DCMAKE_INSTALL_PREFIX=$out";
@@ -47,5 +47,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,14 +1,14 @@
 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
@@ -17,25 +17,13 @@ stdenv.mkDerivation rec {
   ];
 
   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/"*
@@ -46,6 +34,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  NIX_LDFLAGS = "-lX11";
+
   meta = {
     license = "GPL";
     homepage = http://www.inkscape.org;
@@ -53,7 +43,7 @@ stdenv.mkDerivation rec {
       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
+      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/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/ufraw/default.nix

@@ -5,13 +5,11 @@ 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 = "0d3hd04msdk6l0nv1n8zs3ybipy3jikli57d9q41pb7v0hnl6hzd";
+    sha256 = "06fzyd7wyv5ixbmhbsz80pphhbic18d1w8ji0gz38aq1vdmgxw9n";
   };
 
-  patches = [ ./mkinstalldirs.patch ];
-  preConfigure = "chmod +x mkinstalldirs";
-
   buildInputs =
     [ pkgconfig gtk gtkimageview gettext bzip2 zlib
       libjpeg libtiff cfitsio exiv2 lcms
@@ -35,5 +33,6 @@ stdenv.mkDerivation rec {
     license = "GPLv2+";
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # needs GTK+
   };
 }

pkgs/applications/graphics/ufraw/mkinstalldirs.patch

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

pkgs/applications/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

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   };
   */
 
-  buildInputs = [x11 xextproto libXtst inputproto];
+  buildInputs = [x11 xextproto libXtst inputproto libXi];
 
   patches = [ (fetchurl {
     url = http://mawercer.de/~nix/syncergy-gcc43.patch.gz;

pkgs/applications/misc/truecrypt/default.nix

@@ -45,12 +45,12 @@ library, use the 'NOGUI' parameter:
 }:
 
 stdenv.mkDerivation {
-  name = "truecrypt-6.3";
+  name = "truecrypt-6.3a";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://www.sfr-fresh.com/unix/misc/TrueCrypt_6.3_Source.tar.gz;
-    sha256 = "0vgyng5zmdjdqlhai0szzapfm14njr3swamnw6yyb6pnjdncd0jq";
+    url = http://www.sfr-fresh.com/unix/misc/TrueCrypt_6.3a_Source.tar.gz;
+    sha256 = "1vwnzay9gjlldqbdb20rhq2arhyzhdy347qc00hkpqmv2b8z070y";
   };
 
   pkcs11h = fetchurl {

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/networking/browsers/chromium/default.nix

@@ -26,17 +26,17 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
 
 stdenv.mkDerivation rec {
   name = "chrome-${version}";
-  version = "31080";
+  version = "32599";
   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 = "1km6mrhzgdlhy7pl60g8wh8hlxp0ymv6rqpp3aqd94mqj9g5asm9";
+        sha256 = "1wz24hrnnjggsjxsaa4spqg73p1f7bv4a8l2ys3kbkdp709fl6v8";
       } 
     else if stdenv.system == "i686-linux" then 
       fetchurl {
         url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
-        sha256 = "12awdamkkcb8kq2z7kila00yhn9msihq7b6970k9hghbwq95hjrk";
+        sha256 = "16w6d7kp34jr1c4ym6y2h6llkq3d65rybj5hs46w1b8qri60q6aa";
       } 
     else null;
 

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

@@ -12,14 +12,14 @@
 
 rec {
 
-  firefoxVersion = "3.5.4";
+  firefoxVersion = "3.5.5";
   
-  xulVersion = "1.9.1.4"; # this attribute is used by other packages
+  xulVersion = "1.9.1.5"; # 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 = "ce250208371326d03e72a02d223bc136cd376e5d";
+    sha1 = "a2146fb6dc8e879a78fa13849f187c14d41442ca";
   };
 
 

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

@@ -4,13 +4,13 @@
 , freetype, fontconfig
 , application ? "browser" }:
 
-let version = "3.5.4"; in
+let version = "3.5.5"; in
 stdenv.mkDerivation {
   name = "icecat-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2";
-    sha256 = "0j506l2qg30xg11zlfk8b2jwrp8bghc286j21gx0ws2qy6snagnr";
+    sha256 = "1mwk81vkay007k1rcx9hdmfl2540lj5nrxxv3zagifbaala89c3d";
   };
 
   buildInputs = [

pkgs/applications/networking/browsers/uzbl/experimental.nix

@@ -13,7 +13,11 @@ rec {
   configureFlags = [];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["addInputs" "doMakeInstall" "doWrap"];
+  phaseNames = ["setVars" "addInputs" "doMakeInstall" "doWrap"];
+
+  setVars = a.noDepEntry ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"
+  '';
       
   doWrap = a.makeManyWrappers "$out/bin/uzbl*" 
     ''

pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix

@@ -4,7 +4,4 @@ rec {
    hash="b5dfae5245b1b3934ca918831fbe9fa0bb7ae790c682b69f5ecc042cccf58894";
    rev="1461ac760f79b8f153c8317c4534cb047a48331a";
    url="git://github.com/Dieterbe/uzbl.git";
-  
-   depth="50";
-  
 }

pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix

@@ -3,6 +3,4 @@
   baseName = "uzbl-experimental";
   method = "fetchgit";
   rev = "origin/experimental";
-  extraVars = "depth";
-  eval_depth = "depth=50";
 }

pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix

@@ -39,7 +39,7 @@ rec {
     ++ (lib.optional externalPurple2 "postInstall")
   ;
       
-  name = "carrier-" + version;
+  name = "carrier-2.5.0";
   meta = {
     description = "Carrier - PidginIM GUI fork with user-friendly development model";
     homepage = http://funpidgin.sf.net; 

pkgs/applications/networking/instant-messengers/psi/default.nix

@@ -1,19 +1,24 @@
-args : with args;
+{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, libICE, qca2 }:
+
 stdenv.mkDerivation rec {
+  name = "psi-0.12.1";
+  
   src = fetchurl {
-    url = mirror://sourceforge/psi/psi-0.12.1.tar.bz2;
+    url = "mirror://sourceforge/psi/${name}.tar.bz2";
     sha256 = "0zi71fcia9amcasa6zrvfyghdpqa821iv2rkj53bq5dyvfm2y0m8";
   };
 
   buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE qca2];
 
   NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
+  
   NIX_LDFLAGS="-lqca";
 
-  configureFlags = [ " --with-zlib-inc=${zlib}/include "
-    " --disable-bundled-qca" ];
+  configureFlags =
+    [ " --with-zlib-inc=${zlib}/include "
+      " --disable-bundled-qca"
+    ];
 
-  name = "psi-" + version;
   meta = {
     description = "Psi, an XMPP (Jabber) client";
   };

pkgs/applications/networking/sync/unison/default.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation (rec {
 
   name = "unison-2.27.57";
   src = fetchurl {
-    url = "http://www.seas.upenn.edu/~bcpierce/unison//download/releases/stable/unison-2.27.57.tar.gz";
+    url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.27.57/unison-2.27.57.tar.gz";
     sha256 = "49299ec14216a8467b2c6ba148f8145bec31fa787433f9ce3851c2d62f0035ae";
   };
 

pkgs/applications/office/ledger/default.nix

@@ -0,0 +1,46 @@
+# TODO: fix a problem with patchelf(?)
+
+{stdenv, fetchurl, emacs, gmp, pcre}:
+
+let
+
+  pname = "ledger";
+  version = "2.6.1";
+  name = "${pname}-${version}";
+
+in
+
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+    sha256 = "96830d77d3aa6bf6c5778f5dd52169f9b5203fb7daad0e12831abeb35b14f27a";
+  };
+
+  buildInputs = [ emacs gmp pcre ];
+
+  # Something goes wrong with pathelf...
+  # this is a small workaround: adds a small shell script for
+  # setting LD_LIBRARY_PATH
+  postInstall = ''
+    cd $out/bin
+    mv ledger ledger.bin
+    echo "#!/bin/sh" > ledger
+    echo "LD_LIBRARY_PATH=$out/lib $out/bin/ledger.bin "'"$@"' >> ledger
+    chmod +x ledger
+  '';
+
+  meta = {
+    description =
+     "A double-entry accounting system with a command-line reporting interface";
+    longDescription = ''
+      Ledger is a powerful, double-entry accounting system that is accessed
+      from the UNIX command-line. This may put off some users, as there is
+      no flashy UI, but for those who want unparalleled reporting access to
+      their data, there really is no alternative.
+    '';
+    homepage = http://wiki.github.com/jwiegley/ledger;
+    license = "BSD";
+  };
+}

pkgs/applications/version-management/codeville/0.8.0.nix

@@ -16,7 +16,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["installPythonPackage" (makeManyWrappers ''$out/bin/*'' ''--prefix PYTHONPATH : $(toPythonPath $out)'')];
       
-  name = "codeville-" + version;
+  name = "codeville-0.8.0";
   meta = {
     description = "Codeville - RCS with powerful merge.";
   };

pkgs/applications/version-management/git-and-tools/git/default.nix

@@ -9,11 +9,11 @@
 assert svnSupport -> (subversion != null && perlLibs != [] && subversion.perlBindings);
 
 stdenv.mkDerivation rec {
-  name = "git-1.6.5.2";
+  name = "git-1.6.5.5";
 
   src = fetchurl {
     url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
-    sha256 = "a7050b45a4c5a2b40db83dc67dc3ff4b422ef1864df72316b3221ead2eefb5c1";
+    sha256 = "4d1aaf16b4c37c8412cceab09b009bfc0f8d7b9f30a809b82027ab7fa66fdbb3";
   };
 
   patches = [ ./docbook2texi.patch ];

pkgs/applications/version-management/monotone-viz/mtn-head.nix

@@ -5,7 +5,7 @@ rec {
     dbs = ["monotone.ca"];
     selector = "0e9194c89eb87e62ac7d54c7b88b10b94b07fa41";
     branch = "net.venge.monotone-viz.automate";
-    sha256 = "b9189ccd64c02d158517e97bce079e87843e7b1948c5c61c534aa0b885c711ac";
+    sha256 = "d7980c9729b0a58f0dd27768b8eae46b45462fe72a88534b8aa159d889b4d624";
   } + "/";
 
   buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib 
@@ -20,7 +20,7 @@ rec {
     autoconf -I .
   '') ["minInit" "addInputs" "doUnpack"];
       
-  name = "monotone-viz-" + version;
+  name = "monotone-viz-mtn-head";
   meta = {
     description = "Monotone commit tree visualizer";
     maintainers = [args.lib.maintainers.raskin];

pkgs/applications/version-management/viewmtn/0.10.nix

@@ -38,7 +38,7 @@ rec {
     ln -s $fullOut/static $out/share/viewmtn/
   '') ["minInit" "defEnsureDir" "addInputs" "doUnpack"];
 
-  name = "viewmtn-" + version;
+  name = "viewmtn-0.10";
   meta = {
     description = "Monotone web interface";
   };

pkgs/applications/video/avidemux/default.nix

@@ -0,0 +1,45 @@
+{stdenv, fetchurl, cmake, pkgconfig, libxml2, qt4, gtk, gettext, SDL,
+libXv, pixman, libpthreadstubs, libXau, libXdmcp, libxslt, x264,
+alsaLib, lame, faac, faad2, libvorbis }:
+
+assert stdenv ? glibc;
+
+stdenv.mkDerivation {
+  name = "avidemux-2.5.1";
+  
+  src = fetchurl {
+    url = mirror://sourceforge/avidemux/avidemux_2.5.1.tar.gz;
+    sha256 = "14jwrblbli7bswx4i7b85l0s1msx8rxrqb908df3z8jxm6w4cm9g";
+  };
+  
+  buildInputs = [ cmake pkgconfig libxml2 qt4 gtk gettext SDL libXv
+    pixman libpthreadstubs libXau libXdmcp libxslt x264 alsaLib 
+    lame faac faad2 libvorbis ];
+
+  cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" +
+    " -DGETTEXT_INCLUDE_DIR=${gettext}/include" +
+    " -DSDL_INCLUDE_DIR=${SDL}/include/SDL" +
+    " -DCMAKE_SKIP_BUILD_RPATH=ON" +
+    " -DCMAKE_BUILD_TYPE=Release";
+
+  NIX_LDFLAGS="-lxml2 -lXv -lSDL -lQtGui -lQtCore -lpthread";
+
+  postInstall = ''
+    cd $NIX_BUILD_TOP/$sourceRoot
+    mkdir build_plugins
+    cd build_plugins
+    cmake $cmakeFlags -DAVIDEMUX_INSTALL_PREFIX=$out \
+      -DAVIDEMUX_SOURCE_DIR=$NIX_BUILD_TOP/$sourceRoot \
+      -DAVIDEMUX_CORECONFIG_DIR=$NIX_BUILD_TOP/$sourceRoot/build/config ../plugins
+
+    make
+    make install
+  '';
+
+  meta = { 
+    homepage = http://fixounet.free.fr/avidemux/;
+    description = "Free video editor designed for simple video editing tasks";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/virtualization/qemu/0.11.0.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, SDL, zlib, which}:
+
+stdenv.mkDerivation {
+  name = "qemu-0.11.0";
+
+  src = fetchurl {
+    url = http://download.savannah.gnu.org/releases/qemu/qemu-0.11.0.tar.gz;
+    sha256 = "1w3n61lzwvqg1ygn0vs8syybbmbcbk7lfyya098k201lp5rpwamw";
+  };
+
+  patchFlags = "-p2";
+  
+  buildInputs = [SDL zlib which];
+  
+  meta = {
+    description = "QEmu processor emulator";
+  };
+}

pkgs/applications/virtualization/qemu/linux-img/0.2.nix

@@ -13,11 +13,11 @@ args : with args;
 let 
 doCopy = fullDepEntry ("
   ensureDir \$out/share/qemu-images
-  cp linux-${version}.img  \$out/share/qemu-images/
+  cp linux-0.2.img \$out/share/qemu-images/
 ") [minInit doUnpack defEnsureDir];
 in
 stdenv.mkDerivation rec {
-	name = "QEmu-Linux-Image-"+version;
+	name = "QEmu-Linux-Image-0.2";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doCopy doForceShare doPropagate]);
 	meta = {

pkgs/applications/virtualization/virtualbox/default.nix

@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "virtualbox-3.0.10-${kernel.version}";
+  name = "virtualbox-3.1.0-${kernel.version}";
 
   src = fetchurl {
-    url = http://download.virtualbox.org/virtualbox/3.0.10/VirtualBox-3.0.10-OSE.tar.bz2;
-    sha256 = "0b8l3nnlpfxy6a7q43h1qnibkqj4q12z0dgfagyipmq51bkj9iq1";
+    url = http://download.virtualbox.org/virtualbox/3.1.0/VirtualBox-3.1.0-OSE.tar.bz2;
+    sha256 = "0f86w4awscgbg9az26h0rlg4i7xr9319hbddjs69ils28g2gz2ns";
   };
 
   buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl];

pkgs/build-support/builder-defs/builder-defs.nix

@@ -373,10 +373,6 @@ let inherit (builtins) head tail trace; in
         /*debug = x:(trace x x);
         debugX = x:(trace (toXML x) x);*/
 
-        replaceScriptVar = file: name: value: "sed -e 's`^${name}=.*`${name}='\\''${value}'\\''`' -i ${file}";
-        replaceInScript = file: l: concatStringsSep "\n" ((pairMap (replaceScriptVar file) l));
-        replaceScripts = l: concatStringsSep "\n" (pairMap replaceInScript l);
-        doReplaceScripts = fullDepEntry (replaceScripts (attrByPath ["shellReplacements"] [] args)) ["minInit"];
         makeNest = x: if x == defNest.text then x else "startNest\n" + x + "\nstopNest\n";
         textClosure = a: steps: textClosureMap makeNest a (["defNest"] ++ steps);
 
@@ -546,11 +542,11 @@ let inherit (builtins) head tail trace; in
      sha256 = srcInfo.hash;
    };
 
-   fetchGitFromSrcInfo = srcInfo: fetchgit ({
+   fetchGitFromSrcInfo = srcInfo: fetchgit {
      url = srcInfo.url;
      rev = srcInfo.rev;
      sha256 = srcInfo.hash;
-   } // (if srcInfo ? depth then {inherit (srcInfo) depth;} else {}));
+   };
 }) // args
 
 # [1]: rewrite using '' instead of " so that indentation gets stripped. It's

pkgs/build-support/fetchgit/builder.sh

@@ -2,7 +2,7 @@ source $stdenv/setup
 
 header "exporting $url (rev $rev) into $out"
 
-git clone --depth "$depth" "$url" $out
+git clone "$url" $out
 if test -n "$rev"; then
   cd $out
   git checkout $rev

pkgs/build-support/fetchgit/default.nix

@@ -1,5 +1,27 @@
 {stdenv, git}:
-{url, rev ? "HEAD", md5 ? "", sha256 ? "", depth ? 1}:
+{url, rev ? "HEAD", md5 ? "", sha256 ? ""}:
+
+/* NOTE:
+   fetchgit has one problem: git fetch only works for refs.
+   This is because fetching arbitrary (maybe dangling) commits may be a security risk
+   and checking whether a commit belongs to a ref is expensive. This may
+   change in the future when some caching is added to git (?)
+   Usually refs are either tags (refs/tags/*) or branches (refs/heads/*)
+   Cloning branches will make the hash check fail when there is an update.
+   But not all patches we want can be accessed by tags.
+
+   The workaround is getting the last n commits so that it's likly that they
+   still contain the hash we want.
+
+   for now : increase depth iteratively (TODO)
+
+   real fix: ask git folks to add a
+   git fetch $HASH contained in $BRANCH
+   facility because checking that $HASH is contained in $BRANCH is less
+   expensive than fetching --depth $N.
+   Even if git folks implemented this feature soon it may take years until
+   server admins start using the new version?
+*/
 
 stdenv.mkDerivation {
   name = "git-export";
@@ -10,7 +32,7 @@ stdenv.mkDerivation {
   outputHashMode = "recursive";
   outputHash = if sha256 == "" then md5 else sha256;
 
-  inherit url rev depth;
+  inherit url rev;
 
   impureEnvVars = [
     # We borrow these environment variables from the caller to allow

pkgs/build-support/fetchgit/nix-prefetch-git

@@ -6,7 +6,7 @@ expHash=$3
 
 hashType=$NIX_HASH_ALGO
 if test -z "$hashType"; then
-    hashType=md5
+    hashType=sha256
 fi
 
 if test -z "$url"; then
@@ -36,15 +36,19 @@ if test -z "$finalPath"; then
     trap "rm -rf $tmpPath" EXIT
 
     # Perform the checkout.
-    git clone --depth 1 "$url" $tmpFile
+    git clone "$url" $tmpFile 1>&2
     if test -n "$rev"; then
       cd $tmpFile
-      echo $tmpFile
-      git checkout $rev
+      echo $tmpFile >&2
+      git checkout $rev 1>&2
     fi
     # Allow doing additional processing before .git removal
     eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"
-    find $tmpFile -name .git\* | xargs rm -rf
+    if test "$NIX_PREFETCH_GIT_LEAVE_DOT_GIT" != 1
+    then
+	echo "removing \`.git'..." >&2
+	rm -rf .git
+    fi
 
     # Compute the hash.
     hash=$(nix-hash --type $hashType $hashFormat $tmpFile)

pkgs/build-support/fetchhg/builder.sh

@@ -0,0 +1,9 @@
+source $stdenv/setup
+
+header "getting $url${tag:+ ($tag)} into $out"
+
+hg clone ${tag:+-r "$tag"} "$url" "$out"
+
+rm -rf "$out/.hg"
+
+stopNest

pkgs/build-support/fetchhg/default.nix

@@ -1,7 +1,8 @@
 {stdenv, mercurial, nix}: {url, tag ? null, md5}:
 
+# TODO: statically check if mercurial as the https support if the url starts woth https.
 stdenv.mkDerivation {
-  name = "fetchdarcs";
+  name = "fetchhg";
   builder = ./builder.sh;
   buildInputs = [mercurial nix];
 

pkgs/build-support/fetchmtn/builder.sh

@@ -11,7 +11,7 @@ header "getting revision $selector";
 
 done=;
 for source in $dbs; do
-	if mtn pull --debug --db "$cacheDB" "$source" "${branch}"; then
+	if mtn pull --db "$cacheDB" "$source" "${branch}"; then
 		revision="$(mtn --db "$cacheDB" au toposort $(mtn --db "$cacheDB" au select "$selector") | tail -1)";
 		if [ -n "$revision" ]; then
 			if mtn --db "$cacheDB" au get_revision "$revision"; then
@@ -44,3 +44,8 @@ fi;
 
 stopNest
 
+header "clearing _MTN in the output"
+
+rm -rf "$out/_MTN"
+
+stopNest

pkgs/build-support/fetchsvn/nix-prefetch-svn

@@ -48,7 +48,14 @@ if test -z "$finalPath"; then
     trap "rm -rf $tmpPath" EXIT
 
     # Perform the checkout.
-    echo p | svn export --quiet -r "$rev" "$url" $tmpFile >&2
+    if test "$NIX_PREFETCH_SVN_LEAVE_DOT_SVN" != 1
+    then
+	command="export"
+    else
+	command="checkout"
+    fi
+
+    echo p | svn "$command" --quiet -r "$rev" "$url" "$tmpFile" >&2
 
     # Compute the hash.
     hash=$(nix-hash --type $hashType $hashFormat $tmpFile)

pkgs/build-support/fetchurl/default.nix

@@ -1,6 +1,3 @@
-# Argh, this thing is duplicated (more-or-less) in Nix (in corepkgs).
-# Need to find a way to combine them.
-
 {stdenv, curl}: # Note that `curl' may be `null', in case of the native stdenv.
 
 let

pkgs/build-support/fetchurl/mirrors.nix

@@ -22,10 +22,18 @@ rec {
 
   sf = sourceforge;
 
-  # GNU.
+  # GNU (http://www.gnu.org/prep/ftp.html).
   gnu = [
+    # This one redirects to a (supposedly) nearby and (supposedly) up-to-date
+    # mirror.
+    http://ftpmirror.gnu.org/
+
     http://ftp.nluug.nl/pub/gnu/
     http://mirrors.kernel.org/gnu/
+    ftp://mirror.cict.fr/gnu/
+    ftp://ftp.cs.tu-berlin.de/pub/gnu/
+    ftp://ftp.chg.ru/pub/gnu/
+
     http://ftp.gnu.org/pub/gnu/
   ];
 
@@ -209,6 +217,7 @@ rec {
     http://ftp.funet.fi/pub/linux/mirrors/opensuse/
     http://ftp5.gwdg.de/pub/opensuse/
     http://ftp.opensuse.org/pub/opensuse/
+    http://ftp5.gwdg.de/pub/opensuse/discontinued/
   ];
 
   # Gnome (see http://ftp.gnome.org/pub/GNOME/MIRRORS).

pkgs/build-support/release/nix-build.nix

@@ -22,7 +22,6 @@ stdenv.mkDerivation (
 
     showBuildStats = true;
 
-    # Hack - swap checkPhase and installPhase (otherwise Stratego barfs).
     phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase ${if doCoverageAnalysis then "coverageReportPhase" else ""} finalPhase";
 
     finalPhase =

pkgs/build-support/release/source-tarball.nix

@@ -16,6 +16,12 @@ let
     then ""
     else if src ? rev then "pre${toString src.rev}" else "";
 
+  # By default, provide all the GNU Build System as input.
+  bootstrapBuildInputs =
+    if (args ? bootstrapBuildInputs)
+    then args.bootstrapBuildInputs
+    else [ autoconf automake libtool ];
+
 in
 
 stdenv.mkDerivation (
@@ -36,6 +42,32 @@ stdenv.mkDerivation (
 
     preConfigurePhases = "autoconfPhase";
     postPhases = "finalPhase";
+
+    # Autoconfiscate the sources.
+    autoconfPhase = ''
+      export VERSION=${version}
+      export VERSION_SUFFIX=${versionSuffix}
+
+      # `svn-revision' is set for backwards compatibility with the old
+      # Nix buildfarm.  (Stratego/XT's autoxt uses it.  We should
+      # update it eventually.)
+      echo ${versionSuffix} | sed -e s/pre// > svn-revision
+
+      eval "$preAutoconf"
+
+      if test -x ./bootstrap; then ./bootstrap
+      elif test -x ./bootstrap.sh; then ./bootstrap.sh
+      elif test -x ./autogen.sh; then ./autogen.sh
+      elif test -x ./autogen ; then ./autogen
+      elif test -x ./reconf; then ./reconf
+      elif test -f ./configure.in || test -f ./configure.ac; then
+          autoreconf --install --force --verbose
+      else
+          echo "No bootstrap, bootstrap.sh, configure.in or configure.ac. Assuming this is not an GNU Autotools package."
+      fi
+
+      eval "$postAutoconf"
+    '';
   }
 
   # Then, the caller-supplied attributes.
@@ -45,7 +77,7 @@ stdenv.mkDerivation (
   {
     name = name + "-" + version + versionSuffix;
 
-    buildInputs = buildInputs ++ [autoconf automake libtool];
+    buildInputs = buildInputs ++ bootstrapBuildInputs;
     
     postHook = ''
       ensureDir $out/nix-support
@@ -64,42 +96,18 @@ stdenv.mkDerivation (
 
     nextPostUnpack = if args ? postUnpack then args.postUnpack else "";
 
-    # Autoconfiscate the sources.
-    autoconfPhase = ''
-      export VERSION=${version}
-      export VERSION_SUFFIX=${versionSuffix}
-
-      # `svn-revision' is set for backwards compatibility with the old
-      # Nix buildfarm.  (Stratego/XT's autoxt uses it.  We should
-      # update it eventually.)
-      echo ${versionSuffix} | sed -e s/pre// > svn-revision
-    
-      eval "$preAutoconf"
-    
-      if test -f ./bootstrap; then ./bootstrap
-      elif test -f ./bootstrap.sh; then ./bootstrap.sh
-      elif test -f ./reconf; then ./reconf
-      elif test -f ./configure.in || test -f ./configure.ac; then
-          autoreconf --install --force --verbose
-      else
-          echo "No bootstrap, bootstrap.sh, configure.in or configure.ac. Assuming this is not an GNU Autotools package."
-      fi
-    
-      eval "$postAutoconf"
-    '';
-
     # Cause distPhase to copy tar.bz2 in addition to tar.gz.
-    tarballs = "*.tar.gz *.tar.bz2";
+    tarballs = "*.tar.gz *.tar.bz2 *.tar.xz";
 
     finalPhase = ''
-      for i in $out/tarballs/*; do
+      for i in "$out/tarballs/"*; do
           echo "file source-dist $i" >> $out/nix-support/hydra-build-products
       done
 
       # Try to figure out the release name.
       releaseName=$( (cd $out/tarballs && ls) | head -n 1 | sed -e 's^\.[a-z].*^^')
       test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name)
-    ''; # */
+    '';
 
     passthru = {
       inherit src;

pkgs/build-support/trivial-builders.nix

@@ -0,0 +1,76 @@
+{ stdenv, lndir }:
+
+rec {
+
+  # Run the shell command `buildCommand' to produce a store path named
+  # `name'.  The attributes in `env' are added to the environment
+  # prior to running the command.
+  runCommand = name: env: buildCommand:
+    stdenv.mkDerivation ({
+      inherit name buildCommand;
+    } // env);
+
+
+  # Create a single file.
+  writeTextFile =
+    { name # the name of the derivation
+    , text
+    , executable ? false # run chmod +x ?
+    , destination ? ""   # relative path appended to $out eg "/bin/foo"
+    }:
+    runCommand name {inherit text executable; }
+      ''
+        n=$out${destination}
+        mkdir -p "$(dirname "$n")"
+        echo -n "$text" > "$n"
+        (test -n "$executable" && chmod +x "$n") || true
+      '';
+
+    
+  # Shorthands for `writeTextFile'.
+  writeText = name: text: writeTextFile {inherit name text;};
+  writeScript = name: text: writeTextFile {inherit name text; executable = true;};
+  writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";};
+
+
+  # Create a forest of symlinks to the files in `paths'.
+  symlinkJoin = name: paths:
+    runCommand name { inherit paths; }
+      ''
+        mkdir -p $out
+        for i in $paths; do
+          ${lndir}/bin/lndir $i $out
+        done
+      '';
+
+
+  # Make a package that just contains a setup hook with the given contents.
+  makeSetupHook = script:
+    runCommand "hook" {}
+      ''
+        ensureDir $out/nix-support
+        cp ${script} $out/nix-support/setup-hook
+      '';
+
+
+  # Write the references (i.e. the runtime dependencies in the Nix store) of `path' to a file.
+  writeReferencesToFile = path: runCommand "runtime-deps"
+    {
+      exportReferencesGraph = ["graph" path];
+    }
+    ''
+      touch $out
+      while read path; do
+        echo $path >> $out
+        read dummy
+        read nrRefs
+        for ((i = 0; i < nrRefs; i++)); do read ref; done
+      done < graph
+    '';
+
+  # Quickly create a set of symlinks to derivations.
+  # entries is a list of attribute sets like { name = "name" ; path = "/nix/store/..."; }
+  linkFarm = name: entries: runCommand name {} ("mkdir -p $out; cd $out; \n" +
+    (stdenv.lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries));
+
+}

pkgs/build-support/upstream-updater/snippets.sh

@@ -4,6 +4,8 @@
 #http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz
 skipRedirectSF='s@^http://sourceforge.net/projects/@http://downloads.sourceforge.net/@; s@/download$@@'
 extractReleaseSF='s@.*/([^/]+)/[^/]+@\1@'
+apacheMirror='s@http://www.apache.org/dist/@mirror://apache/@'
+skipRedirectApache='s@/dyn/closer.cgi[?]path=@/dist@'
 
 replaceAllVersionOccurences() {
 	echo s/"$version"/\${version}/g

pkgs/build-support/vm/default.nix

@@ -252,15 +252,6 @@ rec {
   '';
 
 
-  modifyDerivation = f: attrs:
-    let attrsCleaned = removeAttrs attrs ["meta" "passthru" "outPath" "drvPath"];
-        newDrv = derivation (attrsCleaned // (f attrs));
-    in newDrv //
-      { meta = if attrs ? meta then attrs.meta else {};
-        passthru = if attrs ? passthru then attrs.passthru else {};
-      };
-
-
   /* Run a derivation in a Linux virtual machine (using Qemu/KVM).  By
      default, there is no disk image; the root filesystem is a tmpfs,
      and /nix/store is shared with the host (via the CIFS protocol to
@@ -282,7 +273,7 @@ rec {
      `run-vm' will be left behind in the temporary build directory
      that allows you to boot into the VM and debug it interactively. */
      
-  runInLinuxVM = modifyDerivation (attrs: {
+  runInLinuxVM = drv: lib.overrideDerivation drv (attrs: {
     builder = "${bash}/bin/sh";
     args = ["-e" (vmRunCommand qemuCommandLinux)];
     origArgs = attrs.args;
@@ -317,7 +308,7 @@ rec {
      - Reboot to shutdown the machine (because Qemu doesn't seem
        capable of a APM/ACPI VM shutdown).
   */
-  runInGenericVM = modifyDerivation (attrs: {
+  runInGenericVM = drv: lib.overrideDerivation drv (attrs: {
     system = "i686-linux";
     builder = "${bash}/bin/sh";
     args = ["-e" (vmRunCommand qemuCommandGeneric)];
@@ -782,6 +773,28 @@ rec {
       archs = ["noarch" "x86_64"];
     } // args);
 
+    fedora12i386 = args: makeImageFromRPMDist ({
+      name = "fedora-12-i386";
+      fullName = "Fedora 12 (i386)";
+      packagesList = fetchurl {
+        url = mirror://fedora/linux/releases/12/Fedora/i386/os/repodata/92857daf45687583ffa0fa6f8f97c71d08c50d8b6305dfeea8a3332bf2f7f27c-primary.xml.gz;
+        sha256 = "0z7jyzr2ncx3m3pdy1b3ic6wa20xqybqyvzsl3zq6xb88nppv1cj";
+      };
+      urlPrefix = mirror://fedora/linux/releases/12/Fedora/i386/os;
+      archs = ["noarch" "i386" "i586" "i686"];
+    } // args);
+
+    fedora12x86_64 = args: makeImageFromRPMDist ({
+      name = "fedora-12-x86_64";
+      fullName = "Fedora 12 (x86_64)";
+      packagesList = fetchurl {
+        url = mirror://fedora/linux/releases/12/Fedora/x86_64/os/repodata/a4ebee776b3c4898086e124a512e7f8c701ab1699fd83b2dcea3d7592b5c9ff0-primary.xml.gz;
+        sha256 = "1w4zbhmmkmx3rqnkpn4zd6qilw4cgwp52jhjdq49hj1wddvyxsx4";
+      };
+      urlPrefix = mirror://fedora/linux/releases/12/Fedora/x86_64/os;
+      archs = ["noarch" "x86_64"];
+    } // args);
+
     opensuse103i386 = args: makeImageFromRPMDist ({
       name = "opensuse-10.3-i586";
       fullName = "openSUSE 10.3 (i586)";
@@ -1100,6 +1113,8 @@ rec {
     fedora10x86_64 = diskImageExtraFuns.fedora10x86_64 [];
     fedora11i386 = diskImageExtraFuns.fedora11i386 [];
     fedora11x86_64 = diskImageExtraFuns.fedora11x86_64 [];
+    fedora12i386 = diskImageExtraFuns.fedora12i386 [];
+    fedora12x86_64 = diskImageExtraFuns.fedora12x86_64 [];
     opensuse103i386 = diskImageExtraFuns.opensuse103i386 [];
     opensuse110i386 = diskImageExtraFuns.opensuse110i386 [];
     opensuse110x86_64 = diskImageExtraFuns.opensuse110x86_64 [];
@@ -1133,6 +1148,8 @@ rec {
     fedora10x86_64 = extraVirtualPackages : diskImageFuns.fedora10x86_64 { packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
     fedora11i386 = extraVirtualPackages : diskImageFuns.fedora11i386 { packages = commonFedoraPackages     ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
     fedora11x86_64 = extraVirtualPackages : diskImageFuns.fedora11x86_64 { packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
+    fedora12i386 = extraVirtualPackages : diskImageFuns.fedora12i386 { packages = commonFedoraPackages     ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
+    fedora12x86_64 = extraVirtualPackages : diskImageFuns.fedora12x86_64 { packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
     opensuse103i386 = extraVirtualPackages : diskImageFuns.opensuse103i386 { packages = commonOpenSUSEPackages ++ ["devs"] ++ extraVirtualPackages; };
     opensuse110i386 = extraVirtualPackages : diskImageFuns.opensuse110i386 { packages = commonOpenSUSEPackages ++ extraVirtualPackages; };
     opensuse110x86_64 = extraVirtualPackages : diskImageFuns.opensuse110x86_64 { packages = commonOpenSUSEPackages ++ extraVirtualPackages; };

pkgs/data/documentation/std-man-pages/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "std-man-pages-4.2.2";
+  name = "std-man-pages-4.4.0";
   
   src = fetchurl {
-    url = mirror://gcc/libstdc++/doxygen/libstdc++-man-4.2.2.tar.bz2;
-    sha256 = "1572a5hlrj50gk03aardlrhhila0yjlvhqszl424297ga4g95mk2";
+    url = mirror://gcc/libstdc++/doxygen/libstdc++-man.4.4.0.tar.bz2;
+    sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v";
   };
 
   installPhase = ''

pkgs/data/fonts/clearlyU/1.9.nix

@@ -18,7 +18,7 @@ args : with args; with builderDefs;
 	});
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "clearlyU-12-"+version;
+	name = "clearlyU-12-1.9";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);

pkgs/data/fonts/junicode/0.6.15.nix

@@ -16,7 +16,7 @@ args : with args; with builderDefs;
 	});
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "junicode-"+version;
+	name = "junicode-0.6.15";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);

pkgs/data/fonts/libertine/2.7.bin.nix

@@ -8,7 +8,7 @@ rec{
   buildInputs = [];
   phaseNames = ["doUnpack" "installFonts"];
 
-  name = "linux-libertine-" + version;
+  name = "linux-libertine-2.7";
   meta = {
     description = "Linux Libertine Fonts";
     homepage = http://linuxlibertine.sf.net;

pkgs/data/fonts/libertine/2.7.nix

@@ -15,7 +15,7 @@ rec {
     ScaleToEm(1000);
   '';
 
-  name = "linux-libertine-" + version;
+  name = "linux-libertine-2.7";
   meta = {
     description = "Linux Libertine Fonts";
     homepage = http://linuxlibertine.sf.net;

pkgs/data/fonts/lmodern/0.92.nix

@@ -1,32 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/l/lmodern/lmodern_0.92.orig.tar.gz;
-    sha256 = "0ak3n7fsi2va94gsn0pfmyby2b4g7wz9h5a0prpbx24ax1xwinls";
-  };
-
-  buildInputs = [];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doCopy"];
-
-  doCopy = fullDepEntry(''
-    ensureDir $out/share/texmf/fonts/enc 
-    ensureDir $out/share/texmf/fonts/map 
-    ensureDir $out/share/texmf/fonts/type1/public/lm 
-    ensureDir $out/share/texmf/dvips/lm 
-    ensureDir $out/share/texmf/dvipdfm/config
-
-    cp -r ./* $out/share/texmf/
-
-    cp dvips/lm/*.enc $out/share/texmf/fonts/enc
-    cp dvips/lm/*.map $out/share/texmf/fonts/map
-    cp dvips/lm/*.map $out/share/texmf/dvipdfm/config
-  '') ["minInit" "defEnsureDir" "doUnpack"];
-
-  name = "lmodern-" + version;
-  meta = {
-    description = "Latin Modern font";
-  };
-}

pkgs/data/fonts/lmodern/default.nix

@@ -1,25 +1,21 @@
-args : with args; 
-rec {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "lmodern-1.010x";
+  
   src = fetchurl {
     url = http://ftp.de.debian.org/debian/pool/main/l/lmodern/lmodern_1.010x.orig.tar.gz;
     sha256 = "0nwxj1ng7rvnp16jxcs25hbc5in65mdk4a3g3rlaq91i5qpq7mxj";
   };
 
-  buildInputs = [];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doCopy"];
-
-  doCopy = fullDepEntry(''
+  installPhase = ''
     ensureDir $out/share/texmf/
     ensureDir $out/share/fonts/
 
     cp -r ./* $out/share/texmf/
     cp -r fonts/{opentype,type1} $out/share/fonts/
-  '') ["minInit" "defEnsureDir" "doUnpack"];
+  '';
 
-  name = "lmodern-" + version;
   meta = {
     description = "Latin Modern font";
   };

pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix

@@ -15,7 +15,7 @@ args : with args; with builderDefs;
 	});
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "wqy-zenhei-"+version;
+	name = "wqy-zenhei-0.4.23-1";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);

pkgs/desktops/kde-4.3/accessibility/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdeaccessibility-4.3.3";
+  name = "kdeaccessibility-4.3.4";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/kdeaccessibility-4.3.3.tar.bz2;
-    sha1 = "g71fn825bd3ici3vypjgnizypgv345hw";
+    url = mirror://kde/stable/4.3.4/src/kdeaccessibility-4.3.4.tar.bz2;
+    sha1 = "96aa150b8a5c368b6bb36476ed5fb3e3b3c30547";
   };
   includeAllQtDirs=true;
   buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 phonon ];

pkgs/desktops/kde-4.3/admin/default.nix

@@ -3,10 +3,10 @@
 , kdelibs, kdepimlibs, kdebindings, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdeadmin-4.3.3";
+  name = "kdeadmin-4.3.4";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/kdeadmin-4.3.3.tar.bz2;
-    sha1 = "xaps0gpjv68gn9d2vw3iq0568yxk1ilh";
+    url = mirror://kde/stable/4.3.4/src/kdeadmin-4.3.4.tar.bz2;
+    sha1 = "8f61aeb2ff9d51712d72cd77dad837c8902b6a5d";
   };
   builder = ./builder.sh;
   inherit system_config_printer;

pkgs/desktops/kde-4.3/artwork/default.nix

@@ -2,10 +2,10 @@
 , kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}:
 
 stdenv.mkDerivation {
-  name = "kdeartwork-4.3.3";
+  name = "kdeartwork-4.3.4";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/kdeartwork-4.3.3.tar.bz2;
-    sha1 = "r3gpy7d7g6arb0vlnp6959ly6c5dcrbj";
+    url = mirror://kde/stable/4.3.4/src/kdeartwork-4.3.4.tar.bz2;
+    sha1 = "7a095932bad297f22b23765ce6ee17bfd2438bf2";
   };
   includeAllQtDirs=true;
   buildInputs = [ cmake qt4 perl xscreensaver

pkgs/desktops/kde-4.3/base-runtime/default.nix

@@ -2,10 +2,10 @@
 , kdelibs, automoc4, phonon, strigi, soprano, cluceneCore}:
 
 stdenv.mkDerivation {
-  name = "kdebase-runtime-4.3.3";
+  name = "kdebase-runtime-4.3.4";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/kdebase-runtime-4.3.3.tar.bz2;
-    sha1 = "lb4y1pgflp112g98plzm4q9wpdnbkw23";
+    url = mirror://kde/stable/4.3.4/src/kdebase-runtime-4.3.4.tar.bz2;
+    sha1 = "871d23457c4a2676704722e2e3b7194d447904ee";
   };
 /*  CLUCENE_HOME=cluceneCore;*/
   includeAllQtDirs=true;

pkgs/desktops/kde-4.3/base-workspace/default.nix

@@ -6,10 +6,10 @@
 }:
 
 stdenv.mkDerivation {
-  name = "kdebase-workspace-4.3.3";
+  name = "kdebase-workspace-4.3.4";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/kdebase-workspace-4.3.3.tar.bz2;
-    sha1 = "kl5brn6c2nahxmavd38fmy6frq9yjf98";
+    url = mirror://kde/stable/4.3.4/src/kdebase-workspace-4.3.4.tar.bz2;
+    sha1 = "5b43447139d22247d5bc2deee8e3a944447f0bbf";
   };
   includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;

pkgs/desktops/kde-4.3/base/default.nix

@@ -3,10 +3,10 @@
 , automoc4, phonon, strigi, qimageblitz, soprano}:
 
 stdenv.mkDerivation {
-  name = "kdebase-4.3.3";
+  name = "kdebase-4.3.4";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/kdebase-4.3.3.tar.bz2;
-    sha1 = "57ihndwiq8nx5v964s0b8q9965sylnbl";
+    url = mirror://kde/stable/4.3.4/src/kdebase-4.3.4.tar.bz2;
+    sha1 = "7f8637367177c93916dfc2e6a2f6323a5e91c6ce";
   };
   includeAllQtDirs=true;
   buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394

pkgs/desktops/kde-4.3/bindings/default.nix

@@ -5,10 +5,10 @@
 # some bindings are even broken.
 
 stdenv.mkDerivation {
-  name = "kdebindings-4.3.3";
+  name = "kdebindings-4.3.4";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/kdebindings-4.3.3.tar.bz2;
-    sha1 = "8101wqhahlmrrpdr4f32p5iqsgawzp9l";
+    url = mirror://kde/stable/4.3.4/src/kdebindings-4.3.4.tar.bz2;
+    sha1 = "0c7bf45bd3d81bf6aa1d2b085c17b4ce925c656b";
   };
   builder = ./builder.sh;
   includeAllQtDirs=true;

pkgs/desktops/kde-4.3/default.nix

@@ -218,6 +218,12 @@ pkgs.recurseIntoAttrs (rec {
     inherit automoc4 phonon strigi soprano;
   };
 
+  filelight = import ./extragear/filelight {
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl;
+    inherit kdelibs kdebase_workspace;
+    inherit automoc4 phonon qimageblitz;
+  };
+
   kdesvn = import ./extragear/kdesvn {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4;
     inherit kdelibs;

pkgs/desktops/kde-4.3/edu/default.nix

@@ -3,10 +3,10 @@
 , kdelibs, automoc4, phonon, eigen}:
 
 stdenv.mkDerivation {
-  name = "kdeedu-4.3.3";
+  name = "kdeedu-4.3.4";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/kdeedu-4.3.3.tar.bz2;
-    sha1 = "d1cmnmmq1m9yqh694xipy1s8wnkviqgx";
+    url = mirror://kde/stable/4.3.4/src/kdeedu-4.3.4.tar.bz2;
+    sha1 = "ee646d57db11b761d8da33fc03c596c8f531eb9d";
   };
   includeAllQtDirs=true;
   buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml xplanet

pkgs/desktops/kde-4.3/extragear/filelight/default.nix

@@ -0,0 +1,19 @@
+{stdenv, fetchurl, lib, cmake, qt4, perl, qimageblitz, kdelibs, kdebase_workspace,
+automoc4, phonon}:
+
+stdenv.mkDerivation {
+  name = "filelight-1.9rc3";
+  src = fetchurl {
+    url = http://www.kde-apps.org/CONTENT/content-files/99561-filelight-1.9rc3.tgz;
+    sha256 = "0ljyx23j4cvrsi1dvmxila82q2cd26barmcvc8qmr74kz6pj78sq";
+  };
+  includeAllQtDirs=true;
+  buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon 
+    qimageblitz ];
+  meta = {
+    description = "Shows disk usage as an interactive map of concentric rings";
+    license = "GPL";
+    homepage = http://www.methylblue.com/filelight/;
+    maintainers = [ lib.maintainers.viric ];
+  };
+}

pkgs/desktops/kde-4.3/extragear/kdesvn/default.nix

@@ -2,10 +2,10 @@
 , kdelibs, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdesvn-1.4.0";
+  name = "kdesvn-1.4.1";
   src = fetchurl {
-    url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.4.0.tar.bz2;
-    sha256 = "0rb213jybs9mgiwvphk8dhryz6q9m6qvxl1m7bqwzars48cspgl0";
+    url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.4.1.tar.bz2;
+    sha256 = "1xaankj3zl1wxm1zf9dayb9qwnp9s5xx964p83w7pcsir4h5959z";
   };
   includeAllQtDirs=true;
   builder = ./builder.sh;

pkgs/desktops/kde-4.3/extragear/koffice/default.nix

@@ -3,10 +3,10 @@
 , kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen}:
 
 stdenv.mkDerivation {
-  name = "koffice-2.0.2";
+  name = "koffice-2.1.0";
   src = fetchurl {
-    url = mirror://kde/stable/koffice-2.0.2/src/koffice-2.0.2.tar.bz2;
-    sha256 = "1nvpj8viw7ijjnz1pg6kdb21srsm13vh6c1v7s01hn4xrv9zwyic";
+    url = mirror://kde/stable/koffice-2.1.0/koffice-2.1.0.tar.bz2;
+    sha256 = "1jdc2rvj5xqd66d152zmjz2psq44kbraqpl0fq05yjg2wz8kdsln";
   }; 
   includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;

pkgs/desktops/kde-4.3/extragear/konversation/default.nix

@@ -2,10 +2,10 @@
 , kdelibs, kdepimlibs, automoc4, phonon, qca2}:
 
 stdenv.mkDerivation {
-  name = "konversation";
+  name = "konversation-1.2.1";
   src = fetchurl {
-    url = mirror://kde/stable/konversation/1.2/src/konversation-1.2.tar.bz2;
-    sha256 = "16plhy7m8sch52a8hyzsqgc10wj4lgygqbwicfssbad7l6j2a935";
+    url = mirror://kde/stable/konversation/1.2.1/src/konversation-1.2.1.tar.bz2;
+    sha256 = "1rx4xgw14cfzkxghgn80np8i2ndq26sbdvv96g46r0s14qkdyq8w";
   };
   includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;

pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix

@@ -2,10 +2,10 @@
  kdelibs, kdepimlibs, kdebase_workspace, automoc4, phonon, qca2}:
 
 stdenv.mkDerivation {
-  name = "ktorrent-3.2.4";
+  name = "ktorrent-3.3.1";
   src = fetchurl {
-    url = http://ktorrent.org/downloads/3.2.4/ktorrent-3.2.4.tar.bz2;
-    sha256 = "1h06fwjykmk4sxjfsic0a42wfh4wwaa9z6a4470vwi5fyx2apxbn";
+    url = http://ktorrent.org/downloads/3.3.1/ktorrent-3.3.1.tar.bz2;
+    sha256 = "15cyq9bixism15qb3g196ga47q6iyw68sizclcn43nw91g0xl9r1";
   };
   includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;

pkgs/desktops/kde-4.3/games/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, qca2}:
 
 stdenv.mkDerivation {
-  name = "kdegames-4.3.3";
+  name = "kdegames-4.3.4";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/kdegames-4.3.3.tar.bz2;
-    sha1 = "2xy5wvk51rxbifwp28rgby776kwq93vz";
+    url = mirror://kde/stable/4.3.4/src/kdegames-4.3.4.tar.bz2;
+    sha1 = "33ea8ec476b1557a55c90c071bd462e5ceb7c52b";
   };
   includeAllQtDirs=true;
   buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon qca2 ];

pkgs/desktops/kde-4.3/graphics/default.nix

@@ -3,10 +3,10 @@
 , kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}:
 
 stdenv.mkDerivation {
-  name = "kdegraphics-4.3.3";
+  name = "kdegraphics-4.3.4";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/kdegraphics-4.3.3.tar.bz2;
-    sha1 = "8krz6r99lnkdj1ywwhwvykyzdrd1blzk";
+    url = mirror://kde/stable/4.3.4/src/kdegraphics-4.3.4.tar.bz2;
+    sha1 = "bb32171b0d562d5698d4f0526be2b069e99f7448";
   };
   includeAllQtDirs=true;
   buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib

pkgs/desktops/kde-4.3/l10n/default.nix

@@ -4,7 +4,7 @@
 let
 
   deriv = attr : stdenv.mkDerivation {
-    name = "kde-l10n-${attr.lang}-4.3.3";
+    name = "kde-l10n-${attr.lang}-4.3.4";
     src = fetchurl {
       url = attr.url;
       sha256 = attr.sha256;
@@ -24,356 +24,356 @@ in
 
   ar = deriv {
     lang = "ar";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ar-4.3.3.tar.bz2";
-    sha256 = "0js4w2lgrffszg8xvgvvjd0ql41s8bfd4k8arzg0ym4rinsghb6f";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ar-4.3.4.tar.bz2";
+    sha256 = "0dgk97j0qv8qxfhiwv0cwqbmfgnxn0k7znm7vd40ngblbp4k75y1";
   };
 
   bg = deriv {
     lang = "bg";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-bg-4.3.3.tar.bz2";
-    sha256 = "1ys5f4rsvkm8f8dzyfka51rpkj02qrd3j4mcccsp963mgw9s12lk";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-bg-4.3.4.tar.bz2";
+    sha256 = "13mshqlskqndfm20s07978300p5ik432krhdk9k5a049f7w543dp";
   };
 
   bn_IN = deriv {
     lang = "bn_IN";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-bn_IN-4.3.3.tar.bz2";
-    sha256 = "1mf260w44i9267rdvvi26lj7qhywndhm66sbrsgic06gibmb3g45";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-bn_IN-4.3.4.tar.bz2";
+    sha256 = "0zh7zra2si0z966r8qq41m3g4l9864acfg70hjbgr4bhvhn642zd";
   };
 
   ca = deriv {
     lang = "ca";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ca-4.3.3.tar.bz2";
-    sha256 = "0xqdiv3sydbmncfh2sh53dqqhi205mdbq6iphinbzsr09xjcrqr3";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ca-4.3.4.tar.bz2";
+    sha256 = "1ry403z9qgimcj8nilznr0f7bkviybcpwm3clww13na74ngmz4a1";
   };
 
   cs = deriv {
     lang = "cs";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-cs-4.3.3.tar.bz2";
-    sha256 = "0wb2ld2shjvyglajqip0s91q8y9sry6a3jwmr3g221gh6xz49dil";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-cs-4.3.4.tar.bz2";
+    sha256 = "1gd0rl0c59fawd7s20nrmnc5vr915aqhz7f57wrgpw2kxgva33nk";
   };
 
   csb = deriv {
     lang = "csb";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-csb-4.3.3.tar.bz2";
-    sha256 = "1q65365mqsrjg7j59s1dkx03m4hmwq45aa0yzkw5np8sgvf7f65z";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-csb-4.3.4.tar.bz2";
+    sha256 = "02b8341cpgzbp4ijnzs8bkvynz9mhz18ma5yk66i9q0js6rk8bn2";
   };
 
   da = deriv {
     lang = "da";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-da-4.3.3.tar.bz2";
-    sha256 = "0s649zxpqcigpj3yar48liaf5jcmb3m2q0azfm9cwgkvmz9gd1nz";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-da-4.3.4.tar.bz2";
+    sha256 = "1r7kn5qdcx64p0rlj9mb3011hk5rvrqzvr8k6nrfsfmw2h7mnjym";
   };
 
   de = deriv {
     lang = "de";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-de-4.3.3.tar.bz2";
-    sha256 = "1p4lz80myhrq7gq1gmpfhlw9i32ca0s4z7gni9rlsv5dhsbpmcsf";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-de-4.3.4.tar.bz2";
+    sha256 = "0nclr4chx2ir036fjhs7zp2l1k43vn11lww7338v2nn9mcwfdyn3";
   };
 
   el = deriv {
     lang = "el";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-el-4.3.3.tar.bz2";
-    sha256 = "01ym4yxdh2xghwc6mngs0iyw8idvmv3c4k6lkf9hasbkcr77s0dn";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-el-4.3.4.tar.bz2";
+    sha256 = "104ycjq95zhkv2by36lndqc2w2shn3dp386ir5wj52x4f26j1zd0";
   };
 
   en_GB = deriv {
     lang = "en_GB";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-en_GB-4.3.3.tar.bz2";
-    sha256 = "074is29a0h69ypk82s051f037aqcpflnaapwlccrz24x2hncw3zb";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-en_GB-4.3.4.tar.bz2";
+    sha256 = "044s656x90xdgp14cddsz499bxfhsscnngvx4q13pnxrd2gbr2xj";
   };
 
   es = deriv {
     lang = "es";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-es-4.3.3.tar.bz2";
-    sha256 = "1ygx2cyvgfz09i8x9wpynlaisvxv70n5p9r0hq72yypjxd1nqixb";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-es-4.3.4.tar.bz2";
+    sha256 = "0fx40sx0cqjashlj9z9da2jndwbg6s36njsgsx6kjfd90p23snvi";
   };
 
   et = deriv {
     lang = "et";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-et-4.3.3.tar.bz2";
-    sha256 = "0yxvq1ggbqvrm45ljriibnz9s2zarszyk8wxjb1zsxlqs34ym02h";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-et-4.3.4.tar.bz2";
+    sha256 = "08s9y9h9qx2ahz1chmlcycldmf543c0kc8wfrsryrf1iaajdma0r";
   };
 
   eu = deriv {
     lang = "eu";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-eu-4.3.3.tar.bz2";
-    sha256 = "1x6r31s0zyxi5sdnfr5ldbvhfdbm5fcgfqxxz8x6sfm4zrpc8mhv";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-eu-4.3.4.tar.bz2";
+    sha256 = "1q0vjvbc6lywpqzizi61cz91scrkjplxjp2jywyi6dnrv475w6b9";
   };
 
   fi = deriv {
     lang = "fi";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-fi-4.3.3.tar.bz2";
-    sha256 = "0wky41anl3p3ml0rccg9153s442mxncwzp784qpczlczrihg7sly";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-fi-4.3.4.tar.bz2";
+    sha256 = "1z2jmcmr46f0a5hins4hkj843r3bd6azykiz6nwwkgk7png21axm";
   };
 
   fr = deriv {
     lang = "fr";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-fr-4.3.3.tar.bz2";
-    sha256 = "0mvsgyrf15yr4g24hfmiis54i68byyq35x09j0hrsn79z2wszgba";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-fr-4.3.4.tar.bz2";
+    sha256 = "07fi4c7k9h69m5jacp0vlyd268gxljh2j3hj9fk5vka4333rp2x0";
   };
 
   fy = deriv {
     lang = "fy";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-fy-4.3.3.tar.bz2";
-    sha256 = "1c03w0ac9q3fxgjfyw1iq5lcq0n6hr8k8mpn7b3zr9rrvfdsldx5";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-fy-4.3.4.tar.bz2";
+    sha256 = "1l22bjccdxnsqgsns3nbh5wwplacbjgxhw72lvysnc3c7kkjm789";
   };
 
   ga = deriv {
     lang = "ga";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ga-4.3.3.tar.bz2";
-    sha256 = "16032253hs5ikhi6f8j1l4lyy739kpks8qqmh205xxcx5fha9xjh";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ga-4.3.4.tar.bz2";
+    sha256 = "1kkz7gsyfpzrvy7pg2gajw24jybr8crk5yighp9mqa337cqjma6z";
   };
 
   gl = deriv {
     lang = "gl";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-gl-4.3.3.tar.bz2";
-    sha256 = "0d6j4ln5xz1m4r67ldc7byi4yd0p2gbwq7xpms36yrpyg1zx7r93";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-gl-4.3.4.tar.bz2";
+    sha256 = "161dh3w3jwrlzk83is3v25nvaxi5441n3q3bp6kg1fc1jqsinyr0";
   };
 
   gu = deriv {
     lang = "gu";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-gu-4.3.3.tar.bz2";
-    sha256 = "12cgplf9z0lsqslnwjbcbzkkz4g37n6h579gdcj3cs8gfmxja1mj";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-gu-4.3.4.tar.bz2";
+    sha256 = "1i69ma0cw85rf0gxa1wzlbmdhqm3lzyk1br4m4m6iz68am61pkdr";
   };
 
   he = deriv {
     lang = "he";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-he-4.3.3.tar.bz2";
-    sha256 = "0izvz3zry36ypbqn34gx68z3hwik0dmykhbgnhm0xhcapjjhq95r";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-he-4.3.4.tar.bz2";
+    sha256 = "0353x14wmh9r1q46vcn2m9sp6fvrfzkj55v0kh0xbh4jdprw8cpn";
   };
 
   hi = deriv {
     lang = "hi";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-hi-4.3.3.tar.bz2";
-    sha256 = "1pqplq1b6vv60z6nwigiymh2n7gwhwhpjnkq84dml7p1jxabwckj";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-hi-4.3.4.tar.bz2";
+    sha256 = "1wing32i5f12qn3w6f4zlf7dwvarf8wwzxxvb1jjld16m7vxkksx";
   };
 
   hne = deriv {
     lang = "hne";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-hne-4.3.3.tar.bz2";
-    sha256 = "17hkpx4adb3j7vzfij5dc3imqxgd76gpa3vknwmj1d7znzhf484c";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-hne-4.3.4.tar.bz2";
+    sha256 = "149nahrhybv8cyxdqwdj7p787vsh902yr73r7a0l1sjblisrx84g";
   };
 
   hr = deriv {
     lang = "hr";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-hr-4.3.3.tar.bz2";
-    sha256 = "0kciza7zbxv6gr0hk1hpg0fcm5v0anw3p3bzsmaj8svsymkvqkmr";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-hr-4.3.4.tar.bz2";
+    sha256 = "0wg2qahvz8lanv4kqp5128paja7sai68prbincfgfwbi4xdbkfnq";
   };
 
   hu = deriv {
     lang = "hu";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-hu-4.3.3.tar.bz2";
-    sha256 = "1m290f1aw8rq2nmybi2dd5xbdyv50d5ma29jjc55i7cqjbh9vn9a";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-hu-4.3.4.tar.bz2";
+    sha256 = "05vkqxrw3rxb2brm3ggb600al1ggrv739qdfc1m659m1qxhnxgjw";
   };
 
   is = deriv {
     lang = "is";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-is-4.3.3.tar.bz2";
-    sha256 = "1pjbi3a7hskgg3wd43nfddjjhnwy4r824zl6gdxrc42x8j8gh5r0";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-is-4.3.4.tar.bz2";
+    sha256 = "0212ymk3h58bmhaccprn5wfs65fhcpaq73dnqp3v0xmgkfnz6dhy";
   };
 
   it = deriv {
     lang = "it";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-it-4.3.3.tar.bz2";
-    sha256 = "1p9njh83k0zdczwyzilxfv50nw31mpdh466yid5y9973b6chbfzb";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-it-4.3.4.tar.bz2";
+    sha256 = "0h72ln0jwizxg86kwk6m1zi1wws14prv9xvlzhbmyvcb0sa98v75";
   };
 
   ja = deriv {
     lang = "ja";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ja-4.3.3.tar.bz2";
-    sha256 = "07p3rg1iysgrpz13ac81gvqi26syyfwc0568gr3plk40xnkvs0bl";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ja-4.3.4.tar.bz2";
+    sha256 = "0nw4ybl429y3d9d58y13gyaxzrkrvjgxz4vn68ryn8vlb8d0sb6j";
   };
 
   kk = deriv {
     lang = "kk";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-kk-4.3.3.tar.bz2";
-    sha256 = "0bpr89798kfs9g59pq6yl5zvzdranlk6kzxpiqxzdrw65rj1r2fy";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-kk-4.3.4.tar.bz2";
+    sha256 = "01j28srx3vbgs8l0vv30fx3ki05i18ddf6sg2jqdli4ylg517l66";
   };
 
   km = deriv {
     lang = "km";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-km-4.3.3.tar.bz2";
-    sha256 = "0niifkgrqqwdaq1fcgck8v9lj8x8facp3zpxjzmf04cbr70wjy3b";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-km-4.3.4.tar.bz2";
+    sha256 = "1zdbvgn1lz9lyzrkhjf05k7n1cpdjwzv1v62aja7h438qn8scqnh";
   };
 
   kn = deriv {
     lang = "kn";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-kn-4.3.3.tar.bz2";
-    sha256 = "0f9ksq1540bmjy57b2civ44javniqn4xvkmg8411kwh50ccx7qby";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-kn-4.3.4.tar.bz2";
+    sha256 = "193ibxndpgl400djlggwsy6h3mjdkhmvmc5dalh9h2k3fz9fdswn";
   };
 
   ko = deriv {
     lang = "ko";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ko-4.3.3.tar.bz2";
-    sha256 = "03n4ifhh5ki9i9dhdzzqypg7iz7h7fdnanbv76v3nhklbkdw5aap";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ko-4.3.4.tar.bz2";
+    sha256 = "1888mwknd4l8rcs01w1mi7147cl9phylxjpcsmg3gda61pq12035";
   };
 
   ku = deriv {
     lang = "ku";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ku-4.3.3.tar.bz2";
-    sha256 = "0mbjy88m57sljw12lman98bb60iv528qw223hl2rwi5kpjbzbf4a";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ku-4.3.4.tar.bz2";
+    sha256 = "1w70dc75k6s8mpn1fraz1znknfz6cpdbb96frh611fz3r3hzgaix";
   };
 
   lt = deriv {
     lang = "lt";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-lt-4.3.3.tar.bz2";
-    sha256 = "0xwbqla7vqnbmpj0pk3p6lx0isfcyqximxzrh28pajgjrdq9q441";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-lt-4.3.4.tar.bz2";
+    sha256 = "098cw3hz9w0kb2b33p5qwxli4z38qw4rcby4j75hwm66l6fw9iqk";
   };
 
   lv = deriv {
     lang = "lv";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-lv-4.3.3.tar.bz2";
-    sha256 = "16jf1ci6v1n8b7sl7dadv5j3axjmicdrfm1d390bs1yqgv43g26a";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-lv-4.3.4.tar.bz2";
+    sha256 = "08rfi68mz8iarmscvnn11b1gyr7k2j0gyhs7673gnk5m3avmz2ab";
   };
 
   mai = deriv {
     lang = "mai";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-mai-4.3.3.tar.bz2";
-    sha256 = "1mir9yxqb6j52aippjhz2s8z4ya8gnram8bw09bfxlg90ws2q09c";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-mai-4.3.4.tar.bz2";
+    sha256 = "0pkad1rchrra15jjij4r76xy26zkmshm80amqfn8ba9nabxr7nxa";
   };
 
   mk = deriv {
     lang = "mk";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-mk-4.3.3.tar.bz2";
-    sha256 = "0j4h3xaqsl3v7j5lf8n49w5i0n2x37mg5vpipknd72h57k6qqqmd";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-mk-4.3.4.tar.bz2";
+    sha256 = "041iw3754j5x6b02yzk6zyy0fggmx1lq1kgv1d3g5nxv2a4dp311";
   };
 
   ml = deriv {
     lang = "ml";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ml-4.3.3.tar.bz2";
-    sha256 = "04rpijjnbaj5267adcf7l85i1m5rdn10712vhmdfscsy7mikdlwv";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ml-4.3.4.tar.bz2";
+    sha256 = "0y6050gb5vrlpbimackzzpsv08j8zxp67cg2gdn4x0v31xpvpxfr";
   };
 
   mr = deriv {
     lang = "mr";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-mr-4.3.3.tar.bz2";
-    sha256 = "0mdp2rls0zykdb9ldqqk1413f70amvbla5a06gqan47js8smmywb";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-mr-4.3.4.tar.bz2";
+    sha256 = "08asxp8g0qijla04m29lb16544gdibk6d4vf92zmcsff04a1wis2";
   };
 
   nb = deriv {
     lang = "nb";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-nb-4.3.3.tar.bz2";
-    sha256 = "00lqjp5sg0dqw2c9cxqrx4y3vk3v4k713xj7nc4qkm172yrsngqb";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-nb-4.3.4.tar.bz2";
+    sha256 = "179p6ha1py6j9rinzknqqcr8p062x3g9jz2m160vklsc780y1whw";
   };
 
   nds = deriv {
     lang = "nds";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-nds-4.3.3.tar.bz2";
-    sha256 = "11mjzs49zy6w45z22jlcj3kg0xvzrqfqgcm2l037hqs04djlgcck";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-nds-4.3.4.tar.bz2";
+    sha256 = "144rsvkw2qr4cd8zh0sxpvnc3rh17i23l3pxhpk65ldq6b7xnybb";
   };
 
   nl = deriv {
     lang = "nl";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-nl-4.3.3.tar.bz2";
-    sha256 = "15rfawzmzmvamvi1jnlzn4whksv595nhjajlfav6ps7wfphiwa7i";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-nl-4.3.4.tar.bz2";
+    sha256 = "15gnqpg7blc3aj2pdj5pswmimlyhic18jqrlgjk3xsxq4744r4wc";
   };
 
   nn = deriv {
     lang = "nn";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-nn-4.3.3.tar.bz2";
-    sha256 = "0pfa6ssgyv0b9vaggsi8bx7p0y1c8a99mdy5ngpd22qc3j885vnf";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-nn-4.3.4.tar.bz2";
+    sha256 = "0414fmkm19n5bjvbdcxh9vkn0hmpk3w2r60lvm7gmpi8zdak0p2p";
   };
 
   pa = deriv {
     lang = "pa";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-pa-4.3.3.tar.bz2";
-    sha256 = "08l6mbcmsck00g1p8mpjmsrx5yjnrccpx77r2vshi07bp5lj6d2l";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-pa-4.3.4.tar.bz2";
+    sha256 = "0974jsd3l70ygipzf0fv5zvs9ykyn4c6dnm9gf0krdzxskrimfxp";
   };
 
   pl = deriv {
     lang = "pl";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-pl-4.3.3.tar.bz2";
-    sha256 = "05nfkc4zg9nafms1v325vk05ndcgx27j8yxgds2radilzdqay6pb";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-pl-4.3.4.tar.bz2";
+    sha256 = "0f5hr7mff4a8hpwapz67wjlg02jwdnainaa8jk2j64lwzbswybyr";
   };
 
   pt = deriv {
     lang = "pt";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-pt-4.3.3.tar.bz2";
-    sha256 = "1nv7k5091617xqnxzn6ssg6sqf822vygv707b02dragmp5l85s0y";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-pt-4.3.4.tar.bz2";
+    sha256 = "07bclil0lhr59faqr8a59bfmvsdjla0pg0x0a4qqmnqhhan1ki3p";
   };
 
   pt_BR = deriv {
     lang = "pt_BR";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-pt_BR-4.3.3.tar.bz2";
-    sha256 = "08y1482w8bjzwzad5b7igk4b9gsm1qnyqrg4pjjnii9886rgj37x";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-pt_BR-4.3.4.tar.bz2";
+    sha256 = "03y3fk1b2yzp6jbaic76y06522wbq3lzxf1pbc5xi22q3gw14dls";
   };
 
   ro = deriv {
     lang = "ro";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ro-4.3.3.tar.bz2";
-    sha256 = "12khmpq2w3zrpd45l10kr1k5vp73i722kqqf0zkvyc6plvjbcipg";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ro-4.3.4.tar.bz2";
+    sha256 = "0nqdl8jbr29bjdvxdppbmjjgamh68gcg38j8gsh5zp6ak1ac2abc";
   };
 
   ru = deriv {
     lang = "ru";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-ru-4.3.3.tar.bz2";
-    sha256 = "0bjf0d4ss7kvvf0a6d6d5z9sdazfqbvrz6sx9w43dkx6gj4hnbzz";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-ru-4.3.4.tar.bz2";
+    sha256 = "0n5g26p98dshngv35izfc826ahirqppx4ig6ycj9pfza5aakajah";
   };
 
   sk = deriv {
     lang = "sk";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-sk-4.3.3.tar.bz2";
-    sha256 = "0r19i9dwlg46zl22ydz6yjp7rndmldv9cay91ch2fggkwd28m8mm";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-sk-4.3.4.tar.bz2";
+    sha256 = "0jwh0sx09hxz922snak4jxajcl1p3rciycwqw4fgmk6fx5ra7s48";
   };
 
   sl = deriv {
     lang = "sl";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-sl-4.3.3.tar.bz2";
-    sha256 = "0y4rp69wpig9syim5w7xwbif70mqiibz4l3sdzspik4nvx87cn0q";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-sl-4.3.4.tar.bz2";
+    sha256 = "063lbb2g5zpg3330hz749m5kh9hx8xrf7ifj95xjkbkh1sa0g2dm";
   };
 
   sr = deriv {
     lang = "sr";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-sr-4.3.3.tar.bz2";
-    sha256 = "1krw9dh719d3wa1zzlpynfpgpl41i1sr2q9gam2cmg56vn89p9pn";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-sr-4.3.4.tar.bz2";
+    sha256 = "121vdrzk9fm30s8q4m5b7vd3lv3n4azzx7dm62qx84qyx9zs8r4y";
   };
 
   sv = deriv {
     lang = "sv";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-sv-4.3.3.tar.bz2";
-    sha256 = "12kcf9nj98r3vpddgd5ywimxm316yf9f0n94jd9bvcnjz7zw8m0d";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-sv-4.3.4.tar.bz2";
+    sha256 = "192yw9vjwv9s7bdmcndqq0dx0g6djpjbyiq9skpzpq21zphgf0n1";
   };
 
   tg = deriv {
     lang = "tg";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-tg-4.3.3.tar.bz2";
-    sha256 = "1i16l33x1hxdhrmacp5swcm2ha05xhb8aqbm7qpkxp489ffcvyr5";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-tg-4.3.4.tar.bz2";
+    sha256 = "0q90k5fk6f41baiyxl3055y6b55nx7plq7hzlkp1h2d60q2d8yhs";
   };
 
   th = deriv {
     lang = "th";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-th-4.3.3.tar.bz2";
-    sha256 = "0y642apxgzhx74kshsdx4insfzw4na38xvskhrhs0i70wzvs1h6z";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-th-4.3.4.tar.bz2";
+    sha256 = "00jc6dkhpcxc95jkg7v1fsgn2ymk38mqs0h8x1an23jgs5sbl43r";
   };
 
   tr = deriv {
     lang = "tr";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-tr-4.3.3.tar.bz2";
-    sha256 = "0canxvscyazqvm1wxr3wckj7kp03zcmly29liylp3i7s6f6pymws";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-tr-4.3.4.tar.bz2";
+    sha256 = "1igr4fw1h3617kyqhxdgg798k1gdiwxz5g2s59g281vm16r3rg01";
   };
 
   uk = deriv {
     lang = "uk";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-uk-4.3.3.tar.bz2";
-    sha256 = "1i9klbr74g85rpxlflcp3wz9y4y4aydbx9gjbj99flgx4fqq9x9w";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-uk-4.3.4.tar.bz2";
+    sha256 = "0sir7ayb2ydrhl5dbq9ni10l2w45blh9pdd7bpfxmgqz7n1kylp8";
   };
 
   wa = deriv {
     lang = "wa";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-wa-4.3.3.tar.bz2";
-    sha256 = "1p9v4nsavh0rqhwy90zpx4anj3ifi02kqngq6s0ppzrgpck5d6qp";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-wa-4.3.4.tar.bz2";
+    sha256 = "0ip3idiq6sfxzgg872sjw9ra1sy137q9m47ik3fdfcxgfwv7bj1r";
   };
 
   zh_CN = deriv {
     lang = "zh_CN";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-zh_CN-4.3.3.tar.bz2";
-    sha256 = "1jq9qgsdazb1mid09xlm7gql4r8cwpd42cd733sfw942czhyvx42";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-zh_CN-4.3.4.tar.bz2";
+    sha256 = "0c8m6zj3pzr0pkmb6m3h6a5n274s2v8wpp7gfqkxrkardq0scwxb";
   };
 
   zh_TW = deriv {
     lang = "zh_TW";
-    url = "mirror://kde/stable/4.3.3/src/kde-l10n/kde-l10n-zh_TW-4.3.3.tar.bz2";
-    sha256 = "072x1lmdvxvs7vdn37zfgf78xpd1iv4imw6rywp9zhv15dpy9x4r";
+    url = "mirror://kde/stable/4.3.4/src/kde-l10n/kde-l10n-zh_TW-4.3.4.tar.bz2";
+    sha256 = "1xiav7nhvkfpizih845z1cr8avkphvszd4j8i547lcb8xnvvk0bw";
   };
 
 }

pkgs/desktops/kde-4.3/l10n/generate-expr-from-tarballs.pl

@@ -2,7 +2,7 @@
 
 # Typical command to generate the list of tarballs:
 
-# export i="mirror://kde/stable/4.3.3/src/kde-l10n/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs.list
+# export i="mirror://kde/stable/4.3.4/src/kde-l10n/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs.list
 # manually update extra.list
 # then run: cat tarballs-7.4.list extra.list old.list | perl ./generate-expr-from-tarballs.pl
 
@@ -63,7 +63,7 @@ print OUT <<EOF;
 let
 
   deriv = attr : stdenv.mkDerivation {
-    name = "kde-l10n-\${attr.lang}-4.3.3";
+    name = "kde-l10n-\${attr.lang}-4.3.4";
     src = fetchurl {
       url = attr.url;
       sha256 = attr.sha256;

pkgs/desktops/kde-4.3/libs-experimental/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake, qt4, perl, automoc4, kdelibs, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdelibs-experimental-4.3.3";
+  name = "kdelibs-experimental-4.3.4";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/kdelibs-experimental-4.3.3.tar.bz2;
-    sha1 = "5fhzsmpmhpzn923rg25dk9siqpmqzab8";
+    url = mirror://kde/stable/4.3.4/src/kdelibs-experimental-4.3.4.tar.bz2;
+    sha1 = "43e19c44c3cdc1049c9ee9aca2e2f83a48ffe8bd";
   };
   builder = ./builder.sh;
   buildInputs = [ cmake qt4 perl automoc4 kdelibs phonon ];

pkgs/desktops/kde-4.3/libs/default.nix

@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "kdelibs-4.3.3";
+  name = "kdelibs-4.3.4";
   
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/kdelibs-4.3.3.tar.bz2;
-    sha1 = "8pgrd83zsl6m83ysm4slii07w215kdc9";
+    url = mirror://kde/stable/4.3.4/src/kdelibs-4.3.4.tar.bz2;
+    sha1 = "1af2d185c88898b71f36b57f033e3a6d9839ab3d";
   };
   
   includeAllQtDirs = true;

pkgs/desktops/kde-4.3/multimedia/default.nix

@@ -2,10 +2,10 @@
 , kdelibs, kdelibs_experimental, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdemultimedia-4.3.3";
+  name = "kdemultimedia-4.3.4";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/kdemultimedia-4.3.3.tar.bz2;
-    sha1 = "g6dfpv3mfpmgmg8sv7cazyhrl6zmw8fl";
+    url = mirror://kde/stable/4.3.4/src/kdemultimedia-4.3.4.tar.bz2;
+    sha1 = "cf8f2696267ec682ee48fbb0f6171d9e9f7aa4b3";
   };
   includeAllQtDirs=true;
   buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia lame

pkgs/desktops/kde-4.3/network/default.nix

@@ -4,10 +4,10 @@
 , kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}:
 
 stdenv.mkDerivation {
-  name = "kdenetwork-4.3.3";
+  name = "kdenetwork-4.3.4";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/kdenetwork-4.3.3.tar.bz2;
-    sha1 = "1ky5w8cm7pakfw1n9gkrg999wv7z0hmq";
+    url = mirror://kde/stable/4.3.4/src/kdenetwork-4.3.4.tar.bz2;
+    sha1 = "e066c3642d254e1e8213ef511546e960c5658596";
   };
   includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;

pkgs/desktops/kde-4.3/oxygen-icons/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake}:
 
 stdenv.mkDerivation {
-  name = "oxygen-icons-4.3.3";
+  name = "oxygen-icons-4.3.4";
   src = fetchurl {
-    url = mirror://kde/stable/4.3.3/src/oxygen-icons-4.3.3.tar.bz2;
-    sha1 = "b93d8q30ymrpgsj6f5n4ryip5cnf15x8";
+    url = mirror://kde/stable/4.3.4/src/oxygen-icons-4.3.4.tar.bz2;
+    sha1 = "9905f6b5a47db85c05f7387a75b6ae0e0fdd756e";
   };
   buildInputs = [ cmake ];
   meta = {