sup: 0.20.0 -> 0.22.1

5 files changed, 100 insertions, 68 deletions

diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile b/pkgs/applications/networking/mailreaders/sup/Gemfile
index a57feb5d21f3..bc37456ae58e 100644
--- a/pkgs/applications/networking/mailreaders/sup/Gemfile
+++ b/pkgs/applications/networking/mailreaders/sup/Gemfile
@@ -1,8 +1,9 @@
 source "https://rubygems.org"
 
+gem 'rake'
 gem 'sup'
 gem 'gpgme'
 
 # Sup tries to `xapian-ruby` in its extconf instead of listing it as a
 # dependency.
-gem 'xapian-ruby', "~> 1.2.15"
+gem 'xapian-ruby', "~> 1.2.22"
diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock b/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
index fe8746b9f724..0691919ba182 100644
--- a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
+++ b/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
@@ -2,33 +2,40 @@ GEM
   remote: https://rubygems.org/
   specs:
     chronic (0.9.1)
-    gpgme (2.0.7)
-      mini_portile (>= 0.5.0, <= 0.6.0)
-    highline (1.6.21)
-    locale (2.1.0)
+    gpgme (2.0.12)
+      mini_portile2 (~> 2.1.0)
+    highline (1.7.8)
+    locale (2.1.2)
     lockfile (2.1.3)
-    mime-types (1.25.1)
-    mini_portile (0.6.0)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
+    mini_portile2 (2.1.0)
     ncursesw (1.4.9)
+    rake (11.1.2)
     rmail-sup (1.0.1)
-    sup (0.20.0)
+    sup (0.22.1)
       chronic (~> 0.9.1)
       highline
       locale (~> 2.0)
       lockfile
-      mime-types (~> 1.0)
+      mime-types (> 2.0)
       ncursesw (~> 1.4.0)
       rmail-sup (~> 1.0.1)
       trollop (>= 1.12)
       unicode (~> 0.4.4)
-    trollop (2.1.1)
+    trollop (2.1.2)
     unicode (0.4.4.2)
-    xapian-ruby (1.2.19.1)
+    xapian-ruby (1.2.22)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   gpgme
+  rake
   sup
