A segfault-creating state of the branch.

svn path=/nixpkgs/branches/stdenv-bootstrap-20100825/; revision=23413

maintainers/scripts/eval-release.nix

@@ -6,9 +6,13 @@ let
 
   lib = (import ../.. {}).lib;
 
-  rel = removeAttrs (import ../../pkgs/top-level/release.nix) ["tarball"];
+  rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ];
 
-  maybe = x: let y = builtins.tryEval x; in if y.success then y.value else null;
+  seqList = xs: res: lib.fold (x: xs: lib.seq x xs) res xs;
+  
+  strictAttrs = as: seqList (lib.attrValues as) as;
+
+  maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" null;
 
   call = attrs: lib.flip lib.mapAttrs attrs
     (n: v: builtins.trace n (

maintainers/scripts/gnu/gnupdate

@@ -623,19 +623,9 @@ exec ${GUILE-guile} -L "$PWD" -l "$0"    \
   (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))))
+           (make-foreign-function int sym (list '* '*)))))
     (lambda (a b)
-      (let ((a (bytevector->foreign (string->null-terminated-utf8 a)))
-            (b (bytevector->foreign (string->null-terminated-utf8 b))))
-        (> (strverscmp a b) 0)))))
+      (> (strverscmp (string->pointer a) (string->pointer b)) 0))))
 
 (define (latest-release project)
   ;; Return "FOO-X.Y" or #f.

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

maintainers/scripts/test-eval-release.sh

@@ -0,0 +1,3 @@
+#! /bin/sh
+
+nix-instantiate --strict --eval-only --xml --show-trace "$(dirname "$0")"/eval-release.nix 2>&1 > /dev/null

pkgs/applications/audio/ardour/default.nix

@@ -1,7 +1,10 @@
-args: with args;
+{ stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor
+, librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
+, libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
+, gtk, glibmm, gtkmm, libgnomecanvas, librdf, liblo, aubio
+, fftwSinglePrec, libmad }:
 
 stdenv.mkDerivation {
-
   name = "ardour-2.8.2";
 
   # svn is the source to get official releases from their site?
@@ -13,11 +16,10 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    scons boost
-    pkgconfig fftw librdf_raptor librdf_rasqal jackaudio flac
-    libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx libusb cairomm
-    glib pango gtk glibmm gtkmm libgnomecanvas fftw librdf liblo aubio
-    fftw fftwSinglePrec libmad
+    scons boost pkgconfig fftw librdf_raptor librdf_rasqal jackaudio
+    flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
+    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas librdf
+    liblo aubio fftwSinglePrec libmad
   ];
 
   buildPhase = ''
@@ -35,7 +37,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://ardour.org/;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/audio/beast/default.nix

@@ -1,36 +1,37 @@
-args: with args;
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool
+, gtk, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }:
+
+stdenv.mkDerivation {
   name = "beast-0.7.1";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = ftp://beast.gtk.org/pub/beast/v0.7/beast-0.7.1.tar.bz2;
     sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l";
   };
 
-  buildInputs =[zlib guile libart_lgpl pkgconfig intltool gtk glib
+  buildInputs =
+    [ zlib guile libart_lgpl pkgconfig intltool gtk glib
       libogg libvorbis libgnomecanvas gettext
-      ];
-
-  inherit bash perl;
+    ];
 
   patchPhase = ''
     unset patchPhase; patchPhase
     sed 's=-DG_DISABLE_DEPRECATED==g' -i `find -type f` # the patches didn't remove all occurences
-    sed 's=/bin/bash=/$bash/bin/bash=g' -i `find -type f`
-    sed 's=/usr/bin/perl=/$perl/bin/bash=g' -i `find -type f`
+    sed 's=/bin/bash=/${stdenv.shell}=g' -i `find -type f`
+    sed 's=/usr/bin/perl=/${perl}/bin/perl=g' -i `find -type f`
   '';
 
-  patches = [
-        (fetchurl {
-          url = mirror://gentoo/distfiles/beast-0.7.1-guile-1.8.diff.bz2;
-          sha256 = "dc5194deff4b0a0eec368a69090db682d0c3113044ce2c2ed017ddfec9d3814e";
-        })
-        ./patch.patch # patches taken from gentoo
-  ];
+  patches =
+    [ (fetchurl {
+        url = mirror://gentoo/distfiles/beast-0.7.1-guile-1.8.diff.bz2;
+        sha256 = "dc5194deff4b0a0eec368a69090db682d0c3113044ce2c2ed017ddfec9d3814e";
+      })
+      ./patch.patch # patches taken from gentoo
+    ];
 
   meta = { 
-      description = "BEAST - the Bedevilled Sound Engine";
-      homepage = http://beast.gtk.org;
-      license = ["GPL-2" "LGPL-2.1"];
+    description = "BEAST - the Bedevilled Sound Engine";
+    homepage = http://beast.gtk.org;
+    license = ["GPL-2" "LGPL-2.1"];
   };
 }

pkgs/applications/audio/jackmeter/default.nix

@@ -1,23 +1,20 @@
-args: with args;
+{ stdenv, fetchurl, jackaudio, pkgconfig }:
 
