* 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
This commit is contained in:
Eelco Dolstra
2009-02-09 16:51:03 +00:00
parent eebb6f106c
commit 599015e8b0
14 changed files with 982 additions and 902 deletions
+16 -19
View File
@@ -1,19 +1,16 @@
args: with args;
let
flacFun = version: hash:
stdenv.mkDerivation rec {
name = "flac-${version}";
src = fetchurl ({
url = "http://downloads.xiph.org/releases/flac/${name}.tar.gz";
} // hash);
buildInputs = [libogg];
meta = {
homepage = http://flac.sourceforge.net;
};
};
in
stdenv.lib.listOfListsToAttrs [
[ "default" (flacFun "1.2.1" { sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn"; }) ]
[ "1.2.1" (flacFun "1.2.1" { sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn"; }) ]
[ "1.1.2" (flacFun "1.1.2" { md5 = "2bfc127cdda02834d0491ab531a20960"; }) ]
]
{stdenv, fetchurl, libogg}:
stdenv.mkDerivation rec {
name = "flac-1.2.1";
src = fetchurl {
url = mirror://sourceforge/flac/flac-1.2.1.tar.gz;
sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn";
};
buildInputs = [libogg];
meta = {
homepage = http://flac.sourceforge.net;
};
}