From 8e4996c156cb02eb5d191137df8dda895e5158fc Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Wed, 18 Aug 2021 11:55:25 +0200 Subject: [PATCH 1/3] Updating the Homebrew Command This resolves a conflict, and stops Homebrew from using the default formula. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f9c65e8bb..2f8997dba 100644 --- a/README.md +++ b/README.md @@ -1238,7 +1238,7 @@ endif() ### Package Managers -:beer: If you are using OS X and [Homebrew](https://brew.sh), just type `brew tap nlohmann/json` and `brew install nlohmann-json` and you're set. If you want the bleeding edge rather than the latest release, use `brew install nlohmann-json --HEAD`. +:beer: If you are using OS X and [Homebrew](https://brew.sh), just type `brew tap nlohmann/json` and `brew install nlohmann/json/nlohmann_json` and you're set. If you want the bleeding edge rather than the latest release, use `brew install nlohmann/json/nlohmann_json --HEAD`. If you are using the [Meson Build System](https://mesonbuild.com), add this source tree as a [meson subproject](https://mesonbuild.com/Subprojects.html#using-a-subproject). You may also use the `include.zip` published in this project's [Releases](https://github.com/nlohmann/json/releases) to reduce the size of the vendored source tree. Alternatively, you can get a wrap file by downloading it from [Meson WrapDB](https://wrapdb.mesonbuild.com/nlohmann_json), or simply use `meson wrap install nlohmann_json`. Please see the meson project for any issues regarding the packaging. From b65748f763e19c49372d2ce3bedcd9023b029826 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Wed, 18 Aug 2021 16:49:51 +0200 Subject: [PATCH 2/3] Using the homebrew/core Formula I've submitted a PR on [homebrew/core](https://github.com/Homebrew/homebrew-core/pull/83479) that updates their Formula. After that one is set, we can merge this and let users use the default formula, and we don't have to maintain two separate Formulas. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2f8997dba..e4cda9f7e 100644 --- a/README.md +++ b/README.md @@ -1238,7 +1238,7 @@ endif() ### Package Managers -:beer: If you are using OS X and [Homebrew](https://brew.sh), just type `brew tap nlohmann/json` and `brew install nlohmann/json/nlohmann_json` and you're set. If you want the bleeding edge rather than the latest release, use `brew install nlohmann/json/nlohmann_json --HEAD`. +:beer: If you are using OS X and [Homebrew](https://brew.sh), just type `brew install nlohmann-json` and you're set. If you want the bleeding edge rather than the latest release, use `brew install nlohmann-json --HEAD`. If you are using the [Meson Build System](https://mesonbuild.com), add this source tree as a [meson subproject](https://mesonbuild.com/Subprojects.html#using-a-subproject). You may also use the `include.zip` published in this project's [Releases](https://github.com/nlohmann/json/releases) to reduce the size of the vendored source tree. Alternatively, you can get a wrap file by downloading it from [Meson WrapDB](https://wrapdb.mesonbuild.com/nlohmann_json), or simply use `meson wrap install nlohmann_json`. Please see the meson project for any issues regarding the packaging. From 14af5d4a9f6b782052dd2e860c80b2bcab34eb50 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Thu, 19 Aug 2021 09:31:39 +0200 Subject: [PATCH 3/3] fixing the doc files --- doc/mkdocs/docs/integration/package_managers.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/mkdocs/docs/integration/package_managers.md b/doc/mkdocs/docs/integration/package_managers.md index b860296ab..7b7d1b604 100644 --- a/doc/mkdocs/docs/integration/package_managers.md +++ b/doc/mkdocs/docs/integration/package_managers.md @@ -11,14 +11,12 @@ Throughout this page, we will describe how to compile the example file `example. If you are using OS X and [Homebrew](http://brew.sh), just type ```sh -brew tap nlohmann/json brew install nlohmann-json ``` and you're set. If you want the bleeding edge rather than the latest release, use ```sh -brew tap nlohmann/json brew install nlohmann-json --HEAD ``` @@ -37,7 +35,6 @@ instead. 2. Install the package ```sh - brew tap nlohmann/json brew install nlohmann-json ```