Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'Homebrew/master'

  • Loading branch information...
commit 0deda2c1aa7e5911e198e18ec0ca76ca9cd027cc 2 parents 7a3c404 + 6d65e3a
@mistydemeo authored
View
10 Library/Formula/ats2-postiats.rb
@@ -1,14 +1,14 @@
class Ats2Postiats < Formula
desc "ATS programming language implementation"
homepage "http://www.ats-lang.org/"
- url "https://downloads.sourceforge.net/project/ats2-lang/ats2-lang/ats2-postiats-0.2.1/ATS2-Postiats-0.2.1.tgz"
- sha256 "0a0d3a7e762a7a7ae77e5d3e27ccdc43766d19316579bfa2015a9f7977e86f7b"
+ url "https://downloads.sourceforge.net/project/ats2-lang/ats2-lang/ats2-postiats-0.2.2/ATS2-Postiats-0.2.2.tgz"
+ sha256 "3a32aa65928d79cd17328475bd85c24dc83fb7c429826eb857beb73dad446525"
bottle do
cellar :any
- sha256 "be9ab239456434d4208d9a7cd50cb9131771729792b0c327b00b996451eb6c4d" => :yosemite
- sha256 "5d85ec1cac8ba021da8103c5dfdb1bb6eac825475c3a4a7e0a0961ea96df324a" => :mavericks
- sha256 "1cdd861830a35f51c2050621e518d5a7d1e47aca432a58e677cf85b600531959" => :mountain_lion
+ sha256 "a011b5d66c72bcff0e779db8db96570b28baab1898bbd22cbec2df9998ad2caf" => :yosemite
+ sha256 "702f83b5149cad7df30c2cecc75e2e2ec8561f3213a63ecd23d5a95d3d1eee76" => :mavericks
+ sha256 "c94738700929ddec7ce7b100c341e7c53612200462ba7164697f74903eab672c" => :mountain_lion
end
depends_on "gmp"
View
16 Library/Formula/awscli.rb
@@ -1,15 +1,15 @@
class Awscli < Formula
desc "Official Amazon AWS command-line interface"
homepage "https://aws.amazon.com/cli/"
- url "https://pypi.python.org/packages/source/a/awscli/awscli-1.8.0.tar.gz"
- mirror "https://github.com/aws/aws-cli/archive/1.8.0.tar.gz"
- sha256 "9fd888b5771cd9206456169762657f20fa7b8263e348f6016821a9bf1c361432"
+ url "https://pypi.python.org/packages/source/a/awscli/awscli-1.8.1.tar.gz"
+ mirror "https://github.com/aws/aws-cli/archive/1.8.1.tar.gz"
+ sha256 "7f487e7d488787140c09de057b5117e3388a3b2d6ae609fa6e9c35f3201b685c"
bottle do
cellar :any
- sha256 "5ba88399c3105593365908fbc4797740cf74d306905bf73d6e12ec979394ca4d" => :yosemite
- sha256 "3787b3375cd7a56da44936699ddb115e56a0b43e3b928f402d21feb913531271" => :mavericks
- sha256 "af7524a6c3d47d59d7395785cc0da6230196098a7dea7c08a7505909ee5492fb" => :mountain_lion
+ sha256 "6b1dd29674dea329baf232dfe1c8bc8221212e5a124d690510e3ce837a7101ad" => :yosemite
+ sha256 "58d28a94f2d090468ddb2e8558791c938c2b3af910e8b275d509218a9a57b510" => :mavericks
+ sha256 "d7a45514287576bbbd6799d5578b1c39eabac99004181f125be895ee04c570d9" => :mountain_lion
end
head do
@@ -50,8 +50,8 @@ class Awscli < Formula
end
resource "botocore" do
- url "https://pypi.python.org/packages/source/b/botocore/botocore-1.1.11.tar.gz"
- sha256 "f8eb55e49c19b1a5d4fe858bd073b0b0cbc006d1d96459ddd65c5786aff8c76f"
+ url "https://pypi.python.org/packages/source/b/botocore/botocore-1.1.12.tar.gz"
+ sha256 "29bab9a006b45676ec1a559f337415e5a7d8a690d29578d116d5d73d01b9bde5"
end
resource "docutils" do
View
7 Library/Formula/binutils.rb
@@ -13,6 +13,13 @@ class Binutils < Formula
sha256 "689d5c651fba64a18fed5f8f66ba9d156af7f3b8787e383afe8979f535432d64" => :mountain_lion
end
+ # Fixes build on 10.6. Committed upstream; will be in the next release:
+ # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=31593e1b96c792abba3c5268d6423975aefa56b2
+ patch :p1 do
+ url "https://gist.githubusercontent.com/mistydemeo/f14c03c0c9ddfce97cf7/raw/2107e53002c34e41ade9b54629e670184e438d80/binutils_10.6.diff"
+ sha256 "5ff40b9d7ad174d3c24edd8381471b8f5c408703111f0c90135ad0fffba452c2"
+ end
+
def install
system "./configure", "--disable-debug",
"--disable-dependency-tracking",
View
7 Library/Formula/gst-python.rb
@@ -3,12 +3,13 @@ class GstPython < Formula
homepage "http://gstreamer.freedesktop.org/modules/gst-python.html"
url "http://gstreamer.freedesktop.org/src/gst-python/gst-python-1.4.0.tar.xz"
sha256 "b1e40c29ceb41b03f08d38aca6056054f0341d0706276326dceeec6ac8d53d3e"
+ revision 1
bottle do
revision 1
- sha256 "6e21cb7f62dc2d6ef248cd001053e365c8a4e337fd53daad66b9a701ced1e10a" => :yosemite
- sha256 "7360fc4d530557e1984398a521f928e1d0ecdd321a15608161ceede201a85b35" => :mavericks
- sha256 "2683cfdbd77a6537048890a08a907d476f470a6b7178434a6831495e712082de" => :mountain_lion
+ sha256 "23cc5d7ab90a98cb8baf83cff0b8c1f46077ed9171f1aa8b8a28db963f8d6039" => :yosemite
+ sha256 "40fda115c1425f67ec25228f86d902c7cbc4522bc71cc7daedce37f04041a1cf" => :mavericks
+ sha256 "d3b34dcf00708c39721a1696a9bea2ef5fe3144ef1dad200971e063654d372eb" => :mountain_lion
end
depends_on "gst-plugins-base"
View
4 Library/Formula/heroku-toolbelt.rb
@@ -1,8 +1,8 @@
class HerokuToolbelt < Formula
desc "Everything you need to get started with Heroku"
homepage "https://toolbelt.heroku.com/other"
- url "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-3.41.4.tgz"
- sha256 "47f43d7292128234d1412005cc751a45218219e60a1b99081086dc33f682cf5a"
+ url "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-3.41.5.tgz"
+ sha256 "8cc11d8970784d48940af400caa59f02dd464dc63a45216c266795b0fb2d28be"
head "https://github.com/heroku/heroku.git"
depends_on :ruby => "1.9"
View
10 Library/Formula/protobuf-swift.rb
@@ -1,14 +1,14 @@
class ProtobufSwift < Formula
desc "Implementation of Protocol Buffers in Swift."
homepage "https://github.com/alexeyxo/protobuf-swift"
- url "https://github.com/alexeyxo/protobuf-swift/archive/2.0.tar.gz"
- sha256 "88e45f8850923cf33cba82ef1bf15dda345b65ad803a1f273efcd1b7f24f8041"
+ url "https://github.com/alexeyxo/protobuf-swift/archive/2.1.tar.gz"
+ sha256 "7022720fc89cfe3d988728d62e9af2869ac072f6a2be6acc3fc6cbaa939aa220"
bottle do
cellar :any
- sha256 "b6123b83e9e49726eaf29f609904abb6d01817b376ae83a90260288ad0b0e46c" => :yosemite
- sha256 "49b3db87574cd95f11a092b775dca548f2692733e5401a9e5ad4b605122516e7" => :mavericks
- sha256 "b2fe475c59d1fa12b6af9f204bbe2b968a9972978c4a4d99f9330219b30a6516" => :mountain_lion
+ sha256 "8cefd0f809cdda107ec00af094496f09a8b7ce9347b1cad1ab4cb831d8184ba4" => :yosemite
+ sha256 "4d81ccde740ccfe82a13b2ca0b63d24593745f234cd93d03cf891c53dd786d86" => :mavericks
+ sha256 "406475d55ad5eb0177c525446ef8ed1d4924613a5a8b5d2ebf158949cbac7c23" => :mountain_lion
end
depends_on "autoconf" => :build
View
10 Library/Formula/pyenv.rb
@@ -2,13 +2,13 @@ class Pyenv < Formula
desc "Python version management"
homepage "https://github.com/yyuu/pyenv"
head "https://github.com/yyuu/pyenv.git"
- url "https://github.com/yyuu/pyenv/archive/v20150719.tar.gz"
- sha256 "9efb0f615f024d9bb1d7b29e7ce74932613c6ddedc5c78d4b19853a685af23ac"
+ url "https://github.com/yyuu/pyenv/archive/v20150901.tar.gz"
+ sha256 "8dccb8ec89b47c6389e2bf56a1067a67cc5edd5a445effb95bfc69c43499b0ee"
bottle do
- sha256 "4329cb2fe1704fcdfbcd29aecc7f9c29f0e847ace828fc998987e8ab8a209ce2" => :yosemite
- sha256 "503fe24120aeac8b99be1e3c130e3523b9273e8e6045b3fad0d0c031c3fd13e8" => :mavericks
- sha256 "4391ec605642bd2f9433c749c1aecaf1d4c4c5124ebac4097d2aa2fe6480cc57" => :mountain_lion
+ sha256 "ef92abd0b319d35dccdf4bd4b244c968f9eec395ca82269c9dd3af4f780acbc2" => :yosemite
+ sha256 "3c3071db234a46e0fd035d27921fb63fd8af7d3e555c0b3c9a3db0e7414e34ca" => :mavericks
+ sha256 "c0897c017c2c7323b972df3d43a6ee0df4e468a4765d2dd56f58892d5233157d" => :mountain_lion
end
depends_on "autoconf" => [:recommended, :run]
View
11 Library/Formula/pypy.rb
@@ -1,15 +1,14 @@
class Pypy < Formula
desc "Implementation of Python 2 in Python"
homepage "http://pypy.org/"
- url "https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.0-src.tar.bz2"
- sha256 "9bf353f22d25e97a85a6d3766619966055edea1ea1b2218445d683a8ad0399d9"
- revision 1
+ url "https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.1-src.tar.bz2"
+ sha256 "7fddd414c9348c2f899f79ad86adc3fc2b19443855b5243f58487e1f0ac46560"
bottle do
cellar :any
- sha256 "b87916e1eb1ec3d66107930769b41a51c0b932aaada8fbbe130a76facc8a44be" => :yosemite
- sha256 "6b0c8b9b084a62760669dab572651c231efeb730f85547efeb930854706ef589" => :mavericks
- sha256 "6e271c461ac4a654a9aaaf258323e3c07b6fbe7372e82cc4686e33112bb73f68" => :mountain_lion
+ sha256 "8831be56c20ce1982359509dfc5059e0caefdd313dda5350eb13d2ea5237a973" => :yosemite
+ sha256 "6ba539560bad5331eff9172b858876e04cc2793f236e865495952aa48f921bf0" => :mavericks
+ sha256 "010f42ebb6352570c5b0268490d3cd931d0cb2f559cf59d53b7e29c29212f927" => :mountain_lion
end
depends_on :arch => :x86_64
View
6 Library/Homebrew/requirement.rb
@@ -55,12 +55,6 @@ def satisfied?
!!result
end
- # Can overridden to optionally prevent a formula with this requirement from
- # pouring a bottle.
- def pour_bottle?
- true
- end
-
# Overriding #fatal? is deprecated.
# Pass a boolean to the fatal DSL method instead.
def fatal?
View
12 Library/Homebrew/requirements/python_requirement.rb
@@ -14,10 +14,6 @@ class PythonRequirement < Requirement
version == Version.new("2.7")
end
- def pour_bottle?
- build? || system_python?
- end
-
env do
short_version = python_short_version
@@ -28,9 +24,7 @@ def pour_bottle?
ENV.prepend_path "PATH", Formula["python"].opt_bin
end
- if python_binary == "python"
- ENV["PYTHONPATH"] = "#{HOMEBREW_PREFIX}/lib/python#{short_version}/site-packages"
- end
+ ENV["PYTHONPATH"] = "#{HOMEBREW_PREFIX}/lib/python#{short_version}/site-packages"
end
def python_short_version
@@ -66,6 +60,10 @@ class Python3Requirement < PythonRequirement
satisfy(:build_env => false) { which_python }
+ env do
+ ENV["PYTHONPATH"] = "#{HOMEBREW_PREFIX}/lib/python#{python_short_version}/site-packages"
+ end
+
def python_binary
"python3"
end
Please sign in to comment.
Something went wrong with that request. Please try again.