From 78bab3f46f7f5013c56a1ef2817f541beacfa16e Mon Sep 17 00:00:00 2001 From: Malte Poll Date: Wed, 29 Jan 2025 19:29:16 +0100 Subject: [PATCH 1/2] Update changelog --- CHANGELOG.md | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a51442f..56cfb32d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,30 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). ## [Unreleased] -[Unreleased]: https://github.com/tweag/rules_nixpkgs/compare/v0.12.0...HEAD +[Unreleased]: https://github.com/tweag/rules_nixpkgs/compare/v0.13.0...HEAD + +## [0.13.0] - 2025-01-29 + +[0.13.0]: https://github.com/tweag/rules_nixpkgs/compare/v0.12.0...v0.13.0 + +### Added + +- Support for Bazel 8. See [#622]. +- Support for new `apple-sdk` from Nixpkgs 24.11 and later. See [#639]. +- Documentation for `nixpkgs_java_configure` with bzlmod. See [#498]. +- Add `extra_flags_per_feature` to cc toolchain. See [#575]. +- Add `rustfmt_toolchain`. See [#625]. ### Removed -- `nixpkgs_cc_configure_deprecated` was removed since it depended on Bazel's `cc_autoconf_impl`, which [was removed from `@bazel_tools`](https://github.com/bazelbuild/bazel/commit/1c4e78a9ceab9794140324d64833c628e382a3da) and moved into a private package in `rules_cc` in Bazel 8. +- `nixpkgs_cc_configure_deprecated` was removed since it depended on Bazel's `cc_autoconf_impl`, which [was removed from `@bazel_tools`](https://github.com/bazelbuild/bazel/commit/1c4e78a9ceab9794140324d64833c628e382a3da) and moved into a private package in `rules_cc` in Bazel 8. See [#621]. + +[#498]: https://github.com/tweag/rules_nixpkgs/pull/498 +[#575]: https://github.com/tweag/rules_nixpkgs/pull/575 +[#621]: https://github.com/tweag/rules_nixpkgs/pull/621 +[#622]: https://github.com/tweag/rules_nixpkgs/pull/622 +[#625]: https://github.com/tweag/rules_nixpkgs/pull/625 +[#639]: https://github.com/tweag/rules_nixpkgs/pull/639 ## [0.12.0] - 2024-07-12 From 9f655b2dd08ebd3a18af9cdc32763504a72be732 Mon Sep 17 00:00:00 2001 From: Malte Poll Date: Wed, 29 Jan 2025 19:35:48 +0100 Subject: [PATCH 2/2] Bump version from 0.12.0 to 0.13.0 --- README.md | 16 ++++++++-------- core/MODULE.bazel | 2 +- docs/MODULE.bazel | 2 +- .../{0.12.0 => 0.13.0}/MODULE.bazel | 0 .../{0.12.0 => 0.13.0}/source.json | 0 .../modules/rules_nixpkgs_core/metadata.json | 2 +- toolchains/cc/MODULE.bazel | 4 ++-- toolchains/go/MODULE.bazel | 4 ++-- toolchains/java/MODULE.bazel | 4 ++-- toolchains/java/README.md | 16 ++++++++-------- toolchains/java/java.bzl | 16 ++++++++-------- toolchains/nodejs/MODULE.bazel | 4 ++-- toolchains/posix/MODULE.bazel | 4 ++-- toolchains/python/MODULE.bazel | 4 ++-- toolchains/rust/MODULE.bazel | 4 ++-- 15 files changed, 41 insertions(+), 41 deletions(-) rename registry/modules/rules_nixpkgs_core/{0.12.0 => 0.13.0}/MODULE.bazel (100%) rename registry/modules/rules_nixpkgs_core/{0.12.0 => 0.13.0}/source.json (100%) diff --git a/README.md b/README.md index cb28cd49..0ae3ade7 100644 --- a/README.md +++ b/README.md @@ -1003,8 +1003,8 @@ build --tool_java_runtime_version=nixpkgs_java Add the following to your `MODULE.bazel` file to depend on `rules_nixpkgs`, `rules_nixpkgs_java`, and nixpgks: ```bzl -bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0") -bazel_dep(name = "rules_nixpkgs_java", version = "0.12.0") +bazel_dep(name = "rules_nixpkgs_core", version = "0.13.0") +bazel_dep(name = "rules_nixpkgs_java", version = "0.13.0") bazel_dep(name = "rules_java", version = "7.3.1") bazel_dep(name = "platforms", version = "0.0.9") @@ -1025,9 +1025,9 @@ register_toolchains("@nixpkgs_java_runtime_toolchain//:all") archive_override( module_name = "rules_nixpkgs_java", - urls = "https://github.com/tweag/rules_nixpkgs/releases/download/v0.12.0/rules_nixpkgs-0.12.0.tar.gz", + urls = "https://github.com/tweag/rules_nixpkgs/releases/download/v0.13.0/rules_nixpkgs-0.13.0.tar.gz", integrity = "", - strip_prefix = "rules_nixpkgs-0.12.0/toolchains/java", + strip_prefix = "rules_nixpkgs-0.13.0/toolchains/java", ) ``` @@ -1088,8 +1088,8 @@ build --tool_java_language_version=11 Add the following to your `MODULE.bazel` file to depend on `rules_nixpkgs`, `rules_nixpkgs_java`, and nixpgks: ```bzl -bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0") -bazel_dep(name = "rules_nixpkgs_java", version = "0.12.0") +bazel_dep(name = "rules_nixpkgs_core", version = "0.13.0") +bazel_dep(name = "rules_nixpkgs_java", version = "0.13.0") bazel_dep(name = "rules_java", version = "7.5.0") bazel_dep(name = "platforms", version = "0.0.9") @@ -1110,9 +1110,9 @@ register_toolchains("@nixpkgs_java_runtime_toolchain//:all") archive_override( module_name = "rules_nixpkgs_java", - urls = "https://github.com/tweag/rules_nixpkgs/releases/download/v0.12.0/rules_nixpkgs-0.12.0.tar.gz", + urls = "https://github.com/tweag/rules_nixpkgs/releases/download/v0.13.0/rules_nixpkgs-0.13.0.tar.gz", integrity = "", - strip_prefix = "rules_nixpkgs-0.12.0/toolchains/java", + strip_prefix = "rules_nixpkgs-0.13.0/toolchains/java", ) ``` diff --git a/core/MODULE.bazel b/core/MODULE.bazel index 1c8819d4..e7d38644 100644 --- a/core/MODULE.bazel +++ b/core/MODULE.bazel @@ -1,6 +1,6 @@ module( name = "rules_nixpkgs_core", - version = "0.12.0", + version = "0.13.0", ) bazel_dep(name = "platforms", version = "0.0.4") diff --git a/docs/MODULE.bazel b/docs/MODULE.bazel index ead107e2..06da2773 100644 --- a/docs/MODULE.bazel +++ b/docs/MODULE.bazel @@ -1,6 +1,6 @@ module( name = "rules_nixpkgs_docs", - version = "0.12.0", + version = "0.13.0", ) bazel_dep(name = "rules_sh", version = "0.5.0") diff --git a/registry/modules/rules_nixpkgs_core/0.12.0/MODULE.bazel b/registry/modules/rules_nixpkgs_core/0.13.0/MODULE.bazel similarity index 100% rename from registry/modules/rules_nixpkgs_core/0.12.0/MODULE.bazel rename to registry/modules/rules_nixpkgs_core/0.13.0/MODULE.bazel diff --git a/registry/modules/rules_nixpkgs_core/0.12.0/source.json b/registry/modules/rules_nixpkgs_core/0.13.0/source.json similarity index 100% rename from registry/modules/rules_nixpkgs_core/0.12.0/source.json rename to registry/modules/rules_nixpkgs_core/0.13.0/source.json diff --git a/registry/modules/rules_nixpkgs_core/metadata.json b/registry/modules/rules_nixpkgs_core/metadata.json index de56601d..031c64dc 100644 --- a/registry/modules/rules_nixpkgs_core/metadata.json +++ b/registry/modules/rules_nixpkgs_core/metadata.json @@ -17,6 +17,6 @@ "name": "Malte Poll" } ], - "versions": ["0.12.0"], + "versions": ["0.13.0"], "yanked_versions": [] } diff --git a/toolchains/cc/MODULE.bazel b/toolchains/cc/MODULE.bazel index 74eff4ac..dfe0fc7f 100644 --- a/toolchains/cc/MODULE.bazel +++ b/toolchains/cc/MODULE.bazel @@ -1,8 +1,8 @@ module( name = "rules_nixpkgs_cc", - version = "0.12.0", + version = "0.13.0", ) -bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0") +bazel_dep(name = "rules_nixpkgs_core", version = "0.13.0") bazel_dep(name = "bazel_skylib", version = "1.0.3") bazel_dep(name = "rules_cc", version = "0.0.1") diff --git a/toolchains/go/MODULE.bazel b/toolchains/go/MODULE.bazel index 2f877f64..67887da9 100644 --- a/toolchains/go/MODULE.bazel +++ b/toolchains/go/MODULE.bazel @@ -1,9 +1,9 @@ module( name = "rules_nixpkgs_go", - version = "0.12.0", + version = "0.13.0", ) -bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0") +bazel_dep(name = "rules_nixpkgs_core", version = "0.13.0") local_path_override( module_name = "rules_nixpkgs_core", path = "../../core", diff --git a/toolchains/java/MODULE.bazel b/toolchains/java/MODULE.bazel index 393e61ea..e68b67ab 100644 --- a/toolchains/java/MODULE.bazel +++ b/toolchains/java/MODULE.bazel @@ -1,9 +1,9 @@ module( name = "rules_nixpkgs_java", - version = "0.12.0", + version = "0.13.0", ) -bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0") +bazel_dep(name = "rules_nixpkgs_core", version = "0.13.0") local_path_override( module_name = "rules_nixpkgs_core", path = "../../core", diff --git a/toolchains/java/README.md b/toolchains/java/README.md index 206890c0..731f2143 100644 --- a/toolchains/java/README.md +++ b/toolchains/java/README.md @@ -79,8 +79,8 @@ build --tool_java_runtime_version=nixpkgs_java Add the following to your `MODULE.bazel` file to depend on `rules_nixpkgs`, `rules_nixpkgs_java`, and nixpgks: ```bzl -bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0") -bazel_dep(name = "rules_nixpkgs_java", version = "0.12.0") +bazel_dep(name = "rules_nixpkgs_core", version = "0.13.0") +bazel_dep(name = "rules_nixpkgs_java", version = "0.13.0") bazel_dep(name = "rules_java", version = "7.3.1") bazel_dep(name = "platforms", version = "0.0.9") @@ -101,9 +101,9 @@ register_toolchains("@nixpkgs_java_runtime_toolchain//:all") archive_override( module_name = "rules_nixpkgs_java", - urls = "https://github.com/tweag/rules_nixpkgs/releases/download/v0.12.0/rules_nixpkgs-0.12.0.tar.gz", + urls = "https://github.com/tweag/rules_nixpkgs/releases/download/v0.13.0/rules_nixpkgs-0.13.0.tar.gz", integrity = "", - strip_prefix = "rules_nixpkgs-0.12.0/toolchains/java", + strip_prefix = "rules_nixpkgs-0.13.0/toolchains/java", ) ``` @@ -164,8 +164,8 @@ build --tool_java_language_version=11 Add the following to your `MODULE.bazel` file to depend on `rules_nixpkgs`, `rules_nixpkgs_java`, and nixpgks: ```bzl -bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0") -bazel_dep(name = "rules_nixpkgs_java", version = "0.12.0") +bazel_dep(name = "rules_nixpkgs_core", version = "0.13.0") +bazel_dep(name = "rules_nixpkgs_java", version = "0.13.0") bazel_dep(name = "rules_java", version = "7.5.0") bazel_dep(name = "platforms", version = "0.0.9") @@ -186,9 +186,9 @@ register_toolchains("@nixpkgs_java_runtime_toolchain//:all") archive_override( module_name = "rules_nixpkgs_java", - urls = "https://github.com/tweag/rules_nixpkgs/releases/download/v0.12.0/rules_nixpkgs-0.12.0.tar.gz", + urls = "https://github.com/tweag/rules_nixpkgs/releases/download/v0.13.0/rules_nixpkgs-0.13.0.tar.gz", integrity = "", - strip_prefix = "rules_nixpkgs-0.12.0/toolchains/java", + strip_prefix = "rules_nixpkgs-0.13.0/toolchains/java", ) ``` diff --git a/toolchains/java/java.bzl b/toolchains/java/java.bzl index f902cb08..0544bb94 100644 --- a/toolchains/java/java.bzl +++ b/toolchains/java/java.bzl @@ -182,8 +182,8 @@ def nixpkgs_java_configure( Add the following to your `MODULE.bazel` file to depend on `rules_nixpkgs`, `rules_nixpkgs_java`, and nixpgks: ```bzl - bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0") - bazel_dep(name = "rules_nixpkgs_java", version = "0.12.0") + bazel_dep(name = "rules_nixpkgs_core", version = "0.13.0") + bazel_dep(name = "rules_nixpkgs_java", version = "0.13.0") bazel_dep(name = "rules_java", version = "7.3.1") bazel_dep(name = "platforms", version = "0.0.9") @@ -204,9 +204,9 @@ def nixpkgs_java_configure( archive_override( module_name = "rules_nixpkgs_java", - urls = "https://github.com/tweag/rules_nixpkgs/releases/download/v0.12.0/rules_nixpkgs-0.12.0.tar.gz", + urls = "https://github.com/tweag/rules_nixpkgs/releases/download/v0.13.0/rules_nixpkgs-0.13.0.tar.gz", integrity = "", - strip_prefix = "rules_nixpkgs-0.12.0/toolchains/java", + strip_prefix = "rules_nixpkgs-0.13.0/toolchains/java", ) ``` @@ -267,8 +267,8 @@ def nixpkgs_java_configure( Add the following to your `MODULE.bazel` file to depend on `rules_nixpkgs`, `rules_nixpkgs_java`, and nixpgks: ```bzl - bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0") - bazel_dep(name = "rules_nixpkgs_java", version = "0.12.0") + bazel_dep(name = "rules_nixpkgs_core", version = "0.13.0") + bazel_dep(name = "rules_nixpkgs_java", version = "0.13.0") bazel_dep(name = "rules_java", version = "7.5.0") bazel_dep(name = "platforms", version = "0.0.9") @@ -289,9 +289,9 @@ def nixpkgs_java_configure( archive_override( module_name = "rules_nixpkgs_java", - urls = "https://github.com/tweag/rules_nixpkgs/releases/download/v0.12.0/rules_nixpkgs-0.12.0.tar.gz", + urls = "https://github.com/tweag/rules_nixpkgs/releases/download/v0.13.0/rules_nixpkgs-0.13.0.tar.gz", integrity = "", - strip_prefix = "rules_nixpkgs-0.12.0/toolchains/java", + strip_prefix = "rules_nixpkgs-0.13.0/toolchains/java", ) ``` diff --git a/toolchains/nodejs/MODULE.bazel b/toolchains/nodejs/MODULE.bazel index 85ef3a3d..8fbf22bd 100644 --- a/toolchains/nodejs/MODULE.bazel +++ b/toolchains/nodejs/MODULE.bazel @@ -1,9 +1,9 @@ module( name = "rules_nixpkgs_nodejs", - version = "0.12.0", + version = "0.13.0", ) -bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0") +bazel_dep(name = "rules_nixpkgs_core", version = "0.13.0") local_path_override( module_name = "rules_nixpkgs_core", path = "../../core", diff --git a/toolchains/posix/MODULE.bazel b/toolchains/posix/MODULE.bazel index b25c2478..be349162 100644 --- a/toolchains/posix/MODULE.bazel +++ b/toolchains/posix/MODULE.bazel @@ -1,9 +1,9 @@ module( name = "rules_nixpkgs_posix", - version = "0.12.0", + version = "0.13.0", ) -bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0") +bazel_dep(name = "rules_nixpkgs_core", version = "0.13.0") local_path_override( module_name = "rules_nixpkgs_core", path = "../../core", diff --git a/toolchains/python/MODULE.bazel b/toolchains/python/MODULE.bazel index d9ebe436..3f8ef426 100644 --- a/toolchains/python/MODULE.bazel +++ b/toolchains/python/MODULE.bazel @@ -1,9 +1,9 @@ module( name = "rules_nixpkgs_python", - version = "0.12.0", + version = "0.13.0", ) -bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0") +bazel_dep(name = "rules_nixpkgs_core", version = "0.13.0") local_path_override( module_name = "rules_nixpkgs_core", path = "../../core", diff --git a/toolchains/rust/MODULE.bazel b/toolchains/rust/MODULE.bazel index cdacfe52..ff8b16e5 100644 --- a/toolchains/rust/MODULE.bazel +++ b/toolchains/rust/MODULE.bazel @@ -1,9 +1,9 @@ module( name = "rules_nixpkgs_rust", - version = "0.12.0", + version = "0.13.0", ) -bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0") +bazel_dep(name = "rules_nixpkgs_core", version = "0.13.0") local_path_override( module_name = "rules_nixpkgs_core", path = "../../core",