From 27a8717936cd22207449e8d63c03659acf83a3da Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Wed, 25 Jan 2023 10:44:50 +0000
Subject: drive: 0.3.8.1 -> 0.4.0

---
 pkgs/applications/networking/drive/default.nix |  26 ++--
 pkgs/applications/networking/drive/deps.nix    | 192 -------------------------
 2 files changed, 18 insertions(+), 200 deletions(-)
 delete mode 100644 pkgs/applications/networking/drive/deps.nix

(limited to 'pkgs/applications/networking/drive')

diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
index ad1a0c9a533cd..576133e650c8d 100644
--- a/pkgs/applications/networking/drive/default.nix
+++ b/pkgs/applications/networking/drive/default.nix
@@ -1,25 +1,35 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "drive";
-  version = "0.3.8.1";
-
-  goPackagePath = "github.com/odeke-em/drive";
-  subPackages = [ "cmd/drive" ];
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "odeke-em";
     repo = "drive";
     rev = "v${version}";
-    sha256 = "1b9cgc148rg5irg4jas10zv9i2km75x1zin25hld340dmpjcpi82";
+    hash = "sha256-mNOeOB0Tn5eqULFJZuE18PvLoHtnspv4AElmgEQKXcU=";
   };
 
-  goDeps = ./deps.nix;
+  vendorHash = "sha256-F/ikdr7UCVlNv2yiEemyB7eIkYi3mX+rJvSfX488RFc=";
+
+  patches = [
+    # Add Go Modules support
+    (fetchpatch {
+      url = "https://github.com/odeke-em/drive/commit/0fb4bb2cf83a7293d9a33b00f8fc07e1c8dd8b7c.patch";
+      hash = "sha256-4PxsgfufhTfmy/7N5QahIhmRa0rb2eUDXJ66pYb6jFg=";
+    })
+  ];
+
+  subPackages = [ "cmd/drive" ];
+
+  ldflags = [ "-s" "-w" ];
 
   meta = with lib; {
     homepage = "https://github.com/odeke-em/drive";
     description = "Google Drive client for the commandline";
     license = licenses.asl20;
+    maintainers = with maintainers; [ aaronjheng ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/drive/deps.nix b/pkgs/applications/networking/drive/deps.nix
deleted file mode 100644
index ca132288bd691..0000000000000
--- a/pkgs/applications/networking/drive/deps.nix
+++ /dev/null
@@ -1,192 +0,0 @@
-# This file was generated by go2nix.
-[
-  {
-    goPackagePath = "cloud.google.com/go";
-    fetch = {
-      type = "git";
-      url = "https://code.googlesource.com/gocloud";
-      rev = "7450882a75c8d2600748666d1ed16e0a5afa532d";
-      sha256 = "1hl2lsf9m1imdszf5mww4h6qrcjfdjghwh6l2kqsy85d32vbkjgd";
-    };
-  }
-  {
-    goPackagePath = "github.com/boltdb/bolt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/boltdb/bolt";
-      rev = "074dffcc83e9f421e261526d297cd93f22a34080";
-      sha256 = "1kkmsby74n9czqx4mvng9x1cvnm4qgjl3dp6b4mfmg2b00fwbqnv";
-    };
-  }
-  {
-    goPackagePath = "github.com/cheggaaa/pb";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cheggaaa/pb";
-      rev = "ad4efe000aa550bb54918c06ebbadc0ff17687b9";
-      sha256 = "0w6dl2s0vzb64q85yfy1hd5z2fq2vzwygiwl65is6hwa4vkc7hi3";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-isatty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-isatty";
-      rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8";
-      sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5";
-    };
-  }
-  {
-    goPackagePath = "github.com/odeke-em/cache";
-    fetch = {
-      type = "git";
-      url = "https://github.com/odeke-em/cache";
-      rev = "baf8e436bc97557118cb0bf118ab8ac6aeeda381";
-      sha256 = "00nvrnp40w4m1ld89k3s3gwi9qcfjxwi8hnp62zggnvqqyc4fyz1";
-    };
-  }
-  {
-    goPackagePath = "github.com/odeke-em/cli-spinner";
-    fetch = {
-      type = "git";
-      url = "https://github.com/odeke-em/cli-spinner";
-      rev = "610063bb4aeef25f7645b3e6080456655ec0fb33";
-      sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c";
-    };
-  }
-  {
-    goPackagePath = "github.com/odeke-em/command";
-    fetch = {
-      type = "git";
-      url = "https://github.com/odeke-em/command";
-      rev = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561";
-      sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62";
-    };
-  }
-  {
-    goPackagePath = "github.com/odeke-em/exponential-backoff";
-    fetch = {
-      type = "git";
-      url = "https://github.com/odeke-em/exponential-backoff";
-      rev = "96e25d36ae36ad09ac02cbfe653b44c4043a8e09";
-      sha256 = "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6";
-    };
-  }
-  {
-    goPackagePath = "github.com/odeke-em/extractor";
-    fetch = {
-      type = "git";
-      url = "https://github.com/odeke-em/extractor";
-      rev = "801861aedb854c7ac5e1329e9713023e9dc2b4d4";
-      sha256 = "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1";
-    };
-  }
-  {
-    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";
-      url = "https://github.com/odeke-em/meddler";
-      rev = "d2b51d2b40e786ab5f810d85e65b96404cf33570";
-      sha256 = "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x";
-    };
-  }
-  {
-    goPackagePath = "github.com/odeke-em/pretty-words";
-    fetch = {
-      type = "git";
-      url = "https://github.com/odeke-em/pretty-words";
-      rev = "9d37a7fcb4ae6f94b288d371938482994458cecb";
-      sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl";
-    };
-  }
-  {
-    goPackagePath = "github.com/odeke-em/semalim";
-    fetch = {
-      type = "git";
-      url = "https://github.com/odeke-em/semalim";
-      rev = "9c88bf5f9156ed06ec5110a705d41b8580fd96f7";
-      sha256 = "0nq93dcl84cmlvg31rdk281ndlc2452zlh5s7i40hasi0z0kmn1k";
-    };
-  }
-  {
-    goPackagePath = "github.com/odeke-em/statos";
-    fetch = {
-      type = "git";
-      url = "https://github.com/odeke-em/statos";
-      rev = "6f7e4db337bc11fc46d9b0456a93836cbbfe5141";
-      sha256 = "1lijz3cxqxd78sl0nzfgvs675dg7q99jqwvhgisnk9n84ic4ffzj";
-    };
-  }
-  {
-    goPackagePath = "github.com/skratchdot/open-golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/skratchdot/open-golang";
-      rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c";
-      sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3";
-      sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      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";
-    };
-  }
-]
-- 
cgit 1.4.1