From c0570ed238d73db1f59f7b764688acb532ac8c9e Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Mon, 7 Oct 2019 10:00:04 +0200
Subject: [PATCH] zsh-history: use goModule build infrastructure

---
 pkgs/shells/zsh/zsh-history/default.nix |  14 +-
 pkgs/shells/zsh/zsh-history/deps.nix    | 237 ------------------------
 2 files changed, 7 insertions(+), 244 deletions(-)
 delete mode 100644 pkgs/shells/zsh/zsh-history/deps.nix

diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix
index 54a39209ca9c..6f461178a449 100644
--- a/pkgs/shells/zsh/zsh-history/default.nix
+++ b/pkgs/shells/zsh/zsh-history/default.nix
@@ -1,24 +1,24 @@
-{ lib, fetchFromGitHub, buildGoPackage, installShellFiles }:
+{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "zsh-history";
-  version = "2019-10-27";
+  version = "2019-10-07";
 
   src = fetchFromGitHub {
     owner = "b4b4r07";
     repo = "history";
-    rev = "527e6f51873992fbf9c1aad70aa3009a0027a8de";
-    sha256 = "12dc380zfg3b9k7rcsyzi9dxqh28c4957b3fsx1nxvqvdm3ralm2";
+    rev = "a08ad2dcffc852903ae54b0c5704b8a085009ef7";
+    sha256 = "0r3p04my40dagsq1dssnk583qrlcps9f7ajp43z7mq73q3hrya5s";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  goDeps = ./deps.nix;
+  modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42";
   goPackagePath = "github.com/b4b4r07/history";
 
   postInstall = ''
     install -d $out/share
-    cp -r $NIX_BUILD_TOP/go/src/${goPackagePath}/misc/* $out/share
+    cp -r "$NIX_BUILD_TOP/source/misc/"* "$out/share"
     installShellCompletion --zsh --name _history $out/share/zsh/completions/_history
   '';
 
diff --git a/pkgs/shells/zsh/zsh-history/deps.nix b/pkgs/shells/zsh/zsh-history/deps.nix
deleted file mode 100644
index eeefe17b4b8c..000000000000
--- a/pkgs/shells/zsh/zsh-history/deps.nix
+++ /dev/null
@@ -1,237 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
-  {
-    goPackagePath  = "github.com/BurntSushi/toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/BurntSushi/toml";
-      rev =  "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
-      sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
-    };
-  }
-  {
-    goPackagePath  = "github.com/Songmu/go-ltsv";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Songmu/go-ltsv";
-      rev =  "fa2196a290e61d8689cd018048cbb6f14802782b";
-      sha256 = "1mzkvw3510vska7qmcgxxz8qlkn9avw1apfxdncs9rqs9srgqm29";
-    };
-  }
-  {
-    goPackagePath  = "github.com/b4b4r07/go-ask";
-    fetch = {
-      type = "git";
-      url = "https://github.com/b4b4r07/go-ask";
-      rev =  "d8472e72c0d0ac9e17d5d63080e6bf81687030a2";
-      sha256 = "0762bybn7ii6aykycssdk1rkr2zmg8ijnkz94p330rfr27cnxyrx";
-    };
-  }
-  {
-    goPackagePath  = "github.com/b4b4r07/go-colon";
-    fetch = {
-      type = "git";
-      url = "https://github.com/b4b4r07/go-colon";
-      rev =  "bc5ae99f1c2b6d202bd43ea8258596f0a09e7378";
-      sha256 = "046xwvddj023j3xaq6g05xgzj9n13lmhbs5vddh68nyxnhbyrxqm";
-    };
-  }
-  {
-    goPackagePath  = "github.com/b4b4r07/go-pathshorten";
-    fetch = {
-      type = "git";
-      url = "https://github.com/b4b4r07/go-pathshorten";
-      rev =  "b07af83744ea6f0a3abdd663f3f0c5e4457828ab";
-      sha256 = "1ccljskb7x02lzy0sai9pyscdpkj4fj1bw82bjb3xicvhiafpvkh";
-    };
-  }
-  {
-    goPackagePath  = "github.com/briandowns/spinner";
-    fetch = {
-      type = "git";
-      url = "https://github.com/briandowns/spinner";
-      rev =  "5b875a9171af19dbde37e70a8fcbe2ebd7285e05";
-      sha256 = "0vq78qmg07dm9vnjqz17ca9qml8np7f9vj9igsira7a39xg09ivg";
-    };
-  }
-  {
-    goPackagePath  = "github.com/dustin/go-humanize";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dustin/go-humanize";
-      rev =  "9f541cc9db5d55bce703bd99987c9d5cb8eea45e";
-      sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
-    };
-  }
-  {
-    goPackagePath  = "github.com/fatih/color";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fatih/color";
-      rev =  "2d684516a8861da43017284349b7e303e809ac21";
-      sha256 = "1fcfmz4wji3gqmmsdx493r7d101s58hwjalqps6hy25nva5pvmfs";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev =  "89a0c16f4dc2a70c0ed864d8ef64878f24fdaa51";
-      sha256 = "0ik05qacl2alb673c7h6pn280j43y4wnv7j3lakp334zdp89npiy";
-    };
-  }
-  {
-    goPackagePath  = "github.com/google/go-github";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-github";
-      rev =  "dae5b8767170392dd51fafc89da6605faa51a1c2";
-      sha256 = "0hd1xpw12a1c406mya3c11i7zzwhx3w0wzkg7v9py437yf72m5id";
-    };
-  }
-  {
-    goPackagePath  = "github.com/google/go-querystring";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-querystring";
-      rev =  "53e6ce116135b80d037921a7fdd5138cf32d7a8a";
-      sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f";
-    };
-  }
-  {
-    goPackagePath  = "github.com/inconshreveable/mousetrap";
-    fetch = {
-      type = "git";
-      url = "https://github.com/inconshreveable/mousetrap";
-      rev =  "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
-      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
-    };
-  }
-  {
-    goPackagePath  = "github.com/kballard/go-shellquote";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kballard/go-shellquote";
-      rev =  "95032a82bc518f77982ea72343cc1ade730072f0";
-      sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mattn/go-colorable";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-colorable";
-      rev =  "efa589957cd060542a26d2dd7832fd6a6c6c3ade";
-      sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mattn/go-isatty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-isatty";
-      rev =  "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
-      sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mattn/go-pipeline";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-pipeline";
-      rev =  "cfb87a531e2beb376fe3ce94a6dfef7956d33bc7";
-      sha256 = "1jkchwvcy6df8r9820ram8agw6qsvhv64a2k45lv5nldh6rz3vn0";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mattn/go-shellwords";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-shellwords";
-      rev =  "f8471b0a71ded0ab910825ee2cf230f25de000f1";
-      sha256 = "023mdii306ff1h0n4cyylchsb5r2sdxl8x4a7dlbvry45daz2azb";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pelletier/go-buffruneio";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pelletier/go-buffruneio";
-      rev =  "e2f66f8164ca709d4c21e815860afd2024e9b894";
-      sha256 = "16h7fybbai45p5gn2la6z37a8h1ws6r3pg3nwqiw6gbbgjqicrbv";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pelletier/go-toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pelletier/go-toml";
-      rev =  "c2dbbc24a97911339e01bda0b8cabdbd8f13b602";
-      sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/spf13/cobra";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/cobra";
-      rev =  "7c4570c3ebeb8129a1f7456d0908a8b676b6f9f1";
-      sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7";
-    };
-  }
-  {
-    goPackagePath  = "github.com/spf13/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/pflag";
-      rev =  "9a97c102cda95a86cec2345a6f09f55a939babf5";
-      sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev =  "de0752318171da717af4ce24d0a2e8626afaeb11";
-      sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev =  "c39426892332e1bb5ec0a434a079bf82f5d30c54";
-      sha256 = "1w26avkg623xilnwnad0cq6768cfbs4mxk875382xh0da6ai50s3";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/oauth2";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/oauth2";
-      rev =  "3d292e4d0cdc3a0113e6d207bb137145ef1de42f";
-      sha256 = "0jvivlvx7snacd6abd1prqxa7h1z6b7s6mqahn8lpqlag3asryrl";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev =  "98c5dad5d1a0e8a73845ecc8897d0bd56586511d";
-      sha256 = "1jqajmnsp5a185a5gzfacnvdf5yid0ywi0bsia473h268z2rv8hs";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/appengine";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/appengine";
-      rev =  "4216e58b9158e5f1c906f1aca75162a46a2ec88a";
-      sha256 = "0mjg37cb6x3d85yi88sy20xa9czmzrfymfjg46b6ba6gr3rnlxi2";
-    };
-  }
-]
\ No newline at end of file