Merge branch 'master' into staging

pkgs/misc/drivers/m33-linux/default.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/donovan6000/M3D-Linux;
+    homepage = "https://github.com/donovan6000/M3D-Linux";
     description = "A Linux program that can communicate with the Micro 3D printer";
     license = licenses.gpl2;
     platforms = platforms.linux;

pkgs/misc/themes/greybird/default.nix

@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "Greybird";
-  version = "2016-09-13";
+  version = "2016-11-15";
 
   src = fetchFromGitHub {
-    repo = "${pname}";
     owner = "shimmerproject";
-    rev = "1942afc8732f904a1139fd41d7afd74263b87887";
-    sha256 = "0qawc7rx5s3mnk5awvlbp6k5m9aj5krb1lasmgl2cb9fk09khf2v";
+    repo = "${pname}";
+    rev = "0a0853fa1de7545392f32aff33d95a8a1f6dca9e";
+    sha256 = "0i9yvd265783pqij6rjh7pllw0l28v975mrahykcwvn9chq8rrqf";
   };
 
   nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ];

pkgs/misc/vim-plugins/default.nix

@@ -2,7 +2,7 @@
 { fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
 , which, fetchgit, llvmPackages
 , xkb_switch, rustracerd, fzf
-, python3
+, python3, boost, icu
 , Cocoa ? null
 }:
 
@@ -304,16 +304,14 @@ rec {
   };
 
   ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-cmatcher-2016-09-22";
+    name = "ctrlp-cmatcher-2015-10-15";
     src = fetchgit {
       url = "git://github.com/JazzCore/ctrlp-cmatcher";
       rev = "6c36334f106b6fd981d23e724e9a618734cab43a";
       sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q";
     };
     dependencies = [];
-
     buildInputs = [ python ];
-
     buildPhase = ''
       patchShebangs .
       ./install.sh
@@ -2113,4 +2111,26 @@ rec {
     dependencies = [];
 
   };
+
+  cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "cpsm-2016-09-21";
+    src = fetchgit {
+      url = "git://github.com/nixprime/cpsm";
+      rev = "565ab53a66fa52c46d80adf6981b07f4bdffcb1d";
+      sha256 = "125gcnqrg2276sp715q924cxwjxwsv3j4m0n1zj17w9srnpn4r1k";
+    };
+    dependencies = [];
+    buildInputs = [
+      python3
+      stdenv
+      cmake
+      boost
+      icu
+    ];
+    buildPhase = ''
+      patchShebangs .
+      export PY3=ON
+      ./install.sh
+    '';
+  };
 }

pkgs/misc/vim-plugins/vim-plugin-names

@@ -171,3 +171,4 @@
 "github:jiangmiao/auto-pairs"
 "github:editorconfig/editorconfig-vim"
 "github:heavenshell/vim-jsdoc"
+"github:nixprime/cpsm"

pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm

@@ -0,0 +1,12 @@
+    buildInputs = [
+      python3
+      stdenv
+      cmake
+      boost
+      icu
+    ];
+    buildPhase = ''
+      patchShebangs .
+      export PY3=ON
+      ./install.sh
+    '';

pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher

@@ -0,0 +1,5 @@
+    buildInputs = [ python ];
+    buildPhase = ''
+      patchShebangs .
+      ./install.sh
+    '';