Commit Graph

441 Commits

Author SHA1 Message Date
Eelco Dolstra
59d88c1772 * Revert r10833, it doesn't really work. Instead build ghcboot
with Perl 5.8.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10834
2008-02-22 14:43:00 +00:00
Eelco Dolstra
d2d8d83f37 * A clever hack (due to Audrey Tang, see
http://consttype.blogspot.com/2007_07_01_archive.html) around the 
  fact that Perl 5.10 no longer supports the $* variable, which GHC's
  evil mangler requires.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10833
2008-02-22 14:09:29 +00:00
Eelco Dolstra
3e72751bd9 * ghcboot was broken: the combination of patchelf and strip -S generates
broken binaries (NIXPKGS-85).  Worked around by not stripping.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10831
2008-02-22 12:25:00 +00:00
Eelco Dolstra
67c961fd63 * Merged -r10790:HEAD from the trunk.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10815
2008-02-21 17:34:03 +00:00
Ludovic Courtès
cee8b8ebac Add GNU Texinfo 4.9, use it to produce GCC 4.x documentation.
svn path=/nixpkgs/trunk/; revision=10805
2008-02-21 15:34:56 +00:00
Eelco Dolstra
e12b421add * Merged most of the stdenv-updates branch. Some stuff didn't
merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
2008-02-20 23:02:41 +00:00
Tobias Hammerschmidt
182d10bca9 java 6 update 4, can someone confirm that amd64 works properly?
svn path=/nixpkgs/trunk/; revision=10770
2008-02-20 11:34:48 +00:00
Marc Weber
d884e1d0a6 fix c -> Cabal-1.2.3.0 the lib is found again
svn path=/nixpkgs/trunk/; revision=10669
2008-02-13 21:21:20 +00:00
Marc Weber
fe5caa2f0f modified improved hasktags (can be removed when my changes are merged into ghc)
improved ghcs expression file Now you have tags for all libraries.
I still have to work on speed

svn path=/nixpkgs/trunk/; revision=10657
2008-02-13 11:15:08 +00:00
Sander van der Burg
6d4c13380b Added google webtoolkit
svn path=/nixpkgs/trunk/; revision=10653
2008-02-13 08:43:38 +00:00
Marc Weber
260c0c9c96 new version - annotated derivation proposal - used to install addtiontal /src
and /tag/ source code which to build up develop environments more easily ( TODO
make this optional for ghcWrapper )

svn path=/nixpkgs/trunk/; revision=10648
2008-02-12 16:24:02 +00:00
Marc Weber
35c38df0af no longer used
svn path=/nixpkgs/trunk/; revision=10566
2008-02-09 14:09:14 +00:00
Marc Weber
0efd4183e1 updated version of my ghc and packages proposal. Now compiles HAppS.
Examples on how to add ghc extra_libs, libraries from hackage are included

svn path=/nixpkgs/trunk/; revision=10565
2008-02-09 14:08:37 +00:00
Marc Weber
94128cb6a8 added roadsend PHP-Compiler
svn path=/nixpkgs/trunk/; revision=10550
2008-02-08 01:57:31 +00:00
Marc Weber
9e0cfbdfdd bigloo is now compiling
svn path=/nixpkgs/trunk/; revision=10549
2008-02-08 01:35:01 +00:00
Eelco Dolstra
d3993b18fb * GCC 4.2.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10499
2008-02-04 15:15:06 +00:00
Yury G. Kudryashov
fbfab88e04 Nix-expr style review
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.


svn path=/nixpkgs/branches/stdenv-updates/; revision=10429
2008-01-31 10:41:04 +00:00
Yury G. Kudryashov
5bca69ac34 Nix-expr style review
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
2008-01-30 17:20:48 +00:00
Yury G. Kudryashov
c1a512f2a1 Added WebDSL
svn path=/nixpkgs/branches/stdenv-updates/; revision=10386
2008-01-29 13:18:13 +00:00
Yury G. Kudryashov
13255753b4 Added java-front
svn path=/nixpkgs/branches/stdenv-updates/; revision=10384
2008-01-29 13:17:42 +00:00
Yury G. Kudryashov
8b871ad339 Added Stratego/XT 0.17 prerelease
svn path=/nixpkgs/branches/stdenv-updates/; revision=10383
2008-01-29 13:17:25 +00:00
Sander van der Burg
d3b73db40b Added WebDSL
svn path=/nixpkgs/trunk/; revision=10375
2008-01-29 11:46:34 +00:00
Sander van der Burg
293fdf9c5d Added java-front
svn path=/nixpkgs/trunk/; revision=10373
2008-01-29 09:47:34 +00:00
Sander van der Burg
1afbc67f9a Added Stratego/XT 0.17 prerelease
svn path=/nixpkgs/trunk/; revision=10372
2008-01-29 09:42:20 +00:00
Yury G. Kudryashov
b3cd1e644a Changed version-related syntax in python, gettext and ocaml
svn path=/nixpkgs/trunk/; revision=10316
2008-01-28 19:30:57 +00:00
Yury G. Kudryashov
9b2659eec7 Merged with trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=10295
2008-01-25 14:16:25 +00:00
Sander van der Burg
d0792fd3bc Added x86_64 version of JDK5
svn path=/nixpkgs/trunk/; revision=10272
2008-01-24 10:14:33 +00:00
Yury G. Kudryashov
da57804fff Merged with trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=10267
2008-01-23 18:11:03 +00:00
Sander van der Burg
12fafd0c7d Added JBoss
svn path=/nixpkgs/trunk/; revision=10259
2008-01-23 12:25:08 +00:00
Marc Weber
22c7d08b6a proposal cabal ghc builder + dep tracking using GHC_PACKAGE_PATH (untested - not yet working)
svn path=/nixpkgs/trunk/; revision=10245
2008-01-22 14:34:23 +00:00
Michael Raskin
bc46eaf404 Some review of builder-defs and dependent files. No rebuild needed. Now it should be possible to override elements in builderDefs
svn path=/nixpkgs/trunk/; revision=10214
2008-01-18 12:36:56 +00:00
Marc Weber
e054e91e8b renamed av/avs (create attr/value set) to nv nvs
because niksnut has renamed the attr names in listToAttrs long time ago.

svn path=/nixpkgs/trunk/; revision=10185
2008-01-17 11:08:24 +00:00
Yury G. Kudryashov
6e8ff2b24b Merged with trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=10155
2008-01-15 14:32:10 +00:00
Yury G. Kudryashov
a7703662a4 Merged with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
2008-01-15 00:55:21 +00:00
Andres Löh
7f402451ec * porting changes from ghc-6.8.2 nix expression back to 6.6.1
* cleaning up a bit

svn path=/nixpkgs/trunk/; revision=10103
2008-01-09 13:08:36 +00:00
Andres Löh
35d05e3cc1 * statically fix the gcc instance used by ghc
svn path=/nixpkgs/trunk/; revision=10099
2008-01-08 08:45:39 +00:00
Andres Löh
5d4fd5f529 * readline library flag restored; this is required for ghc during linking
svn path=/nixpkgs/trunk/; revision=10092
2008-01-07 22:02:44 +00:00
Eelco Dolstra
ab5a39d40b * Doh.
svn path=/nixpkgs/trunk/; revision=9954
2007-12-19 11:19:02 +00:00
Eelco Dolstra
ae979c46a9 * Support for building GHC 6.8 on Darwin.
svn path=/nixpkgs/trunk/; revision=9942
2007-12-14 21:30:03 +00:00
Eelco Dolstra
e9536180f1 * Doh.
svn path=/nixpkgs/trunk/; revision=9941
2007-12-14 17:53:38 +00:00
Eelco Dolstra
65c1809b67 * Support for building a bootstrap GHC (ghcboot) on i686-darwin.
Building of the bootstrapped compiler isn't tested yet.

svn path=/nixpkgs/trunk/; revision=9940
2007-12-14 17:51:11 +00:00
Andres Löh
05cbfdc0bc * version bump to 6.8.2
svn path=/nixpkgs/trunk/; revision=9933
2007-12-13 22:49:32 +00:00
Andres Löh
4015abfb18 * fixed libraries/core packages for ghc-6.8
svn path=/nixpkgs/trunk/; revision=9908
2007-12-11 19:00:56 +00:00
Andres Löh
67b8350ee6 * ghc-6.8 is no longer a snapshot
* fixed typo in application of x86_64 patch, i.e.,
    now really seems to work on x86_64 ...

svn path=/nixpkgs/trunk/; revision=9898
2007-12-10 10:50:59 +00:00
Yury G. Kudryashov
b5b3671318 removed unused file
svn path=/nixpkgs/branches/stdenv-updates/; revision=9896
2007-12-08 15:21:56 +00:00
Yury G. Kudryashov
d23f0bf7e9 merging trunk...
svn path=/nixpkgs/branches/stdenv-updates/; revision=9895
2007-12-08 15:21:03 +00:00
Yury G. Kudryashov
3896cd4a28 * Get rid of the `(import (__toPath ((toString
./JustNothing/.. )+"/"+args.version+".nix")))' hack, you can also just
  write `import (./path/to/pkg + "/${version}.nix)'.


svn path=/nixpkgs/branches/stdenv-updates/; revision=9886
2007-12-08 01:09:00 +00:00
Yury G. Kudryashov
d1cc8aafd0 * Nix 0.10 compatibility.
svn path=/nixpkgs/branches/stdenv-updates/; revision=9883
2007-12-08 01:08:12 +00:00
Marc Weber
285a11f346 forgotten to commit this small patch
svn path=/nixpkgs/trunk/; revision=9866
2007-12-06 01:33:12 +00:00
Marc Weber
980b32acea Many thanks to Ian Lynagh (Igloo) - Now ghc runs on x86_64 on nixos as well
svn path=/nixpkgs/trunk/; revision=9864
2007-12-05 23:31:38 +00:00
Eelco Dolstra
c54b75c959 * Get rid of the `(import (__toPath ((toString
./JustNothing/.. )+"/"+args.version+".nix")))' hack, you can also just
  write `import (./path/to/pkg + "/${version}.nix)'.

svn path=/nixpkgs/trunk/; revision=9792
2007-11-26 13:24:56 +00:00
Eelco Dolstra
2e7b2f8c43 * Nix 0.10 compatibility.
svn path=/nixpkgs/trunk/; revision=9782
2007-11-23 16:58:42 +00:00
Eelco Dolstra
3949fff65d * Symlink g++ as well (NIXPKGS-62).
svn path=/nixpkgs/branches/stdenv-updates/; revision=9772
2007-11-21 19:30:54 +00:00
Eelco Dolstra
8b3186528e * pcre: don't compile with C++ support when doing a dietlibc build.
* GCC 4.2: restore the ability to build a statically linked compiler,
  needed for the Nixpkgs bootstrap.
* GCC 4.2: use symlinks instead of hard links in $out/bin
  (NIXPKGS-62).

svn path=/nixpkgs/branches/stdenv-updates/; revision=9771
2007-11-21 19:28:54 +00:00
Yury G. Kudryashov
76f78aaf57 ghc upgraded to 6.8.1
svn path=/nixpkgs/branches/stdenv-updates/; revision=9746
2007-11-17 15:30:00 +00:00
Yury G. Kudryashov
85ebf00cab Changed version-related syntax in python, gettext and ocaml
svn path=/nixpkgs/branches/stdenv-updates/; revision=9743
2007-11-17 15:19:03 +00:00
Yury G. Kudryashov
a4326fe9dc Removed references to setup-new-2.sh and setup-new.sh from all-packages.nix
svn path=/nixpkgs/branches/stdenv-updates/; revision=9737
2007-11-17 14:34:34 +00:00
Yury G. Kudryashov
8792fb81c7 Merged with trunk.
The following is autogenerated by git:

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

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

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

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

    gdb upgraded

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

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

    gphoto2 upgraded to 2.4.0: all-packages.nix

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

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

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

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

    gphoto2 upgraded to 2.4.0

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

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

    missing catalog added. Now you can open files

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

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

    nix expression creating startup wrapper for jedit

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

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

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

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

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

    Missing gecko now.

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

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

    Fix path of libnotify

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

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

    added libnotify

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

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

    added libnotify

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

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

    libnotify is missing

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

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

    Added libsexy

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

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

    Added libsexy

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

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

    Added openftd. Doesnt work (yet)

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

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

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

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

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

    bzip2 dependency added in a couple of places

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

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

    Added python to libgsf dependencies

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

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

    * Use latest Nix.

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

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

    Added a currently more functional URL for libgcrypt

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

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

    facile: fixed a typo

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

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

    Added kde-4

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

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

    Added new kde-4 staff

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

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

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

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

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

    lame: upgrade to 3.97

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

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

    libgsf: meta written

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

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

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

    libgsf: upgraded to 0.14.7

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

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

    clucene: upgrade, kde4: remove

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

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

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

    Strigi removed

    I'll add a version from kdesupport trunk today

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

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

    dbus-glib upgraded to 0.74, meta written

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

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

    xine-lib: upgraded to 1.1.8

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

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

    chmlib: upgraded to 0.39

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

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

    Added facile library

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

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

    libgcrypt-1.3.1

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

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

    Fixed a typo in ocaml-3.10.0

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

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

    ocaml: Added 3.10.0, using getVersion staff

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

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

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

    Let user to choose python2.4 or python2.5

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

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

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

    useVersion function added

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

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

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

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

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

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

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

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

    Now SVN Nix builds as a purely alternative Nix choice

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

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

    Added possibility to use non-default Nix.

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

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

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

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

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

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

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

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

    Beta-version of builderDefs fixes.

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

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

    djview location corrected

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

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

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

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

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

    * added Haskell package gtk2hs

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

svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
2007-11-16 21:05:15 +00:00
Eelco Dolstra
b5bfaa03f1 * GCC 3.4: pass --disable-multilib to make it build on x86_64.
svn path=/nixpkgs/trunk/; revision=9704
2007-11-16 13:08:20 +00:00
Eelco Dolstra
c121f6746b * Default compiler changed to GCC 4.2.2.
* Fix for NIXPKGS-60 ("g++ 4.2.0 cannot create dynamically linked executables").

svn path=/nixpkgs/branches/stdenv-updates/; revision=9691
2007-11-15 15:19:58 +00:00
Yury G. Kudryashov
1dba148448 Fixed a typo in ocaml-3.10.0
svn path=/nixpkgs/trunk/; revision=9672
2007-11-14 22:49:24 +00:00
Yury G. Kudryashov
cf76a30070 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.

svn path=/nixpkgs/trunk/; revision=9671
2007-11-14 22:39:58 +00:00
Michael Raskin
a9f02cbe6c Fixed Qi
svn path=/nixpkgs/trunk/; revision=9603
2007-11-08 15:15:41 +00:00
Michael Raskin
b7a3dcdb94 Added missing Qi
svn path=/nixpkgs/trunk/; revision=9602
2007-11-08 14:51:41 +00:00
Marc Weber
fff1ba967e New proposal on howto library dependencies could be handled.
Just install ghc68_wrapper which will install the required dependencies ghc
(and libraries) itself.
The list libraries given in the wrapper attribute set can be user tuned in the future ?
An alternative would be creating something similar to the gcc/g++ include/ lib/ scheme which
is could be used by ghc to find installed packages..

svn path=/nixpkgs/trunk/; revision=9581
2007-11-05 09:27:36 +00:00
Marc Weber
16d701c9ab rxvt-unicode and jdk update provided by Tobias Hammerschmidt
svn path=/nixpkgs/trunk/; revision=9561
2007-10-31 12:17:14 +00:00
Eelco Dolstra
4095c41c33 * Temporary hack to prevent mass recompiles.
svn path=/nixpkgs/trunk/; revision=9551
2007-10-29 11:29:47 +00:00
Michael Raskin
0c4c2cb04d Added missing fortran.sh . Doesn't work, though
svn path=/nixpkgs/trunk/; revision=9550
2007-10-29 11:23:22 +00:00
Michael Raskin
98b2568a0f Tried to fortran-tune (insuccessfully) gcc expressions. They must accept mpfr and gmp anyway if we ever will build fortran.
svn path=/nixpkgs/trunk/; revision=9545
2007-10-28 20:19:43 +00:00
Andres Löh
23d6fce80d * adding ghc-6.8 even though it still segfaults on my machine
(it's marked lowPrio for now, so it shouldn't break anything)

svn path=/nixpkgs/trunk/; revision=9482
2007-10-19 13:24:29 +00:00
Michael Raskin
2a59b66914 Corrected fpc configuration generation after update.
svn path=/nixpkgs/trunk/; revision=9474
2007-10-19 07:59:48 +00:00
Michael Raskin
187c737e3c FPC version bump
svn path=/nixpkgs/trunk/; revision=9405
2007-10-04 19:18:31 +00:00
Eelco Dolstra
544cb9cb83 * Rewrite all URLs to GNU mirrors to mirror://gnu/.
svn path=/nixpkgs/trunk/; revision=9201
2007-08-27 13:42:00 +00:00
Eelco Dolstra
607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Eelco Dolstra
45a2c87402 * Support for mirror:// URLs a la Gentoo (NIXPKGS-70). Instead of
fetchurl {
      url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.9.6.tar.bz2;
      md5 = "8306775c6a11de4d72345b5eee970ea6";
    };

  you can write

    fetchurl {
      url = mirror://sourceforge/zapping/zapping-0.9.6.tar.bz2;
      md5 = "8306775c6a11de4d72345b5eee970ea6";
    };

  which causes fetchurl to try the SourceForge mirrors listed in the
  `sourceforge' attribute in build-support/fetchurl/mirrors.nix.
  (They're currently tried in sequence, and the lists of mirrors are
  not configurable yet.)

  The syntax for mirror URLs is mirror://site/path/to/file, where
  `site' is currently one of `sourceforge', `gnu' (mirrors of
  ftp://ftp.gnu.org/pub/gnu) and `kernel' (mirrors of
  http://www.all.kernel.org/pub/).

svn path=/nixpkgs/trunk/; revision=9197
2007-08-27 12:44:01 +00:00
Eelco Dolstra
a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Marc Weber
88640db58e hugs98 expression
svn path=/nixpkgs/trunk/; revision=9168
2007-08-20 10:33:42 +00:00
Andres Löh
920ce3551d * make ghc use the nix-provided gmp
- this fixes ghc on x86_64 and hopefully doesn't break 32-bit
  - ghc-6.6.1 and -6.6 are tested on 64-bit, 6.4.2 might fail

svn path=/nixpkgs/trunk/; revision=9132
2007-08-15 11:25:20 +00:00
Michael Raskin
aae4a8db7a Added Free Pascal Compiler.
svn path=/nixpkgs/trunk/; revision=9102
2007-08-11 20:55:40 +00:00
Andres Löh
6710a5e02f * make ghcboot work on 64-bit
svn path=/nixpkgs/trunk/; revision=9067
2007-08-07 23:59:08 +00:00
Eelco Dolstra
61656532dd * GCC 4.0.4.
svn path=/nixpkgs/trunk/; revision=9062
2007-08-07 12:05:10 +00:00
Armijn Hemel
838879a4ac fix hash for ghc
svn path=/nixpkgs/trunk/; revision=8818
2007-06-02 17:15:19 +00:00
Eelco Dolstra
13567556bf * Give the real GCC a lower priority than the GCC wrapper so that both
can be installed in a user environment without conflict.  This is
  useful if you need gcov (which isn't symlinked in the GCC wrapper).

svn path=/nixpkgs/trunk/; revision=8809
2007-05-31 13:00:49 +00:00
Eelco Dolstra
2a804eb95b * Backported the gcc 4.2 patch to 4.1
* Update to gcc 4.1.2.
* Removed some unnecessary stuff from the patch.

svn path=/nixpkgs/trunk/; revision=8739
2007-05-24 13:30:09 +00:00
Eelco Dolstra
59d7cc0cd0 * Maybe libmudflap and libssp work now.
svn path=/nixpkgs/trunk/; revision=8724
2007-05-20 21:21:35 +00:00
Eelco Dolstra
062308aabf * Remove some "fixed" header files.
* Strip the gcc executables.

svn path=/nixpkgs/trunk/; revision=8723
2007-05-20 21:09:49 +00:00
Eelco Dolstra
b8dae869b3 * Trying to get gcc 4.2.0 to compile...
* Compute --enable-languages in the Nix expression instead of in the
  builder.
* Pass some flags through the Make command line instead of patching
  the Makefiles.
* gcc: generate code for i686 by default (instead of i386).
* gcc: patch out some references to /lib and /usr/lib.

svn path=/nixpkgs/trunk/; revision=8722
2007-05-20 20:27:55 +00:00
Armijn Hemel
8191ee8927 fix patch, still does not build cleanly
svn path=/nixpkgs/trunk/; revision=8716
2007-05-17 23:37:57 +00:00
Armijn Hemel
15c8486e51 gcc 4.2.0 stubs. untested.
svn path=/nixpkgs/trunk/; revision=8715
2007-05-17 16:27:54 +00:00
Eelco Dolstra
41291a5b26 * Fix Mesa-related evaluation errors.
svn path=/nixpkgs/trunk/; revision=8708
2007-05-16 14:49:28 +00:00
Andres Löh
e3f701c311 * ghc version 6.6.1
svn path=/nixpkgs/trunk/; revision=8654
2007-05-06 15:39:39 +00:00
Eelco Dolstra
0caae36936 * Purity fix: don't use /usr/bin/install.
svn path=/nixpkgs/trunk/; revision=8619
2007-04-26 22:28:26 +00:00
Armijn Hemel
52cb80f235 remove cross compilers. Work is done on a seperate branch and these compilers are not functional anyway right now.
svn path=/nixpkgs/trunk/; revision=8587
2007-04-16 21:45:29 +00:00
Eelco Dolstra
0005a37b8d * In the JDK packages, don't return false if the platform is
unsupported.  This gives a type error ("value is a boolean while 
  an attribute set was expected").

svn path=/nixpkgs/trunk/; revision=8576
2007-04-16 10:07:06 +00:00
Eelco Dolstra
61171e3f15 * Fix GCC 3.3.
svn path=/nixpkgs/trunk/; revision=8478
2007-03-29 13:37:39 +00:00
Martin Bravenboer
753eae47d1 jdk-without-plugin fix
svn path=/nixpkgs/trunk/; revision=8460
2007-03-28 18:29:26 +00:00
Martin Bravenboer
a9c0d60adb disabled sharpbang test
svn path=/nixpkgs/trunk/; revision=8458
2007-03-28 17:49:51 +00:00
Martin Bravenboer
f92b856311 added ncurses support to ocaml
svn path=/nixpkgs/trunk/; revision=8457
2007-03-28 17:15:03 +00:00
Martin Bravenboer
9d9372cd58 Make jdk plugin support optional to avoid deps on gcc 3.3.6 everywhere.
svn path=/nixpkgs/trunk/; revision=8452
2007-03-28 15:21:43 +00:00
Eelco Dolstra
e0ad264f43 * Get GCC 3.3 to build on x86_64/powerpc-linux. Not tested.
svn path=/nixpkgs/trunk/; revision=8439
2007-03-28 12:29:36 +00:00
Martin Bravenboer
fb91f1b319 M pkgs/development/compilers/jdk/jdk6-linux.nix
M    pkgs/development/compilers/jdk/dlj-bundle-builder.sh

Various fixes to get javaws and mozillaPlugin to work. Requires gcc3.3
libstdc++ to be in the dynamic library path.


svn path=/nixpkgs/trunk/; revision=8434
2007-03-27 22:02:55 +00:00
Martin Bravenboer
778d516e41 A pkgs/tools/typesetting/pdfjam
A    pkgs/tools/typesetting/pdfjam/builder.sh
A    pkgs/tools/typesetting/pdfjam/default.nix

Added pdfjam, a package with the following tools:

    * pdfnup, which allows PDF files to be "n-upped" in roughly the
      way that psnup does for PostScript files.

    * pdfjoin, which concatenates the pages of multiple PDF files
      together into a single file

    * pdf90, which rotates the pages of one or more PDF files through
      90 degrees (anti-clockwise).

M    pkgs/development/compilers/jdk/jdk6-linux.nix

Typo


svn path=/nixpkgs/trunk/; revision=8404
2007-03-21 12:53:01 +00:00
Martin Bravenboer
d86846bb6a Fixes in x86_64 support for the jdk.
svn path=/nixpkgs/trunk/; revision=8329
2007-03-18 00:33:32 +00:00
Martin Bravenboer
03dbe4cf1f Added x86_64-linux support to the jdk.
svn path=/nixpkgs/trunk/; revision=8326
2007-03-17 14:37:23 +00:00
Martin Bravenboer
c212318239 patch unpack200 before running the construct script
svn path=/nixpkgs/trunk/; revision=8198
2007-03-05 21:33:47 +00:00
Martin Bravenboer
038454978f Use unzip to avoid unpurities
svn path=/nixpkgs/trunk/; revision=8196
2007-03-05 19:54:37 +00:00
Martin Bravenboer
3b1d307518 More deps on xlibs
svn path=/nixpkgs/trunk/; revision=8188
2007-03-05 17:55:17 +00:00
Martin Bravenboer
25e0bf0f49 oops.
svn path=/nixpkgs/trunk/; revision=8187
2007-03-05 17:29:21 +00:00
Martin Bravenboer
6892b99bf6 Update of jdk and jre to jdk-distros, based on Distributor License for Java.
D    pkgs/development/interpreters/jre

Obsolete. jdk and jre are now build by the same expression.

D    pkgs/development/compilers/blackdown

Obsolete. jdk is now downloadable.

D    pkgs/development/compilers/jdk/jdk5-sun-linux.nix

Obsolete

A    pkgs/development/compilers/jdk/dlj-bundle-builder.sh

Build for DLJ bundles.

M    pkgs/top-level/all-packages.nix

Dropped blackdown and ant based on blackdown.

A    pkgs/development/compilers/jdk/jdk6-construct.sh

Copy of DLJ construct script to fix problem with jdk6 bundles.

A    pkgs/development/compilers/jdk/jdk6-linux.nix

New main Nix expression for jdk and jre. Supports mozillaPlugin.

A    pkgs/development/compilers/jdk/dlj-bundle-builder.sh

Include path to libjli in rpath.


svn path=/nixpkgs/trunk/; revision=8186
2007-03-05 17:13:53 +00:00
Eelco Dolstra
279c1e343e * ghc-pkg wrapper: remove --global; it's not needed and it causes
problems (e.g., with ghc-pkg -s PKGNAME).

svn path=/nixpkgs/trunk/; revision=7790
2007-01-24 14:26:50 +00:00
Eelco Dolstra
f861c8b66c * makeFlags -> buildFlags in a few places.
svn path=/nixpkgs/trunk/; revision=7503
2006-12-27 18:34:35 +00:00
Arie Middelkoop
afde8e6270 Added GHC 6.6.
note: the old GHC 6.4(.2?) version is still there. I reused the bootstrap-version to bootstrap GHC-6.6. And some other packages depend on the old GHC 
version as well.

note: only use this package for building other packages. If you install it as an end-user, you'll only be able to use the default GHC libraries, 
because other libraries are only privately registered to this GHC version during a nix-build by hooks (which are not executed when you run GHC 
yourself as an end-user).

Consequently, also added a newer version of uulib and uuagc.

svn path=/nixpkgs/trunk/; revision=7346
2006-12-15 13:32:55 +00:00
Eelco Dolstra
711bb9b56a * Fix GCC 3.3.
svn path=/nixpkgs/trunk/; revision=6904
2006-10-30 11:58:24 +00:00
Eelco Dolstra
0b78c04601 * Fix gcc 3.3.
svn path=/nixpkgs/trunk/; revision=6898
2006-10-28 23:41:45 +00:00
Eelco Dolstra
3a6754f6bb * gcc-4.1-temp -> gcc-4.1.
* Use real URLs.

svn path=/nixpkgs/trunk/; revision=6884
2006-10-27 23:14:41 +00:00
Eelco Dolstra
b7a96d74e2 svn path=/nixpkgs/trunk/; revision=6883 2006-10-27 23:13:44 +00:00
Eelco Dolstra
3ea7d9d272 * Fix static linking in gcc.
* Use the coreutils in dietlibc.
* Add objdump to the binutils static tarball.

svn path=/nixpkgs/trunk/; revision=6879
2006-10-27 20:08:53 +00:00
Eelco Dolstra
b90781ec21 * Renamed orig-glibc -> orig-libc in some places, and in others, use
the new $NIX_GCC/nix-support/dynamic-linker file to locate the
  dynamic linker directly (don't hardcode ld-linux.so.2).

svn path=/nixpkgs/trunk/; revision=6873
2006-10-27 12:43:32 +00:00
Eelco Dolstra
2d3cfb2058 * Put back in the code to do a profiled GCC build, but turn in off
(build ICEs).

svn path=/nixpkgs/trunk/; revision=6861
2006-10-26 20:23:49 +00:00
Eelco Dolstra
eb4584c0cb * Merge the gcc-4.1 changes into 3.4.
svn path=/nixpkgs/trunk/; revision=6855
2006-10-26 11:25:29 +00:00
Eelco Dolstra
4be38f2f31 * No longer needed.
svn path=/nixpkgs/trunk/; revision=6851
2006-10-25 16:32:33 +00:00
Eelco Dolstra
7f9a2ecc16 * Fix building in an impure environment.
svn path=/nixpkgs/trunk/; revision=6841
2006-10-25 09:50:58 +00:00
Eelco Dolstra
1a7576f193 * Get the g++ tarball unconditionally, otherwise the patch won't apply.
svn path=/nixpkgs/trunk/; revision=6840
2006-10-25 09:23:20 +00:00
Eelco Dolstra
69ee353dc7 * glibc-2.5 is the default now.
* Remove gcc-static-3.4.

svn path=/nixpkgs/trunk/; revision=6831
2006-10-24 22:23:20 +00:00
Eelco Dolstra
b342dcb13b * gcc-wrapper: separately store the flags necessary to find GCC and
Glibc.  This is useful when building GCC.
* gcc-wrapper: the dynamic linker has a different name on x86_64 and
  powerpc.
* gcc-wrapper: "glibc" -> "libc", because someday we might support
  different C libraries.
* gcc: don't do a multilib build (e.g., 32-bit support on x86_64),
  don't need it.
* gcc: merge in support for static builds.
* gcc: various simplifications in the compiler/linker flags, hope they
  work.

svn path=/nixpkgs/trunk/; revision=6823
2006-10-24 18:26:23 +00:00
Eelco Dolstra
0cf5154681 * Build a static GCC, properly. (Reminder: when building GCC on an
impure x86_64 environment, make sure that the 32-bit GCC / Glibc
  libraries are installed, such as /usr/lib/crti.o.)

svn path=/nixpkgs/trunk/; revision=6818
2006-10-24 11:36:19 +00:00
Eelco Dolstra
c466083d3f * Don't build unnecessary libraries.
svn path=/nixpkgs/trunk/; revision=6812
2006-10-23 21:51:08 +00:00
Eelco Dolstra
b495d3f65e * Trying to get gcc-static to build on x86_64. Still doesn't work though.
svn path=/nixpkgs/trunk/; revision=6809
2006-10-23 18:56:43 +00:00
Eelco Dolstra
6aefff0061 * Fix for NIXPKGS-30: make libstdc++'s configure script correctly
identify the features of the compiler / C library.  Specifically, it
  should find out that functions like floorf() are available and not
  substitute its own versions that have the unfortunate tendency of
  going off into an infinite recursion.

svn path=/nixpkgs/trunk/; revision=6738
2006-10-16 07:05:36 +00:00
Eelco Dolstra
ef9b025dbe * Remove a bunch of unused Nix expressions.
svn path=/nixpkgs/trunk/; revision=6716
2006-10-12 15:43:01 +00:00
Eelco Dolstra
ad897a7c96 * Update more URLs.
svn path=/nixpkgs/trunk/; revision=6713
2006-10-12 14:53:45 +00:00
Eelco Dolstra
d030e2fdd7 * Removed Harp.
svn path=/nixpkgs/trunk/; revision=6712
2006-10-12 14:29:05 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra
368c196a62 * More descriptions.
svn path=/nixpkgs/trunk/; revision=6709
2006-10-12 10:53:16 +00:00
Eelco Dolstra
6006d61835 * Added a bunch of descriptions.
svn path=/nixpkgs/trunk/; revision=6705
2006-10-11 16:45:55 +00:00
Martin Bravenboer
98038f9592 PowerPC environment is not pure, so patching is useless
svn path=/nixpkgs/trunk/; revision=6406
2006-08-31 02:06:31 +00:00
Martin Bravenboer
6bae4d7e4e Prelim. support for JDK on PowerPC using IBM's SDK
svn path=/nixpkgs/trunk/; revision=6405
2006-08-31 01:51:41 +00:00
Martin Bravenboer
80e695bfca PKG_CONFIG_PATH no longer required
svn path=/nixpkgs/trunk/; revision=6268
2006-08-27 12:52:56 +00:00
Martin Bravenboer
9706572beb Hack hack
svn path=/nixpkgs/trunk/; revision=6264
2006-08-27 03:50:20 +00:00
Martin Bravenboer
eac3336cd6 Hack hack
svn path=/nixpkgs/trunk/; revision=6263
2006-08-27 03:49:09 +00:00
Martin Bravenboer
0ff3af3d00 Hack hack
svn path=/nixpkgs/trunk/; revision=6262
2006-08-27 03:45:51 +00:00
Martin Bravenboer
961b20c1b7 Added pre release of stratego libraries, fixed support for configureFlags in MinGW, add binary pkg-config distribution for bootstrapping. Optionally use pkgconfig from the stdenv (again, for bootstrapping)
svn path=/nixpkgs/trunk/; revision=6253
2006-08-26 20:11:31 +00:00
Armijn Hemel
6c7ea78070 fix compilation so we can build a statically linked gcc with an impure environment. Needs "noSysDirs = false" passed as a parameter in all-packages.nix, or whatever.
svn path=/nixpkgs/trunk/; revision=6247
2006-08-25 23:24:41 +00:00
Armijn Hemel
b6811b43f1 pass noSysDirs for static gcc
svn path=/nixpkgs/trunk/; revision=6246
2006-08-25 22:19:16 +00:00
Armijn Hemel
1a2f1130cb 3.4.2 -> 3.4.6
We should update the whole Nix "static baseline" soon...ish

svn path=/nixpkgs/trunk/; revision=6244
2006-08-25 21:20:04 +00:00
Armijn Hemel
1b17f45ef5 add a statically linked gcc-4.1
svn path=/nixpkgs/trunk/; revision=6056
2006-08-05 13:50:42 +00:00
Martin Bravenboer
799e451a26 Updated abc to version 1.2.0
svn path=/nixpkgs/trunk/; revision=6021
2006-08-02 17:27:42 +00:00
Martin Bravenboer
6fa02079b8 Update of aspectj to 1.5.2
svn path=/nixpkgs/trunk/; revision=6019
2006-08-02 16:42:52 +00:00
Eelco Dolstra
3defd9a3d3 * On Darwin, use Apple's gcc fork.
svn path=/nixpkgs/trunk/; revision=5715
2006-07-14 22:34:24 +00:00
Eelco Dolstra
4d7f947bcb * GCC 4.0.3.
svn path=/nixpkgs/trunk/; revision=5676
2006-07-11 07:55:38 +00:00
Eelco Dolstra
1165fdd247 * More fixes.
svn path=/nixpkgs/trunk/; revision=5513
2006-06-24 11:16:29 +00:00
Eelco Dolstra
7682bf3d1e * Make it easier to override parts of stdenv (like gcc or make) per
package using the `overrideGCC' and `overrideInStdenv' functions.

svn path=/nixpkgs/trunk/; revision=5505
2006-06-23 20:11:36 +00:00
Eelco Dolstra
45e1edfda8 * Give the GHC builder a temporary $HOME.
svn path=/nixpkgs/trunk/; revision=5504
2006-06-23 20:08:48 +00:00
Eelco Dolstra
3042581b2a * Disable some stuff.
* Use GNU make 3.80 for StrategoXT.
* Updated octave.

svn path=/nixpkgs/trunk/; revision=5502
2006-06-23 14:04:32 +00:00
Eelco Dolstra
fc37dbc487 * GCC 3.4.6.
svn path=/nixpkgs/trunk/; revision=5496
2006-06-23 11:09:07 +00:00
Eelco Dolstra
2bbb426a7d * GHC 6.4.2.
svn path=/nixpkgs/trunk/; revision=5493
2006-06-22 15:22:55 +00:00
Eelco Dolstra
9af9b95298 * Make GCC 4.1.1 the default compiler for Nixpkgs.
svn path=/nixpkgs/trunk/; revision=5481
2006-06-21 15:54:18 +00:00
Martin Bravenboer
0d6c1cb83b Updates of jre and jdk
svn path=/nixpkgs/trunk/; revision=5395
2006-06-06 19:43:31 +00:00
Eelco Dolstra
1a9b6bb4ad * Microsoft Windows SDK, purified. Small problem: building the SDK
takes huge amounts of temporary disk space (almost 2 GB).  Oh well.

svn path=/nixpkgs/trunk/; revision=5386
2006-06-05 22:03:52 +00:00
Eelco Dolstra
fef1bdfad1 * Make it work.
svn path=/nixpkgs/trunk/; revision=5385
2006-06-05 20:23:24 +00:00
Eelco Dolstra
d571eaafb3 * Started adding the Windows SDK.
svn path=/nixpkgs/trunk/; revision=5384
2006-06-05 19:40:14 +00:00
Eelco Dolstra
588383905a * Download and unpack Visual C++ 2005 Express Edition.
svn path=/nixpkgs/trunk/; revision=5383
2006-06-05 19:26:11 +00:00
Eelco Dolstra
51640ca1ab * Oops.
svn path=/nixpkgs/trunk/; revision=5371
2006-06-02 12:05:03 +00:00
Eelco Dolstra
08d3840c94 * A Hello World GUI application compiled with VC++.
svn path=/nixpkgs/trunk/; revision=5370
2006-06-02 10:09:19 +00:00
Eelco Dolstra
91aebd8616 * A wrapper around the Visual C++ compiler and the Windows SDK.
TODO: download and unpack into the Nix store Visual C++ (either from
  Visual C++ Express Edition or from the .NET 2.0 Framework SDK) and
  the Windows Platform SDK.  The command line tools don't seem to need
  any registry settings...

svn path=/nixpkgs/trunk/; revision=5369
2006-06-02 09:56:10 +00:00
Martin Bravenboer
8dbf2c38fb * Update of jre
* Added aspectj-1.5.0


svn path=/nixpkgs/trunk/; revision=5110
2006-03-26 03:52:55 +00:00
Martin Bravenboer
d88e2ea70f Added abc 1.1.1.
svn path=/nixpkgs/trunk/; revision=5109
2006-03-26 03:21:32 +00:00
Eelco Dolstra
09a9cae715 * Merged the usability branch (from trunk@4749 to branches/usability@5087).
svn path=/nixpkgs/trunk/; revision=5088
2006-03-24 12:25:19 +00:00
Eelco Dolstra
baec8f5b38 * stdenv.mkDerivation now takes an optional attribute "meta" that
contains arbitrary information about a package, like this:

  meta = {
    homepage = "http://gcc.gnu.org/";
    license = "GPL/LGPL";
    description = "GNU Compiler Collection, 4.0.x";
  };

  The "meta" attribute is not passed to the actual derivation
  operation, so it's not a dependency --- changes to "meta" attributes
  don't trigger a recompilation.

  Now we have to standardise some useful attributes ;-)

svn path=/nixpkgs/branches/usability/; revision=5024
2006-03-10 16:12:46 +00:00
Eelco Dolstra
4c63a4a97a * Don't pass Blackdown to firefox-wrapper unless it is actually built.
svn path=/nixpkgs/branches/usability/; revision=4999
2006-03-08 16:03:47 +00:00
Armijn Hemel
6bec50fda1 add gcc-4.1. The no-sys-dirs.patch had to be regenerated because a lot of stuff had been reworked in the Makefiles for 4.1.
svn path=/nixpkgs/trunk/; revision=4961
2006-03-01 19:09:53 +00:00
Merijn de Jonge
ebe59d3d21 fixed ocaml/qcmm problem:
-created separate nix expressions for ocaml-3.08.0 and ocaml 3.09.1
-ocam-3.09.1 is standard/default ocaml version (included by ocaml/default.nix)
-created ocaml3080 in all-packages-generic.nix
-qcmm now uses ocaml3080 instead of ocaml


svn path=/nixpkgs/trunk/; revision=4935
2006-03-01 09:18:22 +00:00
Merijn de Jonge
90666e6eff Updated ocaml to version 3.09.1
svn path=/nixpkgs/trunk/; revision=4882
2006-02-23 09:30:40 +00:00
Christof Douma
3c68c34ee7 build native qc-- version only (with ocamlopt). This removes the runtime dependency on ocaml.
svn path=/nixpkgs/trunk/; revision=4682
2006-02-02 20:14:11 +00:00
Christof Douma
1fa4c66b73 added version to uuagc
added: noweb, lua-5.x, lua-4.x, mk, qc-- (as qcmm)

svn path=/nixpkgs/trunk/; revision=4681
2006-02-02 17:07:07 +00:00
Andres Löh
51e287469c * ghc should call the gcc instance it's been built with (to compile Haskell code)
svn path=/nixpkgs/trunk/; revision=4658
2006-01-31 23:58:32 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Armijn Hemel
accbe1d1a7 update to jdk-1_5_0_06-linux-i586.bin
svn path=/nixpkgs/trunk/; revision=4618
2006-01-30 14:25:19 +00:00
Christof Douma
8d4e61d096 change uulib to store all dependencies to package.conf
added ghc-wrapper to use a generated global package.conf
added uuagc

svn path=/nixpkgs/trunk/; revision=4608
2006-01-27 10:16:15 +00:00
Armijn Hemel
7625850ab3 a patch which defines FLAGS_FOR_TARGET. This patch is not enabled by default
svn path=/nixpkgs/trunk/; revision=4585
2006-01-23 11:53:33 +00:00
Eelco Dolstra
57315e624d * Fix the gcc-4.0.2 build. It was impure: it used /lib/cpp during the
building of libstdc++.
* Add gcc-4.0.2 to the channel.  

svn path=/nixpkgs/trunk/; revision=4583
2006-01-20 17:27:53 +00:00
Armijn Hemel
560a2d3c10 make a symlink to an existing "ar"
svn path=/nixpkgs/trunk/; revision=4468
2005-12-31 15:56:07 +00:00
Armijn Hemel
2f3dfaa5b9 make our cross compiler a lot more generic.
svn path=/nixpkgs/trunk/; revision=4464
2005-12-31 14:09:44 +00:00
Eelco Dolstra
b43c421658 * JDK: put the machine-dependent header files in the right place.
* Added SWT for GTK (built from source).
* Added Azureus (a Bittorrent client written in Java).

svn path=/nixpkgs/trunk/; revision=4438
2005-12-26 00:51:24 +00:00
Martin Bravenboer
83afd0c173 Added Transformers 0.4
svn path=/nixpkgs/trunk/; revision=4405
2005-12-22 07:39:06 +00:00
Eelco Dolstra
94fe7734fa * Glibc 2.3.6.
* GCC 3.4.5.
* Updated several other stdenv packages.
* Modified the builders of several packages to use the generic
  builder.

svn path=/nixpkgs/trunk/; revision=4336
2005-12-06 00:12:45 +00:00
Eelco Dolstra
82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Eelco Dolstra
b6befed50e * Updated SDL, NASM and Generator to the latest versions.
* Moved Generator to the misc/emulators directory.

svn path=/nixpkgs/trunk/; revision=4330
2005-12-03 01:33:18 +00:00
Armijn Hemel
3f3636a403 we need this patch (the famous "-Dinhibit_libc hack") to get stuff compiled
properly

svn path=/nixpkgs/trunk/; revision=4315
2005-11-28 21:58:24 +00:00
Armijn Hemel
2748236699 add cross compilers for ARM, only able to compile C code
svn path=/nixpkgs/trunk/; revision=4313
2005-11-28 11:20:59 +00:00
Martin Bravenboer
9da2209bf0 Update of strategoxt-utils
svn path=/nixpkgs/trunk/; revision=4236
2005-11-04 19:20:51 +00:00
Martin Bravenboer
50a2b624f7 fix
svn path=/nixpkgs/trunk/; revision=4223
2005-11-04 13:38:29 +00:00
Martin Bravenboer
e45e5c724d Upgrade of strategoxt to 0.16
svn path=/nixpkgs/trunk/; revision=4222
2005-11-04 13:34:35 +00:00
Martin Bravenboer
4ba92bbd4e * Added unstable pre release of Stratego/XT 0.16
* Upgraded bibtex-tools to latest unstable release.


svn path=/nixpkgs/trunk/; revision=4176
2005-10-31 14:28:11 +00:00
Martin Bravenboer
2c6d747823 Update to 4.0.2
svn path=/nixpkgs/trunk/; revision=4170
2005-10-30 23:58:42 +00:00
Eelco Dolstra
3c1c258aa5 * Use PatchELF 0.1.
svn path=/nixpkgs/trunk/; revision=4062
2005-10-11 13:31:33 +00:00
Eelco Dolstra
7112b86997 * Export swingSupport attribute.
svn path=/nixpkgs/trunk/; revision=4032
2005-10-08 13:31:39 +00:00
Eelco Dolstra
5b63bb66f7 * Purification of JDK 5. At runtime it now uses the Nix-deployed
Glibc and X11 client libraries.  The latter are actually optional
  dependencies: if the function is called with `swingSupport' set to
  `false', they are not needed.  This is nice for, e.g., server
  environments.

  All hail Patchelf!

svn path=/nixpkgs/trunk/; revision=4030
2005-10-07 22:27:42 +00:00
Eelco Dolstra
881f4b0db1 * Use unzip to unpack the JDK. Then unpack the *.pack files. The
advantage is that we don't have to run the Sun installer (which is
  impure).

  TODO: make sure that all the other JDK versions still work.

svn path=/nixpkgs/trunk/; revision=4029
2005-10-07 14:49:37 +00:00
Eelco Dolstra
45f652ce1b * Pass readline and ncurses to the source-built ghc as well.
svn path=/nixpkgs/trunk/; revision=4013
2005-10-04 20:16:33 +00:00