From 675ebc55595676b158ac6ce9f9d67bfcf9861993 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 26 Jan 2019 11:25:20 -0300 Subject: [PATCH] elvish: a small fixup (#54531) * Elvish: a small fixup Fixing version variable in order to properly download the source code. Also, some minor stylistical modifications and additions. * elvish: use pname * Update pkgs/shells/elvish/default.nix Use `pname` instead of `name`. Co-Authored-By: AndersonTorres --- pkgs/shells/elvish/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 0b7b934646e2..80b0f3860514 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "elvish-${version}"; + pname = "elvish"; version = "0.12"; goPackagePath = "github.com/elves/elvish"; @@ -12,17 +12,22 @@ buildGoPackage rec { ''; src = fetchFromGitHub { - repo = "elvish"; owner = "elves"; - rev = version; + repo = pname; + rev = "v${version}"; sha256 = "1vvbgkpnrnb5aaak4ks45wl0cyp0vbry8bpxl6v2dpmq9x0bscpp"; }; meta = with stdenv.lib; { - description = "A friendly and expressive Unix shell"; + description = "A friendly and expressive command shell"; + longDescription = '' + Elvish is a friendly interactive shell and an expressive programming + language. It runs on Linux, BSDs, macOS and Windows. Despite its pre-1.0 + status, it is already suitable for most daily interactive use. + ''; homepage = https://elv.sh/; license = licenses.bsd2; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ vrthra AndersonTorres ]; platforms = with platforms; linux ++ darwin; };