Merge remote-tracking branch 'upstream/master' into hardened-stdenv

21 files changed, 99 insertions, 94 deletions

diff --git a/pkgs/misc/base16/default.nix b/pkgs/misc/base16/default.nix
index 5dad210ab54b..6b53f952aad9 100644
--- a/pkgs/misc/base16/default.nix
+++ b/pkgs/misc/base16/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     inherit rev;
     url = "https://github.com/chriskempson/base16-builder";
-    sha256 = "05wyf0qz5z3n3g8lz2rd1b6gv6v7qjaazwjm0w4ib4anj4v026sd";
+    sha256 = "1zicwam16nsdg74rnza65jwwf4mlpkgv35p9gkr8ydy60l7agzwy";
   };
 
   patches = [
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 0eaf08c2b8d4..9743261c6b2b 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = git://github.com/dolphin-emu/dolphin.git;
     rev = "5097a22844b850b429872f4de390bd958b11a616";
-    sha256 = "1qizkahbimpmgjs51av1cdmnnyvbz0j0gknmi5vdc38vrzxvwkrf";
+    sha256 = "09jx61cxvfimnq1snkv6w3m9qidrgp0j0w81c7pbkpmcwysz8xya";
     fetchSubmodules = false;
   };
 
diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index 07470fa54ab4..a35b7a846b18 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://github.com/mgba-emu/mgba.git";
     rev = "be2641c77b4a438e0db487bc82b43bc27a26e0c2";
