Merge branch 'vcsh'

pkgs/applications/version-management/vcsh/default.nix

···
 {stdenv, fetchgit}:
 
 stdenv.mkDerivation rec {
-  rev = "75c4c554eefbefb714fabd356933858edbce3b1e";
-  version = "1.20131229";
-  name = "vcsh-${version}_${rev}";
+  rev = "ef15aeeb0553efb698e3d4261e79eff77a136ee7";
+  version = "1.20141026";
+  name = "vcsh-${version}_${builtins.substring 0 7 rev}";
 
   src = fetchgit {
     inherit rev;
     url = "https://github.com/RichiH/vcsh";
-    sha256 = "0rc82a8vnnk9q6q88z9s10873gqgdpppbpwy2yw8a7hydqrpn0hs";
+    sha256 = "1dg6ina2wpy406s5x0x4r7khx6gc42hfak0gjwy0i53ivkckl1nd";
   };
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
···
     cp vcsh $out/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Version Control System for $HOME";
     homepage = https://github.com/RichiH/vcsh;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ garbas ttuegel ];
+    platforms = platforms.unix;
   };
 }