Skip to content

Commit

Permalink
Merge branch homebrew/master into linuxbrew/master
Browse files Browse the repository at this point in the history
Conflicts:
      Formula/pango.rb
      Formula/python3.rb
      Formula/stunnel.rb
  • Loading branch information
jonchang committed Jul 27, 2017
2 parents 3fe24de + 524d057 commit 92904ef
Show file tree
Hide file tree
Showing 10 changed files with 75 additions and 41 deletions.
39 changes: 39 additions & 0 deletions Formula/apache-ctakes.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
class ApacheCtakes < Formula
desc "NLP system for extraction of information from EMR clinical text"
homepage "https://ctakes.apache.org"
url "https://apache.osuosl.org/ctakes/ctakes-4.0.0/apache-ctakes-4.0.0-bin.tar.gz"
sha256 "37ca2b8dfe06465469ed1830fbb84dfc7bcc4295e5387d66e90a76ad2a5cdeaf"

bottle :unneeded

option "with-ctakes-resources", "Install prebuilt dictionaries and models"

depends_on :java => "1.8+"

resource "ctakes-resources" do
url "https://downloads.sourceforge.net/project/ctakesresources/ctakes-resources-4.0-bin.zip"
sha256 "c72b5f64e1572c207c139f1dfbe6fa8b5e3708bc66e1f5d6f4c8863055121351"
end

def install
rm_f Dir["bin/*.bat", "bin/*.cmd", "bin/ctakes.profile", "bin/ctakes-ytex",
"libexec/*.bat", "libexec/*.cmd"]
libexec.install %w[bin config desc lib resources]
pkgshare.install_symlink libexec/"resources/org/apache/ctakes/examples"

if build.with? "ctakes-resources"
resource("ctakes-resources").stage do
system "ditto", "resources", libexec/"resources"
end
end

bin.write_exec_script Dir["#{libexec}/bin/*"]
end

test do
piper = pkgshare/"examples/pipeline/HelloWorld.piper"
note = pkgshare/"examples/notes/dr_nutritious_1.txt"
output = shell_output("#{bin}/runPiperFile.sh -p #{piper} -i #{note}")
assert_match "mayo-pos.zip", output
end
end
4 changes: 2 additions & 2 deletions Formula/apache-geode.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class ApacheGeode < Formula
desc "In-memory Data Grid for fast transactional data processing"
homepage "https://geode.apache.org/"
url "https://www.apache.org/dyn/closer.cgi?path=geode/1.1.1/apache-geode-1.1.1.tar.gz"
sha256 "f540ba8d2b9dc80069e18314651deb890498af87d17dc5dbcd6ae47bf487b185"
url "https://www.apache.org/dyn/closer.cgi?path=geode/1.2.0/apache-geode-1.2.0.tar.gz"
sha256 "9cb67d62d60d015463a8b1055921a033f91d2a142d63b2c52444dfc79926f09f"

bottle :unneeded

Expand Down
6 changes: 3 additions & 3 deletions Formula/exploitdb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ class Exploitdb < Formula
desc "The official Exploit Database"
homepage "https://www.exploit-db.com/"
url "https://github.com/offensive-security/exploit-database.git",
:tag => "2017-07-10",
:revision => "22bf5da09877e854bfd4a25f1f70c325cf54f565"
version "2017-07-10"
:tag => "2017-07-17",
:revision => "635e0e935f19227daeda31d675a03baa2314ccf0"
version "2017-07-17"
head "https://github.com/offensive-security/exploit-database.git"

bottle :unneeded
Expand Down
12 changes: 6 additions & 6 deletions Formula/knot.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
class Knot < Formula
desc "High-performance authoritative-only DNS server"
homepage "https://www.knot-dns.cz/"
url "https://secure.nic.cz/files/knot-dns/knot-2.5.2.tar.xz"
sha256 "286671a4ee35a5207b2e45fd0812962b481b1b543bf3d5df3a8c319c26e2f5e9"
url "https://secure.nic.cz/files/knot-dns/knot-2.5.3.tar.xz"
sha256 "d78ae231a68ace264f5738c8e57481923bcad7413f3f440c06fa6cc0aded9d8e"