-    sha256 = "0ygsmmp24w14x5fm2qz2v68p59bs2ravn22axrg2ipn5skkgrvxz";
+    sha256 = "1wxywfbkgqvb0j9cyz4nwsfzhxrdjcmvz1k7rljmy4bz1pjcglj1";
   };
 
   buildInputs = [
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index 87ae977c7cc7..68fb71050780 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec{
     url = "https://github.com/hrydgard/ppsspp.git";
     rev = "8c8e5de89d52b8bcb968227d96cbf049d04d1241";
     fetchSubmodules = true;
-    sha256 = "71dfa0be045f31969b1d6ab4f1adf6a208f9ef4834d708bc7bf6d9195efb5f80";
+    sha256 = "1q21qskzni0nvz2yi2m17gjh4i9nrs2l4fm4y2dww9m29xpvzw3x";
   };
 
   buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ]
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 07783d016183..259a6007975c 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -55,7 +55,7 @@ in
     src = fetchRetro {
       repo = core + "-libretro";
       rev = "cbd700e2bb95f08f241ca24330fa732aa6af8018";
-      sha256 = "1118iadkznppygq0mppirx1ycndmjp3fqlj8sshiby47j8sgly6h";
+      sha256 = "1xp43hpd23rhj96pns13fz9mjp66gmxzl5frqa8q9fqcn2qkx7b1";
     };
     description = "Port of 4DO/libfreedo to libretro";
   }).override {
@@ -67,7 +67,7 @@ in
     src = fetchRetro {
       repo = bname;
       rev = "0bfe7f4f895af0927cec1c06dcae096b59416159";
-      sha256 = "0xsf10zkx7pnjpdb9n605663i0vqgnshdfjmb472hg84l9dr4gr5";
+      sha256 = "0dmaa1vy6nfj9jk6xkvrbbcxa9j3f3zrp24zflnqbizc088vncb9";
     };
     description = "Fork of bsnes with HLE DSP emulation restored";
   }).override {
@@ -79,7 +79,7 @@ in
     src = fetchRetro {
       repo = core;
       rev = "cae5945149a72b1dc0b130d6e60e2690b88a925a";
-      sha256 = "1z4gzixkvxn2s5x5pn179ddwwh3blw7phdkp33qxv40kcv6g3h79";
+      sha256 = "1qzlbw0vy87zi3w6hp5zj9dxdkj3qc9czjf41sj70irwyvqi0kii";
     };
     description = "libretro wrapper for desmume NDS emulator";
   }).override {
@@ -91,7 +91,7 @@ in
     src = fetchRetro {
       repo = core + "-libretro";
       rev = "b642e054a1f581fbac16c08f4b8df9ab6c474203";
-      sha256 = "0h2bk8m1hn2z76hachdmalgh2nv51jgfhmiqqhfkghf00rabinlx";
+      sha256 = "0jxbzjhpyw1fzipm2ai2nv62vb0q5cb203m093vakr1zdsx7si2n";
     };
     description = "Port of Final Burn Alpha to libretro";
   }).override {
@@ -117,7 +117,7 @@ in
     src = fetchRetro {
       repo = core + "-libretro";
       rev = "59fb6a652e0de3c3a3b29e58af5ac035958da37e";
-      sha256 = "0vgnn4dnxbw258s3vs1wzgy29cvcywlbfdrzddiwxbp7anclzxkv";
+      sha256 = "0n2416lgqbzah1q3ji1hhpcdi9h29563gz739kf9libmnz86vd6f";
     };
     description = "Gambatte libretro port";
   }).override {
@@ -139,7 +139,7 @@ in
     src = fetchRetro {
       repo = "mame";
       rev = "8da2303292bb8530f9f4ffad8bf1df95ee4cab74";
-      sha256 = "0rzy5klp8vf9vc8fylbdnp2qcvl1nkgw5a55ljqc5vich4as5alq";
+      sha256 = "0afsxsm1d4x9jn28qz6v47hhnp7q9i0yqk62i4lk4d7i7m4dq5j9";
     };
     description = "Port of MAME to libretro";
 
@@ -151,7 +151,7 @@ in
     src = fetchRetro {
       repo = "beetle-pce-fast-libretro";
       rev = "6e2eaf75da2eb3dfcf2fd64413f471c8c90cf885";
-      sha256 = "1mxlvd3bcc6grryby2xn4k2gia3s49ngkwcvgxlj1fg3hkr5kcp8";
+      sha256 = "0m946108wzawg0c4xvqpv6yzfmjngz6lji5hn4swgk0z5f2bj5a5";
     };
     description = "Port of Mednafen's PC Engine core to libretro";
   }).override {
@@ -163,7 +163,7 @@ in
     src = fetchRetro {
       repo = "beetle-psx-libretro";
       rev = "20c9b0eb0062b8768cc40aca0e2b2d626f1002a2";
-      sha256 = "1dhql8zy9wv55m1lgvqv412087cqmlw7zwcsmxkl3r4z199dsh3m";
+      sha256 = "192xzvdbjjqlxrnxxn45hmrr6yjpxw3gapkbax6nhrabnxhva43k";
     };
     description = "Port of Mednafen's PSX Engine core to libretro";
   }).override {
@@ -175,7 +175,7 @@ in
     src = fetchRetro {
       repo = core + "-libretro";
       rev = "7db9296453629a44de806589f3ff64e824e775ad";
-      sha256 = "0gykkx8j0xlkr1dqz5k5hiyki2wsz9ys05df5zv3f2rpk2dkdwyp";
+      sha256 = "075lpmwmj99yf9d9905x7apawd4bqz0whr37mh2fgr3jf730yiyl";
     };
     description = "Libretro port of Mupen64 Plus, GL only";
 
@@ -189,7 +189,7 @@ in
     src = fetchRetro {
       repo = core;
       rev = "dcaed965760669161d6fd44755887545ea393041";
-      sha256 = "09fvk3ki9nw76kb1c4sw6c54wwn9y3ypsxnbzvhzsarmapkd9fa3";
+      sha256 = "03fy5hb181ffx8sk9wmm415k084zqqhfqga4crgc7hdqi16s3r5v";
     };
     description = "nestopia undead libretro port";
   }).override {
@@ -201,7 +201,7 @@ in
     src = fetchRetro {
       repo = core;
       rev = "e912fdf26376bfa5d7d6488055fe6fdbd13c2e49";
-      sha256 = "1jg9ig3vxbmna6cavz39hk6j9dpm4prfmmdpf7lzn1qvpqxs3ynx";
+      sha256 = "1mi36y8kx6s76cgygpj11zw35p44gd66mxygmxliz7k6xsd7ww41";
     };
     description = "Fast MegaDrive/MegaCD/32X emulator";
 
@@ -216,7 +216,7 @@ in
     src = fetchRetro {
       repo = "libretro-" + core;
       rev = "ea17e27fcf16b9f875718b6550fe7145c6257c06";
-      sha256 = "0l6bzh50vh87j0g1s4144qfqa7vy7gry9ifd5vq1y5114fvbqdlb";
+      sha256 = "0w5njj5pamqc4a022hdplb7vapwkf34ad1w4acz3c8b05vkl457d";
     };
     description = "ppsspp libretro port";
     extraBuildInputs = [ mesa ffmpeg ];
@@ -241,7 +241,7 @@ in
     src = fetchRetro {
       repo = "QuickNES_Core";
       rev = "518638b8064c9d0cb1b5aa29d96419f8528c9de5";
-      sha256 = "0n6w8g0gklli9qs9vv17kljj83n9pky32ir25r7b202nl0292h53";
+      sha256 = "0jv1z65m4j3hbfnb3chklh0dhwlc4gdqr0asswdsc1y4iwp0331c";
     };
     description = "QuickNES libretro port";
   }).override {
@@ -253,7 +253,7 @@ in
     src = fetchRetro {
       repo = core;
       rev = "c3e719acc08c1873609bab3578939b7c9e606511";
-      sha256 = "08ab4gybp76la3z94dgg0jjzmajva9003p74256hgr7nnk2kwn4q";
+      sha256 = "03wvffy3h62qc7f3d8042wd234m8ikd843ggp903y285sgh54r9y";
     };
     description = "Libretro port of ScummVM";
     extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ];
