Commit graph

519 commits

Author SHA1 Message Date
Marc Weber eccd5d5a41 ghc-get-packages.sh no array at all: roughly 20% faster
svn path=/nixpkgs/trunk/; revision=16399
2009-07-16 15:18:21 +00:00
Michael Raskin 81d09cd1f3 Use GTK2 for Lazarus and get Unicode support
svn path=/nixpkgs/trunk/; revision=16363
2009-07-14 20:31:11 +00:00
Michael Raskin cf03c27fb7 Update FPC and Lazarus
svn path=/nixpkgs/trunk/; revision=16343
2009-07-14 09:08:05 +00:00
Andres Löh 059b912b27 Efficiency fix for ghc-get-packages script.
svn path=/nixpkgs/trunk/; revision=16326
2009-07-10 19:36:50 +00:00
Peter Simons 356791ea62 The ghc binary distribution contains a 'pwd' binary that's broken on systems running a Red Hat kernel and causes the build to fail. To remedy that problem, we replace that binary with Nix's 'pwd' program before running configure.
Unfortunately, the same problem occurs again with 'installPackage', so as of
now, GHC cannot be installed on Red Hat.

svn path=/nixpkgs/trunk/; revision=16314
2009-07-10 12:26:18 +00:00
Rob Vermaas 22557d5e1f update mono to 2.4.2.1
svn path=/nixpkgs/trunk/; revision=16311
2009-07-10 11:49:32 +00:00
Rob Vermaas 471518d65b typo
svn path=/nixpkgs/trunk/; revision=16302
2009-07-10 08:40:04 +00:00
Rob Vermaas 297f0127aa java-front 0.9, compile with -O2 for cygwin
svn path=/nixpkgs/trunk/; revision=16301
2009-07-10 08:05:23 +00:00
Rob Vermaas 99afadc21f java-front 0.9
svn path=/nixpkgs/trunk/; revision=16300
2009-07-10 07:57:26 +00:00
Marc Weber 25a1533d9a removing old haskell stuff. I was using my own branch for a long time.
It will be replaced by something else anyway.
Some of those patches may still be of interest (?)

svn path=/nixpkgs/trunk/; revision=16298
2009-07-09 22:24:08 +00:00
Rob Vermaas ccc059b201 * changed stacksize for sdf2-bundle on cygwin
svn path=/nixpkgs/trunk/; revision=16277
2009-07-09 14:15:36 +00:00
Michael Raskin dd89941fb2 Added myself as the maintainer of some packages
svn path=/nixpkgs/trunk/; revision=16221
2009-07-07 15:05:15 +00:00
Michael Raskin b02a08a022 SBCL now works fine. added hacks and workarounds for store mono-timestamp handling
svn path=/nixpkgs/trunk/; revision=16219
2009-07-07 14:50:37 +00:00
Rob Vermaas 0aeeaafa55 * going even further back for gcc darwin
svn path=/nixpkgs/trunk/; revision=16189
2009-07-06 12:00:06 +00:00
Rob Vermaas a30efafa57 * back to old gcc version for darwin, will make new version in different tree
svn path=/nixpkgs/trunk/; revision=16182
2009-07-06 07:39:38 +00:00
Ludovic Courtès 63393ce174 GCC 4.4.0: Fix compilation (for C and C++, at least).
svn path=/nixpkgs/trunk/; revision=16177
2009-07-05 14:15:44 +00:00
Ludovic Courtès 85d950b8fb Add GCC 4.4.0 (and hope for the best).
svn path=/nixpkgs/trunk/; revision=16168
2009-07-03 18:54:28 +00:00
Ludovic Courtès 5ed15d55ba GCJ 4.3: Fix the Java patch.
svn path=/nixpkgs/trunk/; revision=16164
2009-07-03 14:13:58 +00:00
Ludovic Courtès 5964e20243 GCJ 4.3: Try to incrementally fix things.
svn path=/nixpkgs/trunk/; revision=16163
2009-07-03 13:30:25 +00:00
Rob Vermaas 7d5a3a1933 * strategoxt-0.17
svn path=/nixpkgs/trunk/; revision=16154
2009-07-03 05:01:04 +00:00
Rob Vermaas d2419bccee * bumped gcc 4.2.1 build 5531 for apple again
svn path=/nixpkgs/trunk/; revision=16092
2009-06-30 09:24:53 +00:00
Marc Weber 6bc07c8e68 fix my wrong opplication of the patch
svn path=/nixpkgs/trunk/; revision=16062
2009-06-26 17:00:02 +00:00
Marc Weber f316832e3a update default ocmal to 3.11.1. patch provided by olegfink
svn path=/nixpkgs/trunk/; revision=16061
2009-06-26 16:53:02 +00:00
Rob Vermaas 1c3f49e06f * Changed version of gcc to 4.0.1 - 5484 on darwin
* Added dsymutil to gcc wrapper env on darwin
 * turned off make check for gnugrep on darwin
 * added --enable-bsd=libs configure flag for gnugrep on darwin 