-let name = "jackmeter-0.3";
-in
-stdenv.mkDerivation {
-
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "jackmeter-0.3";
 
   src = fetchurl {
     url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz";
     sha256 = "03siznnq3f0nnqyighgw9qdq1y4bfrrxs0mk6394pza3sz4b6sgp";
   };
 
-  buildInputs = [jackaudio pkgconfig];
+  buildInputs = [ jackaudio pkgconfig ];
 
   meta = { 
-    description = "console jack loudness meter";
+    description = "Console jack loudness meter";
     homepage = http://www.aelius.com/njh/jackmeter/;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

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

@@ -1,27 +1,22 @@
-args: with args;
-	let localDefs = builderDefs.passthru.function {
-		src = 
-		fetchurl {
-			url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz;
-			sha256 = "0h462s4mmqg4iw7zdsihnrmz2vjg0fd49qxw2a284bnryjjfhpnh";
-		};
-		buildInputs = [fftw ladspaH pkgconfig];
-		configureFlags = [];
-	};
-	in with localDefs;
-let
-	postInstall = fullDepEntry ("
-		ensureDir \$out/share/ladspa/
-		ln -s \$out/lib/ladspa \$out/share/ladspa/lib
-	") [minInit defEnsureDir];
-in
+{ stdenv, fetchurl, fftw, ladspaH, pkgconfig }:
+
 stdenv.mkDerivation {
-	name = "swh-plugins-0.4.15";
-	builder = writeScript "swh-plugins-0.4.15-builder"
-		(textClosure localDefs [doConfigure doMakeInstall 
-			postInstall doForceShare]);
-	meta = {
-		description = "LADSPA format audio plugins";
-		inherit src;
-	};
+  name = "swh-plugins-0.4.15";
+
+  src = fetchurl {
+    url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz;
+    sha256 = "0h462s4mmqg4iw7zdsihnrmz2vjg0fd49qxw2a284bnryjjfhpnh";
+  };
+  
+  buildInputs = [fftw ladspaH pkgconfig];
+
+  postInstall =
+    ''
+      ensureDir $out/share/ladspa/
+      ln -s $out/lib/ladspa $out/share/ladspa/lib
+    '';
+
+  meta = {
+    description = "LADSPA format audio plugins";
+  };
 }

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

@@ -1,28 +1,28 @@
-args: with args;
+{ stdenv, fetchurl, builderDefs }:
+
 let 
-	src = 
-	fetchurl {
-		url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt;
-		sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
-	};
+  src = fetchurl {
+    url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt;
+    sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
+  };
 in
-	let localDefs = builderDefs.passthru.function {
-		buildInputs = [];
-		inherit src;
-	};
-	in with localDefs;
+  let localDefs = builderDefs.passthru.function {
+    buildInputs = [];
+    inherit src;
+  };
+  in with localDefs;
 let
-	copyFile = fullDepEntry ("
-		ensureDir \$out/include
-		cp ${src} \$out/include/ladspa.h
-	") [minInit defEnsureDir];
+  copyFile = fullDepEntry ("
+    ensureDir \$out/include
+    cp ${src} \$out/include/ladspa.h
+  ") [minInit defEnsureDir];
 in
 stdenv.mkDerivation {
-	name = "ladspa.h";
-	builder = writeScript "ladspa.h-builder"
-		(textClosure localDefs [copyFile]);
-	meta = {
-		description = "LADSPA format audio plugins";
-		inherit src;
-	};
+  name = "ladspa.h";
+  builder = writeScript "ladspa.h-builder"
+    (textClosure localDefs [copyFile]);
+  meta = {
+    description = "LADSPA format audio plugins";
+    inherit src;
+  };
 }

pkgs/applications/audio/qjackctl/default.nix

@@ -1,20 +1,20 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, qt4, alsaLib, jackaudio }:
+
+stdenv.mkDerivation {
+  name = "qjackctl-0.3.3";
 
   # some dependencies such as killall have to be installed additionally
 
-  name = "qjackctl-0.3.3";
-
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://downloads.sourceforge.net/qjackctl/qjackctl-0.3.3.tar.gz;
     sha256 = "1z9v208fs79ka6ni3p5v5xb0k5y1wqqm2a9cf903387b9p3fhpxj";
   };
 
-  buildInputs =(with args; [qt4 alsaLib jackaudio]);
+  buildInputs = [ qt4 alsaLib jackaudio ];
 
   meta = { 
-      description = "qt jackd control gui tool";
-      homepage = http://qjackctl.sourceforge.net/;
-      license = "GPL";
+    description = "qt jackd control gui tool";
+    homepage = http://qjackctl.sourceforge.net/;
+    license = "GPL";
   };
 }

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

@@ -1,11 +1,10 @@
 # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
 
-args: with args;
+{ stdenv, fetchurl, libsndfile, qt, fftw, librdf, rubberband
+, libsamplerate, vampSDK, alsaLib, librdf_raptor, librdf_rasqal
+, redland, jackaudio, pulseaudio, libmad, libogg, liblo, bzip2 }:
 
 stdenv.mkDerivation {
-
-#TODO add plugins!
-
   name = "sonic-visualizer-1.6";
 
   src = fetchurl {
@@ -13,16 +12,17 @@ stdenv.mkDerivation {
     sha256 = "1dbqqa7anii2jnjpfwm4sr83nn4bwmz68xw4n6clycsz5iqk52f5";
   };
 
-  buildInputs = [libsndfile qt fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
-    libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
-    # optional
-    jackaudio
-    # portaudio
-    pulseaudio
-    libmad
-    libogg # ?
-    # fishsound
-    liblo
+  buildInputs =
+    [ libsndfile qt fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
+      libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
+      # optional
+      jackaudio
+      # portaudio
+      pulseaudio
+      libmad
+      libogg # ?
+      # fishsound
+      liblo
     ];
 
   buildPhase = ''
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     description = "View and analyse contents of music audio files";
     homepage = http://www.sonicvisualiser.org/;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/editors/bvi/default.nix

@@ -1,4 +1,5 @@
-args : with args;
+{ stdenv, fetchurl, ncurses }:
+
 stdenv.mkDerivation {
   name = "bvi-1.3.2";
 
@@ -7,11 +8,11 @@ stdenv.mkDerivation {
     sha256 = "110wxqnyianqamxq4y53drqqxb9vp4k2fcvic45qggvlqkqhlfgz";
   };
 
-  buildInputs = [ncurses];
+  buildInputs = [ ncurses ];
 
   meta = { 
-      description = "hex editor with vim style keybindings";
-      homepage = http://bvi.sourceforge.net/download.html;
-      license = "GPL2";
+    description = "Hex editor with vim style keybindings";
+    homepage = http://bvi.sourceforge.net/download.html;
+    license = "GPL2";
   };
 }

pkgs/applications/editors/ed/default.nix

@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  crossAttrs = {
+    compileFlags = [ "CC=${stdenv.cross.config}-gcc" ];
+  };
+
   meta = {
     description = "GNU ed, an implementation of the standard Unix editor";
 

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

@@ -0,0 +1,28 @@
+{stdenv, fetchurl}:
+
+let
+    version = "0.2-4";
+in
+stdenv.mkDerivation
+{
+  name = "rudel-${version}";
+  src = fetchurl
+  {
+    url = "mirror://sourceforge/rudel/rudel-${version}.tar.gz";
+    sha256 = "68247bfb702d929877f6d098932e8b0ca45c573a3510187e1ccc43e5ea194f25";
+  };
+
+  installPhase = ''
+    for n in . obby zeroconf jupiter; do
+      ensureDir "$out/share/emacs/site-lisp/$n";
+      cp $n/*.el "$out/share/emacs/site-lisp/$n/";
+    done
+    install -D -m444 doc/card.pdf "$out/share/doc/rudel/card.pdf"
+  '';
+
+  meta = {
+    homepage = "http://rudel.sourceforge.net/";
+    description = "Rudel is a collaborative editing environment for GNU Emacs";
+    license = "GPL";
+  };
+}

pkgs/applications/editors/jedit/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, ant }:
+
 stdenv.mkDerivation {
   name = "jedit-4.2";
 
@@ -18,11 +19,11 @@ stdenv.mkDerivation {
     cp modes/catalog \$out/lib/modes
   ";
 
-  buildInputs = [ant];
+  buildInputs = [ ant ];
 
   meta = { 
-      description = "really nice programmers editor written in Java. Give it a try";
-      homepage = http://www.jedit.org;
-      license = "GPL";
+    description = "really nice programmers editor written in Java. Give it a try";
+    homepage = http://www.jedit.org;
+    license = "GPL";
   };
 }

pkgs/applications/editors/nano/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, ncurses, gettext }:
+
 stdenv.mkDerivation (rec {
   pname = "nano";
   version = "2.2.3";
@@ -9,9 +10,10 @@ stdenv.mkDerivation (rec {
     url = "mirror://gnu/nano/${name}.tar.gz";
     sha256 = "1vpl993xrpj8bqi1ayga8fc0j2jag90xp6rqakzwm3bxw71hmwi2";
   };
-  buildInputs = [ncurses gettext];
-#  configureFlags = "--enable-tiny";
-  configureFlags = "
+  
+  buildInputs = [ ncurses gettext ];
+  
+  configureFlags = ''
     --disable-browser 
     --disable-help 
     --disable-justify 
@@ -20,7 +22,7 @@ stdenv.mkDerivation (rec {
     --disable-speller
     --disable-tabcomp
     --disable-wrapping
-  ";
+  '';
 
   meta = {
     homepage = http://www.nano-editor.org/;

pkgs/applications/editors/vim/configurable.nix

@@ -14,7 +14,8 @@ composableDerivation {} {
     configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"];
 
     buildNativeInputs = [ncurses pkgconfig]
-      ++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu ];
+      ++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib 
+           libICE ];
 
     # most interpreters aren't tested yet.. (see python for example how to do it)
     flags = {
@@ -30,17 +31,18 @@ composableDerivation {} {
       // 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 = "lua" ; feat = "luainterp"; enable = { buildNativeInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};}
       // 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 = "sniff"; feat = "sniff" ; } #Include Sniff interface.
       // edf { name = "multibyte"; } #Include multibyte editing support.
-      // edf { name = "hangulinput"; } #Include Hangul input support.
-      # // edf { name = "xim"; enable = { buildNativeInputs = [xim]; }; } #Include XIM input support.
+      // edf { name = "hangulinput"; feat = "hangulinput" ;} #Include Hangul input support.
+      // edf { name = "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).
-      // edf { name = "nls"; } #Don't support NLS (gettext()).
+      // edf { name = "nls"; enable = {buildNativeInputs = [gettext];}; } #Don't support NLS (gettext()).
       ;
 
   cfg = {

pkgs/applications/editors/vim/default.nix

@@ -1,86 +1,32 @@
-args:
-let 
-	defList = [];
-	#stdenv and fetchurl are added automatically
-	getVal = (args.lib.getValue args defList);
-	check = args.lib.checkFlag args;
-	reqsList = [
-	["gtkGUI" "glib" "gtk" "pkgconfig" "libXpm" "libXext" "x11Support"]
-	["athenaGUI" "libXau" "libXt" "libXaw" "libXpm" "libXext" "x11Support"]
-	["x11Support" "libX11"]
-	["hugeFeatures"]
-	["pythonSupport" "python"]
-	["perlSupport" "perl"]
-	["tclSupport" "tcl"]
-	["eclSupport" "ecl" "gmp" "mpfr"]
-	["luaSupport" "lua"]
+{ stdenv, fetchurl, ncurses }:
 
-	# Currently causes problems
-	["mzSchemeSupport" "pltScheme"]
-
-	["perlSupport" "perl"]
-	["rubySupport" "ruby"]
-	["hangulSupport"]
-	["sniffSupport"]
-	["gettextSupport" "gettext"]
-	["true" "ncurses"]
-	["false" "libSM"]
-	];
-	nameSuffixes = [
-	"hugeFeatures" "-huge"
-	"x11Support" "-X11"
-	"pythonSupport" "-python"
-	"perlSupport" "-perl"
-	"tclSupport" "-tcl"
-	"ximSupport" "-xim"
-	"eclSupport" "-ecl"
-	"luaSupport" "-lua"
-	"perlSupport" "-perl"
-	"rubySupport" "-ruby"
-	"mzSchemeSupport" "-mzscheme"
-	];
-	configFlags = [
-	"true" " --enable-multibyte "
-	"x11Support" " --enable-gui=auto "
-	"hugeFeatures" "--with-features=huge --enable-cscope --enable-xsmp "
-	"pythonSupport" " --enable-pythoninterp "
-	"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 = 
-		(args.lib.concatLists (map 
-		(x:(if (x==[]) then [] else builtins.tail x)) 
-		reqsList));});
-in
-	assert args.lib.checkReqs args defList reqsList;
-args.stdenv.mkDerivation {
-  name = args.lib.condConcat "vim-7.2" nameSuffixes check;
+stdenv.mkDerivation rec {
+  name = "vim-7.2";
  
-  src = args.lib.attrByPath ["src"] (args.fetchurl {
-    url = ftp://ftp.vim.org/pub/vim/unix/vim-7.2.tar.bz2;
+  src = fetchurl {
+    url = "ftp://ftp.vim.org/pub/vim/unix/${name}.tar.bz2";
     sha256 = "11hxkb6r2550c4n13nwr0d8afvh30qjyr5c2hw16zgay43rb0kci";
-  }) args;
+  };
  
-  inherit (args) ncurses;
-
-  buildInputs = args.lib.filter (x: (x!=null)) (map getVal buildInputsNames);
+  buildInputs = [ ncurses ];
 
   postInstall = "ln -s $out/bin/vim $out/bin/vi";
-  preBuild="touch src/auto/link.sed";
-  configureFlags = args.lib.condConcat "" configFlags check;
-
-  NIX_LDFLAGS = "-lpthread -lutil";
 
+  crossAttrs = {
+    configureFlags = [
+      "vim_cv_toupper_broken=no"
+      "--with-tlib=ncurses"
+      "vim_cv_terminfo=yes"
+      "vim_cv_tty_group=tty"
+      "vim_cv_tty_mode=0660"
+      "vim_cv_getcwd_broken=no"
+      "vim_cv_stat_ignores_slash=yes"
+      "ac_cv_sizeof_int=4"
+      "vim_cv_memmove_handles_overlap=yes"
+      "STRIP=${stdenv.cross.config}-strip"
+    ];
+  };
+  
   meta = {
     description = "The most popular clone of the VI editor";
     homepage = http://www.vim.org;

pkgs/applications/editors/zile/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ncurses, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "zile-2.3.17";
+  name = "zile-2.3.19";
 
   src = fetchurl {
     url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "1wrg53qz0s4336nq8z2v7pi18vpz5ifxvlwq4jv0w4rwmbksgvi0";
+    sha256 = "1c2by5d5d1nmap3wc55giscsj47xx16viv7b07c6c4nssnlniszs";
   };
 
   buildInputs = [ ncurses ];

pkgs/applications/graphics/exrdisplay/default.nix

@@ -1,8 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, fltk, openexr, mesa, which, openexr_ctl }:
 
 assert fltk.glSupport;
-stdenv.mkDerivation {
 
+stdenv.mkDerivation {
   name ="openexr_viewers-1.0.1";
 
   src = fetchurl {
@@ -10,18 +10,18 @@ stdenv.mkDerivation {
     sha256 = "1w5qbcdp7sw48z1wk2v07f7p14vqqb1m2ncxyxnbkm9f4ab0ymg6";
   };
 
-  inherit fltk mesa;
+  configurePhase =
+    ''
+      # don't know why.. adding these flags it works
+      #export CXXFLAGS=`fltk-config --use-gl --cxxflags --ldflags`
+      ./configure --prefix=$out --with-fltk-config=${fltk}/bin/fltk-config
+    '';
 
-  configurePhase = "
-    # don't know why.. adding these flags it works
-    #export CXXFLAGS=`fltk-config --use-gl --cxxflags --ldflags`
-    ./configure --prefix=\$out --with-fltk-config=\$fltk/bin/fltk-config";
-
-  buildInputs = [openexr fltk pkgconfig mesa which openexr_ctl];
+  buildInputs = [ openexr fltk pkgconfig mesa which openexr_ctl ];
 
   meta = { 
-      description = "tool to view OpenEXR images";
-      homepage = http://openexr.com;
-      license = "BSD-like";
+    description = "Tool to view OpenEXR images";
+    homepage = http://openexr.com;
+    license = "BSD-like";
   };
 }

pkgs/applications/graphics/gimp/default.nix

@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.6.9";
+  name = "gimp-2.6.10";
   
   src = fetchurl {
     url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
-    sha256 = "1w7qp38d8qrd36jgxlk4dg4npxir958kx6sq6qw85pv0016kvd1v";
+    sha256 = "0cp0abdmqczncy0miazbyd61sjm63r1mhlwsvbz8lb9m7gkkyypg";
   };
   
   buildInputs = [

pkgs/applications/graphics/gocr/0.44.nix

@@ -1,21 +0,0 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-fetchurl {
-		url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz;
-		sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0";
-	};
-
-		buildInputs = [];
-		configureFlags = [];
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "gocr";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "GPL Optical Character Recognition";
-		inherit src;
-	};
-}

pkgs/applications/graphics/gocr/default.nix

@@ -0,0 +1,14 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "gocr-0.44";
+
+  src = fetchurl {
+    url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz;
+    sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0";
+  };
+
+  meta = {
+    description = "GPL Optical Character Recognition";
+  };
+}

pkgs/applications/graphics/hugin/default.nix

@@ -3,15 +3,13 @@
  glew, libXmu, libXi }:
 
 stdenv.mkDerivation rec {
-  name = "hugin-2009.4.0";
+  name = "hugin-2010.0.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/hugin/${name}.tar.gz";
-    sha256 = "1xa7rnpwlv68wfkikmlrs74hqylpkh837p3narqljr2a7fxf04r9";
+    sha256 = "08xm7ggfrh536lqvdzw7zg09p2awbclw5r7i8c59gf092w1cac7d";
   };
 
-#   patches = [ ./levmar-64-bit-alignment.patch ];
-
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
 
   NIX_LDFLAGS = "-lrt";

pkgs/applications/graphics/hugin/levmar-64-bit-alignment.patch

@@ -1,64 +0,0 @@
-This patch fixes alignment issues on 64-bit machines.  It was taken
-from http://www.mail-archive.com/hugin-ptx@googlegroups.com/msg02976.html .
-See also http://thread.gmane.org/gmane.linux.distributions.nixos/2352 .
-
---- hugin/src/foreign/levmar/misc_core.c	2009-04-28 13:30:33.000000000 +0200 # SVN 3799
-+++ hugin/src/foreign/levmar/misc_core.c	2009-05-04 07:49:00.000000000 +0200 # Merged patch.pt and fix_alias.diff
-@@ -332,7 +332,7 @@
-   a_sz=m*m;
-   u_sz=m*m; s_sz=m; vt_sz=m*m;
- 
--  tot_sz=iworksz*sizeof(int) + (a_sz + u_sz + s_sz + vt_sz + worksz)*sizeof(LM_REAL);
-+  tot_sz=(a_sz + u_sz + s_sz + vt_sz + worksz)*sizeof(LM_REAL) + iworksz*sizeof(int); /* should be arranged in that order for proper doubles alignment */
- 
-     buf_sz=tot_sz;
-     buf=(LM_REAL *)malloc(buf_sz);
-@@ -414,25 +414,27 @@
- int buf_sz=0;
- 
- register int i, j, k, l;
--int *idx, maxi=-1, idx_sz, a_sz, x_sz, work_sz, tot_sz;
-+int *idxbuf, *idx, maxi=-1, idx_sz, a_sz, x_sz, work_sz, tot_sz;
- LM_REAL *a, *x, *work, max, sum, tmp;
- 
-   /* calculate required memory size */
-   idx_sz=m;
-+  idxbuf=(void *)malloc(idx_sz*sizeof(int));
-+
-   a_sz=m*m;
-   x_sz=m;
-   work_sz=m;
--  tot_sz=idx_sz*sizeof(int) + (a_sz+x_sz+work_sz)*sizeof(LM_REAL);
-+  tot_sz=(a_sz + x_sz + work_sz)*sizeof(LM_REAL) + idx_sz*sizeof(int); /* should be arranged in that order for proper doubles alignment */
- 
-   buf_sz=tot_sz;
-   buf=(void *)malloc(tot_sz);
--  if(!buf){
-+  if(!buf || !idxbuf){
-     fprintf(stderr, RCAT("memory allocation in ", LEVMAR_LUINVERSE) "() failed!\n");
-     exit(1);
-   }
- 
--  idx=(int *)buf;
--  a=(LM_REAL *)(idx + idx_sz);
-+  idx=(int *)idxbuf;
-+  a=(LM_REAL *)buf;
-   x=a + a_sz;
-   work=x + x_sz;
- 
-@@ -448,6 +450,7 @@
- 		  if(max==0.0){
-         fprintf(stderr, RCAT("Singular matrix A in ", LEVMAR_LUINVERSE) "()!\n");
-         free(buf);
-+	free(idxbuf);
- 
-         return 0;
-       }
-@@ -522,6 +525,7 @@
-   }
- 
-   free(buf);
-+  free(idxbuf);
- 
-   return 1;
- }

pkgs/applications/graphics/inkscape/default.nix

@@ -1,4 +1,7 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft
+, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
+, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
+, gsl, python, pyxml, lxml }:
 
 stdenv.mkDerivation rec {
   name = "inkscape-0.47";
@@ -45,6 +48,5 @@ stdenv.mkDerivation rec {
 
       If you want to import .eps files install ps2edit.
     '';
-
   };
 }

pkgs/applications/graphics/xscreensaver/default.nix

@@ -1,41 +1,43 @@
-x@{ pkgconfig, bc, perl, xlibs, libjpeg, mesa, gtk
-, libxml2, libglade, builderDefsPackage, ... }:                                                                 
+{ stdenv, fetchurl, pkgconfig, bc, perl, pam
+, libXext, libXScrnSaver, libX11, libXrandr, libXmu, libXxf86vm, libXrender
+, libXxf86misc
+, libjpeg, mesa, gtk , libxml2, libglade}:
 
-builderDefsPackage 
-(a: rec {
+stdenv.mkDerivation rec {
   version = "5.11";
   name = "xscreensaver-${version}";
-  url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
 
-  src = a.fetchurl {
-    inherit url;
+  src = fetchurl {
+    url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
     sha256="0w47s0qd8ab6ywhhhkqjx0grb2b28bh2flnkdpj3yaind202l0s7";
   };
 
-  buildInputs = with a;
-    [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade
-      xlibs.xlibs xlibs.libXmu
-    ];
+  buildInputs =
+    [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam
+    libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
+    libXxf86misc ];
 
   configureFlags =
-    [ "--with-gl"
-      "--with-dpms"
-      "--with-pixbuf"
+    [
+      "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
+
+      "--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext"
+      "--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext"
+      "--with-xshm-ext" "--with-xdbe-ext" "--without-readdisplay"
+
       "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
-      "--with-hackdir=\${out}/share/xscreensaver-hacks"
     ];
 
-  preConfigure = a.fullDepEntry
+  preConfigure =
     ''
       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 = {
+    homepage = http://www.jwz.org/xscreensaver/;
     description = "A set of screensavers";
-    maintainers = [ a.lib.maintainers.raskin ];
-    platforms = a.lib.platforms.allBut "i686-cygwin";
+    maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+    platforms = stdenv.lib.platforms.allBut "i686-cygwin";
   };
-}) x
+}

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

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

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

@@ -1,15 +1,16 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, lib, fetchurl, alsaLib, libao, lame, libmad }:
 
-    name = "sox-14.3.0";
+let inherit (composableDerivation) edf; in
 
-    src = args.fetchurl {
-      url = mirror://sourceforge/sox/sox-14.3.0.tar.gz;
-      sha256 = "15r39dq9nlwrypm0vpxmbxyqqv0bd6284djbi1fdfrlkjhf43gws";
-    };
+composableDerivation.composableDerivation {} {
+  name = "sox-14.3.0";
 
-    flags =
+  src = fetchurl {
+    url = mirror://sourceforge/sox/sox-14.3.0.tar.gz;
+    sha256 = "15r39dq9nlwrypm0vpxmbxyqqv0bd6284djbi1fdfrlkjhf43gws";
+  };
+
+  flags =
     # are these options of interest? We'll see
     #--disable-fftw          disable usage of FFTW
     #--enable-debug          enable debugging
@@ -23,39 +24,21 @@ composableDerivation {} {
     // edf { name = "dl-mad"; enable.buildInputs = [ libmad ]; } # use shared library
     // edf { name = "mad";    enable.buildInputs =[ libmad ]; }
     ;
-    # These options should be autodetected by the configure script
-    /*
-    --without-sndfile       Don't try to use libsndfile
-    --without-ogg           Don't try to use Ogg Vorbis
-    --without-flac          Don't try to use FLAC
-    --without-ffmpeg        Don't try to use ffmpeg
-    --without-mad           Don't try to use MAD (MP3 Audio Decoder)
-    --without-lame          Don't try to use LAME (LAME Ain't an MP3 Encoder)
-    --without-amr-wb        Don't try to use amr-wb
-    --without-amr-nb        Don't try to use amr-nb
-    --without-samplerate    Don't try to use libsamplerate (aka Secret Rabbit
-                            Code)
-    --without-ladspa        Don't try to use LADSPA
-    --with-ladspa-path      Default search path for LADSPA plugins
-    */
-
 
   cfg = {
     ossSupport = false;
     sun_audioSupport = false;
-  } // lib.listToAttrs [
-      { name = "dl-lameSupport"; value = true; }
+  } // lib.listToAttrs
+    [ { name = "dl-lameSupport"; value = true; }
       { name = "dl-madSupport"; value = true; }
-  ];
+    ];
 
   configureFlags = ["-enable-dl-lame"];
 
-
   optionals = [ "libsndfile" "libogg" "flac" "ffmpeg" "libmad" "lame"
                  /* "amr-wb" "amr-nb" */
                 "libsamplerate" /* "ladspa" */ ];
 
-
   meta = {
     description = "Sample Rate Converter for audio";
     homepage = http://www.mega-nerd.com/SRC/index.html;

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

@@ -1,13 +1,14 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, snack, tcl, tk, makeWrapper }:
+
+stdenv.mkDerivation {
   name = "wavesurfer-1.8.5";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz;
     sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807";
   };
 
-  buildInputs =(with args; [snack tcl tk makeWrapper]);
+  buildInputs = [ snack tcl tk makeWrapper ];
 
   installPhase = ''
     ensureDir $out/{bin,nix-support,share/wavesurfer/}
@@ -15,13 +16,13 @@ args.stdenv.mkDerivation {
     mv * $out/nix-support
     ln -s $out/{nix-support,bin}/wavesurfer.tcl
     wrapProgram "$out/nix-support/wavesurfer.tcl"  \
-                 --set TCLLIBPATH "${args.snack}/lib" \
-                 --prefix PATH : "${args.tcl}/bin:${args.tk}/bin"
+                 --set TCLLIBPATH "${snack}/lib" \
+                 --prefix PATH : "${tcl}/bin:${tk}/bin"
   '';
 
   meta = { 
-      description = "tool for recording, playing, editing, viewing and labeling of audio";
-      homepage = http://www.speech.kth.se/wavesurfer/;
-      license = "BSD";
+    description = "Tool for recording, playing, editing, viewing and labeling of audio";
+    homepage = http://www.speech.kth.se/wavesurfer/;
+    license = "BSD";
   };
 }

pkgs/applications/misc/bluez-firmware/default.nix

@@ -1,13 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "bluez-firmware-1.1";
-  src = fetchurl {
-    url = http://bluez.sf.net/download/bluez-firmware-1.1.tar.gz;
-    md5 = "2f1c2d939108c865dd07bae3e819c573";
-  };
-
-  meta = {
-    homepage = http://www.bluez.org;
-  };
-}

pkgs/applications/misc/bluez-utils/default.nix

@@ -1,14 +0,0 @@
-{stdenv, fetchurl, bluezLibs}:
-
-stdenv.mkDerivation {
-  name = "bluez-utils-2.25";
-  src = fetchurl {
-    url = http://bluez.sf.net/download/bluez-utils-2.25.tar.gz;
-    md5 = "ae3729ab5592be06ed01b973d4b3e9fe";
-  };
-  buildInputs = [bluezLibs];
-
-  meta = {
-    homepage = http://www.bluez.org;
-  };
-}

pkgs/applications/misc/calibre/default.nix

@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-0.7.0";
+  name = "calibre-0.7.14";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.gz";
-    sha256 = "0aij3gqkfvhzrsfk0ms9mlawrdj46r3634cglbwsapv17g2wv6mg";
+    sha256 = "07vnmxxpg77pmd7fhcrlnark02bn6zj62hbsybdqz8fp1yp99wkn";
   };
 
   inherit python;

pkgs/applications/misc/d4x/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, gtk, glib, pkgconfig, openssl, boost }:
+
 stdenv.mkDerivation {
   name = "d4x-2.5.7.1";
   
@@ -12,11 +13,12 @@ stdenv.mkDerivation {
   configurePhase = "./configure --prefix=\$out "
     + " --with-boost-libdir=\$boost/lib"
     + " --with-boost-includedir=\$boost/include";
-  buildInputs = [gtk glib pkgconfig openssl boost];
+    
+  buildInputs = [ gtk glib pkgconfig openssl boost ];
 
   meta = { 
-      description = "graphical download manager";
-      homepage = http://www.krasu.ru/soft/chuchelo/;
-      license = "Artistic";
+    description = "Graphical download manager";
+    homepage = http://www.krasu.ru/soft/chuchelo/;
+    license = "Artistic";
   };
 }

pkgs/applications/misc/flite/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "flite-1.3-release";
 
@@ -7,20 +8,22 @@ stdenv.mkDerivation {
     sha256 = "12wanxx57bbqgkag54dlqzv6h2kr9053p0z8mkxs0mqy03vja8lj";
   };
 
-  buildPhase = "
-    unset buildPhase
-    ensureDir \$out/lib
-    buildPhase
-  ";
+  buildPhase =
+    ''
+      unset buildPhase
+      ensureDir $out/lib
+      buildPhase
+    '';
 
-  installPhase = "
-    ensureDir \$out/share/flite
-    cp -r bin \$out
-  ";
+  installPhase =
+    ''
+      ensureDir $out/share/flite
+      cp -r bin $out
+    '';
 
   meta = { 
-      description = "Flite text to speech engine";
-      homepage = http://www.speech.cs.cmu.edu/flite/download.html;
-      license = "BSD as-is";
+    description = "Flite text to speech engine";
+    homepage = http://www.speech.cs.cmu.edu/flite/download.html;
+    license = "BSD as-is";
   };
 }

pkgs/applications/misc/freemind/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }:
+
 stdenv.mkDerivation {
   name = "freemind-0.9.0_RC_6";
 
@@ -7,43 +8,44 @@ stdenv.mkDerivation {
     sha256 = "0qxpwqmb4xd8c83zh76gczmx0hsx5m209k7p60kh7c4f25snhngf";
   };
 
-  buildInputs = [jdk ant];
+  buildInputs = [ jdk ant ];
 
-  phases="unpackPhase patchPhase buildPhase installPhase";
+  phases = "unpackPhase patchPhase buildPhase installPhase";
 
-  patchPhase=''
+  patchPhase = ''
     # There is a complain about this. I don't understand it.
     mkdir plugins/plugins
   '';
 
   buildPhase="ant dist";
-# LIBXCB_ALLOW_SLOPPY_LOCK=true :
-# don't know yet what this option really means but I'm no longer getting
-#   Checking Java Version...
-#   Locking assertion failure.  Backtrace:
-#   java: xcb_xlib.c:82: xcb_xlib_unlock: Assertion `c->xlib.lock' failed
-# this way
-# reference and more info https://bugs.launchpad.net/ubuntu/+source/sun-java5/+bug/86103
-# JDK 7 beta seems to have fixed this (bug ?)
+  
+  # LIBXCB_ALLOW_SLOPPY_LOCK=true :
+  # don't know yet what this option really means but I'm no longer getting
+  #   Checking Java Version...
+  #   Locking assertion failure.  Backtrace:
+  #   java: xcb_xlib.c:82: xcb_xlib_unlock: Assertion `c->xlib.lock' failed
+  # this way
+  # reference and more info https://bugs.launchpad.net/ubuntu/+source/sun-java5/+bug/86103
+  # JDK 7 beta seems to have fixed this (bug ?)
 
-  installPhase=''
+  installPhase = ''
     ensureDir $out/{bin,nix-support}
     cp -r ../bin/dist $out/nix-support
     sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh
     cat > $out/bin/freemind << EOF
     #!/bin/sh
-    export PATH=${args.coreutils}/bin:${args.gnugrep}/bin:"$PATH"
+    export PATH=${coreutils}/bin:${gnugrep}/bin:"$PATH"
     export JAVA_HOME="${jre}"
     export LIBXCB_ALLOW_SLOPPY_LOCK=true
     $out/nix-support/dist/freemind.sh
     EOF
 
     chmod +x $out/{bin/freemind,nix-support/dist/freemind.sh}
-    '';
+  '';
 
   meta = {
-      description = "mind mapping software";
-      homepage = http://freemind.sourceforge.net/wiki/index.php/Main_Page;
-      license = "GPL";
+    description = "Mind-mapping software";
+    homepage = http://freemind.sourceforge.net/wiki/index.php/Main_Page;
+    license = "GPL";
   }; 
 }

pkgs/applications/misc/grip/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte
+, curl, cdparanoia, libid3tag }:
 
 stdenv.mkDerivation {
   name = "grip-3.2.0";
@@ -8,13 +9,13 @@ stdenv.mkDerivation {
     sha256 = "1jh5x35rq15n8ivlp9wbdx8x9mj6agf5rfdv8sd6gai851zsclas";
   };
 
-  buildInputs = [gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag];
+  buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag ];
 
   meta = { 
-    description = "GTK+ based Audio CD Player/Ripper";
+    description = "GTK+-based audio CD player/ripper";
     homepage = http://nostatic.org/grip;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     #platforms = args.lib.platforms.linux;
   };
 }

pkgs/applications/misc/jigdo/default.nix

@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, db45, gtk, bzip2 }:
 
 stdenv.mkDerivation {
   name = "jigdo-0.7.3";
@@ -9,18 +9,18 @@ stdenv.mkDerivation {
     sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv";
   };
 
-  buildInputs = [db45 gtk bzip2];
-
-  configureFlags = "--without-libdb";
-
-  meta = { 
-    description = "tool designed to ease the distribution of very large files over the internet";
-    homepage = http://atterer.net/jigdo/;
-    license = "GPLv2";
-  };
-
   patches = fetchurl {
     url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz;
     sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3";
   };
+  
+  buildInputs = [ db45 gtk bzip2 ];
+
+  configureFlags = "--without-libdb";
+
+  meta = { 
+    description = "Download utility that can fetch files from several sources simultaneously";
+    homepage = http://atterer.net/jigdo/;
+    license = "GPLv2";
+  };
 }

