1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Commit graph

406 commits

Author SHA1 Message Date
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
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
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 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 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 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 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
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
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
Michael Raskin 02d4d7ada4 Bigloo has tired me with disappearing betas..
svn path=/nixpkgs/trunk/; revision=13672
2009-01-01 19:52:20 +00:00
Michael Raskin e95557f033 Bigloo version bump to beta 2088-12-18
svn path=/nixpkgs/trunk/; revision=13667
2008-12-21 17:41:10 +00:00
Marc Weber e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
2008-12-20 01:20:35 +00:00
Marc Weber ce242a0bd8 ghc-6.10 binary
svn path=/nixpkgs/trunk/; revision=13345
2008-11-19 21:46:19 +00:00
Eelco Dolstra aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Michael Raskin c5363217ad meta.function -> passthru.function, not killing other contents of passthru
svn path=/nixpkgs/trunk/; revision=13190
2008-11-04 21:24:10 +00:00
Michael Raskin 9e48add3e0 Try protecting FreeBSD from instntiating TinyCC
svn path=/nixpkgs/trunk/; revision=13184
2008-11-03 19:16:21 +00:00
Ludovic Courtès 0336a2f3bb TinyCC: Fix crt and loader paths.
svn path=/nixpkgs/trunk/; revision=13170
2008-10-31 18:39:49 +00:00
Ludovic Courtès d0ef8a845e Add TinyCC (TCC), a small, fast, and embeddable C compiler and interpreter.
svn path=/nixpkgs/trunk/; revision=13168
2008-10-31 16:52:44 +00:00
Eelco Dolstra 8b458f246f * Fixed ghc-pkg in ghcboot on Darwin (it doesn't like the -framework flag).
This is needed to get haddockboot to build.

svn path=/nixpkgs/trunk/; revision=13031
2008-10-09 16:08:48 +00:00
Eelco Dolstra 92d6f869f2 * Apparently the URL has changed.
svn path=/nixpkgs/trunk/; revision=13029
2008-10-09 15:38:29 +00:00