Merge branch 'master' into staging

pkgs/misc/drivers/hplip/default.nix

@@ -10,16 +10,16 @@
 let
 
   name = "hplip-${version}";
-  version = "3.16.3";
+  version = "3.16.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "1501qdnkjp1ybgagy5188fmf6cgmj5555ygjl3543nlbwcp31lj2";
+    sha256 = "1nay65q1zmx2jxiwn66n7mlr73azacz5097gw98kqqf90dh522f6";
   };
 
   plugin = fetchurl {
     url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "03q730w0kbh8i55i95vfb59yc0kjxz01hjpb3l05w2jw3hmfzvdp";
+    sha256 = "15qrcd3ndnxri6pfdfmsjyv2f3zfkig80yghs76jbsm106rp8g3q";
   };
 
   hplipState =

pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.2.3";
+  version = "2.5.1";
   name = "numix-gtk-theme-${version}";
   
   src = fetchurl {
-    url = "https://github.com/shimmerproject/Numix/archive/v${version}.tar.gz";
-    sha256 = "b0acc2d81300b898403766456d3406304553cc7016677381f3179dbeb1192a2d";
+    url = "https://github.com/numixproject/Numix/archive/v${version}.tar.gz";
+    sha256 = "0y6c4xr2n9sygxhgviwd97l02n17n53bkpfp62srkm05cq0jy87k";
   };
 
   dontBuild = true;

pkgs/misc/vim-plugins/default.nix

@@ -67,7 +67,9 @@ rec {
   Gundo               = gundo-vim; # backwards compat, added 2015-10-03
   haskellConceal      = haskellconceal; # backwards compat, added 2014-10-18
   haskellconceal      = vim-haskellconceal;
+  haskellConcealPlus  = vim-haskellConcealPlus;
   hier                = vim-hier;
+  hlint-refactor      = hlint-refactor-vim;
   hoogle              = Hoogle;
   ipython             = vim-ipython;
   latex-live-preview  = vim-latex-live-preview;
@@ -1703,4 +1705,37 @@ rec {
     dependencies = [];
 
   };
+
+  vim-haskellConcealPlus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-haskellConcealPlus-2015-11-14";
+    src = fetchgit {
+      url = "git://github.com/enomsg/vim-haskellConcealPlus";
+      rev = "fdd4e15800121edcb72e050650b02537af2d64ce";
+      sha256 = "0dw9ibj54bnszvkzxhfdwxwyjlv5a5k1pbyjmbw44ldqx48x4651";
+    };
+    dependencies = [];
+
+  };
+
+  hlint-refactor-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "hlint-refactor-vim-2015-12-05";
+    src = fetchgit {
+      url = "git://github.com/mpickering/hlint-refactor-vim";
+      rev = "fffb044ecef854a82c5c2efda252e09044ba03e0";
+      sha256 = "0z8d31arfy9aidg1dwj5msnnx799d9r7njkgh51z695w6ayxn6p8";
+    };
+    dependencies = [];
+
+  };
+
+  haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "haskell-vim-2016-04-18";
+    src = fetchgit {
+      url = "git://github.com/neovimhaskell/haskell-vim";
+      rev = "40bb7c933d2e95432571fcb353d69323a1432d4e";
+      sha256 = "08da8hp1jirxzlwbnzf2zlpzya1jc74mahwsb37xnbs6hgvvpd86";
+    };
+    dependencies = [];
+
+  };
 }

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

@@ -30,6 +30,7 @@
 "github:digitaltoad/vim-jade"
 "github:eagletmt/neco-ghc"
 "github:esneider/YUNOcommit.vim"
+"github:enomsg/vim-haskellConcealPlus"
 "github:fatih/vim-go"
 "github:flazz/vim-colorschemes"
 "github:google/vim-jsonnet"
@@ -56,7 +57,9 @@
 "github:lyokha/vim-xkbswitch"
 "github:mhinz/vim-startify"
 "github:mkasa/lushtags"
+"github:mpickering/hlint-refactor-vim"
 "github:nbouscal/vim-stylish-haskell"
+"github:neovimhaskell/haskell-vim"
 "github:osyo-manga/shabadou.vim"
 "github:osyo-manga/vim-watchdogs"
 "github:racer-rust/vim-racer"