From b2a7b213be921a8f4f32bd233ffdb01a00cfd3ee Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Thu, 14 Aug 2014 14:36:34 +0200
Subject: consul*: fix evaluation

CC #2955.
---
 pkgs/servers/consul/deps.nix |  8 ++++----
 pkgs/servers/consul/ui.nix   | 15 ++++++++-------
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'pkgs/servers/consul')

diff --git a/pkgs/servers/consul/deps.nix b/pkgs/servers/consul/deps.nix
index ba237e2d94e7..c1ebcf809288 100644
--- a/pkgs/servers/consul/deps.nix
+++ b/pkgs/servers/consul/deps.nix
@@ -6,7 +6,7 @@ let
       root = "code.google.com/p/go.net";
       src = fetchhg {
         url = "http://code.google.com/p/go.net";
-        tag = "134";
+        rev = "134";
         sha256 = "1jycpgrfwgkfac60zjbx6babcz7sgyn9xgy6cr3l811j6k8r2pbv";
       };
     }
@@ -14,7 +14,7 @@ let
       root = "code.google.com/p/go.text";
       src = fetchhg {
         url = "http://code.google.com/p/go.text";
-        tag = "85";
+        rev = "85";
         sha256 = "1x8h6vq9g5gbi7iiwla6dkaaqqf7wmkdm4szj7wvzlsijf2x8dwr";
       };
     }
@@ -211,7 +211,7 @@ let
       root = "launchpad.net/gocheck";
       src = fetchbzr {
         url = "https://launchpad.net/gocheck";
-        revision = "87";
+        rev = "87";
         sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0";
       };
     }
@@ -219,7 +219,7 @@ let
       root = "launchpad.net/mgo";
       src = fetchbzr {
         url = "https://launchpad.net/mgo";
-        revision = "2";
+        rev = "2";
         sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x";
       };
     }
diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix
index 68e12ab1cfed..d1c04f959cb8 100644
--- a/pkgs/servers/consul/ui.nix
+++ b/pkgs/servers/consul/ui.nix
@@ -1,11 +1,7 @@
 { stdenv, fetchzip }:
 
-let version = "0.3.0";
-in fetchzip {
-  name = "consul-ui-${version}";
-  url = "https://dl.bintray.com/mitchellh/consul/${version}_web_ui.zip";
-  sha256 = "0p4mhlrqidd6p3899wd3i9p41bdbb5avbz5986mnxg9f7dvhjdrc";
-
+let
+  version = "0.3.0";
   meta = with stdenv.lib; {
     homepage = http://www.consul.io/intro/getting-started/ui.html;
     description = "The static files for Consul's UI (used via -ui-dir)";
@@ -13,4 +9,9 @@ in fetchzip {
     license = licenses.mpl20 ;
     platforms = platforms.all;
   };
-}
+in (fetchzip {
+  name = "consul-ui-${version}";
+  url = "https://dl.bintray.com/mitchellh/consul/${version}_web_ui.zip";
+  sha256 = "0p4mhlrqidd6p3899wd3i9p41bdbb5avbz5986mnxg9f7dvhjdrc";
+}) // { inherit meta; }
+
-- 
cgit 1.4.1