From cfc659596e424203e2b13de731f341780be9df70 Mon Sep 17 00:00:00 2001
From: Manuel Naranjo <manuel.naranjo@booking.com>
Date: Mon, 15 Jul 2024 15:57:41 +0200
Subject: [PATCH] wip

---
 .gitattributes                    | 7 +++++--
 .github/workflows/release_prep.sh | 2 +-
 bazeldnf/extensions.bzl           | 5 ++---
 bazeldnf/repositories.bzl         | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index d4a5939..0c48c7e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,5 +4,8 @@ docs/*.md linguist-generated=true
 # see https://git-scm.com/docs/git-archive/2.40.0#ATTRIBUTES
 # Exclude a bunch of paths to save some disk space
 e2e export-ignore
-.aspect
-.github
+.aspect export-ignore
+.github export-ignore
+pkg/*/testdata export-ignore
+tools/release export-ignore
+
diff --git a/.github/workflows/release_prep.sh b/.github/workflows/release_prep.sh
index d68a38d..e4b70eb 100755
--- a/.github/workflows/release_prep.sh
+++ b/.github/workflows/release_prep.sh
@@ -37,7 +37,7 @@ PREBUILTS=$(jq \
 cat >${PREFIX}/tools/integrity.bzl <<EOF
 "Generated during release by release_prep.sh, using integrity.jq"
 
-PREBUILTS = "${PREBUILTS}"
+PREBUILTS = ${PREBUILTS}
 
 EOF
 
diff --git a/bazeldnf/extensions.bzl b/bazeldnf/extensions.bzl
index 233bdcd..162fb03 100644
--- a/bazeldnf/extensions.bzl
+++ b/bazeldnf/extensions.bzl
@@ -6,7 +6,6 @@ based on: https://github.com/bazel-contrib/rules-template/blob/0dadcb716f06f6728
 """
 
 load("@bazel_features//:features.bzl", "bazel_features")
-load("//bazeldnf/private:toolchains_repo.bzl", "toolchains_repo")
 load("//internal:rpm.bzl", rpm_repository = "rpm")
 load(":repositories.bzl", "bazeldnf_register_toolchains")
 
@@ -38,7 +37,7 @@ _proxy_repo = repository_rule(
 
 _DEFAULT_NAME = "bazeldnf"
 
-def _handle_rpms(alias, mod, module_ctx):
+def _handle_rpms(alias, mod):
     if not mod.tags.rpm:
         return {}
 
@@ -98,7 +97,7 @@ def _toolchain_extension(module_ctx):
             alias = _alias.name
             dev_dependency = _alias.dev_dependency
 
-        rpms = _handle_rpms(alias, mod, module_ctx)
+        rpms = _handle_rpms(alias, mod)
         if rpms:
             if not dev_dependency:
                 repos[alias] = 1
diff --git a/bazeldnf/repositories.bzl b/bazeldnf/repositories.bzl
index badf0ad..f28118b 100644
--- a/bazeldnf/repositories.bzl
+++ b/bazeldnf/repositories.bzl
@@ -8,7 +8,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file", _http_archive
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 load("//bazeldnf/private:toolchains_repo.bzl", "toolchains_repo")
 load("//tools:integrity.bzl", "PREBUILTS")
-load("//tools:version.bzl", "VERSION", "REPO_URL")
+load("//tools:version.bzl", "REPO_URL", "VERSION")
 load(":platforms.bzl", "PLATFORMS")
 
 def http_archive(name, **kwargs):