diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 4bbd0289a15..d446e057174 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -1,23 +1,21 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "wego"; - version = "unstable-2019-02-11"; - rev = "994e4f141759a1070d7b0c8fbe5fad2cc7ee7d45"; + version = "2.1"; - goPackagePath = "github.com/schachmat/wego"; - - src = fetchgit { - inherit rev; - url = "https://github.com/schachmat/wego"; - sha256 = "1affzwi5rbp4zkirhmby8bvlhsafw7a4rs27caqwyj8g3jhczmhy"; + src = fetchFromGitHub { + owner = "schachmat"; + repo = pname; + rev = version; + sha256 = "sha256-lMcrFwYtlnivNjSbzyiAEAVX6ME87yB/Em8Cxb1LUS4="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-kv8c0TZdxCIfmkgCLDiNyoGqQZEKUlrNLEbjlG9rSPs="; - meta = { - license = lib.licenses.isc; + meta = with lib; { homepage = "https://github.com/schachmat/wego"; description = "Weather app for the terminal"; + license = licenses.isc; }; } diff --git a/pkgs/applications/misc/wego/deps.nix b/pkgs/applications/misc/wego/deps.nix deleted file mode 100644 index 133315cd022..00000000000 --- a/pkgs/applications/misc/wego/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "98ec13f34aabf44cc914c65a1cfb7b9bc815aef1"; - sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "31745d66dd679ac0ac4f8d3ecff168fce6170c6a"; - sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "18c3d09a134a52720932bbaa92c798a0ab111004"; - sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66"; - }; - } - { - goPackagePath = "github.com/schachmat/ingo"; - fetch = { - type = "git"; - url = "https://github.com/schachmat/ingo"; - rev = "a4bdc0729a3fda62cc4069b6e490fc657fd54e33"; - sha256 = "1gw0kddy7jh3467imsqni86cf9yq7k6vpfc0ywkbwj0zsjsdgd49"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b016eb3dc98ea7f69ed55e8216b87187067ae621"; - sha256 = "1k0qr26046d228gi6ngkfxp4m1rjgxk4jj75h0kh1cpyp91n5rja"; - }; - } -]