diff options
author | Nikolay Korotkiy <sikmir@gmail.com> | 2020-06-19 19:53:34 +0300 |
---|---|---|
committer | Nikolay Korotkiy <sikmir@gmail.com> | 2020-06-19 19:53:34 +0300 |
commit | 0dbc4721b53d74ff985765c47638907729c116a4 (patch) | |
tree | c53688eb660cbf9f4fd12683be31dd1de511ddc0 | |
parent | 612ef3438aff907113780374babb69a1bcfa08c6 (diff) |
micro: 2.0.3 -> 2.0.5
-rw-r--r-- | pkgs/applications/editors/micro/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/editors/micro/deps.nix | 8 |
2 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index 6a1ee5d196ee..438dec91d47d 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -2,21 +2,25 @@ buildGoPackage rec { pname = "micro"; - version = "2.0.3"; + version = "2.0.5"; goPackagePath = "github.com/zyedidia/micro"; src = fetchFromGitHub { owner = "zyedidia"; - repo = "micro"; + repo = pname; rev = "v${version}"; - sha256 = "017m9kb3gfrgzd06f1nma1i3m5rb0hzpgdikb86lsyv8ik18y12z"; + sha256 = "12fyyax1mr0n82s5yhmk90iyyzbh32rppkkpj37c25pal73czdhc"; fetchSubmodules = true; }; subPackages = [ "cmd/micro" ]; - buildFlagsArray = [ "-ldflags=" "-X ${goPackagePath}/internal/util.Version=${version}" ]; + buildFlagsArray = let t = "${goPackagePath}/internal/util"; in '' + -ldflags= + -X ${t}.Version=${version} + -X ${t}.CommitHash=${src.rev} + ''; goDeps = ./deps.nix; diff --git a/pkgs/applications/editors/micro/deps.nix b/pkgs/applications/editors/micro/deps.nix index e8ed69a9088b..c274ce80ada1 100644 --- a/pkgs/applications/editors/micro/deps.nix +++ b/pkgs/applications/editors/micro/deps.nix @@ -203,8 +203,8 @@ fetch = { type = "git"; url = "https://github.com/zyedidia/clipboard"; - rev = "241f98e9b197"; - sha256 = "1glc8w30sijpbppcvaf3503rmx5nxqkcgw87dr2pr3q3vv1bg3zi"; + rev = "7c45b8673834"; + sha256 = "0ag36wd3830d4s6fvpj05v6f662c5rymgdydsj2gq8aaqplfb0v4"; }; } { @@ -257,8 +257,8 @@ fetch = { type = "git"; url = "https://github.com/zyedidia/tcell"; - rev = "v1.4.4"; - sha256 = "0d62a9csab15b64y09jcbvq71065wliw4bd5m7lfpl5k8rmrrdyi"; + rev = "v1.4.7"; + sha256 = "1ddaznp0haz35mxfjjh2fmamdrlk1igqg65fz22l5r6vvhcdsfxa"; }; } { |