@@ -278,7 +278,7 @@ in
     src = fetchRetro {
       repo = core;
       rev = "dfb7eef46d6bc2dbcc98f25e2bfadc9d2cff5cfd";
-      sha256 = "1naznsy1mhijcijysm9g8r95dxhr8rspixmf6r187rpcrvfd4zbl";
+      sha256 = "0vdfjdwr6b5izh3gy63lcfnrdvr99qhlqfibjw4mmyqk9gkjrwm8";
     };
     description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro";
   };
@@ -288,7 +288,7 @@ in
     src = fetchRetro {
       repo = core + "-libretro";
       rev = "ada5c57d632ace0ba915ce7a470d504a5d89ebcc";
-      sha256 = "1riwi6n9fj5vd5jcldwpwaxxvgxv3gs232l6zm9k26x3rngwcyfz";
+      sha256 = "090isch1l5hm07l22l8hja31cdiaxc0vgc3i01qs8zgdyvsx4vvg";
     };
     description = "Port of Stella to libretro";
   }).override {
@@ -300,7 +300,7 @@ in
     src = fetchRetro {
       repo = core;
       rev = "0c20cd92bc8684340d7a1bcae14a603001ad5e4a";
-      sha256 = "09shkha7i7a226nk9wfxswsj3wwrxn7xwrsaaki1x8pvbyy5wjg9";
+      sha256 = "016vm2xyjfkkcqkqfw3n09if4bxxppk3g6p92waa9bv2ni4xli69";
     };
     description = "VBA-M libretro port with modifications for speed";
   };
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index 87fb854c8448..0ab4698c196e 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = https://github.com/libretro/RetroArch.git;
     rev = "09dda14549fc13231311fd522a07a75e923889aa";
-    sha256 = "1f7w4i0idc4n0sqc5pcrsxsljk3f614sfdqhdgjb1l4xj16g37cg";
+    sha256 = "0yrisl61iaa70ahswzgb505bvm5cxq8ndnv2bw7gqrlm5qrh54qy";
   };
 
   buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils
diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix
index 23930ac624ce..be7666487b95 100644
--- a/pkgs/misc/emulators/zsnes/default.nix
+++ b/pkgs/misc/emulators/zsnes/default.nix
@@ -1,6 +1,18 @@
-{stdenv, fetchurl, fetchpatch, nasm, SDL, zlib, libpng, ncurses, mesa}:
+{stdenv, fetchurl, fetchpatch, nasm, SDL, zlib, libpng, ncurses, mesa
+, makeDesktopItem }:
 
