Added flags to compile amule daemon and remote gui

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

VERSION

@@ -1 +1 @@
-0.13
+0.14

doc/package-notes.xml

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

doc/release-notes.xml

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

maintainers/docs/update-upstream-data.txt

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

maintainers/scripts/copy-tarballs.sh

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

maintainers/scripts/eval-release.nix

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

maintainers/scripts/gnu/gnupdate

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec "${GUILE:-guile}" $GUILE_FLAGS -L . -l gnupdate.scm \
+  -e '(apply main (cdr (command-line)))' -- "$@"

maintainers/scripts/gnu/gnupdate.scm

@@ -0,0 +1,712 @@
+;;; GNUpdate -- Update GNU packages in Nixpkgs.     -*- coding: utf-8; -*-
+;;; Copyright (C) 2010  Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; This program is free software: you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation, either version 3 of the License, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(cond-expand (guile-2 #t)
+             (else (error "GNU Guile 2.0 is required")))
+
+(use-modules (sxml ssax)
+             (ice-9 popen)
+             (ice-9 match)
+             (ice-9 rdelim)
+             (ice-9 regex)
+             (ice-9 vlist)
+             (srfi srfi-1)
+             (srfi srfi-9)
+             (srfi srfi-11)
+             (srfi srfi-37)
+             (system foreign)
+             (rnrs bytevectors))
+
+
+;;;
+;;; SNix.
+;;;
+
+(define-record-type <location>
+  (make-location file line column)
+  location?
+  (file          location-file)
+  (line          location-line)
+  (column        location-column))
+
+(define (->loc line column path)
+  (and line column path
+       (make-location path (string->number line) (string->number column))))
+
+;; XXX: Hack to add missing exports from `(sxml ssax)' as of 1.9.10.
+(let ((ssax (resolve-module '(sxml ssax))))
+  (for-each (lambda (sym)
+              (module-add! (current-module) sym
+                           (module-variable ssax sym)))
+            '(ssax:warn ssax:skip-pi nl)))
+
+;; Nix object types visible in the XML output of `nix-instantiate' and
+;; mapping to S-expressions (we map to sexps, not records, so that we
+;; can do pattern matching):
+;;
+;;   at               (at varpat attrspat)
+;;   attr             (attribute loc name value)
+;;   attrs            (attribute-set attributes)
+;;   attrspat         (attribute-set-pattern patterns)
+;;   bool             #f|#t
+;;   derivation       (derivation drv-path out-path attributes)
+;;   ellipsis         '...
+;;   expr             (snix loc body ...)
+;;   function         (function loc at|attrspat|varpat)
+;;   int              int
+;;   list             list
+;;   null             'null
+;;   path             string
+;;   string           string
+;;   unevaluated      'unevaluated
+;;   varpat           (varpat name)
+;;
+;; Initially ATTRIBUTES in `derivation' and `attribute-set' was a promise;
+;; however, handling `repeated' nodes makes it impossible to do anything
+;; lazily because the whole SXML tree has to be traversed to maintain the
+;; list of known derivations.
+
+(define (xml-element->snix elem attributes body derivations)
+  ;; Return an SNix element corresponding to XML element ELEM.
+
+  (define (loc)
+    (->loc (assq-ref attributes 'line)
+           (assq-ref attributes 'column)
+           (assq-ref attributes 'path)))
+
+  (case elem
+    ((at)
+     (values `(at ,(car body) ,(cadr body)) derivations))
+    ((attr)
+     (let ((name (assq-ref attributes 'name)))
+       (cond ((null? body)
+              (values `(attribute-pattern ,name) derivations))
+             ((and (pair? body) (null? (cdr body)))
+              (values `(attribute ,(loc) ,name ,(car body))
+                      derivations))
+             (else
+              (error "invalid attribute body" name (loc) body)))))
+    ((attrs)
+     (values `(attribute-set ,(reverse body)) derivations))
+    ((attrspat)
+     (values `(attribute-set-pattern ,body) derivations))
+    ((bool)
+     (values (string-ci=? "true" (assq-ref attributes 'value))
+             derivations))
+    ((derivation)
+     (let ((drv-path (assq-ref attributes 'drvPath))
+           (out-path (assq-ref attributes 'outPath)))
+       (if (equal? body '(repeated))
+           (let ((body (vhash-assoc drv-path derivations)))
+             (if (pair? body)
+                 (values `(derivation ,drv-path ,out-path ,(cdr body))
+                         derivations)
+                 (error "no previous occurrence of derivation"
+                        drv-path)))
+           (values `(derivation ,drv-path ,out-path ,body)
+                   (vhash-cons drv-path body derivations)))))
+    ((ellipsis)
+     (values '... derivations))
+    ((expr)
+     (values `(snix ,(loc) ,@body) derivations))
+    ((function)
+     (values `(function ,(loc) ,body) derivations))
+    ((int)
+     (values (string->number (assq-ref attributes 'value))
+             derivations))
+    ((list)
+     (values body derivations))
+    ((null)
+     (values 'null derivations))
+    ((path)
+     (values (assq-ref attributes 'value) derivations))
+    ((repeated)
+     (values 'repeated derivations))
+    ((string)
+     (values (assq-ref attributes 'value) derivations))
+    ((unevaluated)
+     (values 'unevaluated derivations))
+    ((varpat)
+     (values `(varpat ,(assq-ref attributes 'name)) derivations))
+    (else (error "unhandled Nix XML element" elem))))
+
+(define xml->snix
+  ;; Return the SNix represention of TREE, an SXML tree as returned by
+  ;; parsing the XML output of `nix-instantiate' on Nixpkgs.
+  (let ((parse
+         (ssax:make-parser NEW-LEVEL-SEED
+                           (lambda (elem-gi attributes namespaces expected-content
+                                    seed)
+                             (cons '() (cdr seed)))
+
+                           FINISH-ELEMENT
+                           (lambda (elem-gi attributes namespaces parent-seed
+                                            seed)
+                             (let ((snix        (car seed))
+                                   (derivations (cdr seed)))
+                               (let-values (((snix derivations)
+                                             (xml-element->snix elem-gi
+                                                                attributes
+                                                                snix
+                                                                derivations)))
+                                 (cons (cons snix (car parent-seed))
+                                       derivations))))
+
+                           CHAR-DATA-HANDLER
+                           (lambda (string1 string2 seed)
+                             ;; Discard inter-node strings, which are blanks.
+                             seed))))
+    (lambda (port)
+      ;; Discard the second value returned by the parser (the derivation
+      ;; vhash).
+      (caar (parse port (cons '() vlist-null))))))
+
+(define (call-with-package snix proc)
+  (match snix
+    (('attribute _ (and attribute-name (? string?))
+                 ('derivation _ _ body))
+     ;; Ugly pattern matching.
+     (let ((meta
+            (any (lambda (attr)
+                   (match attr
+                     (('attribute _ "meta" ('attribute-set metas)) metas)
+                     (_ #f)))
+                 body))
+           (package-name
+            (any (lambda (attr)
+                   (match attr
+                     (('attribute _ "name" (and name (? string?)))
+                      name)
+                     (_ #f)))
+                 body))
+           (location
+            (any (lambda (attr)
+                   (match attr
+                     (('attribute loc "name" (? string?))
+                      loc)
+                     (_ #f)))
+                 body))
+           (src
+            (any (lambda (attr)
+                   (match attr
+                     (('attribute _ "src" src)
+                      src)
+                     (_ #f)))
+                 body)))
+       (proc attribute-name package-name location meta src)))))
+
+(define (call-with-src snix proc)
+  ;; Assume SNIX contains the SNix expression for the value of an `src'
+  ;; attribute, as returned by `call-with-package', and call PROC with the
+  ;; relevant SRC information, or #f if SNIX doesn't match.
+  (match snix
+    (('derivation _ _ body)
+     (let ((name
+            (any (lambda (attr)
+                   (match attr
+                     (('attribute _ "name" (and name (? string?)))
+                      name)
+                     (_ #f)))
+                 body))
+           (output-hash
+            (any (lambda (attr)
+                   (match attr
+                     (('attribute _ "outputHash" (and hash (? string?)))
+                      hash)
+                     (_ #f)))
+                 body))
+           (urls
+            (any (lambda (attr)
+                   (match attr
+                     (('attribute _ "urls" (and urls (? pair?)))
+                      urls)
+                     (_ #f)))
+                 body)))
+       (proc name output-hash urls)))
+    (_ (proc #f #f #f))))
+
+(define (src->values snix)
+  (call-with-src snix values))
+
+(define (open-nixpkgs nixpkgs)
+  (let ((script  (string-append nixpkgs
+                                "/maintainers/scripts/eval-release.nix")))
+    (open-pipe* OPEN_READ "nix-instantiate"
+                "--strict" "--eval-only" "--xml"
+                script)))
+
+(define (nix-prefetch-url url)
+  ;; Download URL in the Nix store and return the base32-encoded SHA256 hash
+  ;; of the file at URL
+  (let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url))
+         (hash (read-line pipe)))
+    (close-pipe pipe)
+    (if (eof-object? hash)
+        (values #f #f)
+        (let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path"
+                                 "sha256" hash (basename url)))
+               (path (read-line pipe)))
+          (if (eof-object? path)
+              (values #f #f)
+              (values (string-trim-both hash) (string-trim-both path)))))))
+
+(define (update-nix-expression file
+                               old-version old-hash
+                               new-version new-hash)
+  ;; Modify FILE in-place.  Ugly: we call out to sed(1).
+  (let ((cmd (format #f "sed -i \"~a\" -e 's/~A/~a/g ; s/~A/~A/g'"
+                     file
+                     (regexp-quote old-version) new-version
+                     old-hash
+                     (or new-hash "new hash not available, check the log"))))
+    (format #t "running `~A'...~%" cmd)
+    (system cmd)))
+
+
+;;;
+;;; FTP client.
+;;;
+
+(define-record-type <ftp-connection>
+  (%make-ftp-connection socket addrinfo)
+  ftp-connection?
+  (socket    ftp-connection-socket)
+  (addrinfo  ftp-connection-addrinfo))
+
+(define %ftp-ready-rx
+  (make-regexp "^([0-9]{3}) (.+)$"))
+
+(define (%ftp-listen port)
+  (let loop ((line (read-line port)))
+    (cond ((eof-object? line) (values line #f))
+          ((regexp-exec %ftp-ready-rx line)
+           =>
+           (lambda (match)
+             (values (string->number (match:substring match 1))
+                     (match:substring match 2))))
+          (else
+           (loop (read-line port))))))
+
+(define (%ftp-command command expected-code port)
+  (format port "~A~A~A" command (string #\return) (string #\newline))
+  (let-values (((code message) (%ftp-listen port)))
+    (if (eqv? code expected-code)
+        message
+        (throw 'ftp-error port command code message))))
+
+(define (%ftp-login user pass port)
+  (let ((command (string-append "USER " user (string #\newline))))
+    (display command port)
+    (let-values (((code message) (%ftp-listen port)))
+      (case code
+        ((230)  #t)
+        ((331) (%ftp-command (string-append "PASS " pass) 230 port))
+        (else  (throw 'ftp-error port command code message))))))
+
+(define (ftp-open host)
+  (catch 'getaddrinfo-error
+    (lambda ()
+      (let* ((ai (car (getaddrinfo host "ftp")))
+             (s  (socket (addrinfo:fam ai) (addrinfo:socktype ai)
+                         (addrinfo:protocol ai))))
+        (connect s (addrinfo:addr ai))
+        (setvbuf s _IOLBF)
+        (let-values (((code message) (%ftp-listen s)))
+          (if (eqv? code 220)
+              (begin
+                ;(%ftp-command "OPTS UTF8 ON" 200 s)
+                (%ftp-login "anonymous" "ludo@example.com" s)
+                (%make-ftp-connection s ai))
+              (begin
+                (format (current-error-port) "FTP to `~a' failed: ~A: ~A~%"
+                        host code message)
+                (close s)
+                #f)))))
+    (lambda (key errcode)
+      (format (current-error-port) "failed to resolve `~a': ~a~%"
+              host (gai-strerror errcode))
+      #f)))
+
+(define (ftp-close conn)
+  (close (ftp-connection-socket conn)))
+
+(define (ftp-chdir conn dir)
+  (%ftp-command (string-append "CWD " dir) 250
+                (ftp-connection-socket conn)))
+
+(define (ftp-pasv conn)
+  (define %pasv-rx
+    (make-regexp "([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+)"))
+
+  (let ((message (%ftp-command "PASV" 227 (ftp-connection-socket conn))))
+    (cond ((regexp-exec %pasv-rx message)
+           =>
+           (lambda (match)
+             (+ (* (string->number (match:substring match 5)) 256)
+                (string->number (match:substring match 6)))))
+          (else
+           (throw 'ftp-error conn "PASV" 227 message)))))
+
+
+(define* (ftp-list conn #:optional directory)
+  (define (address-with-port sa port)
+    (let ((fam  (sockaddr:fam sa))
+          (addr (sockaddr:addr sa)))
+      (cond ((= fam AF_INET)
+             (make-socket-address fam addr port))
+            ((= fam AF_INET6)
+             (make-socket-address fam addr port
+                                  (sockaddr:flowinfo sa)
+                                  (sockaddr:scopeid sa)))
+            (else #f))))
+
+  (if directory
+      (ftp-chdir conn directory))
+
+  (let* ((port (ftp-pasv conn))
+         (ai   (ftp-connection-addrinfo conn))
+         (s    (socket (addrinfo:fam ai) (addrinfo:socktype ai)
+                       (addrinfo:protocol ai))))
+    (connect s (address-with-port (addrinfo:addr ai) port))
+    (setvbuf s _IOLBF)
+
+    (dynamic-wind
+      (lambda () #t)
+      (lambda ()
+        (%ftp-command "LIST" 150 (ftp-connection-socket conn))
+
+        (let loop ((line   (read-line s))
+                   (result '()))
+          (cond ((eof-object? line) (reverse result))
+                ((regexp-exec %ftp-ready-rx line)
+                 =>
+                 (lambda (match)
+                   (let ((code (string->number (match:substring match 1))))
+                     (if (= 126 code)
+                         (reverse result)
+                         (throw 'ftp-error conn "LIST" code)))))
+                (else
+                 (loop (read-line s)
+                       (let ((file (car (reverse (string-tokenize line)))))
+                         (cons file result)))))))
+      (lambda ()
+        (close s)
+        (let-values (((code message) (%ftp-listen (ftp-connection-socket conn))))
+          (or (eqv? code 226)
+              (throw 'ftp-error conn "LIST" code message)))))))
+
+
+;;;
+;;; GNU.
+;;;
+
+(define %ignored-package-attributes
+  ;; Attribute name of packages to be ignored.
+  '("bash" "bashReal" "bashInteractive" ;; the full versioned name is incorrect
+    "autoconf213"
+    "automake17x"
+    "automake19x"
+    "automake110x"
+    "automake" ;; = 1.10.x
+    "bison1875"
+    "bison23"
+    "bison" ;; = 2.3
+    "emacs22"
+    "emacsSnapshot"
+    "gcc295"
+    "gcc33"
+    "gcc34"
+    "gcc40"
+    "gcc41"
+    "gcc42"
+    "gcc43"
+    "glibc25"
+    "glibc27"
+    "glibc29"
+    "guile_1_9"
+    ))
+
+(define (gnu? package)
+  ;; Return true if PACKAGE (a snix expression) is a GNU package (according
+  ;; to a simple heuristic.)  Otherwise return #f.
+  (match package
+    (('attribute _ attribute-name ('derivation _ _ body))
+     (any (lambda (attr)
+            (match attr
+              (('attribute _ "meta" ('attribute-set metas))
+               (any (lambda (attr)
+                      (match attr
+                        (('attribute _ "description" value)
+                         (string-prefix? "GNU" value))
+                        (('attribute _ "homepage" value)
+                         (string-contains value "www.gnu.org"))
+                        (_ #f)))
+                    metas))
+              (_ #f)))
+          body))
+    (_ #f)))
+
+(define (gnu-packages packages)
+  (fold (lambda (package gnu)
+          (match package
+            (('attribute _ "emacs23Packages" emacs-packages)
+             ;; XXX: Should prepend `emacs23Packages.' to attribute names.
+             (append (gnu-packages emacs-packages) gnu))
+            (('attribute _ attribute-name ('derivation _ _ body))
+             (if (member attribute-name %ignored-package-attributes)
+                 gnu
+                 (if (gnu? package)
+                     (cons package gnu)
+                     gnu)))
+            (_ gnu)))
+        '()
+        packages))
+
+(define (ftp-server/directory project)
+  (define quirks
+    '(("commoncpp2"   "ftp.gnu.org"   "/gnu/commoncpp" #f)
+      ("libgcrypt"    "ftp.gnupg.org" "/gcrypt" #t)
+      ("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t)
+      ("gnupg"        "ftp.gnupg.org" "/gcrypt" #t)
+      ("gnu-ghostscript" "ftp.gnu.org"  "/ghostscript" #f)
+      ("GNUnet"       "ftp.gnu.org" "/gnu/gnunet" #f)
+      ("mit-scheme"   "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg")
+      ("icecat"       "ftp.gnu.org" "/gnu/gnuzilla" #f)
+      ("TeXmacs"      "ftp.texmacs.org" "/TeXmacs/targz" #f)))
+
+  (let ((quirk (assoc project quirks)))
+    (match quirk
+      ((_ server directory subdir?)
+       (values server (if (not subdir?)
+                          directory
+                          (string-append directory "/" project))))
+      (else
+       (values "ftp.gnu.org" (string-append "/gnu/" project))))))
+
+(define (nixpkgs->gnu-name project)
+  (define quirks
+    '(("gcc-wrapper" . "gcc")
+      ("ghostscript" . "gnu-ghostscript") ;; ../ghostscript/gnu-ghoscript-X.Y.tar.gz
+      ("gnum4"       . "m4")
+      ("gnugrep"     . "grep")
+      ("gnused"      . "sed")
+      ("gnutar"      . "tar")
+      ("gnunet"      . "GNUnet") ;; ftp.gnu.org/gnu/gnunet/GNUnet-x.y.tar.gz
+      ("mitscheme"   . "mit-scheme")
+      ("texmacs"     . "TeXmacs")))
+
+  (or (assoc-ref quirks project) project))
+
+(define (releases project)
+  ;; TODO: Handle project release trees like that of IceCat and MyServer.
+  (define release-rx
+    (make-regexp (string-append "^" project "-[0-9].*\\.tar\\.")))
+
+  (catch #t
+    (lambda ()
+      (let-values (((server directory) (ftp-server/directory project)))
+        (let* ((conn  (ftp-open server))
+               (files (ftp-list conn directory)))
+          (ftp-close conn)
+          (map (lambda (tarball)
+                 (let ((end (string-contains tarball ".tar")))
+                   (substring tarball 0 end)))
+
+               ;; Filter out signatures, deltas, and files which are potentially
+               ;; not releases of PROJECT (e.g., in /gnu/guile, filter out
+               ;; guile-oops and guile-www).
+               (filter (lambda (file)
+                         (and (not (string-suffix? ".sig" file))
+                              (regexp-exec release-rx file)))
+                       files)))))
+    (lambda (key subr message . args)
+      (format (current-error-port)
+              "failed to get release list for `~A': ~A ~A~%"
+              project message args)
+      '())))
+
+(define version-string>?
+  (let ((strverscmp
+         (let ((sym (or (dynamic-func "strverscmp" (dynamic-link))
+                        (error "could not find `strverscmp' (from GNU libc)"))))
+           (make-foreign-function int sym (list '* '*))))
+        (string->null-terminated-utf8
+         (lambda (s)
+           (let* ((utf8 (string->utf8 s))
+                  (len  (bytevector-length utf8))
+                  (nts  (make-bytevector (+ len 1))))
+             (bytevector-copy! utf8 0 nts 0 len)
+             (bytevector-u8-set! nts len 0)
+             nts))))
+    (lambda (a b)
+      (let ((a (bytevector->foreign (string->null-terminated-utf8 a)))
+            (b (bytevector->foreign (string->null-terminated-utf8 b))))
+        (> (strverscmp a b) 0)))))
+
+(define (latest-release project)
+  ;; Return "FOO-X.Y" or #f.
+  (let ((releases (releases project)))
+    (and (not (null? releases))
+         (fold (lambda (release latest)
+                 (if (version-string>? release latest)
+                     release
+                     latest))
+               ""
+               releases))))
+
+(define (package/version name+version)
+  (let ((hyphen (string-rindex name+version #\-)))
+    (if (not hyphen)
+        (values name+version #f)
+        (let ((name    (substring name+version 0 hyphen))
+              (version (substring name+version (+ hyphen 1)
+                                  (string-length name+version))))
+          (values name version)))))
+
+(define (file-extension file)
+  (let ((dot (string-rindex file #\.)))
+    (and dot (substring file (+ 1 dot) (string-length file)))))
+
+(define (packages-to-update gnu-packages)
+  (fold (lambda (pkg result)
+          (call-with-package pkg
+            (lambda (attribute name+version location meta src)
+              (let-values (((name old-version)
+                            (package/version name+version)))
+                (let ((latest (latest-release (nixpkgs->gnu-name name))))
+                  (cond ((not latest)
+                         (format #t "~A [unknown latest version]~%"
+                                 name+version)
+                         result)
+                        ((string=? name+version latest)
+                         (format #t "~A [up to date]~%" name+version)
+                         result)
+                        (else
+                         (let-values (((project new-version)
+                                       (package/version latest))
+                                      ((old-name old-hash old-urls)
+                                       (src->values src)))
+                           (format #t "~A -> ~A [~A]~%" name+version latest
+                                   (and (pair? old-urls) (car old-urls)))
+                           (let* ((url      (and (pair? old-urls)
+                                                 (car old-urls)))
+                                  (new-hash (fetch-gnu project new-version
+                                                       (if url
+                                                           (file-extension url)
+                                                           "gz"))))
+                             (cons (list name attribute
+                                         old-version old-hash
+                                         new-version new-hash
+                                         location)
+                                   result))))))))))
+        '()
+        gnu-packages))
+
+(define (fetch-gnu project version archive-type)
+  (let-values (((server directory)
+                (ftp-server/directory project)))
+    (let* ((base    (string-append project "-" version ".tar." archive-type))
+           (url     (string-append "ftp://" server "/" directory "/" base))
+           (sig     (string-append base ".sig"))
+           (sig-url (string-append url ".sig")))
+      (let-values (((hash path) (nix-prefetch-url url)))
+        (pk 'prefetch-url url hash path)
+        (and hash path
+             (begin
+               (false-if-exception (delete-file sig))
+               (system* "wget" sig-url)
+               (if (file-exists? sig)
+                   (let ((ret (system* "gpg" "--verify" sig path)))
+                     (false-if-exception (delete-file sig))
+                     (if (and ret (= 0 (status:exit-val ret)))
+                         hash
+                         (begin
+                           (format (current-error-port)
+                                   "signature verification failed for `~a'~%"
+                                   base)
+                           (format (current-error-port)
+                                   "(could be because the public key is not in your keyring)~%")
+                           #f)))
+                   (begin
+                     (format (current-error-port)
+                             "no signature for `~a'~%" base)
+                     hash))))))))
+
+
+;;;
+;;; Main program.
+;;;
+
+(define %options
+  ;; Specifications of the command-line options.
+  (list (option '(#\h "help") #f #f
+                (lambda (opt name arg result)
+                  (format #t "Usage: gnupdate [OPTIONS...]~%")
+                  (format #t "GNUpdate -- update Nix expressions of GNU packages in Nixpkgs~%")
+                  (format #t "~%")
+                  (format #t "  -x, --xml=FILE      Read XML output of `nix-instantiate'~%")
+                  (format #t "                      from FILE.~%")
+                  (format #t "  -d, --dry-run       Don't actually update Nix expressions~%")
+                  (format #t "  -h, --help          Give this help list.~%~%")
+                  (format #t "Report bugs to <ludo@gnu.org>~%")
+                  (exit 0)))
+        (option '(#\d "dry-run") #f #f
+                (lambda (opt name arg result)
+                  (alist-cons 'dry-run #t result)))
+
+        (option '(#\x "xml") #t #f
+                (lambda (opt name arg result)
+                  (alist-cons 'xml-file arg result)))))
+
+(define-public (main . args)
+  ;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs.
+  (let* ((opts      (args-fold args %options
+                               (lambda (opt name arg result)
+                                 (error "unrecognized option `~A'" name))
+                               (lambda (operand result)
+                                 (error "extraneous argument `~A'" operand))
+                               '()))
+         (home      (getenv "HOME"))
+         (path      (or (getenv "NIXPKGS")
+                        (string-append home "/src/nixpkgs")))
+         (snix      (begin
+                      (format (current-error-port) "parsing XML...~%")
+                      (xml->snix
+                       (or (and=> (assoc-ref opts 'xml-file) open-input-file)
+                           (open-nixpkgs path)))))
+         (packages  (match snix
+                      (('snix _ ('attribute-set attributes))
+                       attributes)
+                      (else #f)))
+         (gnu       (gnu-packages packages))
+         (updates   (packages-to-update gnu)))
+    (format #t "~%~A packages to update...~%" (length updates))
+    (for-each (lambda (update)
+                (match update
+                  ((name attribute
+                    old-version old-hash
+                    new-version new-hash
+                    location)
+                   (if (assoc-ref opts 'dry-run)
+                       (format #t "`~a' would be updated from ~a to ~a (~a -> ~a)~%"
+                               name old-version new-version
+                               old-hash new-hash)
+                       (update-nix-expression (location-file location)
+                                              old-version old-hash
+                                              new-version new-hash)))
+                  (_ #f)))
+              updates)
+    #t))

pkgs/applications/audio/ardour/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     scons boost
-    pkgconfig fftw redland librdf_raptor librdf_rasqal jackaudio flac
+    pkgconfig fftw librdf_raptor librdf_rasqal jackaudio flac
     libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx libusb cairomm
     glib pango gtk glibmm gtkmm libgnomecanvas fftw librdf liblo aubio
     fftw fftwSinglePrec libmad
@@ -25,12 +25,13 @@ stdenv.mkDerivation {
     export CXX=g++
     scons PREFIX=$out install
   '';
+  
   installPhase = ":";
 
   meta = { 
-    description = "multi-track hard disk recording software";
+    description = "Multi-track hard disk recording software";
     longDescription = ''
-      Also read "the importance of Paying Something on their homepage, pelase!"
+      Also read "The importance of Paying Something" on their homepage, please!
     '';
     homepage = http://ardour.org/;
     license = "GPLv2";

pkgs/applications/audio/audacious/default.nix

@@ -0,0 +1,54 @@
+{ stdenv, fetchurl, pkgconfig, glib, gtk, libmowgli, libmcs
+, gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg
+, libvorbis, libcdio, libcddb, flac, ffmpeg
+}:
+
+stdenv.mkDerivation rec {
+  name = "audacious-2.3";
+  
+  src = fetchurl {
+    url = "http://distfiles.atheme.org/${name}.tgz";
+    sha256 = "0vs16y1vrlkzcbaw8imc36b9lncva69zkdkp38ikbidssiskm6xi";
+  };
+
+  pluginsSrc = fetchurl {
+    url = "http://distfiles.atheme.org/audacious-plugins-2.3.tgz";
+    sha256 = "0hdami52qpiyim3nz3qnml85wgjzpmx6g2wahfnsdvncmhm4v93x";
+  };
+  
+  # `--enable-amidiplug' is to prevent configure from looking in /proc/asound.
+  configureFlags = "--enable-amidiplug";
+  
+  buildInputs =
+    [ gettext pkgconfig glib gtk libmowgli libmcs libxml2 dbus_glib
+      libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio
+      libcddb ffmpeg
+    ];
+
+  # Here we build bouth audacious and audacious-plugins in one
+  # derivations, since they really expect to be in the same prefix.
+  # This is slighly tricky.
+  builder = builtins.toFile "builder.sh"
+    ''
+      # First build audacious.
+      (
+        source $stdenv/setup
+        genericBuild
+      )
+
+      # Then build the plugins.
+      (
+        buildNativeInputs="$out $buildNativeInputs" # to find audacious
+        source $stdenv/setup
+        rm -rfv audacious-*
+        src=$pluginsSrc
+        genericBuild
+      )
+    '';
+
+  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 ];
+  };
+}

pkgs/applications/audio/audacious/player.nix

@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk, libmowgli
-, libglade, libmcs, gettext, xlibs, dbus_glib
-}:
-
-stdenv.mkDerivation {
-  name = "audacious-1.5.1";
-  
-  src = fetchurl {
-    url = http://distfiles.atheme.org/audacious-1.5.1.tbz2;
-    sha256 = "1s32pdgx85qkrq15wwmvdw7wbcbxcf3nrhqxi6y72aijqm6fjwnz";
-  };
-
-  buildInputs = [pkgconfig libglade libmcs gettext dbus_glib];
-
-  propagatedBuildInputs = [glib gtk libmowgli libmcs];
-
-  NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib";
-
-  # Otherwise we barf with "libgcc_s.so.1 must be installed for
-  # pthread_cancel to work" on exit, as it tries to find libgcc_s
-  # dynamically.
-  dontPatchELF = true;
-
-  preBuild = ''
-    ensureDir $out/lib
-  '';
-
-  meta = {
-    description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork";
-    homepage = http://audacious-media-player.org/;
-  };
-}

pkgs/applications/audio/audacious/plugins.nix

@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, audacious, dbus_glib, gettext
-, libmad, xlibs, alsaLib, taglib, libmpcdec, libogg, libvorbis
-, libcdio, libcddb, libxml2
-}:
-
-stdenv.mkDerivation {
-  name = "audacious-plugins-1.5.1";
-  
-  src = fetchurl {
-    url = http://distfiles.atheme.org/audacious-plugins-1.5.1.tbz2;
-    sha256 = "1ki5bd50g4vi4d0qzxynyrgaq2n4cwhbsxln9rwk8ppphvk9pawc";
-  };
-
-  buildInputs = [
-    pkgconfig audacious dbus_glib gettext libmad
-    xlibs.libXcomposite alsaLib taglib libmpcdec
-    libogg libvorbis libcdio libcddb libxml2
-  ];
-
-  preBuild = ''
-    makeFlagsArray=(pluginlibdir=$out/lib/audacious)
-  '';
-
-  NIX_LDFLAGS = "-L${audacious}/lib/audacious"; # needed because we override pluginlibdir
-
-  # `--enable-amidiplug' is to prevent configure from looking in /proc/asound.
-  configureFlags = "--enable-amidiplug";
-  
-  meta = {
-    description = "Plugins for the Audacious media player";
-    homepage = http://audacious-media-player.org/;
-  };
-}

pkgs/applications/audio/lame/default.nix

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

pkgs/applications/audio/mpc123/default.nix

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

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

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

pkgs/applications/audio/pavucontrol/default.nix

@@ -2,11 +2,11 @@
 , libglademm, libcanberra, intltool, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "pavucontrol-0.9.7";
+  name = "pavucontrol-0.9.10";
 
   src = fetchurl {
     url = "http://0pointer.de/lennart/projects/pavucontrol/${name}.tar.gz";
-    sha256 = "1a1v06hbl1j78ryqy5aiccg6w5hf1yzday2b9h31kx7vr42ir1w0";
+    sha256 = "0g2sd9smwwpnyq8yc65dl9z0iafj2rrimi8v58wkxx98vhnnvsby";
   };
 
   buildInputs = [ pkgconfig pulseaudio gtkmm libsigcxx libglademm libcanberra
@@ -26,5 +26,8 @@ stdenv.mkDerivation rec {
     homepage = http://0pointer.de/lennart/projects/pavucontrol/;
 
     license = "GPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }

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

@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     # Don't set PAM_RHOST to "localhost", it confuses ConsoleKit
     # (which assumes that a non-empty string means a remote session).
     ./pam2.patch
+    
+    ./slim-1.3.1-gcc4.4.patch
   ];
 
   buildInputs = [x11 libjpeg libpng libXmu freetype pam];

pkgs/applications/display-managers/slim/slim-1.3.1-gcc4.4.patch

@@ -0,0 +1,17 @@
+Patch to allow compilation with gcc-4.4
+
+Notified by Daniel J. - from Debian bug tracker
+
+http://bugs.gentoo.org/252745
+
+--- a/switchuser.h	2008-11-11 19:40:18.000000000 +0000
++++ a/switchuser.h	2008-11-11 19:40:28.000000000 +0000
+@@ -18,6 +18,7 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #include <paths.h>
++#include <cstdio>
+ #include <iostream>
+ #include "const.h"
+ #include "cfg.h"
+

pkgs/applications/editors/eclipse/default.nix

@@ -1,24 +1,104 @@
 { stdenv, fetchurl, patchelf, makeDesktopItem, makeWrapper
 , freetype, fontconfig, libX11, libXext, libXrender, zlib
 , glib, gtk, libXtst, jre
+ # defaulting to this version because not all installable plugins work with 3.5.2 yet
+ # can also be set to "latest"
+, version ? "3.5.1"
 }:
 
+/*
+  Note: Eclipse stores various Eclipse instance specific data in ~/.eclipse/*-instance/...
+  The '*' depends on the executable location of Eclipse.
+
+  So if an Eclipse dependency such as gtk changes a different Eclipse setup directory will be used and
+  the plugins and update site list and more global settings seem to be gone.
+
+  Staring Eclipse from ~/.nix-profile/bin/eclipse doesn't help.
+
+  So I suggest copying the store path to ~/eclipse and run ~/eclipse/bin/eclipse instead.
+
+  However this still has some drawbacks: If you run nix-collect-garbage the gtk
+  libs the wrapper refers to might be gone. It should be easy for you to
+  replace the imortant lines in the wrapper.
+
+  You can also put this eclipse wrapper script (which was removed from
+  all-packages.nix -r 18458)
+  to your packageOverrides section and use that to run eclipse/eclipse.
+
+  Its parameterized by system because you may want to run both: i686 and x86_64 systems.
+
+    eclipseRunner =
+      pkgs.stdenv.mkDerivation {
+      name = "nix-eclipse-runner-script-${stdenv.system}";
+
+      phases = "installPhase";
+      installPhase = ''
+        ensureDir $out/bin
+        target=$out/bin/nix-run-eclipse-${stdenv.system}
+        cat > $target << EOF
+        #!/bin/sh
+        export PATH=${pkgs.jre}/bin:\$PATH
+        export LD_LIBRARY_PATH=${pkgs.gtkLibs216.glib}/lib:${pkgs.gtkLibs216.gtk}/lib:${pkgs.xlibs.libXtst}/lib
+        # If you run out of XX space try these? -vmargs -Xms512m -Xmx2048m -XX:MaxPermSize=256m
+        eclipse="\$1"; shift
+        exec \$eclipse -vmargs -Xms512m -Xmx2048m -XX:MaxPermSize=256m "\$@"
+        EOF
+        chmod +x $target
+      '';
+
+      meta = {
+        description = "provide environment to run Eclipse";
+        longDescription = ''
+          Is there one distribution providing support for up to date Eclipse installations?
+          There are various reasons why not.
+          Installing binaries just works. Get Eclipse binaries form eclipse.org/downloads
+          install this wrapper then run Eclipse like this:
+          nix-run-eclipse $PATH_TO_ECLIPSE/eclipse/eclipse
+          and be happy. Everything works including update sites.
+        '';
+        maintainers = [pkgs.lib.maintainers.marcweber];
+        platforms = pkgs.lib.platforms.linux;
+      };
+    };
+
+*/
+
+
+let
+
+  v = if version == "latest" then "3.5.2" else version;
+
+in
+
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  name = "eclipse-3.5.1";
+  name = "eclipse-${v}";
   
   src =
-    if stdenv.system == "x86_64-linux" then
-      fetchurl {
+    if v == "3.5.2" then
+      if stdenv.system == "x86_64-linux" then
+        fetchurl {
+          url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk-x86_64.tar.gz;
+          md5 = "54e2ce0660b2b1b0eb4267acf70ea66d";
+        }
+      else
+        fetchurl {
+          url = http://mirror.selfnet.de/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz;
+          md5 = "bde55a2354dc224cf5f26e5320e72dac";
+        }
+    else if v == "3.5.1" then
+     if stdenv.system == "x86_64-linux" then
+       fetchurl {
         url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz;
         sha256 = "132zd7q9q29h978wnlsfbrlszc85r1wj30yqs2aqbv3l5xgny1kk";
-      }
-    else
-      fetchurl {
+       }
+     else
+       fetchurl {
         url = http://mirrors.linux-bg.org/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk.tar.gz;
         sha256 = "0a0lpa7gxg91zswpahi6fvg3csl4csvlym4z2ad5cc1d4yvicp56";
-      };
+      }
+    else throw "no source for eclipse version ${v} known";
 
   desktopItem = makeDesktopItem {
     name = "Eclipse";
@@ -55,5 +135,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.eclipse.org/;
     description = "A extensible multi-language software development environment";
+    longDescription = ''
+    '';
   };
 }

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

@@ -16,17 +16,17 @@ stdenv.mkDerivation rec {
   name = "emacs-22.3";
 
   builder = ./builder.sh;
-  
+
   src = fetchurl {
     url = "mirror://gnu/emacs/${name}.tar.gz";
     sha256 = "05hd89bchcpwzcx5la0alcp0wb7xywvnf98dxrshrqlfvccvgnbv";
   };
-  
+
   buildInputs = [ncurses x11]
     ++ stdenv.lib.optional xawSupport (if xaw3dSupport then Xaw3d else libXaw)
     ++ stdenv.lib.optional xpmSupport libXpm
     ++ stdenv.lib.optionals gtkGUI [pkgconfig gtk];
-  
+
   configureFlags =
     stdenv.lib.optional gtkGUI "--with-x-toolkit=gtk";
 
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/emacs/;
     license = "GPLv3+";
 
-    platforms = stdenv.lib.platforms.linux;  # GTK & co. are needed.
+    platforms = stdenv.lib.platforms.all;
   };
 }

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

@@ -1,46 +1,29 @@
-{ xawSupport ? true
-, xpmSupport ? true
-, dbusSupport ? true
-, xaw3dSupport ? false
-, gtkGUI ? false
-, xftSupport ? false
-, stdenv, fetchurl, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
-, pkgconfig ? null, gtk ? null, libXft ? null, dbus ? null
-, libpng, libjpeg, libungif, libtiff, texinfo
+{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
+, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
+, libtiff, librsvg, texinfo, gconf
 }:
 
-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
-assert stdenv.system == "i686-darwin" -> xawSupport; # fails to link otherwise
+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-23.1";
+  name = "emacs-23.2";
 
   builder = ./builder.sh;
 
   src = fetchurl {
     url = "mirror://gnu/emacs/${name}.tar.bz2";
-    sha256 = "076b4ixdp29l4c02bwic26d14gxlj0lcqyam33wyj3ksgi2z8d9b";
+    sha256 = "1i96hp91s86jawrqjhfxm5y2sjxizv99009128b4bh06bgx6dm7z";
   };
 
   buildInputs = [
-    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 []);
+    ncurses x11 texinfo libXaw Xaw3d libXpm dbus libpng libjpeg libungif
+    libtiff librsvg gtk (if gtk != null then pkgconfig else null) libXft gconf
+  ];
 
-  configureFlags = "
-    ${if gtkGUI then "--with-x-toolkit=gtk --enable-font-backend --with-xft" else ""}
-  ";
+  configureFlags =
+    stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft" ];
 
   doCheck = true;
 
@@ -67,7 +50,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/emacs/;
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.linux;  # GTK & co. are needed.
+    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.all;
   };
 }

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

@@ -0,0 +1,25 @@
+{stdenv, fetchsvn}:
+
+let
+  revision = "73";
+in
+
+stdenv.mkDerivation {
+  name = "hol_light_mode-${revision}";
+
+  src = fetchsvn {
+    url = http://seanmcl-ocaml-lib.googlecode.com/svn/trunk/workshop/software/emacs;
+    rev = revision;
+    sha256 = "3ca83098960439da149a47e1caff32536601559a77f04822be742a390c67feb7";
+  };
+
+  installPhase = ''
+    DEST=$out/share/emacs/site-lisp
+    ensureDir $DEST
+    cp -a * $DEST
+  '';
+
+  meta = {
+    description = "A HOL Light mode for emacs";
+  };
+}

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

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, emacs }:
+stdenv.mkDerivation rec {
+  pname  = "emacs-jabber";
+  version = "0.8.0";
+  name = "${pname}-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+    sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26";
+  };
+  buildInputs = [ emacs ];
+  meta = {
+    description = "A Jabber client for Emacs";
+    longDescription = ''
+      jabber.el is a Jabber client for Emacs. It may seem strange to have a
+      chat client in an editor, but consider that chatting is, after all, just
+      a special case of text editing.
+    '';
+    homepage = http://emacs-jabber.sourceforge.net/;
+    license = [ "GPLv2+" ];
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

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

@@ -9,12 +9,13 @@ in
     # Last release is too old, so use SVN.
     # See http://www.emacswiki.org/emacs/JavaDevelopmentEnvironment .
     src = fetchsvn {
-      # Looks like they're not sure whether to put one or two `e'...
-      url = "https://jdee.svn.sourceforge.net/svnroot/jdee/trunk/jde";
+      url = "https://jdee.svn.sourceforge.net/svnroot/jdee/trunk/jdee";
       rev = revision;
-      sha256 = "0pjkbr1srx2m428xkky1csf97fr5219prs4dif7njlydyrwp0gnn";
+      sha256 = "1qj5cv74dp6nf6060jyvnlcbmc4sz8a09806gwa1zfiwz6mm9zrs";
     };
 
+    patchFlags = "-p1 --ignore-whitespace";
+
     patches = [
       ./build-properties.patch
       ./cedet-paths.patch ./elib-avltree.patch
@@ -91,5 +92,6 @@ in
       license = "GPLv2+";
 
       maintainers = [ stdenv.lib.maintainers.ludo ];
+      platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
     };
   }

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

@@ -1,11 +1,14 @@
-{stdenv, fetchurl, emacs, texinfo}:
+{ stdenv, fetchurl, emacs, texinfo }:
 
+let
+  version = "0.8";
+in
 stdenv.mkDerivation {
-  name = "magit-0.7";
+  name = "magit-${version}";
 
   src = fetchurl {
-    url = "http://zagadka.vm.bytemark.co.uk/magit/magit-0.7.tar.gz";
-    sha256 = "0qry1vj41pycwkf71sqrz3zgzh85zdg5acq26asscq4s7jksrjiz";
+    url = "http://github.com/downloads/philjackson/magit/magit-${version}.tar.gz";
+    sha256 = "4d1b55dcb118e506c6b8838acd4a50dbdd5348b1d12edd9789a3109a582e2954";
   };
 
   buildInputs = [emacs texinfo];
@@ -26,6 +29,8 @@ stdenv.mkDerivation {
     '';
 
     license = "GPLv3+";
-    homepage = "http://zagadka.vm.bytemark.co.uk/magit/";
+    homepage = "http://github.com/philjackson/magit";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

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

@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }:
+
+let
+  pname = "ProofGeneral";
+  version = "3.7.1.1";
+  name = "${pname}-${version}";
+  website = "http://proofgeneral.inf.ed.ac.uk";
+in
+
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "http://www.cl.cam.ac.uk/research/hvg/Isabelle/dist/contrib/${name}.tar.gz";
+    sha256 = "ae430590d6763618df50a662a37f0627d3c3c8f31372f6f0bb2116b738fc92d8";
+  };
+
+  sourceRoot = name;
+
+  buildInputs = [ emacs texinfo texLive perl which ];
+
+  patchPhase =
+    '' 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'
+    '';
+
+  installPhase =
+    # Copy `texinfo.tex' in the right place so that `texi2pdf' works.
+    '' cp -v "${automake}/share/"automake-*/texinfo.tex doc
+       make install install-doc
+    '';
+
+  meta = {
+    description = "Proof General, an Emacs front-end for proof assistants";
+    longDescription = ''
+      Proof General is a generic front-end for proof assistants (also known as
+      interactive theorem provers), based on the customizable text editor Emacs.
+    '';
+    homepage = website;
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}

pkgs/applications/editors/nano/default.nix

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

pkgs/applications/editors/vim/configurable.nix

@@ -13,7 +13,7 @@ composableDerivation {} {
 
     configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"];
 
-    buildInputs = [ncurses pkgconfig]
+    buildNativeInputs = [ncurses pkgconfig]
       ++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu ];
 
     # most interpreters aren't tested yet.. (see python for example how to do it)
@@ -26,17 +26,17 @@ composableDerivation {} {
       // edf { name = "xsmp"; } #Disable XSMP session management
       // edf { name = "xsmp_interact"; } #Disable XSMP interaction
       // edf { name = "mzscheme"; } #Include MzScheme interpreter.
-      // edf { name = "perl"; feat = "perlinterp"; enable = { buildInputs = [perl]; };} #Include Perl interpreter.
-      // edf { name = "python"; feat = "pythoninterp"; enable = { buildInputs = [python]; }; } #Include Python interpreter.
-      // edf { name = "tcl"; enable = { buildInputs = [tcl]; }; } #Include Tcl interpreter.
-      // edf { name = "ruby"; feat = "rubyinterp"; enable = { buildInputs = [ruby]; };} #Include Ruby interpreter.
+      // edf { name = "perl"; feat = "perlinterp"; enable = { buildNativeInputs = [perl]; };} #Include Perl interpreter.
+      // edf { name = "python"; feat = "pythoninterp"; enable = { buildNativeInputs = [python]; }; } #Include Python interpreter.
+      // edf { name = "tcl"; enable = { buildNativeInputs = [tcl]; }; } #Include Tcl interpreter.
+      // edf { name = "ruby"; feat = "rubyinterp"; enable = { buildNativeInputs = [ruby]; };} #Include Ruby interpreter.
       // edf { name = "cscope"; } #Include cscope interface.
       // edf { name = "workshop"; } #Include Sun Visual Workshop support.
       // edf { name = "netbeans"; } #Disable NetBeans integration support.
       // edf { name = "sniff"; } #Include Sniff interface.
       // edf { name = "multibyte"; } #Include multibyte editing support.
       // edf { name = "hangulinput"; } #Include Hangul input support.
-      # // edf { name = "xim"; enable = { buildInputs = [xim]; }; } #Include XIM input support.
+      # // edf { name = "xim"; enable = { buildNativeInputs = [xim]; }; } #Include XIM input support.
       // edf { name = "fontset"; } #Include X fontset output support.
       // edf { name = "acl"; } #Don't check for ACL support.
       // edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon).
@@ -62,11 +62,11 @@ composableDerivation {} {
 
   postInstall = "
     rpath=`patchelf --print-rpath \$out/bin/vim`;
-    for i in $\buildInputs; do
+    for i in $\buildNativeInputs; do
       echo adding \$i/lib
       rpath=\$rpath:\$i/lib
     done
-    echo \$buildInputs
+    echo \$buildNativeInputs
     echo \$rpath
     patchelf --set-rpath \$rpath \$out/bin/{vim,gvim}
   ";

pkgs/applications/editors/vim/default.nix

@@ -12,6 +12,17 @@ let
 	["pythonSupport" "python"]
 	["perlSupport" "perl"]
 	["tclSupport" "tcl"]
+	["eclSupport" "ecl" "gmp" "mpfr"]
+	["luaSupport" "lua"]
+
+	# Currently causes problems
+	["mzSchemeSupport" "pltScheme"]
+
+	["perlSupport" "perl"]
+	["rubySupport" "ruby"]
+	["hangulSupport"]
+	["sniffSupport"]
+	["gettextSupport" "gettext"]
 	["true" "ncurses"]
 	["false" "libSM"]
 	];
@@ -22,6 +33,11 @@ let
 	"perlSupport" "-perl"
 	"tclSupport" "-tcl"
 	"ximSupport" "-xim"
+	"eclSupport" "-ecl"
+	"luaSupport" "-lua"
+	"perlSupport" "-perl"
+	"rubySupport" "-ruby"
+	"mzSchemeSupport" "-mzscheme"
 	];
 	configFlags = [
 	"true" " --enable-multibyte "
@@ -31,6 +47,14 @@ let
 	"perlSupport" " --enable-perlinterp "
 	"tclSupport" " --enable-tclinterp "
 	"ximSupport" " --enable-xim "
+	"eclSupport" " --enable-eclinterp "
+	"hangulSupport" " --enable-hangulinput "
+	"perlSupport" " --enable-perlinterp "
+	"luaSupport" " --enable-luainterp --with-lua-prefix=${args.lua} "
+	"rubySupport" " --enable-rubyinterp "
+	"sniffSupport" " --enable-sniff "
+	"mzSchemeSupport" " --enable-mzschemeinterp "
+	"gettextSupport" " --enable-nls "
 	];
 	buildInputsNames = args.lib.filter (x: (null!=getVal x)) 
 		(args.lib.uniqList {inputList = 
@@ -42,10 +66,10 @@ in
 args.stdenv.mkDerivation {
   name = args.lib.condConcat "vim-7.2" nameSuffixes check;
  
-  src = args.fetchurl {
+  src = args.lib.attrByPath ["src"] (args.fetchurl {
     url = ftp://ftp.vim.org/pub/vim/unix/vim-7.2.tar.bz2;
     sha256 = "11hxkb6r2550c4n13nwr0d8afvh30qjyr5c2hw16zgay43rb0kci";
-  };
+  }) args;
  
   inherit (args) ncurses;
 

pkgs/applications/editors/zile/default.nix

@@ -1,14 +1,15 @@
 { fetchurl, stdenv, ncurses, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "zile-2.3.13";
+  name = "zile-2.3.16";
 
   src = fetchurl {
     url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "13nvrlns4vjngwjwg110r3djmpwq34q22crr4x8wpzf9c0chp8i4";
+    sha256 = "1lm24sw2ziqsib11sddz7gcqzw5iwfnsx65m1i461kxq218xl59h";
   };
 
-  buildInputs = [ ncurses help2man ];
+  buildInputs = [ ncurses ];
+  buildNativeInputs = [ help2man ];
 
   # Tests can't be run because most of them rely on the ability to
   # fiddle with the terminal.

pkgs/applications/graphics/ImageMagick/default.nix

@@ -1,34 +1,49 @@
-args: with args;
+{ stdenv
+, fetchurl
+, bzip2
+, freetype
+, graphviz
+, ghostscript
+, libjpeg
+, libpng
+, libtiff
+, libxml2
+, zlib
+, libtool
+, jasper
+, libX11
+, tetex ? null
+, librsvg ? null
+}:
 
-let version = "6.5.5-6"; in
-
-stdenv.mkDerivation (rec {
+let
+  version = "6.5.9-1";
+in
+stdenv.mkDerivation rec {
   name = "ImageMagick-${version}";
 
   src = fetchurl {
     url = "mirror://imagemagick/${name}.tar.bz2";
-    sha256 = "1037nsvfpw7wdgsvvzvi0bn1n5d667d8aj1xam7zgmf7xi6xha3q";
+    sha256 = "0a4yhhfqagz28yccydngi31050101jfmq5ljln61g69yy6m47ifg";
   };
 
   configureFlags = ''
     --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts
     --with-gslib
-    ${if args ? tetex then "--with-frozenpaths" else ""}
+    ${if tetex != null then "--with-frozenpaths" else ""}
   '';
 
   buildInputs =
-    [ bzip2 freetype ghostscript graphviz libjpeg libpng
-      libtiff libX11 libxml2 zlib libtool
-    ]
-    ++ stdenv.lib.optional (args ? tetex) args.tetex
-    ++ stdenv.lib.optional (args ? librsvg) args.librsvg;
+    [ bzip2 freetype graphviz ghostscript libjpeg libpng
+      libtiff libxml2 zlib tetex librsvg libtool jasper libX11
+    ];
 
-  preConfigure = if args ? tetex then
+  preConfigure = if tetex != null then
     ''
-      export DVIDecodeDelegate=${args.tetex}/bin/dvips
+      export DVIDecodeDelegate=${tetex}/bin/dvips
     '' else "";
 
   meta = {
     homepage = http://www.imagemagick.org;
   };
-})
+}

pkgs/applications/graphics/autopanosiftc/default.nix

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

pkgs/applications/graphics/dia/default.nix

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

pkgs/applications/graphics/feh/default.nix

@@ -1,17 +1,25 @@
-{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib }:
+{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib
+, libXinerama }:
 
 stdenv.mkDerivation {
-  name = "feh-1.3.4";
+  name = "feh-1.6.1";
 
   src = fetchurl {
-    url = http://linuxbrit.co.uk/downloads/feh-1.3.4.tar.gz;
-    sha256 = "091iz2id5z80vn2qxg0ipwncv5bv8i9ifw2q15ja9zazq6xz5fc1";
+    url = http://www.chaosdorf.de/~derf/feh/feh-1.6.1.tar.bz2;
+    sha256 = "1mv09b34ar0dx4wl22xak2g554xgpylicqy5zbnk3bh66vn9pxz2";
   };
 
-  buildInputs = [x11 imlib2 giblib libjpeg libpng];
+  buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama];
+
+  preBuild = ''
+    makeFlags="PREFIX=$out"
+  '';
 
   meta = {
     description = "A light-weight image viewer";
-    homepage = http://linuxbrit.co.uk/feh/;
+    homepage = https://derf.homelinux.org/projects/feh/;
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/applications/graphics/freepv/default.nix

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

pkgs/applications/graphics/gimp/default.nix

@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.6.7";
+  name = "gimp-2.6.8";
   
   src = fetchurl {
     url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
-    sha256 = "05g1dwxf0ydaadc8nv85akr9n240frh3f2sdrc9j90cywpxwa0d4";
+    sha256 = "0cikkb4l6psankz9yhgal934b41nwk6d5a93r9zib413fj5j3m6m";
   };
   
   buildInputs = [

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

@@ -37,7 +37,7 @@ let
  libLQR = pluginDerivation {
     name = "liblqr-1-0.4.1";
     # required by lqrPlugin, you don't havet to install this lib explicitely
-    buildInputs = [ gimp ] ++ gimp.buildInputs;
+    buildInputs = [ gimp ] ++ gimp.buildNativeInputs;
     src = fetchurl {
       url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2;
       sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz";
@@ -46,13 +46,36 @@ let
 
 in
 rec {
+  gap = pluginDerivation {
+    /* menu:
+       Video
+    */
+    name = "gap-2.6.0";
+    buildInputs = [ gimp pkgconfig glib pkgs.intltool gimp.gtk ] ++ gimp.buildNativeInputs;
+    src = fetchurl {
+      url = ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2;
+      sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
+    };
+    patchPhase = ''
+      sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \
+       -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure
+    '';
+    meta = { 
+      description = "The GIMP Animation Package";
+      homepage = http://www.gimp.org;
+      # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license
+      # falls inside "free".
+      license = [ "GPLv3" "free" ];
+    };
+  };
+
   fourier = pluginDerivation {
     /* menu:
        Filters/Generic/FFT Forward
        Filters/Generic/FFT Inverse
     */
     name = "fourier-0.3.3";
-    buildInputs = [ gimp pkgs.fftwSinglePrec  pkgconfig glib] ++ gimp.buildInputs;
+    buildInputs = [ gimp pkgs.fftwSinglePrec  pkgconfig glib] ++ gimp.buildNativeInputs;
     postInstall = "fail";
     installPhase = "installPlugins fourier";
     src = fetchurl {
@@ -69,7 +92,7 @@ rec {
       Filters/Enhance/Smart remove selection
     */
     name = "resynthesizer-0.16";
-    buildInputs = [ gimp pkgs.fftw ] ++ gimp.buildInputs;
+    buildInputs = [ gimp pkgs.fftw ] ++ gimp.buildNativeInputs;
     src = fetchurl {
       url = http://www.logarithmic.net/pfh-files/resynthesizer/resynthesizer-0.16.tar.gz;
       sha256 = "1k90a1jzswxmajn56rdxa4r60v9v34fmqsiwfdxqcvx3yf4yq96x";
@@ -83,7 +106,7 @@ rec {
 
   texturize = pluginDerivation {
     name = "texturize-2.1";
-    buildInputs = [ gimp ] ++ gimp.buildInputs;
+    buildInputs = [ gimp ] ++ gimp.buildNativeInputs;
     src = fetchurl {
       url = http://prdownloads.sourceforge.net/gimp-texturize/texturize-2.1_src.tgz;
       sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3";
@@ -96,7 +119,7 @@ rec {
       Filters/Enhance/Wavelet sharpen
     */
     name = "wavelet-sharpen-0.1.2";
-    buildInputs = [ gimp ] ++ gimp.buildInputs;
+    buildInputs = [ gimp ] ++ gimp.buildNativeInputs;
     src = fetchurl {
       url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz;
       sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
@@ -109,7 +132,7 @@ rec {
        Layer/Liquid Rescale
     */
     name = "lqr-plugin-0.6.1";
-    buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.buildInputs;
+    buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.buildNativeInputs;
     src = fetchurl {
       url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
       sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";
@@ -124,7 +147,7 @@ rec {
   let imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough?
   in pluginDerivation {
       name = "gmic-1.3.2.0";
-      buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.buildInputs;
+      buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.buildNativeInputs;
       src = fetchurl {
         url = http://dfn.dl.sourceforge.net/sourceforge/gmic/gmic_1.3.2.0.tar.gz;
         sha256 = "0mxq664vzzc2l6k6sqm9syp34mihhi262i6fixk1g12lmc28797h";
@@ -150,7 +173,7 @@ rec {
   # or use the binary
   ufraw = pluginDerivation {
     name = "ufraw-0.15";
-    buildInputs = [pkgs.lcms gimp] ++ gimp.buildInputs;
+    buildInputs = [pkgs.lcms gimp] ++ gimp.buildNativeInputs;
       # --enable-mime - install mime files, see README for more information
       # --enable-extras - build extra (dcraw, nikon-curve) executables
       # --enable-dst-correction - enable DST correction for file timestamps.

pkgs/applications/graphics/graphicsmagick/1.3.7.nix

@@ -0,0 +1,31 @@
+{stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
+, libjpeg, libpng, libtiff, libxml2, zlib, libtool
+, libX11}:
+
+let version = "1.3.7"; in
+
+stdenv.mkDerivation {
+  name = "graphicsmagick-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.gz";
+    sha256 = "0bwyqqvajz0hi34gfbjvm9f78icxk3fb442mvn8q2rapmvfpfkgf";
+  };
+
+  configureFlags = "--enable-shared";
+
+  buildInputs =
+    [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2
+      zlib libtool
+    ];
+
+  postInstall = ''
+    sed -i 's/-ltiff.*'\'/\'/ $out/bin/*
+  '';
+
+  meta = {
+    homepage = http://www.graphicsmagick.org;
+    description = "Swiss army knife of image processing";
+    license = stdenv.lib.licenses.mit;
+  };
+}

pkgs/applications/graphics/graphicsmagick/default.nix

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

pkgs/applications/graphics/gwenview/default.nix

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

pkgs/applications/graphics/hugin/default.nix

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

pkgs/applications/graphics/meshlab/default.nix

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

pkgs/applications/graphics/paraview/default.nix

@@ -1,35 +1,15 @@
 { fetchurl, stdenv, cmake, qt4 }:
 
-stdenv.mkDerivation {
-  name = "paraview-3.4.0";
+stdenv.mkDerivation rec {
+  name = "paraview-3.8.0";
   src = fetchurl {
-    url = http://www.paraview.org/files/v3.4/paraview-3.4.0.tar.gz;
-    sha256 = "27544f442e957e9aa60b32c674f2dcd84fffeecc9a40071ef6e305333413187d";
+    url = "http://www.paraview.org/files/v3.8/ParaView-3.8.0.tar.gz";
+    sha256 = "0y20daf59hn9dmbp1cmx0085z34qccwps04hv2lh9s15namca9py";
   };
 
-  patches = [ ./include-qobject.patch ];
-
-  # I added these flags to get all the rpaths right, which I guess they are
-  # taken from the qt4 sources. Not very nice.
-  cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/paraview-3.4\"" +
-    " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/paraview-3.4" +
-    " -lpng12 -lSM -lICE -lXrender -lXrandr -lXcursor -lXinerama" +
-    " -lXfixes -lfreetype -lfontconfig -lXext -lX11 -lssl -lXt -lz\"" +
-    " -DCMAKE_SKIP_BUILD_RPATH=ON" +
-    " -DCMAKE_BUILD_TYPE=Release" +
-    " -DCMAKE_INSTALL_PREFIX=$out";
-
-  dontUseCmakeConfigure = true;
-
-  # I rewrote the configure phase to get the $out references evaluated in
-  # cmakeFlags
-  configurePhase = ''
-    set -x
-    mkdir -p build;
-    cd build
-    eval -- "cmake .. $cmakeFlags"
-    set +x
-    '';
+  preConfigure = ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.8"
+  '';
 
   buildInputs = [ cmake qt4 ];
 

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

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

pkgs/applications/graphics/pinta/builder.sh

@@ -0,0 +1,20 @@
+source $stdenv/setup
+source $makeWrapper
+
+postInstall() {
+    mv $out/bin $out/bin-orig
+    mkdir $out/bin
+
+    for i in $out/bin-orig/*; do
+        echo "wrapping $(basename $i)"
+        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
+        makeWrapper "$i" "$out/bin/$(basename $i)" \
+            --suffix PATH ':' "$(dirname $(type -p mono))" \
+            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
+            --suffix MONO_GAC_PREFIX ':' "$out"
+    done
+}
+
+genericBuild
+
+

pkgs/applications/graphics/pinta/default.nix

@@ -0,0 +1,29 @@
+{stdenv, fetchgit, mono, gtksharp, pkgconfig, automake, autoconf}:
+
+stdenv.mkDerivation {
+  name = "pinta-20100617";
+
+  builder = ./builder.sh;
+
+  src = fetchgit {
+    url = http://github.com/jpobst/Pinta.git;
+    rev = "c8ce06fc14a42083749b6400ed57d3883820d368";
+    sha256 = "9df96b69b08567045e9100e228047d7711db28705bd2badc0afc316e63c15505";
+  };
+
+  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
+
+  configurePhase = ''
+    sh ./autogen.sh --prefix=$out
+  '';
+
+  makePhase = ''
+    HOME=`pwd`/tmphome
+    mkdir -p $HOME
+    xbuild Pinta.Core/Pinta.Core.csproj /v:diag
+  '';
+
+  buildInputs = [mono gtksharp pkgconfig automake autoconf];
+
+  inherit gtksharp;
+}

pkgs/applications/graphics/pqiv/default.nix

@@ -4,19 +4,21 @@ stdenv.mkDerivation (rec {
   name = "pqiv-0.8";
 
   src = fetchurl {
-    url = "http://www.pberndt.com/raw//Programme/Linux/pqiv/_download/pqiv-0.8.tbz";
+    url = "http://www.pberndt.com/raw/Programme/Linux/pqiv/_download/${name}.tbz";
     sha256 = "365332bab4b13ca56da6935e7155af20658e67d323808942dce23e880466f66d";
   };
 
   buildInputs = [ getopt which pkgconfig gtk ];
 
-  unpackCmd="bzip2 -d < $src | tar xvf - || fail";
-
   preConfigure=''
     substituteInPlace configure --replace /bin/bash "$shell"
     sed -i -e 's|$(tempfile -s.*)|temp.c|' -e 's|tempfile|mktemp|' configure
   '';
 
+  unpackCmd = ''
+    tar -xf ${src}
+  '';
+
   meta = {
     description = "Rewrite of qiv (quick image viewer)";
     homepage = http://www.pberndt.com/Programme/Linux/pqiv;

pkgs/applications/graphics/rawtherapee/default.nix

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

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

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

pkgs/applications/graphics/seg3d/cstdio.patch

@@ -0,0 +1,81 @@
+diff --git a/Core/Geometry/Transform.cc b/Core/Geometry/Transform.cc
+index 4f16fdc..0da4679 100644
+--- a/Core/Geometry/Transform.cc
++++ b/Core/Geometry/Transform.cc
+@@ -28,6 +28,7 @@
+ 
+ #include <cassert>
+ #include <cstring>
++#include <cstdio>
+ 
+ #include <Core/Util/TypeDescription.h>
+ #include <Core/Geometry/Transform.h>
+diff --git a/Core/Util/FullFileName.cc b/Core/Util/FullFileName.cc
+index 7a2cad7..7710e92 100644
+--- a/Core/Util/FullFileName.cc
++++ b/Core/Util/FullFileName.cc
+@@ -29,6 +29,7 @@
+ 
+ #include <Core/Util/FullFileName.h>
+ #include <iostream>
++#include <cstdio>
+ 
+ namespace SCIRun {
+ 
+diff --git a/Externals/particle-system-mm/src/sizingfield/LFS.cxx b/Externals/particle-system-mm/src/sizingfield/LFS.cxx
+index d1fa5aa..a5a4358 100644
+--- a/Externals/particle-system-mm/src/sizingfield/LFS.cxx
++++ b/Externals/particle-system-mm/src/sizingfield/LFS.cxx
+@@ -1,5 +1,6 @@
+ #include <cstdlib>
+ #include <iostream>
++#include <cstdio>
+ #include <LFS.h>
+ 
+ using namespace std;
+diff --git a/Externals/slivr/Point.cc b/Externals/slivr/Point.cc
+index d3be03e..ed4e503 100644
+--- a/Externals/slivr/Point.cc
++++ b/Externals/slivr/Point.cc
+@@ -42,6 +42,7 @@
+ #include <slivr/Point.h>
+ #include <slivr/Vector.h>
+ #include <iostream>
++#include <cstdio>
+ 
+ namespace SLIVR {
+ 
+diff --git a/Externals/slivr/Transform.cc b/Externals/slivr/Transform.cc
+index c0a4430..520179f 100644
+--- a/Externals/slivr/Transform.cc
++++ b/Externals/slivr/Transform.cc
+@@ -47,6 +47,7 @@
+ #include <math.h>
+ #include <string.h>
+ #include <iostream>
++#include <cstdio>
+ 
+ using namespace SLIVR;
+ using namespace std;
+diff --git a/Externals/slivr/Vector.cc b/Externals/slivr/Vector.cc
+index 8370d65..8b04bb9 100644
+--- a/Externals/slivr/Vector.cc
++++ b/Externals/slivr/Vector.cc
+@@ -43,6 +43,7 @@
+ #include <slivr/Point.h>
+ #include <assert.h>
+ #include <iostream>
++#include <cstdio>
+ 
+ using std::istream;
+ using std::ostream;
+diff --git a/Externals/vispack/src/image/imagefile.txx b/Externals/vispack/src/image/imagefile.txx
+index ced2590..13a32b2 100644
+--- a/Externals/vispack/src/image/imagefile.txx
++++ b/Externals/vispack/src/image/imagefile.txx
+@@ -1,3 +1,5 @@
++#include <cstdio>
++
+ template <class T>
+ int write_raw(const char* name, const VISImage<T>& im)
+ {

pkgs/applications/graphics/seg3d/default.nix

@@ -0,0 +1,51 @@
+{ fetchurl, stdenv, cmake, wxGTK, itk, mesa, libXft, libXext, libXi, zlib, libXmu,
+libuuid }:
+
+assert (stdenv ? glibc);
+
+stdenv.mkDerivation {
+  name = "seg3d-1.12";
+  src = fetchurl {
+    url = http://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz;
+    sha256 = "1wr6rc6v5qjjkmws8yrc03z35h3iydxk1z28p06v1wdnca0y71z8";
+  };
+
+  patches = [ ./cstdio.patch ];
+
+  cmakeFlags = [
+    "-DM_LIBRARY=${stdenv.glibc}/lib/libm.so"
+    "-DDL_LIBRARY=${stdenv.glibc}/lib/libdl.so"
+    "-DBUILD_UTILS=1"
+    "-DBUILD_SEG3D=1"
+    "-DBUILD_DATAFLOW=0"
+    "-DBUILD_SHARED_LIBS=0"
+    "-DWITH_X11=1"
+    "-DBUILD_BIOMESH3D=1"
+    "-DWITH_TETGEN=1"
+    "-DBUILD_TYPE=Release"
+    "-DBUILD_TESTING=0"
+    "-DWITH_WXWIDGETS=ON"
+    "-DITK_DIR=${itk}/lib/InsightToolkit"
+    "-DGDCM_LIBRARY=${itk}/lib/libitkgdcm.a"
+  ];
+
+
+  makeFlags = "VERBOSE=1";
+
+  preBuild = ''
+    export LD_LIBRARY_PATH=`pwd`/lib
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lGLU -lSM -lICE -lX11 -lXext -luuid";
+  '';
+
+  preUnpack = ''
+    set -x
+    sourceRoot=`pwd`/src
+  '';
+
+  postInstall = ''
+    cp Seg3D $out/bin
+    exit 1
+  '';
+
+  buildInputs = [ cmake wxGTK itk mesa libXft libXext libXi zlib libXmu libuuid ];
+}

pkgs/applications/graphics/xaos/default.nix

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

pkgs/applications/graphics/xournal/default.nix

@@ -1,35 +1,26 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl
+, ghostscript, atk, gtk, glib, fontconfig, freetype
+, libgnomecanvas, libgnomeprint, libgnomeprintui
+, pango, libX11, xproto, zlib, poppler, popplerData
+, autoconf, automake, libtool, pkgconfig}:
+stdenv.mkDerivation rec {
+  version = "0.4.5";
+  name = "xournal-" + version;
+  src = fetchurl {
+    url = "mirror://sourceforge/xournal/${name}.tar.gz";
+    sha256 = "1lamfzhby06w2pg56lpv1symdixcwmg6wvi7g6br6la4ak5w5mx7";
+  };
 
-  version = a.lib.attrByPath ["version"] "0.4.2.1" a; 
-  buildInputs = with a; [
+  buildInputs = [
     ghostscript atk gtk glib fontconfig freetype
     libgnomecanvas libgnomeprint libgnomeprintui
     pango libX11 xproto zlib poppler popplerData
     autoconf automake libtool pkgconfig
   ];
-in
-rec {
-  src = fetchurl {
-    url = "http://downloads.sourceforge.net/xournal/xournal-${version}.tar.gz";
-    sha256 = "1zxqcdhsd7h19c6pz7dwkr8bncn64v07liiqyw504m2v8lylrsif";
-  };
 
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["setEnvVars" "doAutotools" "doConfigure" "doMakeInstall"];
-
-  setEnvVars = a.noDepEntry (''
-    export NIX_LDFLAGS="-lX11"
-  '');
-      
-  name = "xournal-" + version;
+  NIX_LDFLAGS="-lX11 -lz";
   meta = {
     description = "note-taking application (supposes stylus)";
-    maintainers = [
-    ];
+    maintainers = [ stdenv.lib.maintainers.guibert ];
   };
 }

pkgs/applications/graphics/xscreensaver/default.nix

@@ -1,41 +1,41 @@
-args : with args; let localDefs = builderDefs.passthru.function (args // rec {
-                version = lib.attrByPath ["version"] "5.10" args;
-		src = /* put a fetchurl here */
-		fetchurl {
-		    url = "http://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz";
-		    sha256 = "07zy157wqwgcapqycyv89yabxa8byk4p8jn3zlvhf7lx5w1xmval";
-		};
-		useConfig = true;
-		reqsList = [
-			["true" "libX11" "pkgconfig" "bc" "perl" "intltool" "libXmu"]
-			["GL" "mesa"]
-			["GUI" "gtk" "libxml2" "libglade"]
-			["jpeg" "libjpeg"]
-			["false"]
-		];
-		configFlags = [
-			"GL" " --with-gl "
-			"gdkpixbuf" " --with-pixbuf "
-			"DPMS" " --with-dpms "
-			"true" (" --with-x-app-defaults=\$out/share/xscreensaver/app-defaults "+
-				" --with-hackdir=\$out/share/xscreensaver-hacks ")
-		];
-	});
-	in with localDefs;
-let
-	preConfigure = fullDepEntry ("
-		sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' "+
-		"-i driver/Makefile.in po/Makefile.in.in;
-	") ["minInit" "doUnpack"];
-in
-stdenv.mkDerivation rec {
-	name = "xscreensaver-5.10";
-	buildCommand = textClosure localDefs
-          [preConfigure doConfigure doMakeInstall doForceShare doPropagate];
-	meta = {
-		description = "A set of screensavers";
-		inherit src;
-    		maintainers = [stdenv.lib.maintainers.raskin];
-		platforms = stdenv.lib.platforms.allBut "i686-cygwin";
-	};
-}
+x@{ pkgconfig, bc, perl, xlibs, libjpeg, mesa, gtk
+, libxml2, libglade, builderDefsPackage, ... }:                                                                 
+
+builderDefsPackage 
+(a: rec {
+  version = "5.11";
+  name = "xscreensaver-${version}";
+  url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
+
+  src = a.fetchurl {
+    inherit url;
+    sha256="0w47s0qd8ab6ywhhhkqjx0grb2b28bh2flnkdpj3yaind202l0s7";
+  };
+
+  buildInputs = with a;
+    [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade
+      xlibs.xlibs xlibs.libXmu
+    ];
+
+  configureFlags =
+    [ "--with-gl"
+      "--with-dpms"
+      "--with-pixbuf"
+      "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
+      "--with-hackdir=\${out}/share/xscreensaver-hacks"
+    ];
+
+  preConfigure = a.fullDepEntry
+    ''
+      sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
+        -i driver/Makefile.in po/Makefile.in.in
+    '' ["minInit" "doUnpack"];
+
+  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
+
+  meta = {
+    description = "A set of screensavers";
+    maintainers = [ a.lib.maintainers.raskin ];
+    platforms = a.lib.platforms.allBut "i686-cygwin";
+  };
+}) x

pkgs/applications/misc/blender/2.49.nix

@@ -0,0 +1,33 @@
+{stdenv, fetchurl, cmake, mesa, gettext, python, libjpeg, libpng, zlib, openal, SDL
+, openexr, libsamplerate, libXi, libtiff, ilmbase, freetype}:
+
+stdenv.mkDerivation rec {
+  name = "blender-2.49b";
+
+  src = fetchurl {
+    url = "http://download.blender.org/source/${name}.tar.gz";
+    sha256 = "1214fp2asij7l1sci2swh46nfjgpm72gk2qafq70xc0hmas4sm93";
+  };
+
+  buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal SDL openexr libsamplerate
+    libXi libtiff ilmbase freetype ];
+
+  cmakeFlags = [ "-DFREETYPE_INC=${freetype}/include" "-DOPENEXR_INC=${openexr}/include/OpenEXR" "-DWITH_OPENCOLLADA=OFF"
+    "-DPYTHON_LIBPATH=${python}/lib" ];
+
+  NIX_LDFLAGS = "-lX11";
+  NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix} -I${freetype}/include/freetype2";
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp bin/* $out/bin
+  '';
+
+  meta = { 
+    description = "3D Creation/Animation/Publishing System";
+    homepage = http://www.blender.org;
+    # They comment two licenses: GPLv2 and Blender License, but they
+    # say: "The BL has not been activated yet."
+    license = "GPLv2+";
+  };
+}

pkgs/applications/misc/blender/default.nix

@@ -1,50 +1,29 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "blender-2.48";
+{stdenv, fetchurl, cmake, mesa, gettext, python, libjpeg, libpng, zlib, openal, SDL
+, openexr, libsamplerate, libXi, libtiff, ilmbase }:
+
+stdenv.mkDerivation rec {
+  name = "blender-2.50a1";
 
   src = fetchurl {
-    url = http://download.blender.org/source/blender-2.48a.tar.gz;
-    sha256 = "0ijfpy510ls8xq1i8fb6j6wd0vac1jvnzmpiga4g7x1j4fg4s7bq";
+    url = "http://download.blender.org/source/${name}.tar.gz";
+    sha256 = "1cik05fmf9b8z3qpwsm6q9h1ia87w1piz87hxhfs24jw6l5pyiwr";
   };
 
-  phases="unpackPhase buildPhase";
+  buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal SDL openexr libsamplerate
+    libXi libtiff ilmbase ];
 
-  inherit scons SDL freetype openal python openexr mesa;
+  cmakeFlags = [ "-DOPENEXR_INC=${openexr}/include/OpenEXR" "-DWITH_OPENCOLLADA=OFF"
+    "-DPYTHON_LIBPATH=${python}/lib" ];
 
-  buildInputs = [python scons
-         gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi 
-         ];
+  NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}";
 
-  # patch SConstruct so that we can pass on additional include.  Either blender
-  # or openEXR is broken. I think OpenEXR should use include "" isntead of <> to
-  # include files beeing in the same directory
-  buildPhase = "
-cat >> user-config.py << EOF
-WITH_BF_OPENAL = 'true'
-WITH_BF_GAMEENGINE='true'
-WITH_BF_BULLET = 'true'
-WITH_BF_INTERNATIONAL = 'true'
-WITH_BF_OPENEXR = 'true'
-EOF
-
-    sed -i -e \"s=##### END SETUP ##########=env['CPPFLAGS'].append(os.getenv('CPPFLAGS').split(':'))\\n##### END SETUP ##########=\" SConstruct\n"
-    + " CPPFLAGS=-I$openexr/include/OpenEXR"
-    + " scons PREFIX=\$out/nix-support"
-    + " BF_SDL=\$SDL"
-    + " BF_SDL_LIBPATH=\$SDL/lib"
-    + " BF_FREETYPE=\$freetype"
-    + " BF_OPENAL=\$openal"
-    + " BF_PYTHON=\$python"
-    + " BF_OPENEXR_INC=\$openexr/include"
-    + " BF_OPENEXR_LIBPATH=\$openexr/lib"
-    + " BF_INSTALLDIR=\$out/nix-support/dontLinkThatMuch \n"
-    + " ensureDir \$out/bin\n"
-    + " ln -s \$out/nix-support/dontLinkThatMuch/blender \$out/bin/blender"
-    ;
+  patches = [ ./python-chmod.patch ];
 
   meta = { 
-      description = "3D Creation/Animation/Publishing System";
-      homepage = http://www.blender.org;
-      license = "GPL-2 BL";
-    };
+    description = "3D Creation/Animation/Publishing System";
+    homepage = http://www.blender.org;
+    # They comment two licenses: GPLv2 and Blender License, but they
+    # say: "We've decided to cancel the BL offering for an indefinite period."
+    license = "GPLv2+";
+  };
 }

pkgs/applications/misc/blender/python-chmod.patch

@@ -0,0 +1,14 @@
+As the code copied from the nix store, the files there do not have the 'writeable' permission.
+Hence this fix, needed on nix but not on usual LSB linuces.
+diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
+index 386ef1b..6a180fa 100644
+--- a/source/creator/CMakeLists.txt
++++ b/source/creator/CMakeLists.txt
+@@ -152,6 +152,7 @@ IF(WITH_INSTALL)
+ 				COMMAND mkdir ${TARGETDIR}/.blender/python # PYTHONPATH and PYTHONHOME is set here
+ 				COMMAND mkdir ${TARGETDIR}/.blender/python/lib/
+ 				COMMAND cp -R ${PYTHON_LIBPATH}/python${PYTHON_VERSION} ${TARGETDIR}/.blender/python/lib/
++        COMMAND chmod -R +w ${TARGETDIR}/.blender/python/lib/
+         
+ 				COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/distutils
+ 				COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib2to3

pkgs/applications/misc/calibre/default.nix

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

pkgs/applications/misc/djvulibre/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, lib, useQt3 ? true, libjpeg, libtiff, libpng, ghostscript
+, libungif, zlib, x11, libX11, mesa, qt3 }:
 
 stdenv.mkDerivation {
   name = "djvulibre-3.5.22";
@@ -8,10 +9,12 @@ stdenv.mkDerivation {
     sha256 = "1gphi67qiq1ky7k8vymkwcgla80cwy8smk1rla6grxdqipwl54ix";
   };
 
-  buildInputs = [qt libX11 libjpeg libtiff libpng ghostscript zlib libungif x11 mesa];
+  buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++
+    stdenv.lib.optionals useQt3 [qt3 libX11 x11 mesa];
 
   meta = {
     description = "A library and viewer for the DJVU file format for scanned images";
     homepage = http://djvu.sourceforge.net;
+    maintainers = [ lib.maintainers.urkud ];
   };
 }

pkgs/applications/misc/dmenu/default.nix

@@ -1,10 +1,11 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "dmenu-3.9";
+{stdenv, fetchurl, libX11, libXinerama}:
+
+stdenv.mkDerivation rec {
+  name = "dmenu-4.1.1";
 
   src = fetchurl {
-    url = http://code.suckless.org/dl/tools/dmenu-3.9.tar.gz;
-    sha256 = "2370111e02c6a3863ea04376795fa72f9e41cdd2650b12f90e6a0c7d096e4b22";
+    url = "http://dl.suckless.org/tools/${name}.tar.gz";
+    sha256 = "02p687yi3fmnpkbvnskpryz54dc4i8pzf1spxc554s91wrd7fpwy";
   };
 
   buildInputs = [ libX11 libXinerama ];
@@ -15,5 +16,7 @@ stdenv.mkDerivation {
       description = "a generic, highly customizable, and efficient menu for the X Window System";
       homepage = http://tools.suckless.org/dmenu;
       license = "MIT";
+      maintainers = with stdenv.lib.maintainers; [viric];
+      platforms = with stdenv.lib.platforms; all;
   };
 }

pkgs/applications/misc/eaglemode/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, libX11, xineLib, libjpeg, libpng, libtiff }:
 
 stdenv.mkDerivation {
-  name = "eaglemode-0.75";
+  name = "eaglemode-0.76.0";
  
   src = fetchurl {
-    url = mirror://sourceforge/eaglemode/eaglemode-0.75.0.tar.bz2;
-    sha256 = "0iqdf55ff0il5frkl3yq3r27yk9xl30b9ygf3fvrv78a5bzpq8r7";
+    url = mirror://sourceforge/eaglemode/eaglemode-0.76.0.tar.bz2;
+    sha256 = "152v7p9dicm8shwncpcifg4b2l4c61c1qn00469cz38vja67npww";
   };
  
   buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff ];

pkgs/applications/misc/epdfview/default.nix

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

pkgs/applications/misc/freemind/default.nix

@@ -1,15 +1,20 @@
 args: with args;
 stdenv.mkDerivation {
-  name = "freemind-0.9.0_Beta_20";
+  name = "freemind-0.9.0_RC_6";
 
   src = fetchurl {
-    url = mirror://sourceforge/freemind/freemind-src-0.9.0_Beta_20.tar.gz;
-    sha256 = "1ja573n0g9zpdrljabgps20njg1p76hvsv8xjb56cii2dr77yspv";
+    url = mirror://sourceforge/freemind/freemind-src-0.9.0_RC_6.tar.gz;
+    sha256 = "0qxpwqmb4xd8c83zh76gczmx0hsx5m209k7p60kh7c4f25snhngf";
   };
 
   buildInputs = [jdk ant];
 
-  phases="unpackPhase buildPhase installPhase";
+  phases="unpackPhase patchPhase buildPhase installPhase";
+
+  patchPhase=''
+    # There is a complain about this. I don't understand it.
+    mkdir plugins/plugins
+  '';
 
   buildPhase="ant dist";
 # LIBXCB_ALLOW_SLOPPY_LOCK=true :

pkgs/applications/misc/gkrellm/default.nix

@@ -1,10 +1,10 @@
-args: with args;
+{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE }:
 
-stdenv.mkDerivation {
-  name = "gkrellm-2.3.1";
+stdenv.mkDerivation rec {
+  name = "gkrellm-2.3.4";
   src = fetchurl {
-    url = http://members.dslextreme.com/users/billw/gkrellm/gkrellm-2.3.1.tar.bz2;
-    sha256 = "1a2a7e3ee9d1f2d7305da0d33d9be71ffe5d1903ed6a9c69cf77ffe10fc95b4d";
+    url = "http://members.dslextreme.com/users/billw/gkrellm/${name}.tar.bz2";
+    sha256 = "0mjg2pxpiqms7d6dvxzxvpa420cakhpjxvrclhq0y8jd2dlv2irl";
   };
 
   buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE];
@@ -15,9 +15,7 @@ stdenv.mkDerivation {
      echo "patching makefiles..."
      for i in Makefile src/Makefile server/Makefile
      do
-       cat "$i" | sed -e "s|/usr/X11R6|${libX11}|g ;
-                          s|-lICE|-lX11 -lICE|g" > ",,tmp" &&	\
-       mv ",,tmp" "$i"
+       sed -i "$i" -e "s|/usr/X11R6|${libX11}|g ; s|-lICE|-lX11 -lICE|g"
      done '';
 
   buildPhase = ''
@@ -27,7 +25,16 @@ stdenv.mkDerivation {
 
   meta = {
     description = "GKrellM, a themeable process stack of system monitors.";
+    longDescription =
+      '' GKrellM is a single process stack of system monitors which supports
+         applying themes to match its appearance to your window manager, Gtk,
+         or any other theme.
+      '';
+
     homepage = http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html;
-    license = "GPL";
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/applications/misc/googleearth/default.nix

@@ -1,19 +1,19 @@
 { stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv,
 libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11,
-zlib, patchelf05 }:
+zlib }:
 
 /* I haven't found any x86_64 package from them */
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
-  name = "googleearth-5.1.3509.4636";
+  name = "googleearth-5.1.3535.3218";
 
   src = fetchurl {
     url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin;
-    sha256 = "6c948c64eed5f30adb67019c0d26c148b9ad7a821891018548da650fe812dca8";
+    sha256 = "f721e4e8db3a7351c77a8aea425ec334ff01e163481cbcf6cdda9dbb0ad422ac";
   };
 
-  buildInputs = [
+  buildNativeInputs = [
     glibc
     glib
     stdenv.gcc.gcc
@@ -34,10 +34,12 @@ stdenv.mkDerivation {
   ];
 
   phases = "unpackPhase installPhase";
+  
   unpackPhase = ''
     bash $src --noexec --target unpacked
     cd unpacked
   '';
+  
   installPhase =''
     ensureDir $out/{opt/googleearth/,bin};
     tar xf googleearth-data.tar -C $out/opt/googleearth
@@ -51,22 +53,23 @@ stdenv.mkDerivation {
     chmod +x $out/bin/googleearth
 
     fullPath=
-    for i in $buildInputs; do
+    for i in $buildNativeInputs; do
       fullPath=$fullPath:$i/lib
     done
           
-    ${patchelf05}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
       --set-rpath $fullPath \
       $out/opt/googleearth/googleearth-bin
 
     for a in $out/opt/googleearth/*.so* ; do
-      ${patchelf05}/bin/patchelf --set-rpath $fullPath $a
+      patchelf --set-rpath $fullPath $a
     done
   '';
 
   meta = {
-      description = "A world sphere viewer";
-      homepage = http://earth.google.com;
-      license = "unfree";
+    description = "A world sphere viewer";
+    homepage = http://earth.google.com;
+    license = "unfree";
+    maintainers = [ stdenv.lib.maintainers.viric ];
   };
 }

pkgs/applications/misc/gosmore/default.nix

@@ -0,0 +1,30 @@
+a@{fetchsvn, libxml2, gtk, curl, pkgconfig, lib, ...} :  
+let 
+  fetchsvn = a.fetchsvn;
+
+  buildInputs = with a; [
+    libxml2 gtk curl pkgconfig
+  ];
+in
+rec {
+  src = fetchsvn {
+    url = http://svn.openstreetmap.org/applications/rendering/gosmore;
+    sha256 = "0r6c6gk0pjljwcqxjy18d2s526pyv2kwydf5gl9k68s1b20ps3nd";
+    rev = "21657";
+  } + "/";
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  name = "gosmore-r21657";
+  meta = {
+    description = "Open Street Map viewer";
+    maintainers = [
+      a.lib.maintainers.raskin
+    ];
+    platforms = a.lib.platforms.linux;
+  };
+}

pkgs/applications/misc/grass/default.nix

@@ -0,0 +1,182 @@
+{getConfig, ...}@a:
+
+# You can set gui by exporting GRASS_GUI=..
+# see http://grass.itc.it/gdp/html_grass64/g.gui.html
+# defaulting to wxpython because this is used in the manual
+let inherit (builtins) getAttr;
+    inherit (a.composableDerivation) edf wwf;
+    inherit (a.stdenv.lib) maybeAttr optionalString;
+
+    # wrapper for wwf call
+    # lib: the lib whose include and lib paths should be passed
+    # {}@args: additional args being merged before passing everything to wwf
+    wwfp = lib: {name, ...}@args:
+      let mbEnable = maybeAttr "enable" {} args;
+      in wwf (args // {
+      enable =  mbEnable // {
+        buildInputs = [ lib ]
+          ++ maybeAttr "buildInputs" [] mbEnable;
+        configureFlags = [
+          "--with-${name}-libs=${lib}/lib"
+          "--with-${name}-includes=${lib}/include"
+        ] ++ maybeAttr "configureFlags" [] mbEnable;
+      };
+    });
+in
+a.composableDerivation.composableDerivation {} (fix: {
+
+  name = "grass-6.4.0RC6";
+
+  buildInputs = [
+    # gentoos package depends on gmath ? 
+    a.pkgconfig
+    a.flex a.bison a.libXmu a.libXext a.libXp a.libX11 a.libXt a.libSM a.libICE
+    a.libXpm a.libXaw a.flex a.bison a.gdbm
+    a.makeWrapper
+  ];
+
+  cfg = {
+    _64bitSupport = getConfig ["grass" "64bitSupport"] true;
+    cursesSupport = getConfig ["grass" "curses"] true;
+    gdalSupport = getConfig ["grass" "gdal"] true;
+    pythonSupport = getConfig ["grass" "python"] true;
+    wxwidgetsSupport = getConfig ["grass" "wxwidgets"] true;
+    readlineSupport = getConfig ["grass" "readline"] true;
+    jpegSupport = getConfig ["grass" "jpeg"] true;
+    tiffSupport = getConfig ["grass" "tiff"] true;
+    pngSupport = getConfig ["grass" "png"] true;
+    tcltkSupport = getConfig ["grass" "tcltk"] true;
+    postgresSupport = getConfig ["grass" "postgres"] true;
+    mysqlSupport = getConfig ["grass" "mysql"] true;
+    sqliteSupport = getConfig ["grass" "sqlite"] true;
+    ffmpegSupport = getConfig ["grass" "ffmpeg"] true;
+    openglSupport = getConfig ["grass" "opengl"] true;
+    odbcSupport = getConfig ["grass" "odbc"] false; # fails to find libodbc - why ?
+    fftwSupport = getConfig ["grass" "fftw"] true;
+    blasSupport = getConfig ["grass" "blas"] true;
+    lapackSupport = getConfig ["grass" "lapack"] true;
+    cairoSupport = getConfig ["grass" "cairo"] true;
+    motifSupport = getConfig ["grass" "motif"] true;
+    freetypeSupport = getConfig ["grass" "freetype"] true;
+    projSupport = getConfig ["grass" "proj"] true;
+    opendwgSupport = getConfig ["grass" "dwg"] false;
+    largefileSupport = getConfig ["grass" "largefile"] true;
+  };
+
+  # ?? NLS support:                no
+  # ?? GLw support:                no
+  # ?? DWG support:                no
+  flags = {
+
+    python = {
+      configureFlags = [ "--with-python=${a.python}/bin/python-config" ];
+      buildInputs = [a.python a.swig];
+    };
+    
+  }
+  // edf { name = "_64bit"; feat = "64bit"; }
+  // wwfp a.ncurses { name = "curses"; }
+  // wwfp a.gdal { name = "gdal"; }
+  // wwfp a.wxGTK { name = "wxwidgets"; value = "${a.wxGTK}/bin/wx-config"; }
+  // wwfp a.readline { name = "readline"; }
+  // wwfp a.libjpeg { name = "jpeg"; }
+  // wwfp a.libtiff { name = "tiff"; }
+  // wwfp a.libpng { name = "png"; }
+  // wwfp a.tk { name = "tcltk"; enable.buildInputs = [ a.tcl ]; }
+  // wwfp a.postgresql { name = "postgres"; }
+  // wwf {
+    name = "mysql";
+    enable = {
+      buildInputs = [ a.mysql ];
+      configureFlags = [
+        "--with-mysql-libs=${a.mysql}/lib/mysql"
+        "--with-mysql-includes=${a.mysql}/include/mysql"
+      ];
+    };
+  }
+  // wwfp a.sqlite { name = "sqlite"; }
+  // wwf {
+    name = "ffmpeg";
+    enable = {
+      configureFlags = [
+        "--with-ffmpeg-libs=${a.ffmpeg}/lib"
+        "--with-ffmpeg-includes=${a.ffmpeg}/include"
+      ];
+      # is there a nicer way to pass additional include directories?
+      # this should work: --with-ffmpeg-includes=/usr/include/lib[av|sw]*
+      # I did not try
+      preConfigure = ''
+        for dir in ${a.ffmpeg}/include/*; do
+          if [ -d $dir ]; then
+            NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$dir"
+          fi
+        done
+      '';
+      buildInputs = [a.ffmpeg];
+    };
+  }
+  // wwfp a.mesa { name = "opengl"; }
+  // wwfp a.unixODBC { name = "odbc"; }
+  // wwfp a.fftw { name = "fftw"; }
+  // wwf {
+    name = "blas"; 
+    enable.configureFlags = [ "--with-blas-libs=${a.blas}/lib" ];
+  }
+  // wwf {
+    name = "lapack";
+    enable.configureFlags = [ "--with-lapack-libs=${a.liblapack}/lib" ];
+  }
+  // wwfp a.cairo {
+    name = "cairo";
+    enable.buildInputs = [ a.fontconfig a.libXrender ];
+  }
+  // wwfp a.motif { name = "motif"; }
+  // wwf {
+    name="freetype";
+    enable = {
+      buildInputs = [ a.freetype ];
+      configureFlags = [
+        "--with-freetype-libs=${a.freetype}/lib"
+        "--with-freetype-includes=${a.freetype}/include/freetype2"
+      ];
+    };
+  }
+  // wwfp a.proj { name = "proj"; enable.configureFlags = [ "--with-proj-share=${a.proj}/share"]; }
+  // wwfp a.opendwg { name = "opendwg"; }
+  // edf {
+    name = "largefile";
+  };
+  /* ?
+  // wwf {
+    name = "x";
+    enable.buildInputs = [];
+  };
+  */
+
+  src = a.fetchurl {
+    url = "http://grass.itc.it/grass64/source/grass-6.4.0RC6.tar.gz";
+    sha256 = "043cxa224rd4q1x2mq7sl7ylnxv2vvb4k8laycgcjnp60nzhlmaz";
+  };
+
+  postInstall = ''
+    e=$(echo $out/bin/grass*)
+    mv $out/bin/{,.}$(basename $e)
+    cat >> $e << EOF
+    #!/bin/sh
+    export PATH=${a.python}/bin:\$PATH
+    export GRASS_WISH=\${a.tk}/bin/wish
+    export GRASS_GUI=\''${GRASS_GUI:-wxpython}
+    export SHELL=/bin/sh
+    ${optionalString fix.fixed.cfg.wxwidgetsSupport ''export PYTHONPATH=\$PYTHONPATH\''${PYTHONPATH:+:}:$(toPythonPath ${a.wxPython})''}
+    exec $out/bin/.$(basename $e)
+    EOF
+    chmod +x $e
+  '';
+
+  meta = {
+    description = "free Geographic Information System (GIS) software used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization";
+    homepage = http://grass.itc.it/index.php;
+    license = [ "GPL" ];
+  };
+
+})

pkgs/applications/misc/grip/default.nix

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

pkgs/applications/misc/gv/default.nix

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

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

@@ -1,13 +1,15 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "hello-2.3";
+stdenv.mkDerivation rec {
+  name = "hello-2.6";
   
   src = fetchurl {
-    url = mirror://gnu/hello/hello-2.3.tar.bz2;
-    sha256 = "0c7vijq8y68bpr7g6dh1gny0bff8qq81vnp4ch8pjzvg56wb3js1";
+    url = "mirror://gnu/hello/${name}.tar.gz";
+    sha256 = "1h6fjkkwr7kxv0rl5l61ya0b49imzfaspy7jk9jas1fil31sjykl";
   };
-  
+
+  doCheck = true;
+
   meta = {
     description = "A program that produces a familiar, friendly greeting";
     longDescription = ''
@@ -16,5 +18,8 @@ stdenv.mkDerivation {
     '';
     homepage = http://www.gnu.org/software/hello/manual/;
     license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/applications/misc/htmldoc/default.nix

@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, fltk, openssl, libpng, libjpeg }:
+stdenv.mkDerivation rec {
+  name = "htmldoc-1.8.27";
+  src = fetchurl {
+    url = http://ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.tar.bz2;
+    sha256 = "04wnxgx6fxdxwiy9vbawdibngwf55mi01hjrr5fkfs22fcix5zw9";
+  };
+  buildInputs = [ fltk openssl libpng libjpeg ];
+  meta = {
+    homepage = http://www.htmldoc.org/;
+    description = "Converts HTML files to indexed HTML, PS or PDF";
+    license = "GPLv2";
+    maintainers = with stdenv.lib.maintainers; [ viric ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/misc/ikiwiki/default.nix

@@ -1,24 +1,26 @@
-{stdenv, fetchurl, perl, gettext, makeWrapper, lib,
+{ stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick,
   TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate,
-  CGISession, CGIFormBuilder, DBFile
+  CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
   , git ? null
   , monotone ? null
   , extraUtils ? []
   }:
 
+let
+  name = "ikiwiki";
+  version = "3.20100515";
+in
 stdenv.mkDerivation {
-  name = "ikiwiki_3.20091009";
+  name = "${name}-${version}";
 
   src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/ikiwiki_3.20091009.tar.gz;
-    sha256 = "1iznyiypsnhga71s31782j3rf52fyvxrcys3nfpcr8yg1a5zadpn";
+    url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
+    sha256 = "143f245196d98ab037a097402420208da14506d6a65793d042daef5dd765ddd7";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
-    TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder ]
-    ++
-    (lib.optional (monotone != null) monotone)
-    ;
+    TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
+    RpcXML XMLSimple PerlMagick git monotone];
 
   patchPhase = ''
     sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man
@@ -34,16 +36,15 @@ stdenv.mkDerivation {
   postInstall = ''
     for a in $out/bin/*; do
       wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin \
-      ${lib.optionalString (git != null) 
+      ${lib.optionalString (git != null)
         ''--prefix PATH : ${git}/bin \''}
-      ${lib.optionalString (monotone != null) 
+      ${lib.optionalString (monotone != null)
         ''--prefix PATH : ${monotone}/bin \''}
       ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
-
     done
   '';
 
-  meta = { 
+  meta = {
     description = "Wiki compiler, storing pages and history in a RCS";
     homepage = http://ikiwiki.info/;
     license = "GPLv2+";

pkgs/applications/misc/lyx/default.nix

@@ -1,15 +1,24 @@
 # I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc
-args: with args;
+{ fetchurl, stdenv, texLive, python, makeWrapper
+, libX11, qt
+}:
+
 stdenv.mkDerivation rec {
-  version = "1.6.4";
+  version = "1.6.5";
   name = "lyx-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/${name}.tar.bz2";
-    sha256 = "1b56e53e6884a9f1417811c03e5c986d79955444e8169244a2b80b0709223d15";
+    sha256 = "0xxj37l4ghaa2ij5nfxlg90rfw0znipigjlh271mfmwjw9ykcw1n";
   };
 
-  buildInputs = [texLive qt python];
+  buildInputs = [texLive qt python makeWrapper ];
+
+  # don't ask me why it can't find libX11.so.6
+  postInstall = ''
+    wrapProgram $out/bin/lyx \
+      --prefix LD_LIBRARY_PATH ":" ${libX11}/lib
+  '';
 
   meta = { 
       description = "WYSIWYM frontend for LaTeX, DocBook, etc.";

pkgs/applications/misc/merkaartor/default.nix

@@ -0,0 +1,23 @@
+{stdenv, fetchurl, qt, boost}:
+
+stdenv.mkDerivation {
+  name = "merkaartor-0.16.0";
+  src = fetchurl {
+    url = http://www.merkaartor.org/downloads/source/merkaartor-0.16.0.tar.bz2;
+    sha256 = "0l33vgwwkqj65i86qq5j33bbf6q02hs8r1frjnd7icqdaqqv08d7";
+  };
+
+  configurePhase = ''
+    qmake -makefile PREFIX=$out
+  '';
+
+  buildInputs = [ qt boost ];
+
+  meta = {
+    description = "An openstreetmap editor";
+    homepage = http://merkaartor.org/;
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}

pkgs/applications/misc/openjump/default.nix

@@ -0,0 +1,39 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+  name = "openjump-1.3.1";
+
+  src = fetchurl {
+    url = mirror://sourceforge/jump-pilot/OpenJUMP/1.3.1/openjump-1.3.1.zip;
+    sha256 = "0y4z53yx0x7rp3c8rnj028ni3gr47r35apgcpqp3jl7r2di6zgqm";
+  };
+
+  # ln jump.log hack: a different user will probably get a permission denied
+  # error. Still this is better than getting it always.
+  # TODO: build from source and patch this
+  unpackPhase = ''
+    ensureDir $out/bin;
+    cd $out; unzip $src
+    s=$out/bin/OpenJump
+    dir=$(echo $out/openjump-*)
+    cat >> $s << EOF
+    #!/bin/sh
+    cd $dir/bin
+    exec /bin/sh openjump.sh
+    EOF
+    chmod +x $s
+    ln -s /tmp/openjump.log $dir/bin/jump.log
+  '';
+
+  installPhase = ":";
+
+  buildInputs = [unzip];
+
+  meta = {
+    description = "open source Geographic Information System (GIS) written in the Java programming language";
+    homepage = http://www.openjump.org/index.html;
+    license = "GPLv2";
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/applications/misc/procmail/default.nix

@@ -4,11 +4,13 @@ stdenv.mkDerivation {
 
   buildInputs = [ stdenv.gcc.libc ];
 
+  # getline is defined differently in glibc now. So rename it.
   installPhase = "
     ensureDir \$out/bin
     sed -e \"s%^RM.*$%RM=`type -f rm | awk '{print $3;}'` -f%\" -i Makefile
     sed -e \"s%^BASENAME.*%\BASENAME=$out%\" -i Makefile
     sed -e \"s%^LIBS=.*%LIBS=-lm%\" -i Makefile
+    sed -e \"s%getline%thisgetline%g\" -i src/*.c src/*.h
     make DESTDIR=\$out install
    ";
 

pkgs/applications/misc/pstree/default.nix

@@ -1,10 +1,10 @@
 args: with args;
 stdenv.mkDerivation rec {
-  name = "pstree-2.32";
+  name = "pstree-2.33";
 
   src = fetchurl {
-    url = "http://fresh.t-systems-sfr.com/unix/src/misc/${name}.tar.gz";
-    sha256 = "0k5r6alnc0ch3frvl5bhh2vi91m6aik10pnjfl86qwkdwsr303az";
+    url = "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz";
+    sha256 = "1469lrhpy6wghlvbjx6lmvh27rakq00x11cpz4n965fg11i121hg";
   };
 
   unpackPhase="unpackFile \$src; sourceRoot=.";

pkgs/applications/misc/qgis/default.nix

@@ -6,19 +6,19 @@ let inherit (builtins) getAttr;
 in
 composableDerivation.composableDerivation {} {
 
-  buildInputs = [ gdal cmake qt flex bison proj geos x11 sqlite gsl];
+  buildInputs = [ gdal cmake qt flex bison proj geos x11 sqlite gsl pyqt4];
     cfgOption = [
                   # without this option it can't find sqlite libs yet (missing symbols..) (TODO)
                   "-DWITH_INTERNAL_SQLITE3=TRUE"
                 ];
 
-  name = "qgis-1.0.1-2";
+  name = "qgis-1.4.0";
 
   # src = args.fetchsvn { url=https://svn.qgis.org/repos/qgis/trunk/qgis;
   #                md5="ac0560e0a2d4e6258c8639f1e9b56df3"; rev="7704"; };
   src = fetchurl {
-    url = "http://download.osgeo.org/qgis/src/qgis_1.0.1-2.tar.gz";
-    sha256 = "07yyic9sn1pz20wjk7k560jwqz6b19rhf2gawybz38xq1f8rjwd4";
+    url = http://download.osgeo.org/qgis/src/qgis_1.4.0.tar.gz;
+    sha256 = "1nn71j9pnkqcprwvzqnybh6ybl0zp50jj04lm769bnjbxknpxq5v";
   };
 
   meta = {

pkgs/applications/misc/qgis/trunk.nix

@@ -0,0 +1,23 @@
+{qgis, fetchurl,  sourceFromHead, python, sip}:
+qgis.merge {
+
+  name = "qgis-trunk";
+
+  buildInputs = [ sip python ];
+
+  preConfigure = ''
+    export PYTHONPATH=$(toPythonPath ${sip})
+  '';
+
+  cfgOption = [
+                # without this option it can't find sqlite libs yet (missing symbols..) (TODO)
+                "-DWITH_INTERNAL_SQLITE3=TRUE"
+                "-DPYTHON_EXECUTABLE=${python}/bin/python"
+              ];
+
+  # REGION AUTO UPDATE:    { name="qgis"; type="svn"; url="https://svn.osgeo.org/qgis/trunk/qgis"; }
+  src = sourceFromHead "qgis-13572.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/qgis-13572.tar.gz"; sha256 = "fd4c0e19919901cbee7ead7522acdbecbf17c5b9050e34ef91f8ea6e2736bec8"; });
+  # END
+
+}

pkgs/applications/misc/rxvt_unicode/default.nix

@@ -3,7 +3,7 @@ args: with args;
 # see man urxvtperl for details
 let 
   name = "rxvt-unicode";
-  version = "9.06";
+  version = "9.07";
   n = "${name}-${version}";
 in
 stdenv.mkDerivation (rec {
@@ -11,8 +11,8 @@ stdenv.mkDerivation (rec {
   name = "${n}${if perlSupport then "-with-perl" else ""}";
 
   src = fetchurl {
-    url = "http://dist.schmorp.de/rxvt-unicode/Attic/${n}.tar.bz2";
-    sha256 = "8ef9359c01059efd330626c6cd7b082be9bf10587f2b9fe84caa43a84aa576d1";
+    url = "http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.07.tar.bz2";
+    sha256 = "18y5mb3cm1gawjm723q5r7yk37s9drzg39kna036i694m2667865";
   };
 
   buildInputs = [ libX11 libXt libXft ncurses /* required to build the terminfo file */ ]

pkgs/applications/misc/sakura/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, cmake, pkgconfig, gtk, vte, pixman, gettext, perl }:
+stdenv.mkDerivation rec {
+  name = "sakura-2.3.8";
+  src = fetchurl {
+    url = "http://www.pleyades.net/david/projects/sakura/${name}.tar.bz2";
+    sha256 = "1gfjh1xxqgna0njh0pd4srnbmj67ir4b13slrdri6bm80shfbz8l";
+  };
+  buildInputs = [ cmake pkgconfig gtk vte pixman gettext perl ];
+  meta = {
+    homepage = "http://www.pleyades.net/david/sakura.php";
+    description = "A terminal emulator based on GTK and VTE";
+    longDescription = ''
+      sakura is a terminal emulator based on GTK and VTE. It's a terminal
+      emulator with few dependencies, so you don't need a full GNOME desktop
+      installed to have a decent terminal emulator. Current terminal emulators
+      based on VTE are gnome-terminal, XFCE Terminal, TermIt and a small
+      sample program included in the vte sources. The differences between
+      sakura and the last one are that it uses a notebook to provide several
+      terminals in one window and adds a contextual menu with some basic
+      options. No more no less.
+    '';
+    license = "GPLv2";
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/misc/synergy/default.nix

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

pkgs/applications/misc/tangogps/default.nix

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

pkgs/applications/misc/thinking-rock/default.nix

@@ -3,7 +3,7 @@ args.stdenv.mkDerivation {
   name = "thinkingrock-2.2.1-binary";
 
   src = args.fetchurl {
-    url = mirror://sourceforge/thinkingrock/files/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz;
+    url = mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz;
     sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm";
   };
 

pkgs/applications/misc/wordnet/default.nix

@@ -1,10 +1,11 @@
 {stdenv, fetchurl, tcl, tk, x11, makeWrapper}:
 
+let version = "3.0"; in
 stdenv.mkDerivation {
-  name = "wordnet-3.0";
+  name = "wordnet-${version}";
   src = fetchurl {
-    url = http://wordnet.princeton.edu/3.0/WordNet-3.0.tar.bz2;
-    sha256 = "6c492d0c7b4a40e7674d088191d3aa11f373bb1da60762e098b8ee2dda96ef22";
+    url = "http://wordnetcode.princeton.edu/${version}/WordNet-${version}.tar.bz2";
+    sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc";
   };
 
   buildInputs = [tcl tk x11 makeWrapper];
@@ -14,12 +15,27 @@ stdenv.mkDerivation {
                    "--with-tk="  + tk  + "/lib";
 
   postInstall = ''
-    wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/tk8.4"
+    wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
     wrapProgram $out/bin/wnb    --prefix PATH : "$out/bin"
   '';
 
   meta = {
-    description = "WordNet, a lexical database for the English language.";
+    description = "WordNet, a lexical database for the English language";
+
+    longDescription =
+      '' WordNet® is a large lexical database of English.  Nouns, verbs,
+         adjectives and adverbs are grouped into sets of cognitive synonyms
+         (synsets), each expressing a distinct concept.  Synsets are
+         interlinked by means of conceptual-semantic and lexical relations.
+         The resulting network of meaningfully related words and concepts can
+         be navigated with the browser.  WordNet is also freely and publicly
+         available for download.  WordNet's structure makes it a useful tool
+         for computational linguistics and natural language processing.
+      '';
+
     homepage = http://wordnet.princeton.edu/;
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }

pkgs/applications/misc/xfontsel/default.nix

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

pkgs/applications/misc/xlsfonts/default.nix

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

pkgs/applications/misc/xmobar/default.nix

@@ -1,11 +1,11 @@
-{cabal, X11, mtl, parsec, stm}:
+{cabal, X11, mtl, parsec, stm, utf8String, X11_xft}:
 
 cabal.mkDerivation (self : {
   pname = "xmobar";
   name = "${self.fname}";
   version = "0.9.2";
   sha256 = "361295f5dc912512a2eb644ecd331562a271243192be6215cb071e44f50c7c66";
-  extraBuildInputs = [X11 mtl parsec stm];
+  extraBuildInputs = [X11 mtl parsec stm utf8String X11_xft];
   meta = {
     description = "xmobar is a minimalistic text based status bar";
   };

pkgs/applications/misc/xneur/src-for-default.nix

@@ -1,9 +1,9 @@
 rec {
-   version="0.9.6";
-   name="xneur-0.9.6";
-   hash="0xxyj2w5ckk2pnqsx853zgs6s2lq1cb101px472rccpixcbdfs47";
+   version="0.9.8";
+   name="xneur-0.9.8";
+   hash="11xpw5vj4yccyq54jnx63kv6lkxa3fqr3kjncmgdc8xqk1pa7jmd";
    url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2";
-   advertisedUrl="http://dists.xneur.ru/release-0.9.6/tgz/xneur-0.9.6.tar.bz2";
+   advertisedUrl="http://dists.xneur.ru/release-0.9.8/tgz/xneur-0.9.8.tar.bz2";
   
   
 }

pkgs/applications/misc/xneur/src-info-for-default.nix

@@ -1,5 +1,5 @@
 {
-  downloadPage = "http://xneur.ru/wiki/Downloads";
+  downloadPage = "http://xneur.ru/downloads";
   baseName = "xneur";
   versionReferenceCreator = "$(replaceAllVersionOccurences)";
 }

pkgs/applications/misc/xpdf/default.nix

@@ -8,7 +8,7 @@ assert enablePDFtoPPM -> freetype != null;
 assert useT1Lib -> t1lib != null;
 
 stdenv.mkDerivation {
-  name = "xpdf-3.02pl3";
+  name = "xpdf-3.02pl4";
 
   src = fetchurl {
     url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz;
@@ -32,6 +32,10 @@ stdenv.mkDerivation {
       url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch;
       sha256 = "0jskkv8x6dqr9zj4azaglas8cziwqqrkbbnzrpm2kzrvsbxyhk2r";
     })
+    (fetchurl {
+      url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch;
+      sha256 = "1c48h7aizx0ngmzlzw0mpja1w8vqyy3pg62hyxp7c60k86al715h";
+    })
     ./xpdf-3.02-protection.patch
   ];
     

pkgs/applications/misc/xterm/default.nix

@@ -10,10 +10,21 @@ stdenv.mkDerivation rec {
     freetype pkgconfig libXft luit];
   configureFlags = "--enable-wide-chars --enable-256-color
     --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit
-    --enable-mini-luit";
+    --enable-mini-luit --with-tty-group=tty";
+
+  # Hack to get xterm built with the feature of releasing a possible setgid of 'utmp',
+  # decided by the sysadmin to allow the xterm reporting to /var/run/utmp
+  # If we used the configure option, that would have affected the xterm installation,
+  # (setgid with the given group set), and at build time the environment even doesn't have
+  # groups, and the builder will end up removing any setgid.
+  postConfigure = ''
+    echo '#define USE_UTMP_SETGID 1'
+  '';
 
   meta = {
     homepage = http://invisible-island.net/xterm;
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
-

pkgs/applications/misc/yate/default.nix

@@ -8,7 +8,7 @@ composableDerivation {} ( fixed : {
 
   src = fetchurl {
     url = http://yate.null.ro/tarballs/yate2/yate2.tar.gz;
-    sha256 = "0nniicfal3nqkz9swzrxsmyq04cy6xd2dwrngwbjzv0ra5x2p415";
+    sha256 = "1z1rvzcw6449cvczig1dkh6rlp6f8zv649sk0ldz38mwkyd07257";
   };
 
   # TODO zaptel ? postgres ?

pkgs/applications/misc/zathura/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, gtk, poppler }:
+stdenv.mkDerivation rec {
+  name = "zathura-0.0.5";
+  src = fetchurl {
+    #url = "https://pwmt.org/zathura/download/{name}.tar.gz"
+    # Site's SSL cert is invalid, and I dunno how to pass --insecure to curl.
+    # Thanks Mark Weber for mirroring this tarball.
+    url = "http://mawercer.de/~nix/${name}.tar.gz";
+    sha256 = "e4dfbcceafc7bcb5c4e1ff349822c610db6378906ab65aabba8be246d7ee9b52";
+  };
+  buildInputs = [ pkgconfig gtk poppler ];
+  patchPhase = ''
+    substituteInPlace config.mk --replace 'PREFIX = /usr' "PREFIX = $out"
+  '';
+  meta = {
+    homepage = https://pwmt.org/zathura/;
+    description = "A highly customizable and functional PDF viewer";
+    longDescription = ''
+      zathura is a highly customizable and functional PDF viewer based on the
+      poppler rendering library and the gtk+ toolkit. The idea behind zathura
+      is an application that provides a minimalistic and space saving interface
+      as well as an easy usage that mainly focuses on keyboard interaction.
+    '';
+    license = "free";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

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

@@ -5,6 +5,7 @@
 , pango
 , glib
 , libXrender
+, libXScrnSaver
 , gtk
 , nspr
 , nss
@@ -20,23 +21,29 @@
 , unzip
 , expat
 , zlib
+, libjpeg
+, bzip2
+, libpng
+, dbus
+, dbus_glib
+, patchelf
 }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
 
 stdenv.mkDerivation rec {
   name = "chrome-${version}";
-  version = "32599";
+  version = "47504";
   src = 
     if stdenv.system == "x86_64-linux" then 
       fetchurl {
         url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip";
-        sha256 = "1wz24hrnnjggsjxsaa4spqg73p1f7bv4a8l2ys3kbkdp709fl6v8";
+        sha256 = "06cwfr02acv9b0sbc14irqx099p4mgyjl9w58g1vja6r7jbb234c";
       } 
     else if stdenv.system == "i686-linux" then 
       fetchurl {
         url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
-        sha256 = "16w6d7kp34jr1c4ym6y2h6llkq3d65rybj5hs46w1b8qri60q6aa";
+        sha256 = "1g9m2d5x415gybjd6kvnhbj2sbfcaszv3dzvdwncsrcviic6w634";
       } 
     else null;
 
@@ -46,7 +53,7 @@ stdenv.mkDerivation rec {
 
   libPath = 
     stdenv.lib.makeLibraryPath
-       [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib] ;
+       [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng libXScrnSaver dbus dbus_glib] ;
 
   installPhase = ''
     ensureDir $out/bin
@@ -55,8 +62,8 @@ stdenv.mkDerivation rec {
 
     cp -R * $out/chrome
     ln -s $out/chrome/chrome $out/bin/chrome
-  
-    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/chrome/chrome 
+    ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/chrome/chrome 
+        
 
     ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d
     ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d

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

@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, unzip }:
+stdenv.mkDerivation {
+  name = "conkeror-0.9.2";
+  src = fetchurl {
+    url = http://repo.or.cz/w/conkeror.git/snapshot/efacc207b0d6c7b3899fc584c9f48547b18da076.zip;
+    sha256 = "1bkrrskrmhpx2xp90zgi5jrz4akynkxv2nzk5hzg0a17ikdi5ql8";
+  };
+  buildInputs = [ unzip ];
+  installPhase = ''
+    cp -r . $out
+  '';
+  meta = {
+    description = "A keyboard-oriented, customizable, extensible web browser";
+    longDescription = ''
+      Conkeror is a keyboard-oriented, highly-customizable, highly-extensible
+      web browser based on Mozilla XULRunner, written mainly in JavaScript,
+      and inspired by exceptional software such as Emacs and vi. Conkeror
+      features a sophisticated keyboard system, allowing users to run commands
+      and interact with content in powerful and novel ways. It is
+      self-documenting, featuring a powerful interactive help system.
+    '';
+    homepage = http://conkeror.org/;
+    license = [ "MPLv1.1" "GPLv2" "LGPLv2.1" ];
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

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

@@ -1,14 +1,14 @@
 args: with args;
 
-stdenv.mkDerivation {
-  name = "elinks-0.11.3";
+stdenv.mkDerivation rec {
+  name = "elinks-0.12pre5";
 
   src = fetchurl {
-    url = http://elinks.or.cz/download/elinks-0.11.3.tar.bz2;
-    sha256 = "c10e657fbd884eae4f01b91b32407bbfcbcae0ad5017fb24ea365aebc71d2af1";
+    url = http://elinks.or.cz/download/elinks-0.12pre5.tar.bz2;
+    sha256 = "1li4vlbq8wvnigxlkzb15490y90jg6y9yzzrqpqcz2h965w5869d";
   };
 
-  buildInputs = [python perl ncurses x11 bzip2 zlib openssl spidermonkey guile];
+  buildInputs = [python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm];
   configureFlags = "--enable-finger --enable-html-highlight --with-guile
   --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent
   --enable-nntp --with-openssl=${openssl}";

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

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

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

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

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

@@ -12,14 +12,14 @@
 
 rec {
 
-  firefoxVersion = "3.5.5";
+  firefoxVersion = "3.5.9";
   
-  xulVersion = "1.9.1.5"; # this attribute is used by other packages
+  xulVersion = "1.9.1.9"; # this attribute is used by other packages
 
   
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "a2146fb6dc8e879a78fa13849f187c14d41442ca";
+    sha1 = "f20f06a783ee81ec1d7d6f7a75b38a25dc58f0e1";
   };