* 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

1 files changed, 16 insertions, 19 deletions

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 6095e59fa07..ad9d3356cda 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -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;
+  };
+}