Commit graph

435 commits

Author SHA1 Message Date
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