diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-01 19:37:20 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-01 19:37:20 +0200 |
| commit | 50c060d13dc55b673435f05119c968720c97b0c5 (patch) | |
| tree | 3c5b425db1a6cacf9d6845ece815236744a8da47 /pkgs/shells | |
| parent | 941aec472e16b9119af5f981047eba6c3c889825 (diff) | |
| parent | 3541e8b4fbf01731580b2f26a3de41200213e6f1 (diff) | |
| download | nixpkgs-50c060d13dc55b673435f05119c968720c97b0c5.tar nixpkgs-50c060d13dc55b673435f05119c968720c97b0c5.tar.gz nixpkgs-50c060d13dc55b673435f05119c968720c97b0c5.tar.bz2 nixpkgs-50c060d13dc55b673435f05119c968720c97b0c5.tar.lz nixpkgs-50c060d13dc55b673435f05119c968720c97b0c5.tar.xz nixpkgs-50c060d13dc55b673435f05119c968720c97b0c5.tar.zst nixpkgs-50c060d13dc55b673435f05119c968720c97b0c5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/zsh/antibody/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/shells/zsh/zsh-history/default.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index dc63c308bcc..baceb6fdb8c 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ filalex77 worldofpeace ]; }; -} \ No newline at end of file +} diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 79aaa185500..1f22099e901 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-07-23"; + version = "2020-07-30"; pname = "oh-my-zsh"; - rev = "95218372402afc9aeafc89c0984310387ce79599"; + rev = "8755c5f101f801738dd249c7685dcf30dd03a7b2"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "0fgxq2d6lajk5fjbr9vwhhnw58gbk6yhbc49pcj563lwk2kc4d9f"; + sha256 = "0z6bcv91xxfnaj42n7yzlx0wv14f87wws0n5cciy2g4yd3kyzmkq"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index 47f590a78f2..778e19f1bd4 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -33,4 +33,4 @@ buildGoModule rec { passthru.tests = { zsh-history-shell-integration = nixosTests.zsh-history; }; -} \ No newline at end of file +} |