diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-03-15 09:42:01 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-03-15 09:52:04 +0100 |
| commit | f48c1fda6b457520c1214b29992af0c0c9872b6c (patch) | |
| tree | 1bb43ae46bf2c035c48361c764ad4c5995881a10 /pkgs/shells | |
| parent | 415d23fb4d2b2823a87d410da9beef8332d82d7b (diff) | |
| parent | aa6313a23d749f0d73f91af35a2fe15e74501451 (diff) | |
Merge branch 'master' into staging-next
Conflict in pkgs/development/libraries/libvirt/default.nix required manual adjustments. The fetched patch is already in src. I checked that libvirt builds.
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/zsh/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 6 |
2 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 71f95472bb44b..5a2c0d050ce06 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -13,7 +13,7 @@ , buildPackages }: let - version = "5.8"; + version = "5.8.1"; in stdenv.mkDerivation { @@ -22,19 +22,12 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; - sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w"; + sha256 = "sha256-tpc1ILrOYAtHeSACabHl155fUFrElSBYwRrVu/DdmRk="; }; patches = [ # fix location of timezone data for TZ= completion ./tz_completion.patch - # This commit will be released with the next version of zsh - (fetchpatch { - name = "fix-git-stash-drop-completions.patch"; - url = "https://github.com/zsh-users/zsh/commit/754658aff38e1bdf487c58bec6174cbecd019d11.patch"; - sha256 = "sha256-ud/rLD+SqvyTzT6vwOr+MWH+LY5o5KACrU1TpmL15Lo="; - excludes = [ "ChangeLog" ]; - }) ]; nativeBuildInputs = [ autoreconfHook perl groff texinfo ] diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f85797f763563..1907745fe8d17 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2022-03-10"; + version = "2022-03-14"; pname = "oh-my-zsh"; - rev = "c10241f3d1d7bf77d483e11869a6a00f1d2e5e88"; + rev = "345976874550efa09fa7e9cdbe1215ce27d1541b"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "HVV3zhEZ4NU4Dk7zHv+NeatTJUbzxqOvM4cYNzjuTfo="; + sha256 = "AxKt84XDqmkwBlUeWsE6Tm0aRxvv0HXRdBf/OXjIyHo="; }; installPhase = '' |