Merge pull request #28779 from vyp/deer

deer: init at 1.4

authored by Jörg Thalheim and committed by GitHub 95d9a6c0 a2de9c33

+65
+35
pkgs/shells/zsh-deer/default.nix
··· 1 + { stdenv, fetchFromGitHub, perl }: 2 + 3 + let 4 + version = "1.4"; 5 + name = "deer-${version}"; 6 + in stdenv.mkDerivation { 7 + inherit name; 8 + 9 + src = fetchFromGitHub { 10 + owner = "Vifon"; 11 + repo = "deer"; 12 + rev = "v${version}"; 13 + sha256 = "1xnbnbi0zk2xsyn8dqsmyxqlfnl36pb1wwibnlp0dxixw6sfymyl"; 14 + }; 15 + 16 + prePatch = '' 17 + substituteInPlace deer \ 18 + --replace " perl " " ${perl}/bin/perl " 19 + ''; 20 + 21 + patches = [ ./realpath.patch ]; 22 + 23 + installPhase = '' 24 + mkdir -p $out/share/zsh/site-functions/ 25 + cp deer $out/share/zsh/site-functions/ 26 + ''; 27 + 28 + meta = with stdenv.lib; { 29 + description = "Ranger-like file navigation for zsh"; 30 + homepage = "https://github.com/Vifon/deer"; 31 + license = licenses.gpl3Plus; 32 + maintainers = maintainers.vyp; 33 + platforms = platforms.unix; 34 + }; 35 + }
+28
pkgs/shells/zsh-deer/realpath.patch
··· 1 + From ceadb2f11119143af4f590ea6b05a531483219b5 Mon Sep 17 00:00:00 2001 2 + From: xd1le <elisp.vim@gmail.com> 3 + Date: Wed, 30 Aug 2017 17:27:20 +1000 4 + Subject: [PATCH] use realpath instead of python to calculate relative path 5 + 6 + --- 7 + deer | 5 +---- 8 + 1 file changed, 1 insertion(+), 4 deletions(-) 9 + 10 + diff --git a/deer b/deer 11 + index 3d89dea..804a871 100644 12 + --- a/deer 13 + +++ b/deer 14 + @@ -259,10 +259,7 @@ deer-get-relative() 15 + { 16 + local TMP 17 + TMP=${1:-${DEER_DIRNAME%/}/$DEER_BASENAME[$DEER_DIRNAME]} 18 + - TMP="`python -c ' 19 + -import sys, os 20 + -print(os.path.relpath(sys.argv[1], sys.argv[2])) 21 + -' $TMP ${DEER_STARTDIR:-$PWD}`" 22 + + TMP="`realpath --relative-to=${DEER_STARTDIR:-$PWD} $TMP`" 23 + print -R $TMP:q 24 + } 25 + 26 + -- 27 + 2.14.1 28 +
+2
pkgs/top-level/all-packages.nix
··· 1615 1615 1616 1616 debootstrap = callPackage ../tools/misc/debootstrap { }; 1617 1617 1618 + deer = callPackage ../shells/zsh-deer { }; 1619 + 1618 1620 detox = callPackage ../tools/misc/detox { }; 1619 1621 1620 1622 devilspie2 = callPackage ../applications/misc/devilspie2 {