diff --git a/README.md b/README.md index f4af0a85f..62a7119d3 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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(): diff --git a/docs/README.md.tpl b/docs/README.md.tpl index 0b36b347e..ff0cec84d 100644 --- a/docs/README.md.tpl +++ b/docs/README.md.tpl @@ -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 diff --git a/nixpkgs/toolchains/go.bzl b/nixpkgs/toolchains/go.bzl index 1d3798d8c..a6c4c3b3f 100644 --- a/nixpkgs/toolchains/go.bzl +++ b/nixpkgs/toolchains/go.bzl @@ -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():