Merge pull request #76510 from alyssais/mikutter

mikutter: 3.8.7 -> 4.0.0
NixOS · Dec 27, 2019 · b38c283 · b38c283
2 parents 60659a5 + f04b8f5
commit b38c283
Show file tree

Hide file tree

Showing 8 changed files with 159 additions and 243 deletions.
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile
@@ -7,34 +7,30 @@ def source(url)
 
 source 'https://rubygems.org'
 
-ruby '>= 2.3.0'
+ruby '>= 2.5.0'
 
 group :default do
-  gem 'oauth', '>= 0.5.1'
-  gem 'json_pure', '~> 1.8'
-  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', '>= 2.0', '< 3.0'
-  gem 'twitter-text', '>= 2.1.0'
+  gem 'addressable','>= 2.7.0', '< 2.8'
+  gem 'delayer','>= 1.0.1', '< 1.1'
+  gem 'delayer-deferred','>= 2.1.1', '< 2.2'
+  gem 'diva','>= 1.0.1', '< 1.1'
+  gem 'memoist','>= 0.16.2', '< 0.17'
+  gem 'oauth','>= 0.5.4'
+  gem 'pluggaloid','>= 1.2.0', '< 1.3'
+  gem 'typed-array','>= 0.1.2', '< 0.2'
 end
 
 group :test do
-  gem 'test-unit', '~> 3.0'
-  gem 'rake', '~> 10.1'
-  gem 'watch', '~> 0.1'
-  gem 'mocha', '~> 0.14'
-  gem 'webmock', '~> 1.17'
-  gem 'ruby-prof'
+  gem 'test-unit','>= 3.3.4', '< 4.0'
+  gem 'rake','>= 13.0.1'
+  gem 'mocha','>= 1.11.1'
+  gem 'webmock','>= 3.7.6'
+  gem 'ruby-prof','>= 1.1.0'
 end
 
 
 group :plugin do