svn path=/nixpkgs/trunk/; revision=16014
2009-06-21 18:37:54 +00:00
Rob Vermaas ee88032be9 * bumped gcc to 4.2.1 build 5531 on darwin
svn path=/nixpkgs/trunk/; revision=15920
2009-06-10 11:08:57 +00:00
Michael Raskin e9eea90443 Compile SBCL with sb-thread enabled..
svn path=/nixpkgs/trunk/; revision=15835
2009-06-03 07:07:01 +00:00
Michael Raskin 526f6f63c7 Updating CLisp and adding SBCL. SBCL currently has to be symlinked to a writable directory (I am investigating a fix). CLisp 2.47 is somewhat incompatible with lots of software, so I added 2.44.1 as preserved version
svn path=/nixpkgs/trunk/; revision=15806
2009-05-31 06:07:25 +00:00
Andres Löh 2c096bf75f Fix the ghc-wrapper in order to enable runghc/runhaskell.
svn path=/nixpkgs/trunk/; revision=15774
2009-05-28 19:06:29 +00:00
Marc Weber 52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
2009-05-19 23:25:58 +00:00
Eelco Dolstra 6b611bc0f1 svn path=/nixpkgs/trunk/; revision=15605 2009-05-14 14:43:50 +00:00
Eelco Dolstra 120a82d7b9 * NASM: updated to the latest version.
* eduke: needs NASM on i686-linux.

svn path=/nixpkgs/trunk/; revision=15604
2009-05-14 14:42:20 +00:00
Andres Löh 677f91a6d1 Added Idris and updated fetchdarcs.
svn path=/nixpkgs/trunk/; revision=15595
2009-05-13 19:02:23 +00:00
Andres Löh 61a000b056 Added ghc-6.10.3.
svn path=/nixpkgs/trunk/; revision=15541
2009-05-10 21:04:58 +00:00
Michael Raskin 2a82c141ec An attempt to add gcj-4.3. It fails not finding some GC-related symbols. I failed to understand the reason - for now
svn path=/nixpkgs/trunk/; revision=15523
2009-05-10 09:11:41 +00:00
Marc Weber 75244dffaf update jdk because jdk-1.6.0_13 provides a mozilla plugin for x86_64
svn path=/nixpkgs/trunk/; revision=15422
2009-05-01 19:34:56 +00:00
Eelco Dolstra 210ba6316e * Urgh. Some files that had been deleted in the trunk came back
through the stdenv-updates merge (probably because they had been
  modified in the branch).