pkgs/applications/misc/mrxvt/default.nix

@@ -1,12 +1,13 @@
-args: with args;
-stdenv.mkDerivation {
+{ stdenv, fetchurl, libX11, libXft, libXi, inputproto, libSM, libICE
+, freetype, pkgconfig, which }:
 
+stdenv.mkDerivation {
   name = "mrxvt-0.5.4";
 
-  buildInputs = [libX11 libXft libXi inputproto libSM libICE
-    freetype pkgconfig which];
+  buildInputs =
+    [ libX11 libXft libXi inputproto libSM libICE freetype pkgconfig which ];
 
-  configureFlags=[
+  configureFlags = [
     "--with-x"
     "--enable-frills"
     "--enable-xft"
@@ -17,7 +18,7 @@ stdenv.mkDerivation {
     "--with-save-lines=10000"
   ];
 
-  preConfigure=''
+  preConfigure = ''
     NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2";
   '';
 
@@ -27,10 +28,10 @@ stdenv.mkDerivation {
   };
 
   meta = { 
-    description = "lightweight multitabbed feature-rich X11 terminal emulator";
+    description = "Lightweight multitabbed feature-rich X11 terminal emulator";
     longDescription = "
     	Multitabbed lightweight terminal emulator based on rxvt. 
-	Supports transparency, backgroundimages, freetype fonts,..
+	Supports transparency, backgroundimages, freetype fonts, ...
     ";
     homepage = http://sourceforge.net/projects/materm;
     license = "GPL";

pkgs/applications/misc/multisync/default.nix

@@ -1,15 +1,19 @@
-args: with args;
-
+{ stdenv, fetchurl, gtk, glib, ORBit2, libbonobo, libtool, pkgconfig
+, libgnomeui, GConf, automake, autoconf }:
 
 stdenv.mkDerivation {
   name = "multisync-0.82-1";
+  
   src = fetchurl {
     url = mirror://sourceforge/multisync/multisync-0.82-1.tar.bz2;
     sha256 = "1azb6zsn3n1rnla2qc3c440gc4vgmbj593k6xj5g1v0xha2vm2y3";
   };
-  buildInputs = [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf
-                  automake autoconf
-                ];
+  
+  buildInputs =
+    [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf
+      automake autoconf
+    ];
+    
   preConfigure = "./autogen.sh"; # install.sh is not contained in the tar
 
   meta = {

pkgs/applications/misc/mupdf/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg
+, libX11, libXext }:
+stdenv.mkDerivation rec {
+  name = "mupdf-0.6";
+
+  src = fetchurl {
+    url = "http://mupdf.com/download/source/${name}.tar.gz";
+    sha256 = "01cn2kz4zx53qhqvbxy8xd7xqbh58kpid8ykvx5hz7pf2gqw91vg";
+  };
+
+  buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];
+
+  preBuild = ''
+    export makeFlags="prefix=$out"
+  '';
+
+  meta = {
+    homepage = http://mupdf.com/;
+    description = "Lightweight PDF viewer and toolkit written in portable C";
+    license = "GPLv3+";
+    maintainers = with stdenv.lib.maintainers; [ viric ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/misc/pgadmin/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }:
+
 stdenv.mkDerivation rec {
   name = "pgadmin3-1.10.0";
 
@@ -7,11 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "1ndi951da3jw5800fjdgkbvl8n6k71x7x16ghihi1l88bilf2a16";
   };
 
-  buildInputs = [postgresql wxGTK libxml2 libxslt openssl];
+  buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ];
 
   meta = { 
-      description = "postgresql admin gui tool";
-      homepage = http://www.pgadmin.org;
-      license = "GPL2";
-    };
+    description = "PostgreSQL administration GUI tool";
+    homepage = http://www.pgadmin.org;
+    license = "GPL2";
+  };
 }

pkgs/applications/misc/procmail/default.nix

@@ -1,6 +1,7 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
-  name="procmail-3.22";
+  name = "procmail-3.22";
 
   buildInputs = [ stdenv.gcc.libc ];
 

pkgs/applications/misc/pstree/default.nix

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

pkgs/applications/misc/qcad/default.nix

@@ -1,5 +1,7 @@
 # translations still misssing
-args: with args;
+
+{ stdenv, fetchurl, qt3, libpng, libXext, libX11 }:
+
 stdenv.mkDerivation {
   name = "qcad-2.0.5.0-1-community";
 
@@ -15,7 +17,7 @@ stdenv.mkDerivation {
     cd ..
   '';
 
-  buildInputs = [qt3 libpng libXext libX11];
+  buildInputs = [ qt3 libpng libXext libX11 ];
 
   patchPhase = ''
     sed -i 's/-pedantic//' mkspecs/defs.pro
@@ -35,8 +37,8 @@ stdenv.mkDerivation {
   '';
 
   meta = { 
-      description="A 2D CAD package based upon Qt.";
-      homepage = http://www.ribbonsoft.de/qcad.html;
-      license = "GPLv2"; # community edition
+    description = "A 2D CAD package based upon Qt";
+    homepage = http://www.ribbonsoft.de/qcad.html;
+    license = "GPLv2"; # community edition
   };
 }

pkgs/applications/misc/rsibreak/default.nix

@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, cmake, kdelibs, kdebase_workspace }:
+
+stdenv.mkDerivation rec {
+  name = "rsibreak-0.10";
+
+  src = fetchurl {
+    url = "http://www.rsibreak.org/files/${name}.tar.bz2";
+    sha256 = "02vvwmzhvc9jfrzmnfn3cygx63yx7g360lcslwj1vikzkg834ik0";
+  };
+
+  buildInputs = [ cmake kdelibs kdebase_workspace ];
+}

pkgs/applications/misc/rxvt/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, libX11, libXt }:
+
 stdenv.mkDerivation {
   name = "rxvt-2.6.4";
 
@@ -10,8 +11,8 @@ stdenv.mkDerivation {
   buildInputs = [ libX11 libXt ];
 
   meta = { 
-      description = "colour vt102 terminal emulator with less features and lower memory consumption";
-      homepage = http://www.rxvt.org/;
-      license = "GPL";
+    description = "Colour vt102 terminal emulator with less features and lower memory consumption";
+    homepage = http://www.rxvt.org/;
+    license = "GPL";
   };
 }

pkgs/applications/misc/rxvt_unicode/default.nix

@@ -1,11 +1,11 @@
-args: with args;
-# args.perlSupport: enables perl interpreter support
-# see man urxvtperl for details
+{ stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl }:
+
 let 
   name = "rxvt-unicode";
   version = "9.07";
   n = "${name}-${version}";
 in
+
 stdenv.mkDerivation (rec {
 
   name = "${n}${if perlSupport then "-with-perl" else ""}";
@@ -15,26 +15,25 @@ stdenv.mkDerivation (rec {
     sha256 = "18y5mb3cm1gawjm723q5r7yk37s9drzg39kna036i694m2667865";
   };
 
-  buildInputs = [ libX11 libXt libXft ncurses /* required to build the terminfo file */ ]
-          ++ lib.optional perlSupport perl;
+  buildInputs =
+    [ libX11 libXt libXft ncurses /* required to build the terminfo file */ ]
+    ++ stdenv.lib.optional perlSupport perl;
 
-  preConfigure=''
-    configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}";
-    export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
-  ''
-  # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically
-  + (if perlSupport then ''
+  preConfigure =
+    ''
+      configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}";
+      export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
+    ''
+    # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically
+    + stdenv.lib.optionalString perlSupport ''
       ensureDir $out/lib/perl5
       ln -s $out/{lib/urxvt,lib/perl5/site_perl}
-  '' else "");
-
-  postInstall = ''
-  '';
+    '';
 
   meta = {
-    description = "rxvt-unicode is a clone of the well known terminal emulator rxvt.";
+    description = "A clone of the well-known terminal emulator rxvt";
     longDescription = "
-      you should put this into your .bashrc
+      You should put this into your ~/.bashrc:
       export TERMINFO=~/.nix-profile/share/terminfo
     ";
     homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";

pkgs/applications/misc/sbagen/default.nix

@@ -1,18 +1,18 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "sbagen-1.4.4";
 
-  buildPhases="buildPhase installPhase";
+  buildPhases = "buildPhase installPhase";
 
-  buildPhase="./mk";
+  buildPhase = "./mk";
 
-  installPhase="
-    ensureDir \$out/{bin,share/sbagen/doc}
-    cp -r --target-directory=\$out/share/sbagen examples scripts river1.ogg river2.ogg
+  installPhase = ''
+    ensureDir $out/{bin,share/sbagen/doc}
+    cp -r --target-directory=$out/share/sbagen examples scripts river1.ogg river2.ogg
     cp sbagen $out/bin
-    cp --target-directory=\$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt
-  
-   ";
+    cp --target-directory=$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt
+  '';
 
   src = fetchurl {
     url = http://uazu.net/sbagen/sbagen-1.4.4.tgz;
@@ -20,8 +20,8 @@ stdenv.mkDerivation {
   };
 
   meta = { 
-      description = "binaural sound generator";
-      homepage = http://uazu.net/sbagen;
-      license = "GPL";
-    };
+    description = "Binaural sound generator";
+    homepage = http://uazu.net/sbagen;
+    license = "GPL";
+  };
 }

pkgs/applications/misc/simgrid/default.nix

@@ -0,0 +1,59 @@
+{ fetchurl, stdenv, cmake, ruby }:
+
+stdenv.mkDerivation rec {
+  name = "simgrid-3.4.1";
+
+  src = fetchurl {
+    url = "https://gforge.inria.fr/frs/download.php/26944/${name}.tar.bz2";
+    sha256 = "acd2bb2c1abf59e9b190279b1c38582b7c1edd4b6ef4c6a9b01100740f1a6b28";
+  };
+
+  /* FIXME: Ruby currently disabled because of this:
+
+     Linking C shared library ../src/.libs/libsimgrid.so
+     ld: cannot find -lruby-1.8.7-p72
+
+   */
+  buildInputs = [ cmake /* ruby */ ];
+
+  preConfigure =
+    # Make it so that libsimgrid.so will be found when running programs from
+    # the build dir.
+    '' export LD_LIBRARY_PATH="$PWD/src/.libs"
+       export cmakeFlags="-Dprefix=$out"
+    '';
+
+  makeFlags = "VERBOSE=1";
+
+  patchPhase =
+    '' for i in "src/smpi/"*
+       do
+         sed -i "$i" -e's|/bin/bash|/bin/sh|g'
+       done
+    '';
+
+  installPhase = "make install-simgrid";
+
+  # Fixing the few tests that fail is left as an exercise to the reader.
+  doCheck = false;
+
+  meta = {
+    description = "SimGrid, a simulator for distributed applications in heterogeneous environments";
+
+    longDescription =
+      '' SimGrid is a toolkit that provides core functionalities for the
+         simulation of distributed applications in heterogeneous distributed
+         environments.  The specific goal of the project is to facilitate
+         research in the area of distributed and parallel application
+         scheduling on distributed computing platforms ranging from simple
+         network of workstations to Computational Grids.
+      '';
+
+    homepage = http://simgrid.gforge.inria.fr/;
+
+    license = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}

pkgs/applications/misc/synergy/default.nix

@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, x11, xextproto, libXtst, inputproto, libXi
+, automake, autoconf, sourceFromHead }:
+
 stdenv.mkDerivation {
   name = "synergy-cvs";
 
@@ -10,18 +12,20 @@ stdenv.mkDerivation {
                (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];
+  buildInputs = [ x11 xextproto libXtst inputproto libXi automake autoconf ];
 
-  preConfigure = "autoreconf; ";
+  preConfigure = "autoreconf";
 
-  patches = [ (fetchurl {
-    url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz;
-    sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7";
-  }) ];
+  patches =
+    [ (fetchurl {
+        url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz;
+        sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7";
+      })
+    ];
 
-  meta= { 
-      description = "share mouse keyboard and clipboard between computers";
-      homepage = http://synergy2.sourceforge.net;
-      license = "GPL";
+  meta = { 
+    description = "Tool to share the mouse keyboard and the clipboard between computers";
+    homepage = http://synergy2.sourceforge.net;
+    license = "GPL";
   };
 }

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

@@ -1,8 +1,9 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "thinkingrock-2.2.1-binary";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz;
     sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm";
   };
@@ -28,11 +29,12 @@ args.stdenv.mkDerivation {
     EOF
     chmod +x $out/bin/thinkingrock
   '';
+  
   installPhase = ":";
 
   meta = { 
-      description = "task managing system";
-      homepage = http://www.thinkingrock.com.au/;
-      license = "CDDL"; # Common Development and Distribution License
+    description = "Task management system";
+    homepage = http://www.thinkingrock.com.au/;
+    license = "CDDL"; # Common Development and Distribution License
   };
 }

pkgs/applications/misc/xneur/0.8.nix

@@ -1,26 +1,28 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, pcre, GStreamer, glib, libxml2, aspell
+, imlib2, xorg, xosd }:
 
 stdenv.mkDerivation {
   name = "xneur-0.8.0";
+  
   src = fetchurl {
     url = http://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2;
     sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8";
   };
 
-  buildInputs = [libX11 pkgconfig pcre GStreamer glib libxml2 aspell
-    libXpm imlib2 xosd libXt libXext];
-
-  inherit aspell imlib2 xosd;
+  buildInputs =
+    [ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell
+      xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext
+    ];
 
   preConfigure = ''
     sed -e 's/-Werror//' -i configure
-    sed -e 's/for aspell_dir in/for aspell_dir in $aspell /' -i configure
-    sed -e 's/for imlib2_dir in/for imlib2_dir in $imlib2 /' -i configure
-    sed -e 's/for xosd_dir in/for xosd_dir in $xosd /' -i configure
+    sed -e 's@for aspell_dir in@for aspell_dir in ${aspell} @' -i configure
+    sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure
+    sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure
   '';
 
   meta = {
-    description = "xneur is the keyboard layout switcher.";
+    description = "Utility for switching between keyboard layouts";
   };
 
 }

pkgs/applications/misc/xneur/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, xorg, pcre, GStreamer, glib, libxml2
+, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk }:
 
 let s = import ./src-for-default.nix; in
 
@@ -9,17 +10,17 @@ stdenv.mkDerivation rec {
     sha256 = s.hash;
   };
 
-  buildInputs = [libX11 pkgconfig pcre GStreamer glib libxml2 aspell
-    libXpm imlib2 xosd libXt libXext libXi libnotify gtk pango
-    cairo];
-
-  inherit aspell imlib2 xosd;
+  buildInputs =
+    [ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell cairo
+      xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify
+      gtk pango
+    ];
 
   preConfigure = ''
     sed -e 's/-Werror//' -i configure
-    sed -e 's/for aspell_dir in/for aspell_dir in $aspell /' -i configure
-    sed -e 's/for imlib2_dir in/for imlib2_dir in $imlib2 /' -i configure
-    sed -e 's/for xosd_dir in/for xosd_dir in $xosd /' -i configure
+    sed -e 's/for aspell_dir in/for aspell_dir in ${aspell} /' -i configure
+    sed -e 's/for imlib2_dir in/for imlib2_dir in ${imlib2} /' -i configure
+    sed -e 's/for xosd_dir in/for xosd_dir in ${xosd} /' -i configure
 
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
@@ -31,11 +32,10 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "xneur is the keyboard layout switcher.";
+    description = "Utility for switching between keyboard layouts";
     homepage = http://xneur.ru;
     license = "GPL2+";
     maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.linux;
   };
-
 }

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

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

pkgs/applications/misc/xterm/default.nix

@@ -1,16 +1,24 @@
-args: with args;
+{ stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "xterm-231";
+  
   src = fetchurl {
     url = "ftp://invisible-island.net/xterm/${name}.tgz";
     sha256 = "0qlz5nkdqkahdg9kbd1ni96n69srj1pd9yggwrw3z0kghaajb2sr";
   };
-  buildInputs = [libXaw xproto libXt libXext libX11 libSM libICE ncurses
-    freetype pkgconfig libXft luit];
-  configureFlags = "--enable-wide-chars --enable-256-color
-    --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit
-    --enable-mini-luit --with-tty-group=tty";
+  
+  buildInputs =
+    [ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE
+      ncurses freetype pkgconfig xorg.libXft xorg.luit
+    ];
+    
+  configureFlags =
+    ''
+      --enable-wide-chars --enable-256-color
+      --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-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

pkgs/applications/misc/yate/default.nix

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

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

@@ -35,17 +35,17 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
 
 stdenv.mkDerivation rec {
   name = "chrome-${version}";
-  version = "51653";
+  version = "55366";
   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 = "1d8q4ac8s3b1bncli537phzxshfr50j69y49409g5p64v7iya9kw";
+        sha256 = "1dazdfpnl278wwh03hs0x184ql5zh0yhpfiaw75j437dp3668hnj";
       } 
     else if stdenv.system == "i686-linux" then 
       fetchurl {
         url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
-        sha256 = "1kdhwkl7xxssmkrkkgrdwrwvbah97va7rxbwrfhlcnjgw60ppf9v";
+        sha256 = "1x5ykvp2hxc56p4bb1lykahkk1nzkqi2kkm474spplqcfnmd6j2b";
       } 
     else null;
 
@@ -55,7 +55,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 libjpeg bzip2 libpng libXScrnSaver dbus dbus_glib cups libgcrypt] ;
+       [ stdenv.gcc.libc 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 cups libgcrypt] ;
 
   installPhase = ''
     ensureDir $out/bin

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

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl
+, spidermonkey, guile, gpm }:
 
 stdenv.mkDerivation rec {
   name = "elinks-0.12pre5";
@@ -8,13 +9,27 @@ stdenv.mkDerivation rec {
     sha256 = "1li4vlbq8wvnigxlkzb15490y90jg6y9yzzrqpqcz2h965w5869d";
   };
 
-  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}";
+  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}
+    '';
+
+  crossAttrs = {
+    propagatedBuildInputs = [ ncurses.hostDrv zlib.hostDrv openssl.hostDrv ];
+    configureFlags = ''
+      --enable-finger --enable-html-highlight
+      --enable-gopher --enable-cgi --enable-bittorrent --enable-nntp
+      --with-openssl=${openssl.hostDrv}
+      --with-bzip2=${bzip2.hostDrv}
+    '';
+  };
 
   meta = {
-    description = "Full-Featured Text WWW Browser";
+    description = "Full-featured text-mode web browser";
     homepage = http://elinks.or.cz;
   };
 }

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