-  xapian-ruby (~> 1.2.15)
+  xapian-ruby (~> 1.2.22)
+
+BUNDLED WITH
+   1.10.6
diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index f7aff8a4d0c2..b7ac621eb6db 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -2,9 +2,14 @@
 , pkgconfig, which }:
 
 bundlerEnv {
-  name = "sup-0.20.0";
+  name = "sup-0.22.1";
 
   inherit ruby;
+
+  # Updated with:
+  # nix-shell -p bundix -p bundler -p ncurses -p ruby -p which -p zlib -p libuuid
+  # bundle install --path ./vendor
+  # bundix
   gemfile = ./Gemfile;
   lockfile = ./Gemfile.lock;
   gemset = ./gemset.nix;
diff --git a/pkgs/applications/networking/mailreaders/sup/gemset.nix b/pkgs/applications/networking/mailreaders/sup/gemset.nix
index e39da3dac85e..babc063d6346 100644
--- a/pkgs/applications/networking/mailreaders/sup/gemset.nix
+++ b/pkgs/applications/networking/mailreaders/sup/gemset.nix
@@ -1,107 +1,126 @@
 {
-  "chronic" = {
-    version = "0.9.1";
+  xapian-ruby = {
+    version = "1.2.22";
     source = {
       type = "gem";
-      sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xbarnxmhy6r0rxpspn4wk85j183w6b18nah73djcs06b3gfas15";
     };
+    dependencies = [ "rake" ];
   };
-  "gpgme" = {
-    version = "2.0.7";
+  unicode = {
+    version = "0.4.4.2";
     source = {
       type = "gem";
-      sha256 = "1p84zhiri2ihcld7py9mwc2kg5xs5da8fk11zhndrhmw05yvf5mr";
+      remotes = ["https://rubygems.org"];
+      sha256 = "15fggljzan8zvmr8h12b5m7pcj1gvskmmnx367xs4p0rrpnpil8g";
     };
-    dependencies = [
-      "mini_portile"
-    ];
   };
-  "highline" = {
-    version = "1.6.21";
+  trollop = {
+    version = "2.1.2";
     source = {
       type = "gem";
-      sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
     };
   };
-  "locale" = {
-    version = "2.1.0";
+  sup = {
+    version = "0.22.1";
     source = {
       type = "gem";
-      sha256 = "18bb0g24flq9dr8qv4j7pm7w9i2vmvmqrbmry95ibf1r1c4s60yj";
+      remotes = ["https://rubygems.org"];
+      sha256 = "17s2sxismf46zdhgr6g2v53fw9f3sp1ijx7xdw3wx8qpcsgazcgi";
     };
+    dependencies = ["chronic" "highline" "locale" "lockfile" "mime-types" "ncursesw" "rmail-sup" "trollop" "unicode" "rake" ];
   };
-  "lockfile" = {
-    version = "2.1.3";
+  rmail-sup = {
+    version = "1.0.1";
     source = {
       type = "gem";
-      sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g";
     };
   };
-  "mime-types" = {
-    version = "1.25.1";
+  rake = {
+    version = "11.1.2";
     source = {
       type = "gem";
-      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jfmy7kd543ldi3d4fg35a1w7q6jikpnzxqj4bzchfbn94cbabqz";
     };
   };
-  "mini_portile" = {
-    version = "0.6.0";
+  ncursesw = {
+    version = "1.4.9";
     source = {
       type = "gem";
-      sha256 = "09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn";
+      remotes = ["https://rubygems.org"];
+      sha256 = "154cls3b237imdbhih7rni5p85nw6mpbpkzdw08jxzvqaml7q093";
     };
   };
-  "ncursesw" = {
-    version = "1.4.9";
+  mini_portile2 = {
+    version = "2.1.0";
     source = {
       type = "gem";
-      sha256 = "154cls3b237imdbhih7rni5p85nw6mpbpkzdw08jxzvqaml7q093";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
     };
   };
-  "rmail-sup" = {
-    version = "1.0.1";
+  mime-types-data = {
+    version = "3.2016.0221";
     source = {
       type = "gem";
-      sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g";
+      remotes = ["https://rubygems.org"];
+      sha256 = "05ygjn0nnfh6yp1wsi574jckk95wqg9a6g598wk4svvrkmkrzkpn";
     };
   };
-  "sup" = {
-    version = "0.20.0";
+  mime-types = {
+    version = "3.0";
     source = {
       type = "gem";
-      sha256 = "1lpqgrqkv29xr1h1142qsbmknlshpgys7fc3w1nkyhib8s3ikamg";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1snjc38a9vqvy8j41xld1i1byq9prbl955pbjw7dxqcfcirqlzra";
     };
-    dependencies = [
-      "chronic"
-      "highline"
-      "locale"
-      "lockfile"
-      "mime-types"
-      "ncursesw"
-      "rmail-sup"
-      "trollop"
-      "unicode"
-    ];
+    dependencies = ["mime-types-data"];
   };
-  "trollop" = {
-    version = "2.1.1";
+  lockfile = {
+    version = "2.1.3";
     source = {
       type = "gem";
-      sha256 = "0z5dvh7glwqjprlihsjx67hfzy4whsjfhqj9akyyrby9q5va1i4k";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
     };
   };
-  "unicode" = {
-    version = "0.4.4.2";
+  locale = {
+    version = "2.1.2";
     source = {
       type = "gem";
-      sha256 = "15fggljzan8zvmr8h12b5m7pcj1gvskmmnx367xs4p0rrpnpil8g";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
     };
   };
-  "xapian-ruby" = {
-    version = "1.2.19.1";
+  highline = {
+    version = "1.7.8";
     source = {
       type = "gem";
-      sha256 = "1crfrmc8kf6qq1xcfcmgf213zg66badpg4d86n7y9x3i1f5lxlbv";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+    };
+  };
+  gpgme = {
+    version = "2.0.12";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a04a76dw9dias0a8rp6dyk3vx2y024gim40lg2md6zdh2m1kx85";
+    };
+    dependencies = ["mini_portile2"];
+  };
+  chronic = {
+    version = "0.9.1";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk";
     };
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7eb48fe9a7e9..4d3e764ee529 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13187,7 +13187,7 @@ in
   smtube = qt5.callPackage ../applications/video/smtube {};
 
   sup = callPackage ../applications/networking/mailreaders/sup {
-    ruby = ruby_1_9.override { cursesSupport = true; };
+    ruby = ruby_2_3.override { cursesSupport = true; };
   };
 
   synapse = callPackage ../applications/misc/synapse {