-stdenv.mkDerivation {
+let
+  desktopItem = makeDesktopItem {
+    name = "zsnes";
+    exec = "zsnes";
+    icon = "zsnes";
+    comment = "A SNES emulator";
+    desktopName = "zsnes";
+    genericName = "zsnes";
+    categories = "Game;";
+  };
+
+in stdenv.mkDerivation {
   name = "zsnes-1.51";
 
   src = fetchurl {
@@ -39,6 +51,20 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--enable-release" ];
 
+  postInstall = ''
+    function installIcon () {
+        mkdir -p $out/share/icons/hicolor/$1/apps/
+        cp icons/$1x32.png $out/share/icons/hicolor/$1/apps/zsnes.png
+    }
+    installIcon "16x16"
+    installIcon "32x32"
+    installIcon "48x48"
+    installIcon "64x64"
+
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
   meta = {
     description = "A Super Nintendo Entertainment System Emulator";
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/misc/gnuk/default.nix b/pkgs/misc/gnuk/default.nix
index fb845d9c4765..f3d5450c94ba 100644
--- a/pkgs/misc/gnuk/default.nix
+++ b/pkgs/misc/gnuk/default.nix
@@ -6,6 +6,6 @@ callPackage ./generic.nix (args // rec {
   src = fetchgit {
     url = "git://git.gniibe.org/gnuk/gnuk.git";
     rev = "93867d0c8b90c485f9832c0047c3a2e17a029aca";
-    sha256 = "176vx81m6wnfvamxpp7hfbs1pm692zr0my0z2gid65b6rgffdycd";
+    sha256 = "0ah2gc772kdq7gdwpqwdmfh5nzbx2wgpk5ljnhwc4i3mrkafdiih";
   };
 })
diff --git a/pkgs/misc/gnuk/git.nix b/pkgs/misc/gnuk/git.nix
index 8c03a1eee536..142c4a0e7e5f 100644
--- a/pkgs/misc/gnuk/git.nix
+++ b/pkgs/misc/gnuk/git.nix
@@ -6,6 +6,6 @@ callPackage ./generic.nix (args // rec {
   src = fetchgit {
     url = "git://git.gniibe.org/gnuk/gnuk.git";
     rev = "3d5a776ab15a4ae6e17d91341a58eda3db09f700";
-    sha256 = "1pkdca331wrf1lsnlxxwbbnfcr7vj9xsac92dhj06fhpq4mb8kgb";
+    sha256 = "1f9l1rwy630z8cnjd6lfv0zp6ij3c9ifbm3fym245049hh2xds7v";
   };
 })
diff --git a/pkgs/misc/gnuk/unstable.nix b/pkgs/misc/gnuk/unstable.nix
index 0bfcbc023bf1..16dbe5d21fc8 100644
--- a/pkgs/misc/gnuk/unstable.nix
+++ b/pkgs/misc/gnuk/unstable.nix
@@ -6,6 +6,6 @@ callPackage ./generic.nix (args // rec {
   src = fetchgit {
     url = "git://git.gniibe.org/gnuk/gnuk.git";
     rev = "e7e8b9f5ca414a5c901f61b0f043c8da42414103";
-    sha256 = "0zjpgvmnvgvfqp9cd9g8ns9z05alimwcdqx16l22604ywnhdy99l";
+    sha256 = "0js9dc1iyvrrcb0d8a2irivrli3yb7mxmpxws5a2n53hj5xc4n6l";
   };
 })
diff --git a/pkgs/misc/phabricator/default.nix b/pkgs/misc/phabricator/default.nix
index 3162dd0079d0..72551e27fcfb 100644
--- a/pkgs/misc/phabricator/default.nix
+++ b/pkgs/misc/phabricator/default.nix
@@ -6,17 +6,17 @@ stdenv.mkDerivation rec {
   srcLibphutil = pkgs.fetchgit {
       url = git://github.com/facebook/libphutil.git;
       rev = "48a04395363d6c1dd9f66057bd11fd70d4665ba9";
-      sha256 = "d570d2c1e68471c2eda35b8722d8083bcc13163fbd5c944529464f2c7b55a2e5";
+      sha256 = "198w4kq86py31m86sgpinz2va3m9j8k92q2pa2qzzi0lyf1sb8c3";
   };
   srcArcanist = pkgs.fetchgit {
       url = git://github.com/facebook/arcanist.git;
       rev = "97501da16416fbfdc6e84bd60abcbf5ad9506225";
-      sha256 = "9031c4ae228bdc986131e0c93c98fb73290bb0e297be1ec32f22ab09cdacafa3";
+      sha256 = "1afn25db4pv3amjh06p8jk3s14i5139n59zk3h4awk84d2nj1kzk";
   };
   srcPhabricator = pkgs.fetchgit {
       url = git://github.com/phacility/phabricator.git;
       rev = "7ac5abb97934f7399b67762aa98f59f667711bf3";
-      sha256 = "6a1d449597ae4432e40a3e6cdb14e3a5a8a40e019f3930493064c35911f2adcc";
+      sha256 = "1hk6fnvdfn5w82wnprjdkjm8akzw3zfqm460cjqd8v3q5n21ddpf";
   };
 
   buildCommand = ''
diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix
index 51674f5dd86c..6f2ebbc51581 100644
--- a/pkgs/misc/screensavers/alock/default.nix
+++ b/pkgs/misc/screensavers/alock/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = https://github.com/Arkq/alock;
     rev = "69b547602d965733d415f877eb59d05966bd158d";
-    sha256 = "c1f00bf90c966b2b76e00061cc4b54a3c0bc6547e788731ab694b43f55a216ab";
+    sha256 = "0lv2ng5qxzcq0vwbl61dbwigv79sin4zg90y9cgsz6ydvm4ncpas";
   };
 
   configureFlags = [
diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix
index 49dd8bebaeda..a2599d5ebee8 100644
--- a/pkgs/misc/screensavers/xss-lock/default.nix
+++ b/pkgs/misc/screensavers/xss-lock/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = https://bitbucket.org/raymonad/xss-lock.git;
     rev = "1e158fb20108058dbd62bd51d8e8c003c0a48717";
-    sha256 = "0jdpd6x1kk30qynv2n4zbjmsicvwjwcldr2224da0srzl7sgyjsg";
+    sha256 = "10hx7k7ga8g08akwz8qrsvj8iqr5nd4siiva6sjx789jvf0sak7r";
   };
 
   buildInputs = [ cmake pkgconfig docutils glib libpthreadstubs libXau
diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix
index 1f12ffa93015..887c179c59d5 100644
--- a/pkgs/misc/screensavers/xtrlock-pam/default.nix
+++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = "https://github.com/aanatoly/xtrlock-pam";
     rev = "6f4920fcfff54791c0779057e9efacbbbbc05df6";
-    sha256 = "fa8aeedfa2a4e1d813f8cad562bafdd4e2c5130df0a7cde7b2f956a32044e9f8";
+    sha256 = "1z2wlhi5d05b18pvwz146kp0lkcc6z2mnilk01mk19hzbziyqmsc";
   };
 
   buildInputs = [ python pkgconfig xlibsWrapper pam ];
diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix
index eda2daf15c97..b14746cfec50 100644
--- a/pkgs/misc/themes/arc/default.nix
+++ b/pkgs/misc/themes/arc/default.nix
@@ -1,29 +1,29 @@
-{ stdenv, autoconf, automake, fetchFromGitHub, gnome3, gtk, gtk-engine-murrine, pkgconfig}:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
-  version = "2016-05-14";
-  name = "arc-gtk-theme-git-${version}";
+  version = "2016-06-02";
+  name = "arc-gtk-theme-${version}";
+
   src = fetchFromGitHub {
     owner = "horst3180";
     repo = "arc-theme";
-    rev = "fb3fe2fc0b280e9d8ca4b5fc5ca23e5b00fcac27";
-    sha256 = "1q844i7bkf75jv9fvf15n47vwvzzbkvhv5ssxl98q8x66dgjwx35";
+    rev = "226098a06b646981022f0e260fd4d3ca64ff5616";
+    sha256 = "1lg2iig1rws2h0p7qy1pavphyzdcchmfdlv126696jczz21d67qm";
   };
 
-  preferLocalBuild = true;
-
-  nativeBuildInputs = [ autoconf automake pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   buildInputs = [ gtk-engine-murrine ];
 
-  configureScript = "./autogen.sh";
+  preferLocalBuild = true;
+
   configureFlags = "--with-gnome=${gnome3.version}";
 
   meta = with stdenv.lib; {
     description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell";
     homepage = "https://github.com/horst3180/Arc-theme";
     license = licenses.gpl3;
-    maintainers = [ maintainers.simonvandel ];
     platforms = platforms.linux;
+    maintainers = with maintainers; [ simonvandel romildo ];
   };
 }
diff --git a/pkgs/misc/themes/mate-icon-theme/default.nix b/pkgs/misc/themes/mate-icon-theme/default.nix
deleted file mode 100644
index 6749b5e4c392..000000000000
--- a/pkgs/misc/themes/mate-icon-theme/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk2, iconnamingutils }:
-
-stdenv.mkDerivation {
-  name = "mate-icon-theme-1.6.3";
-
-  src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.3.tar.xz";
-    sha256 = "1r3qkx4k9svmxdg453r9d3hs47cgagxsngzi8rp6yry0c9bw5r5w";
-  };
-
-  buildInputs = [ pkgconfig intltool gtk2 iconnamingutils ];
-
-  meta = {
-    description = "Icon themes from MATE";
-    homepage = "http://mate-desktop.org";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/misc/themes/mate-themes/default.nix b/pkgs/misc/themes/mate-themes/default.nix
deleted file mode 100644
index bc622ef3729f..000000000000
--- a/pkgs/misc/themes/mate-themes/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk2, gtk_engines,
-gtk-engine-murrine, gdk_pixbuf, librsvg }:
-
-stdenv.mkDerivation rec {
-  name = "mate-themes-${version}";
-  version = "${major-ver}.${minor-ver}";
-  major-ver = "3.18";
-  minor-ver = "1";
-
-  src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz";
-    sha256 = "0lkp6jqvnxp6jly35iw89paqs279nvhqg01ig92n1xcfp8yrqq9c";
-  };
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  buildInputs = [ gtk2 gtk_engines gtk-engine-murrine gdk_pixbuf librsvg ];
-
-  meta = {
-    description = "A set of themes from MATE";
-    homepage = "http://mate-desktop.org";
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
-  };
-}
diff --git a/pkgs/misc/themes/orion/default.nix b/pkgs/misc/themes/orion/default.nix
index a6d037c3c4fc..da46beb0fb07 100644
--- a/pkgs/misc/themes/orion/default.nix
+++ b/pkgs/misc/themes/orion/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = "https://github.com/shimmerproject/Orion.git";
     rev = "refs/tags/v1.5";