svn path=/nixpkgs/trunk/; revision=15403
2009-04-29 16:19:57 +00:00
Eelco Dolstra 5a2284ac61 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15313
2009-04-25 22:45:32 +00:00
Andres Löh 66f3af0bdd ghc-wrapper now detects installed pkgs automatically.
svn path=/nixpkgs/trunk/; revision=15301
2009-04-25 14:23:00 +00:00
Eelco Dolstra 7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Eelco Dolstra 94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Rob Vermaas a00ef2d247 updated strategoxt 0.17pre to bootstrap build
svn path=/nixpkgs/trunk/; revision=15188
2009-04-20 14:49:51 +00:00
Eelco Dolstra 35e42d3e5c * Fix missing description errors.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15157
2009-04-19 16:00:46 +00:00
Eelco Dolstra 5cfba3ac68 * Added GHC 6.10.1.
svn path=/nixpkgs/trunk/; revision=15147
2009-04-19 11:43:38 +00:00
Eelco Dolstra 1c1967a9a1 * Call the wrapper "ghc-wrapper".
svn path=/nixpkgs/trunk/; revision=15143
2009-04-19 10:26:45 +00:00
Andres Löh 1643888f80 Added cabalized darcs-2 and associated Haskell libs.
svn path=/nixpkgs/trunk/; revision=15141
2009-04-19 10:07:41 +00:00
Eelco Dolstra ffcd38403e * Install the package config files under
$out/lib/ghc-pkgs/ghc-<version>/<package>.conf instead of under
  $out/nix-support/ghc-package.conf.  This makes them visible in the
  user's profile when installed with nix-env.

svn path=/nixpkgs/trunk/; revision=15135
2009-04-18 20:24:36 +00:00
Eelco Dolstra 4ce5419f17 * Remove bad backslashes.
svn path=/nixpkgs/trunk/; revision=15134
2009-04-18 20:22:47 +00:00
Eelco Dolstra ca8b45d441 * Cabal builder: put the GHC version in the default name attribute to
disambiguate between package instances built with different GHCs.

svn path=/nixpkgs/trunk/; revision=15132
2009-04-18 16:21:59 +00:00
Eelco Dolstra baad5d7cb4 * GHC setup hook: don't generate wrappers around ghc etc., instead
set GHC_PACKAGE_PATH.
* Let Cabal generate a package configuration file
  ($out/nix-support/ghc-package.conf) instead of a registration
  script.

svn path=/nixpkgs/trunk/; revision=15127
2009-04-18 15:23:00 +00:00
Eelco Dolstra cee387e845 * Move the composition of Haskell packages out of all-packages.nix
into haskell-packages.nix, which depends on an instance of GHC.
  This allows a consistent set of packages to be built with the same
  GHC.  For instance,

  $ nix-build -A haskellPackages_ghc683.xmonad

  builds xmonad and all its dependencies with GHC 6.8.3, while

  $ nix-build -A haskellPackages_ghc6102.xmonad

  does the same with GHC 6.10.2.  This is the same technique used with
  kernelPackages.  It also means that we don't need things like
  "cabal682" and "cabal683" anymore.

* The setup hook is now in a separate wrapper package so that we don't
  have to recompile all of GHC every time we want to make a small
  change.

* cinelerra: this package appears to have an accidental dependency on
  the "X11" Haskell package.

svn path=/nixpkgs/trunk/; revision=15125
2009-04-18 12:47:11 +00:00
Eelco Dolstra 95a472cd55 * Doh.
svn path=/nixpkgs/trunk/; revision=15121
2009-04-17 19:46:28 +00:00
Eelco Dolstra 6f2da398be * Revert to GHC 6.10.1 binary for bootstrapping GHC 6.10.2 at Andres'
suggestion.  It's good to use an older GHC for bootstrapping because
  old versions can build newer versions but not vice versa.

svn path=/nixpkgs/trunk/; revision=15120
2009-04-17 19:43:05 +00:00
Eelco Dolstra ad07109bba * Added GHC 6.10.2.
svn path=/nixpkgs/trunk/; revision=15106
2009-04-16 22:00:41 +00:00
Eelco Dolstra dae40d9c62 * GHC apparently works with Perl 5.10 now.
svn path=/nixpkgs/trunk/; revision=15101
2009-04-16 19:59:41 +00:00
Eelco Dolstra 902cf75ca6 * The wrapper to set LDPATH to $gmp/lib no longer seems necessary (but
the package.conf fixup is).

svn path=/nixpkgs/trunk/; revision=15100
2009-04-16 19:48:11 +00:00
Eelco Dolstra 7bb9c71aee * Doh.
svn path=/nixpkgs/trunk/; revision=15096
2009-04-16 19:27:14 +00:00
Eelco Dolstra 79cb8d11a6 * editline: renamed to libedit (which seems to be the proper name for
the package).
* Removed the old ghc-wrapper, which hasn't been used for a long time.
* Renamed the "boot" GHC to "binary", which is more descriptive.
  (They *can* be used for other things than bootstrapping a GHC
  source build.)
