oh: 20160522 -> 0.8.0

2 files changed, 16 insertions, 43 deletions

diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix
index 33e71358b4d..68f34fe8eb1 100644
--- a/pkgs/shells/oh/default.nix
+++ b/pkgs/shells/oh/default.nix
@@ -1,23 +1,25 @@
-{ buildGoPackage, fetchgit, lib }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "oh";
-  version = "20160522-${lib.strings.substring 0 7 rev}";
-  rev = "0daaf4081475fb9d6b3801c85019bdd57b2ee9b4";
+  version = "0.8.0";
 
-  goPackagePath = "github.com/michaelmacinnis/oh";
-
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/michaelmacinnis/oh";
-    sha256 = "0ajidzs0aisbw74nri9ks6sx6644nmwkisc9mvxm3f89zmnlsgwr";
+  src = fetchFromGitHub {
+    owner = "michaelmacinnis";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0sdpk77i5mfamkdqldybl9znzz92hqgi4xvby5j28m0a5gw46kj0";
   };
 
-  goDeps = ./deps.nix;
+  vendorSha256 = "12vlvh37hvi8c1i9arppm5wj4v9c98s7myxra10q6qpdqssgc8a0";
 
-  meta = with lib;{
+  meta = with lib; {
     homepage = "https://github.com/michaelmacinnis/oh";
-    description = "A Unix shell";
-    license = lib.licenses.mit;
+    description = "A new Unix shell";
+    license = licenses.mit;
+  };
+
+  passthru = {
+    shellPath = "/bin/oh";
   };
 }
diff --git a/pkgs/shells/oh/deps.nix b/pkgs/shells/oh/deps.nix
deleted file mode 100644
index b4b98f10c3a..00000000000
--- a/pkgs/shells/oh/deps.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-[
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "d9157a9621b69ad1d8d77a1933590c416593f24f";
-      sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931";
-    };
-  }
-  {
-    goPackagePath = "github.com/michaelmacinnis/adapted";
-    fetch = {
-      type = "git";
-      url = "https://github.com/michaelmacinnis/adapted";
-      rev = "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978";
-      sha256 = "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv";
-    };
-  }
-  {
-    goPackagePath = "github.com/peterh/liner";
-    fetch = {
-      type = "git";
-      url = "https://github.com/peterh/liner";
-      rev = "ad1edfd30321d8f006ccf05f1e0524adeb943060";
-      sha256 = "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317";
-    };
-  }
-]