diff --git a/Library/Homebrew/blacklist.rb b/Library/Homebrew/blacklist.rb index 65a6dc136b6bf..e9e67cb7520f7 100644 --- a/Library/Homebrew/blacklist.rb +++ b/Library/Homebrew/blacklist.rb @@ -5,13 +5,12 @@ def blacklisted?(name) EOS when "tex", "tex-live", "texlive", "latex" then <<-EOS.undent Installing TeX from source is weird and gross, requires a lot of patches, - and only builds 32-bit (and thus can't use Homebrew deps on Snow Leopard.) + and only builds 32-bit (and thus can't use Homebrew dependencies) We recommend using a MacTeX distribution: https://www.tug.org/mactex/ - You can install it using Cask: - - brew cask install mactex + You can install it with Homebrew Cask: + brew cask install mactex EOS when "pip" then <<-EOS.undent Homebrew provides pip via: `brew install python`. However you will then @@ -84,9 +83,7 @@ def blacklisted?(name) and cabal-install instead: brew install ghc cabal-install - A binary installer is available: - https://www.haskell.org/platform/mac.html - Or via the cask: + You can install with Homebrew Cask: brew cask install haskell-platform EOS when "mysqldump-secure" then <<-EOS.undent @@ -95,11 +92,7 @@ def blacklisted?(name) when "ngrok" then <<-EOS.undent Upstream sunsetted 1.x in March 2016 and 2.x is not open-source. - If you wish to use the 2.x release you can install it - either via Homebrew: - brew install homebrew/binary/ngrok2 - - Or via the Cask: + If you wish to use the 2.x release you can install with Homebrew Cask: brew cask install ngrok EOS end diff --git a/Library/Homebrew/official_taps.rb b/Library/Homebrew/official_taps.rb index aedb0809e207b..55e726102ee6d 100644 --- a/Library/Homebrew/official_taps.rb +++ b/Library/Homebrew/official_taps.rb @@ -1,6 +1,5 @@ OFFICIAL_TAPS = %w[ apache - binary completions devel-only dupes diff --git a/share/doc/homebrew/Acceptable-Formulae.md b/share/doc/homebrew/Acceptable-Formulae.md index 81178747eaecf..e8ee2f0d61607 100644 --- a/share/doc/homebrew/Acceptable-Formulae.md +++ b/share/doc/homebrew/Acceptable-Formulae.md @@ -57,9 +57,10 @@ point it to the downloaded archive in order to avoid loading. ### We don’t like binary formulae Our policy is that formulae in the core repository -([homebrew/core](https://github.com/Homebrew/homebrew-core)) must be built -from source (or produce cross-platform binaries like e.g. Java). Binary-only -formulae should go to [homebrew/binary](https://github.com/Homebrew/homebrew-binary) or [homebrew-cask](https://github.com/caskroom/homebrew-cask). +([homebrew/core](https://github.com/Homebrew/homebrew-core)) must be open-source +and either built from source or produce cross-platform binaries like e.g. Java). +Binary-only formulae should go to +[Homebrew Cask](https://github.com/caskroom/homebrew-cask). ### Stable versions Formulae in the core repository must have a stable version tagged by @@ -102,14 +103,11 @@ include things that don't meet these criteria or reject things that do. Please trust that we need to use our discretion based on our experience running a package manager. -### Stuff that builds a .app +### Stuff that builds an .app Don’t make your formula build an `.app` (native OS X Application); we -don’t want those things in Homebrew. Make it build a command line tool -or a library. However, we have a few exceptions to that, e.g. when the -App is just additional to CLI or if the GUI-application is non-native -for OS X and/or hard to get in binary elsewhere (example: fontforge). -Check out the [homebrew-cask](https://github.com/caskroom/homebrew-cask) -project if you’d like to brew native OS X Applications. +don’t want those things in Homebrew (but +[Homebrew Cask](https://github.com/caskroom/homebrew-cask) does). +Make it build a command-line tool or a library. ### Sometimes there are exceptions Even if all criteria are met we may not accept the formula. diff --git a/share/doc/homebrew/Interesting-Taps-&-Branches.md b/share/doc/homebrew/Interesting-Taps-&-Branches.md index a09797fa7c237..6c0776aabfd0f 100644 --- a/share/doc/homebrew/Interesting-Taps-&-Branches.md +++ b/share/doc/homebrew/Interesting-Taps-&-Branches.md @@ -6,9 +6,7 @@ Homebrew has the capability to add (and remove) multiple taps to your local inst * [homebrew/apache](https://github.com/Homebrew/homebrew-apache): A tap for Apache modules, extending OS X's built-in Apache. These brews may require unconventional additional setup, as explained in the caveats. -* [homebrew/binary](https://github.com/Homebrew/homebrew-binary): Precompiled binary formulae. - -* [homebrew/boneyard](https://github.com/Homebrew/homebrew-boneyard): Formula are not deleted, they are moved here. +* [homebrew/boneyard](https://github.com/Homebrew/homebrew-boneyard): Formulae from other official taps, primarily (homebrew/core) are not deleted, they are moved here. * [homebrew/bundle](https://github.com/Homebrew/homebrew-bundle): Bundler for non-Ruby dependencies from Homebrew. @@ -32,6 +30,8 @@ Homebrew has the capability to add (and remove) multiple taps to your local inst * [homebrew/science](https://github.com/Homebrew/homebrew-science): A collection of scientific libraries and tools. +* [homebrew/services](https://github.com/Homebrew/homebrew-services): A tool to start Homebrew formulae's plists with `launchctl`. + * [homebrew/versions](https://github.com/Homebrew/homebrew-versions): Need e.g. older or newer versions of Postgresql? Older versions of GCC? * [homebrew/x11](https://github.com/Homebrew/homebrew-x11): Formulae with hard X11 dependencies. @@ -56,9 +56,7 @@ You can be added as a maintainer for one of the Homebrew organization taps and a * [mistydemeo/tigerbrew](https://github.com/mistydemeo/tigerbrew): Experimental Tiger PowerPC version -* [homebrew/linuxbrew](https://github.com/Homebrew/linuxbrew): Experimental Linux version - -* [nddrylliog/homebrew-mingw](https://github.com/nddrylliog/homebrew-mingw): An experimental port of Homebrew for Windows (with an MSYS/MinGW environment). +* [Linuxbrew/brew](https://github.com/Linuxbrew/brew): Experimental Linux version ## Technical Details