Commit Graph

382 Commits

Author SHA1 Message Date
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
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
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
Eelco Dolstra
aaccd6f6e2 * Fix building the Fortran compiler.
svn path=/nixpkgs/trunk/; revision=12201
2008-06-27 14:43:25 +00:00
Eelco Dolstra
34f583224d * GCC 4.3.1. (g++ doesn't work yet though.)
svn path=/nixpkgs/trunk/; revision=12194
2008-06-26 10:20:33 +00:00
Eelco Dolstra
faba06ce54 * firefox-wrapper: plugins no longer have to declare additional
LD_LIBRARY_PATH elements, since they can use patchelf --rpath if
  necessary.
* Flashplayer / JRE: do just that.
* JRE: libstdcpp5 no longer seems to be necessary for the plugin.

svn path=/nixpkgs/trunk/; revision=12094
2008-06-14 21:42:07 +00:00
Eelco Dolstra
fc5eebdf8b * Merged the stdenv branch
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
2008-06-13 11:46:39 +00:00
Andres Löh
d025d67118 * layout changes
svn path=/nixpkgs/trunk/; revision=11980
2008-06-04 14:03:20 +00:00
Andres Löh
ec984a1208 Added a ghc-6.8.3 snapshot (with version number 6.8.2.20080602).
svn path=/nixpkgs/trunk/; revision=11969
2008-06-04 09:42:25 +00:00
Andres Löh
dbddb786cc Remove a patch that is no longer used and needed.
svn path=/nixpkgs/trunk/; revision=11968
2008-06-04 09:40:17 +00:00
Ludovic Courtès
ecc5f11e65 Add Stalin, an efficient Scheme compiler.
svn path=/nixpkgs/trunk/; revision=11927
2008-05-29 12:10:10 +00:00
Eelco Dolstra
e1410edbc9 * GCC 4.2.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=11890
2008-05-26 07:36:32 +00:00
Tobias Hammerschmidt
326a234888 version update
svn path=/nixpkgs/trunk/; revision=11774
2008-05-07 18:37:55 +00:00
Michael Raskin
e9b3f798ba Added Ikarus Scheme
svn path=/nixpkgs/trunk/; revision=11755
2008-05-06 07:01:50 +00:00
Marc Weber
e17c96c881 Support for profiling (all libraries) enabled by custom config
moved flapjax to ghcExecutables
added haskelldb mysql
added ghc darcs build (left in comments)

svn path=/nixpkgs/trunk/; revision=11742
2008-04-28 22:27:03 +00:00
Tobias Hammerschmidt
1ad80e8dbc java 6 update 6
svn path=/nixpkgs/trunk/; revision=11723
2008-04-25 21:49:54 +00:00
Eelco Dolstra
09ab596e0f * Remove calls to fail().
svn path=/nixpkgs/branches/stdenv-updates/; revision=11690
2008-04-23 07:34:20 +00:00
Marc Weber
5f5fb2ce5d exposing /bin/* as well because of helper applications such as hsc2hs
svn path=/nixpkgs/trunk/; revision=11636
2008-04-15 17:05:28 +00:00
Tobias Hammerschmidt
d62d2eea35 doh!
svn path=/nixpkgs/trunk/; revision=11595
2008-04-11 22:13:51 +00:00