Commit graph

1448 commits

Author SHA1 Message Date
Eelco Dolstra 6d27c9d5c3 gcc: Fix building on 32-bit Glibc 2.16
http://hydra.nixos.org/build/3046633
2012-09-21 10:53:56 -04:00
Peter Simons 0de6725105 haskell-idris: update to version 0.9.3.1 2012-09-21 16:36:24 +02:00
Peter Simons 8363515431 haskell-idris: update to version 0.9.3 2012-09-17 16:17:55 +02:00
Peter Simons 33e67e8394 ghc-head: update to version 7.7.20120912 2012-09-13 15:50:15 +02:00
Peter Simons 52454d7593 ghc-7.4.2: add binary snapshot required for bootstrapping ghc 7.7.x 2012-09-13 15:49:42 +02:00
Peter Simons eb288cf12e ghc-wrapper: choose '-package-conf' or '-package-db' flag depending on the version of GHC that's being wrapped 2012-09-13 15:13:00 +02:00
Peter Simons 13be1ff86e ghc-wrapper.nix: cosmetic 2012-09-13 15:12:43 +02:00
Peter Simons 7596ce3dbb Remove myself as maintainer of these packages. 2012-09-11 18:22:31 +02:00
Peter Simons 15df3d131a ghc-7.6.1: parallel builds of this package fail
I got the following error in 4 consecutive attempts:

  building rts/dist/build/AutoApply.debug_o
  building rts/dist/build/AutoApply.thr_o
    rts_dist_HC rts/dist/build/AutoApply.debug_o
  /nix/store/1iigiim5855m8j7pmwf5xrnpf705s4dh-binutils-2.21.1a/bin/ld: cannot find libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers_o_split/gmp-wrappers__1.o
  collect2: ld returned 1 exit status
  make[1]: *** [libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers.p_o] Error 1
2012-09-10 12:28:25 +02:00
Peter Simons 64c0d7a490 ghc: bump 7.6.1-rc1 to version 7.6.1 2012-09-10 11:30:12 +02:00
Peter Simons ef649da119 polyml: fix bogus license attribute 2012-09-06 18:46:54 +02:00
Marco Maggesi 264c528154 Upgrade PolyML to version 5.4.1 2012-09-04 12:02:18 +02:00
Michael Raskin da01cdaa82 Update Julia to latest revision, include zlib in dependencies 2012-09-04 09:32:59 +04:00
Lluís Batlle i Rossell 6bff865155 mono: fixing build
it looks like it doesn't like parallel builds.
2012-09-02 09:06:30 +02:00
Rickard Nilsson 59180564d5 dev86: Update to 0.16.19 (old sources disappeared) 2012-08-30 11:07:45 +02:00
Shea Levy f4bc57feba openjdk: passthru the architecture attribute like oracle jdk6 does. 2012-08-27 12:41:13 -04:00
Lluis Batlle e5bf4de6b6 go: improving the expression so it works if overriden by hg src
Users might want to override the 'src' and 'name' of go from 'hg'.
I make the expression compatible with that.

Aside, I also set GOARM in the wrapper for it to build programs fine on
armv5tel by default.
2012-08-26 23:16:29 +02:00
Lluis Batlle df35189985 go: Removing an out of date comment 2012-08-26 23:16:27 +02:00
Lluis Batlle bf007753d1 go: make it accept armv5tel
It doesn't build though, due to some problems fixed in go trunk. But
I failed to port them over to 1.0.2.
2012-08-26 23:16:26 +02:00
Shea Levy 84e1da4b09 openjdk bootstrap tarballs are on nixos.org now. 2012-08-25 17:55:21 -04:00
aszlig ca3f140e9b urweb: Use lib.licenses.bsd3 in meta attributes. 2012-08-25 16:08:01 +02:00
aszlig 9dace1124e urweb: Update to version 20120807.
The previous version seemed rather old and not even the examples from the
official site compile with that fossil. As there are no reverse dependencies,
this update should be trivial and hopefully doesn't hurt someones personal
feelings.
2012-08-25 16:06:21 +02:00
Shea Levy 228c35f0b2 openjdk: Build from bootstrap 2012-08-24 23:05:41 -04:00
Shea Levy a4b39fac65 openjdk-bootstrap: nukerefs the whole thing and put it in a tarball 2012-08-24 08:30:48 -04:00
Shea Levy 6ed6d1c5c0 Add expression to create an openjdk bootstrap capable of building the full openjdk 2012-08-23 23:07:38 -04:00
Eelco Dolstra 2bc9508034 Prevent the JDK from appearing in the Nixpkgs channel 2012-08-22 15:43:19 -04:00
Eelco Dolstra 8020c37f55 Remove obsolete JDK versions
These are the JDK 5 on powerpc-linux (no longer a maintained Nixpkgs
platform), JDK 1.4 (required a manual download) and JDK 5 on Linux
(idem).
2012-08-22 15:43:19 -04:00
Peter Simons 1f18f24387 gcc-4.7: download source code from a mirror instead of hard-coding the URL of the master site 2012-08-22 14:30:15 +02:00
Ludovic Courtès 255c72ede6 gcc 4.5: Update to 4.5.4. 2012-08-20 10:15:17 +02:00
Michael Raskin b32844654b Julia: update source revision 2012-08-18 20:52:52 +04:00
Peter Simons 2253afb4f1 scala: cosmetic 2012-08-16 15:49:00 +02:00
Peter Simons 7ab915da52 scala: enable 'fixupPhase' (among other things) which corrects the shebang paths of the installed scripts 2012-08-16 15:48:18 +02:00
Andres Loeh e093d7ea38 ghc-7.6.1-rc1: Add release candidate. 2012-08-13 16:29:01 +02:00
Michael Raskin 801dee4a36 SBCL: update to 1.0.58 2012-08-09 13:01:04 +04:00
Lluís Batlle i Rossell 6655bc783e go: patching it to get the nixos cacert bundle taken just fine 2012-08-05 20:50:54 +02:00
Lluís Batlle i Rossell f682ff3521 gcc47: disabling parallel build if profiled bootstrap required
The gccinstall manual says that parallel building with a profiled
bootstrap is not supported. As we don't have much means of checking
if our profiled bootstrap with parallel build was good or bad, I
propose going to safe terrain.
2012-08-03 19:59:43 +02:00
Lluís Batlle i Rossell 592b980931 gccgo46: removing it. I set gccgo = gcc47
gccgo46 did not build for me, and maybe never built at all.
The same recipe, though, worked fine for gcc47. So let's go with gcc47.
2012-08-03 19:52:19 +02:00
Lluís Batlle i Rossell a375ffa53f Adding gccgo for gcc4.7.
I tested hello world, and it works.
2012-08-03 19:49:53 +02:00
Michael Raskin 901574fe8a Julia language: update to a fresh version
Update julia and some of its dependencies

