Merge master into x-updates

pkgs/misc/themes/gtk2/oxygen-gtk/default.nix

@@ -2,12 +2,12 @@
   cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.4";
+  version = "1.4.1";
   name = "oxygen-gtk2-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
-    sha256 = "02q46kq0hhrmzwbjngg31ydl2198ls5bxgnz2si4amdmqii1nlmj";
+    sha256 = "13vrdlzg8h5gxn04f488f65yfy9m0amqpqdbs9l304yxgm7mkawd";
   };
 
   buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf

pkgs/misc/vim-plugins/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which }:
+{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit }:
 
 /*
 About Vim and plugins
@@ -197,6 +197,22 @@ in rec
     };
   };
 
+  golang = simpleDerivation {
+    name = "vim-golang-20131127";
+    src = fetchgit {
+      url = "https://github.com/jnwhiteh/vim-golang.git";
+      rev = "832d64e5a813511ed52217aa24f0255c49671bab";
+    };
+    path = "golang";
+    meta = with stdenv.lib; {
+      description = "Vim plugins for Go";
+      homepage    = https://github.com/jnwhiteh/vim-golang;
+      license     = licenses.publicDomain;
+      maintainers = with maintainers; [ lovek323 ];
+      platforms   = platforms.unix;
+    };
+  };
+
   ipython = simpleDerivation {
     name = "vim-ipython-ff8f88f3fe518851a91dc88aaa5a75f8f352a960";
     src = fetchurl {