From a277b420eec09b88180ba04cc5d0cf0007497526 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 6 Mar 2008 02:48:09 +0000
Subject: [PATCH] annotatedDerivation removed

svn path=/nixpkgs/trunk/; revision=10975
---
 pkgs/lib/annotatedDerivations.nix | 56 -------------------------------
 pkgs/top-level/all-packages.nix   |  2 --
 2 files changed, 58 deletions(-)
 delete mode 100644 pkgs/lib/annotatedDerivations.nix

diff --git a/pkgs/lib/annotatedDerivations.nix b/pkgs/lib/annotatedDerivations.nix
deleted file mode 100644
index eca97747cd8..00000000000
--- a/pkgs/lib/annotatedDerivations.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib } : with lib; with builtins; rec {
-  /*
-  # traversal proposal (very unstable now )
-  # goal: create tags easily (and install source files along without recompiling)
-
-  rec {
-    # encouraged: using it you can filter based on names later on? Do we ned it?
-    name = 
-
-    # required: the annotated derivation (this attr is used to identify a
-    # annotated derivation)
-    aDeriv =
-
-    # required: extra list of annotated dependencies, so we can traverse the tree
-    aDeps = <annotated deps>
-
-    # your annotation derivations 
-  };
-  */
-
-  isAnnotated = a : (a ? aDeriv); # this function serves documentation purposes 
-
-  delAnnotation = a :
-    if ((__isAttrs a) && (isAnnotated a)) then  a.aDeriv
-    else a; # most probalby a derivation without annotations.
-
-  # returns buildInputs and propagatedBuildInputs from given set after removing annotations
-  delAnnotationsFromInputs = attrs :
-    subsetmap (map delAnnotation) attrs [ "buildInputs" "propagatedBuildInputs" ];
-
-  /* so an annotated drivation function might look like this
-  args: with args;
-    let aDeps = filterDeps args;
-        deps = delAnnotation aDeps;
-    in rec {
-      name = "my-package-0.2";
-      inherit aDeps;
-
-      aDeriv = stdenv.mkDerivation {
-        inherit name;
-        buildInputs = deps;
-      };
-    };
-
-  */
-
-  filterAnnotated = lib.filter isAnnotated;
-
-  # stops when depthCounter = 0 
-  traverseByDepthCounter = depthCounter : aAttrs :
-    if (depthCounter == 0) then []
-    else [ aAttrs ] ++ map (traverseByDepthCounter (__sub depthCounter 1) ) (filterAnnotated aAttrs.aDeps);
-
-  # get all deps recursively
-  uniqAnnotatedDeps = aAttrs : uniqList { inputList = traverseByDepthCounter 10 aAttrs; };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb067b77dac..646f9e0db29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -124,8 +124,6 @@ rec {
 
   lib = import ../lib;
 
-  annotatedDerivations = (import ../lib/annotatedDerivations.nix) { inherit lib; };
-
   # optional srcDir
   annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags);