mikutter: 3.5.13 -> 3.8.7 (#60808)

8 files changed, 277 insertions, 134 deletions

diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
index 0eed9808ab4..3ebd745e4f1 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
+++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
@@ -7,17 +7,20 @@ def source(url)
 
 source 'https://rubygems.org'
 
+ruby '>= 2.3.0'
+
 group :default do
   gem 'oauth', '>= 0.5.1'
   gem 'json_pure', '~> 1.8'
-  gem 'addressable', '~> 2.3'
+  gem 'addressable', '>= 2.5.2', '< 2.6'
+  gem 'diva', '>= 0.3.2', '< 2.0'
   gem 'memoist', '>= 0.16', '< 0.17'
   gem 'ruby-hmac', '~> 0.4'
   gem 'typed-array', '~> 0.1'
   gem 'delayer', '~> 0.0'
   gem 'pluggaloid', '>= 1.1.1', '< 2.0'
-  gem 'delayer-deferred', '>= 1.0.4', '< 1.1'
-  gem 'twitter-text', '>= 1.14.6'
+  gem 'delayer-deferred', '>= 2.0', '< 3.0'
+  gem 'twitter-text', '>= 2.1.0'
 end
 
 group :test do
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
index 69530be4a44..2e1f2fbd382 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
+++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
@@ -3,75 +3,78 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    atk (3.1.9)
-      glib2 (= 3.1.9)
-    cairo (1.15.10)
+    atk (3.3.2)
+      glib2 (= 3.3.2)
+    cairo (1.16.4)
       native-package-installer (>= 1.0.3)
       pkg-config (>= 1.2.2)
-    cairo-gobject (3.1.9)
-      cairo
-      glib2 (= 3.1.9)
+    cairo-gobject (3.3.2)
+      cairo (>= 1.16.2)
+      glib2 (= 3.3.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     delayer (0.0.2)
-    delayer-deferred (1.0.4)
+    delayer-deferred (2.0.0)
       delayer (>= 0.0.2, < 0.1)
-    gdk_pixbuf2 (3.1.9)
-      gio2 (= 3.1.9)
-    gettext (3.0.9)
+    diva (0.3.2)
+      addressable (>= 2.5, < 2.6)
+    gdk_pixbuf2 (3.3.2)
+      gio2 (= 3.3.2)
+    gettext (3.2.9)
       locale (>= 2.0.5)
-      text
-    gio2 (3.1.9)
-      glib2 (= 3.1.9)
-      gobject-introspection (= 3.1.9)
-    glib2 (3.1.9)
+      text (>= 1.3.0)
+    gio2 (3.3.2)
+      gobject-introspection (= 3.3.2)
+    glib2 (3.3.2)
       native-package-installer (>= 1.0.3)
       pkg-config (>= 1.2.2)
-    gobject-introspection (3.1.9)
-      glib2 (= 3.1.9)
-    gtk2 (3.1.9)
-      atk (= 3.1.9)
-      gdk_pixbuf2 (= 3.1.9)
-      pango (= 3.1.9)
-    hashdiff (0.3.7)
+    gobject-introspection (3.3.2)
+      glib2 (= 3.3.2)
+    gtk2 (3.3.2)
+      atk (= 3.3.2)
+      gdk_pixbuf2 (= 3.3.2)
+      pango (= 3.3.2)
+    hashdiff (0.3.9)
     httpclient (2.8.3)
+    idn-ruby (0.1.0)
     instance_storage (1.0.0)
+    irb (1.0.0)
     json_pure (1.8.6)
     locale (2.1.2)
     memoist (0.16.0)
     metaclass (0.0.4)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    moneta (1.0.0)
-    native-package-installer (1.0.4)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
-    oauth (0.5.3)
-    pango (3.1.9)
-      cairo (>= 1.14.0)
-      cairo-gobject (= 3.1.9)
-      gobject-introspection (= 3.1.9)
-    pkg-config (1.2.8)
-    pluggaloid (1.1.1)
+    moneta (1.1.1)
+    native-package-installer (1.0.7)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    oauth (0.5.4)
+    pango (3.3.2)
+      cairo-gobject (= 3.3.2)
+      gobject-introspection (= 3.3.2)
+    pkg-config (1.3.7)
+    pluggaloid (1.1.2)
       delayer
       instance_storage (>= 1.0.0, < 2.0.0)
-    power_assert (1.1.1)
-    public_suffix (3.0.0)
+    power_assert (1.1.4)
+    public_suffix (3.0.3)
     rake (10.5.0)
     ruby-hmac (0.4.0)
-    ruby-prof (0.16.2)
-    safe_yaml (1.0.4)
-    test-unit (3.2.6)
+    ruby-prof (0.17.0)
+    safe_yaml (1.0.5)
+    test-unit (3.3.2)
       power_assert
     text (1.3.1)
     totoridipjp (0.1.0)
-    twitter-text (1.14.7)
+    twitter-text (3.0.0)
+      idn-ruby
       unf (~> 0.1.0)
     typed-array (0.1.2)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.6)
     watch (0.1.0)
     webmock (1.24.6)
       addressable (>= 2.3.6)
@@ -82,12 +85,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable (~> 2.3)
+  addressable (>= 2.5.2, < 2.6)
   delayer (~> 0.0)
-  delayer-deferred (>= 1.0.4, < 1.1)
-  gettext (~> 3.0.1)
-  gtk2 (= 3.1.9)
+  delayer-deferred (>= 2.0, < 3.0)
+  diva (>= 0.3.2, < 2.0)
+  gettext (>= 3.2.9, < 3.3)
+  gtk2 (= 3.3.2)
   httpclient
+  irb (>= 1.0.0, < 1.1)
   json_pure (~> 1.8)
   memoist (>= 0.16, < 0.17)
   mocha (~> 0.14)
@@ -100,10 +105,13 @@ DEPENDENCIES
   ruby-prof
   test-unit (~> 3.0)
   totoridipjp
-  twitter-text (>= 1.14.6)
+  twitter-text (>= 2.1.0)
   typed-array (~> 0.1)
   watch (~> 0.1)
   webmock (~> 1.17)
 
+RUBY VERSION
+   ruby 2.5.5p157
+
 BUNDLED WITH
-   1.14.6
+   1.17.2
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
index b7d19db3763..efe602edc4f 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
+++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'gtk2', '3.1.9'
+gem 'gtk2', '3.3.2'
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile
index 1625327f16d..61424d395f9 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile
+++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile
@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
 group :default do
-  gem 'gettext', '~> 3.0.1'
+  gem 'gettext', '>= 3.2.9', '< 3.3'
+  gem 'irb', '>= 1.0.0', '< 1.1'
 end
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
index 3cb254122d7..ea190db07a6 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@@ -1,15 +1,29 @@
 { stdenv, fetchurl
 , bundlerEnv, ruby
-, alsaUtils, libnotify, which, wrapGAppsHook, gtk2
+, alsaUtils, libnotify, which, wrapGAppsHook, gtk2, atk, gobject-introspection
 }:
 
+# how to update:
+# find latest version at: http://mikutter.hachune.net/download#download
+# run these commands:
+#
+# wget http://mikutter.hachune.net/bin/mikutter.3.8.7.tar.gz
+# tar xvf mikutter.3.8.7.tar.gz
+# cd mikutter
+# find . -not -name Gemfile -exec rm {} \;
+# find . -type d -exec rmdir -p --ignore-fail-on-non-empty {} \;
+# cd ..
+# mv mikutter/* .
+# rm mikutter.3.8.7.tar.gz
+# rm gemset.nix Gemfile.lock; nix-shell -p bundler bundix --run 'bundle lock && bundix'
+
 stdenv.mkDerivation rec {
   name = "mikutter-${version}";
-  version = "3.5.13";
+  version = "3.8.7";
 
   src = fetchurl {
     url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz";
-    sha256 = "2e01cd6cfe0caad663a381e5263f6d8030f0fb7cd8d4f858d320166516c7c320";
+    sha256 = "1griypcd1xgyfd9wc3ls32grpw4ig0xxdiygpdinzr3bigfmd7iv";
   };
 
   env = bundlerEnv {
@@ -19,7 +33,7 @@ stdenv.mkDerivation rec {
     inherit ruby;
   };
 
-  buildInputs = [ alsaUtils libnotify which gtk2 ruby ];
+  buildInputs = [ alsaUtils libnotify which gtk2 ruby atk gobject-introspection ];
   nativeBuildInputs = [ wrapGAppsHook ];
 
   postUnpack = ''
@@ -41,6 +55,7 @@ stdenv.mkDerivation rec {
       --prefix GEM_HOME : "${env}/${env.ruby.gemPath}"
       --set DISABLE_BUNDLER_SETUP 1
     )
+      # --prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules"
 
     mkdir -p $out/share/mikutter $out/share/applications
     ln -sv $out/core/skin $out/share/mikutter/skin
@@ -54,7 +69,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    broken = true;
     description = "An extensible Twitter client";
     homepage = https://mikutter.hachune.net;
     platforms = ruby.meta.platforms;
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
index ef7091689b3..5f3ef945b3d 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
@@ -1,6 +1,8 @@
 {
   addressable = {
     dependencies = ["public_suffix"];
+    groups = ["default" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
@@ -10,33 +12,41 @@
   };
   atk = {
     dependencies = ["glib2"];
+    groups = ["default" "plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18l99gv6828rn59q8k6blxg146b025fj44klrcisffw6h9s9qqxm";
+      sha256 = "17c5ixwyg16lbbjix2prk7fa6lm0vkxvc1z6m6inc6jgkb1x0700";
       type = "gem";
     };
-    version = "3.1.9";
+    version = "3.3.2";
   };
   cairo = {
     dependencies = ["native-package-installer" "pkg-config"];
+    groups = ["default" "plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1f0n057cj6cjz7f38pwnflrkbwkl8pm3g9ssa51flyxr7lcpcw7c";
+      sha256 = "0yvv2lcbsybzbw1nrmfivmln23da4rndrs3av6ymjh0x3ww5h7p8";
       type = "gem";
     };
-    version = "1.15.10";
+    version = "1.16.4";
   };
   cairo-gobject = {
     dependencies = ["cairo" "glib2"];
+    groups = ["default" "plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qnsd9203qc6hl2i4hfzngr8v06rfk4vxfn6sbr8b4c1q4n0lq26";
+      sha256 = "12q441a5vnfvbcnli4fpq2svb75vq1wvs2rlgsp6fv38fh6fgsfz";
       type = "gem";
     };
-    version = "3.1.9";
+    version = "3.3.2";
   };
   crack = {
     dependencies = ["safe_yaml"];
+    groups = ["default" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
@@ -45,6 +55,8 @@
     version = "0.4.3";
   };
   delayer = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "156vy4x1d2jgafkjaafzfz7g8ghl4p5zgbl859b8slp4wdxy3v1r";
@@ -54,76 +66,105 @@
   };
   delayer-deferred = {
     dependencies = ["delayer"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rp2hpik8gs1kzwwq831jwj1iv5bhfwd3dmm9nvizy3nqpz1gvvb";
+      sha256 = "0zvqphyzngj5wghgbb2nd1qj2qvj2plsz9vx8hz24c7bfq55n4xz";
       type = "gem";
     };
-    version = "1.0.4";
+    version = "2.0.0";
+  };
+  diva = {
+    dependencies = ["addressable"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rp125gdlq7jqq7x8la52pdpimhx5wr66frcgf6z4jm927rjw84d";
+      type = "gem";
+    };
+    version = "0.3.2";
   };
   gdk_pixbuf2 = {
     dependencies = ["gio2"];
+    groups = ["default" "plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0x7vna77qw26479dydzfs1sq7xmq31xfly2pn5fvh35wg0q4y07d";
+      sha256 = "071z8a8khs5qb43ri5hbvaijwbx43mick7cjfmhn6javifkzijk7";
       type = "gem";
     };
-    version = "3.1.9";
+    version = "3.3.2";
   };
   gettext = {
     dependencies = ["locale" "text"];
+    groups = ["default" "plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14vw306p46w2kyad3kp9vq56zw3ch6px30wkhl5x0qkx8d3ya3ir";
+      sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr";
       type = "gem";
     };
-    version = "3.0.9";
+    version = "3.2.9";
   };
   gio2 = {
-    dependencies = ["glib2" "gobject-introspection"];
+    dependencies = ["gobject-introspection"];
+    groups = ["default" "plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dxyaxp32m19mynw20x39vkb50wa4jcxczwmbkq7pcg55j76wwhm";
+      sha256 = "1f131yd9zzfsjn8i4k8xkl7xm3c5f9sm7irvwxnqqh635qccfz8n";
       type = "gem";
     };
-    version = "3.1.9";
+    version = "3.3.2";
   };
   glib2 = {
     dependencies = ["native-package-installer" "pkg-config"];
+    groups = ["default" "plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y1ws895345a88wikqil1x87cpd7plmwfi635piam7il6vsb4h73";
+      sha256 = "13r1i8gkgxj0fjz7bdnqqrsvszl7dffbf85ghx2f8p7zrcbzlk3p";
       type = "gem";
     };
-    version = "3.1.9";
+    version = "3.3.2";
   };
   gobject-introspection = {
     dependencies = ["glib2"];
+    groups = ["default" "plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04gla6z9y8g0d69wlwl0wr7pwyzqg132pfs1n9fq6fgkjb6l7sm3";
+      sha256 = "15njcm0yg4qpwkhyx6gf2nxvjl6fxm9jffan8zrl2xyh68yr4jf7";
       type = "gem";
     };
-    version = "3.1.9";
+    version = "3.3.2";
   };
   gtk2 = {
     dependencies = ["atk" "gdk_pixbuf2" "pango"];
+    groups = ["plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mshgsw2x0w5wfcp17qnsja50aafbjxy2g42kvk5sr19l0chkkkq";
+      sha256 = "1a4lj6anmvr82cwrg8swzglz90jss995zr7bvsiwr876qqdwv7qs";
       type = "gem";
     };
-    version = "3.1.9";
+    version = "3.3.2";
   };
   hashdiff = {
+    groups = ["default" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9";
+      sha256 = "1qji49afni3c90zws617x514xi7ik70g2iwngj9skq68mjcq6y4x";
       type = "gem";
     };
-    version = "0.3.7";
+    version = "0.3.9";
   };
   httpclient = {
+    groups = ["plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
@@ -131,7 +172,19 @@
     };
     version = "2.8.3";
   };
+  idn-ruby = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
   instance_storage = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "08nf5fhq9dckq9lmaklxydq0hrlfi7phk66gr3bggxg45zd687pl";
@@ -139,7 +192,19 @@
     };
     version = "1.0.0";
   };
+  irb = {
+    groups = ["default" "plugin"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "181d88hns00fpw8szg8hbchflwq69wp3y5zvd3dyqjzbq91v1dcr";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
   json_pure = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1vllrpm2hpsy5w1r7000mna2mhd7yfrmd8hi713lk0n9mv27bmam";
@@ -148,6 +213,8 @@
     version = "1.8.6";
   };
   locale = {
+    groups = ["default" "plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
@@ -156,6 +223,8 @@
     version = "2.1.2";
   };
   memoist = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
@@ -164,6 +233,8 @@
     version = "0.16.0";
   };
   metaclass = {
+    groups = ["default" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5";
@@ -172,15 +243,19 @@
     version = "0.0.4";
   };
   mini_portile2 = {
+    groups = ["default" "plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+      sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.4.0";
   };
   mocha = {
     dependencies = ["metaclass"];
+    groups = ["test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0id1x7g46fzy8f4jna20ys329ydaj3sad75qs9db2a6nd7f0zc2b";
@@ -189,81 +264,101 @@
     version = "0.14.0";
   };
   moneta = {
+    groups = ["plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pgwn6xnlh7vviy511mfgkv2j3sfihn5ic2zabmyrs2nh6kfa912";
+      sha256 = "1mbs9w3c13phza8008mwlx8s991fzigml7pncq94i1c2flz9vw95";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.1.1";
   };
   native-package-installer = {
+    groups = ["default" "plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0svj2sg7y7izl90qrvzd2fcb1rkq8bv3bd6lr9sh1ml18v3w882a";
+      sha256 = "03qrzhk807f98bdwy6c37acksyb5fnairdz4jpl7y3fifh7k7yfn";
       type = "gem";
     };
-    version = "1.0.4";
+    version = "1.0.7";
   };
   nokogiri = {
     dependencies = ["mini_portile2"];
+    groups = ["plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
+      sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
       type = "gem";
     };
-    version = "1.8.1";
+    version = "1.10.3";
   };
   oauth = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1a5cfg9pm3mxsmlk1slj652vza8nha2lpbpbmf3rrk0lh6zi4d0b";
+      sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y";
       type = "gem";
     };
-    version = "0.5.3";
+    version = "0.5.4";
   };
   pango = {
-    dependencies = ["cairo" "cairo-gobject" "gobject-introspection"];
+    dependencies = ["cairo-gobject" "gobject-introspection"];
+    groups = ["default" "plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0swld0s01djjlqrari0ib75703mb7qr4ydn00cqfhdr7xim66hjk";
+      sha256 = "0lbhjsd6y42iw572xcynd6gcapczjki41h932s90rkh6022pbm9p";
       type = "gem";
     };
-    version = "3.1.9";
+    version = "3.3.2";
   };
   pkg-config = {
+    groups = ["default" "plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "056qb6cwbw2l9riq376wazx4kwd67cdilyclpa6j38mfsswpmzws";
+      sha256 = "1s56ym0chq3fycl29vqabcalqdcf7y2f25pmihjwqgbmrmzdyvr1";
       type = "gem";
     };
-    version = "1.2.8";
+    version = "1.3.7";
   };
   pluggaloid = {
     dependencies = ["delayer" "instance_storage"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0p9s1bzw02jzjlpjpxsbfsy1cyfbqs10iqvhxqh4xgyh72nry9zr";
+      sha256 = "0fkm6y7aq132icmmv4k8mqw08fxqil8k52l8li642jyi79hvzrqh";
       type = "gem";
     };
-    version = "1.1.1";
+    version = "1.1.2";
   };
   power_assert = {
+    groups = ["default" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0h0s1clasynlbk3782801c61yx24pdv959fpw53g5yl8gxqj34iz";
+      sha256 = "072y5ixw59ad47hkfj6nl2i4zcyad8snfxfsyyrgjkiqnvqwvbvq";
       type = "gem";
     };
-    version = "1.1.1";
+    version = "1.1.4";
   };
   public_suffix = {
+    groups = ["default" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f";
+      sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "3.0.3";
   };
   rake = {
+    groups = ["test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b";
@@ -272,6 +367,8 @@
     version = "10.5.0";
   };
   ruby-hmac = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "01zym41f8fqbmxfz8zv19627swi62ka3gp33bfbkc87v5k7mw954";
@@ -280,31 +377,39 @@
     version = "0.4.0";
   };
   ruby-prof = {
+    groups = ["test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0y13gdcdajfgrkx5rc9pvb7bwkyximwl5yrhq05gkmhflzdr7kag";
+      sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c";
       type = "gem";
     };
-    version = "0.16.2";
+    version = "0.17.0";
   };
   safe_yaml = {
+    groups = ["default" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+      sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56";
       type = "gem";
     };
-    version = "1.0.4";
+    version = "1.0.5";
   };
   test-unit = {
     dependencies = ["power_assert"];
+    groups = ["test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gl5b2d6bysnm0a1zx54qn6iwd67f6gsjy0c7zb68ag0453rqcnv";
+      sha256 = "0hf47w70ajvwdchx0psq3dir26hh902x9sz0iwbxqj8z9w1kc6sd";
       type = "gem";
     };
-    version = "3.2.6";
+    version = "3.3.2";
   };
   text = {
+    groups = ["default" "plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg";
@@ -313,6 +418,8 @@
     version = "1.3.1";
   };
   totoridipjp = {
+    groups = ["plugin"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "03ci9hbwc6xf4x0lkm6px4jgbmi37n8plsjhbf2ir5vka9f29lck";
@@ -321,15 +428,19 @@
     version = "0.1.0";
   };
   twitter-text = {
-    dependencies = ["unf"];
+    dependencies = ["idn-ruby" "unf"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg";
+      sha256 = "1ibk4bl9hrq0phlg7zplkilsqgniji6yvid1a7k09rs0ai422jax";
       type = "gem";
     };
-    version = "1.14.7";
+    version = "3.0.0";
   };
   typed-array = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0qlv2rnkin9rwkgjx3k5qvc17m0m7jf5cdirw3wxbjnw5kga27w9";
@@ -339,6 +450,8 @@
   };
   unf = {
     dependencies = ["unf_ext"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
@@ -347,14 +460,18 @@
     version = "0.1.4";
   };
   unf_ext = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb";
+      sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf";
       type = "gem";
     };
-    version = "0.0.7.4";
+    version = "0.0.7.6";
   };
   watch = {
+    groups = ["test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "02g4g6ynnldyjjzrh19r584gj4z6ksff7h0ajz5jdwhpp5y7cghx";
@@ -364,6 +481,8 @@
   };
   webmock = {
     dependencies = ["addressable" "crack" "hashdiff"];
+    groups = ["test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "03vlr6axajz6c7xmlk0w1kvkxc92f8y2zp27wq1z6yk916ry25n5";
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix b/pkgs/applications/networking/instant-messengers/mikutter/shell.nix
deleted file mode 100644
index bc83767af32..00000000000
--- a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-
-pkgs.stdenv.mkDerivation {
-  name = "mikutter-shell";
-  buildInputs = with pkgs; [
-    bundix
-    bundler
-  ];
-
-  shellHook = ''
-    export MIKUTTER_CONFROOT="/homeless-shelter"
-    truncate --size 0 Gemfile.lock
-    bundle lock
-    bundle package --path=vendor/bundle --no-install
-    rm -rf vendor .bundle
-    bundix -d
-  '';
-}
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 4e2de5c9caf..f9f1addd4c3 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -23,7 +23,7 @@
 , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
 , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
 , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx
-, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf
+, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
 , libselinux ? null, libsepol ? null
 }@args:
 
@@ -179,9 +179,17 @@ in
 
   gtk2 = attrs: {
     nativeBuildInputs = [ pkgconfig ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ];
-    buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp];
+    buildInputs = [
+      fribidi
+      gobject-introspection
+      gtk2
+      harfbuzz
+      pcre
+      xorg.libpthreadstubs
+      xorg.libXdmcp
+    ];
     # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly
-    CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path";
+    # CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path";
   };
 
   gobject-introspection = attrs: {
@@ -299,7 +307,15 @@ in
 
   pango = attrs: {
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ];
+    buildInputs = [
+      fribidi
+      gobject-introspection
+      gtk2
+      harfbuzz
+      pcre
+      xorg.libpthreadstubs
+      xorg.libXdmcp
+    ];
   };
 
   patron = attrs: {