* Updated the GHC 6.10.1 binary to 6.10.2.

svn path=/nixpkgs/trunk/; revision=15095
2009-04-16 19:25:22 +00:00
Eelco Dolstra d182df5526 * Disable the GHC setup hook. It's kind of annoying to have to
rebuild all of GHC every time the setup hook changes.  Thus its
  better to factor it out.  (After all, the setup hook doesn't have to
  be provided by the GHC package proper; it can also be provided by
  some helper package.)

svn path=/nixpkgs/trunk/; revision=15094
2009-04-16 18:38:41 +00:00
Eelco Dolstra 405f746280 * More GHC cleanup.
svn path=/nixpkgs/trunk/; revision=15093
2009-04-16 18:21:03 +00:00
Eelco Dolstra 27855da0d9 * Put all the GHCs in one directory.
svn path=/nixpkgs/trunk/; revision=15092
2009-04-16 18:12:59 +00:00
Eelco Dolstra 49e5575268 * Started cleaning up the GHC support.
svn path=/nixpkgs/trunk/; revision=15091
2009-04-16 18:08:09 +00:00
Lluís Batlle i Rossell 3569572ce4 Fixing the name of iasl.
svn path=/nixpkgs/trunk/; revision=15072
2009-04-16 07:19:31 +00:00
Eelco Dolstra a4c304ef84 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
2009-04-15 13:25:01 +00:00
Sander van der Burg 96010823a7 Stole a patch from the cross-lfs project in order to compile dev86 on x86-64 linux
svn path=/nixpkgs/trunk/; revision=15056
2009-04-15 09:36:17 +00:00
Eelco Dolstra eeed10ba8e * g77 -> gfortran throughout. Got rid of the separate
expressions/builders for Fortran.  Tested by building Octave with
  gfortran 4.3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14978
2009-04-09 15:24:33 +00:00
Eelco Dolstra 2eb05cf933 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
2009-04-09 12:19:57 +00:00
Rob Vermaas d4646914ce removed metaBuildEnvTrunk, not necessary any more
svn path=/nixpkgs/trunk/; revision=14910
2009-04-07 13:57:26 +00:00
Marc Weber c22abb7c2a adding open source adobe flex sdk
svn path=/nixpkgs/trunk/; revision=14902
2009-04-06 13:07:21 +00:00
Rob Vermaas bbeaa60535 meta-build-env prerelease
svn path=/nixpkgs/trunk/; revision=14882
2009-04-04 15:10:42 +00:00
Rob Vermaas 6a469ac20a meta-build-env
svn path=/nixpkgs/trunk/; revision=14851
2009-04-03 09:34:49 +00:00
Eelco Dolstra d8e436c742 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14634
2009-03-20 16:49:02 +00:00
Eelco Dolstra 84b78f7489 * Work around a bug in java-front.
svn path=/nixpkgs/trunk/; revision=14620
2009-03-19 17:34:59 +00:00
Eelco Dolstra bbf6b46178 * Updated WebDSL.
svn path=/nixpkgs/trunk/; revision=14614
2009-03-19 16:04:32 +00:00
Eelco Dolstra e0b48bbdec * Added javafront & dryad.
svn path=/nixpkgs/trunk/; revision=14611
2009-03-19 14:46:38 +00:00
Eelco Dolstra 5986a4d175 * More cleanup. Updated to the latest Stratego/XT 0.17.
svn path=/nixpkgs/trunk/; revision=14610
2009-03-19 14:34:16 +00:00
Eelco Dolstra 399ee394d4 * Cleaned up some Stratego-related stuff.
svn path=/nixpkgs/trunk/; revision=14603
2009-03-19 12:21:28 +00:00
Eelco Dolstra 3593b97d63 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12:45:27 +00:00
Eelco Dolstra 2ae9a1c947 * Doh.
svn path=/nixpkgs/trunk/; revision=14498
2009-03-10 20:04:08 +00:00
Marc Weber b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
2009-03-06 23:21:28 +00:00
Eelco Dolstra fcad0b0a5a * Cleaned up a lot of description fields that contained newlines.
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
2009-03-03 13:27:40 +00:00
Michael Raskin 9d06868cda Updated Lazarus
svn path=/nixpkgs/trunk/; revision=14263
2009-02-26 15:49:55 +00:00
Michael Raskin d6682c9514 Updated FPC. Patch partially by Felix Breuer
svn path=/nixpkgs/trunk/; revision=14261
2009-02-26 15:14:17 +00:00
Ludovic Courtès 4373d12cb4 Add GNU Prolog.
svn path=/nixpkgs/trunk/; revision=14122
2009-02-19 13:32:07 +00:00
Eelco Dolstra 390695e73f * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
2009-02-12 21:16:55 +00:00
Eelco Dolstra 599015e8b0 * Split lib/default.nix into several files, as it had become a big
mess.  Also cleaned up some functions:

  - foldl appeared broken (it recursively called fold).
  - Renamed logicalAND/logicalOR to and/or.
  - Removed listOfListsToAttrs, eqStrings: obsolete.
  - Removed isInList, which does the same thing as elem.
  - stringToCharacters: don't return a "" at the end of the list.
  - Renamed concatList to concat, as concatList (singular) is a
    misnomer: it takes two lists.  Likewise, renamed mergeAttr to
    mergeAttrs.

  misc.nix still contains a lot of stuff that should be refactored and
  moved to other files.