@@ -12,14 +12,14 @@
 
 rec {
 
-  firefoxVersion = "3.6.7";
+  firefoxVersion = "3.6.8";
   
-  xulVersion = "1.9.2.7"; # this attribute is used by other packages
+  xulVersion = "1.9.2.8"; # 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 = "12c584a63ea6ddbb9253094ad500bc6b046903a6";
+    sha1 = "4936e543f6c7492c5954cbd5b30ddda6b20e3797";
   };
 
 

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

@@ -1,7 +1,7 @@
-{ fetchurl, stdenv, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
+{ fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
 , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
 , libnotify, gnomevfs, libgnomeui
-, freetype, fontconfig, wirelesstools ? null
+, freetype, fontconfig, wirelesstools ? null, pixman
 , application ? "browser" }:
 
 # Build the WiFi stuff on Linux-based systems.
@@ -9,18 +9,18 @@
 # http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 .
 #assert stdenv.isLinux -> (wirelesstools != null);
 
-let version = "3.6"; in
+let version = "3.6.7"; in
 stdenv.mkDerivation {
   name = "icecat-${version}";
 
   src = fetchurl {
-    url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2";
-    sha256 = "0fsf8zd8nncg1w1gg2jhlxwkbljvrx4mm9pywasklyi0gvi939ds";
+    url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz";
+    sha256 = "0nm0py3kd55pgyx1yv44v1acq5d1rgka3p6msfbgqx60yd38rwsm";
   };
 
   buildInputs =
-    [ libgnomeui libnotify gnomevfs alsaLib
-      pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
+    [ xz libgnomeui libnotify gnomevfs alsaLib
+      pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman
       python ply dbus dbus_glib pango freetype fontconfig
       xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
     ]
@@ -30,18 +30,6 @@ stdenv.mkDerivation {
     ./skip-gre-registration.patch ./rpath-link.patch
   ];
 
-  postPatch =
-    # Work around the broken `firefox.js' in 3.6.  See
-    # http://news.gmane.org/gmane.comp.gnu.gnuzilla/1419 for details.
-    let firefox_js = fetchurl {
-          url = "http://svn.savannah.gnu.org/viewvc/*checkout*/trunk/icecat/browser/app/profile/firefox.js?revision=98&root=gnuzilla";
-          sha256 = "1jf86wa7r7pf4f3ixrnsslv0i35ypm8hrzlw14hcm5wjcwidzq0f";
-          name = "firefox.js";
-        };
-    in
-      '' cp -v "${firefox_js}" "browser/app/profile/firefox.js"
-      '';
-
   configureFlags =
     [ "--enable-application=${application}"
       "--enable-libxul"

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

@@ -15,6 +15,7 @@ stdenv.mkDerivation {
   configureFlags = if sslSupport then "--with-ssl" else "";
   
   buildInputs = [ ncurses ] ++ stdenv.lib.optional sslSupport openssl;
+  buildNativeInputs = [ ncurses ];
 
   meta = {
     homepage = http://lynx.isc.org/;

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix

@@ -51,9 +51,9 @@ let
         url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_1_p2_debug_linux_121709.tar.gz;
         sha256 = "162cnzn8sfdvr8mwyggsxi2bcl7zzi1nrl61bw481hhhpwnrjdx4";
       } else {
-        version = "10.1.53.64";
+        version = "10.1.82.76";
         url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
-        sha256 = "1598vn4dd96cp1nv225vvjpna70ydkd8lcyfm88gnpzkwx2scz1b";
+        sha256 = "c6f8831ce648e7fa8e037f1fa8362d2d998cae0e06490e792bcd5871f3eb936a";
       }
     else throw "flashplayer is not supported on this platform";
 

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

@@ -1,16 +1,20 @@
-{ stdenv, fetchurl, fetchgit, cmake, qt4, kdelibs, automoc4, phonon, perl
-, v ? "0.4.90" }:
+{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, perl
+, gtk, gettext, pixman}:
 
-stdenv.mkDerivation (
-  builtins.getAttr v (import ./source.nix { inherit fetchurl fetchgit; })
-  // {
-    buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl ];
+stdenv.mkDerivation rec {
+  name = "rekonq-0.5.0";
 
-    meta = with stdenv.lib; {
-      platforms = platforms.linux;
-      maintainers = [ maintainers.urkud ];
-      description = "KDE Webkit browser";
-      homepage = http://rekonq.sourceforge.net;
-    };
-  }
-)
+  src = fetchurl {
+    url = "mirror://sf/rekonq/${name}.tar.bz2";
+    sha256 = "0qm16ivxlh3pj7v39z3ajf90sgm5q5xq6a8s2x1a0ipsh7fgkp58";
+  };
+
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl gtk gettext pixman ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.urkud ];
+    description = "KDE Webkit browser";
+    homepage = http://rekonq.sourceforge.net;
+  };
+}

pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pidgin} :
+
+stdenv.mkDerivation {
+  name = "pidgin-msn-pecan-0.1.0";
+  src = fetchurl {
+    url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.0.tar.bz2;
+    sha256 = "06cgkdlv2brv2g5hpx8g8p6j296cnvd29l8fap30i1k0mznbjxf4";
+  };
+
+  meta = {
+    description = "Alternative MSN protocol plug-in for Pidgin IM.";
+    homepage = http://code.google.com/p/msn-pecan/;
+  };
+
+  makeFlags = "PURPLE_LIBDIR=lib PURPLE_DATADIR=share/data DESTDIR=$$out";
+  preInstall = "ensureDir \$out/share";
+  postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-msn-pecan";
+
+  buildInputs = [pidgin];
+}

pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix

@@ -1,10 +1,10 @@
-args: with args;
+{ stdenv, fetchurl, pidgin, intltool, libxml2 }:
+
+let version = "1.10.0"; in
 
-let
-  version = "1.10.0";
-in
 stdenv.mkDerivation {
   name = "pidgin-sipe-${version}";
+  
   src = fetchurl {
     url = "mirror://sourceforge/sipe/sipe/pidgin-sipe-${version}/pidgin-sipe-${version}.tar.gz";
     sha256 = "11d85qxix1dmwvzs3lx0sycsx1d5sy67r9y78fs7z716py4mg9np";

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

@@ -21,10 +21,10 @@
 } :
 
 stdenv.mkDerivation {
-  name = "pidgin-2.7.1";
+  name = "pidgin-2.7.3";
   src = fetchurl {
-    url = mirror://sourceforge/pidgin/pidgin-2.7.1.tar.bz2;
-    sha256 = "1lcmpb86qsknkzwc1395r2aq09v8z6cr7d23jwi57mcs72ksa4pl";
+    url = mirror://sourceforge/pidgin/pidgin-2.7.3.tar.bz2;
+    sha256 = "1wi3wckn3gkbrgx0kk1b690nxj1i4xcp3xn5wrra6gwcgfm8hmwb";
   };
 
   inherit nss ncurses;

pkgs/applications/networking/irc/quassel/default.nix

@@ -46,11 +46,11 @@ in with stdenv; mkDerivation rec {
       meaning that one (or multiple) client(s) can attach to
       and detach from a central core -- much like the popular
       combination of screen and a text-based IRC client such
-      as WeeChat, but graphical(based on Qt4/KDE4).
+      as WeeChat, but graphical (based on Qt4/KDE4).
     '';
     license = "GPLv3";
     maintainers = [ maintainers.phreedom ];
-    platforms = platforms.all;
+    inherit (qt4.meta) platforms;
   };
 }
 

pkgs/applications/networking/irc/weechat/default.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, ncurses, openssl, perl, python, aspell}:
+
+stdenv.mkDerivation {
+  name = "weechat-0.3.2";
+
+  src = fetchurl {
+    url = http://weechat.org/files/src/weechat-0.3.2.tar.gz;
+    sha256 = "0ds548fmiv2fg69amhyg1v1rgyw51rqlp64p3rmsbm1lkcwwmivc";
+  };
+
+  buildInputs = [ncurses perl python openssl aspell];
+
+  meta = {
+    homepage = http://http://www.weechat.org/;
+    description = "A fast, light and extensible chat client";
+  };
+}
+     

pkgs/applications/networking/kphone/default.nix

@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, autoconf, automake, libtool, qt, pkgconfig
+, openssl, libpng, alsaLib, libX11, libXext, libXt, libICE
+, libSM }:
 
 stdenv.mkDerivation {
   name = "kphone-1.2";
@@ -10,7 +12,7 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ autoconf automake libtool qt pkgconfig openssl libpng alsaLib
-      libX11 libXext libXt libICE libSM libX11
+      libX11 libXext libXt libICE libSM
     ];
     
   preConfigure = "autoconf";
@@ -19,7 +21,7 @@ stdenv.mkDerivation {
     description = "KPhone is a SIP UA for Linux";
     homepage = http://sourceforge.net/projects/kphone/;
     license = "GPL";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/networking/p2p/ldcpp/default.nix

@@ -1,4 +1,6 @@
-args : with args; with builderDefs;
+{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11 }:
+
+with builderDefs;
 	let localDefs = builderDefs.passthru.function ((rec {
 		src = /* put a fetchurl here */
 		fetchurl {
@@ -6,7 +8,7 @@ args : with args; with builderDefs;
 			sha256 = "0w9c8k13cl85y4v4av8ic6w4zkdivcj6p5q86llfh3sz077vckiv";
 		};
 
-		buildInputs = [scons pkgconfig gtk bzip2 pkgconfig libglade
+		buildInputs = [scons pkgconfig gtk bzip2 libglade
 			openssl libX11];
 		configureFlags = [];
 		doScons = fullDepEntry (''
@@ -15,7 +17,7 @@ args : with args; with builderDefs;
 			scons PREFIX=$out 
 			scons PREFIX=$out install
 		'') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
-	}) //  args);
+	}));
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "ldcpp-1.0.3";

pkgs/applications/networking/skype/default.nix

@@ -1,5 +1,5 @@
 {stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib
-, libXext, libX11, libXScrnSaver, libSM, qt, libICE, freetype, fontconfig}:
+, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig}:
 
 assert stdenv.system == "i686-linux";
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     libXv
     libXext 
     libX11 
-    qt
+    qt4
     libXScrnSaver
     libSM
     libICE

pkgs/applications/networking/twinkle/default.nix

