drive: 20151025 -> 0.3.8.1

Update the `drive` package from version "20151025" to version 0.3.8.1,
replacing the package-definition files with updated versions given to
me by @Mic92 in [nixpkgs GitHub issue #19749] [1].

I have tested the updated package per nixpkgs manual section 11.1
("Making patches"), and I have tested that the update seems to fix
[issue #19749] [1].

[1]: <https://github.com/NixOS/nixpkgs/issues/19749>

2 files changed, 106 insertions, 71 deletions

diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
index 3f1b5dad727e1..826452016e736 100644
--- a/pkgs/applications/networking/drive/default.nix
+++ b/pkgs/applications/networking/drive/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "drive-${version}";
-  version = "20151025-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "6dc2f1e83032ea3911fa6147b846ee93f18dc544";
+  version = "0.3.8.1";
 
   goPackagePath = "github.com/odeke-em/drive";
   subPackages = [ "cmd/drive" ];
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/odeke-em/drive";
-    sha256 = "07s4nhfcr6vznf1amvl3a4wq2hn9zq871rcppfi4i6zs7iw2ay1v";
+  src = fetchFromGitHub {
+    owner = "odeke-em";
+    repo = "drive";
+    rev = "v${version}";
+    sha256 = "1b9cgc148rg5irg4jas10zv9i2km75x1zin25hld340dmpjcpi82";
   };
 
   goDeps = ./deps.nix;
+
+  meta = with lib; {
+    homepage = https://github.com/odeke-em/drive;
+    description = "Google Drive client for the commandline";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/applications/networking/drive/deps.nix b/pkgs/applications/networking/drive/deps.nix
index ad5a8f7c4e633..ca132288bd691 100644
--- a/pkgs/applications/networking/drive/deps.nix
+++ b/pkgs/applications/networking/drive/deps.nix
@@ -1,38 +1,30 @@
+# This file was generated by go2nix.
 [
   {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4";
-      sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p";
-    };
-  }
-  {
-    goPackagePath = "google.golang.org/api";
+    goPackagePath = "cloud.google.com/go";
     fetch = {
       type = "git";
-      url = "https://code.googlesource.com/google-api-go-client";
-      rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80";
-      sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8";
+      url = "https://code.googlesource.com/gocloud";
+      rev = "7450882a75c8d2600748666d1ed16e0a5afa532d";
+      sha256 = "1hl2lsf9m1imdszf5mww4h6qrcjfdjghwh6l2kqsy85d32vbkjgd";
     };
   }
   {
-    goPackagePath = "google.golang.org/cloud";
+    goPackagePath = "github.com/boltdb/bolt";
     fetch = {
       type = "git";
-      url = "https://code.googlesource.com/gocloud";
-      rev = "6335269abf9002cf5a84613c13cda6010842b834";
-      sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf";
+      url = "https://github.com/boltdb/bolt";
+      rev = "074dffcc83e9f421e261526d297cd93f22a34080";
+      sha256 = "1kkmsby74n9czqx4mvng9x1cvnm4qgjl3dp6b4mfmg2b00fwbqnv";
     };
   }
   {
-    goPackagePath = "golang.org/x/oauth2";
+    goPackagePath = "github.com/cheggaaa/pb";
     fetch = {
       type = "git";
-      url = "https://go.googlesource.com/oauth2";
-      rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a";
-      sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8";
+      url = "https://github.com/cheggaaa/pb";
+      rev = "ad4efe000aa550bb54918c06ebbadc0ff17687b9";
+      sha256 = "0w6dl2s0vzb64q85yfy1hd5z2fq2vzwygiwl65is6hwa4vkc7hi3";
     };
   }
   {
@@ -40,26 +32,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-isatty";
-      rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449";
-      sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj";
-    };
-  }
-  {
-    goPackagePath = "github.com/boltdb/bolt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/boltdb/bolt";
-      rev = "957d850b5158a4eebf915476058e720f43459584";
-      sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf";
+      rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8";
+      sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5";
     };
   }
   {
-    goPackagePath = "github.com/cheggaaa/pb";
+    goPackagePath = "github.com/odeke-em/cache";
     fetch = {
       type = "git";
-      url = "https://github.com/cheggaaa/pb";
-      rev = "e648e12b78cedf14ebb2fc1855033f07b034cfbb";
-      sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam";
+      url = "https://github.com/odeke-em/cache";
+      rev = "baf8e436bc97557118cb0bf118ab8ac6aeeda381";
+      sha256 = "00nvrnp40w4m1ld89k3s3gwi9qcfjxwi8hnp62zggnvqqyc4fyz1";
     };
   }
   {
@@ -72,12 +55,12 @@
     };
   }
   {
-    goPackagePath = "github.com/odeke-em/statos";
+    goPackagePath = "github.com/odeke-em/command";
     fetch = {
       type = "git";
-      url = "https://github.com/odeke-em/statos";
-      rev = "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6";
-      sha256 = "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs";
+      url = "https://github.com/odeke-em/command";
+      rev = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561";
+      sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62";
     };
   }
   {
@@ -99,6 +82,33 @@
     };
   }
   {
+    goPackagePath = "github.com/odeke-em/go-utils";
+    fetch = {
+      type = "git";
+      url = "https://github.com/odeke-em/go-utils";
+      rev = "d915395a7a46a9fe73d93f4daeff5953eeac5ef2";
+      sha256 = "0c1z4vmz69vxak8ldw4qjcgwia5ph969gj80az7a3824gia7zhbh";
+    };
+  }
+  {
+    goPackagePath = "github.com/odeke-em/go-uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/odeke-em/go-uuid";
+      rev = "b211d769a9aaba5b2b8bdbab5de3c227116f3c39";
+      sha256 = "086l4xmwkjl5qcylcb5iwy9ksk9k5g43xwfbkcgvmhpz5mq3wmz2";
+    };
+  }
+  {
+    goPackagePath = "github.com/odeke-em/log";
+    fetch = {
+      type = "git";
+      url = "https://github.com/odeke-em/log";
+      rev = "cad53c4565a0b0304577bd13f3862350bdc5f907";
+      sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w";
+    };
+  }
+  {
     goPackagePath = "github.com/odeke-em/meddler";
     fetch = {
       type = "git";
@@ -108,57 +118,75 @@
     };
   }
   {
-    goPackagePath = "github.com/odeke-em/xon";
+    goPackagePath = "github.com/odeke-em/pretty-words";
     fetch = {
       type = "git";
-      url = "https://github.com/odeke-em/xon";
-      rev = "d580be739d723da4f6378083128f93017b8ab295";
-      sha256 = "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc";
+      url = "https://github.com/odeke-em/pretty-words";
+      rev = "9d37a7fcb4ae6f94b288d371938482994458cecb";
+      sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl";
     };
   }
   {
-    goPackagePath = "github.com/odeke-em/cache";
+    goPackagePath = "github.com/odeke-em/semalim";
     fetch = {
       type = "git";
-      url = "https://github.com/odeke-em/cache";
-      rev = "b51b08cb6cf889deda6c941a5205baecfd16f3eb";
-      sha256 = "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4";
+      url = "https://github.com/odeke-em/semalim";
+      rev = "9c88bf5f9156ed06ec5110a705d41b8580fd96f7";
+      sha256 = "0nq93dcl84cmlvg31rdk281ndlc2452zlh5s7i40hasi0z0kmn1k";
     };
   }
   {
-    goPackagePath = "github.com/odeke-em/command";
+    goPackagePath = "github.com/odeke-em/statos";
     fetch = {
       type = "git";
-      url = "https://github.com/odeke-em/command";
-      rev = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561";
-      sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62";
+      url = "https://github.com/odeke-em/statos";
+      rev = "6f7e4db337bc11fc46d9b0456a93836cbbfe5141";
+      sha256 = "1lijz3cxqxd78sl0nzfgvs675dg7q99jqwvhgisnk9n84ic4ffzj";
     };
   }
   {
-    goPackagePath = "github.com/odeke-em/log";
+    goPackagePath = "github.com/skratchdot/open-golang";
     fetch = {
       type = "git";
-      url = "https://github.com/odeke-em/log";
-      rev = "cad53c4565a0b0304577bd13f3862350bdc5f907";
-      sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w";
+      url = "https://github.com/skratchdot/open-golang";
+      rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c";
+      sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga";
     };
   }
   {
-    goPackagePath = "github.com/odeke-em/pretty-words";
+    goPackagePath = "golang.org/x/crypto";
     fetch = {
       type = "git";
-      url = "https://github.com/odeke-em/pretty-words";
-      rev = "9d37a7fcb4ae6f94b288d371938482994458cecb";
-      sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl";
+      url = "https://go.googlesource.com/crypto";
+      rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3";
+      sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj";
     };
   }
   {
-    goPackagePath = "github.com/skratchdot/open-golang";
+    goPackagePath = "golang.org/x/net";
     fetch = {
       type = "git";
-      url = "https://github.com/skratchdot/open-golang";
-      rev = "c8748311a7528d0ba7330d302adbc5a677ef9c9e";
-      sha256 = "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac";
+      url = "https://go.googlesource.com/net";
+      rev = "6acef71eb69611914f7a30939ea9f6e194c78172";
+      sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev = "1e695b1c8febf17aad3bfa7bf0a819ef94b98ad5";
+      sha256 = "1sfgrc63jwslczkld7bsfipw1jm1rn06228dx0vc5gggd52155ys";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/api";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/google-api-go-client";
+      rev = "eb84d1a029af1654777e7ba65c979085305c3e38";
+      sha256 = "0ldmzcx5lxa81lcr39djcvyhd0ls11jlswj5877rinq3505ayf5l";
     };
   }
 ]