diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2021-02-26 10:25:13 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2021-02-26 10:25:13 +0100 |
| commit | c456a2512f7a7558cbe25328a423762033822cc0 (patch) | |
| tree | d64f521751037012a1c4d05fedeb485eeee39b05 /pkgs/shells | |
| parent | babf9d6100c3e5dcdbbbe8850de99d3fe2b3cf86 (diff) | |
| parent | 6d7128414cf2763ab14f31365c21c6cec3547dac (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/any-nix-shell/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/shells/any-nix-shell/default.nix index 3a9f0a0bfbd1..3bd41a53844c 100644 --- a/pkgs/shells/any-nix-shell/default.nix +++ b/pkgs/shells/any-nix-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "any-nix-shell"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "haslersn"; repo = "any-nix-shell"; rev = "v${version}"; - sha256 = "05xixgsdfv0qk648r74nvazw16dpw49ryz8dax9kwmhqrgkjaqv6"; + sha256 = "0q27rhjhh7k0qgcdcfm8ly5za6wm4rckh633d0sjz87faffkp90k"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index e957457c8c3b..c7d5ba0e7734 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 = "2021-02-09"; + version = "2021-02-21"; pname = "oh-my-zsh"; - rev = "f21e646ce6c09198f7f625c597f08af49551fdb0"; + rev = "9a9f3831925432fdf4352c24a002506a06d329c1"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "14m932zbzdbwyfqkn882jarpw4dbmxkfna5pakd4n5b123drjz46"; + sha256 = "befalsEX/o5WwVn0bzDnMVhlZawmpGV4AGzvxl7UHLI="; }; installPhase = '' |