diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 19:27:16 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 19:41:25 +0100 |
commit | 419bc0a4cdc0f577062f6c439809f4bf6e3b0c63 (patch) | |
tree | 0f39c63fcddea75c562825d53a3f36bbba8b7930 /pkgs/shells | |
parent | 873e6a4e65451be32e8dcd6151e1f26262ef35f2 (diff) | |
download | nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.gz nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.bz2 nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.lz nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.xz nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.zst nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.zip |
Revert "Revert "Merge master into staging-next""
In 87a19e9048773d5a363679617406ad148d36c3b8 I merged staging-next into master using the GitHub gui as intended. In ac241fb7a570d6cf81d229ad22a8889602639160 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master. Thinking this may cause trouble, I reverted it in 0be87c79797a5fa384fbc356c74ed54f9f7829ea. This was however wrong, as it "removed" master. This reverts commit 0be87c79797a5fa384fbc356c74ed54f9f7829ea.
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index ada885b974c..3cd8d2d4942 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { version = "2020-02-04"; pname = "oh-my-zsh"; - rev = "6bebc254e88ac9b7fdaa7491d031f82ec107e418"; + rev = "77aa1795d2f05583d4fc63a63abb0144beb5ecff"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1lmg1givymr4hgmvmngklm7q3g7dpqwm7aj5xild72cdhx0g5qqw"; + sha256 = "0n36wpdlr1w4gr0cja48mcywi8av71p3diigkiv3n45a9hh94fxx"; }; pathsToLink = [ "/share/oh-my-zsh" ]; |