Update test builder

Author: rvl

test/default.nix

@@ -36,18 +36,36 @@ let
     ];
   };
 
-  fetch-bower = import ./.. { inherit pkgs; };
+  bower2nix = import ./.. { inherit pkgs; };
 
   # fetch-bower-3.0.0 has different command line args from fetch-bower-2.0.0
   # nixpkgs will need a pull request for this change.
   # Also the quoting of fetch-bower arguments was fixed
   fetchbower = name: version: target: outputHash: pkgs.stdenv.mkDerivation {
-    name = "${name}-${version}";
-    buildCommand = "fetch-bower --out=$out '${name}' '${target}' '${version}'";
+    name = "${name}-${bowerVersion version}";
+    buildCommand = "fetch-bower --quiet --out=$out '${name}' '${target}' '${version}'";
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
     inherit outputHash;
-    buildInputs = [pkgs.git fetch-bower];
+    buildInputs = [ bower2nix ];
+  };
+
+  bowerVersion = version:
+    let
+      components = pkgs.lib.splitString "#" version;
+      hash = pkgs.lib.last components;
+      ver = if builtins.length components == 1 then version else hash;
+    in ver;
+
+
+  # running bower2nix from nix can't really work properly.
+  bowerGeneratedNix = pkgs.stdenv.mkDerivation {
+    name = "bower-generated.nix";
+    src = test;
+    buildInputs = [ bower2nix ];
+    buildPhase = "bower2nix bower.json $out";
+    installPhase = "true";
+    preferLocalBuild = true;
   };
 
 in bowerComponents