@@ -1,4 +1,7 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, commoncpp2, ccrtp, openssl, boost
+, libsndfile, libxml2, libjpeg, readline, qt, perl, file
+, alsaLib, speex, libzrtpcpp, xorg }:
+        
 stdenv.mkDerivation {
   name = "twinkle-1.4.2";
 
@@ -9,19 +12,18 @@ stdenv.mkDerivation {
 
   configureFlags = "--with-extra-includes=${libjpeg}/include";
 
-  buildInputs = [pkgconfig commoncpp2 ccrtp openssl boost libsndfile
-    libxml2 libjpeg readline qt libjpeg perl file
-    # optional ? :
-    alsaLib
-    speex libzrtpcpp libX11 libXaw libICE libXext
+  buildInputs =
+    [ pkgconfig commoncpp2 ccrtp openssl boost libsndfile
+      libxml2 libjpeg readline qt perl file
+      # optional ? :
+      alsaLib
+      speex libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext
     ];
 
-
   meta = { 
-    description = "softphone for your voice over IP";
     homepage = http://www.xs4all.nl/~mfnboer/twinkle/index.html;
     license = "GPL";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/office/abiword/default.nix

@@ -1,15 +1,17 @@
-{stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomecanvas, fribidi, libpng, popt, libgsf,
-enchant, wv, librsvg, bzip2
+{ stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomecanvas, fribidi
+, libpng, popt, libgsf, enchant, wv, librsvg, bzip2
 }:
 
 stdenv.mkDerivation {
   name = "abiword-2.8.6";
+  
   src = fetchurl {
     url = http://www.abisource.org/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz;
     sha256 = "059sd2apxdmcacc4pll880i7vm18h0kyjsq299m1mz3c7ak8k46r";
   };
 
-  buildInputs = [pkgconfig gtk libglade librsvg bzip2
-                 libgnomecanvas fribidi libpng popt libgsf enchant wv
-                ];
+  buildInputs =
+    [ pkgconfig gtk libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
+      libgsf enchant wv
+    ];
 }

pkgs/applications/office/scribus/default.nix

@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
+, libart_lgpl, qt, python, cups, fontconfig, libjpeg
+, zlib, libpng, xorg, cairo, cmake }:
 
 assert stdenv.gcc.gcc != null;
 
@@ -8,13 +10,9 @@ assert stdenv.gcc.gcc != null;
 # will be released with the next version of scribus - So don't miss them
 # when upgrading this package
 
-#let useCairo = true;
-let useCairo = false;
-
-in
+let useCairo = false; in
 
 stdenv.mkDerivation {
-
   name = "scribus-1.3.3.14";
 
   src = fetchurl {
@@ -35,9 +33,9 @@ stdenv.mkDerivation {
   buildInputs =
     [ pkgconfig /*<- required fro cairo only?*/ cmake freetype lcms libtiff libxml2 libart_lgpl qt
       python cups fontconfig
-      libXaw libXext libX11 libXtst libXi libXinerama
-      libjpeg libtiff zlib libpng
-    ] ++ lib.optional useCairo cairo;
+      xorg.libXaw xorg.libXext xorg.libX11 xorg.libXtst xorg.libXi xorg.libXinerama
+      libjpeg zlib libpng
+    ] ++ stdenv.lib.optional useCairo cairo;
 
   # fix rpath which is removed by cmake..
   postFixup = ''
@@ -49,9 +47,9 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    maintainers = [lib.maintainers.marcweber];
-    platforms = lib.platforms.linux;
-    description = "Desktop Publishing (DTP) and Layout program for Linux.";
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
+    description = "Desktop Publishing (DTP) and Layout program for Linux";
     homepage = http://www.scribus.net;
     license = "GPLv2";
   };

pkgs/applications/science/biology/arb/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, glew, mesa, libpng, lesstif, lynx, freeglut
+, libtiff, rxp, sablotron, perl, jdk, transfig, gv, gnuplot, xorg }:
 
 # NOTE: This package does not build on 64-bit systems. Because of some faulty
 # int->pointer arithmatic. The build scripts are abnormal - but it appears to
@@ -6,6 +7,7 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "arb-2007-Dec-07";
+  
   src = fetchurl {
     url = http://download.arb-home.de/release/2007_12_07/arbsrc.tgz;
     sha256 = "04l7qj0wigg1h56a9d70hxhdr343v3dg5dhqrc7fahc1v4h8f1rd";
@@ -13,7 +15,11 @@ stdenv.mkDerivation {
 
   patches = [ ./makefile.patch ];
 
-  buildInputs = [ glew mesa libpng libXpm lesstif lynx freeglut libtiff rxp sablotron libXaw perl jdk transfig libX11 libXext libXt gv gnuplot ];
+  buildInputs =
+    [ glew mesa libpng xorg.libXpm lesstif lynx freeglut libtiff rxp
+      sablotron xorg.libXaw perl jdk transfig xorg.libX11 xorg.libXext
+      xorg.libXt gv gnuplot
+    ];
 
   unpackPhase = ''
     tar xzf $src
@@ -49,20 +55,22 @@ stdenv.mkDerivation {
     chmod a+rwx $shareddir/lib/pixmaps
     # bulk copy
     cp -vau * $out
+    
     # replace arb script
     mv $out/bin/arb $out/bin/arb.orig
     cat > $out/bin/arb << ARB 
-#!/bin/sh
+    #!/bin/sh
 
-echo Starting Nix compiled arb from $out
-echo Shared databases are located in $shareddir
-# sometimes local profiles override these:
-export ARBHOME=$out
-export LD_LIBRARY=$ARBHOME/lib   
+    echo Starting Nix compiled arb from $out
+    echo Shared databases are located in $shareddir
+    # sometimes local profiles override these:
+    export ARBHOME=$out
+    export LD_LIBRARY=$ARBHOME/lib   
 
-$out/bin/arb_ntree $*
+    $out/bin/arb_ntree $*
 
-ARB
+    ARB
+    
     chmod +x $out/bin/arb
   '';
 

pkgs/applications/science/geometry/tetgen/default.nix

@@ -0,0 +1,21 @@
+{stdenv, fetchurl}: 
+
+stdenv.mkDerivation rec {
+  name = "tetgen-1.4.3";
+
+  src = fetchurl {
+    url = http://tetgen.berlios.de/files/tetgen1.4.3.tar.gz;
+    sha256 = "159i0vdjz7abb8bycz47ax4fqlzc82kv19sygqnrkr86qm4g43wy";
+  };
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp tetgen $out/bin
+  '';
+
+  meta = {
+    description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
+    homepage = "http://tetgen.berlios.de/";
+    license = "MIT";
+  };
+}

pkgs/applications/science/logic/coq/default.nix

@@ -4,19 +4,15 @@
 {stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
 
 let
-
-  pname = "coq";
-  version = "8.2pl1";
-  name = "${pname}-${version}";
-
+  version = "8.2pl2";
 in
 
 stdenv.mkDerivation {
-  inherit name;
+  name = "coq-${version}";
 
   src = fetchurl {
-    url = "http://coq.inria.fr/V${version}/files/${name}.tar.gz";
-    sha256 = "7c15acfd369111e51d937cce632d22fc77a6718a5ac9f2dd2dcbdfab4256ae0c";
+    url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";
+    sha256 = "0dh2vv3bvz8694dd12kjdkdaq19l1vslvygzif11igshc5bw4rhf";
   };
 
   buildInputs = [ ocaml camlp5 ncurses lablgtk ];

pkgs/applications/science/logic/isabelle/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, nettools, polyml, emacs, emacsPackages }:
+{ stdenv, fetchurl, perl, nettools, polyml, proofgeneral }:
 # nettools needed for hostname
 
 let
@@ -6,7 +6,6 @@ let
   version = "2009-1";
   name = "${pname}${version}";
   theories = ["HOL" "FOL" "ZF"];
-  proofgeneral = (emacsPackages emacs).proofgeneral;
 in
 
 stdenv.mkDerivation {

pkgs/applications/science/math/yacas/default.nix

@@ -0,0 +1,42 @@
+{stdenv, fetchurl, perl}: 
+
+stdenv.mkDerivation rec {
+  name = "yacas-1.2.2";
+
+  src = fetchurl {
+    url = "http://yacas.sourceforge.net/backups/${name}.tar.gz";
+    sha256 = "1dmafm3w0lm5w211nwkfzaid1rvvmgskz7k4500pjhgdczi5sd78";
+  };
+
+  # Perl is only for the documentation
+  buildNativeInputs = [ perl ];
+
+  patches = [ ./gcc43.patch ];
+
+  crossAttrs = {
+    # Trick to get host-built programs needed for the cross-build.
+    # If yacas had proper makefiles, this would not be needed.
+    preConfigure = ''
+      ./configure
+      pushd src
+      make mkfastprimes 
+      cp mkfastprimes ../..
+      popd
+      pushd manmake
+      make manripper removeduplicates
+      cp manripper removeduplicates ../..
+      popd
+    '';
+    preBuild = ''
+      cp ../mkfastprimes ../manripper ../removeduplicates src
+    '';
+  };
+
+  meta = { 
+      description = "Easy to use, general purpose Computer Algebra System";
+      homepage = http://yacas.sourceforge.net/;
+      license = "GPLv2+";
+      maintainers = with stdenv.lib.maintainers; [viric];
+      platforms = with stdenv.lib.platforms; all;
+  };
+}

pkgs/applications/science/math/yacas/gcc43.patch

@@ -0,0 +1,17 @@
+Taken from gentoo:
+http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/yacas/files/yacas-1.2.2-gcc43.patch?rev=1.1&view=markup
+Index: yacas-1.2.2-gcc43.patch
+===================================================================
+--- a/manmake/manripper.cpp
++++ b/manmake/manripper.cpp
+@@ -1,7 +1,8 @@
+ 
+-#include <stdio.h>
+-#include <ctype.h>
++#include <cstdio>
++#include <cctype>
+ #include <string>
++#include <cstring>
+ #include <map>
+ 
+ using namespace std;

pkgs/applications/version-management/arch/default.nix

@@ -1,7 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, which, diffutils, gnupatch, gnutar }:
 
 stdenv.mkDerivation rec {
   name = "tla-1.3.5";
+  
   src = fetchurl {
     url = "mirror://gnu/gnu-arch/" + name + ".tar.gz";
     sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0";
@@ -10,6 +11,7 @@ stdenv.mkDerivation rec {
   patches = [ ./configure-tmpdir.patch ];
 
   buildInputs = [which];
+  
   propagatedBuildInputs = [diffutils gnupatch gnutar];
 
   # Instead of GNU Autoconf, tla uses Tom Lord's now

pkgs/applications/version-management/bazaar/default.nix

@@ -1,11 +1,13 @@
 {stdenv, fetchurl, python, makeWrapper}:
 
-stdenv.mkDerivation {
-  name = "bazaar-1.10rc1";
+stdenv.mkDerivation rec {
+  version = "2.2";
+  release = ".0";
+  name = "bazaar-${version}${release}";
 
   src = fetchurl {
-    url = http://launchpad.net/bzr/1.10/1.10rc1/+download/bzr-1.10rc1.tar.gz;
-    sha256 = "dc3669e15ced93e0956c13b724f604075e0323ce07fb08f6463946c85e69bec0";
+    url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz";
+    sha256 = "64cd6c23097884e40686adc7f0ad4a8200e2292bdc5e0caba3563b6f5c32bacf";
   };
 
   buildInputs = [python makeWrapper];

pkgs/applications/version-management/bazaar/tools.nix

@@ -5,9 +5,10 @@ if ! bazaar.python.readlineSupport then
 else
 
 rec {
+  version = "2.2.0";
   src = fetchurl {
-    url = http://launchpad.net/bzrtools/stable/1.5.0/+download/bzrtools-1.5.0.tar.gz;
-    sha256 = "0lm4qhsjy3k8zp9hcahlf37v69w6lhhz2x3hjskgm3rk6b0bngjz";
+    url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz";
+    sha256 = "835e0dc2b3b798d3c88b960bf719fe3b4cec7ae241908aafeb6aafe4c83f591b";
   };
 
   buildInputs = [];
@@ -16,7 +17,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = [(simplyShare "bzrtools")];
       
-  name = "bzr-tools-1.5";
+  name = "bzr-tools-${version}";
   meta = {
     description = "Bazaar plugins.";
   };

pkgs/applications/version-management/darcs/darcs-2.nix

@@ -3,8 +3,8 @@
 cabal.mkDerivation (self : {
   pname = "darcs";
   name = self.fname;
-  version = "2.4.1";
-  sha256 = "6ac0e84d2eca160e6e33755679dfb185d9b5f9f5bdc43f99db326210aabbc4aa";
+  version = "2.4.4";
+  sha256 = "97cde35ae4b74488f8b98b487bc0498069eaa74fe035903394f3d4aff1da9f9e";
 
   extraBuildInputs = [
     html parsec regexCompat curl haskeline hashedStorage zlib

pkgs/applications/version-management/fossil/default.nix

@@ -1,7 +1,7 @@
 {stdenv, fetchurl, zlib, openssl}:
 
 let
-  version = "20100521162104";
+  version = "20100703153359";
 in
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz";
-    sha256 = "0aym6r06194nnl5801lhihvjc9mhj7zl602xsz7dch8bnhln470f";
+    sha256 = "1n4jl2xcwd8gfp0c897id13myk8z2h0yvs7g7z4s6bywx5wbkx0r";
   };
 
   buildInputs = [ zlib openssl ];
@@ -19,6 +19,10 @@ stdenv.mkDerivation {
     INSTALLDIR=$out/bin make install
   '';
 
+  crossAttrs = {
+    makeFlagsArray = [ "TCC=${stdenv.cross.config}-gcc" ];
+  };
+
   meta = {
     description = "Simple, high-reliability, distributed software configuration management.";
     longDescription = ''

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

@@ -12,11 +12,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "git-1.7.1";
+  name = "git-1.7.2.1";
 
   src = fetchurl {
     url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
-    sha256 = "bcf008ec9639480a3ebfdc4708743b6c0978a8bd3103a2dda587ea9473b9dde2";
+    sha256 = "5446b4ece3b8d81b1fcbcd6c4b91f1961b6f4047a3f6173e3200bee368724921";
   };
 
   patches = [ ./docbook2texi.patch ];
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
        '')
 
    + ''# Install man pages and Info manual
-       make PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
+       make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
          -C Documentation ''
 
    + (if guiSupport then ''
@@ -116,6 +116,8 @@ stdenv.mkDerivation rec {
 
      '';
 
+  enableParallelBuilding = true;
+
   meta = {
     license = "GPLv2";
     homepage = http://git-scm.com/;

pkgs/applications/version-management/mercurial/default.nix

@@ -1,7 +1,9 @@
-args: with args;
+{ stdenv, fetchurl, python, makeWrapper
+, guiSupport ? false, tk ? null }:
 
 stdenv.mkDerivation rec {
   name = "mercurial-1.5.1";
+  
   src = fetchurl {
     url = "http://www.selenic.com/mercurial/release/${name}.tar.gz";
     sha256 = "5796dd27c884c0effb027c71925fe2c2506b08e0ac8c5f53db259d378ef96569";
@@ -10,8 +12,10 @@ stdenv.mkDerivation rec {
   inherit python; # pass it so that the same version can be used in hg2git
 
   buildInputs = [ python makeWrapper ];
+  
   makeFlags = "PREFIX=$(out)";
-  postInstall = (if args.guiSupport then
+  
+  postInstall = (stdenv.lib.optionalString guiSupport
     ''
       ensureDir $out/etc/mercurial
       cp contrib/hgk $out/bin
@@ -23,9 +27,7 @@ stdenv.mkDerivation rec {
       WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\"
                 --set HG \"$out/bin/hg\"
                 --prefix PATH : \"${tk}/bin\" "
-    ''
-    else "")
-    +
+    '') +
     ''
       for i in $(cd $out/bin && ls); do
         wrapProgram $out/bin/$i \

pkgs/applications/version-management/monotone-viz/graphviz.patch

@@ -0,0 +1,34 @@
+# patch "agraph.ml"
+#  from [8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e]
+#    to [05aa88921481ac9bfe238daeb4374fbc9993caaa]
+#
+============================================================
+--- a/agraph.ml	8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e
++++ b/agraph.ml	05aa88921481ac9bfe238daeb4374fbc9993caaa
+@@ -50,8 +50,9 @@ let dot_format params agraph =
+       agraph.nodes in
+ 
+   !+ "digraph \"monotone-viz\"\n{\n" ;
+-  if params.lr_layout then
+-    !+ "  graph [rankdir=LR] ;\n" ;
++  if params.lr_layout
++  then  !+ "  graph [rankdir=LR] ;\n"
++  else  !+ "  graph [rankdir=BT] ;\n" ;
+   !+ "  graph [ranksep=\"0.25\"] ;\n" ;
+   !+ "  node [label=\"\"] ;\n" ;
+   
+@@ -222,11 +223,11 @@ let spawn_dot graph status done_cb =
+   let dot_prg = graph.layout_params.dot_program in
+   let cmd = 
+     if Viz_misc.debug "dot"
+-    then [ "/bin/sh" ; "-c" ; 
++    then [ "/bin/sh" ; "-c" ; 
+ 	   Printf.sprintf 
+ 	     "set -o pipefail ; \
+-              tee agraph.in.dot | %s -q -y -s%.0f | tee agraph.out.dot" dot_prg ppi ]
+-    else [ dot_prg ; "-q" ; "-y" ; Printf.sprintf "-s%.0f" ppi ] in
++              tee agraph.in.dot | %s -q -s%.0f | tee agraph.out.dot" dot_prg ppi ]
++    else [ dot_prg ; "-q" ; Printf.sprintf "-s%.0f" ppi ] in
+   let error fmt =
+     Printf.kprintf (fun s -> done_cb (`LAYOUT_ERROR s)) fmt in
+   try

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

@@ -3,9 +3,9 @@ rec {
   src = fetchmtn {
     name = "monotone-viz-mtn-checkout";
     dbs = ["monotone.ca"];
-    selector = "0e9194c89eb87e62ac7d54c7b88b10b94b07fa41";
-    branch = "net.venge.monotone-viz.automate";
-    sha256 = "d7980c9729b0a58f0dd27768b8eae46b45462fe72a88534b8aa159d889b4d624";
+    selector = "b34ff2e695b53c2d73d533a3ffa7cb081b48eefb";
+    branch = "net.venge.monotone-viz.new-stdio";
+    sha256 = "06263564bc111d865b50b4a9587a86f8d97fff47625a3c1cb98d90b79faf7889";
   } + "/";
 
   buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib 
@@ -13,12 +13,14 @@ rec {
   configureFlags = ["--with-lablgtk-dir=${lablgtk}/lib/ocaml/lablgtk2"];
 
   /* doConfigure should be specified separately */
-  phaseNames = ["doAutoconf" "doConfigure" "doMakeInstall"];
+  phaseNames = ["doAutoconf" "doPatch" "doConfigure" "doMakeInstall"];
 
   doAutoconf = fullDepEntry(''
     aclocal -I .
     autoconf -I .
   '') ["minInit" "addInputs" "doUnpack"];
+
+  patches = [ ./graphviz.patch ];
       
   name = "monotone-viz-mtn-head";
   meta = {

pkgs/applications/version-management/veracity/default.nix

@@ -0,0 +1,49 @@
+x@{builderDefsPackage
+  , cmake, curl, patch, zlib, icu, sqlite, libuuid
+  , readline, openssl, spidermonkey_1_8_0rc1
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  s = import ./src-for-default.nix;
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+    
+in
+rec {
+  src = a.fetchUrlFromSrcInfo s;
+
+  inherit (s) name;
+  inherit buildInputs;
+
+  phaseNames = ["prepareMakefiles" "doMake" "doDeploy"];
+
+  prepareMakefiles = a.fullDepEntry ''
+    find src -type f -exec sed -e 's@#include \([<"]\)sgbrings/js/js@#include \1js/js@g' -i '{}' ';'
+    cd ..
+    mkdir build
+    cd build
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lssl"
+    cmake -G "Unix Makefiles" -D SGBRINGS_JS_INCDIR="${spidermonkey_1_8_0rc1}/include" -D SGBRINGS_JS_LIB="${spidermonkey_1_8_0rc1}/lib/libjs.a" ../veracity*
+  '' ["minInit" "addInputs" "doUnpack"];
+
+  doDeploy = a.fullDepEntry ''
+    ensureDir "$out/bin" "$out/share/veracity/"
+    cp -r .. "$out/share/veracity/build-dir"
+    ln -s "$out/share/veracity/build-dir/build/src/cmd/vv" "$out/bin"
+    ln -s "$out/share/veracity/build-dir/build/src/script/vscript" "$out/bin"
+  '' ["doMake" "minInit" "defEnsureDir"];
+
+  meta = {
+    description = "A distributed version control system with template-based merging";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux ;
+  };
+}) x
+

pkgs/applications/version-management/veracity/src-for-default.nix

@@ -0,0 +1,8 @@
+rec {
+   version="0.3.0.10246";
+   name="veracity-0.3.0.10246";
+   hash="03wn6dzbjv5p50xmiznynza5c1nk38v95mzv6rk6km1ykqprnlw0";
+   url="http://download-us.sourcegear.com/Veracity/0.3.0.10246/veracity-source-${version}.tar.gz";
+   advertisedUrl="http://download-us.sourcegear.com/Veracity/0.3.0.10246/veracity-source-0.3.0.10246.tar.gz";
+  
+}

pkgs/applications/version-management/veracity/src-info-for-default.nix

@@ -0,0 +1,4 @@
+{
+  downloadPage = "http://sourcegear.com/veracity/downloads.html";
+  baseName = "veracity";
+}

pkgs/applications/video/MPlayer/default.nix

@@ -1,10 +1,11 @@
 { alsaSupport ? false, xvSupport ? true, theoraSupport ? false, cacaSupport ? false
 , xineramaSupport ? false, randrSupport ? false, dvdnavSupport ? true
 , stdenv, fetchurl, x11, freetype, fontconfig, zlib
-, alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null
+, alsa ? null, libXv ? null, libtheora ? null, libcaca ? null
 , libXinerama ? null, libXrandr ? null, libdvdnav ? null
 , cdparanoia ? null, cddaSupport ? true
 , amrnb ? null, amrwb ? null, amrSupport ? false
+, x11Support ? true, libX11 ? null
 , jackaudioSupport ? false, jackaudio ? null
 , x264Support ? false, x264 ? null
 , xvidSupport ? false, xvidcore ? null
@@ -13,11 +14,12 @@
 }:
 
 assert alsaSupport -> alsa != null;
-assert xvSupport -> libXv != null;
+assert x11Support -> libX11 != null;
+assert xvSupport -> (libXv != null && x11Support);
 assert theoraSupport -> libtheora != null;
 assert cacaSupport -> libcaca != null;
-assert xineramaSupport -> libXinerama != null;
-assert randrSupport -> libXrandr != null;
+assert xineramaSupport -> (libXinerama != null && x11Support);
+assert randrSupport -> (libXrandr != null && x11Support);
 assert dvdnavSupport -> libdvdnav != null;
 assert cddaSupport -> cdparanoia != null;
 assert jackaudioSupport -> jackaudio != null;
@@ -54,7 +56,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs =
-    [ x11 libXv freetype zlib mesa pkgconfig yasm ]
+    [ freetype zlib pkgconfig ]
+    ++ stdenv.lib.optional x11Support [ libX11 mesa ]
     ++ stdenv.lib.optional alsaSupport alsa
     ++ stdenv.lib.optional xvSupport libXv
     ++ stdenv.lib.optional theoraSupport libtheora
@@ -69,18 +72,32 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optional xvidSupport xvidcore
     ++ stdenv.lib.optional lameSupport lame;
 
+  buildNativeInputs = [ yasm ];
+
   configureFlags = ''
     ${if cacaSupport then "--enable-caca" else "--disable-caca"}
     ${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""}
     ${if x264Support then "--enable-x264 --extra-libs=-lx264" else ""}
     --codecsdir=${codecs}
     --enable-runtime-cpudetection
-    --enable-x11
+    ${if x11Support then "--enable-x11" else ""}
     --disable-xanim
     --disable-ivtv
   '';
 
-  NIX_LDFLAGS = "-lX11 -lXext";
+  NIX_LDFLAGS = if x11Support then "-lX11 -lXext" else "";
+
+  crossAttrs = {
+    preConfigure = ''
+      configureFlags="`echo $configureFlags |
+        sed -e 's/--build[^ ]\+//' \
+        -e 's/--host[^ ]\+//' \
+        -e 's/--codecsdir[^ ]\+//' \
+        -e 's/--enable-runtime-cpudetection//' `"
+      configureFlags="$configureFlags --target=${stdenv.cross.arch}-linux
+        --cc=$crossConfig-gcc --as=$crossConfig-as"
+    '';
+  };
 
   meta = {
     description = "A movie player that supports many video formats";

pkgs/applications/video/cinelerra/default.nix

@@ -1,6 +1,11 @@
-args:
-with args;
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, sourceFromHead, autoconf, automake, libtool
+, pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394
+, libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg
+, libtiff, freetype, mjpegtools, x264, gettext, openexr, esound 
+, libXxf86vm, libXv, libXi, libX11, xextproto, libtheora, libpng
+, libdv, nasm, perl, e2fsprogs }:
+        
+stdenv.mkDerivation {
   name = "cinelerra-git";
 
   # REGION AUTO UPDATE:    { name="cinelerra"; type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; }
@@ -8,35 +13,33 @@ args.stdenv.mkDerivation {
                (fetchurl { url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"; sha256 = "0b264e2a770d2257550c9a23883a060afcaff12293fe43828954e7373f5f4fb4"; });
   # END
 
-  perl = args.perl;
-
   # touch confi.rpath: work around bug in automake 1.10 ?
   preConfigure = ''
-    find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@$perl/bin/perl@" -i
+    find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@${perl}/bin/perl@" -i
     touch config.rpath
     ./autogen.sh
-    '';
-  configureOptions = ["--enable-freetype2"];
+  '';
+  
+  configureFlags = [ "--enable-freetype2" ];
 
-  buildInputs =(with args; [
-      automake
+  buildInputs =
+    [ automake
       autoconf libtool pkgconfig
       faad2 faac
       a52dec alsaLib   fftw lame libavc1394 libiec61883
       libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype
       mjpegtools x264 gettext openexr esound 
-      #
       libXxf86vm libXv libXi libX11 xextproto
       libtheora libpng libdv
       nasm
       perl
       e2fsprogs
-  ]);
+    ];
 
   meta = { 
-      description = "Cinelerra - Video Editor";
-      homepage = http://www.cinelerra.org;
-      maintainers = [lib.maintainers.marcweber];
-      license = "GPLv2";
+    description = "Cinelerra - Video Editor";
+    homepage = http://www.cinelerra.org;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    license = "GPLv2";
   };
 }

pkgs/applications/video/dvdauthor/default.nix

@@ -1,17 +1,18 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng }:
+
+stdenv.mkDerivation {
   name = "dvdauthor-0.6.14";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/dvdauthor/dvdauthor-0.6.14.tar.gz;
     sha256 = "1x4flj3ja7m8rbc956a6ha3qk0k6zxd1y6sl826r6r7dyc91a6yx";
   };
 
-  buildInputs =(with args; [imagemagick libdvdread libxml2 freetype fribidi libpng]);
+  buildInputs = [ imagemagick libdvdread libxml2 freetype fribidi libpng ];
 
   meta = { 
-      description = "Tools for generating DVD files to be played on standalone DVD players";
-      homepage = http://dvdauthor.sourceforge.net/;
-      license = ["GPLv2"];
+    description = "Tools for generating DVD files to be played on standalone DVD players";
+    homepage = http://dvdauthor.sourceforge.net/;
+    license = ["GPLv2"];
   };
 }

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

@@ -1,27 +0,0 @@
-
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = [ http://fabrice.bellard.free.fr/qemu/linux-0.2.img.bz2 http://bellard.org/qemu/linux-0.2.img.bz2];
-			sha256 = "08xlwy1908chpc4fsqy2v13zi25dapk0ybrd43fj95v67kdj5hj1";
-		};
-		buildInputs = [];
-		configureFlags = [];
-	};
-	in with localDefs;
-let 
-doCopy = fullDepEntry ("
-  ensureDir \$out/share/qemu-images
-  cp linux-0.2.img \$out/share/qemu-images/
-") [minInit doUnpack defEnsureDir];
-in
-stdenv.mkDerivation rec {
-	name = "QEmu-Linux-Image-0.2";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doCopy doForceShare doPropagate]);
-	meta = {
-		description = "Qemu sample image.";
-		inherit src;
-	};
-}

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

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "qemu-linux-image-0.2";
+
+  src = fetchurl {
+    url = http://wiki.qemu.org/download/linux-0.2.img.bz2;
+    sha256 = "08xlwy1908chpc4fsqy2v13zi25dapk0ybrd43fj95v67kdj5hj1";
+  };
+
+  unpackPhase = "true";
+
+  installPhase =
+    ''
+      ensureDir $out/share/qemu-images
+      bunzip2 < $src > $out/share/qemu-images/linux-0.2.img
+    '';
+
+  meta = {
+    description = "QEMU sample Linux disk image";
+  };
+}

pkgs/applications/virtualization/virtualbox/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, lib, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext
 , libXcursor, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
-, python, which, alsaLib, curl
+, python, which, alsaLib, curl, gawk
 }:
 
 stdenv.mkDerivation {
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
     sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \
            -e "s|@QT4_PATH@|${qt4}/lib|" \
 	   -e "s|which|${which}/bin/which|" \
-	   -e "s|awk|${stdenv.gawk}/bin/awk|" \
+	   -e "s|awk|${gawk}/bin/awk|" \
 	   $out/bin/VBox.sh
     chmod 755 $out/bin/VBox.sh
     for file in VirtualBox VBoxManage VBoxSDL

pkgs/applications/window-managers/awesome/default.nix

@@ -4,11 +4,11 @@
 , docbook_xml_dtd_45, libxslt, coreutils}:
 
 stdenv.mkDerivation rec {
-  name = "awesome-3.4.5";
+  name = "awesome-3.4.6";
  
   src = fetchurl {
-    url = http://awesome.naquadah.org/download/awesome-3.4.5.tar.xz;
-    sha256 = "124g6k4n2yf9shw3ig9lj1jdwiysfbj13mnjd38k22hqbj3yhnbi";
+    url = http://awesome.naquadah.org/download/awesome-3.4.6.tar.xz;
+    sha256 = "1bxym326pl32q5jsaqa7p785k8yviinzj0q1l42pdhiiq717zbwi";
   };
  
   buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango