3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

398 commits

Author SHA1 Message Date
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
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
Eelco Dolstra e31341510d * Merged from the trunk. Let's see how well this works with
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
2008-12-10 09:59:21 +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
Marc Weber 839be39796 updated jdk5-sun to 1_5_0_16
svn path=/nixpkgs/trunk/; revision=13016
2008-10-09 09:49:17 +00:00
Eelco Dolstra d09042b7d9 * GCC 4.3.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=12992
2008-10-07 17:33:40 +00:00
Ludovic Courtès 621b315eea Bigloo 3.1c.
svn path=/nixpkgs/trunk/; revision=12869
2008-09-16 21:18:33 +00:00
Michael Raskin 87ff8d6347 Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.
svn path=/nixpkgs/trunk/; revision=12655
2008-08-19 05:54:09 +00:00
Pjotr Prins f222b38f00 Added rightly named package gfortran and updated gcc version for compiling gfortran
r-lang debends on gfortran


svn path=/nixpkgs/trunk/; revision=12529
2008-08-07 08:33:03 +00:00
Andres Löh 25fa56e74f * updated the ghc HEAD snapshot
svn path=/nixpkgs/trunk/; revision=12454
2008-07-31 12:36:47 +00:00
Andres Löh a52d7b00f3 * missing file from last commit
svn path=/nixpkgs/trunk/; revision=12393
2008-07-22 13:02:11 +00:00
Andres Löh dd4a4a1dc4 * Added ghc-6.8.3 as the new default version of ghc.
* Added a ghc HEAD snapshot (ghc-6.9.x).

svn path=/nixpkgs/trunk/; revision=12391
2008-07-21 14:43:33 +00:00
Eelco Dolstra 48ac8018ca Improved support for building 32-bit binaries on x86_64-linux.
* glibc_multi: a wrapper that combines the 32-bit and 64-bit Glibcs.
  This is necessary so that 64-bit GCC can find gnu/stubs-32.h and the
  32-bit Glibc libraries.

  To build glibc_multi on x86_64-linux, you still need either the
  i686-linux Glibc derivation from a channel, or to have configured
  Nix with support for forwarding the build to a i686-linux machine.
  In the future this may become unnecessary by providing a prebuilt
  binary of 32-bit Glibc somewhere (like the binaries used in the
  stdenvLinux bootstrap).

* With glibc_multi, it becomes possible to build gcc with multilib
  support (i.e. it builds 32-bit and 64-bit versions of libgcc,
  libstdc++, etc.).

svn path=/nixpkgs/trunk/; revision=12203
2008-06-27 18:26:19 +00:00