-    sha256 = "995671990514a68192dc82ed51eaa6ab17c396950e1d8b7768c262027be6b05f";
+    sha256 = "1116yawv3fspkiq1ykk2wj0gza3l04b5nhldy0bayzjaj0y6fd89";
   };
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/misc/uboot/nanonote.nix b/pkgs/misc/uboot/nanonote.nix
index b8261979ec0c..8b2de80c79b3 100644
--- a/pkgs/misc/uboot/nanonote.nix
+++ b/pkgs/misc/uboot/nanonote.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   srcPatches = fetchgit {
     url = "git://projects.qi-hardware.com/openwrt-xburst.git";
     rev = "3244d5ef9f93802f9b9b6f4405636424abf6fa83";
-    sha256 = "99dde9c3c4c66722d3ee2223d306bc84289a8aa77d0b5918ca49c2f4032ab38f";
+    sha256 = "0mg87s10hpz41dr1zbd3bcl8i64gwvh3f1nrz8cb8c49099miqla";
   };
 
   patchPhase = ''
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index f2fdbd292b48..98a8a4ddf249 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,7 +1,7 @@
 # TODO check that no license information gets lost
 { fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
 , which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip
-, vim_configurable, vimPlugins, xkb_switch, git, racerdRust, goPackages
+, vim_configurable, vimPlugins, xkb_switch, git, racerdRust, fzf
 , Cocoa ? null
 }:
 
