Skip to content

Commit

Permalink
bazel-docs: Replace references to DACH-NY repo (digital-asset#2655)
Browse files Browse the repository at this point in the history
  • Loading branch information
aherrmann-da authored and mergify[bot] committed Aug 26, 2019
1 parent ea02814 commit c1623ac
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
4 changes: 2 additions & 2 deletions BAZEL-JVM.md
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ activated on all Scala targets by default. It is configured in the [Scala rule
wrappers][wartremover_config] used in the daml repository.
[wartremover_plugin]: https://github.com/wartremover/wartremover
[wartremover_config]: https://github.com/DACH-NY/da/blob/f0fe4b65e6cfca4e354d0f6138d04c98107d771c/bazel_tools/scala.bzl#L56
[wartremover_config]: https://github.com/digital-asset/daml/blob/ea02814b343e4754c70a8718cb14657d6c51915f/bazel_tools/scala.bzl#L71
### Command-Line Tools
Expand All @@ -781,7 +781,7 @@ a set of custom Bazel rules defined in [`rules_daml`][rules_daml]. Refer to the
[user guide][bazel_user_guide] or the [API docs][bazel-api-documentation] for
details.
[rules_daml]: https://github.com/DACH-NY/da/tree/f0fe4b65e6cfca4e354d0f6138d04c98107d771c/rules_daml
[rules_daml]: https://github.com/digital-asset/daml/tree/ea02814b343e4754c70a8718cb14657d6c51915f/rules_daml
## Java Runtime and Toolchain
Expand Down
15 changes: 7 additions & 8 deletions BAZEL-haskell.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,13 @@ nixpkgs_package(
)
```

We see in the last macro invocation, forward reference to the [`ai_formation_hazel`]("https://github.com/DACH-NY/hazel) workspace. Here's its definition:
We see in the last macro invocation, forward reference to the [`ai_formation_hazel`](https://github.com/tweag/rules_haskell/tree/master/hazel) workspace. Here's its definition:
```
http_archive(
name = "ai_formation_hazel",
strip_prefix = "hazel-{}".format(hazel_version),
# XXX: Switch to upstream once necessary changes are merged.
# urls = ["https://github.com/formationai/hazel/archive/{}.tar.gz".format(hazel_version)],
urls = ["https://github.com/DACH-NY/hazel/archive/{}.tar.gz".format(hazel_version)],
name = "ai_formation_hazel",
strip_prefix = "rules_haskell-{}/hazel".format(rules_haskell_version),
urls = ["https://github.com/tweag/rules_haskell/archive/%s.tar.gz" % rules_haskell_version],
sha256 = rules_haskell_sha256,
)
```
Hazel is a Bazel framework of build rules for third-party Haskell dependencies - it autogenerates Bazel rules from Cabal files. From the `@ai_formation_hazel` workspace we load
Expand All @@ -127,7 +126,7 @@ and from there we the DAML `//bazel_tools` project the `add_extra_packages` macr
load("//bazel_tools:haskell.bzl", "add_extra_packages")
```

The [`hazel_repositories`](https://github.com/DACH-NY/hazel#using-hazel-in-build-rules) macro creates a separate external dependency for each package. It downloads Cabal tarballs from Hackage and constructs build rules for compiling the components of each such package:
The [`hazel_repositories`](https://github.com/tweag/rules_haskell/tree/master/hazel#using-hazel-in-build-rules) macro creates a separate external dependency for each package. It downloads Cabal tarballs from Hackage and constructs build rules for compiling the components of each such package:
```
hazel_repositories(
core_packages = core_packages (...),
Expand Down Expand Up @@ -187,6 +186,6 @@ alias(

## Further reading:

- ["Bazel User Guide"](https://github.com/DACH-NY/da/blob/master/BAZEL.md) (DAML specific)
- ["Bazel User Guide"](https://github.com/digital-asset/daml/blob/master/BAZEL.md) (DAML specific)
- ["A Users's Guide to Bazel"](https://docs.bazel.build/versions/master/guide.html) (official documentation)
- [`rules_haskell` documentation](https://api.haskell.build/index.html) (core Haskell rules, Haddock support, Linting, Defining toolchains, Support for protocol buffers, Interop with `cc_*` rules, Workspace rules)
2 changes: 1 addition & 1 deletion BAZEL.md
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ More comprehensive documentation on the `bazel` command can be found
If your work goes beyond simply adding targets to existing
`BUILD.bazel` files and involves things like defining toolchains and
external dependencies, then [this
document](https://github.com/DACH-NY/da/blob/master/BAZEL-haskell.md)
document](https://github.com/digital-asset/daml/blob/master/BAZEL-haskell.md)
is for you!
## Documentation packages in Bazel
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ hazel_repositories(
extra =

# Read [Working on ghc-lib] for ghc-lib update instructions at
# https://github.com/DACH-NY/daml/blob/master/ghc-lib/working-on-ghc-lib.md.
# https://github.com/digital-asset/daml/blob/master/ghc-lib/working-on-ghc-lib.md.
hazel_ghclibs(GHC_LIB_VERSION, "96c1d09bc2345563ce9f2f025a466502c1da5bcc937fcb01bd0541f934f6aa1d", "d543a49fc15e2895f2cb1be62a957b2397dc02760ee326c0a6cf67a147a59855") +
hazel_github_external("digital-asset", "hlint", "34133de4262f2b472ec855de8858ae0a74fe2b72", "1a9d623926bdfe97a7a85b3159e259f440749f06bc75d59b981550ce6dca77ef") +
hazel_github_external("awakesecurity", "proto3-wire", "4f355bbac895d577d8a28f567ab4380f042ccc24", "031e05d523a887fbc546096618bc11dceabae224462a6cdd6aab11c1658e17a3") +
Expand Down

0 comments on commit c1623ac

Please sign in to comment.