sup: use bundlerApp, cleanup (#60515)

3 files changed, 124 insertions, 88 deletions

diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock b/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
index 0691919ba18..bd0f051c104 100644
--- a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
+++ b/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
@@ -2,17 +2,17 @@ GEM
   remote: https://rubygems.org/
   specs:
     chronic (0.9.1)
-    gpgme (2.0.12)
-      mini_portile2 (~> 2.1.0)
-    highline (1.7.8)
+    gpgme (2.0.18)
+      mini_portile2 (~> 2.3)
+    highline (2.0.2)
     locale (2.1.2)
     lockfile (2.1.3)
-    mime-types (3.0)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
-    mini_portile2 (2.1.0)
-    ncursesw (1.4.9)
-    rake (11.1.2)
+    mime-types-data (3.2019.0331)
+    mini_portile2 (2.4.0)
+    ncursesw (1.4.10)
+    rake (12.3.2)
     rmail-sup (1.0.1)
     sup (0.22.1)
       chronic (~> 0.9.1)
@@ -24,8 +24,8 @@ GEM
       rmail-sup (~> 1.0.1)
       trollop (>= 1.12)
       unicode (~> 0.4.4)
-    trollop (2.1.2)
-    unicode (0.4.4.2)
+    trollop (2.9.9)
+    unicode (0.4.4.4)
     xapian-ruby (1.2.22)
 
 PLATFORMS
@@ -38,4 +38,4 @@ DEPENDENCIES
   xapian-ruby (~> 1.2.22)
 
 BUNDLED WITH
-   1.10.6
+   1.17.2
diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index c803db6dcbc..cfc471a57f0 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -1,23 +1,30 @@
-{ lib, bundlerEnv, ruby }:
+{ lib, bundlerApp, rake, which }:
 
-bundlerEnv {
-  name = "sup-0.22.1";
+# Updated with:
+# rm gemset.nix Gemfile.lock
+# nix-shell -p bundler bundix --run 'bundle lock && bundix'
 
-  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;
+bundlerApp {
+  pname = "sup";
+  gemdir = ./.;
+  exes = [
+    "sup"
+    "sup-add"
+    "sup-config"
+    "sup-dump"
+    "sup-import-dump"
+    "sup-psych-ify-config-files"
+    "sup-recover-sources"
+    "sup-sync"
+    "sup-sync-back-maildir"
+    "sup-tweak-labels"
+  ];
 
   meta = with lib; {
     description = "A curses threads-with-tags style email client";
     homepage    = http://sup-heliotrope.github.io;
     license     = licenses.gpl2;
-    maintainers = with maintainers; [ cstrahan lovek323 ];
+    maintainers = with maintainers; [ cstrahan lovek323 manveru ];
     platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/mailreaders/sup/gemset.nix b/pkgs/applications/networking/mailreaders/sup/gemset.nix
index babc063d634..023374932cb 100644
--- a/pkgs/applications/networking/mailreaders/sup/gemset.nix
+++ b/pkgs/applications/networking/mailreaders/sup/gemset.nix
@@ -1,126 +1,155 @@
 {
-  xapian-ruby = {
-    version = "1.2.22";
+  chronic = {
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "1xbarnxmhy6r0rxpspn4wk85j183w6b18nah73djcs06b3gfas15";
+      sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk";
+      type = "gem";
     };
-    dependencies = [ "rake" ];
+    version = "0.9.1";
   };
-  unicode = {
-    version = "0.4.4.2";
+  gpgme = {
+    dependencies = ["mini_portile2"];
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "15fggljzan8zvmr8h12b5m7pcj1gvskmmnx367xs4p0rrpnpil8g";
+      sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m";
+      type = "gem";
     };
+    version = "2.0.18";
   };
-  trollop = {
-    version = "2.1.2";
+  highline = {
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
+      sha256 = "1g0zpalfj8wvca86hcnirir5py2zyqrhkgdgv9f87fxkjaw815wr";
+      type = "gem";
     };
+    version = "2.0.2";
   };
-  sup = {
-    version = "0.22.1";
+  locale = {
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "17s2sxismf46zdhgr6g2v53fw9f3sp1ijx7xdw3wx8qpcsgazcgi";
+      sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
+      type = "gem";
     };
-    dependencies = ["chronic" "highline" "locale" "lockfile" "mime-types" "ncursesw" "rmail-sup" "trollop" "unicode" "rake" ];
+    version = "2.1.2";
   };
-  rmail-sup = {
-    version = "1.0.1";
+  lockfile = {
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g";
+      sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
+      type = "gem";
     };
+    version = "2.1.3";
   };
-  rake = {
-    version = "11.1.2";
+  mime-types = {
+    dependencies = ["mime-types-data"];
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "0jfmy7kd543ldi3d4fg35a1w7q6jikpnzxqj4bzchfbn94cbabqz";
+      sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
+      type = "gem";
     };
+    version = "3.2.2";
   };
-  ncursesw = {
-    version = "1.4.9";
+  mime-types-data = {
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "154cls3b237imdbhih7rni5p85nw6mpbpkzdw08jxzvqaml7q093";
+      sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
+      type = "gem";
     };
+    version = "3.2019.0331";
   };
   mini_portile2 = {
-    version = "2.1.0";
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
+      sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
+      type = "gem";
     };
+    version = "2.4.0";
   };
-  mime-types-data = {
-    version = "3.2016.0221";
+  ncursesw = {
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "05ygjn0nnfh6yp1wsi574jckk95wqg9a6g598wk4svvrkmkrzkpn";
+      sha256 = "1nc14wls1yiigz593vw7580hb99lf4n485axapiz6sqpg1jnlhcr";
+      type = "gem";
     };
+    version = "1.4.10";
   };
-  mime-types = {
-    version = "3.0";
+  rake = {
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "1snjc38a9vqvy8j41xld1i1byq9prbl955pbjw7dxqcfcirqlzra";
+      sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn";
+      type = "gem";
     };
-    dependencies = ["mime-types-data"];
+    version = "12.3.2";
   };
-  lockfile = {
-    version = "2.1.3";
+  rmail-sup = {
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
+      sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g";
+      type = "gem";
     };
+    version = "1.0.1";
   };
-  locale = {
-    version = "2.1.2";
+  sup = {
+    dependencies = ["chronic" "highline" "locale" "lockfile" "mime-types" "ncursesw" "rmail-sup" "trollop" "unicode"];
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
+      sha256 = "17s2sxismf46zdhgr6g2v53fw9f3sp1ijx7xdw3wx8qpcsgazcgi";
+      type = "gem";
     };
+    version = "0.22.1";
   };
-  highline = {
-    version = "1.7.8";
+  trollop = {
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+      sha256 = "074h7lns72kg1dl5gvz5apl3xz1i0axbnbc01pf2kbw4q0lkpnp4";
+      type = "gem";
     };
+    version = "2.9.9";
   };
-  gpgme = {
-    version = "2.0.12";
+  unicode = {
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "0a04a76dw9dias0a8rp6dyk3vx2y024gim40lg2md6zdh2m1kx85";
+      sha256 = "1v8kxmq9i85agjpl7pnl72688901xhs8wxhmj6lpy16a8xz3nzxk";
+      type = "gem";
     };
-    dependencies = ["mini_portile2"];
+    version = "0.4.4.4";
   };
-  chronic = {
-    version = "0.9.1";
+  xapian-ruby = {
+    groups = ["default"];
+    platforms = [];
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk";
+      sha256 = "1xbarnxmhy6r0rxpspn4wk85j183w6b18nah73djcs06b3gfas15";
+      type = "gem";
     };
+    version = "1.2.22";
   };
-}
+}
\ No newline at end of file