ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

Merged with trunk.

Browse Source 
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
This commit is contained in:
Yury G. Kudryashov 2007-11-16 21:05:15 +00:00
parent 71353ce929
commit 8792fb81c7
97 changed files with 1501 additions and 608 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/audio/ladspa-plugins/default.nix
View File

@ -17,7 +17,8 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "swh-plugins-0.4.15"; name = "swh-plugins-0.4.15";
builder = writeScript "swh-plugins-0.4.15-builder" builder = writeScript "swh-plugins-0.4.15-builder"
(textClosure [doConfigure doMakeInstall postInstall doForceShare]); (textClosure [doConfigure doMakeInstall
postInstall doForceShare]);
meta = { meta = {
description = " description = "
LADSPA format audio plugins. LADSPA format audio plugins.

6
pkgs/applications/audio/lame/default.nix
View File

@ -1,9 +1,9 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "lame-3.96.1"; name = "lame-3.97";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/lame/lame-3.96.1.tar.gz ; url = mirror://sourceforge/lame/lame-3.97.tar.gz ;
md5 = "e1206c46a5e276feca11a7149e2fc6ac" ; sha256 = "05xy9lv6m9s013lzlvhxwvr1586c239xaiiwka52k18hs6k388qa";
}; };
} }

28
pkgs/applications/jedit/default.nix Normal file
View File

@ -0,0 +1,28 @@
args:
args.stdenv.mkDerivation {
name = "jedit-4.2";
src = args.fetchurl {
url = http://kent.dl.sourceforge.net/sourceforge/jedit/jedit42source.tar.gz;
sha256 = "1ckqghsw2r30kfkqfgjl4k47gdwpz8c1h85haw0y0ymq4rqh798j";
};
phases = "unpackPhase buildPhase";
buildPhase = "
sed -i 's/\\<SplashScreen\\>/org.gjt.sp.jedit.gui.SplashScreen/g' org/gjt/sp/jedit/GUIUtilities.java
ant dist
ensureDir $out/lib
cp jedit.jar $out/lib
ensureDir \$out/lib/modes
cp modes/catalog \$out/lib/modes
";
buildInputs =(with args; [ant]);
meta = {
description = "really nice programmers editor written in Java. Give it a try";
homepage = http://sourceforge.net/project/showfiles.php?group_id=588;
license = "GPL";
};
}

18
pkgs/applications/jedit/wrapper.nix Normal file
View File

@ -0,0 +1,18 @@
args:
args.stdenv.mkDerivation {
name = args.jedit.name+"_startscript";
java = args.jre+"/bin/java";
jeditjar = args.jedit+"/lib/jedit.jar";
phases = "buildPhase";
buildPhase = "
ensureDir \$out/bin
cat > \$out/bin/${args.jedit.name} << EOF
#!/bin/sh
exec $java -jar $jeditjar \\$*
EOF
chmod +x \$out/bin/${args.jedit.name}
";
}

14
pkgs/applications/misc/gphoto2/default.nix
View File

@ -1,10 +1,12 @@
{stdenv, fetchurl, pkgconfig, libgphoto2, libexif, popt}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gphoto2-2.2.0"; name = "gphoto2-2.4.0";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/gphoto/gphoto2-2.2.0.tar.bz2; url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
md5 = "f5c1f83185db598b4ca52889964a5e84"; sha256 = "1rf4w5m35dsi8dkwwnh4wg70xivdi9j79f2dy3rq90p1v8sar9ca";
}; };
buildInputs = [pkgconfig libgphoto2 libexif popt]; buildInputs = [pkgconfig libgphoto2 libexif popt gettext];
# There is a bug in 2.4.0 configure.ac (in their m4 macroses)
patchPhase = "sed -e 's@_tmp=true@_tmp=false@' -i configure configure.ac";
} }

2
pkgs/applications/misc/synergy/default.nix
View File

@ -5,7 +5,7 @@ args.stdenv.mkDerivation {
src = args.fetchcvs { src = args.fetchcvs {
url = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2"; url = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2";
module = "synergy"; module = "synergy";
tag = "-DNOW"; date = "NOW";
sha256 = "ef8e2ebfda6e43240051a7af9417092b2af50ece8b5c6c3fbd908ba91c4fe068"; sha256 = "ef8e2ebfda6e43240051a7af9417092b2af50ece8b5c6c3fbd908ba91c4fe068";
}; };

6
pkgs/applications/networking/browsers/elinks/default.nix
View File

@ -8,11 +8,7 @@ stdenv.mkDerivation {
sha256 = "c10e657fbd884eae4f01b91b32407bbfcbcae0ad5017fb24ea365aebc71d2af1"; sha256 = "c10e657fbd884eae4f01b91b32407bbfcbcae0ad5017fb24ea365aebc71d2af1";
}; };
preConfigure = " buildInputs = [python perl ncurses x11 bzip2 zlib openssl spidermonkey guile];
touch config.log ; rm /tmp/elinks.config.log; ln -f config.log /tmp/elinks.config.log";
buildInputs = [python perl ncurses x11 bzip2 zlib openssl spidermonkey guile
libtool];
configureFlags = "--enable-finger --enable-html-highlight --with-guile configureFlags = "--enable-finger --enable-html-highlight --with-guile
--with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent
--enable-nntp --with-openssl=${openssl}"; --enable-nntp --with-openssl=${openssl}";

21
pkgs/applications/version-management/git/default.nix
View File

@ -1,16 +1,21 @@
{stdenv, fetchurl, curl, openssl, zlib, expat, perl}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "git-1.5.1.2"; name = "git-1.5.3.5";
src = fetchurl { src = fetchurl {
url = mirror://kernel/software/scm/git/git-1.5.1.2.tar.bz2; url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
sha256 = "0a7nnw9631h6nxk7sny0cjv89qlibilvsm6947620vr2kgc6p6k2"; sha256 = "0ab63s25wzmsl5inp7bykz5ac7xjilqa0ciaz7ydhciymz6gkawj";
}; };
buildInputs = [curl openssl zlib expat]; buildInputs = [curl openssl zlib expat];
preBuild = " makeFlags="prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}";
makeFlagsArray=(prefix=$out PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell})
"; meta = {
license = "GPL2";
homepage = http://git.or.cz;
description = "A popular version control system designed to handle very
large projects with speed and efficiency";
};
} }

13
pkgs/build-support/fetchcvs/builder.sh
View File

@ -1,8 +1,5 @@
source $stdenv/setup source $stdenv/setup
if test -z "$tag"; then
tag="-DNOW"
fi
# creating the export drictory and checking out there only to be able to # creating the export drictory and checking out there only to be able to
# move the content without the root directory into $out ... # move the content without the root directory into $out ...
# cvs -f -d "$url" export $tag -d "$out" "$module" # cvs -f -d "$url" export $tag -d "$out" "$module"
@ -10,6 +7,16 @@ fi
# See als man Page for those options # See als man Page for those options
ensureDir $out export ensureDir $out export
set -x
if [ -n "$tag" ]; then
tag="-r $tag"
else
if [ -n "$date" ]; then
tag="-D $date"
else
tag="-D NOW"
fi
fi
cd export; cvs -f -d "$url" export $tag "$module" cd export; cvs -f -d "$url" export $tag "$module"
mv */* $out mv */* $out

12
pkgs/build-support/fetchcvs/default.nix
View File

@ -1,13 +1,13 @@
# example tags: # example tags:
# "-DNOW" (get current version) # date="2007-20-10"; (get the last version before given date)
# "-D2007-20-10" (get the last version before given date) # tag="<tagname>" (get version by tag name)
# "-r <tagname>" (get version by tag name) # If you don't specify neither one date="NOW" will be used (get latest)
{stdenv, cvs, nix}: {url, module, tag, sha256}:
{stdenv, cvs, nix}: {url, module, tag ? null, date ? null, sha256}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cvs-export"; name = "cvs-export";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [cvs nix]; buildInputs = [cvs nix];
inherit url module sha256 tag date;
inherit url module tag sha256;
} }

2
pkgs/desktops/gnome/default.nix
View File

@ -210,7 +210,7 @@ rec {
gnomedocutils = import ./gnome-doc-utils.nix { gnomedocutils = import ./gnome-doc-utils.nix {
inherit stdenv fetchurl pkgconfig perl perlXMLParser python inherit stdenv fetchurl pkgconfig perl perlXMLParser python
libxml2 libxslt gettext; libxml2 libxslt gettext libxml2Python;
input = desktop.gnomedocutils; input = desktop.gnomedocutils;
}; };

17
pkgs/desktops/gnome/gnome-doc-utils.nix
View File

@ -1,7 +1,4 @@
{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, python args: with args;
, libxml2, libxslt, gettext
}:
# !!! xml2po needs to store the path to libxml2 # !!! xml2po needs to store the path to libxml2
stdenv.mkDerivation { stdenv.mkDerivation {
@ -9,8 +6,18 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
pkgconfig perl perlXMLParser python pkgconfig perl perlXMLParser python
libxml2 libxslt gettext libxml2 libxslt gettext python libxml2Python
]; ];
configureFlags = "--disable-scrollkeeper"; configureFlags = "--disable-scrollkeeper";
postInstall = "
mv \$out/bin/xml2po \$out/bin/.xml2po.orig
pythonPathLibXml2=\"\$(toPythonPath ${libxml2Python})\"
echo -e '#! ${stdenv.shell}\nPYTHONPATH=$PYTHONPATH:'\"\$( toPythonPath \$out )"+
":\${pythonPathLibXml2//python2.5/python2.4}"+
":\$( toPythonPath ${libxml2Python} )\""+
"' \$(dirname \$0)/.xml2po.orig \"\$@\"' > \$out/bin/xml2po;
chmod a+x \$out/bin/xml2po
";
} }

11
pkgs/desktops/kde-4/kdebase/builder.sh → pkgs/desktops/kde-4/base/builder.sh
View File

