svn merge ^/nixpkgs/trunk

- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500

doc/stdenv.xml

@@ -70,7 +70,7 @@ stdenv.mkDerivation {
     gcc foo.c -o foo
   '';
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp foo $out/bin
   '';
 }</programlisting>
@@ -112,7 +112,7 @@ buildPhase() {
 }
 
 installPhase() {
-  ensureDir $out/bin
+  mkdir -p $out/bin
   cp foo $out/bin
 }
 
@@ -939,14 +939,6 @@ functions.</para>
 <variablelist>
 
   
-  <varlistentry xml:id='fun-ensureDir'>
-    <term><function>ensureDir</function> <replaceable>args</replaceable></term>
-    <listitem><para>Creates the specified directories, including all
-    necessary parent directories, if they do not already
-    exist.</para></listitem>
-  </varlistentry>
-  
-
   <varlistentry xml:id='fun-substitute'>
     <term><function>substitute</function>
     <replaceable>infile</replaceable>
@@ -1062,7 +1054,16 @@ echo @foo@
     That is, no substitution is performed for undefined variables.</para></listitem>
   </varlistentry>
 
-  
+
+  <varlistentry xml:id='fun-substituteAllInPlace'>
+    <term><function>substituteAllInPlace</function>
+    <replaceable>file</replaceable></term>
+    <listitem><para>Like <function>substituteAll</function>, but performs
+    the substitutions in place on the file
+    <replaceable>file</replaceable>.</para></listitem>
+  </varlistentry>
+
+
   <varlistentry xml:id='fun-stripHash'>
     <term><function>stripHash</function>
     <replaceable>path</replaceable></term>

maintainers/docs/cross.txt

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

maintainers/scripts/copy-tarball.sh

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

maintainers/scripts/copy-tarballs.sh

@@ -1,57 +1,15 @@
 #! /bin/sh -e
 