Split PCRE because a lot of packages depend on it and I am not sure we
want to test them in a hurry (and Julia specifies exact version).
2012-08-02 17:48:36 +04:00
Lluís Batlle i Rossell 7954b01342 Adding gcc 4.7.1. 2012-08-02 12:53:30 +02:00
Arie Middelkoop 5bc99bc883 Adds Ocaml 4.00.0 (first attempt)
Bumps Findlib to 1.3.3 (required for ocaml 4.00)
2012-07-31 14:09:27 +02:00
Lluís Batlle i Rossell e58b351734 go: updating to 1.0.2
I've only tried it in 386. We'll see if it works on amd64.
2012-07-29 17:24:19 +02:00
Lluís Batlle i Rossell c0832627c4 ocaml, unison: make them build on mips (native compilers)
I switch off the build of ocaml compilers to native code, and add
a 'passthru' that unison can use to see if it needs to call the native
or the bytecode compiler.
2012-07-27 22:43:40 +02:00
Andres Loeh 83505f15b2 ghc-head: bump snapshot version 2012-07-18 11:02:00 +02:00
Andres Loeh 945a3480d4 ghc-HEAD: update to a new snapshot 2012-07-11 20:04:15 +02:00
Michael Raskin 253c129f78 SBCL: update to 1.0.57
It looks like SBCL 1.0.58 is not coming soon, so I update to the latest
release now.
2012-07-07 20:11:55 +04:00
Shea Levy 9117819e60 Merge pull request #24 from antono/fix-ikarus-url
Fix ikarus download url (ikarus-scheme.org is down)
2012-06-26 20:27:43 -07:00
Antono Vasiljev 58738223ab Rm vala 14 add versions 2012-06-25 19:01:51 +03:00
Antono Vasiljev e6e6301c5f Vala 14, 15, 16, 17. Default is 17 now 2012-06-25 16:46:26 +03:00
Antono Vasiljev 019963b256 Fix ikarus download url (ikarus-scheme.org is down) 2012-06-25 15:34:05 +03:00
Mathijs Kwik c0efa356fc uhc: fixed building on ghc 7.2.1+
by removing the check for the 'binary' package, which is built-in from
that version onward. This is a workaround for the problem where ghc's
built-in libraries (like containers, array, binary) don't show up in
"ghc-pkg list" output.

svn path=/nixpkgs/trunk/; revision=34471
2012-06-11 18:58:28 +00:00
Peter Simons 09321105f1 ghc: added version 7.4.2
svn path=/nixpkgs/trunk/; revision=34460
2012-06-11 16:25:45 +00:00
Karn Kallio ea102b34f6 Patch PAKCS to build with GHC 7.4.1 .
Also fix symbolic links to emacs lisp files.

svn path=/nixpkgs/trunk/; revision=34430
2012-06-11 06:05:18 +00:00
Andres Löh 789df7619e Updated GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=34379
2012-06-08 08:25:30 +00:00
Marco Maggesi cadc02cb2b Fix build of ocaml 3.12.1 on darwin
svn path=/nixpkgs/trunk/; revision=34373
2012-06-06 20:44:11 +00:00
Michael Raskin f6b2f17bc3 Given that I have a vested interest in working LLVM now - add myself as maintainer
svn path=/nixpkgs/trunk/; revision=34302
2012-05-31 11:26:16 +00:00
Michael Raskin 2de23edd59 Adding LLVM 3.1. (as a separate attribute, because it seems to be API-incompatible)
svn path=/nixpkgs/trunk/; revision=34300
2012-05-31 11:04:28 +00:00
Lluís Batlle i Rossell 44b2d21212 Mingw changes to gcc.
Removing a gcc flag, --enable-version-specific-runtime-libs, that put gcc libs
in a speparate directory instead of /lib; this broke the installation of
libgcc_s.a for the case of "--enable-shared" in mingw-w64. And we already have all gccs in directories apart.

