Merge branch 'master' into ohmyzsh-cleanups

This commit is contained in:
Tim Steinbach
2020-08-31 08:57:43 -04:00
committed by GitHub
377 changed files with 9941 additions and 7921 deletions
+3 -10
View File
@@ -4,23 +4,16 @@
{ stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec {
version = "2020-08-24";
version = "2020-08-28";
pname = "oh-my-zsh";
src = fetchFromGitHub {
owner = "ohmyzsh";
repo = "ohmyzsh";
rev = "cfb86cd08d3b24fd4b59d0d35b3af1f589c891fa";
sha256 = "0af37smv0bqw37bng2halzgszf8y3m2sxahdff54m16asm0py2cr";
rev = "4ed6fd2b8b6a0efb2f84f00a64503282aca260e7";
sha256 = "0f2f1k6s28lgxpjdgl4s7jisw6dgva9mcsqlsq0wg6041p246nai";
};
patches = [(fetchpatch {
# TODO: remove once https://github.com/ohmyzsh/ohmyzsh/pull/9210 is merged
name = "0001-pygmalion-use-pure-zsh-instead-of-perl.patch";
url = "https://github.com/flokli/ohmyzsh/commit/299b48ce422957c0f5ca06cd5ccade55e0a08d87.patch";
sha256 = "1cxj3c9bbcqd8zj9fccn117n2rzhx6krzbl4db059g2vsycadwmi";
})];
installPhase = ''
outdir=$out/share/oh-my-zsh
template=templates/zshrc.zsh-template