-  Dir.glob(File.expand_path(File.join(__dir__, 'core/plugin/*/Gemfile'))){ |path|
+  Dir.glob(File.expand_path(File.join(__dir__, 'plugin/*/Gemfile'))){ |path|
     eval File.open(path).read
   }
   Dir.glob(File.join(File.expand_path(ENV['MIKUTTER_CONFROOT'] || '~/.mikutter'), 'plugin/*/Gemfile')){ |path|

diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
@@ -1,117 +1,103 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    atk (3.3.2)
-      glib2 (= 3.3.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    atk (3.4.1)
+      glib2 (= 3.4.1)
     cairo (1.16.4)
       native-package-installer (>= 1.0.3)
       pkg-config (>= 1.2.2)
-    cairo-gobject (3.3.2)
+    cairo-gobject (3.4.1)
       cairo (>= 1.16.2)
-      glib2 (= 3.3.2)
+      glib2 (= 3.4.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    delayer (0.0.2)
-    delayer-deferred (2.0.0)
-      delayer (>= 0.0.2, < 0.1)
-    diva (0.3.2)
-      addressable (>= 2.5, < 2.6)
-    gdk_pixbuf2 (3.3.2)
-      gio2 (= 3.3.2)
+    delayer (1.0.1)
+    delayer-deferred (2.1.1)
+      delayer (>= 1.0, < 2.0)
+    diva (1.0.1)
+      addressable (>= 2.5.2, < 2.8)
+    gdk_pixbuf2 (3.4.1)
+      gio2 (= 3.4.1)
     gettext (3.2.9)
       locale (>= 2.0.5)
       text (>= 1.3.0)
-    gio2 (3.3.2)
-      gobject-introspection (= 3.3.2)
-    glib2 (3.3.2)
+    gio2 (3.4.1)
+      gobject-introspection (= 3.4.1)
+    glib2 (3.4.1)
       native-package-installer (>= 1.0.3)
-      pkg-config (>= 1.2.2)
-    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)
+      pkg-config (>= 1.3.5)
+    gobject-introspection (3.4.1)
+      glib2 (= 3.4.1)
+    gtk2 (3.4.1)
+      atk (= 3.4.1)
+      gdk_pixbuf2 (= 3.4.1)
+      pango (= 3.4.1)
+    hashdiff (1.0.0)
     httpclient (2.8.3)
-    idn-ruby (0.1.0)
     instance_storage (1.0.0)
-    irb (1.0.0)
-    json_pure (1.8.6)
+    io-console (0.5.3)
+    irb (1.2.1)
+      reline (>= 0.0.1)
     locale (2.1.2)
-    memoist (0.16.0)
-    metaclass (0.0.4)
+    memoist (0.16.2)
     mini_portile2 (2.4.0)
-    mocha (0.14.0)
-      metaclass (~> 0.0.1)
-    moneta (1.1.1)
-    native-package-installer (1.0.7)
-    nokogiri (1.10.3)
+    mocha (1.11.1)
+    moneta (1.2.1)
+    native-package-installer (1.0.9)
+    nokogiri (1.10.7)
       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
+    pango (3.4.1)
+      cairo-gobject (= 3.4.1)
+      gobject-introspection (= 3.4.1)
+    pkg-config (1.4.0)
+    pluggaloid (1.2.0)
+      delayer (>= 1.0.0, < 2.0)
       instance_storage (>= 1.0.0, < 2.0.0)
-    power_assert (1.1.4)
-    public_suffix (3.0.3)
-    rake (10.5.0)
-    ruby-hmac (0.4.0)
-    ruby-prof (0.17.0)
+    power_assert (1.1.5)
+    public_suffix (4.0.1)
+    rake (13.0.1)
+    reline (0.1.2)
+      io-console (~> 0.5)
+    ruby-prof (1.1.0)
     safe_yaml (1.0.5)
-    test-unit (3.3.2)
+    test-unit (3.3.4)
       power_assert
     text (1.3.1)
-    totoridipjp (0.1.0)
-    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.6)
-    watch (0.1.0)
-    webmock (1.24.6)
+    webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable (>= 2.5.2, < 2.6)
-  delayer (~> 0.0)
-  delayer-deferred (>= 2.0, < 3.0)
-  diva (>= 0.3.2, < 2.0)
+  addressable (>= 2.7.0, < 2.8)
+  delayer (>= 1.0.1, < 1.1)
+  delayer-deferred (>= 2.1.1, < 2.2)
+  diva (>= 1.0.1, < 1.1)
   gettext (>= 3.2.9, < 3.3)
-  gtk2 (= 3.3.2)
+  gtk2 (= 3.4.1)
   httpclient
-  irb (>= 1.0.0, < 1.1)
-  json_pure (~> 1.8)
-  memoist (>= 0.16, < 0.17)
-  mocha (~> 0.14)
+  irb (>= 1.2.0, < 1.3)
+  memoist (>= 0.16.2, < 0.17)
+  mocha (>= 1.11.1)
   moneta
   nokogiri
-  oauth (>= 0.5.1)
-  pluggaloid (>= 1.1.1, < 2.0)
-  rake (~> 10.1)
-  ruby-hmac (~> 0.4)
-  ruby-prof
-  test-unit (~> 3.0)
-  totoridipjp
-  twitter-text (>= 2.1.0)
-  typed-array (~> 0.1)
-  watch (~> 0.1)
-  webmock (~> 1.17)
+  oauth (>= 0.5.4)
+  pluggaloid (>= 1.2.0, < 1.3)
+  rake (>= 13.0.1)
+  ruby-prof (>= 1.1.0)
+  test-unit (>= 3.3.4, < 4.0)
+  typed-array (>= 0.1.2, < 0.2)
+  webmock (>= 3.7.6)
 
 RUBY VERSION
-   ruby 2.5.5p157
+   ruby 2.7.0p0
 
 BUNDLED WITH
-   1.17.2
+   2.1.2
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@@ -7,23 +7,24 @@
 # 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
+# wget http://mikutter.hachune.net/bin/mikutter.4.0.0.tar.gz
+# mkdir mikutter
 # cd mikutter
+# tar xvf ../mikutter.4.0.0.tar.gz
 # 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 mikutter.4.0.0.tar.gz
 # rm gemset.nix Gemfile.lock; nix-shell -p bundler bundix --run 'bundle lock && bundix'
 
 stdenv.mkDerivation rec {
   pname = "mikutter";
-  version = "3.8.7";
+  version = "4.0.0";
 
   src = fetchurl {
     url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz";
-    sha256 = "1griypcd1xgyfd9wc3ls32grpw4ig0xxdiygpdinzr3bigfmd7iv";
+    sha256 = "0nx14vlp7p69m2vw0s6kbiyymsfq0r2jd4nm0v5c4xb9avkpgc8g";
   };
 
   env = bundlerEnv {
@@ -36,8 +37,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ alsaUtils libnotify which gtk2 ruby atk gobject-introspection ];
   nativeBuildInputs = [ wrapGAppsHook ];
 
-  postUnpack = ''
-    rm -rf $sourceRoot/vendor
+  unpackPhase = ''
+    mkdir source
+    cd source
+    unpackFile $src
+    rm -rf vendor
   '';
 
   installPhase = ''
@@ -73,5 +77,6 @@ stdenv.mkDerivation rec {
     homepage = https://mikutter.hachune.net;
     platforms = ruby.meta.platforms;
     license = licenses.mit;
+    broken = true;
   };
 }