diff options
| author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2020-08-31 08:57:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 08:57:43 -0400 |
| commit | 63a726d8479a4831fcc2b891638f56e9f185857e (patch) | |
| tree | 09e9a38135dc20794e569549a2431cdcf46900e4 /pkgs/shells | |
| parent | b07a1dc743837562087406e6d62aa011deb88f06 (diff) | |
| parent | 1b0186928d298dfe7711ff99b0c1b02d040dd163 (diff) | |
Merge branch 'master' into ohmyzsh-cleanups
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/xonsh/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 13 |
2 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 5d6a8a6065bb..f73ec422e06b 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -4,21 +4,31 @@ , glibcLocales , coreutils , git +, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.19"; + version = "0.9.20"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "1s7nb23zh4may4k3c9yfiizfdflm97hf5q2aww4j6ibykgcydv64"; + sha256 = "05phrwqd1c64531y78zxkxd4w1cli8yj3x2cqch7nkzbyz93608p"; }; LC_ALL = "en_US.UTF-8"; + + patches = [ + # Fix vox tests. Remove with the next release + (fetchpatch { + url = "https://github.com/xonsh/xonsh/commit/00aeb7645af97134495cc6bc5fe2f41922df8676.patch"; + sha256 = "0hx5jk22wxgmjzmqbxr2pjs3mwh7p0jwld0xhslc1s6whbjml25h"; + }) + ]; + postPatch = '' sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py sed -ie "s|SHELL=xonsh|SHELL=$out/bin/xonsh|" tests/test_integrations.py diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index b70d62ffb101..fc87a3a2b312 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -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 |