Skip to content

Commit

Permalink
Docs nixpkgs_go_toolchain --> *_configure
Browse files Browse the repository at this point in the history
  • Loading branch information
aherrmann authored and Théophane Hufschmitt committed Mar 11, 2021
1 parent 6178f2a commit c840dd3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ rules_nixpkgs_dependencies()

load("@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl", "nixpkgs_git_repository", "nixpkgs_package", "nixpkgs_cc_toolchain")

load("@io_tweag_rules_nixpkgs//nixpkgs:toolchains/go.bzl", "nixpkgs_go_toolchain") # optional
load("@io_tweag_rules_nixpkgs//nixpkgs:toolchains/go.bzl", "nixpkgs_go_configure") # optional
```

If you use `rules_nixpkgs` to configure a toolchain then you will also need to
Expand Down Expand Up @@ -1070,10 +1070,10 @@ and also provide an empty normal file named `PACKAGE_ROOT` at the root of packag
ctx.file("BUILD", "")

imports_for_nix = """
load("@io_tweag_rules_nixpkgs//nixpkgs:toolchains/go.bzl", "nixpkgs_go_toolchain")
load("@io_tweag_rules_nixpkgs//nixpkgs:toolchains/go.bzl", "nixpkgs_go_configure")
def fix_go():
nixpkgs_go_toolchain(repository = "@nixpkgs")
nixpkgs_go_configure(repository = "@nixpkgs")
"""
imports_for_non_nix = """
def fix_go():
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ rules_nixpkgs_dependencies()

load("@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl", "nixpkgs_git_repository", "nixpkgs_package", "nixpkgs_cc_toolchain")

load("@io_tweag_rules_nixpkgs//nixpkgs:toolchains/go.bzl", "nixpkgs_go_toolchain") # optional
load("@io_tweag_rules_nixpkgs//nixpkgs:toolchains/go.bzl", "nixpkgs_go_configure") # optional
```

If you use `rules_nixpkgs` to configure a toolchain then you will also need to
Expand Down
4 changes: 2 additions & 2 deletions nixpkgs/toolchains/go.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ def nixpkgs_go_configure(
ctx.file("BUILD", "")
imports_for_nix = \"""
load("@io_tweag_rules_nixpkgs//nixpkgs:toolchains/go.bzl", "nixpkgs_go_toolchain")
load("@io_tweag_rules_nixpkgs//nixpkgs:toolchains/go.bzl", "nixpkgs_go_configure")
def fix_go():
nixpkgs_go_toolchain(repository = "@nixpkgs")
nixpkgs_go_configure(repository = "@nixpkgs")
\"""
imports_for_non_nix = \"""
def fix_go():
Expand Down

0 comments on commit c840dd3

Please sign in to comment.