bottle do
sha256 "4f06e27a71ae3c5fe02d3096fdc5d7f70ab07323f25b82e46d0fbb0e5d9e1771" => :sierra
sha256 "f20936f3a3626817d752b831fe18746208f7d43507f716cb00a7f0813e790323" => :el_capitan
sha256 "4141dd77281e90b97cad16c6cbf714c8822e9b161dd050de4f0e4f74f87793fd" => :yosemite
sha256 "7b83bcfd808621b1c0b6352d488c16c9108520174e8e3d32db0b228b3de69eb7" => :sierra
sha256 "9e22d87d26a20707bad5a32d368bf0416e3f564adfb239ea914fa5a4aeab0615" => :el_capitan
sha256 "2a04cadab84f8510ae0bbe96cd0fe2f68fe8658ecadb7d6e868b5d12d2235823" => :yosemite
end

head do
url "https://gitlab.labs.nic.cz/labs/knot.git"
url "https://gitlab.labs.nic.cz/knot/knot-dns.git"

depends_on "automake" => :build
depends_on "autoconf" => :build
Expand Down
10 changes: 5 additions & 5 deletions Formula/packer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ class Packer < Formula
desc "Tool for creating identical machine images for multiple platforms"
homepage "https://packer.io"
url "https://github.com/hashicorp/packer.git",
:tag => "v1.0.2",
:revision => "6a8ae4b258d1bb0beece05c9fc3bbc1c186a0480"
:tag => "v1.0.3",
:revision => "c0ddb4a044551f3c967ca36f612a33ce13e215f0"
head "https://github.com/hashicorp/packer.git"

bottle do
cellar :any_skip_relocation
sha256 "e4e84d568430431cfdea8fdfe3dd32ed51981adeae28d0c1cfe7cdd2fecf602b" => :sierra
sha256 "a8e69592f02ae3382c89aac16a08b0a26b289b1e8feb6abfad0b595fabf34be8" => :el_capitan
sha256 "2077bf72a756742e58a801337c10c41fc9d2d746393ce0acc523c51db8ad9fa6" => :yosemite
sha256 "6b7dd6df7d2020553dba03db75f6c86395fa9fe602b92225447a8f0a3edc54d9" => :sierra
sha256 "af1f5afce107799415e68f4f0ab45201bb3527e9b14bc1cec14df3708679cc76" => :el_capitan
sha256 "71c62e8d113432c28072b106ed29db91d2510c35a5dd240c702565f54d53393d" => :yosemite
end

depends_on "go" => :build
Expand Down
11 changes: 5 additions & 6 deletions Formula/pango.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
class Pango < Formula
desc "Framework for layout and rendering of i18n text"
homepage "http://www.pango.org/"
url "https://download.gnome.org/sources/pango/1.40/pango-1.40.6.tar.xz"
sha256 "ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573"
url "https://download.gnome.org/sources/pango/1.40/pango-1.40.7.tar.xz"
sha256 "517645c00c4554e82c0631e836659504d3fd3699c564c633fccfdfd37574e278"

bottle do
sha256 "9a3b7c067180b377e5caac5debdb477feda07db598602d34c9e037b6c4701402" => :sierra
sha256 "fda967c19a3c80effebe70dd1389ce443d662ef572ec84485c64060d60c2474c" => :el_capitan
sha256 "9be657bfbfb322e057022b10255fffbe3f18994e20a49de3a43ec55921fd1dd8" => :yosemite
sha256 "3fe31dd9e2ea20a659129a8ac81f6e515d6da54ef13a2e3fa3a2eccb339d4432" => :x86_64_linux
sha256 "56ed4949c060bc9f276fc23175a97e5ba34cb603118d92c7ef4c6b3876d6f188" => :sierra
sha256 "67bdaa908ae261446c384e9c80fdad3a861020219e328fcea77c2f5d4dfd5f98" => :el_capitan
sha256 "b310a0d7ea96190e911b772b1d80665ceed29bea3fe673d123beb078a2d57f7c" => :yosemite
end

head do
Expand Down
12 changes: 5 additions & 7 deletions Formula/python3.rb
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
class Python3 < Formula
desc "Interpreted, interactive, object-oriented programming language"
homepage "https://www.python.org/"
url "https://www.python.org/ftp/python/3.6.1/Python-3.6.1.tar.xz"
sha256 "a01810ddfcec216bcdb357a84bfaafdfaa0ca42bbdaa4cb7ff74f5a9961e4041"
url "https://www.python.org/ftp/python/3.6.2/Python-3.6.2.tar.xz"
sha256 "9229773be41ed144370f47f0f626a1579931f5a390f1e8e3853174d52edd64a9"
head "https://github.com/python/cpython", :using => :git

bottle do
rebuild 1
sha256 "77fddf274eed11c29f7d9dc0b7b1183860fa70ffff00bcf046150a0f65cd675c" => :sierra
sha256 "e9060ef5d5e291e55533e2b8e7ce742906e53c2eb1302ed54036301016eefe19" => :el_capitan
sha256 "16753928434530a84ec309c0a083ba3da9535b8e7750fd5b2440e77c71c8f7b0" => :yosemite
sha256 "f54c23cb86de180704267da39f784825dcb11e6338e50122c5002d150b54e65c" => :x86_64_linux
sha256 "a0cde735f5c8e959d09ef9077dc18be2f84db8ec0bdccf99828d991c0f24688f" => :sierra
sha256 "59f5676f3263d26f0d2b73988a60ce30d188d66b8fe7fe141f08b315c3939efd" => :el_capitan
sha256 "3bf948638b7b0de06d7ce0d03ef035cd558929b330e8513e6ecee70390b06cc1" => :yosemite
end

devel do
Expand Down
5 changes: 2 additions & 3 deletions Formula/sbt.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ class Sbt < Formula
sha256 "b6e073d7c201741dcca92cfdd1dd3cd76c42a47dc9d8c8ead8df7117deed7aef"

devel do
url "https://github.com/sbt/sbt/releases/download/v1.0.0-M6/sbt-1.0.0-M6.tgz"
sha256 "3af45cfa3a857331d5dce667e575f2f623d51d088ef4b129de638e6d1493b31a"
version "1.0.0-M6"
url "https://github.com/sbt/sbt/releases/download/v1.0.0-RC2/sbt-1.0.0-RC2.tgz"
sha256 "4e446c49a473d9ae5001e6ec847c06b76e3d27f34d680ae7bd258709547630d7"
end

bottle :unneeded
Expand Down
13 changes: 6 additions & 7 deletions Formula/stunnel.rb
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
class Stunnel < Formula
desc "SSL tunneling program"
homepage "https://www.stunnel.org/"
url "https://www.stunnel.org/downloads/stunnel-5.41.tar.gz"
mirror "https://www.usenix.org.uk/mirrors/stunnel/stunnel-5.41.tar.gz"
sha256 "f05c6321ee1f6ddebacc234ccf20825971941e831b5beea6d0ce0b8e1668148f"
url "https://www.stunnel.org/downloads/stunnel-5.42.tar.gz"
mirror "https://www.usenix.org.uk/mirrors/stunnel/stunnel-5.42.tar.gz"
sha256 "1b6a7aea5ca223990bc8bd621fb0846baa4278e1b3e00ff6eee279cb8e540fab"

bottle do
sha256 "6c40cc75d38798febde053d609a5829a32098e35bc597a354d9250823c9c6195" => :sierra
sha256 "1184496138c87b15e3aee13b1499a531e6bdf85b5c28ab9312de4468d8c4da7e" => :el_capitan
sha256 "e71dae8c515ca851e64e60418d54bc12791bddbd1eee4126b9e960ec89fafcd9" => :yosemite
sha256 "e271f52fff26fcb78c921b9bac465444719cba1abd7ea113144bf807e436c7e6" => :x86_64_linux
sha256 "1565e603f9b0e7b9c83bf4dd59a125e2c128c54c0cc89b6f0cf8ea92c350ec4d" => :sierra
sha256 "0892b6e696bcd9716f71f5548d2525bdd727697479b753e98f281176f4a63c67" => :el_capitan
sha256 "2311128cf8eefd1dba064ed592c9e06e1d65502a69ad04b40e6897827b71c3ff" => :yosemite
end

# Please revision me whenever OpenSSL is updated
Expand Down
4 changes: 2 additions & 2 deletions Formula/tfenv.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class Tfenv < Formula
desc "Terraform version manager inspired by rbenv"
homepage "https://github.com/kamatama41/tfenv"
url "https://github.com/kamatama41/tfenv/archive/v0.4.4.tar.gz"
sha256 "decbd1e871d3da5e7b1299ab3d36852dbb94e3932bc3b5fad047c0488e4eac1b"
url "https://github.com/kamatama41/tfenv/archive/v0.5.0.tar.gz"
sha256 "04c0188b293f61a5e4722d3b288025078f1c3a68ced5e7cea430f7122e5eabed"
head "https://github.com/kamatama41/tfenv.git"

bottle :unneeded
Expand Down

0 comments on commit 92904ef

Please sign in to comment.