@ -1,21 +1,12 @@
source ${stdenv}/setup source ${stdenv}/setup
myPreBuild()
{
for i in ${qt}/include/*; do
NIX_CFLAGS_COMPILE="-I$i ${NIX_CFLAGS_COMPILE}"
done;
echo "${NIX_CFLAGS_COMPILE}"
}
preBuild=myPreBuild
myPatchPhase() myPatchPhase()
{ {
echo "Fixing dbus calls in CMakeLists.txt files" echo "Fixing dbus calls in CMakeLists.txt files"
# Trailing slash in sed is essential # Trailing slash in sed is essential
find .. -name CMakeLists.txt \ find .. -name CMakeLists.txt \
| xargs sed -e "s@\${DBUS_INTERFACES_INSTALL_DIR}/@${kdelibs}/share/dbus-1/interfaces/@" -i | xargs sed -e "s@\${DBUS_INTERFACES_INSTALL_DIR}/@${kdelibs}/share/dbus-1/interfaces/@" -i
sed -e '/^#define HAS_RANDR_1_2 1$/d' -i ../workspace/kcontrol/randr/randr.h #sed -e '/^#define HAS_RANDR_1_2 1$/d' -i ../workspace/kcontrol/randr/randr.h
} }
patchPhase=myPatchPhase patchPhase=myPatchPhase
genericBuild genericBuild

14
pkgs/desktops/kde-4/base/default.nix Normal file
View File

@ -0,0 +1,14 @@
args: with args;
stdenv.mkDerivation {
name = "kdebase-4.0beta4";
#builder = ./builder.sh;
src = fetchurl {
url = mirror://kde/unstable/3.95/src/kdebase-3.95.0.tar.bz2;
sha256 = "0qf7bn5jqj70hznjk74vpwb7rvk6f5gx9fxwli930b2hskib3zll";
};
propagatedBuildInputs = [kdepimlibs libusb];
inherit kdelibs;
}

11
pkgs/desktops/kde-4/decibel/default.nix Normal file
View File

@ -0,0 +1,11 @@
args: with args;
stdenv.mkDerivation {
name = "decibel-0.5.0";
src = fetchurl {
url = http://decibel.kde.org/fileadmin/downloads/decibel/releases/decibel-0.5.0.tar.gz;
sha256 = "07visasid4mpzm0ba5j9qy0lxxb6451lvbr2gnc1vzfvjagffqz4";
};
buildInputs = [kdelibs kdebase ];
}

35
pkgs/desktops/kde-4/default.nix Normal file
View File

@ -0,0 +1,35 @@
args:
rec {
fullargs = args // { kdelibs = libs; kdepimlibs = pimlibs; kdebase = base; kderuntime = runtime; };
libs = import ./libs (args // { kdesupport = support; });
pimlibs = import ./pimlibs (args // { kdelibs = libs; });
graphics = import ./graphics (fullargs // { kdeworkspace = workspace; } );
multimedia = import ./multimedia (fullargs // { kdeworkspace = workspace; } );
toys = import ./toys (fullargs // { kdeworkspace = workspace; } );
network = import ./network (fullargs // { kdeworkspace = workspace; } );
utils = import ./utils (fullargs // { kdeworkspace = workspace; } );
games = import ./games (fullargs // { kdeworkspace = workspace; } );
edu = import ./edu (fullargs // { kdeworkspace = workspace; } );
base = import ./base fullargs;
runtime = import ./runtime fullargs;
workspace = import ./workspace fullargs;
extragear_plasma = import ./extragear (fullargs // { kdeworkspace = workspace; });
support = import ./support args;
decibel = import ./decibel fullargs;
pim = import ./pim (fullargs // {kdeworkspace = workspace; });
env = with args; runCommand "kde-env"
{
KDEDIRS = lib.concatStringsSep ":" ([ libs pimlibs graphics multimedia
toys network utils games edu base runtime workspace extragear_plasma pim] ++
support.all);
scriptName = "echo-kde-dirs";
}
"
ensureDir \${out}/bin
scriptPath=\${out}/bin/\${scriptName}
echo \"#!/bin/sh\" > \${scriptPath}
echo \"echo -n export KDEDIRS=\${KDEDIRS}\" >> \${scriptPath}
chmod +x \${scriptPath}
";
}

20
pkgs/desktops/kde-4/edu/default.nix Normal file
View File

@ -0,0 +1,20 @@
args: with args;
stdenv.mkDerivation rec {
name = "kdeedu-4.0beta4";
src = fetchurl {
url = mirror://kde/unstable/3.95/src/kdeedu-3.95.0.tar.bz2;
sha256 = "0cydl3pp3l0cbfmf774qh8njyhycaf8yxb27k4xf6mipvw1k9jqf";
};
buildInputs = [kdelibs kdepimlibs kdeworkspace boost readline openbabel ocaml
libusb facile python];
myCmakeFiles = ./myCmakeFiles;
patchPhase = "
cp ${myCmakeFiles}/* ../cmake/modules
sed -e 's@+facile@\${LIBFACILE_INCLUDE_DIR}@' -i \\
../kalzium/src/CMakeOCamlInstructions.cmake
";
configureFlags = "--debug-trycompile";
}

38
pkgs/desktops/kde-4/edu/myCmakeFiles/CheckBoostAndPythonCompatible.cmake Normal file
View File

@ -0,0 +1,38 @@
include(CheckCXXSourceCompiles)
include(CheckIncludeFileCXX)
include(CheckLibraryExists)
MACRO(check_boost_and_python_compatible
_bo_inc _bo_ld _bo_py_lib
_py_inc _py_ld _py_lib)
set(_save_CXX_FLAGS ${CMAKE_CXX_FLAGS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
set(CMAKE_REQUIRED_FLAGS "-L${_bo_ld} -L${_py_ld}")
set(CMAKE_REQUIRED_INCLUDES ${_py_inc} ${_bo_inc})
set(CMAKE_REQUIRED_LIBRARIES ${_bo_py_lib} ${_py_lib})
check_cxx_source_compiles("
#include <boost/python.hpp>
const char* greet() { return \"Hello world!\"; }
BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); }
int main() { return 0; }
// some vars, in case of the compilation fail...
// python include dir: ${_py_inc}
// python lib: ${_py_lib}
//
// boost python lib: ${_bo_py_lib}
// boost include dir: ${_bo_inc}
// boost lib dir: ${_bo_ld}
//
"
BOOST_PYTHON_${_bo_inc}_${_bo_ld}_${_bo_py_lib}_${_py_inc}_${_py_ld}_${_py_lib}_COMPATIBLE )
set(CMAKE_REQUIRED_FLAGS)
set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES)
set(CMAKE_CXX_FLAGS ${_save_CXX_FLAGS})
ENDMACRO(check_boost_and_python_compatible)

90
pkgs/desktops/kde-4/edu/myCmakeFiles/FindBoostPython.cmake Normal file
View File

@ -0,0 +1,90 @@
# - Try to find the a valid boost+python combination
# Once done this will define
#
# Boost_PYTHON_FOUND - system has a valid boost+python combination
# BOOST_PYTHON_INCLUDES - the include directory for boost+python
# BOOST_PYTHON_LIBS - the needed libs for boost+python
# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
# Already in cache, be silent
set(Boost_PYTHON_FIND_QUIETLY TRUE)
endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
SET(Boost_PYTHON_LIB_SUFFIXES "-mt" "-gcc-mt")
SET(Boost_KNOWN_VERSIONS "-1_34_1" "-1_34_0" "-1_33_1" "-1_33_0")
FIND_PACKAGE(Boost)
INCLUDE(PythonLibsUtils)
INCLUDE(CheckBoostAndPythonCompatible)
IF(Boost_FOUND AND Boost_LIBRARY_DIRS)
SET(Boost_PYTHON_LIB_NAMES boost_python)
FOREACH(_suffix ${Boost_PYTHON_LIB_SUFFIXES})
set(Boost_PYTHON_LIB_NAMES ${Boost_PYTHON_LIB_NAMES}
boost_python${_suffix})
FOREACH(_bo_ver ${Boost_KNOWN_VERSIONS})
set(Boost_PYTHON_LIB_NAMES ${Boost_PYTHON_LIB_NAMES}
boost_python${_suffix}${_bo_ver})
ENDFOREACH(_bo_ver)
ENDFOREACH(_suffix)
SET(_found FALSE)
FOREACH(_boost_python_lib ${Boost_PYTHON_LIB_NAMES})
IF(NOT _found)
FIND_LIBRARY(Boost_PYTHON_LIB_FULLPATH
NAME ${_boost_python_lib}
PATHS ${Boost_LIBRARY_DIRS}
NO_DEFAULT_PATH
)
IF(Boost_PYTHON_LIB_FULLPATH)
SET(Boost_PYTHON_LIB ${_boost_python_lib})
SET(_found TRUE)
ENDIF(Boost_PYTHON_LIB_FULLPATH)
ENDIF(NOT _found)
ENDFOREACH(_boost_python_lib)
IF(Boost_PYTHON_LIB)
SET(_found FALSE)
FOREACH(_py_ver ${PYTHON_KNOWN_VERSIONS})
if (NOT _found)
python_find_version(${_py_ver} _py_inc _py_ld _py_lib)
IF(PYTHON_REQ_VERSION_FOUND)
MESSAGE(STATUS " ${Boost_INCLUDE_DIRS} ${Boost_LIBRARY_DIRS} ${Boost_PYTHON_LIB} ${_py_inc} ${_py_ld} ${_py_lib}")
check_boost_and_python_compatible(
"${Boost_INCLUDE_DIRS}" "${Boost_LIBRARY_DIRS}"
"${Boost_PYTHON_LIB}" "${_py_inc}" "${_py_ld}"
"${_py_lib}")
SET(_found
BOOST_PYTHON_${Boost_INCLUDE_DIRS}_${Boost_LIBRARY_DIRS}_${Boost_PYTHON_LIB}_${_py_inc}_${_py_ld}_${_py_lib}_COMPATIBLE)
IF(BOOST_PYTHON_${Boost_INCLUDE_DIRS}_${Boost_LIBRARY_DIRS}_${Boost_PYTHON_LIB}_${_py_inc}_${_py_ld}_${_py_lib}_COMPATIBLE)
SET(BOOST_PYTHON_INCLUDES ${Boost_INCLUDE_DIRS} ${_py_inc})
SET(BOOST_PYTHON_LIBS "-l${_py_lib} -L${_py_ld} -l${Boost_PYTHON_LIB}")
SET(BOOST_PYTHON_FOUND TRUE)
SET(_found TRUE)
ENDIF(BOOST_PYTHON_${Boost_INCLUDE_DIRS}_${Boost_LIBRARY_DIRS}_${Boost_PYTHON_LIB}_${_py_inc}_${_py_ld}_${_py_lib}_COMPATIBLE)
ENDIF(PYTHON_REQ_VERSION_FOUND)
ENDIF(NOT _found)
ENDFOREACH(_py_ver)
ENDIF(Boost_PYTHON_LIB)
ENDIF(Boost_FOUND AND Boost_LIBRARY_DIRS)
if(BOOST_PYTHON_FOUND)
if(NOT BoostPython_FIND_QUIETLY)
message(STATUS "Found Boost+Python: ${BOOST_PYTHON_INCLUDES} ${BOOST_PYTHON_LIBS}")
endif(NOT BoostPython_FIND_QUIETLY)
set(KIG_ENABLE_PYTHON_SCRIPTING 1)
else (BOOST_PYTHON_FOUND)
if (BoostPython_FIND_REQUIRED)
message(FATAL_ERROR "Could NOT find Boost+Python")
endif(BoostPython_FIND_REQUIRED)
set(KIG_ENABLE_PYTHON_SCRIPTING 0)
endif(BOOST_PYTHON_FOUND)
mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS)

45
pkgs/desktops/kde-4/edu/myCmakeFiles/FindLibfacile.cmake Normal file
View File

@ -0,0 +1,45 @@
# - Try to find Libfacile
# Once done this will define
#
# LIBFACILE_FOUND - system has Libfacile
# LIBFACILE_INCLUDE_DIR - the Libfacile include directory
# LIBFACILE_LIBRARIES - Link these to use Libfacile
# LIBFACILE_DEFINITIONS - Compiler switches required for using Libfacile
#
# Copyright (c) 2006, Carsten Niehaus, <cniehaus@gmx.de>
# Copyright (c) 2006, Montel Laurent, <montel@kde.org>
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
find_package(OCaml)
set(LIBFACILE_FOUND FALSE)
if( OCAML_FOUND )
find_file(LIBFACILE_LIBRARIES NAME facile.a
PATHS ${OCAMLC_DIR} ENV CMAKE_LIBRARY_PATH
PATH_SUFFIXES facile ocaml/facile
)
message(STATUS "LIBFACILE_LIBRARIES :<${LIBFACILE_LIBRARIES}>")
if (LIBFACILE_LIBRARIES)
get_filename_component(LIBFACILE_INCLUDE_DIR ${LIBFACILE_LIBRARIES} PATH)
message(STATUS "LIBFACILE_INCLUDE_DIR <${LIBFACILE_INCLUDE_DIR}>")
set(LIBFACILE_FOUND TRUE)
endif(LIBFACILE_LIBRARIES)
endif(OCAML_FOUND)
if(LIBFACILE_FOUND)
if(NOT Libfacile_FIND_QUIETLY)
message(STATUS "Found Libfacile: ${LIBFACILE_LIBRARIES}")
endif(NOT Libfacile_FIND_QUIETLY)
else(LIBFACILE_FOUND)
if(Libfacile_FIND_REQUIRED)
message(FATAL_ERROR "Could not find Libfacile")
endif(Libfacile_FIND_REQUIRED)
endif(LIBFACILE_FOUND)
# show the LIBFACILE_INCLUDE_DIR and LIBFACILE_LIBRARIES variables only in the advanced view
mark_as_advanced(LIBFACILE_INCLUDE_DIR LIBFACILE_LIBRARIES )

46
pkgs/desktops/kde-4/edu/myCmakeFiles/PythonLibsUtils.cmake Normal file
View File

@ -0,0 +1,46 @@
SET(PYTHON_KNOWN_VERSIONS "2.5" "2.4" "2.3" "2.2" "2.1" "2.0" "1.6" "1.5")
MACRO(python_find_version _py_ver _py_inc _py_ld _py_lib)
STRING(REPLACE "." "" _py_ver_nd "${_py_ver}")
SET(PY_INSTALL_PATH
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_py_ver}\\InstallPath])
SET(_py_libnames "python${_py_ver}" "python${_py_ver_nd}")
SET(_py_found FALSE)
FOREACH(_py_libname ${_py_libnames})
IF (NOT _py_found)
SET(_py_lib_full _py_lib_full-NOTFOUND)
FIND_LIBRARY(_py_lib_full
NAMES "${_py_libname}"
PATHS "${PY_INSTALL_PATH}/libs"
NO_SYSTEM_ENVIRONMENT_PATH
)
FIND_LIBRARY(_py_lib_full
NAMES "${_py_libname}"
PATHS "${PY_INSTALL_PATH}/libs"
PATH_SUFFIXES "python${_py_ver}/config"
NO_SYSTEM_ENVIRONMENT_PATH
)
IF(_py_lib_full)
SET(_py_lib "${_py_libname}")
GET_FILENAME_COMPONENT(_py_ld "${_py_lib_full}" PATH)
SET(_py_found TRUE)
ENDIF(_py_lib_full)
ENDIF(NOT _py_found)
ENDFOREACH(_py_libname)
IF(_py_found)
FIND_PATH(_py_inc
NAMES Python.h
PATHS
${PY_INSTALL_PATH}/include
PATH_SUFFIXES
"python${_py_ver}"
)
ENDIF(_py_found)
SET(PYTHON_REQ_VERSION_FOUND ${_py_found})
ENDMACRO(python_find_version)

14
pkgs/desktops/kde-4/extragear/default.nix Normal file
View File

@ -0,0 +1,14 @@
args: with args;
stdenv.mkDerivation {
name = "extragear-plasma-4.0beta4";
src = fetchurl {
url = mirror://kde/unstable/3.95/src/extragear-plasma-3.95.0.tar.bz2;
sha256 = "1nzfy34ig66gfpgv6kbcmcap13axcy7kvj43srbd0ic6a0giv283";
};
buildInputs = [ kdeworkspace kdebase ];
patchPhase = "
sed -e 's@<Plasma@<KDE/Plasma@' -i ../applets/*/*.h";
}