@@ -98,9 +98,9 @@ rec {
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing;
 
-  fzf = buildVimPluginFrom2Nix {
-    name = goPackages.fzf.name;
-    src = "${goPackages.fzf}/share/go/src/github.com/junegunn/fzf";
+  fzfWrapper = buildVimPluginFrom2Nix {
+    name = fzf.name;
+    src = "${fzf}/share/go/src/github.com/junegunn/fzf";
     dependencies = [];
   };
 
@@ -1301,6 +1301,28 @@ rec {
 
   };
 
+  psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "psc-ide-vim-2016-06-04";
+    src = fetchgit {
+      url = "git://github.com/frigoeu/psc-ide-vim";
+      rev = "27c000f0f27c7a4d05f001320ddcf1ae15b22eb7";
+      sha256 = "1vgxf5kziv00mi346zw3b2dnxygxk0jyxg41y6w1j22yrp9id1k2";
+    };
+    dependencies = [ ];
+
+  };
+
+  purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "purescript-vim-2016-06-04";
+    src = fetchgit {
+      url = "git://github.com/raichoo/purescript-vim";
+      rev = "92dd6bc647b45444e9d5e0550bdc3c56928f9762";
+      sha256 = "090vpff58lzzhqp28p27am5s8s6ngjxw6j4y46zaixcxxx7wqzha";
+    };
+    dependencies = [ ];
+
+  };
+
   quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "quickfixstatus-2011-09-02";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index de87046d3bc9..cdb411051aa4 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -36,6 +36,7 @@
 "github:esneider/YUNOcommit.vim"
 "github:fatih/vim-go"
 "github:flazz/vim-colorschemes"
+"github:frigoeu/psc-ide-vim"
 "github:google/vim-jsonnet"
 "github:hecal3/vim-leader-guide"
 "github:idris-hackers/idris-vim"
@@ -68,6 +69,7 @@
 "github:osyo-manga/shabadou.vim"
 "github:osyo-manga/vim-watchdogs"
 "github:racer-rust/vim-racer"
+"github:raichoo/purescript-vim"
 "github:rust-lang/rust.vim"
 "github:shougo/neocomplete.vim"
 "github:shougo/neosnippet-snippets"