Resolve merge conflict with graphviz and ngrok

packages/graphviz.rb

@@ -3,22 +3,14 @@ require 'package'
 class Graphviz < Package
   description 'Graphviz is open source graph visualization software.'
   homepage 'https://www.graphviz.org/'
-  version '2.42.2'
+  version '2.44.0'
   compatibility 'all'
-  source_url 'https://gitlab.com/graphviz/graphviz/-/archive/2.42.2/graphviz-2.42.2.tar.bz2'
-  source_sha256 '1daed697d9cdd7fac3b320336fa98dd3518dd211769301dc716869fc3d5409b1'
+  source_url 'https://gitlab.com/graphviz/graphviz/-/archive/2.44.0/graphviz-2.44.0.tar.bz2'
+  source_sha256 'eaff61ce05bf8196c596097bab6310fa6e7e96ee908a199a4bc83fbd5e7082d6'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/graphviz-2.42.2-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/graphviz-2.42.2-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/graphviz-2.42.2-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/graphviz-2.42.2-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: '7950f9bf30b726d47e2a43b7617cd2cc01039a53faba377b5c8aa706e1b61a2f',
-     armv7l: '7950f9bf30b726d47e2a43b7617cd2cc01039a53faba377b5c8aa706e1b61a2f',
-       i686: 'dc786a500b658446e90f90e7e6b8aeb5165840f09964f12899cef19c8413a633',
-     x86_64: 'b34bab2d96832ca42aaeeddad01637f4f0bab8705f7d49ef9a2488a7164d8451',
   })
 
   depends_on 'automake' => :build
@@ -28,10 +20,11 @@ class Graphviz < Package
   depends_on 'libxrender'
   depends_on 'poppler'
   depends_on 'tcl'
+  depends_on 'expat'
 
   def self.build
     system "./autogen.sh"
-    system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX} LDFLAGS='-L#{CREW_LIB_PREFIX}' --with-libgd=yes --with-gdincludedir=#{CREW_PREFIX}/include --with-gdlibdir=#{CREW_LIB_PREFIX} --enable-tcl=no --enable-lua=no --enable-perl=no --enable-io=no"
+    system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX} LDFLAGS='-L#{CREW_LIB_PREFIX}' --with-libgd=yes --with-gdincludedir=#{CREW_PREFIX}/include --with-gdlibdir=#{CREW_LIB_PREFIX} --enable-tcl=no --enable-lua=no --enable-perl=no --enable-io=no --with-libexpat=yes"
     system "make"
   end
 

packages/ngrok.rb

@@ -3,21 +3,18 @@ require 'package'
 class Ngrok < Package
   description 'ngrok exposes local servers behind NATs and firewalls to the public internet over secure tunnels.'
   homepage 'https://ngrok.com/'
-  version '2.3.15'
+  version '2.3.35'
   compatibility 'all'
   case ARCH
-  when 'aarch64'
-    source_url 'https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-arm.zip'
-    source_sha256 'd7c1beab61690cf83be3fc4e26880806e3c2ebbe6357182457f4cad22ae033de'
-  when 'armv7l'
-    source_url 'https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-arm.zip'
-    source_sha256 'd7c1beab61690cf83be3fc4e26880806e3c2ebbe6357182457f4cad22ae033de'
+  when 'aarch64', 'armv7l'
+    source_url 'https://bin.equinox.io/a/dFJfzZziYxC/ngrok-2.3.35-linux-arm.tar.gz'
+    source_sha256 '2721e6d74f7d26f061c96df3b5676f32cf4b94a5b43d44d9a535f777dc0b863e'
   when 'i686'
-    source_url 'https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-386.zip'
-    source_sha256 'e8b8b033b4aec785e0ba1e5ce5893982fc9740aeb2006b1f9c2d2a906f5884f9'
+    source_url 'https://bin.equinox.io/a/3BwMsheYHot/ngrok-2.3.35-linux-386.tar.gz'
+    source_sha256 '12c79750c1d5d78c9924d56e448ae5ceb78fe06bfc3d724ed9028b02b0cda56b'
   when 'x86_64'
-    source_url 'https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip'
-    source_sha256 '45d8a9e10abff1c77210acc0c123cdea3b7fbce7cfc1a06138c6392379775b17'
+    source_url 'https://bin.equinox.io/a/jAq5uX8wfS8/ngrok-2.3.35-linux-amd64.tar.gz'
+    source_sha256 '55df9c479b41a3b9b488458b5fb758df63001d14196a4126e3f669542c8727e9'
   end
 
   binary_url ({