12
pkgs/desktops/kde-4/games/default.nix Normal file
View File

@ -0,0 +1,12 @@
args: with args;
stdenv.mkDerivation {
name = "kdegames-4.0beta4";
src = fetchurl {
url = mirror://kde/unstable/3.95/src/kdegames-3.95.0.tar.bz2;
sha256 = "1zsfslnazl8gmiq51y5d16svv7p92yvs2zsz13zg7zpwy4afxzbp";
};
buildInputs = [kdelibs kdepimlibs kdeworkspace];
}

13
pkgs/desktops/kde-4/graphics/default.nix Normal file
View File

@ -0,0 +1,13 @@
args: with args;
stdenv.mkDerivation {
name = "kdegraphics-4.0beta4";
src = fetchurl {
url = mirror://kde/unstable/3.95/src/kdegraphics-3.95.0.tar.bz2;
sha256 = "0mfsadv9ihhw6s7pcy1yabc21px47nzfs34c76n1888qb09m5dfw";
};
buildInputs = [kdelibs kdepimlibs kdeworkspace libgphoto2 saneBackends
djvulibre exiv2 poppler chmlib];
}

55
pkgs/desktops/kde-4/kdebase/default.nix
View File

@ -1,55 +0,0 @@
{ stdenv, fetchurl
, inputproto, kbproto, scrnsaverproto, xextproto, xf86miscproto
, xf86vidmodeproto, xineramaproto, xproto
, libICE
, libX11
, libXau
, libXcomposite
, libXcursor
, libXdamage
, libXdmcp
, libXext
, libXfixes
, libXft
, libXi
, libXinerama
, libXpm
, libXrandr
, libXrender
, libXScrnSaver
, libXt
, libXtst
, libXv
, libXxf86misc
, libxkbfile
, zlib, perl, qt, openssl, pcre
, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
, freetype, bzip2, strigi, cmake, shared_mime_info, alsaLib, libungif
, libusb, glib, mesa
, cups, kdelibs, kdepimlibs
}:
stdenv.mkDerivation {
name = "kdebase-4.0beta1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://kde/unstable/3.92/src/kdebase-3.92.0.tar.bz2;
sha256 = "1xh5a93l6anmix358fll4xfqm5fl4hpm1ksmlab8hr8s7vqng707";
};
buildInputs = [
inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto
xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor
libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr
libXinerama mesa stdenv.gcc.libc
libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile
zlib perl qt openssl pcre
pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
libtool freetype bzip2 strigi cmake shared_mime_info alsaLib libungif cups
kdelibs kdepimlibs libusb glib
];
# TODO : it should be done through setup-hooks
KDEDIRS="${kdelibs}/share/apps:${kdepimlibs}/share/apps";
inherit qt kdelibs;
}

48
pkgs/desktops/kde-4/kdelibs/default.nix
View File

@ -1,48 +0,0 @@
{ stdenv, fetchurl
, inputproto, kbproto, scrnsaverproto, xextproto, xf86miscproto
, xf86vidmodeproto, xineramaproto, xproto
, libICE
, libX11
, libXau
, libXcomposite
, libXcursor
, libXdamage
, libXdmcp
, libXext
, libXfixes
, libXft
, libXi
, libXpm
, libXrandr
, libXrender
, libXScrnSaver
, libXt
, libXtst
, libXv
, libXxf86misc
, libxkbfile
, zlib, perl, qt, openssl, pcre
, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
, freetype, bzip2, strigi, cmake, shared_mime_info, alsaLib, libungif
, cups
}:
stdenv.mkDerivation {
name = "kdelibs-4.0beta1";
src = fetchurl {
url = mirror://kde/unstable/3.92/src/kdelibs-3.92.0.tar.bz2;
sha256 = "19jd9nx5g0ayxavj3ys52wx5ppxw9yr9jylxk7qplxsm525ryf1p";
};
buildInputs = [
inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto
xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor
libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr
libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile
zlib perl qt openssl pcre
pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
libtool freetype bzip2 strigi cmake shared_mime_info alsaLib libungif cups
];
patchPhase = "sed -e 's@ NO_SYSTEM_PATH@@g' -i ../cmake/modules/FindX11.cmake";
}

18
pkgs/desktops/kde-4/kdepim/builder.sh
View File

