public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
This commit is contained in:
Tuomas Tynkkynen
2016-05-03 23:12:48 +03:00
parent 2362891dc8 e7d3166656
commit aadaa91379
506 changed files with 31436 additions and 5404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/shells/oh-my-zsh/default.nix
View File

@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
name = "oh-my-zsh-git-${version}";
version = "2016-04-06";
version = "2016-04-20";
src = fetchgit {
url = "https://github.com/robbyrussell/oh-my-zsh";
rev = "d310fac7f65d31f7494532201e02ebf67c9d9555";
sha256 = "0kx552b0jf5j8qkk1kixdr1z49ly79cvzhdh27848rj3kwb0z8vq";
rev = "1b1315a777328095cd8b5f364fd4345eeae7c4bf";
sha256 = "0q3w96a9rjxmqknycxjqjs5mi0q2mark8yrfim7snxrf9ajv0ypk";
};
phases = "installPhase";