diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-02-09 16:51:03 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-02-09 16:51:03 +0000 |
| commit | 599015e8b071bc8d38779fbfc37961db1ac0f464 (patch) | |
| tree | 12cfb8ef316f4021ef81d135a5c331804a817809 /pkgs/development/compilers/ocaml | |
| parent | eebb6f106c445c5661975a60a55b07ad91c6fa47 (diff) | |
* 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
Diffstat (limited to 'pkgs/development/compilers/ocaml')
| -rw-r--r-- | pkgs/development/compilers/ocaml/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/compilers/ocaml/default.nix b/pkgs/development/compilers/ocaml/default.nix index 837a685198bd5..f3ef70b2a5581 100644 --- a/pkgs/development/compilers/ocaml/default.nix +++ b/pkgs/development/compilers/ocaml/default.nix @@ -1,7 +1,8 @@ args: -args.stdenv.lib.listOfListsToAttrs [ - [ "3.08.0" (import ./3.08.0.nix args) ] - [ "3.09.1" (import ./3.09.1.nix args) ] - [ "3.10.0" (import ./3.10.0.nix args) ] - [ "default" (import ./3.09.1.nix args) ] + +builtins.listToAttrs [ + { name = "3.08.0"; value = import ./3.08.0.nix args; } + { name = "3.09.1"; value = import ./3.09.1.nix args; } + { name = "3.10.0"; value = import ./3.10.0.nix args; } + { name = "default"; value = import ./3.09.1.nix args; } ] |