@ -1,18 +0,0 @@
source ${stdenv}/setup
myPreBuild()
{
for i in ${qt}/include/*; do
NIX_CFLAGS_COMPILE="-I$i ${NIX_CFLAGS_COMPILE}"
done;
echo "${NIX_CFLAGS_COMPILE}"
}
preBuild=myPreBuild
myPatchPhase()
{
sed -e '3s/)/ ${CMAKE_MODULE_PATH})/' -i ../CMakeLists.txt
}
patchPhase=myPatchPhase
genericBuild

55
pkgs/desktops/kde-4/kdepim/default.nix
View File

@ -1,55 +0,0 @@
{ stdenv, fetchurl
, inputproto, kbproto, scrnsaverproto, xextproto, xf86miscproto
, xf86vidmodeproto, xineramaproto, xproto
, libICE
, libX11
, libXau
, libXcomposite
, libXcursor
, libXdamage
, libXdmcp
, libXext
, libXfixes
, libXft
, libXi
, libXinerama
, libXpm
, libXrandr
, libXrender
, libXScrnSaver
, libXt
, libXtst
, libXv
, libXxf86misc
, libxkbfile
, zlib, perl, qt, openssl, pcre
, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
, freetype, bzip2, strigi, cmake, shared_mime_info, alsaLib, libungif
, libusb, glib, mesa, gpgme, boost
, cups, kdelibs, kdepimlibs
}:
stdenv.mkDerivation {
name = "kdepim-4.0beta1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://kde/unstable/3.92/src/kdepim-3.92.0.tar.bz2;
sha256 = "1wlq1h7j07f24n1mjnv9wbfsxn2vn24qfn5dgn4j4fsl84qha16i";
};
buildInputs = [
inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto
xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor
libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr
libXinerama mesa stdenv.gcc.libc
libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile
zlib perl qt openssl pcre
pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
libtool freetype bzip2 strigi cmake shared_mime_info alsaLib libungif cups
kdelibs kdepimlibs libusb glib gpgme boost
];
# TODO : it should be done through setup-hooks
KDEDIRS="${kdelibs}/share/apps:${kdepimlibs}/share/apps";
inherit qt kdelibs;
}

48
pkgs/desktops/kde-4/kdepimlibs/default.nix
View File

@ -1,48 +0,0 @@
{ stdenv, fetchurl
, inputproto, kbproto, scrnsaverproto, xextproto, xf86miscproto
, xf86vidmodeproto, xineramaproto, xproto
, libICE
, libX11
, libXau
, libXcomposite
, libXcursor
, libXdamage
, libXdmcp
, libXext
, libXfixes
, libXft
, libXi
, libXpm
, libXrandr
, libXrender
, libXScrnSaver
, libXt
, libXtst
, libXv
, libXxf86misc
, libxkbfile
, zlib, perl, qt, openssl, pcre
, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
, freetype, bzip2, strigi, cmake, shared_mime_info, alsaLib, libungif
, cups, kdelibs, boost, gpgme
}:
stdenv.mkDerivation {
name = "kdepimlibs-4.0beta1";
src = fetchurl {
url = mirror://kde/unstable/3.92/src/kdepimlibs-3.92.0.tar.bz2;
sha256 = "0q7zzj8n282xaxvdij74fb17w5c1vja7izxfrkcbq7arn9f40wbx";
};
buildInputs = [
inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto
xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor
libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr
libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile
zlib perl qt openssl pcre
pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
libtool freetype bzip2 strigi cmake shared_mime_info alsaLib libungif cups
kdelibs boost gpgme
];
}

74
pkgs/desktops/kde-4/libs/FindIlmBase.cmake Normal file
View File

@ -0,0 +1,74 @@
# Try to find the IlmBase libraries
# This check defines:
#
# ILMBASE_FOUND - system has IlmBase
# ILMBASE_INCLUDE_DIR - IlmBase include directory
# ILMBASE_LIBRARIES - Libraries needed to use IlmBase
#
# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
# Copyright (c) 2007, Yury G. Kudryashov, <urkud.urkud@gmail.com>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
if (ILMBASE_INCLUDE_DIR AND ILMBASE_LIBRARIES)
# in cache already
SET(ILMBASE_FOUND TRUE)
else (ILMBASE_INCLUDE_DIR AND ILMBASE_LIBRARIES)
IF (NOT WIN32)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
INCLUDE(UsePkgConfig)
PKGCONFIG(IlmBase _IlmBaseIncDir _IlmBaseLinkDir _IlmBaseLinkFlags _IlmBaseCflags)
ENDIF (NOT WIN32)
FIND_PATH(ILMBASE_INCLUDE_DIR ImathBox.h
${_IlmBaseIncDir}
${_IlmBaseIncDir}/OpenEXR/
)
FIND_LIBRARY(ILMBASE_HALF_LIBRARY NAMES Half
PATHS
${_IlmBaseLinkDir}
NO_DEFAULT_PATH
)
FIND_LIBRARY(ILMBASE_HALF_LIBRARY NAMES Half )
FIND_LIBRARY(ILMBASE_IEX_LIBRARY NAMES Iex
PATHS
${_IlmBaseLinkDir}
NO_DEFAULT_PATH
)
FIND_LIBRARY(ILMBASE_IEX_LIBRARY NAMES Iex )
FIND_LIBRARY(ILMBASE_IMATH_LIBRARY NAMES Imath
PATHS
${_IlmBaseLinkDir}
NO_DEFAULT_PATH
)
FIND_LIBRARY(ILMBASE_IMATH_LIBRARY NAMES Imath )
if (ILMBASE_INCLUDE_DIR AND ILMBASE_IMATH_LIBRARY AND ILMBASE_IEX_LIBRARY AND ILMBASE_HALF_LIBRARY)
set(ILMBASE_FOUND TRUE)
set(ILMBASE_LIBRARIES ${ILMBASE_IMATH_LIBRARY} ${ILMBASE_IEX_LIBRARY} ${ILMBASE_HALF_LIBRARY} CACHE STRING "The libraries needed to use IlmBase")
endif (ILMBASE_INCLUDE_DIR AND ILMBASE_IMATH_LIBRARY AND ILMBASE_IEX_LIBRARY AND ILMBASE_HALF_LIBRARY)
if (ILMBASE_FOUND)
if (NOT IlmBase_FIND_QUIETLY)
message(STATUS "Found ILMBASE: ${ILMBASE_LIBRARIES}")
endif (NOT IlmBase_FIND_QUIETLY)
else (ILMBASE_FOUND)
if (IlmBase_FIND_REQUIRED)
message(FATAL_ERROR "Could NOT find ILMBASE")
endif (IlmBase_FIND_REQUIRED)
endif (ILMBASE_FOUND)
MARK_AS_ADVANCED(
ILMBASE_INCLUDE_DIR
ILMBASE_LIBRARIES
ILMBASE_IMATH_LIBRARY
ILMBASE_IEX_LIBRARY
ILMBASE_HALF_LIBRARY )
endif (ILMBASE_INCLUDE_DIR AND ILMBASE_LIBRARIES)

68
pkgs/desktops/kde-4/libs/FindOpenEXR.cmake Normal file
View File

@ -0,0 +1,68 @@
# Try to find the OpenEXR libraries
# This check defines:
#
# OPENEXR_FOUND - system has OpenEXR
# OPENEXR_INCLUDE_DIR - OpenEXR include directory
# OPENEXR_LIBRARIES - Libraries needed to use OpenEXR
#
# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
# Copyright (c) 2007, Yury G. Kudryashov, <urkud.urkud@gmail.com>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
if (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)
# in cache already
SET(OPENEXR_FOUND TRUE)
else (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)
FIND_PACKAGE(IlmBase)
IF (NOT ILMBASE_FOUND)
SET(OPENEXR_FOUND FALSE)
ELSE (NOT ILMBASE_FOUND)
IF (NOT WIN32)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
INCLUDE(UsePkgConfig)
PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflags)
ENDIF (NOT WIN32)
FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h
${_OpenEXRIncDir}
${_OpenEXRIncDir}/OpenEXR/
)
FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf
PATHS
${_OpenEXRLinkDir}
NO_DEFAULT_PATH
)
FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf )
if (OPENEXR_INCLUDE_DIR AND OPENEXR_ILMIMF_LIBRARY)
set(OPENEXR_FOUND TRUE)
set(OPENEXR_LIBRARIES ${ILMBASE_LIBRARIES} ${OPENEXR_ILMIMF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR")
set(OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_DIR} ${ILMBASE_INCLUDE_DIR})
endif (OPENEXR_INCLUDE_DIR AND OPENEXR_ILMIMF_LIBRARY)
ENDIF (NOT ILMBASE_FOUND)
if (OPENEXR_FOUND)
if (NOT OpenEXR_FIND_QUIETLY)
message(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}")
endif (NOT OpenEXR_FIND_QUIETLY)
else (OPENEXR_FOUND)
if (OpenEXR_FIND_REQUIRED)
message(FATAL_ERROR "Could NOT find OPENEXR")
endif (OpenEXR_FIND_REQUIRED)
endif (OPENEXR_FOUND)
MARK_AS_ADVANCED(
OPENEXR_INCLUDE_DIR
OPENEXR_LIBRARIES
OPENEXR_ILMIMF_LIBRARY
OPENEXR_IMATH_LIBRARY
OPENEXR_IEX_LIBRARY
OPENEXR_HALF_LIBRARY )
endif (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)

27
pkgs/desktops/kde-4/libs/default.nix Normal file
View File

@ -0,0 +1,27 @@
args: with args;
stdenv.mkDerivation rec {
name = "kdelibs-4.0beta4";
src = fetchurl {
url = mirror://kde/unstable/3.95/src/kdelibs-3.95.0.tar.bz2;
sha256 = "0960880wvwrj68r35knqjjxbqq90xzy1lqv526zyaymp7jc24ybc";
};
propagatedBuildInputs = [
cmake inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto
xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor
libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr
libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile zlib
perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
libtool freetype bzip2 shared_mime_info alsaLib libungif cups
gettext enchant openexr aspell stdenv.gcc.libc
] ++ kdesupport.all;
patchPhase = "cp ${findIlmBase} ../cmake/modules/FindIlmBase.cmake;
cp $findOpenEXR ../cmake/modules/FindOpenEXR.cmake;
sed -e 's@Soprano/DummyModel@Soprano/Util/DummyModel@' -i ../nepomuk/core/resourcemanager.cpp;";
findIlmBase = ./FindIlmBase.cmake;
findOpenEXR = ./FindOpenEXR.cmake;
setupHook=./setup.sh;
}

5
pkgs/desktops/kde-4/libs/setup.sh Executable file
View File

@ -0,0 +1,5 @@
addKDEDIRS()
{
addToSearchPath KDEDIRS /share/kde4 /. $1
}
envHooks=(${envHooks[@]} addKDEDIRS)

13
pkgs/desktops/kde-4/multimedia/default.nix Normal file
View File

@ -0,0 +1,13 @@
args: with args;
stdenv.mkDerivation {
name = "kdemultimedia-4.0beta4";
src = fetchurl {
url = mirror://kde/unstable/3.95/src/kdemultimedia-3.95.0.tar.bz2;
sha256 = "0vjk5gpn45fh7hm982jw1frd7fr0grff96ksmh29wnkc160rh8va";
};
buildInputs = [kdelibs kdepimlibs kdeworkspace libogg flac cdparanoia lame
libvorbis];
}

12
pkgs/desktops/kde-4/network/default.nix Normal file
View File

@ -0,0 +1,12 @@
args: with args;
stdenv.mkDerivation {
name = "kdenetwork-4.0beta4";
src = fetchurl {
url = mirror://kde/unstable/3.95/src/kdenetwork-3.95.0.tar.bz2;
sha256 = "118r55aw0pag78kawjfn3vya7aca12n5ypknm1i4khxs747hxqbr";
};
buildInputs = [kdelibs kdepimlibs kdeworkspace sqlite libidn];
}

10
pkgs/desktops/kde-4/pim/builder.sh Executable file
View File

@ -0,0 +1,10 @@
source ${stdenv}/setup
myPatchPhase()
{
# They reset CMAKE_MODULE_PATH, not adding to the existing
sed -e '3s/)/ ${CMAKE_MODULE_PATH})/' -i ../CMakeLists.txt
}
patchPhase=myPatchPhase
genericBuild

15
pkgs/desktops/kde-4/pim/default.nix Normal file
View File

@ -0,0 +1,15 @@
args: with args;
stdenv.mkDerivation {
name = "kdepim-4.0beta4";
src = fetchurl {
url = mirror://kde/unstable/3.95/src/kdepim-3.95.0.tar.bz2;
sha256 = "0gzvm4h6ij7i119apmh9w82raygahr18bl0i9m3ynf2mcca0aq94";
};
buildInputs = [libXinerama mesa stdenv.gcc.libc alsaLib kdelibs kdepimlibs
kdeworkspace libusb glib];
qt4BadIncludes = true;
inherit qt kdelibs;
}

12
pkgs/desktops/kde-4/pimlibs/default.nix Normal file
View File

@ -0,0 +1,12 @@
args: with args;
stdenv.mkDerivation {
name = "kdepimlibs-4.0beta4";
src = fetchurl {
url = mirror://kde/unstable/3.95/src/kdepimlibs-3.95.0.tar.bz2;
sha256 = "1dhn5x3k9myqfymv6ry84v0zm2qwxnrlm1vdlllfvmgbm5nz34mg";
};
propagatedBuildInputs = [kdelibs boost gpgme cyrus_sasl openldap];
}

12
pkgs/desktops/kde-4/runtime/builder.sh Executable file
View File

@ -0,0 +1,12 @@
source ${stdenv}/setup
myPatchPhase()
{
echo "Fixing dbus calls in CMakeLists.txt files"
# Trailing slash in sed is essential
find .. -name CMakeLists.txt \
| xargs sed -e "s@\${DBUS_INTERFACES_INSTALL_DIR}/@${kdelibs}/share/dbus-1/interfaces/@" -i
#sed -e '/^#define HAS_RANDR_1_2 1$/d' -i ../workspace/kcontrol/randr/randr.h
}
patchPhase=myPatchPhase
genericBuild

15
pkgs/desktops/kde-4/runtime/default.nix Normal file
View File

@ -0,0 +1,15 @@
args: with args;
stdenv.mkDerivation {
name = "kdebase-runtime-4.0beta4";
builder = ./builder.sh;
src = fetchurl {
url = mirror://kde/unstable/3.95/src/kdebase-runtime-3.95.0.tar.bz2;
sha256 = "1s4fhbz7gpdxmvlr20c7n6cvcb9sn0qxigzpljsxw9524w177ksr";
};
propagatedBuildInputs = [kdepimlibs libusb kdebase xineLib];
inherit kdelibs;
}

13
pkgs/desktops/kde-4/support/akode.nix Normal file
View File

@ -0,0 +1,13 @@
args: with args;
stdenv.mkDerivation {
name = "akode-2.0.0dev";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akode;
rev = 732646;
md5 = "6629ffedc42c020d2e8645910a4efdf5";
};
buildInputs = [ cmake qt openssl gettext cyrus_sasl alsaLib ];
}

36
pkgs/desktops/kde-4/support/default.nix Normal file
View File

@ -0,0 +1,36 @@
args:
rec {
qca = (import ./qca.nix) args;
akode = (import ./akode.nix) args;
gmm = (import ./gmm.nix) args;
eigen = (import ./eigen.nix) args;
taglib = (import ./taglib.nix) args;
soprano = (import ./soprano.nix) args;
strigi = (import ./strigi.nix) args;
qimageblitz = (import ./qimageblitz.nix) args;
all = [qca gmm eigen taglib soprano strigi qimageblitz];
}
#args: with args;
#
#stdenv.mkDerivation {
# name = "kdesupport-4.0svn-r729462";
#
# src = fetchsvn {
# url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport;
# rev = 729462;
# md5 = "aa50ec8e5c8d49e1dfd53143345cb4b3";
# };
#
# propagatedBuildInputs = [
# exiv2
# cmake inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto
# xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor
# libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr
# libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile zlib
# perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
# libtool freetype bzip2 shared_mime_info alsaLib libungif cups
# gettext cluceneCore redland stdenv.gcc.libc dbus bison cppunit
# ];
# CLUCENE_HOME=cluceneCore;
# patchPhase = "sed -e '/set(qca_PLUGINSDIR/s@\${QT_PLUGINS_DIR}@\${CMAKE_INSTALL_PREFIX}/plugins@' -i ../qca/CMakeLists.txt";
#}

13
pkgs/desktops/kde-4/support/eigen.nix Normal file
View File

@ -0,0 +1,13 @@
args: with args;
stdenv.mkDerivation {
name = "eigen-1.0.5";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/eigen;
rev = 732646;
md5 = "f91ad5d3dd992984fb61107fd9050a36";
};
buildInputs = [ cmake ];
}

13
pkgs/desktops/kde-4/support/gmm.nix Normal file
View File

@ -0,0 +1,13 @@
args: with args;
stdenv.mkDerivation {
name = "gmm-svn";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/gmm;
rev = 732646;
md5 = "09ee4cfcbb3c428bc681c2da022648bf";
};
buildInputs = [ cmake ];
}

15
pkgs/desktops/kde-4/support/qca.nix Normal file
View File

@ -0,0 +1,15 @@
args: with args;
stdenv.mkDerivation {
name = "qca-2.0.0dev";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca;
rev = 732646;
md5 = "1df54bf3bf327b14ea1948f9080717c3";
};
buildInputs = [ cmake qt openssl gettext cyrus_sasl libgcrypt gnupg ];
patchPhase = "sed -e '/set(qca_PLUGINSDIR/s@\${QT_PLUGINS_DIR}@\${CMAKE_INSTALL_PREFIX}/plugins@' -i ../CMakeLists.txt";
}

13
pkgs/desktops/kde-4/support/qimageblitz.nix Normal file
View File

@ -0,0 +1,13 @@
args: with args;
stdenv.mkDerivation {
name = "qimageblitz-4.0.0svn";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qimageblitz;
rev = 732646;
md5 = "c37fa505368071ec501e966225e30c78";
};
buildInputs = [cmake qt];
}

14
pkgs/desktops/kde-4/support/soprano.nix Normal file
View File

@ -0,0 +1,14 @@
args: with args;
stdenv.mkDerivation {
name = "soprano-1.9.0svn";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/soprano;
rev = 732646;
md5 = "c3b43544536f0f8061e4afeb9e368072";
};
CLUCENE_HOME=cluceneCore;
buildInputs = [ cmake qt cluceneCore redland ];
}

15
pkgs/desktops/kde-4/support/strigi.nix Normal file
View File

@ -0,0 +1,15 @@
args: with args;
stdenv.mkDerivation {
name = "strigi-svn";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi;
rev = 732646;
md5 = "15762f5a406ef84bc1cdd776b2ca9a82";
};
CLUCENE_HOME=cluceneCore;
buildInputs = [ cmake zlib cluceneCore bzip2 libxml2 qt dbus
log4cxx stdenv.gcc.libc exiv2 bison cppunit perl ];
}

13
pkgs/desktops/kde-4/support/taglib.nix Normal file
View File

@ -0,0 +1,13 @@
args: with args;
stdenv.mkDerivation {
name = "taglib-1.4svn";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib;
rev = 732646;
md5 = "647d68a76858cf3a667656c486b0a8c2";
};
buildInputs = [ cmake zlib ];
}

12
pkgs/desktops/kde-4/toys/default.nix Normal file
View File

@ -0,0 +1,12 @@
args: with args;
stdenv.mkDerivation {
name = "kdetoys-4.0beta4";
src = fetchurl {
url = mirror://kde/unstable/3.95/src/kdetoys-3.95.0.tar.bz2;
sha256 = "0qg9ns640v21sa837pg5basnw8clnkyxap2lm7s69ainsg69662v";
};
buildInputs = [kdelibs kdepimlibs kdeworkspace];
}

13
pkgs/desktops/kde-4/utils/default.nix Normal file
View File

@ -0,0 +1,13 @@
args: with args;
stdenv.mkDerivation {
name = "kdeutils-4.0beta4";
src = fetchurl {
url = mirror://kde/unstable/3.95/src/kdeutils-3.95.0.tar.bz2;
sha256 = "1b8jvdy83qwhnfwqxzx96bxnaxss25psazifymyb0z4ynkqmadlh";
};
buildInputs = [kdelibs kdepimlibs kdeworkspace gmp libzip python ];
# TODO : tpctl
}

12
pkgs/desktops/kde-4/workspace/builder.sh Executable file
View File

@ -0,0 +1,12 @@
source ${stdenv}/setup
myPatchPhase()
{
echo "Fixing dbus calls in CMakeLists.txt files"
# Trailing slash in sed is essential
find .. -name CMakeLists.txt \
| xargs sed -e "s@\${DBUS_INTERFACES_INSTALL_DIR}/@${kdelibs}/share/dbus-1/interfaces/@" -i
sed -e '/^#define HAS_RANDR_1_2 1$/d' -i ../kcontrol/randr/randr.h
}
patchPhase=myPatchPhase
genericBuild

15
pkgs/desktops/kde-4/workspace/default.nix Normal file
View File

@ -0,0 +1,15 @@
args: with args;
stdenv.mkDerivation {
name = "kdebase-workspace-4.0beta4";
builder = ./builder.sh;
src = fetchurl {
url = mirror://kde/unstable/3.95/src/kdebase-workspace-3.95.0.tar.bz2;
sha256 = "0jripmw8vgs7lxlsif552rr9vqps5kav8jdlfyhmr9c3xw5c99v0";
};
buildInputs = [kdelibs kdepimlibs kdebase kderuntime stdenv.gcc.libc];
inherit kdelibs;
}

12
pkgs/development/compilers/gcc-3.4/builder.sh
View File

@ -37,22 +37,10 @@ fi
preConfigure=preConfigure preConfigure=preConfigure
preConfigure() { preConfigure() {
# Determine the frontends to build.
langs="c"
if test -n "$langCC"; then
langs="$langs,c++"
fi
if test -n "$langF77"; then
langs="$langs,f77"
fi
# Perform the build in a different directory. # Perform the build in a different directory.
mkdir ../build mkdir ../build
cd ../build cd ../build
configureScript=../$sourceRoot/configure configureScript=../$sourceRoot/configure
configureFlags="--enable-languages=$langs $configureFlags"
} }

19
pkgs/development/compilers/gcc-3.4/default.nix
View File

@ -5,6 +5,8 @@
assert langC; assert langC;
with import ../../../lib;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gcc-3.4.6"; name = "gcc-3.4.6";
builder = ./builder.sh; builder = ./builder.sh;
@ -15,7 +17,22 @@ stdenv.mkDerivation {
patches = if noSysDirs then [./no-sys-dirs.patch] else []; patches = if noSysDirs then [./no-sys-dirs.patch] else [];
inherit noSysDirs langC langCC langF77 profiledCompiler; inherit noSysDirs profiledCompiler;
configureFlags = "
--disable-multilib
--with-system-zlib
--enable-languages=${
concatStrings (intersperse ","
( optional langC "c"
++ optional langCC "c++"
++ optional langF77 "f77"
)
)
}
";
passthru = { inherit langC langCC langF77; };
meta = { meta = {
homepage = "http://gcc.gnu.org/"; homepage = "http://gcc.gnu.org/";

2
pkgs/development/compilers/ocaml/ocaml-3.08.0.nix → pkgs/development/compilers/ocaml/3.08.0.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, x11}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-3.08.0"; name = "ocaml-3.08.0";

2
pkgs/development/compilers/ocaml/ocaml-3.09.1.nix → pkgs/development/compilers/ocaml/3.09.1.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, x11, ncurses}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-3.09.1"; name = "ocaml-3.09.1";

23
pkgs/development/compilers/ocaml/3.10.0.nix Normal file
View File

@ -0,0 +1,23 @@
args: with args;
stdenv.mkDerivation rec {
name = "ocaml-3.10.0";
src = fetchurl {
url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2";
sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
};
prefixKey = "-prefix ";
configureFlags = ["-no-tk" "-x11lib" x11];
buildFlags = "world bootstrap world.opt";
buildInputs = [x11 ncurses];
installTargets = "install installopt";
patchPhase = "
CAT=$(type -tp cat)
sed -e \"s@/bin/cat@\${CAT}@\" -i config/auto-aux/sharpbang
";
meta = {
homepage = http://caml.inria.fr/ocaml;
license = "QPL, LGPL2 (library part)";
desctiption = "Most popular variant of the Caml language";
};
}

8
pkgs/development/compilers/ocaml/default.nix
View File

@ -1 +1,7 @@
import ./ocaml-3.09.1.nix args:
rec {
default = v_3_09_1;
v_3_08_0 = import ./3.08.0.nix (args // {stdenv = args.stdenv34;});
v_3_09_1 = import ./3.09.1.nix args;
v_3_10_0 = import ./3.10.0.nix (args // {stdenv = args.stdenvUsingSetupNew2;});
}

4
pkgs/development/interpreters/perl/setup-hook.sh
View File

@ -1,5 +1,7 @@
addPerlLibPath () { addPerlLibPath () {
addToSearchPath PERL5LIB /lib/site_perl "" $1 if test -d $1/lib/site_perl; then
export PERL5LIB="${PERL5LIB}${PERL5LIB:+:}$1/lib/site_perl"
fi
} }
envHooks=(${envHooks[@]} addPerlLibPath) envHooks=(${envHooks[@]} addPerlLibPath)

52
pkgs/development/interpreters/python/2.4.nix Normal file
View File

@ -0,0 +1,52 @@
{stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2}:
assert zlibSupport -> zlib != null;
with stdenv.lib;
let
buildInputs =
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
[bzip2] ++
optional zlibSupport zlib;
in
stdenv.mkDerivation {
name = "python-2.4.4";
src = fetchurl {
url = http://www.python.org/ftp/python/2.4.4/Python-2.4.4.tar.bz2;
md5 = "0ba90c79175c017101100ebf5978e906";
};
patches = [
# Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
./search-path.patch
];
inherit buildInputs;
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
configureFlags = "--enable-shared";
preConfigure = "
# Purity.
for i in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace $i /no-such-path
done
";
postInstall = "
ensureDir $out/nix-support
cp ${./setup-hook.sh} $out/nix-support/setup-hook
rm -rf $out/lib/python2.4/test
";
passthru = {
inherit zlibSupport;
libPrefix = "python2.4";
};
}

5
pkgs/development/interpreters/python/2.5/setup-hook.sh
View File

@ -1,5 +1,8 @@
addPythonPath() { addPythonPath() {
addToSearchPathWithCustomDelimiter : PYTHONPATH /lib/python2.5/site-packages "" $1 local p=$1/lib/python2.5/site-packages
if test -d $p; then
export PYTHONPATH="${PYTHONPATH}${PYTHONPATH:+:}$p"
fi
} }
toPythonPath() { toPythonPath() {

55
pkgs/development/interpreters/python/default.nix
View File

@ -1,52 +1,5 @@
{stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2}: args: rec {
default = v_2_4;
assert zlibSupport -> zlib != null; v_2_4 = import ./2.4.nix args;
v_2_5 = import ./2.5 args;
with stdenv.lib;
let
buildInputs =
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
[bzip2] ++
optional zlibSupport zlib;
in
stdenv.mkDerivation {
name = "python-2.4.4";
src = fetchurl {
url = http://www.python.org/ftp/python/2.4.4/Python-2.4.4.tar.bz2;
md5 = "0ba90c79175c017101100ebf5978e906";
};
patches = [
# Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
./search-path.patch
];
inherit buildInputs;
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
configureFlags = "--enable-shared";
preConfigure = "
# Purity.
for i in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace $i /no-such-path
done
";
postInstall = "
ensureDir $out/nix-support
cp ${./setup-hook.sh} $out/nix-support/setup-hook
rm -rf $out/lib/python2.4/test
";
passthru = {
inherit zlibSupport;
libPrefix = "python2.4";
};
} }

5
pkgs/development/interpreters/python/setup-hook.sh
View File

@ -1,5 +1,8 @@
addPythonPath() { addPythonPath() {
addToSearchPathWithCustomDelimiter : PYTHONPATH /lib/python2.4/site-packages "" $1 local p=$1/lib/python2.4/site-packages
if test -d $p; then
export PYTHONPATH="${PYTHONPATH}${PYTHONPATH:+:}$p"
fi
} }
toPythonPath() { toPythonPath() {

19
pkgs/development/libraries/chmlib/builder.sh
View File

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

17
pkgs/development/libraries/chmlib/default.nix
View File

@ -1,9 +1,16 @@
{stdenv, fetchurl}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "chmlib-0.38"; name = "chmlib-0.39";
src = fetchurl { src = fetchurl {
url = http://66.93.236.84/~jedwin/projects/chmlib/chmlib-0.38.tar.bz2; url = "${meta.homepage}/${name}.tar.bz2";
md5 = "d72661526aaea377ed30e9f58a086964"; sha256 = "0hgzw121ffmk79wbpkd0394y5ah99c3i85z6scp958mmkr25sc6j";
};
meta = {
homepage = http://www.jedrea.com/chmlib;
license = "LGPL";
description = "CHLIB is a library for dealing with Microsoft ITSS/CHM
format files";
}; };
} }

18
pkgs/development/libraries/clucene-contrib/default.nix
View File

@ -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;
};
}

25
pkgs/development/libraries/clucene-core/default.nix
View File

@ -1,16 +1,15 @@
{ stdenv, fetchurl }: args: with args;
stdenv.mkDerivation rec {
name = "clucene-core-0.9.20";
stdenv.mkDerivation { src = fetchurl {
name = "clucene-core-0.9.16a"; url = "mirror://sf/clucene/${name}.tar.bz2";
sha256 = "1hwq3b4qp1dgygmypgpg3blj68wnksq2rbqkwyxvl5dldn12q7rg";
};
configureFlags = "--disable-static";
src = fetchurl { meta = {
url = ftp://ftp.chg.ru/pub/sourceforge/c/cl/clucene/clucene-core-0.9.16a.tar.bz2; description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package.";
sha256 = "0hv7sp1lbicnj2984hiki8qwrvz5zwn1zhj6azhavgjklanhihjr"; homepage = http://clucene.sourceforge.net;
}; };
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";
} }

14
pkgs/development/libraries/dbus-glib/default.nix
View File

@ -1,12 +1,18 @@
{stdenv, fetchurl, pkgconfig, gettext, dbus, glib, expat}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "dbus-glib-0.73"; name = "dbus-glib-0.74";
src = fetchurl { src = fetchurl {
url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.73.tar.gz; url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.74.tar.gz;
sha256 = "14ndjhbn6q4m7wrml8s57wghnjbm6a6fqb5jgazjxcn6748gkmyn"; sha256 = "1qmbnd9xgg7vahlfywd8sfd9yqhx8jdyczz3cshfsd4qc76xhw78";
}; };
inherit dbus glib; inherit dbus glib;
buildInputs = [pkgconfig gettext glib expat]; buildInputs = [pkgconfig gettext glib expat];
propagatedBuildInputs = [dbus]; propagatedBuildInputs = [dbus];
meta = {
homepage = http://dbus.freedesktop.org;
license = "AFL-2.1 or GPL-2";
description = "GLib bindings for D-Bus lightweight IPC mechanism";
};
} }

19
pkgs/development/libraries/facile/default.nix Normal file
View File

@ -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";
};
}

18
pkgs/development/libraries/haskell/gtk2hs/default.nix Normal file
View File

@ -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"
];
}

12
pkgs/development/libraries/libexif/default.nix
View File

@ -1,12 +1,12 @@
{stdenv, fetchurl}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "libexif-0.6.14"; name = "libexif-0.6.16";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/libexif/libexif-0.6.14.tar.bz2; url = "mirror://sourceforge/libexif/${name}.tar.bz2";
sha256 = "0pza5ysvbvvliz7al2i8l3yai64w09xwc6ivy2v5cl7k43almz84"; sha256 = "0hxc3aik3sn8xq4mbmxxb8ycx2lwffmhi5xvz0zjffhfwkaqas6v";
}; };
patches = [./no-po.patch]; buildInputs = [gettext];
} }

11
pkgs/development/libraries/libgcrypt/default.nix
View File

@ -1,10 +1,13 @@
{stdenv, fetchurl, libgpgerror}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libgcrypt-1.2.4"; name = "libgcrypt-1.3.1";
src = fetchurl { src = fetchurl {
url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.2.4.tar.gz; urls = [
sha256 = "1v6rbx2jpwvh9jwf8n91da2p66v2gzmym6s3h1fidfdy7qqkyg6g"; 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]; buildInputs = [libgpgerror];

17
pkgs/development/libraries/libgphoto2/default.nix
View File

@ -1,14 +1,15 @@
{stdenv, fetchurl, pkgconfig, libusb}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "libgphoto2-2.2.1"; name = "libgphoto2-2.4.0";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/gphoto/libgphoto2-2.2.1.tar.bz2; url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
md5 = "69827311733e39fafa9f77bb05e55b77"; sha256 = "0yfvpgfly774jnjrfqjf89h99az3sgvzkfpb9diygpk8hmx6phhd";
}; };
buildInputs = [pkgconfig libusb]; buildInputs = [pkgconfig libusb libtool libexif libjpeg gettext];
## remove this patch when 2.2.2 is released meta = {
patches = [./libgphoto2-2.2.1.patch]; license = "LGPL-2";
};
} }

19
pkgs/development/libraries/libgsf/default.nix
View File

@ -1,10 +1,17 @@
{stdenv, fetchurl, perl, perlXMLParser, pkgconfig, libxml2, glib, gettext}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "libgsf-1.14.1"; name = "libgsf-1.14.7";
src = fetchurl { src = fetchurl {
url = http://ftp.gnome.org/pub/gnome/sources/libgsf/1.14/libgsf-1.14.1.tar.bz2; url = "http://ftp.gnome.org/pub/gnome/sources/libgsf/1.14/${name}.tar.bz2";
md5 = "00de00b99382d0b7e034e0fffd8951d4"; 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];
} }

20
pkgs/development/libraries/libnotify/default.nix Normal file
View File

@ -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="";
}

17
pkgs/development/libraries/libsexy/default.nix Normal file
View File

@ -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="";
}

5
pkgs/development/libraries/libwpd/default.nix
View File

@ -1,10 +1,9 @@
{stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libwpd-0.8.5"; name = "libwpd-0.8.5";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/libwpd/libwpd-0.8.5.tar.gz; url = mirror://sourceforge/libwpd/libwpd-0.8.5.tar.gz;
md5 = "6b679e205a2805c3d23f41c65b35e266"; md5 = "6b679e205a2805c3d23f41c65b35e266";
}; };
buildInputs = [pkgconfig glib libgsf libxml2]; buildInputs = [pkgconfig glib libgsf libxml2 bzip2];
} }

3
pkgs/development/libraries/openssl/default.nix
View File

@ -1,4 +1,4 @@
args: with args; stdenv.mkDerivation { {stdenv, fetchurl, perl}: stdenv.mkDerivation {
name = "openssl-0.9.8g"; name = "openssl-0.9.8g";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
@ -6,5 +6,4 @@ args: with args; stdenv.mkDerivation {
sha256 = "1w0wj3pgg9ga0hay3jdxs9sl17bfw307b6qvkxn735fy8ml8h9hf"; sha256 = "1w0wj3pgg9ga0hay3jdxs9sl17bfw307b6qvkxn735fy8ml8h9hf";
}; };
buildInputs = [perl]; buildInputs = [perl];
propagatedBuildInputs = [gmp];
} }

20
pkgs/development/libraries/strigi/default.nix
View File

@ -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";
};
}

6
pkgs/development/libraries/xine-lib/default.nix
View File

@ -12,11 +12,11 @@ assert encryptedDVDSupport -> libdvdcss != null;
assert alsaSupport -> alsaLib != null; assert alsaSupport -> alsaLib != null;
(stdenv.mkDerivation { (stdenv.mkDerivation {
name = "xine-lib-1.1.7"; name = "xine-lib-1.1.8";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/xine/xine-lib-1.1.7.tar.bz2; url = mirror://sourceforge/xine/xine-lib-1.1.8.tar.bz2;
sha256 = "1aycmhvq95gbb5mqw5skgcxyn4nh5qkzq21yclnqk5yzflpwwvvg"; sha256 = "03iwhgsf9kj0x5b4fgv7lzc1vj3frk4afh2idgrqskvixjyi37vc";
}; };
buildInputs = [ buildInputs = [
x11 x11

15
pkgs/development/tools/build-managers/cmake/setup-hook.sh
View File

@ -1,16 +1,15 @@
addCMakeParamsInclude() addCMakeParamsInclude()
{ {
addToSearchPath CMAKE_INCLUDE_PATH /include "" $1 if [ -d $1/include ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}${CMAKE_INCLUDE_PATH:+:}$1/include"
fi
} }
addCMakeParamsLibs() addCMakeParamsLibs()
{ {
addToSearchPath CMAKE_LIBRARY_PATH /lib "" $1 if [ -d $1/lib ]; then
} export CMAKE_LIBRARY_PATH="${CMAKE_LIBRARY_PATH}${CMAKE_LIBRARY_PATH:+:}$1/lib"
fi
addCMakeModulePath()
{
addToSearchPath CMAKE_MODULE_PATH /share/cmake-2.4/Modules "" $1
} }
fixCmakeFiles() fixCmakeFiles()
@ -46,4 +45,4 @@ if [ -z "$noCmakeTewaks" ]; then
postUnpack="cmakePostUnpack${postUnpack:+; }${postUnpack}" postUnpack="cmakePostUnpack${postUnpack:+; }${postUnpack}"
fi; fi;
envHooks=(${envHooks[@]} addCMakeParamsInclude addCMakeParamsLibs addCMakeModulePath) envHooks=(${envHooks[@]} addCMakeParamsInclude addCMakeParamsLibs)

4
pkgs/development/tools/misc/automake/setup-hook.sh
View File

@ -1,5 +1,7 @@
addAclocals () { addAclocals () {
addToSearchPathWithCustomDelimiter : ACLOCAL_PATH /share/aclocal "" $1 if test -d $1/share/aclocal; then
export ACLOCAL_PATH="$ACLOCAL_PATH${ACLOCAL_PATH:+:}$1/share/aclocal"
fi
} }
envHooks=(${envHooks[@]} addAclocals) envHooks=(${envHooks[@]} addAclocals)

10
pkgs/development/tools/misc/gdb/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, ncurses}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gdb-6.6"; name = "gdb-6.7.1";
src = fetchurl { src = fetchurl {
url = http://ftp.gnu.org/gnu/gdb/gdb-6.6.tar.bz2; url = "mirror://gnu/gdb/${name}.tar.bz2";
md5 = "a4df41d28dd514d64e8ccbfe125fd9a6"; sha256 = "0qig8j8hcqpqfhnnp685rzgj8v88bw2fc5igvbiiqkqg88wfr37r";
}; };
buildInputs = [ncurses]; buildInputs = [ncurses];
} }

10
pkgs/development/tools/misc/pkgconfig/builder.sh Normal file
View File

@ -0,0 +1,10 @@
source $stdenv/setup
postInstall() {
test -x $out/nix-support || mkdir $out/nix-support
cp $setupHook $out/nix-support/setup-hook
}
postInstall=postInstall
genericBuild

12
pkgs/development/tools/misc/pkgconfig/default.nix
View File

@ -1,18 +1,14 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "pkgconfig-0.22"; name = "pkgconfig-0.21";
builder = ./builder.sh;
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
src = fetchurl { src = fetchurl {
url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.tar.gz; url = http://nix.cs.uu.nl/dist/tarballs/pkg-config-0.21.tar.gz;
sha256 = "1rpb5wygmp0f8nal7y3ga4556i7hkjdslv3wdq04fj30gns621vy"; md5 = "476f45fab1504aac6697aa7785f0ab91";
}; };
postInstall = "
ensureDir \$out/nix-support
cp \$setupHook \$out/nix-support/setup-hook
";
patches = [ patches = [
# Process Requires.private properly, see # Process Requires.private properly, see
# http://bugs.freedesktop.org/show_bug.cgi?id=4738. # http://bugs.freedesktop.org/show_bug.cgi?id=4738.

4
pkgs/development/tools/misc/pkgconfig/setup-hook.sh
View File

@ -1,5 +1,7 @@
addPkgConfigPath () { addPkgConfigPath () {
addToSearchPath PKG_CONFIG_PATH /lib/pkgconfig "" $1 if test -d $1/lib/pkgconfig; then
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}${PKG_CONFIG_PATH:+:}$1/lib/pkgconfig"
fi
} }
envHooks=(${envHooks[@]} addPkgConfigPath) envHooks=(${envHooks[@]} addPkgConfigPath)

4
pkgs/lib/default.nix
View File

@ -244,4 +244,8 @@ rec {
(l + (if l=="" then "" else ".") + s) (builtins.getAttr s attrs))) (l + (if l=="" then "" else ".") + s) (builtins.getAttr s attrs)))
(builtins.attrNames attrs))))); (builtins.attrNames attrs)))));
innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else
innerModifySumArgs f x (a // b);
modifySumArgs = f: x: innerModifySumArgs f x {};
} }

2
pkgs/servers/monitoring/nagios/plugins/official/default.nix
View File

@ -20,6 +20,8 @@ stdenv.mkDerivation {
) )
"; ";
postInstall = "ln -s libexec $out/bin";
buildInputs = [openssh]; # !!! make openssh a runtime dependency only buildInputs = [openssh]; # !!! make openssh a runtime dependency only
meta = { meta = {

49
pkgs/test/openftd/default.nix Normal file
View File

@ -0,0 +1,49 @@
/*
Systeemvereisten
* libz >= 1.1.4
* glib >= 2.2.0
* gtk >= 2.2.0
Glib 2 is een 'dependancy' van gtk2. Als je gtk2 op je systeem hebt staan dan heb je ongetwijfeld ook glib2 op je systeem. Zie: www.gtk.org voor meer informatie omtrent Glib/gtk2
Alhoewel FTD4Linux gtk 2.2 als minimumvereiste heeft raden we toch aan om gtk 2.4 te gebruiken. Dit vanwege een bug in gtk versies 2.2.2 t/m 2.2.4.
* libxml2 >= 2.2.5
* libxslt >= 1.0.5
* mozilla (gecompileerd met gtk2 support)
Mozilla is de opensource browser die is voortgekomen uit het vrijgeven van de netscape navigator source code. Als je mozilla reeds op je systeem hebt staan zou je even moeten nagaan of deze tegen gtk2 is gelinkt. Dit kun je doen met behulp van het programma ldd.
ldd /usr/X11R6/lib/mozilla-gtk2/libgtkembedmoz.so | grep gtk
/usr/X11R6/lib/mozilla-gtk2/libgtkembedmoz.so:
libgtk-x11-2.0.so.200 => /usr/X11R6/lib/libgtk-x11-2.0.so.200 (0x282c3000)
In de output van het ldd programma kun je zien of er inderdaad wordt gelink tegen gtk2. (libgtk-x11-2.0.so.200).
Heb je geen mozilla, maar heb je wel de firebird/firefox variant geinstalleerd staan dan kun je ook met de mozilla compatible onderdelen van firebird/firefox aan de gang. Je hebt hier echter wel de header (development) bestanden bij nodig. Controleer dus even of jouw firebird/firefox installatie hiermee is geleverd. (gtkembedmoz/gtkmozembed.h) Een 'locate gtkmozembed.h' zou hier snel genoeg uitsluitsel over moeten geven.
* OpenSSL
* LibCURL
*/
{ stdenv, fetchurl
, zlib, libxml2, libxslt, firefox, openssl, curl
, glib, gtk, libgnomeui, libgtkhtml
, pkgconfig, dbus_glib, realCurl, pcre, libsexy, gtkspell, libnotify
}:
stdenv.mkDerivation {
name = "openftd-0.98.6";
#builder = ./builder.sh;
src = fetchurl {
url = http://speeldoos.eweka.nl/~paul/openftd/openftd-1.0.1.tar.bz2;
sha256 = "e0710865f852fdf209949788a1ced65e9ecf82b4eaa0992a7a1dde1511a3b6e7";
};
buildInputs = [
zlib libxml2 libxslt firefox openssl curl
glib gtk pkgconfig dbus_glib realCurl pcre libsexy libgnomeui gtkspell libnotify libgtkhtml
];
configureFlags="--with-libcurl-libraries=${curl}/lib --with-libcurl-headers=${curl}/include --with-pcre_libraries=${pcre}/lib --with-pcre_headers=${pcre}/include";
}

20
pkgs/tools/misc/shebangfix/default.nix Normal file
View File

@ -0,0 +1,20 @@
args:
args.stdenv.mkDerivation {
name = "shebangfix-0.0";
buildInputs = [args.perl];
file = ./shebangfix.pl;
phases = "buildPhase";
buildPhase = "
ensureDir \$out/bin
s=\$out/bin/shebangfix
cp \$file \$s
chmod +x \$s
perl \$s \$s
";
meta = { description = "replaces the #!executable with $#!correctpath/executable "; };
}

35
pkgs/tools/misc/shebangfix/shebangfix.pl Normal file
View File

@ -0,0 +1,35 @@
#!/bin/perl
use warnings;
use strict;
#usage PATH=< : separated path list> perl <this script> file1 file2
print "TODO fix space trouble. This script won't work if your paths contain spaces";
sub findInPath{
my $file = shift(@_);
foreach (split(/:/, $ENV{'PATH'})){
my $f = "$_/$file";
if (-x "$f"){
return $f;
}
}
print "unable to find $file in on of ".$ENV{'PATH'};
exit 1
}
foreach (@ARGV)
{
my $file = $_;
open(FILE, $file);
my $content = do { local $/; <FILE> };
close(FILE);
(my $name = $content) =~ /^#![^ ]*\/([^ \n\r]*)/;
my $fullpath = ($1 eq 'sh') ? "/bin/sh" : findInPath($1);
$content =~ s/^#![^ \n\r]*/#!$fullpath/;
open(FILE, ">$file");
print FILE $content;
close($file);
}

2
pkgs/tools/misc/wv/default.nix
View File

@ -9,7 +9,7 @@ args.stdenv.mkDerivation {
}; };
buildInputs =(with args; [zlib imagemagick libpng glib buildInputs =(with args; [zlib imagemagick libpng glib
pkgconfig libgsf libxml2]); pkgconfig libgsf libxml2 bzip2]);
meta = { meta = {
description = " description = "

45
pkgs/tools/package-management/nix/custom.nix Normal file
View File

@ -0,0 +1,45 @@
{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
, src
, preConfigure ? ""
, autoconf ? null, automake ? null, libtool ? null
, bison ? null
, flex ? null
, w3m ? null
, docbook5_xsl ? null, libxslt ? null
, docbook5 ? null, docbook_xml_dtd_43 ? null
, configureFlags ? []
}:
stdenv.mkDerivation {
name = "nix-custom";
inherit src;
buildInputs = [perl curl openssl]
++ (if automake != null then [automake] else [])
++ (if autoconf != null then [autoconf] else [])
++ (if libtool != null then [libtool] else [])
++ (if bison != null then [bison] else [])
++ (if flex != null then [flex] else [])
++ (if docbook5_xsl != null then [docbook5_xsl] else [])
++ (if libxslt != null then [libxslt] else [])
++ (if docbook5 != null then [docbook5] else [])
++ (if docbook_xml_dtd_43 != null then [docbook_xml_dtd_43] else [])
++ (if w3m != null then [w3m] else [])
;
inherit preConfigure;
configureFlags = ["
--with-store-dir=${storeDir} --localstatedir=${stateDir}
--with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2}
--disable-init-state"] ++ configureFlags ;
meta = {
description = "The Nix Deployment System";
homepage = http://nix.cs.uu.nl/;
license = "LGPL";
};
}

4
pkgs/tools/package-management/nix/unstable.nix
View File

@ -3,14 +3,14 @@
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
}: }:
let version = "0.11pre9570"; in let version = "0.11pre9692"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nix-${version}"; name = "nix-${version}";
src = fetchurl { src = fetchurl {
url = "http://nix.cs.uu.nl/dist/nix/nix-${version}/nix-${version}.tar.bz2"; url = "http://nix.cs.uu.nl/dist/nix/nix-${version}/nix-${version}.tar.bz2";
md5 = "5170f1b1e8feda2adeb2cac3c5ca5ff9"; md5 = "35c0bc68b81d20c7fb925bcf8faf4827";
}; };
buildInputs = [perl curl openssl]; buildInputs = [perl curl openssl];