-distDir=/data/webserver/tarballs
-
-urls=$(nix-instantiate --eval-only --xml --strict ./eval-release.nix \
+urls=$(nix-instantiate --eval-only --xml --strict '<nixpkgs/maintainers/scripts/eval-release.nix>' \
     | grep -A2 'name="urls"' \
     | grep '<string value=' \
     | sed 's/.*"\(.*\)".*/\1/' \
     | sort | uniq)
 
 for url in $urls; do
-    
     if echo "$url" | grep -q -E "www.cs.uu.nl|nixos.org|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe|belastingdienst|microsoft|armijn/.nix|sun.com|archive.eclipse.org"; then continue; fi
-
-    base="$(basename "$url")"
-    newPath="$distDir/$base"
-
-    if ! test -e "$newPath"; then
-
-        #if echo $url | grep -q 'mirror://'; then
-        #   echo "$fn: skipping mirrored $url"
-        #   continue
-        #fi
-
-        echo "downloading $url to $newPath"
-
-        if test -n "$doCopy"; then
-            declare -a res
-            if ! res=($(PRINT_PATH=1 nix-prefetch-url "$url")); then
-                continue
-            fi
-            storePath=${res[1]}
-            cp $storePath "$newPath.tmp.$$"
-            mv -f "$newPath.tmp.$$" "$newPath"
-        fi
-        
-    fi
-
-    if test -n "$doCopy" -a -e "$newPath"; then
-
-        echo "hashing $newPath"
-
-        md5=$(nix-hash --flat --type md5 "$newPath")
-        ln -sfn "../$base" $distDir/md5/$md5
-
-        sha1=$(nix-hash --flat --type sha1 "$newPath")
-        ln -sfn "../$base" $distDir/sha1/$sha1
-
-        sha256=$(nix-hash --flat --type sha256 "$newPath")
-        ln -sfn "../$base" $distDir/sha256/$sha256
-        ln -sfn "../$base" $distDir/sha256/$(nix-hash --type sha256 --to-base32 "$sha256")
-
-    fi
-
+    if ! echo "$url" | grep -q -E "\-.*[0-9].*"; then echo "skipping $url"; continue; fi
+    $(dirname $0)/copy-tarball.sh "$url"
 done
 
 echo DONE

maintainers/scripts/debian-patches.sh

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

maintainers/scripts/eval-release.nix

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

maintainers/scripts/gnome-latest.sh

@@ -84,20 +84,10 @@ sha256=`nix-hash --to-base32 --type sha256 $sha256`
 echo "Chosen ${ext_pref}, hash is ${sha256}" >&2
 
 cat <<EOF
-  src = fetchurl_gnome {
-    project = "${project}";
-EOF
-echo -n "    major = \"`echo ${version} | cut -d. -f1`\";"
-echo -n " minor = \"`echo ${version} | cut -d. -f2`\";"
-patchlevel=`echo ${version} | cut -d. -f3`
-if [ -n "$patchlevel" ]; then
-  echo -n " patchlevel = \"${patchlevel}\";"
-fi
-if [ "$ext_pref" != "bz2" ]; then
-  echo -n " extension = \"${ext_pref}\";"
-fi
-echo
-cat <<EOF
+  name = "${project}-${version}";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/${project}/${baseVersion}/${project}-${version}.tar.${ext_pref};
     sha256 = "${sha256}";
   };
 EOF

maintainers/scripts/gnu/gnupdate

@@ -441,6 +441,8 @@ the file at URL."
     (define validsig-rx
       (make-regexp
        "^\\[GNUPG:\\] VALIDSIG ([[:xdigit:]]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+) .*$"))
+    (define expkeysig-rx                    ; good signature, but expired key
+      (make-regexp "^\\[GNUPG:\\] EXPKEYSIG ([[:xdigit:]]+) (.*)$"))
     (define errsig-rx
       (make-regexp
        "^\\[GNUPG:\\] ERRSIG ([[:xdigit:]]+) ([^ ]+) ([^ ]+) ([^ ]+) ([[:digit:]]+) ([[:digit:]]+)"))
@@ -450,20 +452,25 @@ the file at URL."
            (lambda (match)
              `(signature-id ,(match:substring match 1) ; sig id
                             ,(match:substring match 2) ; date
-                            ,(string->number      ; timestamp
+                            ,(string->number           ; timestamp
                               (match:substring match 3)))))
           ((regexp-exec goodsig-rx line)
            =>
            (lambda (match)
-             `(good-signature ,(match:substring match 1) ; key id
+             `(good-signature ,(match:substring match 1)    ; key id
                               ,(match:substring match 2)))) ; user name
           ((regexp-exec validsig-rx line)
            =>
            (lambda (match)
              `(valid-signature ,(match:substring match 1) ; fingerprint
                                ,(match:substring match 2) ; sig creation date
-                               ,(string->number   ; timestamp
+                               ,(string->number           ; timestamp
                                  (match:substring match 3)))))
+          ((regexp-exec expkeysig-rx line)
+           =>
+           (lambda (match)
+             `(expired-key-signature ,(match:substring match 1) ; fingerprint
+                                     ,(match:substring match 2)))) ; user name
           ((regexp-exec errsig-rx line)
            =>
            (lambda (match)
@@ -471,7 +478,7 @@ the file at URL."
                                ,(match:substring match 2) ; pubkey algo
                                ,(match:substring match 3) ; hash algo
                                ,(match:substring match 4) ; sig class
-                               ,(string->number   ; timestamp
+                               ,(string->number           ; timestamp
                                  (match:substring match 5))
                                ,(let ((rc
                                        (string->number ; return code
@@ -504,7 +511,7 @@ the file at URL."
 a key-id/user pair; return #f otherwise."
   (any (lambda (sexp)
          (match sexp
-           (('good-signature key-id user)
+           (((or 'good-signature 'expired-key-signature) key-id user)
             (cons key-id user))
            (_ #f)))
        status))
@@ -774,7 +781,6 @@ Return #t if the signature was good, #f otherwise."
       ("freefont-ttf" "ftp.gnu.org"   "/gnu/freefont" #f)
       ("gnupg"        "ftp.gnupg.org" "/gcrypt" #t)
       ("gnu-ghostscript" "ftp.gnu.org"  "/gnu/ghostscript" #f)
-      ("GNUnet"       "ftp.gnu.org" "/gnu/gnunet" #f)
       ("mit-scheme"   "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg" #f)
       ("icecat"       "ftp.gnu.org" "/gnu/gnuzilla" #f)
       ("source-highlight" "ftp.gnu.org" "/gnu/src-highlite" #f)
@@ -798,7 +804,6 @@ Return #t if the signature was good, #f otherwise."
       ("gnumake"     . "make")
       ("gnused"      . "sed")
       ("gnutar"      . "tar")
-      ("gnunet"      . "GNUnet") ;; ftp.gnu.org/gnu/gnunet/GNUnet-x.y.tar.gz
       ("mitscheme"   . "mit-scheme")
       ("texmacs"     . "TeXmacs")))
 
@@ -1060,7 +1065,10 @@ pairs.  Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
 
     (case selection
       ((stdenv)
-       gnu)
+       (filter (lambda (p)
+                 (member (package-source-output-path p)
+                         (force stdenv)))
+               gnu))
       ((non-stdenv)
        (filter (lambda (p)
                  (not (member (package-source-output-path p)

maintainers/scripts/test-eval-release.sh

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

pkgs/applications/audio/GStreamer/default.nix

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

pkgs/applications/audio/amarok/default.nix

@@ -1,20 +1,21 @@
-{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl
-, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon
-, strigi, soprano, qca2, libmtp, liblastfm, libgpod, pkgconfig }:
+{ stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl
+, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs
+, qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon
+, strigi, soprano }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   pname = "amarok";
-  version = "2.4.3";
+  version = "2.5.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "0242psqci1b6wfhrrds14h4c4qin9s83cxk1259d9hqcsgn4ir3c";
+    sha256 = "0jc8fsrhshgfv441b2dgqk0wz3ms5bzjqchcj5ydxphg57dr3l8y";
   };
 
   QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
-  buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl
+  buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl
     libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
     soprano qca2 libmtp liblastfm libgpod pkgconfig ];
 

pkgs/applications/audio/ardour/ardour3.nix

@@ -5,16 +5,16 @@ librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile,
 libusb, libuuid, libxml2, libxslt, pango, perl, pkgconfig, python }:
 
 let
-  rev = "9942";
+  rev = "11483";
 in
 
 stdenv.mkDerivation {
   name = "ardour3-svn-${rev}";
 
   src = fetchsvn {
-    url = http://subversion.ardour.org/svn/ardour2/branches/3.0;
+    url = http://subversion.ardour.org/svn/ardour2/tags/3.0-beta3;
     inherit rev;
-    sha256 = "5f463e5a67bcb1ee6b4d24c25307419ea14ce52130819054b775e377c31a0664";
+    sha256 = "02az11lvfbln475np9jyfkdlrkpp1pszjmk6gl75wq6ws08dd7rd";
   };
 
   buildInputs = [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec

pkgs/applications/audio/ardour/default.nix

@@ -1,29 +1,42 @@
-{ stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor
+{ stdenv, fetchsvn, scons, boost, pkgconfig, fftw, librdf_raptor
 , librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
 , libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
-, gtk, glibmm, gtkmm, libgnomecanvas, librdf, liblo, aubio
-, fftwSinglePrec, libmad }:
+, gtk, glibmm, gtkmm, libgnomecanvas,  liblo, aubio
+, fftwSinglePrec, libmad, automake, autoconf, libtool, liblrdf }:
 
-stdenv.mkDerivation {
-  name = "ardour-2.8.2";
+stdenv.mkDerivation rec {
+  name = "ardour-${version}";
+  version = "2.8.12";
 
   # svn is the source to get official releases from their site?
   # alternative: wget  --data-urlencode 'key=7c4b2e1df903aae5ff5cc4077cda801e' http://ardour.org/downloader
   # but hash is changing ?
-  src = fetchurl {
-    url = http://mawercer.de/~nix/ardour-2.8.2.tar.bz2;
-    sha256 = "1igwv1r6rlybdac24qady5asaf34f9k7kawkkgyvsifhl984m735";
+
+  # TODO: see if this is also true when using a tag (~goibhniu)
+
+  # This version does not run it exits with the following error:
+  # raptor_new_uri_for_rdf_concept called with Raptor V1 world object
+  # raptor_general.c:240:raptor_init: fatal error: raptor_init() failedAborted
+  src = fetchsvn {
+    url = "http://subversion.ardour.org/svn/ardour2/tags/${version}";
+    sha256 = "0d4y8bv12kb0yd2srvxn5388sa4cl5d5rk381saj9f3jgpiciyky";
   };
 
+  patchPhase = ''
+    sed -e "s#/usr/bin/which#type -P#" -i libs/glibmm2/autogen.sh
+    echo '#include "ardour/svn_revision.h"' > libs/ardour/svn_revision.cc
+    echo -e 'namespace ARDOUR {\n extern const char* svn_revision = "2.8.12";\n }\n' >> libs/ardour/svn_revision.cc
+  '';
+
   buildInputs = [
     scons boost pkgconfig fftw librdf_raptor librdf_rasqal jackaudio
     flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
-    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas librdf
-    liblo aubio fftwSinglePrec libmad
+    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas liblrdf
+    liblo aubio fftwSinglePrec libmad autoconf automake libtool
   ];
 
   buildPhase = ''
-    ensureDir $out
+    mkdir -p $out
     export CXX=g++
     scons PREFIX=$out install
   '';
@@ -33,6 +46,7 @@ stdenv.mkDerivation {
   meta = { 
     description = "Multi-track hard disk recording software";
     longDescription = ''
+      Broken: use ardour3-svn instead
       Also read "The importance of Paying Something" on their homepage, please!
     '';
     homepage = http://ardour.org/;

pkgs/applications/audio/audacious/default.nix

@@ -3,22 +3,25 @@
 , libvorbis, libcdio, libcddb, flac, ffmpeg
 }:
 
-stdenv.mkDerivation rec {
-  name = "audacious-3.0";
-  
+let
+  version = "3.2.1";
+in
+stdenv.mkDerivation {
+  name = "audacious-${version}";
+
   src = fetchurl {
-    url = "http://distfiles.atheme.org/${name}.tar.gz";
-    sha256 = "0kj78hgf73fmbm6y3idir2kavbnnlv0jb9ka0pcsb12sxb994s68";
+    url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
+    sha256 = "064a8d2887a0f92a1637df9d71b8eefa8064199c04eccfaac725f840cff6eac3";
   };
 
   pluginsSrc = fetchurl {
-    url = "http://distfiles.atheme.org/audacious-plugins-3.0.tar.gz";
-    sha256 = "0hhxk1mxnnrb1shshpf1nf8mqpc9q1qpsljwn4jzylcnwy6pq4rw";
+    url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
+    sha256 = "5b7d3e52f6b8903bc01ae15651817e990d3348ae6b9734767f354eb2dbfc8c2d";
   };
-  
+
   # `--enable-amidiplug' is to prevent configure from looking in /proc/asound.
   configureFlags = "--enable-amidiplug --disable-oss";
-  
+
   buildInputs =
     [ gettext pkgconfig glib gtk libmowgli libmcs libxml2 dbus_glib
       libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio
@@ -51,6 +54,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork";
     homepage = http://audacious-media-player.org/;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ];
   };
 }

pkgs/applications/audio/gmu/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     cp ${keymap}.keymap $out/share/gmu/default.keymap
     cp gmuinput.${conf}.conf $out/share/gmu/gmuinput.conf
-    ensureDir $out/etc/gmu
+    mkdir -p $out/etc/gmu
     cp gmu.${conf}.conf $out/etc/gmu/gmu.conf
   '';
 

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

@@ -9,6 +9,14 @@
  
  
  	#location of qt4.py
+@@ -298,7 +298,6 @@
+ 
+         for N in glob.glob('./data/i18n/hydrogen.*'):
+             env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
+-	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
+ 
+ 	#add every img in ./data/img to the install list. 
+ 	os.path.walk("./data/img/",install_images,env) 
 @@ -379,7 +379,7 @@
  
  includes, a , b = get_platform_flags( opts )

pkgs/applications/audio/id3v2/default.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   preInstall = ''
-    ensureDir $out/bin $out/man/man1
+    mkdir -p $out/bin $out/man/man1
   '';
 
   meta = {

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

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   postInstall =
     ''
-      ensureDir $out/share/ladspa/
+      mkdir -p $out/share/ladspa/
       ln -sv $out/lib/ladspa $out/share/ladspa/lib
     '';
 

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

@@ -13,7 +13,7 @@ in
   in with localDefs;
 let
   copyFile = fullDepEntry ("
-    ensureDir \$out/include
+    mkdir -p \$out/include
     cp ${src} \$out/include/ladspa.h
   ") [minInit defEnsureDir];
 in

pkgs/applications/audio/mhwaveedit/default.nix

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

pkgs/applications/audio/mp3info/default.nix

@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
     '';
 
   preInstall =
-    '' ensureDir "$out/bin"
-       ensureDir "$out/man/man1"
+    '' mkdir -p "$out/bin"
+       mkdir -p "$out/man/man1"
     '';
 
   meta = {

pkgs/applications/audio/mpc123/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   installPhase =
     # XXX: Should install locales too (though there's only 1 available).
-    '' ensureDir "$out/bin"
+    '' mkdir -p "$out/bin"
        cp -v mpc123 "$out/bin"
     '';
 

pkgs/applications/audio/ncmpcpp/default.nix

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

pkgs/applications/audio/petrifoo/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, alsaLib, cmake, gtk, jackaudio, libgnomecanvas
+, libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
+, pkgconfig }:
+
+stdenv.mkDerivation  rec {
+  name = "petri-foo";
+
+  src = fetchgit {
+    url = https://github.com/licnep/Petri-Foo.git;
+    rev = "eef3b6efebe842d2fa18ed32b881fea4562b84e0";
+    sha256 = "a20c3f1a633500a65c099c528c7dc2405daa60738b64d881bb8f2036ae59913c";
+  };
+
+  buildInputs =
+   [ alsaLib cmake  gtk jackaudio libgnomecanvas libpthreadstubs
+     libsamplerate libsndfile libtool libxml2 pkgconfig
+   ];
+
+  dontUseCmakeBuildDir=true;
+
+  meta = with stdenv.lib; {
+    description = "MIDI controllable audio sampler";
+    longDescription = "a fork of Specimen";
+    homepage = http://petri-foo.sourceforge.net;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}

pkgs/applications/audio/qtractor/default.nix

@@ -1,19 +1,21 @@
-{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jackaudio,
-ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile,
-libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
+{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jackaudio
+, ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
+, libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.0";
+  version = "0.5.4";
   name = "qtractor-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qtractor/${name}.tar.gz";
-    sha256 = "de5991d2d29b2713d73a90ab29efc24db0be68d8e9ca328062d53d229e902e89";
+    sha256 = "08vnvjl4w6z49s5shnip0qlwib0gwixw9wrqbazkh62i328fa05l";
   };
 
-  buildInputs = [ alsaLib autoconf automake dssi gtk jackaudio ladspaH
-    ladspaPlugins liblo libmad libsamplerate libsndfile libtool
-    libvorbis pkgconfig qt4 rubberband ];
+  buildInputs =
+    [ alsaLib autoconf automake dssi gtk jackaudio ladspaH
+      ladspaPlugins liblo libmad libsamplerate libsndfile libtool
+      libvorbis pkgconfig qt4 rubberband
+    ];
 
   meta = with stdenv.lib; {
     description = "Audio/MIDI multi-track sequencer";

pkgs/applications/audio/rakarrack/default.nix

@@ -10,6 +10,8 @@ stdenv.mkDerivation  rec {
     sha256 = "1rpf63pdn54c4yg13k7cb1w1c7zsvl97c4qxcpz41c8l91xd55kn";
   };
 
+  patches = [ ./fltk-path.patch ];
+
   buildInputs = [ alsaLib alsaUtils fltk jackaudio libXft libXpm libjpeg
     libpng libsamplerate libsndfile zlib ];
 

pkgs/applications/audio/rakarrack/fltk-path.patch

@@ -0,0 +1,35 @@
+commit 47245c3fd30dc326fedd7cdae444ddcf0fd97490
+Author: holborn <holborn@users.sourceforge.net>
+Date:   Tue Apr 19 15:02:26 2011 +0100
+
+            Fix FL path
+    
+    	modified:   src/global.h
+    	modified:   src/process.C
+
+diff --git a/src/global.h b/src/global.h
+index fc74b06..3e33da9 100644
+--- a/src/global.h
++++ b/src/global.h
+@@ -176,7 +176,7 @@ return y;
+ #include <X11/xpm.h>
+ #include <jack/jack.h>
+ #include <jack/midiport.h>
+-#include <Fl/Fl_Preferences.H>
++#include <FL/Fl_Preferences.H>
+ #include "FPreset.h"
+ #include "Reverb.h"
+ #include "Chorus.h"
+diff --git a/src/process.C b/src/process.C
+index 51bbc65..c993ff8 100644
+--- a/src/process.C
++++ b/src/process.C
+@@ -28,7 +28,7 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-#include <Fl/Fl_Preferences.H>
++#include <FL/Fl_Preferences.H>
+ #include "global.h"
+ 
+ int Pexitprogram, preset;

pkgs/applications/audio/snd/default.nix

@@ -40,7 +40,7 @@ rec {
 
   makeDocsWork = fullDepEntry ''
                 # hackish way to make html docs work
-                h="$out/share/snd/html"; ensureDir "$h"; cp *.html "$h"
+                h="$out/share/snd/html"; mkdir -p "$h"; cp *.html "$h"
                 patch -p1 < ${./doc.patch}
                 sed "s@HTML-DIR@$h@" -i index.scm snd-help.c
             '' ["defEnsureDir"];

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

@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out/{bin,share/sonic-visualiser}
+    mkdir -p $out/{bin,share/sonic-visualiser}
     cp sonic-visualiser/sonic-visualiser $out/bin
     cp -r sonic-visualiser/samples $out/share/sonic-visualiser/samples
     wrapProgram $out/bin/sonic-visualiser --prefix LD_LIBRARY_PATH : ${libX11}/lib

pkgs/applications/audio/specimen/default.nix

@@ -1,28 +0,0 @@
-{ stdenv, fetchsvn, alsaLib, autoconf, automake, gtk, jackaudio,
-libgnomecanvas, libsamplerate, libsndfile, libtool, libxml2, phat,
-pkgconfig }:
-
-stdenv.mkDerivation  rec {
-  name = "specimen-svn-89";
-
-  # The released version won't compile with newer versions of jack
-  src = fetchsvn {
-    url = http://zhevny.com/svn/specimen/trunk;
-    rev = 89;
-    sha256 = "1i24nchw14cbjv7kmzs7cvmis2xv4r7bxghi8d6gq5lprwk8xydf";
-  };
-
-  preConfigure = "sh autogen.sh";
-
-  buildInputs = [ alsaLib autoconf automake gtk jackaudio
-    libgnomecanvas libsamplerate libsndfile libtool libxml2 phat
-    pkgconfig ];
-
-  meta = with stdenv.lib; {
-    description = "MIDI controllable audio sampler";
-    homepage = http://zhevny.com/specimen/;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}

pkgs/applications/audio/spotify/default.nix

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

pkgs/applications/audio/vkeybd/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation  rec {
   buildInputs = [ alsaLib libX11 makeWrapper tcl tk ];
 
   configurePhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     sed -e "s@/usr/local@$out@" -i Makefile
   '';
 

pkgs/applications/audio/xmms/default.nix

@@ -1,21 +0,0 @@
-{stdenv, fetchurl, alsaLib, esound, libogg, libvorbis, glib, gtk}:
-
-stdenv.mkDerivation {
-  name = "xmms-1.2.10";
-  
-  src = fetchurl {
-    url = http://nixos.org/tarballs/xmms-1.2.10.tar.bz2;
-    md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c";
-  };
-
-  # Patch borrowed from SuSE 10.0 to fix pause/continue on ALSA.
-  patches = [./alsa.patch];
-
-  buildInputs = [alsaLib esound libogg libvorbis glib gtk];
-
-  meta = {
-    description = "A music player very similar to Winamp";
-    homepage = http://www.xmms.org;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

pkgs/applications/audio/xsynth-dssi/default.nix

@@ -14,8 +14,8 @@ stdenv.mkDerivation  rec {
     ladspaPlugins liblo pkgconfig ];
 
   installPhase = ''
-    ensureDir $out/bin
-    ensureDir $out/lib
+    mkdir -p $out/bin
+    mkdir -p $out/lib
     cp src/Xsynth_gtk $out/bin
     cp src/.libs/* $out/lib
   '';

pkgs/applications/audio/yoshimi/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, boost, cmakeCurses, fftwSinglePrec, fltk
+{ stdenv, fetchurl, alsaLib, boost, cmake, fftwSinglePrec, fltk
 , jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib }:
 
 assert stdenv ? glibc;
@@ -12,12 +12,18 @@ stdenv.mkDerivation  rec {
     sha256 = "0y67w7y515hx2bi5gfjgsw1hdah1bdrrvcfmqyjsvn7jbd0q47v1";
   };
 
-  buildInputs = [ alsaLib boost cmakeCurses fftwSinglePrec fltk
-    jackaudio libsndfile mesa minixml pkgconfig zlib ];
+  buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa
+    minixml zlib ];
+  buildNativeInputs = [ cmake pkgconfig ];
 
-  preConfigure = ''
-    cd src
-  '';
+  preConfigure = "cd src";
+
+  patches = [
+    (fetchurl {
+      url = http://patch-tracker.debian.org/patch/series/dl/yoshimi/0.060.10-3/02-fluid_1.3.patch;
+      sha256 = "1sywirbaaw4zhn5ypga27j02qvrvqjwv3lw8kvzyj575q4c4qnri";
+    })
+  ];
 
   cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so" ];
 

pkgs/applications/audio/zynaddsubfx/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, fftw, fltk, minixml, zlib }:
+{ stdenv, fetchurl, alsaLib, cmake, fftw, fltk13, minixml, pkgconfig, zlib }:
 
 stdenv.mkDerivation  rec {
   name = "zynaddsubfx-${version}";
@@ -9,11 +9,17 @@ stdenv.mkDerivation  rec {
     sha256 = "1zn5lgh76rrbfj8d4jys2gc1j2pqrbdd18ywfdrk0s7jq4inwyfg";
   };
 
-  buildInputs = [ alsaLib fftw fltk minixml zlib ];
+  buildInputs = [ alsaLib fftw fltk13 minixml zlib ];
+  buildNativeInputs = [ cmake pkgconfig ];
 
-  preConfigure = "cd src";
+  patches = [
+    (fetchurl {
+      url = http://patch-tracker.debian.org/patch/series/dl/zynaddsubfx/2.4.0-1.2/09_fluid_1.3.patch;
+      sha256 = "06wl7fs44b24ls1fzh21596n6zzc3ywm2bcdfrkfiiwpzin3yjq6";
+    })
+  ];
 
-  installPhase = "mkdir -p $out/bin; cp zynaddsubfx $out/bin";
+#installPhase = "mkdir -pv $out/bin; cp -v zynaddsubfx $out/bin";
 
   meta = with stdenv.lib; {
     description = "high quality software synthesizer";

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

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, x11, libjpeg, libpng, libXmu, freetype, pam}:
+{stdenv, fetchurl, x11, libjpeg, libpng12, libXmu, freetype, pam}:
 
 stdenv.mkDerivation rec {
   name = "slim-1.3.2";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     ./pam2.patch
   ];
 
-  buildInputs = [x11 libjpeg libpng libXmu freetype pam];
+  buildInputs = [x11 libjpeg libpng12 libXmu freetype pam];
 
   NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
 

pkgs/applications/editors/eclipse/default.nix

@@ -27,7 +27,7 @@ let
 
       buildCommand = ''
         # Unpack tarball.
-        ensureDir $out
+        mkdir -p $out
         tar xfvz $src -C $out
 
         # Patch binaries.
@@ -47,7 +47,7 @@ let
           --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
 
         # Create desktop item.
-        ensureDir $out/share/applications
+        mkdir -p $out/share/applications
         cp ${desktopItem}/share/applications/* $out/share/applications
       ''; # */
 

pkgs/applications/editors/ed/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "ed-1.4";
+  name = "ed-1.5";
 
   src = fetchurl {
     url = "mirror://gnu/ed/${name}.tar.gz";
-    sha256 = "1njgcghms1377csldi1yqjhcpghiii6bshdhnjpqp78sxs2xldnv";
+    sha256 = "18gvhyhwpabmgv4lh21lg8vl3z7acdyhh2mr2kj9g75wksj39pcp";
   };
 
   doCheck = true;

pkgs/applications/editors/elvis/default.nix

@@ -15,16 +15,16 @@ stdenv.mkDerivation rec {
   '';
 
   preConfigure = ''
-    ensureDir $out/share/man/man1
+    mkdir -p $out/share/man/man1
   '';
 
   installPhase = ''
-    ensureDir $out/bin $out/share/elvis $out/share/elvis/doc
+    mkdir -p $out/bin $out/share/elvis $out/share/elvis/doc
     cp elvis ref elvtags elvfmt $out/bin
     cp -R data/* $out/share/elvis
     cp doc/* $out/share/elvis/doc
 
-    ensureDir $out/share/man/man1
+    mkdir -p $out/share/man/man1
     for a in doc/*.man; do
       cp $a $out/share/man/man1/`basename $a .man`.1
     done

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

@@ -30,6 +30,16 @@ stdenv.mkDerivation rec {
   configureFlags =
     stdenv.lib.optional gtkGUI "--with-x-toolkit=gtk";
 
+  postInstall = ''
+    cat >$out/share/emacs/site-lisp/site-start.el <<EOF
+;; nixos specific load-path
+(when (getenv "NIX_PROFILES") (setq load-path
+                      (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
+                                               (split-string (getenv "NIX_PROFILES"))))
+                       load-path)))
+EOF
+  '';
+
   meta = {
     description = "GNU Emacs, *the* text editor";
 

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

@@ -8,19 +8,19 @@ assert (libXft != null) -> libpng != null;	# probably a bug
 assert stdenv.isDarwin -> libXaw != null;	# fails to link otherwise
 
 stdenv.mkDerivation rec {
-  name = "emacs-23.3";
+  name = "emacs-23.3b";
 
   builder = ./builder.sh;
 
   src = fetchurl {
     url = "mirror://gnu/emacs/${name}.tar.bz2";
-    sha256 = "0kfa546qi0idkwk29gclgi13qd8q54pcqgy9qwjknlclszprdp3a";
+    sha256 = "1vp6qbbjgh5zpd87j3ggsvgf8q6cax8z3cdx3syv5v2662dapp46";
   };
 
-  buildInputs = 
+  buildInputs =
     [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
       libtiff librsvg libXft gconf
-    ] 
+    ]
     ++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
     ++ stdenv.lib.optional stdenv.isLinux dbus;
 
@@ -31,6 +31,16 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (stdenv ? glibc)
          [ "--with-crt-dir=${stdenv.glibc}/lib" ];
 
+  postInstall = ''
+    cat >$out/share/emacs/site-lisp/site-start.el <<EOF
+;; nixos specific load-path
+(when (getenv "NIX_PROFILES") (setq load-path
+                      (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
+                                               (split-string (getenv "NIX_PROFILES"))))
+                       load-path)))
+EOF
+  '';
+
   doCheck = true;
 
   meta = {
@@ -56,7 +66,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/emacs/;
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ];
     platforms = stdenv.lib.platforms.all;
   };
 }

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

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

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

@@ -0,0 +1,73 @@
+{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
+, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
+, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
+, alsaLib
+}:
+
+assert (gtk != null) -> (pkgconfig != null);
+assert (libXft != null) -> libpng != null;	# probably a bug
+assert stdenv.isDarwin -> libXaw != null;	# fails to link otherwise
+
+stdenv.mkDerivation rec {
+  name = "emacs-24.0.94";
+
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = "http://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.gz";
+    sha256 = "1dgy53dxpnwrn6h3i3z8fpcyasms0wlvhqfyih4cwkz712var393";
+  };
+
+  buildInputs = 
+    [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
+      libtiff librsvg libXft gconf libxml2 imagemagick gnutls alsaLib
+    ] 
+    ++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
+    ++ stdenv.lib.optional stdenv.isLinux dbus;
+
+  configureFlags =
+    stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft"]
+
+    # On NixOS, help Emacs find `crt*.o'.
+    ++ stdenv.lib.optional (stdenv ? glibc)
+         [ "--with-crt-dir=${stdenv.glibc}/lib" ];
+
+  postInstall = ''
+    cat >$out/share/emacs/site-lisp/site-start.el <<EOF
+;; nixos specific load-path
+(when (getenv "NIX_PROFILES") (setq load-path
+                      (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
+                                               (split-string (getenv "NIX_PROFILES"))))
+                       load-path)))
+EOF
+  '';
+
+  doCheck = true;
+
+  meta = {
+    description = "PRETEST: GNU Emacs 24.x, the extensible, customizable text editor";
+
+    longDescription = ''
+      GNU Emacs is an extensible, customizable text editor—and more.  At its
+      core is an interpreter for Emacs Lisp, a dialect of the Lisp
+      programming language with extensions to support text editing.
+
+      The features of GNU Emacs include: content-sensitive editing modes,
+      including syntax coloring, for a wide variety of file types including
+      plain text, source code, and HTML; complete built-in documentation,
+      including a tutorial for new users; full Unicode support for nearly all
+      human languages and their scripts; highly customizable, using Emacs
+      Lisp code or a graphical interface; a large number of extensions that
+      add other functionality, including a project planner, mail and news
+      reader, debugger interface, calendar, and more.  Many of these
+      extensions are distributed with GNU Emacs; others are available
+      separately.
+    '';
+
+    homepage = http://www.gnu.org/software/emacs/;
+    license = "GPLv3+";
+
+    maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

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

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   buildInputs = [emacs texinfo ctags];
   configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp";
-  preInstall = "ensureDir $out/info";
+  preInstall = "mkdir -p $out/info";
   installTargets = "install-pkg texinfo";
   postInstall = ''
     mv  $out/info $out/share/

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

@@ -0,0 +1,34 @@
+{ fetchgit, stdenv, emacs }:
+
+# TODO: byte-compile in build phase - a buildEmacsPackage that does
+# that would be nice
+
+stdenv.mkDerivation rec {
+  name = "calfw-1.3-5-ga9b6615";
+
+  src = fetchgit {
+    url = "git://github.com/kiwanami/emacs-calfw.git";
+    rev = "a9b6615b6666bbebe78257c557fd9a2e3a325d8d";
+    sha256 = "524acc8fec7e64ebe0d370ddb1d96eee6a409d650b79011fa910c35225a7f393";
+  };
+
+  buildInputs = [ emacs ];
+
+  installPhase =
+    ''
+       ensureDir "$out/share/doc/${name}"
+       cp -v readme.md "$out/share/doc/${name}"
+
+       ensureDir "$out/share/emacs/site-lisp/"
+       cp *.el "$out/share/emacs/site-lisp/"
+    '';
+
+  meta = {
+    description = "A calendar framework for Emacs";
+
+    license = "GPLv3+";
+
+    maintainers = with stdenv.lib.maintainers; [ chaoflow ];
+    platforms = stdenv.lib.platforms.gnu;
+  };
+}

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

@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
   checkPhase = "make utest";
 
   installPhase = ''
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     cp -v */*.el */*/*.el */*.elc */*/*.elc "$out/share/emacs/site-lisp"
     chmod a-x "$out/share/emacs/site-lisp/"*
 
-    ensureDir "$out/share/info"
+    mkdir -p "$out/share/info"
     cp -v */*.info* */*/*.info* "$out/share/info"
   '';
 

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

@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     cp -rv *.el *.elc ecb-images "$out/share/emacs/site-lisp"
 
-    ensureDir "$out/share/info"
+    mkdir -p "$out/share/info"
     cp -v info-help/*.info* "$out/share/info"
   '';
 

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

@@ -1,6 +1,6 @@
 { fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoconf }:
 
-let date = "2009-07-09"; in
+let date = "2012-01-15"; in
 stdenv.mkDerivation rec {
   name = "emacs-w3m-cvs${date}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     inherit date;
     cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
     module = "emacs-w3m";
-    sha256 = "ad46592d4fe3cdaadc02ce6d3fb1ac237e200beecd2ad11a04c1395a38a70a0a";
+    sha256 = "7a6d90b9d25f137d5a204cfa29f6c6afa8edb1ee302f969110ffda11f11909cc";
   };
 
   buildInputs = [ emacs w3m texinfo autoconf ];

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

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
                           s|/usr/include/taglib|${taglib}/include/taglib|g ;
                           s|/usr/lib|${taglib}/lib|g ;
                           s|^all:\(.*\)\$|all:\1 emms-print-metadata|g"
-    ensureDir "$out/share/man/man1"
+    mkdir -p "$out/share/man/man1"
 
     sed -i "emms-player-mpg321-remote.el" \
         -e 's|emms-player-mpg321-remote-command[[:blank:]]\+"mpg321"|emms-player-mpg321-remote-command "${mpg321}/bin/mpg321"|g'
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    ensureDir "$out/bin" && cp emms-print-metadata "$out/bin"
+    mkdir -p "$out/bin" && cp emms-print-metadata "$out/bin"
   '';
 
   meta = {

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

@@ -1,23 +1,24 @@
-{stdenv, fetchurl, emacs}:
+{ stdenv, fetchgit, emacs }:
 
-stdenv.mkDerivation rec {
-  name = "haskell-mode-2.8.0";
+stdenv.mkDerivation {
+  name = "haskell-mode-2.8.0.29-g7682f99";
 
-  src = fetchurl {
-    url = "http://projects.haskell.org/haskellmode-emacs/${name}.tar.gz";
-    sha256 = "1065g4xy3ca72xhqh6hfxs5j3mls82bli8w5rhz1npzyfwlwhkb1";
+  src = fetchgit {
+    url = "http://github.com/haskell/haskell-mode.git";
+    rev = "7682f991acd63d9400597d5f4980f62d7b1c4c0b";
+    sha256 = "f4508a11fa65ece237c9ee9f623bc4e9ad3d3d58ab2fcacc8ddb080c29aac717";
   };
 
   buildInputs = [emacs];
 
   installPhase = ''
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     cp *.el *.elc *.hs "$out/share/emacs/site-lisp/"
   '';
 
   meta = {
-    homepage = "http://projects.haskell.org/haskellmode-emacs/";
-    description = "Haskell mode package for Emacs";
+    homepage = "http://github.com/haskell/haskell-mode";
+    description = "Haskell mode for Emacs";
 
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.simons ];

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

@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     DEST=$out/share/emacs/site-lisp
-    ensureDir $DEST
+    mkdir -p $DEST
     cp -a * $DEST
   '';
 

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

@@ -6,8 +6,8 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el;
-    sha256 = "17sbhf4r6jh4610x8qb2y0y3hww7w33vfsjqg4vrz99pr29xffry";
+    url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi;
+    sha256 = "70cf41a2ea6a478a45143a8cd672381c01ed894448200e602531acbf2b1fd160";
   };
 
   meta = {

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

@@ -23,7 +23,7 @@ in
     ];
 
     configurePhase = ''
-      ensureDir "dist"
+      mkdir -p "dist"
       cat > build.properties <<EOF
         dist.lisp.dir = dist/share/emacs/site-lisp
         dist.java.lib.dir = dist/lib/java
@@ -50,7 +50,7 @@ in
     installPhase = ''
       ant install
 
-      ensureDir "$out/share/${name}"
+      mkdir -p "$out/share/${name}"
       cp -rv java/bsh-commands "$out/share/${name}"
 
       # Move everything that's not a JAR to $datadir.  This includes

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

@@ -0,0 +1,22 @@
+{ stdenv, fetchgit, emacs }:
+
+stdenv.mkDerivation {
+  name = "js2-mode-0-20120130";
+
+  src = fetchgit {
+    url = "git://github.com/mooz/js2-mode.git";
+    rev = "4c008b1987aa53769899e24808b6d74b41b4ff40";
+    sha256 = "6af5f52e46ffe85b7610e2db19a96afbef60a6f5374f1c5db3653448e30160be";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs --batch -f batch-byte-compile js2-mode.el
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/emacs/site-lisp
+    cp js2-mode.el js2-mode.elc $out/share/emacs/site-lisp/
+  '';
+}

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

@@ -1,22 +1,19 @@
 { stdenv, fetchurl, emacs, texinfo }:
 
 let
-  version = "1.0.0";
+  version = "1.1.0";
 in
 stdenv.mkDerivation {
   name = "magit-${version}";
 
   src = fetchurl {
     url = "http://github.com/downloads/magit/magit/magit-${version}.tar.gz";
-    sha256 = "1hfdl90d96zin31v8x4p8zx5f0x0i5i9hccysx6q3prdgw9r6wzq";
+    sha256 = "8e147e1f2e69938232f859daf712515b46aa367d7b7d90b42538e083f52a72b4";
   };
 
   buildInputs = [emacs texinfo];
 
-  configurePhase =
-    '' sed -i Makefile \
-           -e "s|^PREFIX=.*$|PREFIX=$out|g ; s|/etc/emacs/|$out/etc/emacs/|"
-    '';
+  configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )";
 
   meta = {
     description = "Magit, an Emacs interface to Git";
@@ -34,7 +31,7 @@ stdenv.mkDerivation {
     '';
 
     license = "GPLv3+";
-    homepage = "http://github.com/philjackson/magit";
+    homepage = "https://github.com/magit/magit";
     platforms = stdenv.lib.platforms.all;
     maintainers = with stdenv.lib.maintainers; [ simons ludo ];
   };

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

@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, emacs, ocaml }:
+
+# this package installs the emacs-mode which
+# resides in the ocaml compiler sources.
+
+let version = stdenv.lib.removePrefix "ocaml-" ocaml.name;
+in stdenv.mkDerivation {
+  name = "ocaml-mode-${version}";
+  inherit (ocaml) prefixKey src;
+
+  # a quick configure to get the Makefile generated. Since
+  # we do not build the ocaml itself, we don't really
+  # need it to support any features.
+  configureFlags = [ "-no-tk" "-no-curses" "-no-pthread" ];
+
+  buildInputs = [ emacs ];
+  dontBuild = true;
+
+  installPhase = ''
+    cd emacs;
+    ensureDir "$out/share/emacs/site-lisp" "$out/bin"
+    EMACSDIR=$out/share/emacs/site-lisp make simple-install install-ocamltags
+  '';
+
+  meta = {
+    homepage = http://caml.inria.fr;
+    description = "OCaml mode package for Emacs";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}

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

@@ -1,11 +1,11 @@
 { fetchurl, stdenv, emacs, texinfo, which }:
 
 stdenv.mkDerivation rec {
-  name = "org-7.5";
+  name = "org-7.8.03";
 
   src = fetchurl {
     url = "http://orgmode.org/${name}.tar.gz";
-    sha256 = "978822bc4c5f9f67450fbaa8572f1d4217406b7e28551278c9f23f7e9515cd4b";
+    sha256 = "49357cca7d892e70cd2dfcc0b5d96d9fd164ef5a1f251ace3865ecb27dc1e958";
   };
 
   buildInputs = [ emacs texinfo ];
@@ -29,10 +29,10 @@ stdenv.mkDerivation rec {
   installPhase =
     '' make install install-info
 
-       ensureDir "$out/share/doc/${name}"
+       mkdir -p "$out/share/doc/${name}"
        cp -v doc/org*.{html,pdf,txt} "$out/share/doc/${name}"
 
-       ensureDir "$out/share/org"
+       mkdir -p "$out/share/org"
        cp -R contrib "$out/share/org/contrib"
     '';
 
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.chaoflow ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    maintainers = with stdenv.lib.maintainers; [ ludo chaoflow ];
+    platforms = stdenv.lib.platforms.gnu;
   };
 }

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

@@ -1,28 +1,32 @@
 { stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }:
 
 stdenv.mkDerivation (rec {
-  name = "ProofGeneral-4.0";
+  name = "ProofGeneral-4.1";
 
   src = fetchurl {
-    url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.0.tgz;
-    sha256 = "1ang2lsc97vl70fkgypfsr1ivdzsdliq3bkvympj30wnc7ayzbmq";
+    url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.1.tgz;
+    sha256 = "1ivxx8c6j7cfdfj2pj0gzdqac7hpb679bjmwdqdcz1c1ni34s9ia";
   };
 
   sourceRoot = name;
 
   buildInputs = [ emacs texinfo texLive perl which ];
 
-  patches = [ ./emacs-23.3.patch ];
-
-  postPatch =
+  prePatch =
     '' sed -i "Makefile" \
            -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
                s|/sbin/install-info|install-info|g"
 
        sed -i "bin/proofgeneral" -e's/which/type -p/g'
+
+       # @image{ProofGeneral} fails, so remove it.
+       sed -i '94d' doc/PG-adapting.texi
+       sed -i '101d' doc/ProofGeneral.texi
     '';
 
-  preBuild = "make clean";
+  preBuild = ''
+    make clean;
+  '';
 
   installPhase =
     # Copy `texinfo.tex' in the right place so that `texi2pdf' works.

pkgs/applications/editors/emacs-modes/proofgeneral/emacs-23.3.patch

@@ -1,45 +0,0 @@
-diff -Nuar ProofGeneral-4.0/contrib/mmm/mmm-mode.el ProofGeneral-4.0-nix/contrib/mmm/mmm-mode.el
---- ProofGeneral-4.0/contrib/mmm/mmm-mode.el	2010-10-11 00:56:57.000000000 +0200
-+++ ProofGeneral-4.0-nix/contrib/mmm/mmm-mode.el	2011-05-14 21:55:12.000000000 +0200
-@@ -160,9 +160,9 @@
-      (mmm-add-hooks)
-      (mmm-fixup-skeleton)
-      (make-local-variable 'font-lock-fontify-region-function)
--     (make-local-variable 'font-lock-beginning-of-syntax-function)
-+     (make-local-variable 'syntax-begin-function)
-      (setq font-lock-fontify-region-function 'mmm-fontify-region
--	   font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax)
-+	   syntax-begin-function 'mmm-beginning-of-syntax)
-      (setq mmm-mode t)
-      (condition-case err
- 	 (mmm-apply-all)
-@@ -190,7 +190,7 @@
-     (mmm-update-submode-region)
-     (setq font-lock-fontify-region-function
- 	  (get mmm-primary-mode 'mmm-fontify-region-function)
--	  font-lock-beginning-of-syntax-function
-+	  syntax-begin-function
- 	  (get mmm-primary-mode 'mmm-beginning-of-syntax-function))
-     (mmm-update-font-lock-buffer)
-     (mmm-refontify-maybe)
-diff -Nuar ProofGeneral-4.0/contrib/mmm/mmm-region.el ProofGeneral-4.0-nix/contrib/mmm/mmm-region.el
---- ProofGeneral-4.0/contrib/mmm/mmm-region.el	2010-10-11 00:56:57.000000000 +0200
-+++ ProofGeneral-4.0-nix/contrib/mmm/mmm-region.el	2011-05-14 21:58:01.000000000 +0200
-@@ -548,7 +548,7 @@
- 	    (put mode 'mmm-fontify-region-function
- 		 font-lock-fontify-region-function))
- 	  (put mode 'mmm-beginning-of-syntax-function
--	       font-lock-beginning-of-syntax-function))
-+	       syntax-begin-function))
- 	;; Get variables
- 	(setq global-vars (mmm-get-locals 'global)
- 	      buffer-vars (mmm-get-locals 'buffer)
-@@ -768,7 +768,7 @@
-   ;; For some reason `font-lock-fontify-block' binds this to nil, thus
-   ;; preventing `mmm-beginning-of-syntax' from doing The Right Thing.
-   ;; I don't know why it does this, but let's undo it here.
--  (let ((font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax))
-+  (let ((syntax-begin-function 'mmm-beginning-of-syntax))
-     (mapc #'(lambda (elt)
- 		(when (get (car elt) 'mmm-font-lock-mode)
- 		  (mmm-fontify-region-list (car elt) (cdr elt))))

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

@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   buildPhase = ''
     emacsDir="$out/share/emacs/site-lisp"
 
-    ensureDir "$emacsDir"
+    mkdir -p "$emacsDir"
     cp -v "$src" "$emacsDir/quack.el"
     emacs --batch -f batch-byte-compile "$emacsDir/quack.el"
   '';

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

@@ -14,7 +14,7 @@ stdenv.mkDerivation
 
   installPhase = ''
     for n in . obby zeroconf jupiter; do
-      ensureDir "$out/share/emacs/site-lisp/$n";
+      mkdir -p "$out/share/emacs/site-lisp/$n";
       cp $n/*.el "$out/share/emacs/site-lisp/$n/";
     done
     install -D -m444 doc/card.pdf "$out/share/doc/rudel/card.pdf"

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

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ emacs ];
 
   installPhase =
-    '' ensureDir "$out/share/emacs/site-lisp"
+    '' mkdir -p "$out/share/emacs/site-lisp"
        cp -v *.el *.elc "$out/share/emacs/site-lisp"
     '';
 

pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [emacs];
   
   installPhase = ''
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     cp lisp/*.el "$out/share/emacs/site-lisp/"
   '';
 

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

@@ -1,21 +0,0 @@
-source $stdenv/setup
-
-preConfigure() {
-    libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
-    echo "libc: $libc"
-
-    for i in src/s/*.h src/m/*.h; do
-        substituteInPlace $i \
-            --replace /usr/lib/crt1.o $libc/lib/crt1.o \
-            --replace /usr/lib/crti.o $libc/lib/crti.o \
-            --replace /usr/lib/crtn.o $libc/lib/crtn.o
-    done
-    
-    for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
-        substituteInPlace $i --replace /bin/pwd pwd
-    done
-}
-
-preBuild="make bootstrap"
-
-genericBuild

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

@@ -1,58 +0,0 @@
-{ xawSupport ? true
-, xpmSupport ? true
-, dbusSupport ? true
-, xaw3dSupport ? false
-, gtkGUI ? false
-, xftSupport ? false
-, stdenv, fetchcvs, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
-, pkgconfig ? null, gtk ? null, libXft ? null, dbus ? null
-, libpng, libjpeg, libungif, libtiff, texinfo
-, autoconf, automake
-}:
-
-assert xawSupport -> libXaw != null;
-assert xpmSupport -> libXpm != null;
-assert dbusSupport -> dbus != null;
-assert xaw3dSupport -> Xaw3d != null;
-assert gtkGUI -> pkgconfig != null && gtk != null;
-assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug
-
-let date = "2009-06-26"; in
-stdenv.mkDerivation {
-  name = "emacs-snapshot-23-${date}";
-  
-  builder = ./builder.sh;
-  
-  src = fetchcvs {
-    inherit date;
-    cvsRoot = ":pserver:anonymous@cvs.savannah.gnu.org:/sources/emacs";
-    module = "emacs";
-    sha256 = "bf9b21a0634f45474a1ce91e6153ced69194f1e9c0acd6626a931198f4a5972f";
-  };
-
-  preConfigure = "autoreconf -vfi";
-  
-  buildInputs = [
-    autoconf automake
-    ncurses x11 texinfo
-    (if xawSupport then libXaw else null)
-    (if xpmSupport then libXpm else null)
-    (if dbusSupport then dbus else null)
-    (if xaw3dSupport then Xaw3d else null)
-    libpng libjpeg libungif libtiff # maybe not strictly required?
-  ]
-  ++ (if gtkGUI then [pkgconfig gtk] else [])
-  ++ (if xftSupport then [libXft] else []);
-  
-  configureFlags = "
-    ${if gtkGUI then "--with-x-toolkit=gtk --enable-font-backend --with-xft" else ""}
-  ";
-
-  meta = {
-    description = "GNU Emacs with Unicode, GTK and Xft support (23.x alpha)";
-    homepage = http://www.emacswiki.org/cgi-bin/wiki/XftGnuEmacs;
-    license = "GPLv3+";
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.linux;  # GTK & co. are needed.
-  };
-}

pkgs/applications/editors/jedit/default.nix

@@ -1,28 +1,53 @@
-{ stdenv, fetchurl, ant }:
+{ stdenv, fetchurl, ant, jre }:
 
 stdenv.mkDerivation {
-  name = "jedit-4.2";
+  name = "jedit-4.4.2";
 
   src = fetchurl {
-    url = mirror://sf/jedit/jedit42source.tar.gz;
-    sha256 = "1ckqghsw2r30kfkqfgjl4k47gdwpz8c1h85haw0y0ymq4rqh798j";
+    url = mirror://sf/jedit/jedit4.4.2source.tar.bz2;
+    sha256 = "5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb";
   };
 
-  phases = "unpackPhase buildPhase";
+  setSourceRoot = ''
+    sourceRoot=jEdit
+  '';
 
-  buildPhase = "
-     sed -i 's/\\<SplashScreen\\>/org.gjt.sp.jedit.gui.SplashScreen/g' org/gjt/sp/jedit/GUIUtilities.java
-    ant dist
-    ensureDir $out/lib
-    cp jedit.jar $out/lib
-    ensureDir \$out/lib/modes
-    cp modes/catalog \$out/lib/modes
-  ";
+  buildPhase = ''
+     ant build
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/jEdit
+    cp build/jedit.jar $out/share/jEdit
+    mkdir -p $out/share/jEdit/modes
+    cp -r modes/* $out/share/jEdit/modes
+    mkdir -p $out/share/jEdit/icons
+    cp -r icons/* $out/share/jEdit/icons
+    mkdir -p $out/share/jEdit/macros
+    cp -r macros/* $out/share/jEdit/macros
+    mkdir -p $out/share/jEdit/doc
+    cp -r doc/* $out/share/jEdit/doc
+    
+    sed -i "s|Icon=.*|Icon=$out/share/jEdit/icons/jedit-icon48.png|g" package-files/linux/deb/jedit.desktop
+    mkdir -p $out/share/applications
+    mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop
+
+    patch package-files/linux/jedit << EOF
+    5a6,8
+    > # specify the correct JAVA_HOME
+    > JAVA_HOME=${jre}
+    > 
+    EOF
+    sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit
+    mkdir -p $out/bin
+    cp package-files/linux/jedit $out/bin/jedit
+    chmod +x $out/bin/jedit
+  '';
 
   buildInputs = [ ant ];
 
   meta = { 
-    description = "really nice programmers editor written in Java. Give it a try";
+    description = "Mature programmer's text editor (Java based)";
     homepage = http://www.jedit.org;
     license = "GPL";
   };

pkgs/applications/editors/jedit/wrapper.nix

@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     phases = "buildPhase";
 
     buildPhase = "
-ensureDir \$out/bin
+mkdir -p \$out/bin
 cat > \$out/bin/${jedit.name} << EOF
 #!/bin/sh
 exec $java -jar $jeditjar \\$*

pkgs/applications/editors/kdevelop/4.3.0.nix

@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info,
+  kdebase_workspace, gettext, perl, okteta }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "4.3.0";
+  pname = "kdevelop";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
+    sha256 = "0vb2f5922r1da4va8sx2qn2i1lf2gqg7nfg594kncy98a9b1avnr";
+  };
+
+  buildInputs = [ kdevplatform kdebase_workspace okteta ];
+
+  buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
+
+  NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
+
+  meta = with stdenv.lib; {
+    maintainers = [ maintainers.urkud ];
+    platforms = platforms.linux;
+    description = "KDE official IDE";
+    longDescription =
+      ''
+        A free, opensource IDE (Integrated Development Environment)
+        for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a
+        feature-full, plugin extendable IDE for C/C++ and other
+        programing languages. It is based on KDevPlatform, KDE and Qt
+        libraries and is under development since 1998.
+      '';
+    homepage = http://www.kdevelop.org;
+  };
+}

pkgs/applications/editors/leksah/default.nix

@@ -1,18 +1,20 @@
-{ cabal, binary, binaryShared, deepseq, glib, gtk, gtksourceview2
-, hslogger, leksahServer, ltk, mtl, network, parsec, processLeksah
-, regexBase, regexTdfa, strict, time, utf8String
+{ cabal, binary, binaryShared, Cabal, deepseq, enumerator, filepath
+, gio, glib, gtk, gtksourceview2, hslogger, leksahServer, ltk, mtl
+, network, parsec, QuickCheck, regexBase, regexTdfa, strict, text
+, time, transformers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "leksah";
-  version = "0.10.0.4";
-  sha256 = "1g12w1kl63fxzz1c2x237yrqkaja9awiqyyipkdms5iql0ini7bw";
+  version = "0.12.0.3";
+  sha256 = "1374ffwban58kabnynacl0fyzs6756kd5q1lcfya46mp26l7syrd";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary binaryShared deepseq glib gtk gtksourceview2 hslogger
-    leksahServer ltk mtl network parsec processLeksah regexBase
-    regexTdfa strict time utf8String
+    binary binaryShared Cabal deepseq enumerator filepath gio glib gtk
+    gtksourceview2 hslogger leksahServer ltk mtl network parsec
+    QuickCheck regexBase regexTdfa strict text time transformers
+    utf8String
   ];
   noHaddock = true;
   meta = {
@@ -20,9 +22,6 @@ cabal.mkDerivation (self: {
     description = "Haskell IDE written in Haskell";
     license = "GPL";
     platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })

pkgs/applications/editors/nedit/builder.sh

@@ -3,7 +3,7 @@ source $stdenv/setup
 export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE"
 
 installPhase() {
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp -p source/nedit source/nc $out/bin
 }
 

pkgs/applications/editors/nvi/default.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    ensureDir $out/bin $out/share/vi/catalog
+    mkdir -p $out/bin $out/share/vi/catalog
     for a in dutch english french german ru_SU.KOI8-R spanish swedish; do
       cp ../catalog/$a $out/share/vi/catalog
     done
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     ln -s $out/bin/nvi $out/bin/ex
     ln -s $out/bin/nvi $out/bin/view
 
-    ensureDir $out/share/man/man1
+    mkdir -p $out/share/man/man1
     cp ../docs/USD.doc/vi.man/vi.1 $out/share/man/man1/nvi.1
     ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/vi
     ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/ex

pkgs/applications/editors/zile/default.nix

@@ -1,20 +1,23 @@
 { fetchurl, stdenv, ncurses, boehmgc, perl, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "zile-2.4.2";
+  name = "zile-2.4.3";
 
   src = fetchurl {
     url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "0ia91c18fyssnhabfb22npmidjkx32rqfkjgxxjibvdwfja25d3k";
+    sha256 = "0rygkc3i9bngzn49kq9fnrbz80d8pa2yjy8iz7vjlc4ayc2akvc3";
   };
 
-  buildInputs = [ ncurses boehmgc perl ];
-  buildNativeInputs = [ help2man ];
+  buildInputs = [ ncurses boehmgc ];
+  buildNativeInputs = [ help2man perl ];
 
   # Tests can't be run because most of them rely on the ability to
   # fiddle with the terminal.
   doCheck = false;
 
+  # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro.
+  preConfigure = "export gl_cv_func_fstatat_zero_flag=yes";
+
   meta = {
     description = "GNU Zile, a lightweight Emacs clone";
 

pkgs/applications/graphics/ImageMagick/default.nix

@@ -12,20 +12,19 @@
 , libtool
 , jasper
 , libX11
-, xz
 , tetex ? null
 , librsvg ? null
 }:
 
 let
-  version = "6.6.9-4";
+  version = "6.7.5-3";
 in
 stdenv.mkDerivation rec {
   name = "ImageMagick-${version}";
 
   src = fetchurl {
     url = "mirror://imagemagick/${name}.tar.xz";
-    sha256 = "035j3i3cm29bwc9lipn838gznswrc69g7mwh8h9jj24ss2dmqrf1";
+    sha256 = "0m0sa4jxsvm8pf9nfvkzlbzq13d1lj15lfz6jif12l6ywyh2c1cs";
   };
 
   configureFlags = ''
@@ -41,8 +40,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ tetex graphviz ];
 
-  buildNativeInputs = [ xz ];
-
   preConfigure = if tetex != null then
     ''
       export DVIDecodeDelegate=${tetex}/bin/dvips

pkgs/applications/graphics/cinepaint/default.nix

@@ -1,41 +1,32 @@
-{ stdenv, fetchcvs, cmake, pkgconfig, gtk, freetype, fontconfig, lcms, fltk,
+{ stdenv, fetchurl, cmake, pkgconfig, gtk, freetype, fontconfig, lcms,
   flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
   perlXMLParser, python, pygtk, gettext, intltool, babl, gegl,
   glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
-  mesa, libXext, libXpm, libXxf86vm, automake, autoconf, libtool } :
+  mesa, libXext, libXpm, libXxf86vm, pixman, libpthreadstubs } :
 
-stdenv.mkDerivation {
-  name = "cinepaint-0.25.0";
+stdenv.mkDerivation rec {
+  name = "cinepaint-1.0";
 
-  # The developer told me this cvs fetch is 0.25.0
-  src = fetchcvs {
-    cvsRoot = ":pserver:anonymous@cinepaint.cvs.sourceforge.net:/cvsroot/cinepaint";
-    module = "cinepaint-project";
-    date = "2008-11-06";
-    sha256 = "f5ac249628ffe04349d1bb3b1e078be0cda7575dd71d12ae74143baa006acb6d";
+  src = fetchurl {
+    url = "mirror://sourceforge/cinepaint/${name}.tgz";
+    sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7";
   };
 
-  buildInputs = [ cmake pkgconfig gtk freetype fontconfig lcms fltk flex libtiff
-    libjpeg libpng libexif zlib perl libX11 perlXMLParser python pygtk gettext
-    intltool babl gegl glib makedepend xf86vidmodeproto xineramaproto libXmu
-    openexr mesa libXext libXpm libXxf86vm automake autoconf libtool ];
+  buildInputs = [ gtk freetype fontconfig lcms flex libtiff libjpeg libpng
+    libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
+    gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa
+    libXext libXpm libXxf86vm pixman libpthreadstubs
+  ];
 
-  dontUseCmakeConfigure = 1;
+  buildNativeInputs = [ cmake pkgconfig ];
 
   NIX_CFLAGS_COMPILE = "-I.";
 
-  configurePhase = ''
-    cd cinepaint
-    chmod 0777 autogen.sh
-    ./autogen.sh
-    ./configure --prefix=$out
-  '';
-
   meta = {
     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;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/graphics/darktable/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
-, gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
+, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
 , lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
 , libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
 , openexr, pixman, pkgconfig, sqlite }:
@@ -8,16 +8,16 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "0.9.1";
+  version = "0.9.3";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
-    sha256 = "b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e";
+    sha256 = "0al9fxifqv9vg8rj6vybjsn6f25pq5ij9367imlhpmsv6m9m5mqw";
   };
 
   buildInputs =
-    [ GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk
+    [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
       ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
       libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
       librsvg libtiff libxcb openexr pixman pkgconfig sqlite

pkgs/applications/graphics/darktable/libpng-15.patch

@@ -0,0 +1,22 @@
+commit 5803d31ae7704e0349821dcc20a94a1cddda69f1
+Author: Tim Harder <radhermit@gmail.com>
+Date:   Wed Sep 21 14:13:55 2011 -0700
+
+    Fix build with libpng-1.5
+    
+    Explicitly include the zlib.h header for the Z_BEST_COMPRESSION and
+    Z_DEFAULT_STRATEGY macros since >=libpng-1.5 doesn't pull it in anymore
+    via the png.h header.
+
+diff --git a/src/imageio/format/png.c b/src/imageio/format/png.c
+index 40c7d48..c7be566 100644
+--- a/src/imageio/format/png.c
++++ b/src/imageio/format/png.c
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <png.h>
+ #include <inttypes.h>
++#include <zlib.h>
+ 
+ DT_MODULE(1)
+ 

pkgs/applications/graphics/dia/default.nix

@@ -3,12 +3,12 @@
 , withGNOME ? false, libgnomeui }:
 
 stdenv.mkDerivation rec {
-  inherit (src) name;
+  name = src.pkgname;
 
   src = fetchurl_gnome {
     project = "dia";
-    major = "0"; minor = "97"; patchlevel = "1";
-    sha256 = "0hli89fdzzbshqdznxrbgyqw55qlr4z5xpn86jcg5fl7kln8pzld";
+    major = "0"; minor = "97"; patchlevel = "2"; extension = "xz";
+    sha256 = "1qgawm7rrf4wd1yc0fp39ywv8gbz4ry1s16k00dzg5w6p67lfqd7";
   };
 
   buildInputs =

pkgs/applications/graphics/digikam/default.nix

@@ -1,22 +1,26 @@
 { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
-kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
-liblqr1, lensfun, pkgconfig }:
+lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
+liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
+shared_desktop_ontologies, marble, mysql }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-1.5.0";
+  name = "digikam-2.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/digikam/${name}.tar.bz2";
-    sha256 = "1vvzw132aw2c1z2v1zc3aqa99kvg501krr2law35ri12zkqjsvaz";
+    sha256 = "06l52j8i45vyfj3b81ivifqsqdjlcj4g68d8w06c5lhzniwjqaam";
   };
 
-  buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
-    lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
-    pkgconfig ];
+  buildNativeInputs = [ cmake automoc4 pkgconfig ];
 
-  KDEDIRS=kdeedu;
+  buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
+    jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
+    opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ];
 
-  patches = [ ./include.diff ];
+  # Make digikam find some FindXXXX.cmake
+  KDEDIRS="${marble}:${qjson}";
+
+  patches = [ ./libkvkontakte-not-topdir.patch ./ftbfs-libkipi.patch ];
 
   meta = {
     description = "Photo Management Program";

pkgs/applications/graphics/digikam/ftbfs-libkipi.patch

@@ -0,0 +1,68 @@
+commit 25cc9c9876a5233bd630105d0110319892d4e18c
+Author: Gilles Caulier <caulier.gilles@gmail.com>
+Date:   Tue Jan 3 15:16:37 2012 +0100
+
+    enable checkall and clearall buttons only with libkipi version 1.4.0
+    BUGS: 290496
+
+diff --git a/core/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
+index 0f4030a..b8efb35 100644
+--- a/core/utilities/setup/setupplugins.cpp
++++ b/core/utilities/setup/setupplugins.cpp
+@@ -6,8 +6,8 @@
+  * Date        : 2004-01-02
+  * Description : setup Kipi plugins tab.
+  *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General
+@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
+ 
+     panel->setLayout(mainLayout);
+ 
++#if KIPI_VERSION < 0x010400
++    d->checkAllBtn->setVisible(false);
++    d->clearBtn->setVisible(false);
++#endif
++
+     initPlugins();
+ 
+     // --------------------------------------------------------
+@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
+ void SetupPlugins::slotCheckAll()
+ {
+     QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+     d->kipiConfig->slotCheckAll();
++#endif
+     QApplication::restoreOverrideCursor();
+ }
+ 
+ void SetupPlugins::slotClear()
+ {
+     QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+     d->kipiConfig->slotClear();
++#endif
+     QApplication::restoreOverrideCursor();
+ }
+ 
+diff --git a/core/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
+index 271a569..114e0fa 100644
+--- a/core/utilities/setup/setupplugins.h
++++ b/core/utilities/setup/setupplugins.h
+@@ -6,8 +6,8 @@
+  * Date        : 2004-01-02
+  * Description : setup Kipi plugins tab.
+  *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General

pkgs/applications/graphics/digikam/include.diff

@@ -1,12 +0,0 @@
-diff --git a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
-index 9ee36cc..c6e5c00 100644
---- a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
-+++ b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
-@@ -18,6 +18,7 @@ IF(MARBLEWIDGET_SUPPORTS_PLUGINS)
- 
-     INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/libs/imageproperties/markerclusterholderplugin/
-                          ${CMAKE_BINARY_DIR}/libs/imageproperties/markerclusterholderplugin/
-+						 ${LIBMARBLEWIDGET_INCLUDE_DIR}/..
-                          ${QT_INCLUDE_DIR}
-                        )
- 

pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch

@@ -0,0 +1,33 @@
+commit 0f0cfa14805519cfd9e0b97ee9668dc4f86379de
+Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Date:   Wed Jan 18 05:07:13 2012 +0400
+
+    Use CMAKE_CURRENT_{SOURCE,BINARY}_DIR
+    
+    Some projects (e.g., digikam) include snapshots of this library into their
+    release tarballs, so the libkvkontakte_SOURCE_DIR != CMAKE_SOURCE_DIR.
+
+diff --git a/extra/libkvkontakte/CMakeLists.txt b/extra/libkvkontakte/CMakeLists.txt
+index f19b28b..4310a74 100644
+--- a/extra/libkvkontakte/CMakeLists.txt
++++ b/extra/libkvkontakte/CMakeLists.txt
+@@ -21,7 +21,7 @@ set(INCLUDE_INSTALL_DIR include )
+ 
+ 
+ # === Closer to the code, close to the body ===
+-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
++set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+ include(MacroLibrary)
+@@ -35,8 +35,8 @@ macro_log_feature(QJSON_FOUND "QJSON" "Qt library for handling JSON data" "http:
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ 
+ include_directories(
+-  ${CMAKE_SOURCE_DIR}
+-  ${CMAKE_BINARY_DIR}
++  ${CMAKE_CURRENT_SOURCE_DIR}
++  ${CMAKE_CURRENT_BINARY_DIR}
+   ${KDE4_INCLUDES}
+   ${QJSON_INCLUDE_DIR}
+ )

pkgs/applications/graphics/djview/default.nix

@@ -1,14 +1,18 @@
-{stdenv, fetchurl, djvulibre, qt4 }:
+{stdenv, fetchurl, djvulibre, qt4, pkgconfig }:
 
-stdenv.mkDerivation {
-	name = "djview4-4.1-2";
+stdenv.mkDerivation rec {
+	name = "djview-4.8";
 	src = fetchurl {
-		url = mirror://sf/djvu/djview4-4.1-2.tar.gz;
-		sha256 = "10k0h892kab3n8xypw6vsnvhwil410hvvqj375pwiss4vlm5isv1";
+		url = "mirror://sourceforge/djvu/${name}.tar.gz";
+		sha256 = "17y8jvbvj98h25qwsr93v24x75famv8d0jbb0h46xjj555y6wx4c";
 	};
 
 	buildInputs = [djvulibre qt4];
 
+  buildNativeInputs = [ pkgconfig ];
+
+  patches = [ ./djview4-qt-4.8.patch ];
+
   passthru = {
     mozillaPlugin = "/lib/netscape/plugins";
   };

pkgs/applications/graphics/djview/djview4-qt-4.8.patch

@@ -0,0 +1,38 @@
+Origin: OpenSUSE
+Index: djview-4.8/src/qdjvuwidget.cpp
+===================================================================
+--- djview-4.8.orig/src/qdjvuwidget.cpp
++++ djview-4.8/src/qdjvuwidget.cpp
+@@ -153,7 +153,7 @@ all_numbers(const char *s)
+ }
+ 
+ template<class T> static inline void 
+-swap(T& x, T& y)
++myswap(T& x, T& y)
+ {
+   T tmp;
+   tmp = x;
+@@ -173,11 +173,11 @@ ksmallest(T *v, int n, int k)
+       /* Sort v[lo], v[m], v[hi] by insertion */
+       m = (lo+hi)/2;
+       if (v[lo]>v[m])
+-        swap(v[lo],v[m]);
++        myswap(v[lo],v[m]);
+       if (v[m]>v[hi]) {
+-        swap(v[m],v[hi]);
++        myswap(v[m],v[hi]);
+         if (v[lo]>v[m])
+-          swap(v[lo],v[m]);
++          myswap(v[lo],v[m]);
+       }
+       /* Extract pivot, place sentinel */
+       pivot = v[m];
+@@ -191,7 +191,7 @@ ksmallest(T *v, int n, int k)
+       do ++l; while (v[l]<pivot);
+       do --h; while (v[h]>pivot);
+       if (l < h) { 
+-        swap(v[l],v[h]); 
++        myswap(v[l],v[h]); 
+         goto loop; 
+       }
+       /* Finish up */

pkgs/applications/graphics/fbida/default.nix

@@ -1,32 +1,34 @@
-{ stdenv, fetchurl, libjpeg, libexif, giflib, libtiff, libpng
-, pkgconfig, freetype, fontconfig
+{ stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp
+, pkgconfig, freetype, fontconfig, which, imagemagick, curl, saneBackends
 }:
 
 stdenv.mkDerivation rec {
-  name = "fbida-2.07";
+  name = "fbida-2.09";
   
   src = fetchurl {
     url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz";
-    sha256 = "0i6v3fvjc305pfw48sglb5f22lwxldmfch6mjhqbcp7lqkkxw435";
+    sha256 = "1riia87v5nsx858xnlvc7sspr1p36adjqrdch1255ikr5xbv6h6x";
   };
 
-  preBuild =
-    ''
-      # Fetch a segfault in exiftran (http://bugs.gentoo.org/284753).
-      # `fbida' contains a copy of some internal libjpeg source files.
-      # If these do not match with the actual libjpeg, exiftran may
-      # fail.
-      tar xvf ${libjpeg.src}
-      for i in jpegint.h jpeglib.h jinclude.h transupp.c transupp.h; do
-        cp jpeg-*/$i jpeg/
-      done
-    '';
-
+  buildNativeInputs = [ pkgconfig which ];
   buildInputs =
-    [ pkgconfig libexif libjpeg giflib libpng giflib freetype fontconfig ];
+    [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp
+      imagemagick curl saneBackends
+    ];
   
   makeFlags = [ "prefix=$(out)" "verbose=yes" ];
 
+  patchPhase =
+    ''
+    sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile
+    '';
+
+  configurePhase = "make config $makeFlags";
+
+  crossAttrs = {
+    makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP="];
+  };
+
   meta = {
     description = "Image viewing and manipulation programs";
   };

pkgs/applications/graphics/feh/default.nix

@@ -2,14 +2,14 @@
 , libXinerama, curl }:
 
 stdenv.mkDerivation {
-  name = "feh-2.0";
+  name = "feh-2.4";
 
   src = fetchurl {
-    url = http://feh.finalrewind.org/feh-2.0.tar.bz2;
-    sha256 = "0ilrabi0i4gads6b5r4d7svdav00n5vxjcn6h4kbd05d2hz0mjf5";
+    url = http://feh.finalrewind.org/feh-2.4.tar.bz2;
+    sha256 = "00liykp0ipmmiggl26wk72iawcff6zpmbniifdr3f5yf0sfanz48";
   };
 
-  buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl];
+  buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl ];
 
   preBuild = ''
     makeFlags="PREFIX=$out"

pkgs/applications/graphics/geeqie/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms
-, intltool, gettext, libchamplain, fbida }:
+, intltool, gettext, libchamplain_0_6, fbida }:
 
 stdenv.mkDerivation rec {
   name = "geeqie-1.0";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig gtk libpng exiv2 lcms intltool gettext
-      libchamplain
+      libchamplain_0_6
     ];
 
   postInstall =

pkgs/applications/graphics/gimp/default.nix

@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.6.11";
+  name = "gimp-2.6.12";
   
   src = fetchurl {
     url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
-    sha256 = "18dhgicc3f04q0js521kq9w3gq8yqawpf6vdb7m14f9vh380hvcv";
+    sha256 = "0qpcgaa4pdqqhyyy8vjvzfflxgsrrs25zk79gixzlnbzq3qwjlym";
   };
   
   buildInputs = [

pkgs/applications/graphics/gimp/plugins/default.nix

@@ -5,8 +5,7 @@
 
 { pkgs, gimp }:
 let
-  inherit (pkgs) stdenv fetchurl pkgconfig gtkLibs;
-  inherit (gtkLibs) glib;
+  inherit (pkgs) stdenv fetchurl pkgconfig glib;
   targetPluginDir = "$out/${gimp.name}-plugins";
   targetScriptDir = "$out/${gimp.name}-scripts";
   prefix = "plugin-gimp-";
@@ -15,11 +14,11 @@ let
     prePhases = "extraLib";
     extraLib = ''
       installScripts(){
-        ensureDir ${targetScriptDir};
+        mkdir -p ${targetScriptDir};
         for p in "$@"; do cp "$p" ${targetScriptDir}; done
       }
       installPlugins(){
-        ensureDir ${targetPluginDir};
+        mkdir -p ${targetPluginDir};
         for p in "$@"; do cp "$p" ${targetPluginDir}; done
       }
     '';
@@ -137,7 +136,7 @@ rec {
       url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
       sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";
     };
-    #postInstall = ''ensureDir $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"'';
+    #postInstall = ''mkdir -p $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"'';
     installPhase = "installPlugins src/gimp-lqr-plugin";
   };
 
@@ -190,7 +189,7 @@ rec {
     };
     installPhase = "
       installPlugins ufraw-gimp
-      ensureDir $out/bin
+      mkdir -p $out/bin
       cp ufraw $out/bin
     ";
   };
@@ -209,7 +208,7 @@ rec {
 
     installPhase = "
       installPlugins gimplensfun
-      ensureDir $out/bin
+      mkdir -p $out/bin
       cp gimplensfun $out/bin
     ";
 

pkgs/applications/graphics/giv/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gdk_pixbuf, scons, pkgconfig, gtk, glib,
-  pcre, cfitsio, perl, gob2, vala, libtiff }:
+  pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }:
 
 stdenv.mkDerivation rec {
-  name = "giv-0.9.19";
+  name = "giv-0.9.22";
 
   src = fetchurl {
     url = "mirror://sourceforge/giv/${name}.tar.gz";
-    sha256 = "07sgpp4k27417ymavcvil4waq6ac2mj08g42g1l52l435xm5mnh7";
+    sha256 = "1q0806b66ajppxbv1i71wx5d3ydc1h3hsz23m6g4g80dhiai7dly";
   };
 
   # It built code to be put in a shared object without -fPIC
@@ -17,13 +17,14 @@ stdenv.mkDerivation rec {
     sed -i s,/usr/local,$out, SConstruct 
   '';
 
-  patches = [ ./build.patch ./union.patch ];
+  patches = [ ./build.patch ];
 
   buildPhase = "scons";
 
   installPhase = "scons install";
 
-  buildInputs = [ gdk_pixbuf pkgconfig gtk glib scons pcre cfitsio perl gob2 vala libtiff ];
+  buildInputs = [ gdk_pixbuf pkgconfig gtk glib scons pcre cfitsio perl gob2 vala libtiff
+    json_glib ];
 
   meta = {
     description = "Cross platform image and hierarchical vector viewer based";

pkgs/applications/graphics/giv/union.patch

@@ -1,38 +0,0 @@
-Already reported uptream
-
-diff --git a/src/giv-data.h b/src/giv-data.h
-index 64e7696..d34bfe4 100644
---- a/src/giv-data.h
-+++ b/src/giv-data.h
-@@ -88,7 +88,7 @@ typedef struct
- typedef struct
- {
-   gint op;
--  union
-+  struct
-   {
-     struct
-     {
-diff --git a/src/giv_types.h b/src/giv_types.h
-index 02abebe..c3cfb78 100644
---- a/src/giv_types.h
-+++ b/src/giv_types.h
-@@ -11,13 +11,11 @@ typedef struct {
- 
- typedef struct {
-   gint op;
--  union {
--    struct {
--      gdouble x,y;
--    } point;
--    double arc_dev;
--    text_mark_t *text_object;
--  } data;
-+  struct {
-+    gdouble x,y;
-+  } point;
-+  double arc_dev;
-+  text_mark_t *text_object;
- } point_t;
- 
- typedef struct {

pkgs/applications/graphics/graphicsmagick/1.3.7.nix

@@ -27,5 +27,6 @@ stdenv.mkDerivation {
     homepage = http://www.graphicsmagick.org;
     description = "Swiss army knife of image processing";
     license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/applications/graphics/graphicsmagick/default.nix

@@ -1,15 +1,15 @@
 {stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
-, libjpeg, libpng, libtiff, libxml2, zlib, libtool
+, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
 , libX11}:
 
-let version = "1.3.11"; in
+let version = "1.3.13"; in
 
 stdenv.mkDerivation {
   name = "graphicsmagick-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.bz2";
-    sha256 = "184grcvxa5w0ghiv8zf2vdva0kgp3njf20k3h6lbylspjgd3zhxg";
+    url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
+    sha256 = "08lgjvhvhw3by5h4kfpl7072dbvkcpsajy5f6izq69cv61vadqs5";
   };
 
   configureFlags = "--enable-shared";
@@ -19,6 +19,8 @@ stdenv.mkDerivation {
       zlib libtool
     ];
 
+  buildNativeInputs = [ xz ];
+
   postInstall = ''
     sed -i 's/-ltiff.*'\'/\'/ $out/bin/*
   '';
@@ -27,5 +29,6 @@ stdenv.mkDerivation {
     homepage = http://www.graphicsmagick.org;
     description = "Swiss army knife of image processing";
     license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/applications/graphics/hugin/default.nix

@@ -1,25 +1,29 @@
-{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost,
-  pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa, freeglut,
- glew, libXmu, libXi }:
+{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost
+, pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa
+, freeglut, glew, libXmu, libXi, tclap }:
 
 stdenv.mkDerivation rec {
-  name = "hugin-2010.4.0";
+  name = "hugin-2011.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/hugin/${name}.tar.bz2";
-    sha256 = "13n3p4f39mbdydsjqy48csjgvv30lfcwvln5y5dyy95lyrfwcp6l";
+    sha256 = "1bnxljgqxzfdz14l7y29wzi52x1a38mghsjavnr28fr4vfmqwjrf";
   };
 
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
 
-  NIX_LDFLAGS = "-lrt";
+#NIX_LDFLAGS = "-lrt";
 
-  buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig
+  buildInputs = [ panotools wxGTK libtiff libpng openexr boost tclap
     exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ];
 
+  buildNativeInputs = [ cmake pkgconfig ];
+
+  propagatedUserEnvPackages = [ enblendenfuse autopanosiftc ];
+
   postInstall = ''
-    ensureDir "$out/nix-support"
-    echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages
+    mkdir -p "$out/nix-support"
+    echo $propagatedUserEnvPackages > $out/nix-support/propagated-user-env-packages
   '';
 
   meta = {

pkgs/applications/graphics/inkscape/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
-, gsl, python, pyxml, lxml, poppler }:
+, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }:
 
 stdenv.mkDerivation rec {
   name = "inkscape-0.48.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "10v7ixdz7f8vgk2wv0m81zli9p0f446cm1f4aqlvni1ndsx44fi2";
   };
 
-  patches = [ ./configure-python-libs.patch ];
+  patches = [ ./configure-python-libs.patch ./libpng-1.5.patch ];
 
   propagatedBuildInputs = [
     # Python is used at run-time to execute scripts, e.g., those from
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext
-    makeWrapper intltool gsl poppler
+    makeWrapper intltool gsl poppler imagemagick libwpg
   ];
 
   configureFlags = "--with-python";

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

@@ -0,0 +1,47 @@
+Source: upstream revisions 10061 and 10707
+
+--- a/src/sp-image.cpp	2011-02-21 07:59:34 +0000
++++ b/src/sp-image.cpp	2011-02-21 08:57:28 +0000
+@@ -387,9 +387,13 @@
+ 
+ #if defined(PNG_iCCP_SUPPORTED)
+                 {
+-                    char* name = 0;
++                    png_charp name = 0;
+                     int compression_type = 0;
+-                    char* profile = 0;
++#if (PNG_LIBPNG_VER < 10500)
++                    png_charp profile = 0;
++#else
++                    png_bytep profile = 0;
++#endif
+                     png_uint_32 proflen = 0;
+                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
+ //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
+
+--- a/src/extension/internal/pdfinput/svg-builder.cpp	2011-10-27 04:55:51 +0000
++++ b/src/extension/internal/pdfinput/svg-builder.cpp	2011-10-29 20:34:00 +0000
+@@ -1481,7 +1481,7 @@
+         return NULL;
+     }
+     // Set error handler
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         return NULL;
+     }
+
+--- a/src/helper/png-write.cpp	2011-08-07 10:53:12 +0000
++++ b/src/helper/png-write.cpp	2011-10-29 20:34:00 +0000
+@@ -166,8 +166,8 @@
+     /* Set error handling.  REQUIRED if you aren't supplying your own
+      * error hadnling functions in the png_create_write_struct() call.
+      */
+-    if (setjmp(png_ptr->jmpbuf)) {
+-        /* If we get here, we had a problem reading the file */
++    if (setjmp(png_jmpbuf(png_ptr))) {
++        // If we get here, we had a problem reading the file
+         fclose(fp);
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         return false;
+

pkgs/applications/graphics/jbrout/default.nix

@@ -20,7 +20,7 @@ buildPythonPackage {
   '';
 
   postInstall = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     echo '#!/bin/sh' > $out/bin/jbrout
     echo "python $out/lib/python2.7/site-packages/jbrout-src-py2.7.egg/jbrout/jbrout.py" >> $out/bin/jbrout
     chmod +x $out/bin/jbrout

pkgs/applications/graphics/k3d/debian-patches.nix

@@ -0,0 +1,14 @@
+# Generated by debian-patches.sh from debian-patches.txt
+let
+  prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-15";
+in
+[
+  {
+    url = "${prefix}/disable_mutable_in_boost_gil.patch";
+    sha256 = "037l86h2hszqgw8arqpzprz5qvngsb61i7lpww617mkvqrc4hiq3";
+  }
+  {
+    url = "${prefix}/k3d_gtkmm224.patch";
+    sha256 = "0a81fg96zby6kidqwj6n8mhbrh0j5fpnmfh7lr6havz5r2is9ks5";
+  }
+]

pkgs/applications/graphics/k3d/debian-patches.txt

@@ -0,0 +1,3 @@
+k3d/0.8.0.2-15
+disable_mutable_in_boost_gil.patch
+k3d_gtkmm224.patch