Merged with trunk.

The following is autogenerated by git:

commit 9aaede75e73be646f35069d0717c8c70004ba3f0
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 18:37:23 2007 +0000

    This was needed for me to get a working gnome-doc-utils package

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:30:34 2007 +0000

    gdb upgraded

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit bb908853924046681d1cd6a85b05273aed14fd9f
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:29:11 2007 +0000

    gphoto2 upgraded to 2.4.0: all-packages.nix

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 619c7004d7140d6016927cd1114fd778aca3ecce
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:28:53 2007 +0000

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit f09310ed8403428021d2d751e273fc0add438032
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:28:17 2007 +0000

    gphoto2 upgraded to 2.4.0

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 26d5cc1628e51853fdb9a7d162361b3a13581461
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:27:27 2007 +0000

    missing catalog added. Now you can open files

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:09:32 2007 +0000

    nix expression creating startup wrapper for jedit

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 69701148e45d29b1712c9f14628459def54be076
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:06:53 2007 +0000

    The nice programmers editor jedit is now built on nix as well.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 15ecdd411e78b952d8004323ec871ce6c4969c2e
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:41:15 2007 +0000

    Missing gecko now.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6975eb6f2a972cca2adb2943190a41880e3bedf7
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:36:15 2007 +0000

    Fix path of libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:34:02 2007 +0000

    added libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7fb35510feb89fecc9d92810a723baead232dff4
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:33:36 2007 +0000

    added libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7a9eb1e172ef5b111556d78a30003a87aee7f775
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:24:24 2007 +0000

    libnotify is missing

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 433cc0578ce00860ddfac7d7934818ec0584f6e1
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:08:04 2007 +0000

    Added libsexy

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 194a84b18965e9a3c8f9fa1305fac57690e683cb
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:07:30 2007 +0000

    Added libsexy

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 1d832560cf94bfa6793d90ff43f2235415bc3958
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 13:49:02 2007 +0000

    Added openftd. Doesnt work (yet)

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 13:08:20 2007 +0000

    * GCC 3.4: pass --disable-multilib to make it build on x86_64.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 03:45:42 2007 +0000

    bzip2 dependency added in a couple of places

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 128ac8a7ee8668fc933f4933a66f491c44234379
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 23:47:03 2007 +0000

    Added python to libgsf dependencies

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 1847defee6331b03ba8a54ae9e3e68033310f7a2
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 17:05:45 2007 +0000

    * Use latest Nix.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit cb1992780c20cb5885cf4d3932e7352f8b912533
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 04:23:46 2007 +0000

    Added a currently more functional URL for libgcrypt

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 9d099dbef1a5721065bff5f2edd73844c829f538
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:16:03 2007 +0000

    facile: fixed a typo

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 031c5b7d0797f5eee7be0a06856530c29adee710
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:11:56 2007 +0000

    Added kde-4

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:08:58 2007 +0000

    Added new kde-4 staff

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 18edb608ee7822438d4b2dc2a76af7567efd646a
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:48:40 2007 +0000

    kde-4: removed old staff from kde-4 dir

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:46:48 2007 +0000

    lame: upgrade to 3.97

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 52f8f699f29b6def41eee392f489c7e8ecd9399d
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:44:21 2007 +0000

    libgsf: meta written

    0.14.7 in my previous commit was a typo: 1.14.7 of course

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:40:39 2007 +0000

    libgsf: upgraded to 0.14.7

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7787b342945cb13856168a353fdc9b0062e5f32b
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:37:51 2007 +0000

    clucene: upgrade, kde4: remove

    clucene-core upgraded to 0.9.20
    clucene-contrib removed (can't find any version later than 0.9.16a and don't
    know whether it's compatible with new clucene-core)
    kde4: old staff removed, will add new tonight

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit b4900dece179788dfb8879518b8ec639ba089980
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:25:32 2007 +0000

    Strigi removed

    I'll add a version from kdesupport trunk today

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ffad224993440be069d4f15cf5e73ed018979311
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:23:36 2007 +0000

    dbus-glib upgraded to 0.74, meta written

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:13:29 2007 +0000

    xine-lib: upgraded to 1.1.8

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:11:37 2007 +0000

    chmlib: upgraded to 0.39

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:05:11 2007 +0000

    Added facile library

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:03:29 2007 +0000

    libgcrypt-1.3.1

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ca314a236b855b73024677f6dc5bc021070c4e72
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:49:24 2007 +0000

    Fixed a typo in ocaml-3.10.0

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit b3fa79d09289ab61a30f63692e7c475d0aec142e
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:39:58 2007 +0000

    ocaml: Added 3.10.0, using getVersion staff

    I've added the latest (3.10.0) version of ocaml and let the user choose default
    version.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 853d65d8a9fd65f7bf918c42342baf6690008f54
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:22:06 2007 +0000

    Let user to choose python2.4 or python2.5

    Currently, there is some code duplication. I'll try to rewrite it without
    modifying resulting derivations.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 21:57:26 2007 +0000

    useVersion function added

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 21:41:01 2007 +0000

    git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit dd564f36bd54d4900aefa759bc94cfac7496d1a2
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 19:07:38 2007 +0000

    added small script fixing the shebang (#!/bin/...) path.
    It searches the PATH env variable for the same executable.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 2f9213e49fbaa40634ccb9699e44aec239212aea
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 01:20:17 2007 +0000

    Now SVN Nix builds as a purely alternative Nix choice

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 016b6bfcc67244964251d68d86e1fa6de2062e54
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Tue Nov 13 15:52:16 2007 +0000

    Added possibility to use non-default Nix.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 89f53d7b8dae8d4ec537322340be212602524102
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Tue Nov 13 01:26:54 2007 +0000

    implemented proposal by niksnut.
    Now you have to use either date= or tag= when specifying cvs revision

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:45:47 2007 +0000

    * Symlink $out/bin to $out/libexec.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit d454ab8861882e18ed3b79287727890ec6668455
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:42:13 2007 +0000

    Beta-version of builderDefs fixes.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 959e395c49753d902201d457cee102b40608d3f9
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:12:50 2007 +0000

    djview location corrected

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 52530f607a15017e94225ee50e2698963325ed80
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 13:51:46 2007 +0000

    * Revert the setup hook changes on the trunk (but they remain on the
      stdenv-updates branch).

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 977bdfec49557f48bc1e121e3375c21d4991434f
Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 13:48:33 2007 +0000

    * added Haskell package gtk2hs

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

svn path=/nixpkgs/branches/stdenv-updates/; revision=9727

17 files changed, 149 insertions, 111 deletions

diff --git a/pkgs/development/libraries/chmlib/builder.sh b/pkgs/development/libraries/chmlib/builder.sh
deleted file mode 100644
index ccdbfc17a767f..0000000000000
--- a/pkgs/development/libraries/chmlib/builder.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-source $stdenv/setup
-
-unpackCmd="tar xvfj $src"
-
-makeFlags="-f Makefile.simple CC=gcc LD=gcc INSTALLPREFIX=$out"
-
-postConfigure=postConfigure
-postConfigure() {
-    cd src
-}
-
-preInstall=preInstall
-preInstall() {
-    mkdir $out
-    mkdir $out/lib
-    mkdir $out/include
-}
-
-genericBuild
\ No newline at end of file
diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix
index 096f2e0e2295a..bd593aaea0a5a 100644
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/pkgs/development/libraries/chmlib/default.nix
@@ -1,9 +1,16 @@
-{stdenv, fetchurl}:
+args: with args;
 
-stdenv.mkDerivation {
-  name = "chmlib-0.38";
+stdenv.mkDerivation rec {
+  name = "chmlib-0.39";
   src = fetchurl {
-    url = http://66.93.236.84/~jedwin/projects/chmlib/chmlib-0.38.tar.bz2;
-    md5 = "d72661526aaea377ed30e9f58a086964";
+    url = "${meta.homepage}/${name}.tar.bz2";
+	sha256 = "0hgzw121ffmk79wbpkd0394y5ah99c3i85z6scp958mmkr25sc6j";
+  };
+
+  meta = {
+	  homepage = http://www.jedrea.com/chmlib;
+	  license = "LGPL";
+	  description = "CHLIB is a library for dealing with Microsoft ITSS/CHM
+	  format files";
   };
 }
diff --git a/pkgs/development/libraries/clucene-contrib/default.nix b/pkgs/development/libraries/clucene-contrib/default.nix
deleted file mode 100644
index 8938256dec462..0000000000000
--- a/pkgs/development/libraries/clucene-contrib/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, cluceneCore}:
-
-stdenv.mkDerivation {
-  name = "clucene-contrib-0.9.16a";
-
-  src = fetchurl {
-    url = ftp://ftp.chg.ru/pub/sourceforge/c/cl/clucene/clucene-contrib-0.9.16a.tar.bz2;
-    sha256 = "1apk867pggxsflhgvsnhcmy5vz2cvc1b914g4inkcj6s5vn1a1jx";
-  };
-  inherit cluceneCore;
-  buildInputs=[cluceneCore];
-  configureFlags = "--disable-static --with-clucene=${cluceneCore}";
-
-  meta = {
-    description = "CLucene is a port of the very popular Java Lucene text search engine API. Contrib package.";
-    homepage = http://clucene.sourceforge.net;
-  };
-}
diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix
index 3d5734d6c2d57..24e133a5de3c4 100644
--- a/pkgs/development/libraries/clucene-core/default.nix
+++ b/pkgs/development/libraries/clucene-core/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchurl }:
+args: with args;
+stdenv.mkDerivation rec {
+	name = "clucene-core-0.9.20";
 
-stdenv.mkDerivation {
-  name = "clucene-core-0.9.16a";
+	src = fetchurl {
+		url = "mirror://sf/clucene/${name}.tar.bz2";
+		sha256 = "1hwq3b4qp1dgygmypgpg3blj68wnksq2rbqkwyxvl5dldn12q7rg";
+	};
+	configureFlags = "--disable-static";
 
-  src = fetchurl {
-    url = ftp://ftp.chg.ru/pub/sourceforge/c/cl/clucene/clucene-core-0.9.16a.tar.bz2;
-    sha256 = "0hv7sp1lbicnj2984hiki8qwrvz5zwn1zhj6azhavgjklanhihjr";
-  };
-
-  meta = {
-    description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package.";
-    homepage = http://clucene.sourceforge.net;
-  };
-  configureFlags = "--disable-static";
+	meta = {
+		description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package.";
+		homepage = http://clucene.sourceforge.net;
+	};
 }
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index fb206f9a6f669..e72ca406509d8 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -1,12 +1,18 @@
-{stdenv, fetchurl, pkgconfig, gettext, dbus, glib, expat}:
+args: with args;
 
 stdenv.mkDerivation {
-  name = "dbus-glib-0.73";
+  name = "dbus-glib-0.74";
   src = fetchurl {
-    url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.73.tar.gz;
-    sha256 = "14ndjhbn6q4m7wrml8s57wghnjbm6a6fqb5jgazjxcn6748gkmyn";
+    url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.74.tar.gz;
+    sha256 = "1qmbnd9xgg7vahlfywd8sfd9yqhx8jdyczz3cshfsd4qc76xhw78";
   };
   inherit dbus glib;
   buildInputs = [pkgconfig gettext glib expat];
   propagatedBuildInputs = [dbus];
+
+  meta = {
+	  homepage = http://dbus.freedesktop.org;
+	  license = "AFL-2.1 or GPL-2";
+	  description = "GLib bindings for D-Bus lightweight IPC mechanism";
+  };
 }
diff --git a/pkgs/development/libraries/facile/default.nix b/pkgs/development/libraries/facile/default.nix
new file mode 100644
index 0000000000000..1890c6d0563c6
--- /dev/null
+++ b/pkgs/development/libraries/facile/default.nix
@@ -0,0 +1,19 @@
+args: with args;
+stdenv.mkDerivation rec {
+	name = "facile-1.1";
+	src = fetchurl {
+		url = "${meta.homepage}/distrib/${name}.tar.gz";
+		sha256 = "1jp59ankjds8mh4vm0b5h4fd1lcbfn0rd6n151cgh14ihsknnym8";
+	};
+	dontAddPrefix = 1;
+	patchPhase = "sed -e 's@mkdir@mkdir -p@' -i Makefile";
+	postConfigure = "make -C src .depend";
+	makeFlags = "FACILEDIR=\${out}/lib/ocaml/facile";
+	buildInputs = [ocaml];
+
+	meta = {
+		homepage = http://www.recherche.enac.fr/log/facile;
+		license = "LGPL";
+		description = "A Functional Constraint Library";
+	};
+}
diff --git a/pkgs/development/libraries/haskell/gtk2hs/default.nix b/pkgs/development/libraries/haskell/gtk2hs/default.nix
new file mode 100644
index 0000000000000..f4e3a02c73f86
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gtk2hs/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, pkgconfig, ghc, gtk, cairo, GConf, libglade
+, glib, libgtkhtml, gtkhtml}:
+
+stdenv.mkDerivation {
+  name = "gtk2hs-0.9.12.1";
+  src = fetchurl {
+    url = mirror://sourceforge/gtk2hs/gtk2hs-0.9.12.1.tar.gz;
+    sha256 = "110z6v9gzhg6nzlz5gs8aafmipbva6rc50b8z1jgq0k2g25hfy22";
+  };
+
+  buildInputs = [pkgconfig ghc gtk glib cairo GConf libglade libgtkhtml gtkhtml];
+
+ configureFlags = [
+    "--enable-cairo"
+  ];
+
+
+}
diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix
index 0a63ffda2afc6..76434d2c30bd7 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -1,12 +1,12 @@
-{stdenv, fetchurl}:
+args: with args;
 
-stdenv.mkDerivation {
-  name = "libexif-0.6.14";
+stdenv.mkDerivation rec {
+  name = "libexif-0.6.16";
 
   src = fetchurl {
-    url = mirror://sourceforge/libexif/libexif-0.6.14.tar.bz2;
-    sha256 = "0pza5ysvbvvliz7al2i8l3yai64w09xwc6ivy2v5cl7k43almz84";
+    url = "mirror://sourceforge/libexif/${name}.tar.bz2";
+    sha256 = "0hxc3aik3sn8xq4mbmxxb8ycx2lwffmhi5xvz0zjffhfwkaqas6v";
   };
 
-  patches = [./no-po.patch];
+  buildInputs = [gettext];
 }
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index bb71e8f8499c7..8ea05dc73a32b 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,10 +1,13 @@
-{stdenv, fetchurl, libgpgerror}:
+args: with args;
 
 stdenv.mkDerivation {
-  name = "libgcrypt-1.2.4";
+  name = "libgcrypt-1.3.1";
   src = fetchurl {
-    url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.2.4.tar.gz;
-    sha256 = "1v6rbx2jpwvh9jwf8n91da2p66v2gzmym6s3h1fidfdy7qqkyg6g";
+    urls = [
+      ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.3.1.tar.bz2
+      ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/libgcrypt-1.3.1.tar.bz2
+    ];
+    sha256 = "0ip0bjhnn12lvb050j91x64wfhmpk7xlc3p93mxi9g2qczg413nz";
   };
 
   buildInputs = [libgpgerror];
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 78372330a94f1..6e332117a2db4 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -1,14 +1,15 @@
-{stdenv, fetchurl, pkgconfig, libusb}:
+args: with args;
 
-stdenv.mkDerivation {
-  name = "libgphoto2-2.2.1";
+stdenv.mkDerivation rec {
+  name = "libgphoto2-2.4.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/gphoto/libgphoto2-2.2.1.tar.bz2;
-    md5 = "69827311733e39fafa9f77bb05e55b77";
+    url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
+    sha256 = "0yfvpgfly774jnjrfqjf89h99az3sgvzkfpb9diygpk8hmx6phhd";
   };
-  buildInputs = [pkgconfig libusb];
+  buildInputs = [pkgconfig libusb libtool libexif libjpeg gettext];
 
-  ## remove this patch when 2.2.2 is released
-  patches = [./libgphoto2-2.2.1.patch];
+  meta = {
+	  license = "LGPL-2";
+  };
 }
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 41f946e6606c4..6131314a22cda 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -1,10 +1,17 @@
-{stdenv, fetchurl, perl, perlXMLParser, pkgconfig, libxml2, glib, gettext}:
+args: with args;
 
-stdenv.mkDerivation {
-  name = "libgsf-1.14.1";
+stdenv.mkDerivation rec {
+  name = "libgsf-1.14.7";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/gnome/sources/libgsf/1.14/libgsf-1.14.1.tar.bz2;
-    md5 = "00de00b99382d0b7e034e0fffd8951d4";
+    url = "http://ftp.gnome.org/pub/gnome/sources/libgsf/1.14/${name}.tar.bz2";
+	sha256 = "0vd8arjaavb3qywd9cm2gdn6ngrlyd99nlsj72par8fm60k48bhq";
+  };
+  buildInputs = [perl perlXMLParser pkgconfig libxml2 glib gettext bzip2
+  gnomevfs libbonobo python];
+
+  meta = {
+	  homepage = http://www.gnome.org/projects/libgsf;
+	  license = "LGPL";
+	  description = "GNOME Structured File Library";
   };
-  buildInputs = [perl perlXMLParser pkgconfig libxml2 glib gettext];
 }
diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix
new file mode 100644
index 0000000000000..42747db95a1b4
--- /dev/null
+++ b/pkgs/development/libraries/libnotify/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl
+, pkgconfig, dbus, dbus_glib
+, gtk, glib
+}:
+ 
+stdenv.mkDerivation {
+  name = "libnotify-0.4.4";
+  #builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.4.4.tar.gz;
+    sha256 = "2389a9b8220f776033f728a8d46352cfee5c8705066e34887bfb188f9f0d3856";
+  };
+
+  buildInputs = [
+    pkgconfig dbus dbus_glib gtk glib
+  ];
+
+  configureFlags="";
+}
diff --git a/pkgs/development/libraries/libsexy/default.nix b/pkgs/development/libraries/libsexy/default.nix
new file mode 100644
index 0000000000000..81a38d3997351
--- /dev/null
+++ b/pkgs/development/libraries/libsexy/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk, pango
+}:
+ 
+stdenv.mkDerivation {
+  name = "libsexy-0.1.11";
+  #builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.11.tar.gz;
+    sha256 = "8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e";
+  };
+
+  buildInputs = [ pkgconfig libxml2 glib gtk pango
+  ];
+
+  #configureFlags="";  
+}
diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index 13723fdeb85d3..630eb44753bb7 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -1,10 +1,9 @@
-{stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2}:
-
+args: with args;
 stdenv.mkDerivation {
   name = "libwpd-0.8.5";
   src = fetchurl {
     url = mirror://sourceforge/libwpd/libwpd-0.8.5.tar.gz;
     md5 = "6b679e205a2805c3d23f41c65b35e266";
   };
-  buildInputs = [pkgconfig glib libgsf libxml2];
+  buildInputs = [pkgconfig glib libgsf libxml2 bzip2];
 }
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index e1dbc274aeda7..a4f09612f9b56 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,4 +1,4 @@
-args: with args; stdenv.mkDerivation {
+{stdenv, fetchurl, perl}: stdenv.mkDerivation {
   name = "openssl-0.9.8g";
   builder = ./builder.sh;
   src = fetchurl {
@@ -6,5 +6,4 @@ args: with args; stdenv.mkDerivation {
     sha256 = "1w0wj3pgg9ga0hay3jdxs9sl17bfw307b6qvkxn735fy8ml8h9hf";
   };
   buildInputs = [perl];
-  propagatedBuildInputs = [gmp];
 }
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
deleted file mode 100644
index 85f21652b53a6..0000000000000
--- a/pkgs/development/libraries/strigi/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, zlib, bzip2, expat, pkgconfig, cluceneCore, cluceneContrib,
-qt, cmake, dbus, libxml2, perl }:
-
-stdenv.mkDerivation {
-  name = "strigi-0.5.3dev";
-
-  src = fetchurl {
-    url = http://repo.calcforge.org/f8/strigi-0.5.3.tar.bz2;
-    sha256 = "0rv7l2s4r022hrsw3jw0pvxh0yzlaw53jhmjxi3cbi6mdvc1y2sv";
-  };
-
-  patchPhase="sed -e 's/ iconv / /' -i ../cmake/FindIconv.cmake;
-  export CLUCENE_HOME=${cluceneCore}";
-  buildInputs = [zlib cluceneCore cluceneContrib expat bzip2 pkgconfig qt cmake
-  stdenv.gcc.libc dbus libxml2 perl];
-
-  meta = {
-    description = "Strigi is a fast and light desktop search engine";
-  };
-}
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 191fa13c0ce06..738b21741b5df 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -12,11 +12,11 @@ assert encryptedDVDSupport -> libdvdcss != null;
 assert alsaSupport -> alsaLib != null;
 
 (stdenv.mkDerivation {
-  name = "xine-lib-1.1.7";
+  name = "xine-lib-1.1.8";
   builder = ./builder.sh;
   src = fetchurl {
-    url = mirror://sourceforge/xine/xine-lib-1.1.7.tar.bz2;
-    sha256 = "1aycmhvq95gbb5mqw5skgcxyn4nh5qkzq21yclnqk5yzflpwwvvg";
+    url = mirror://sourceforge/xine/xine-lib-1.1.8.tar.bz2;
+    sha256 = "03iwhgsf9kj0x5b4fgv7lzc1vj3frk4afh2idgrqskvixjyi37vc";
   };
   buildInputs = [
     x11