diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/doc/homebrew/Bottles.md | 16 | ||||
| -rw-r--r-- | share/doc/homebrew/Brew-Test-Bot-For-Core-Contributors.md | 4 | ||||
| -rw-r--r-- | share/doc/homebrew/Formula-Cookbook.md | 14 | 
3 files changed, 17 insertions, 17 deletions
| diff --git a/share/doc/homebrew/Bottles.md b/share/doc/homebrew/Bottles.md index 8b484662c..ea54b170c 100644 --- a/share/doc/homebrew/Bottles.md +++ b/share/doc/homebrew/Bottles.md @@ -23,9 +23,9 @@ Bottles have a DSL to be used in formulae which is contained in the `bottle do .  A simple (and typical) example:  ```ruby  bottle do -  sha1 "23ef6a81af2f37166d7d7423b88f7716bf9b0629" => :yosemite -  sha1 "fdc919d750012fbfeeec8b3f95d07000adc3c946" => :mavericks -  sha1 "0d08b3ca611f47a25a922b2d942f157f1d6268c1" => :mountain_lion +  sha256 "4921af80137af9cc3d38fd17c9120da882448a090b0a8a3a19af3199b415bfca" => :yosemite +  sha256 "c71db15326ee9196cd98602e38d0b7fb2b818cdd48eede4ee8eb827d809e09ba" => :mavericks +  sha256 "85cc828a96735bdafcf29eb6291ca91bac846579bcef7308536e0c875d6c81d7" => :mountain_lion  end  ``` @@ -36,9 +36,9 @@ bottle do    prefix "/opt/homebrew"    cellar "/opt/homebrew/Cellar"    revision 4 -  sha1 "23ef6a81af2f37166d7d7423b88f7716bf9b0629" => :yosemite -  sha1 "fdc919d750012fbfeeec8b3f95d07000adc3c946" => :mavericks -  sha1 "0d08b3ca611f47a25a922b2d942f157f1d6268c1" => :mountain_lion +  sha256 "4921af80137af9cc3d38fd17c9120da882448a090b0a8a3a19af3199b415bfca" => :yosemite +  sha256 "c71db15326ee9196cd98602e38d0b7fb2b818cdd48eede4ee8eb827d809e09ba" => :mavericks +  sha256 "85cc828a96735bdafcf29eb6291ca91bac846579bcef7308536e0c875d6c81d7" => :mountain_lion  end  ``` @@ -58,8 +58,8 @@ See description of `cellar`. When `cellar` is `:any` prefix should be omitted.  Optionally contains the revision of the bottle.  Sometimes bottles may need be updated without bumping the version of the formula e.g. a new patch was applied. In that case the revision will have a value of 1 or more. -### `sha1` -Contains the SHA-1 of bottle for a particular version of OS X. +### `sha256` +Contains the SHA-256 of bottle for a particular version of OS X.  ## Formula DSL  Additionally there is a method available in the formula DSL. diff --git a/share/doc/homebrew/Brew-Test-Bot-For-Core-Contributors.md b/share/doc/homebrew/Brew-Test-Bot-For-Core-Contributors.md index 54140b5d0..619fd09fd 100644 --- a/share/doc/homebrew/Brew-Test-Bot-For-Core-Contributors.md +++ b/share/doc/homebrew/Brew-Test-Bot-For-Core-Contributors.md @@ -19,7 +19,7 @@ To pull and bottle a pull request with `brew pull`:  1. Ensure the job has already completed successfully.  2. Run `brew pull --bottle 12345` where `12345` is the pull request number (or URL). If it complains about a missing URL with `BrewTestBot` in it then the bottles have not finished uploading yet; wait and try again later. -3. Run `brew fetch --force-bottle $FORMULAE` to check the SHA-1 in the bottled formulae match the uploaded files. +3. Run `brew fetch --force-bottle $FORMULAE` to check the SHA-256 in the bottled formulae match the uploaded files.  4. Run `git push` to push the commits.  To bottle a test build or pull request without `brew pull`: @@ -29,5 +29,5 @@ To bottle a test build or pull request without `brew pull`:  3. Run `git fetch --tags https://github.com/BrewTestBot/homebrew.git`  4. For testing builds run `git merge testing-123` (where `123` is the testing job number). For pull requests builds run `git merge pr-45678` (where `45678` is the pull request number).  5. Run `git rebase origin/master` to get rid of any nasty merge commits. -6. Run `brew fetch --force-bottle $FORMULAE` to check the SHA-1 in the bottled formulae match the uploaded files. +6. Run `brew fetch --force-bottle $FORMULAE` to check the SHA-256 in the bottled formulae match the uploaded files.  7. Run `git push` to push the commits. diff --git a/share/doc/homebrew/Formula-Cookbook.md b/share/doc/homebrew/Formula-Cookbook.md index 3aa3fe667..72073959f 100644 --- a/share/doc/homebrew/Formula-Cookbook.md +++ b/share/doc/homebrew/Formula-Cookbook.md @@ -99,7 +99,7 @@ And opens it in your `$EDITOR`. It'll look like:  class Foo < Formula    url "http://example.com/foo-0.1.tar.gz"    homepage "" -  sha1 "1234567890ABCDEF1234567890ABCDEF" +  sha256 "85cc828a96735bdafcf29eb6291ca91bac846579bcef7308536e0c875d6c81d7"    # depends_on "cmake" => :build @@ -257,7 +257,7 @@ If you're installing an application then please locally vendor all the language-  class Foo < Formula    resource "pycrypto" do      url "https://pypi.python.org/packages/source/p/pycrypto/pycrypto-2.6.tar.gz" -    sha1 "c17e41a80b3fbf2ee4e8f2d8bb9e28c5d08bbb84" +    sha256 "85cc828a96735bdafcf29eb6291ca91bac846579bcef7308536e0c875d6c81d7"    end    def install @@ -476,7 +476,7 @@ External patches can be declared using resource-style blocks:  ```rb  patch do    url "https://example.com/example_patch.diff" -  sha1 "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" +  sha256 "85cc828a96735bdafcf29eb6291ca91bac846579bcef7308536e0c875d6c81d7"  end  ``` @@ -485,7 +485,7 @@ A strip level of -p1 is assumed. It can be overridden using a symbol argument:  ```rb  patch :p0 do    url "https://example.com/example_patch.diff" -  sha1 "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" +  sha256 "85cc828a96735bdafcf29eb6291ca91bac846579bcef7308536e0c875d6c81d7"  end  ``` @@ -497,7 +497,7 @@ stable do    patch do      url "https://example.com/example_patch.diff" -    sha1 "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" +    sha256 "85cc828a96735bdafcf29eb6291ca91bac846579bcef7308536e0c875d6c81d7"    end  end  ``` @@ -583,7 +583,7 @@ The "devel" spec (activated by passing `--devel`) is used for a project’s unst  ```ruby  devel do    url "https://foo.com/foo-0.1.tar.gz" -  sha1 "deadbeefdeadbeefdeadbeafdeadbeefdeadbeef" +  sha256 "85cc828a96735bdafcf29eb6291ca91bac846579bcef7308536e0c875d6c81d7"  end  ``` @@ -895,7 +895,7 @@ Homebrew provides two Formula methods for launchd plist files. `plist_name` will  ## Updating formulae -Eventually a new version of the software will be released. In this case you should update the `url` and `sha1`/`sha256`. Please leave the `bottle do ... end`  block as-is; our CI system will update it when we pull your change. +Eventually a new version of the software will be released. In this case you should update the `url` and `sha256`. Please leave the `bottle do ... end`  block as-is; our CI system will update it when we pull your change.  Check if the formula you are updating is a dependency for any other formulae by running `brew uses UPDATED_FORMULA`. If it is a dependency please `brew reinstall` all the dependencies after it is installed and verify they work correctly. | 