svn path=/nixpkgs/trunk/; revision=14013
2009-02-09 16:51:03 +00:00
Eelco Dolstra 37b9b420cb * Sync with trunk. Back to gtkLibs214.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13960
2009-02-02 15:44:04 +00:00
Eelco Dolstra 79a039080c svn path=/nixpkgs/trunk/; revision=13951 2009-02-02 12:44:20 +00:00
Michael Raskin 9dcefd67ec Fix hash for JDK: was duplicate
svn path=/nixpkgs/trunk/; revision=13950
2009-02-02 12:42:00 +00:00
Marc Weber f47649b3db update jre/jdk to 1.6.0_11 cause _6 has known bugs (-> Eclipse FAQ)
svn path=/nixpkgs/trunk/; revision=13924
2009-01-31 22:03:18 +00:00
Eelco Dolstra c584bb878a * Sync with trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13903
2009-01-29 16:33:02 +00:00
Eelco Dolstra 112c86e719 * Typo in the URLs.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13891
2009-01-28 13:44:44 +00:00
Eelco Dolstra cfda61c7c6 * GCC 4.3.3, just in time too :-)
svn path=/nixpkgs/branches/stdenv-updates/; revision=13877
2009-01-27 11:53:35 +00:00
Lluís Batlle i Rossell 6c2c6d7fe4 Fixing commits I did, which didn't follow well the writing rules.
svn path=/nixpkgs/trunk/; revision=13868
2009-01-25 21:03:07 +00:00
Lluís Batlle i Rossell fb1fd1115f Adding Intel ACPI Compiler (trying to build virtualbox)
svn path=/nixpkgs/trunk/; revision=13845
2009-01-25 14:31:42 +00:00
Lluís Batlle i Rossell e44ec52b45 Adding dev86 (I'll try to get virtualbox built)
svn path=/nixpkgs/trunk/; revision=13844
2009-01-25 14:31:24 +00:00
Andres Löh 8a1fb2e075 Updated URIs of old ghc-6.8.2.
svn path=/nixpkgs/trunk/; revision=13802
2009-01-18 14:04:34 +00:00
Eelco Dolstra c1579d2e78 * stdenv branch: synced with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
2009-01-16 10:59:27 +00:00
Ludovic Courtès 1ef61a2580 Bigloo 3.2a.
svn path=/nixpkgs/trunk/; revision=13738
2009-01-11 22:49:44 +00:00
Andres Löh 77d9eec2a1 Changed the bootstrapping version of ghc-6.10.1.
Several binaries (except for ghc itself, for which there was a
workaround) were broken before because they were stripped
during installation. Now, all binaries should work, in particular
ghc-pkg ...

svn path=/nixpkgs/trunk/; revision=13717
2009-01-06 16:29:49 +00:00