I also add the option --enable-fully-dynamic-string, which is used in the
prebuilt mingw64 toolchain; this way nixpkgs creates ABI-compatible binaries
with mingw64 upstream. (told by jon_y on irc ##mingw)


svn path=/nixpkgs/trunk/; revision=34242
2012-05-25 13:49:01 +00:00
Lluís Batlle i Rossell e9186a03b9 Making gcc not build libgomp with uclibc, as it lacks '-ldl' in its checks and
I don't know how to add it.
This makes gcc build with uclibc.


svn path=/nixpkgs/trunk/; revision=34231
2012-05-24 21:45:49 +00:00
Lluís Batlle i Rossell d9fdfffef9 Fixing the mingw cross gcc. I set it not to build shared libraries, because its specs for
shared libraries are wrong.
It should run "-lstdc++ -lsupc++" if libstdc++-6.dll is available, and instead it runs
"-lstdc++" and therefore lack symbols.

I think simply few people use shared gcc libs on mingw.


svn path=/nixpkgs/trunk/; revision=34225
2012-05-24 19:02:27 +00:00
Andres Löh 7aa85ac536 Adding NVIDIA CUDA toolkit and haskell-accelerate-cuda plus deps.
svn path=/nixpkgs/trunk/; revision=34186
2012-05-20 17:38:03 +00:00
Andres Löh e5e2432277 Upgrade ghc stable snapshot to 7.4.2rc1.
svn path=/nixpkgs/trunk/; revision=34137
2012-05-16 12:00:05 +00:00
Mathijs Kwik 206c6b1bbb upgraded uhc
svn path=/nixpkgs/trunk/; revision=34026
2012-05-09 10:01:41 +00:00
Michael Raskin 36b543a26e Fixing webserver path..
svn path=/nixpkgs/trunk/; revision=34005
2012-05-07 16:34:58 +00:00
Michael Raskin 063b03b650 Update Julia; a few fixes get included; changes to build system
svn path=/nixpkgs/trunk/; revision=33968
2012-05-02 03:14:05 +00:00
Michael Raskin 9683cada87 Update ECL
svn path=/nixpkgs/trunk/; revision=33947
2012-04-30 08:14:19 +00:00
Ludovic Courtès d44d30b0ba GHC 7.4.2: Remove `darwinInstallNameToolUtility'.
svn path=/nixpkgs/trunk/; revision=33897
2012-04-23 16:28:10 +00:00
Ludovic Courtès b53f6b9dd0 GCC 4.6: Don't bail out when `gnused' isn't provided.
svn path=/nixpkgs/trunk/; revision=33896
2012-04-23 16:28:06 +00:00
Ludovic Courtès 29bc53265d Darwin: Use GCC 4.6 in `stdenvNix'.
svn path=/nixpkgs/trunk/; revision=33894
2012-04-23 15:47:37 +00:00
Ludovic Courtès 04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Karn Kallio 50cab85e88 Fix mlton build: apply Marc Weber patch and update download URL.
svn path=/nixpkgs/trunk/; revision=33882
2012-04-22 20:39:43 +00:00
Andres Löh 1a355ca2ea Updated the GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=33879
2012-04-22 16:31:21 +00:00
Peter Simons f412a1fbe7 development/compilers/ghc/head.nix: fixed sha256 hash
svn path=/nixpkgs/trunk/; revision=33863
2012-04-20 20:17:07 +00:00
Rob Vermaas 8e510f1888 Update scala to 2.9.2
svn path=/nixpkgs/trunk/; revision=33861
2012-04-20 13:45:49 +00:00
Andres Löh 8915da0a6b New GHC snapshots.
svn path=/nixpkgs/trunk/; revision=33858
2012-04-20 12:22:23 +00:00
Nicolas Pierron 82b308bf11 Add armv7l support.
svn path=/nixpkgs/trunk/; revision=33798
2012-04-15 23:41:25 +00:00
Michael Raskin 9b6e521d44 SBCL update
svn path=/nixpkgs/trunk/; revision=33786
2012-04-14 18:36:04 +00:00
Mathijs Kwik 17cbe60a5b uhc upgrade
svn path=/nixpkgs/trunk/; revision=33775
2012-04-13 14:53:56 +00:00
Ludovic Courtès 47fcc276ae Apple GCC: Fix `no-sys-dirs.patch' so that it applies.
svn path=/nixpkgs/trunk/; revision=33773
2012-04-13 12:41:36 +00:00
Michael Raskin 40347a43c2 Fix license
svn path=/nixpkgs/trunk/; revision=33759
2012-04-12 11:57:43 +00:00
Michael Raskin 5cdb676ac7 Adding FSharp compiler
svn path=/nixpkgs/trunk/; revision=33758
2012-04-12 11:39:40 +00:00
Michael Raskin 16e2cac6f4 Updating Julia to include a few fixes - and adding web-repl
svn path=/nixpkgs/trunk/; revision=33726
2012-04-10 14:53:39 +00:00
Mathijs Kwik 4d34820fba UHC: upgraded and changed to the new official github repository
svn path=/nixpkgs/trunk/; revision=33675
2012-04-09 10:17:17 +00:00
Michael Raskin 45fbf22761 Solve missing symbol problem
svn path=/nixpkgs/trunk/; revision=33642
2012-04-06 10:20:37 +00:00
Michael Raskin 0ef5f0961f Trying to remove tarball error
svn path=/nixpkgs/trunk/; revision=33631
2012-04-05 19:07:14 +00:00
Michael Raskin 12e1751e93 Adding Julia programming language
svn path=/nixpkgs/trunk/; revision=33614
2012-04-05 12:22:55 +00:00
Shea Levy cd83eb3173 Build clang to support all of llvm's targets
svn path=/nixpkgs/trunk/; revision=33518
2012-04-01 14:33:23 +00:00
Yury G. Kudryashov 5299c1f6fb svn merge ^/nixpkgs/trunk
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
2012-03-31 20:01:40 +00:00
Peter Simons a39f417ad7 Updated Haskell packages.
- RSA: updated to version 1.0.6.3
 - derive: updated to version 2.5.7
 - hakyll: updated to version 3.2.7.0
 - happstack-hamlet: updated to version 7.0.0
 - idris: updated to version 0.9.2.1

svn path=/nixpkgs/trunk/; revision=33479
2012-03-29 20:52:37 +00:00
Lluís Batlle i Rossell 3551d159d8 Updating the JDK6 to u32b03 due to some important security fix.
http://www.h-online.com/open/news/item/Critical-Java-hole-being-exploited-on-a-large-scale-1485681.html


svn path=/nixpkgs/trunk/; revision=33460
2012-03-28 20:42:54 +00:00
Yury G. Kudryashov defd86049c Merge ^/nixpkgs/trunk.
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
2012-03-28 15:42:42 +00:00
Rob Vermaas 5a3a3a4e17 * Fix JDK/JRE error: /nix/store/.../jre/lib/i386/xawt/libmawt.so: file not recognized: File format not recognized.
Patch provided by Ambrus Kaposi.


svn path=/nixpkgs/trunk/; revision=33439
2012-03-27 11:19:00 +00:00
Arie Middelkoop 797c0f86fa Recovered OCaml 3.11 by using version 3.11.2 and a patch from ocaml's bugtracker.
svn path=/nixpkgs/trunk/; revision=33399
2012-03-24 22:59:08 +00:00
Peter Simons 880dcc2c64 Removed myself as a maintainer from Haskell packages that I don't personally use.
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.

svn path=/nixpkgs/trunk/; revision=33392
2012-03-24 10:21:28 +00:00
Peter Simons 3fbeca3ebc pkgs/development/compilers/ghc/wrapper.nix: removed extraneous closing bracket that broke the script
svn path=/nixpkgs/trunk/; revision=33371
2012-03-23 11:26:28 +00:00
Michael Raskin f5cc572d8b Updating FPC and Lazarus - works OK with new glib
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33367
2012-03-23 05:55:13 +00:00
Shea Levy 6aa06a6699 ghc-packages: Darwin's native readlink doesn't support -f
svn path=/nixpkgs/trunk/; revision=33366
2012-03-23 03:01:58 +00:00
Mathijs Kwik 01e0c31bae haskell-lazysmallcheck
svn path=/nixpkgs/trunk/; revision=33363
2012-03-22 22:37:08 +00:00
Peter Simons 115b3d943a pkgs/development/compilers/ghc/with-packages.nix: renamed this expression from "ghc-${ghc.version}-linkdir" to "haskell-env-${ghc.name}"
This change allows use of the with-packages wrapper in user profiles that are
being updated with "nix-env -u \*". The previous name this expression generated
was considered by Nix to be an older version of "ghc-7.0.4-wrapper", because
that name has a higher priority.

svn path=/nixpkgs/trunk/; revision=33325
2012-03-21 11:46:15 +00:00
Peter Simons d8e65ee71d pkgs/development/compilers/ghc/with-packages.nix: trivial changes to fix syntax highlighting in Emacs
svn path=/nixpkgs/trunk/; revision=33324
2012-03-21 11:46:12 +00:00
Eelco Dolstra a772508846 * NASM updated to 2.10.
svn path=/nixpkgs/trunk/; revision=33256
2012-03-19 13:16:35 +00:00
Yury G. Kudryashov 0e397758ee dragonegg-3.0
The old version fails to build, thus I commit it instead of review request.

svn path=/nixpkgs/trunk/; revision=33193
2012-03-17 15:25:00 +00:00
Ludovic Courtès cc6f814a8f GFortran 4.6: Add patch to fix the output of `-v'.
svn path=/nixpkgs/trunk/; revision=33154
2012-03-16 13:11:41 +00:00
Shea Levy 6c99fad938 OMVF: Only need some of the sources, and symlinks instead of copies are fine
svn path=/nixpkgs/trunk/; revision=33090
2012-03-14 22:43:07 +00:00
Shea Levy 6cf8e4f815 EDK2: Significant cleanup and
modularization, and add OVMF as an example of how to use it

svn path=/nixpkgs/trunk/; revision=33059
2012-03-14 06:57:58 +00:00
Shea Levy 853dd7266b Add Intel's EDK
svn path=/nixpkgs/trunk/; revision=33058
2012-03-14 04:18:52 +00:00
Shea Levy 27bedda4f6 iasl: Bump
svn path=/nixpkgs/trunk/; revision=33056
2012-03-14 00:53:52 +00:00
Peter Simons c86a90c4e9 Updating Haskell packages.
- Agda-executable: updated to version 2.3.0.1
 - Agda: updated to version 2.3.0.1
 - gio: added version 0.12.3
 - hamlet: updated to version 0.10.9.1
 - leksah-server: updated to version 0.12.0.4
 - leksah: updated to version 0.12.0.3
 - ltk: updated to version 0.12.0.0
 - packages.nix: cosmetic change
 - pandoc: updated to version 1.9.1.2
 - polyparse: added version 1.8
 - shakespeare-css: updated to version 0.10.8
 - shakespeare-i18n: updated to version 0.0.2.1
 - shakespeare-js: updated to version 0.11.2
 - shakespeare-text: updated to version 0.11
 - shakespeare: updated to version 0.11
 - tls: updated to version 0.9.1
 - unordered-containers: updated to version 0.2.0.1
 - uuagc: updated to version 0.9.40.3
 - yesod-core: updated to version 0.10.2.2
 - yesod-form: updated to version 0.4.2.1
 - yesod: updated to version 0.10.1.4

svn path=/nixpkgs/trunk/; revision=33015
2012-03-12 14:06:18 +00:00
Andres Löh ec99325d80 Explicitly set platforms for 7.4.1 rather than inheriting them.
I hope this will enable darwin builds for 7.4.1 on Hydra.

svn path=/nixpkgs/trunk/; revision=32903
2012-03-08 16:22:01 +00:00
Ludovic Courtès 09531a24ad GCC 4.6: Fix `gccCrossStageFinal' for GNU/Hurd.
svn path=/nixpkgs/trunk/; revision=32853
2012-03-07 16:01:07 +00:00
Rob Vermaas c4b2325838 update strategoxt
svn path=/nixpkgs/trunk/; revision=32849
2012-03-07 13:21:44 +00:00
Peter Simons 7873ce2793 pakcs: updated to version 1.10.0
svn path=/nixpkgs/trunk/; revision=32839
2012-03-06 22:27:20 +00:00
Ludovic Courtès 8bab00e0ad GCC 4.6: Add patch to fix GNU/Hurd builds.
svn path=/nixpkgs/trunk/; revision=32837
2012-03-06 21:33:20 +00:00
Eelco Dolstra a88fdf8ef7 * Oops.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32737
2012-03-02 09:35:51 +00:00
Eelco Dolstra a753c4a170 * GCC 4.6.3 and 4.5.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32734
2012-03-01 23:15:21 +00:00
Eelco Dolstra 148e234aab * Fix broken symlink.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32727
2012-03-01 21:40:46 +00:00
Yury G. Kudryashov 0210e20b5a svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Peter Simons 409e44cbe1 haskell-idris: updated to version 0.9.2
svn path=/nixpkgs/trunk/; revision=32671
2012-02-28 10:03:45 +00:00
Peter Simons 81b3becc7e haskell-epic: updated to version 0.9.3
svn path=/nixpkgs/trunk/; revision=32670
2012-02-28 10:03:40 +00:00
Ludovic Courtès 0400423fb1 GCC 4.6: Fix erroneous dependency on X libraries when !javaAwtGtk.
svn path=/nixpkgs/trunk/; revision=32620
2012-02-27 17:22:27 +00:00
Shea Levy ea195b2507 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Lluís Batlle i Rossell bfd787a69a Finally I fix, not blindly, the nvidia-cg-toolkit expression for i686-linux
svn path=/nixpkgs/trunk/; revision=32554
2012-02-24 23:40:58 +00:00
Lluís Batlle i Rossell d1e84a7498 Blind commit trying to fix nvidia cg toolkit on i686-linux
svn path=/nixpkgs/trunk/; revision=32546
2012-02-24 20:18:32 +00:00
Yury G. Kudryashov 38e3d7bc86 svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
Yury G. Kudryashov 65e7aeda65 vala-0.14.2
svn path=/nixpkgs/trunk/; revision=32519
2012-02-23 19:59:22 +00:00
Ludovic Courtès 79232c5f54 GCC 4.6: Enable plug-in support by default.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32502
2012-02-23 00:47:31 +00:00
Ludovic Courtès 5fb4901886 GCC 4.6: Really disable stripping when `stripped' is false.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32501
2012-02-23 00:47:17 +00:00
Eelco Dolstra 0922e0fb71 * Remove ocaml 3.11.1. It doesn't build anymore and isn't used anywhere.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32403
2012-02-19 17:12:37 +00:00
Eelco Dolstra 6c2de318ad * Move all gcc versions to development/compilers/gcc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32371
2012-02-17 21:47:08 +00:00
Eelco Dolstra da3ecd1256 * gcc-apple: produce a libstdc++.dylib that doesn't depend on
/usr/lib/libstdc++.dylib.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32365
2012-02-17 19:33:12 +00:00
Yury G. Kudryashov e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Peter Simons cb28766341 Re-generated Haskell package descriptions with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32327
2012-02-16 14:05:41 +00:00
Peter Simons ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +00:00
Peter Simons ebdb515865 pkgs/development/compilers/gcc-4.6: added 'enablePlugin' attribute (defaults to false) to add support for GCC plugins (such as melt)
svn path=/nixpkgs/branches/stdenv-updates/; revision=32275
2012-02-14 14:42:59 +00:00
Peter Simons 35a4593277 pkgs/development/compilers/gcc-4.6: strip trailing whitespace
svn path=/nixpkgs/branches/stdenv-updates/; revision=32274
2012-02-14 14:42:56 +00:00
Yury G. Kudryashov f7886ac78b svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
2012-02-13 19:47:36 +00:00
Lluís Batlle i Rossell 0a85d5cf98 Blind commit about making nvidia-cg-toolkit build for i686-linux
svn path=/nixpkgs/trunk/; revision=32258
2012-02-13 13:59:12 +00:00
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Peter Simons 5a34b4f9a1 uhc: upgraded to 1.1.3
svn path=/nixpkgs/trunk/; revision=32081
2012-02-06 19:09:01 +00:00
Peter Simons ade99756f9 haskell-idris: updated to version 0.9.1
svn path=/nixpkgs/trunk/; revision=31996
2012-02-03 19:06:12 +00:00
Andres Löh b66db5ca13 Add ghc-7.4.1. Remove Hydra building for the 7.2.* series.
svn path=/nixpkgs/trunk/; revision=31989
2012-02-02 21:08:30 +00:00
Andres Löh a819ccf030 Updated GHC snapshot to ghc-7.4.1-rc2.
svn path=/nixpkgs/trunk/; revision=31910
2012-01-28 15:34:53 +00:00
Yury G. Kudryashov 3256c40575 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31878
2012-01-27 11:48:58 +00:00
Michael Raskin 345da504ea Update SBCL
svn path=/nixpkgs/trunk/; revision=31875
2012-01-27 07:26:21 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Lluís Batlle i Rossell 4a1c721c01 Changing every reference from mips64-linux to mips64el-linux. That's
what the new nix thinks the fuloong is.

Anyone having the old nix should use a nixpkgs previous to this change to build
the new nix. And then, with the new nix, he can use any newer nixpkgs revision.

svn path=/nixpkgs/trunk/; revision=31751
2012-01-21 00:34:51 +00:00
Yury G. Kudryashov 84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Rob Vermaas 087af1bfe7 add gwt 2.4.0, patch provided by TermNL
svn path=/nixpkgs/trunk/; revision=31711
2012-01-19 19:31:25 +00:00
Peter Simons 3ea9f68e75 uhc: upgraded to latest version
svn path=/nixpkgs/trunk/; revision=31646
2012-01-18 20:32:14 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra 48ee2523da * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
2012-01-18 15:53:12 +00:00
Peter Simons 09dee8994f haskell-idris: updated to version 0.9.0
svn path=/nixpkgs/trunk/; revision=31622
2012-01-18 15:04:09 +00:00
Yury G. Kudryashov 0c79434ccb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
2012-01-14 21:34:37 +00:00
Karn Kallio 9663bdebde Advance version of Ur/Web compiler to 20120110
svn path=/nixpkgs/trunk/; revision=31467
2012-01-10 15:23:05 +00:00
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Peter Simons d7edd1e22c haskell-epic: updated to version 0.9.2
svn path=/nixpkgs/trunk/; revision=31364
2012-01-06 18:41:23 +00:00
Yury G. Kudryashov 900c6e18cd svn merge ^/nixpkgs/trunk
Conflicts: openssl, libplist

svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
2012-01-06 01:07:45 +00:00
Lluís Batlle i Rossell 4b4022a4e0 Add meta for mono.
svn path=/nixpkgs/trunk/; revision=31297
2012-01-04 21:18:50 +00:00
Yury G. Kudryashov 394fd28e4e svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31280
2012-01-04 15:22:16 +00:00
Lluís Batlle i Rossell 25db5f1a9d Adding libgdiplus for mono, and making mono reference it.
svn path=/nixpkgs/trunk/; revision=31276
2012-01-04 13:55:54 +00:00
Yury G. Kudryashov 3d61c49b42 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
2012-01-04 09:54:17 +00:00
Lluís Batlle i Rossell fb0d088b33 Updating mono.
svn path=/nixpkgs/trunk/; revision=31262
2012-01-04 08:14:07 +00:00
Yury G. Kudryashov 08761e83fc Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Karn Kallio 2ae07a853f Clean version 2.4
svn path=/nixpkgs/trunk/; revision=31107
2011-12-27 01:48:57 +00:00
Yury G. Kudryashov f77741e018 merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Andres Löh 8af094c99f Updated ghc HEAD snapshot to ghc-7.4.1-rc1.
svn path=/nixpkgs/trunk/; revision=31066
2011-12-25 00:12:52 +00:00
Peter Simons 498508fd59 haskell-uhc-svn: updated to revision 2381
svn path=/nixpkgs/trunk/; revision=31031
2011-12-22 12:18:46 +00:00
Russell O'Connor 83452ba0ab adding two versions of metaocaml
svn path=/nixpkgs/trunk/; revision=31026
2011-12-21 21:51:35 +00:00
Shea Levy ec305ac161 clang builds on darwin now
Also, get rid of the clang bootstrap, there's no need for it

svn path=/nixpkgs/trunk/; revision=30973
2011-12-19 23:58:57 +00:00
Shea Levy cf247dcce0 Try to fix tarball
svn path=/nixpkgs/trunk/; revision=30968
2011-12-19 13:40:33 +00:00
Shea Levy dfb27bd181 llvm should build on darwin now
svn path=/nixpkgs/trunk/; revision=30958
2011-12-19 13:00:03 +00:00
Shea Levy 2a033caa1d llvm+clang don't yet build on non-Linux platforms
svn path=/nixpkgs/trunk/; revision=30957
2011-12-19 12:53:07 +00:00
Shea Levy 006d8dcdc1 clang-3.0
This required moving to the cmake build for llvm in order to build clang
separately from llvm.

svn path=/nixpkgs/trunk/; revision=30956
2011-12-19 12:48:09 +00:00
Yury G. Kudryashov a670a7aca1 merge trunk
A few conflicts due to renames

svn path=/nixpkgs/branches/stdenv-updates/; revision=30947
2011-12-16 22:57:21 +00:00
Andres Löh c11749dcd6 Updated the GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=30937
2011-12-16 18:11:23 +00:00
Marco Maggesi 9819d7b26a Update OCaml 3.12.0 to 3.12.1
svn path=/nixpkgs/trunk/; revision=30923
2011-12-16 08:11:19 +00:00
Eelco Dolstra cfde88976b * Streamline the stdenv bootstrap and resulting closure by removing
some redundant builds (e.g., GMP was built three times).
* Updated GMP to 5.0.2.
* Updated PPL to 0.11.2.
* Remove ad hoc flags to build GCC's dependencies statically.
  Instead, use the ‘makeStaticLibraries’ stdenv adapter.
* Build GMP with C++ support by default.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30891
2011-12-14 14:31:56 +00:00
Eelco Dolstra 9eb4c4ddef * GCC 4.6: drop the cloog-ppl backend, which seems obsolete.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30889
2011-12-14 14:07:23 +00:00
Eelco Dolstra eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Eelco Dolstra 3ea1c30846 * Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing
in its interaction with the ‘dontStrip’ attribute.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30848
2011-12-12 14:02:12 +00:00
Ludovic Courtès 05880a4aea GCC 4.6.2.
svn path=/nixpkgs/trunk/; revision=30846
2011-12-12 08:35:37 +00:00
Peter Simons f06abc04c5 The EHC compiler is now called UHC.
svn path=/nixpkgs/trunk/; revision=30841
2011-12-11 19:54:40 +00:00
Peter Simons 80371eb91e upgraded ehc to latest svn release
svn path=/nixpkgs/trunk/; revision=30835
2011-12-11 19:38:51 +00:00
Andres Löh 64c0b00bbd Linking the complete topdir of GHC in ghc-with-packages.
svn path=/nixpkgs/trunk/; revision=30826
2011-12-11 17:19:36 +00:00
Michael Raskin 93511ab4f1 Update SBCL
svn path=/nixpkgs/trunk/; revision=30770
2011-12-06 07:00:04 +00:00
Ludovic Courtès 3f8320658a MIT/GNU Scheme: Fix hashes.
svn path=/nixpkgs/trunk/; revision=30769
2011-12-05 23:22:42 +00:00
Shea Levy 99dede273d Remove unused patch
svn path=/nixpkgs/trunk/; revision=30735
2011-12-05 05:03:18 +00:00
Shea Levy 9943b8da03 Remove llvmSVN, it's outdated and doesn't work
svn path=/nixpkgs/trunk/; revision=30732
2011-12-05 02:53:26 +00:00
Andres Löh de5d98eff8 Prevent link collisions by linking only Haskell packages.
svn path=/nixpkgs/trunk/; revision=30727
2011-12-04 17:45:12 +00:00
Andres Löh f237a3a418 Extended ghcWithPackages to link binaries.
svn path=/nixpkgs/trunk/; revision=30726
2011-12-04 16:07:39 +00:00
Shea Levy 332afc59aa llvm 3.0
This probably breaks clang. I will be updating clang to 3.0 when I can

svn path=/nixpkgs/trunk/; revision=30722
2011-12-03 23:47:59 +00:00
Andres Löh ecf037f2f7 Added a wrapper function to produce a GHC with a predefined set of packages.
svn path=/nixpkgs/trunk/; revision=30716
2011-12-03 16:19:43 +00:00
Ludovic Courtès 3053de4776 MIT/GNU Scheme 9.1.1.
svn path=/nixpkgs/trunk/; revision=30677
2011-12-01 23:20:31 +00:00
Ludovic Courtès 8404afcfe4 GCC 4.6: Incorporate changes made in 4.5 to support cross-builds to GNU.
svn path=/nixpkgs/trunk/; revision=30628
2011-11-29 22:54:12 +00:00
Shea Levy 7501456c94 Platforms needs to be a list
Should this really be x86_64-linux only? Why?

svn path=/nixpkgs/trunk/; revision=30583
2011-11-28 15:49:14 +00:00
Karn Kallio c13ff671a2 Update urweb compiler to release 20111127.
svn path=/nixpkgs/trunk/; revision=30582
2011-11-28 15:12:02 +00:00
Rob Vermaas df41a6b63f update strategoxt 1.8
svn path=/nixpkgs/trunk/; revision=30581
2011-11-28 14:54:50 +00:00
Karn Kallio 9ac48a630e Add OPA to Nixpkgs.
svn path=/nixpkgs/trunk/; revision=30578
2011-11-27 23:58:46 +00:00
Peter Simons 167ec73929 haskell-Agda-executable: updated to version 2.3.0
svn path=/nixpkgs/trunk/; revision=30560
2011-11-25 13:44:35 +00:00
Ludovic Courtès ea96ea5d2f GCC 4.5: Fix cross-compilation to MinGW.
svn path=/nixpkgs/trunk/; revision=30522
2011-11-22 08:45:25 +00:00
Eelco Dolstra bb002fc121 * Unbreak the Nixpkgs tarball.
svn path=/nixpkgs/trunk/; revision=30447
2011-11-16 16:31:02 +00:00
Ludovic Courtès fa97f54001 GCC 4.5: Fix `gcc45.hostDrv' for GNU.
This fixes a regression introduced in r30410 ("Do not apply
Hurd-specific fixes for simple cross-Linux. Unfortunately, still no luck
with my ARM device").

svn path=/nixpkgs/trunk/; revision=30412
2011-11-13 14:39:15 +00:00
Michael Raskin 612fd5de82 Do not apply Hurd-specific fixes for simple cross-Linux. Unfortunately, still no luck with my ARM device
svn path=/nixpkgs/trunk/; revision=30410
2011-11-13 13:54:04 +00:00
Peter Simons a875b4bc1e haskell-epic: updated to version 0.9
svn path=/nixpkgs/trunk/; revision=30404
2011-11-13 01:37:52 +00:00
Ludovic Courtès 6c90f91463 GCC 4.5: Fix the Canadian cross, aka. `gcc45.hostDrv'.
svn path=/nixpkgs/trunk/; revision=30403
2011-11-12 23:55:53 +00:00
Ludovic Courtès f68d9d7c29 GCC 4.6: Better separate native and host build inputs.
svn path=/nixpkgs/trunk/; revision=30402
2011-11-12 23:55:48 +00:00
Ludovic Courtès ea3ac07d92 GCC 4.5: Allow libcCross != null && cross == null' for gcc.hostDrv'.
svn path=/nixpkgs/trunk/; revision=30401
2011-11-12 23:55:41 +00:00
Ludovic Courtès 2741c168fe GCC 4.5: Provide the right system include directory on GNU/Hurd.
svn path=/nixpkgs/trunk/; revision=30400
2011-11-12 23:55:35 +00:00
Peter Simons 66bd9580f0 Added GHC 7.2.2.
svn path=/nixpkgs/trunk/; revision=30398
2011-11-12 22:19:03 +00:00
Alexander Tsamutali 52e58c6c27 development/compilers/nvidia-cg-toolkit: New nixbuild.
svn path=/nixpkgs/trunk/; revision=30395
2011-11-12 17:19:45 +00:00
Alexander Tsamutali 20005b7f5d Reverting 30393.
svn path=/nixpkgs/trunk/; revision=30394
2011-11-12 17:11:25 +00:00
Alexander Tsamutali 4f3ffcd0ec development/compilers/nvidia-cg-toolkit: New nixbuild.
svn path=/nixpkgs/trunk/; revision=30393
2011-11-12 17:03:44 +00:00
Michael Raskin 2eadc91f84 Oops
svn path=/nixpkgs/trunk/; revision=30367
2011-11-10 05:18:30 +00:00
Michael Raskin e85bfd3c1b Update SBCL
svn path=/nixpkgs/trunk/; revision=30365
2011-11-10 04:20:33 +00:00
Peter Simons 368ac01473 synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
2011-11-08 10:18:35 +00:00
Shea Levy 51eab4deaa Only build clang on Linux until the wrapper is set up for non-Linux stdenvs
svn path=/nixpkgs/trunk/; revision=30302
2011-11-07 19:24:01 +00:00
Michael Raskin a64122818f Cross-compiling TinyCC: move build helpers to buildNativeInputs
svn path=/nixpkgs/trunk/; revision=30277
2011-11-06 19:18:02 +00:00
Peter Simons 69488d688d synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
2011-11-02 10:28:32 +00:00
Ludovic Courtès 67e7995cdc MIT/GNU Scheme 9.1.
svn path=/nixpkgs/trunk/; revision=30124
2011-10-30 11:51:55 +00:00
Eelco Dolstra 30933c30d3 * GCC updated to 4.6.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30062
2011-10-27 17:02:15 +00:00
Eelco Dolstra 3cb8791cf9 * Backport the GCC xlibs dependency fix.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30061
2011-10-27 16:50:00 +00:00
Eelco Dolstra e85e73bbc8 * Operator precendence kills :-) GCC was accidentally depending on
X11 because of missing parentheses around a ‘++’.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30060
2011-10-27 16:42:51 +00:00
Shea Levy 0892d42613 The clang static analyzer can be accessed through clang --analyze, no need for scan-build and view
svn path=/nixpkgs/trunk/; revision=30051
2011-10-27 06:04:00 +00:00
Peter Simons dfd063cf12 synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30027
2011-10-26 09:15:25 +00:00
Rob Vermaas 5e6dbdf386 update to gcc 4.4.6
svn path=/nixpkgs/trunk/; revision=29979
2011-10-24 01:03:16 +00:00
Eelco Dolstra 75c3c1418d * Fix powerpc-linux evaluation (does anybody care?).
svn path=/nixpkgs/trunk/; revision=29958
2011-10-21 16:10:07 +00:00
Eelco Dolstra 5e51aadc10 * Fix evaluation errors.
svn path=/nixpkgs/trunk/; revision=29955
2011-10-21 14:43:18 +00:00
Shea Levy 7c32c9c426 llvm: Use the sw_vers program on darwin
svn path=/nixpkgs/trunk/; revision=29925
2011-10-20 10:15:54 +00:00
Shea Levy 252286194e clang: have gcc tell us its target triplet, no need to limit to x86 linuces
svn path=/nixpkgs/trunk/; revision=29924
2011-10-20 02:07:00 +00:00
Shea Levy 1214310f5d Use the right triplet for 1686
Not sure why we're inconsistent between arches there...

svn path=/nixpkgs/trunk/; revision=29923
2011-10-20 00:15:49 +00:00
Shea Levy 188df14951 clang: Use configureFlags instead of env vars to tell which compiler to use
svn path=/nixpkgs/trunk/; revision=29922
2011-10-19 23:49:22 +00:00
Shea Levy 1d7f2e1e90 clang: Install static analysis tools
svn path=/nixpkgs/trunk/; revision=29921
2011-10-19 21:47:28 +00:00
Shea Levy 6e3cde6383 Enable building clang separately from llvm
Note that there is some duplication when building clang now. The llvm source
is unpacked twice, ./configure is run twice, and two small unit test
libraries are compiled twice. IMO this is a fair tradeoff for having
llvm be a separate build unaffected by changes to clang

svn path=/nixpkgs/trunk/; revision=29919
2011-10-19 20:57:18 +00:00
Shea Levy 94dbab27a3 Bootstrap clang with itself
svn path=/nixpkgs/trunk/; revision=29901
2011-10-19 17:11:26 +00:00
Peter Simons db31cf8287 synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29884
2011-10-19 08:50:00 +00:00
Shea Levy 1ed93241cd clang: Don't send extra -I flags to the linker
svn path=/nixpkgs/trunk/; revision=29883
2011-10-19 04:14:55 +00:00
Shea Levy db619f2d55 First try at a clang-wrapper. Hello world compiles\!
svn path=/nixpkgs/trunk/; revision=29879
2011-10-18 20:03:09 +00:00
Shea Levy 9783d27b7a Bump llvm and clang to 2.9
svn path=/nixpkgs/trunk/; revision=29878
2011-10-18 16:37:28 +00:00
Peter Simons 1abdc56a12 Synchronized stdenv-updates branch with trunk.
There were conflicting patches of pkgs/os-specific/linux/module-init-tools.
Apparently, the expression was updated independently in both branches. I've
resolved the conflict by preferring the patches from stdenv-updates, because
those patches appeared to be more sophisticated, i.e. they build the manual,
etc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=29680
2011-10-06 09:37:22 +00:00
Ludovic Courtès dce7ac1f10 Bigloo 3.7a.
svn path=/nixpkgs/trunk/; revision=29679
2011-10-05 21:51:07 +00:00
Shea Levy 01df54f5cc Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
2011-09-23 16:58:45 +00:00
Karn Kallio 637e57fc93 Advance version of ur/web compiler to 20110917
svn path=/nixpkgs/trunk/; revision=29448
2011-09-23 02:46:05 +00:00
Peter Simons c9a0666da7 pkgs/development/compilers/pakcs: minor cosmetic changes
svn path=/nixpkgs/trunk/; revision=29354
2011-09-19 16:38:43 +00:00
Peter Simons 5bb330db07 swi-prolog: updated to version 5.10.5
svn path=/nixpkgs/trunk/; revision=29350
2011-09-19 16:38:16 +00:00
Peter Simons 6ed0f99b70 haskell-helium: the package has disappeared from the upstream web server
svn path=/nixpkgs/trunk/; revision=29311
2011-09-16 18:29:32 +00:00
Peter Simons 775896c15f haskell-epic: updated to version 0.1.13
svn path=/nixpkgs/trunk/; revision=29213
2011-09-12 16:45:27 +00:00
Eelco Dolstra 41d9959ed3 * Better description.
svn path=/nixpkgs/trunk/; revision=29207
2011-09-12 13:02:54 +00:00
Andres Löh 829a5e3209 Bump GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=29164
2011-09-11 09:14:22 +00:00
Peter Simons f67cf46ddc haskell-ehc: updated to revision 2293
svn path=/nixpkgs/trunk/; revision=29037
2011-09-05 19:24:07 +00:00
Andres Löh 51124b08b5 Bumping the GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=29026
2011-09-05 13:29:33 +00:00