197
pkgs/top-level/all-packages.nix
View File

@ -147,6 +147,13 @@ rec {
getVersion = name: alts: builtins.getAttr getVersion = name: alts: builtins.getAttr
(getConfig [ "environment" "versions" name ] "default") alts; (getConfig [ "environment" "versions" name ] "default") alts;
# The same, another syntax.
# Warning: syntax for configuration.nix changed too
useVersion = name: f: f
{
version = getConfig [ "environment" "versions" name ];
};
# Whether user enabled given feature for the given package? # Whether user enabled given feature for the given package?
getFlag = flag: package: default: getFlag = flag: package: default:
getConfig [ "environment" "flags" package flag ] getConfig [ "environment" "flags" package flag ]
@ -659,6 +666,11 @@ rec {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
}; };
shebangfix = import ../tools/misc/shebangfix {
inherit perl;
stdenv = overrideSetup stdenv ../stdenv/generic/setup-new-2.sh;
};
smartmontools = import ../tools/system/smartmontools { smartmontools = import ../tools/system/smartmontools {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -743,7 +755,7 @@ rec {
wv = import ../tools/misc/wv { wv = import ../tools/misc/wv {
inherit fetchurl stdenv libpng zlib imagemagick inherit fetchurl stdenv libpng zlib imagemagick
pkgconfig libgsf libxml2; pkgconfig libgsf libxml2 bzip2;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
}; };
@ -1063,13 +1075,11 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
ocaml = import ../development/compilers/ocaml { ocaml = getVersion "ocaml" ocaml_alts;
inherit fetchurl stdenv x11 ncurses;
};
ocaml3080 = import ../development/compilers/ocaml/ocaml-3.08.0.nix { ocaml_alts = import ../development/compilers/ocaml {
inherit fetchurl x11; inherit fetchurl stdenv x11 ncurses stdenvUsingSetupNew2;
stdenv = overrideGCC stdenv gcc34; stdenv34 = overrideGCC stdenv gcc34;
}; };
/* /*
@ -1096,7 +1106,7 @@ rec {
qcmm = import ../development/compilers/qcmm { qcmm = import ../development/compilers/qcmm {
lua = lua4; lua = lua4;
ocaml = ocaml3080; ocaml = ocaml_alts.v_3_08_0;
inherit fetchurl stdenv mk noweb groff; inherit fetchurl stdenv mk noweb groff;
}; };
@ -1202,17 +1212,15 @@ rec {
}; };
*/ */
python = import ../development/interpreters/python { python = getVersion "python" python_alts;
inherit fetchurl stdenv zlib bzip2;
};
python25 = import ../development/interpreters/python/2.5 { python_alts = import ../development/interpreters/python {
inherit fetchurl stdenv zlib bzip2; inherit fetchurl stdenv zlib bzip2;
}; };
pyrexFun = lib.sumArgs (import ../development/interpreters/pyrex) { pyrexFun = lib.sumArgs (import ../development/interpreters/pyrex) {
inherit fetchurl stdenv stringsWithDeps lib builderDefs; inherit fetchurl stdenv stringsWithDeps lib builderDefs;
python = python25; python = python_alts.v_2_5;
}; };
pyrex = pyrexFun { pyrex = pyrexFun {
@ -1605,13 +1613,9 @@ rec {
inherit fetchurl stdenv python; inherit fetchurl stdenv python;
}; };
cluceneContrib = (import ../development/libraries/clucene-contrib) { cluceneCore = (import ../development/libraries/clucene-core) {
inherit fetchurl stdenv cluceneCore; inherit fetchurl stdenv;
}; };
cluceneCore = (import ../development/libraries/clucene-core) {
inherit fetchurl stdenv;
};
coredumper = import ../development/libraries/coredumper { coredumper = import ../development/libraries/coredumper {
inherit fetchurl stdenv; inherit fetchurl stdenv;
@ -1681,6 +1685,13 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
facile = import ../development/libraries/facile {
inherit fetchurl;
# Actually, we don't need this version but we need native-code compilation
ocaml = ocaml_alts.v_3_10_0;
stdenv = stdenvUsingSetupNew2;
};
ffmpeg = import ../development/libraries/ffmpeg { ffmpeg = import ../development/libraries/ffmpeg {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -1939,7 +1950,7 @@ rec {
}; };
libexif = import ../development/libraries/libexif { libexif = import ../development/libraries/libexif {
inherit fetchurl stdenv; inherit fetchurl stdenv gettext;
}; };
libgcrypt = import ../development/libraries/libgcrypt { libgcrypt = import ../development/libraries/libgcrypt {
@ -1951,7 +1962,7 @@ rec {
}; };
libgphoto2 = import ../development/libraries/libgphoto2 { libgphoto2 = import ../development/libraries/libgphoto2 {
inherit fetchurl stdenv pkgconfig libusb; inherit fetchurl stdenv pkgconfig libusb libtool libexif libjpeg gettext;
}; };
# commented out because it's using the new configuration style proposal which is unstable # commented out because it's using the new configuration style proposal which is unstable
@ -1960,8 +1971,9 @@ rec {
#}; #};
libgsf = import ../development/libraries/libgsf { libgsf = import ../development/libraries/libgsf {
inherit fetchurl stdenv perl perlXMLParser pkgconfig libxml2 gettext; inherit fetchurl stdenv perl perlXMLParser pkgconfig libxml2 gettext bzip2
inherit (gnome) glib; python;
inherit (gnome) glib gnomevfs libbonobo;
}; };
libidn = import ../development/libraries/libidn { libidn = import ../development/libraries/libidn {
@ -2044,7 +2056,7 @@ rec {
}; };
libwpd = import ../development/libraries/libwpd { libwpd = import ../development/libraries/libwpd {
inherit fetchurl stdenv pkgconfig libgsf libxml2; inherit fetchurl stdenv pkgconfig libgsf libxml2 bzip2;
inherit (gnome) glib; inherit (gnome) glib;
}; };
@ -2145,7 +2157,7 @@ rec {
}; };
openssl = import ../development/libraries/openssl { openssl = import ../development/libraries/openssl {
inherit fetchurl stdenv perl gmp; inherit fetchurl stdenv perl;
}; };
pangoxsl = import ../development/libraries/pangoxsl { pangoxsl = import ../development/libraries/pangoxsl {
@ -2244,12 +2256,6 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
strigi = import ../development/libraries/strigi {
inherit stdenv fetchurl zlib cluceneCore cluceneContrib expat bzip2
pkgconfig cmake dbus libxml2 perl;
qt = qt4;
};
t1lib = import ../development/libraries/t1lib { t1lib = import ../development/libraries/t1lib {
inherit fetchurl stdenv x11; inherit fetchurl stdenv x11;
inherit (xlibs) libXaw; inherit (xlibs) libXaw;
@ -2409,6 +2415,11 @@ rec {
### DEVELOPMENT / LIBRARIES / HASKELL ### DEVELOPMENT / LIBRARIES / HASKELL
gtk2hs = import ../development/libraries/haskell/gtk2hs {
inherit pkgconfig stdenv fetchurl cairo;
inherit (gnome) gtk glib GConf libglade libgtkhtml gtkhtml;
ghc = ghc661;
};
uulib64 = import ../development/libraries/haskell/uulib { # !!! remove? uulib64 = import ../development/libraries/haskell/uulib { # !!! remove?
inherit stdenv fetchurl ghc; inherit stdenv fetchurl ghc;
@ -3078,6 +3089,11 @@ rec {
libselinux = import ../os-specific/linux/libselinux { libselinux = import ../os-specific/linux/libselinux {
inherit fetchurl stdenv libsepol; inherit fetchurl stdenv libsepol;
}; };
libsexy = import ../development/libraries/libsexy {
inherit stdenv fetchurl pkgconfig libxml2;
inherit (gtkLibs) glib gtk pango;
};
librsvg = import ../development/libraries/librsvg { librsvg = import ../development/libraries/librsvg {
inherit fetchurl stdenv; inherit fetchurl stdenv;
@ -3128,6 +3144,11 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
libnotify = import ../development/libraries/libnotify {
inherit stdenv fetchurl pkgconfig dbus dbus_glib;
inherit (gtkLibs) gtk glib;
};
libvolume_id = import ../os-specific/linux/libvolume_id { libvolume_id = import ../os-specific/linux/libvolume_id {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -3509,7 +3530,7 @@ rec {
}; };
compiz = compizFun { compiz = compizFun {
version = getConfig ["compiz" "version"] "0.5.0"; version = getConfig ["compiz" "version"] "0.6.2";
extraConfigureFlags = getConfig ["compiz" "extraConfigureFlags"] []; extraConfigureFlags = getConfig ["compiz" "extraConfigureFlags"] [];
} null; } null;
@ -3578,11 +3599,9 @@ rec {
inherit (xlibs) libX11; inherit (xlibs) libX11;
}; };
/* djview4 = import ../applications/graphics/djview {
djview4 = import ../applications/graphics/djview4 {
inherit fetchurl stdenv qt4 djvulibre; inherit fetchurl stdenv qt4 djvulibre;
}; };
*/
eclipse = plugins: eclipse = plugins:
import ../applications/editors/eclipse { import ../applications/editors/eclipse {
@ -3598,7 +3617,7 @@ rec {
elinks = import ../applications/networking/browsers/elinks { elinks = import ../applications/networking/browsers/elinks {
inherit stdenv fetchurl python perl ncurses x11 zlib openssl spidermonkey inherit stdenv fetchurl python perl ncurses x11 zlib openssl spidermonkey
guile bzip2 libtool; guile bzip2;
}; };
emacs = emacs22; emacs = emacs22;
@ -3720,7 +3739,7 @@ rec {
} null; } null;
gphoto2 = import ../applications/misc/gphoto2 { gphoto2 = import ../applications/misc/gphoto2 {
inherit fetchurl stdenv pkgconfig libgphoto2 libexif popt; inherit fetchurl stdenv pkgconfig libgphoto2 libexif popt readline gettext;
}; };
gqview = import ../applications/graphics/gqview { gqview = import ../applications/graphics/gqview {
@ -3789,6 +3808,11 @@ rec {
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
}; };
jedit = import ../applications/jedit {
inherit fetchurl ant;
stdenv = overrideSetup stdenv ../stdenv/generic/setup-new-2.sh;
};
joe = import ../applications/editors/joe { joe = import ../applications/editors/joe {
inherit stdenv fetchurl; inherit stdenv fetchurl;
}; };
@ -3961,7 +3985,7 @@ rec {
pythonmagick = import ../applications/graphics/PythonMagick { pythonmagick = import ../applications/graphics/PythonMagick {
inherit fetchurl stdenv pkgconfig imagemagick boost; inherit fetchurl stdenv pkgconfig imagemagick boost;
python = python25; python = python_alts.v_2_5;
}; };
ratpoison = import ../applications/window-managers/ratpoison { ratpoison = import ../applications/window-managers/ratpoison {
@ -4344,71 +4368,28 @@ rec {
qt = qt3; qt = qt3;
}; };
kdelibs4 = import ../desktops/kde-4/kdelibs { kde4 = recurseIntoAttrs (import ../desktops/kde-4 {
inherit inherit
fetchurl stdenv zlib perl openssl pcre pkgconfig fetchurl fetchsvn zlib perl openssl pcre pkgconfig libjpeg libpng libtiff
libjpeg libpng libtiff libxml2 libxslt libtool libxml2 libxslt libtool libusb expat freetype bzip2 cmake cluceneCore libgcrypt gnupg
expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups; cppunit cyrus_sasl openldap enchant openexr exiv2 samba nss log4cxx aspell
inherit (xlibs) shared_mime_info alsaLib libungif cups mesa boost gpgme gettext redland
inputproto kbproto scrnsaverproto xextproto xf86miscproto xineLib libgphoto2 djvulibre libogg flac lame libvorbis poppler readline
xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite saneBackends chmlib python libzip gmp sqlite libidn runCommand lib
libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm openbabel ocaml facile;
libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc stdenv = stdenvUsingSetupNew2;
libxkbfile; cdparanoia = cdparanoiaIII;
inherit (xlibs)
inputproto kbproto scrnsaverproto xextproto xf86miscproto
xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite
libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm
libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc
libxkbfile libXinerama;
inherit (gtkLibs) glib;
qt = qt4; qt = qt4;
}; dbus = dbus_alts.withX11;
bison = bison23;
kdepimlibs4 = import ../desktops/kde-4/kdepimlibs { });
inherit
fetchurl stdenv zlib perl openssl pcre pkgconfig
libjpeg libpng libtiff libxml2 libxslt libtool
expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups
boost gpgme;
inherit (xlibs)
inputproto kbproto scrnsaverproto xextproto xf86miscproto
xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite
libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm
libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc
libxkbfile;
qt = qt4;
kdelibs = kdelibs4;
};
kdepim4 = import ../desktops/kde-4/kdepim {
inherit
fetchurl stdenv zlib perl openssl pcre pkgconfig
libjpeg libpng libtiff libxml2 libxslt libtool libusb
expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups
mesa gpgme boost;
inherit (xlibs)
inputproto kbproto scrnsaverproto xextproto xf86miscproto
xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite
libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm
libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc
libxkbfile libXinerama;
inherit (gtkLibs) glib;
qt = qt4;
kdelibs = kdelibs4;
kdepimlibs = kdepimlibs4;
};
kdebase4 = import ../desktops/kde-4/kdebase {
inherit
fetchurl stdenv zlib perl openssl pcre pkgconfig
libjpeg libpng libtiff libxml2 libxslt libtool libusb
expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups
mesa;
inherit (xlibs)
inputproto kbproto scrnsaverproto xextproto xf86miscproto
xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite
libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm
libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc
libxkbfile libXinerama;
inherit (gtkLibs) glib;
qt = qt4;
kdelibs = kdelibs4;
kdepimlibs = kdepimlibs4;
};
kdebase = import ../desktops/kde/kdebase { kdebase = import ../desktops/kde/kdebase {
inherit inherit
@ -4520,6 +4501,18 @@ rec {
db4 = db45; db4 = db45;
}; };
nixCustomFun = src: preConfigure: configureFlags :
(import ../tools/package-management/nix/custom.nix {
inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
autoconf libtool configureFlags;
bison = bison23;
flex = flex2533;
aterm = aterm242fixes;
db4 = db45;
inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
});
ntfs3g = import ../misc/ntfs-3g { ntfs3g = import ../misc/ntfs-3g {
inherit fetchurl stdenv fuse pkgconfig; inherit fetchurl stdenv fuse pkgconfig;
}; };

74
pkgs/top-level/builder-defs.nix
View File

@ -1,5 +1,5 @@
args: with args; with stringsWithDeps; with lib; args: with args; with stringsWithDeps; with lib;
rec (rec
{ {
inherit writeScript; inherit writeScript;
@ -12,30 +12,29 @@ rec
else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip" else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip"
else (abort "unknown archive type : ${s}")); else (abort "unknown archive type : ${s}"));
minInit = noDepEntry (" defAddToSearchPath = FullDepEntry ("
set -e addToSearchPathWithCustomDelimiter() {
NIX_GCC=${stdenv.gcc} local delimiter=\$1
export SHELL=${stdenv.shell} local varName=\$2
# Set up the initial path. local needDir=\$3
PATH= local addDir=\${4:-\$needDir}
for i in \$NIX_GCC ${toString stdenv.initialPath}; do local prefix=\$5
PATH=\$PATH\${PATH:+:}\$i/bin if [ -d \$prefix\$needDir ]; then
done if [ -z \${!varName} ]; then
" + (if ((stdenv ? preHook) && (stdenv.preHook != null) && eval export \${varName}=\${prefix}\$addDir
((toString stdenv.preHook) != "")) then else
" eval export \${varName}=\${!varName}\${delimiter}\${prefix}\$addDir
param1=${stdenv.param1} fi
param2=${stdenv.param2} fi
param3=${stdenv.param3} }
param4=${stdenv.param4}
param5=${stdenv.param5}
source ${stdenv.preHook}
export TZ=UTC
prefix=${if args ? prefix then (toString args.prefix) else "\$out"}
addToSearchPath()
{
addToSearchPathWithCustomDelimiter \"\${PATH_DELIMITER}\" \"\$@\"
}
") [defNest];
defNest = noDepEntry ("
nestingLevel=0 nestingLevel=0
startNest() { startNest() {
@ -62,10 +61,33 @@ rec
} }
trap \"closeNest\" EXIT trap \"closeNest\" EXIT
");
minInit = FullDepEntry ("
set -e
NIX_GCC=${stdenv.gcc}
export SHELL=${stdenv.shell}
# Set up the initial path.
PATH=
for i in \$NIX_GCC ${toString stdenv.initialPath}; do
PATH=\$PATH\${PATH:+:}\$i/bin
done
" + (if ((stdenv ? preHook) && (stdenv.preHook != null) &&
((toString stdenv.preHook) != "")) then
"
param1=${stdenv.param1}
param2=${stdenv.param2}
param3=${stdenv.param3}
param4=${stdenv.param4}
param5=${stdenv.param5}
source ${stdenv.preHook}
export TZ=UTC
prefix=${if args ? prefix then (toString args.prefix) else "\$out"}
" "
else "")); else "")) [defNest defAddToSearchPath];
addInputs = FullDepEntry (" addInputs = FullDepEntry ("
# Recursively find all build inputs. # Recursively find all build inputs.
@ -243,8 +265,8 @@ rec
replaceInScript = file: l: (concatStringsSep "\n" ((pairMap (replaceScriptVar file) l))); replaceInScript = file: l: (concatStringsSep "\n" ((pairMap (replaceScriptVar file) l)));
replaceScripts = l:(concatStringsSep "\n" (pairMap replaceInScript l)); replaceScripts = l:(concatStringsSep "\n" (pairMap replaceInScript l));
doReplaceScripts = FullDepEntry (replaceScripts (getAttr ["shellReplacements"] [] args)) [minInit]; doReplaceScripts = FullDepEntry (replaceScripts (getAttr ["shellReplacements"] [] args)) [minInit];
makeNest = x:(if x==minInit.text then x else "startNest\n" + x + "\nstopNest\n"); makeNest = x:(if x==defNest.text then x else "startNest\n" + x + "\nstopNest\n");
textClosure = textClosureMap makeNest; textClosure = textClosureMap makeNest;
inherit noDepEntry FullDepEntry PackEntry; inherit noDepEntry FullDepEntry PackEntry;
} }) // args