Skip to content

Commit 78ceca0

Browse files
committed
Apply patch to rules_nixpkgs_core
1 parent d2759c6 commit 78ceca0

File tree

3 files changed

+33
-4
lines changed

3 files changed

+33
-4
lines changed

haskell/repositories.bzl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ def rules_haskell_dependencies():
109109
urls = [rules_nixpkgs_url],
110110
sha256 = _rules_nixpkgs_sha256,
111111
# work around invalid path on Windows
112-
patch_cmds_win = ["del /f /q .bazelignore"],
112+
patches = ["@rules_haskell//:rules_nixpkgs_core_bazelignore.patch"],
113+
patch_args = ["-p1"],
113114
)
114115

115116
for toolchain in ["cc", "java", "python", "go", "rust", "posix", "nodejs"]:
@@ -118,8 +119,6 @@ def rules_haskell_dependencies():
118119
strip_prefix = strip_prefix + "/toolchains/" + toolchain,
119120
urls = [rules_nixpkgs_url],
120121
sha256 = _rules_nixpkgs_sha256,
121-
# work around invalid path on Windows
122-
patch_cmds_win = ["del /f /q .bazelignore"],
123122
)
124123

125124
maybe(

registry/modules/rules_nixpkgs_core/0.12.0/source.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"strip_prefix": "rules_nixpkgs-0.12.0/core",
44
"url": "https://github.com/tweag/rules_nixpkgs/releases/download/v0.12.0/rules_nixpkgs-0.12.0.tar.gz",
55
"patches": {
6-
"bazelignore.patch": "sha256-G5xeLdAOe5lV2QeymoKCaIl2AIt3cXhq1rKV/rbGAzA="
6+
"bazelignore.patch": "sha256-ZfaE3Ej4NpUIV8jh/pOrZ5WIVPmYE7zrqIv7jGbxgYc="
77
}
88
}

rules_nixpkgs_bazelignore.patch

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff --git a/core/.bazelignore b/core/.bazelignore
2+
index a61f183..850ed9f 100644
3+
--- a/core/.bazelignore
4+
+++ b/core/.bazelignore
5+
@@ -1,2 +1,2 @@
6+
-bazel-*
7+
+bazel-core
8+
testing
9+
diff --git a/toolchains/nodejs/.bazelignore b/toolchains/nodejs/.bazelignore
10+
index a61f183..18a7578 100644
11+
--- a/toolchains/nodejs/.bazelignore
12+
+++ b/toolchains/nodejs/.bazelignore
13+
@@ -1,2 +1,2 @@
14+
-bazel-*
15+
+bazel-nodejs
16+
testing
17+
diff --git a/toolchains/nodejs/testing/.bazelignore b/toolchains/nodejs/testing/.bazelignore
18+
new file mode 100644
19+
index 0000000..0d9926e
20+
--- /dev/null
21+
+++ b/toolchains/nodejs/testing/.bazelignore
22+
@@ -0,0 +1 @@
23+
+bazel-nodejs
24+
diff --git a/toolchains/rust/.bazelignore b/toolchains/rust/.bazelignore
25+
new file mode 100644
26+
index 0000000..ee88e84
27+
--- /dev/null
28+
+++ b/toolchains/rust/.bazelignore
29+
@@ -0,0 +1 @@
30+
+bazel-rust

0 commit comments

Comments
 (0)