Skip to content

Commit 8941913

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'master' into renovate/aspect_bazel_lib-1.x
2 parents 969cb30 + ea6cf0e commit 8941913

File tree

41 files changed

+115
-153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+115
-153
lines changed

‎.github/renovate.json

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
{
2-
"enabledManagers": [
3-
"bazel",
4-
"bazel-module"
5-
],
62
"extends": [
7-
"config:recommended"
3+
"github>tweag/renovate-presets:ruleset_base",
4+
"github>tweag/renovate-presets:mergify"
85
],
96
"ignorePaths": ["registry/**"],
10-
"gitAuthor": "Renovate Bot <[email protected]>",
11-
"onboarding": false,
12-
"platform": "github"
7+
"packageRules": [
8+
{
9+
"matchFiles": [
10+
"rules_haskell_nix/MODULE.bazel"
11+
],
12+
"enabled": false
13+
}
14+
],
15+
"gitAuthor": "Renovate Bot <[email protected]>"
1316
}

‎MODULE.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,27 +119,27 @@ use_repo(npm, "rules_haskell_npm")
119119
#### Development dependencies ####
120120
bazel_dep(
121121
name = "rules_nixpkgs_core",
122-
version = "0.10.0",
122+
version = "0.11.1",
123123
dev_dependency = True,
124124
)
125125
bazel_dep(
126126
name = "rules_nixpkgs_cc",
127-
version = "0.10.0",
127+
version = "0.11.1",
128128
dev_dependency = True,
129129
)
130130
bazel_dep(
131131
name = "rules_nixpkgs_python",
132-
version = "0.10.0",
132+
version = "0.11.1",
133133
dev_dependency = True,
134134
)
135135
bazel_dep(
136136
name = "rules_nixpkgs_go",
137-
version = "0.10.0",
137+
version = "0.11.1",
138138
dev_dependency = True,
139139
)
140140
bazel_dep(
141141
name = "rules_nixpkgs_posix",
142-
version = "0.10.0",
142+
version = "0.11.1",
143143
dev_dependency = True,
144144
)
145145
bazel_dep(
@@ -150,7 +150,7 @@ bazel_dep(
150150
)
151151
bazel_dep(
152152
name = "rules_nixpkgs_nodejs",
153-
version = "0.10.0",
153+
version = "0.11.1",
154154
dev_dependency = True,
155155
)
156156

‎WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ buildifier_dependencies()
124124

125125
http_archive(
126126
name = "cgrindel_bazel_starlib",
127-
sha256 = "9090280a9cff7322e7c22062506b3273a2e880ca464e520b5c77fdfbed4e8805",
127+
sha256 = "00b084e895146d2dc8c76437dd5f91a7203c7b46bb4edd1896d018b8795bc927",
128128
urls = [
129-
"https://github.com/cgrindel/bazel-starlib/releases/download/v0.18.1/bazel-starlib.v0.18.1.tar.gz",
129+
"https://github.com/cgrindel/bazel-starlib/releases/download/v0.20.2/bazel-starlib.v0.20.2.tar.gz",
130130
],
131131
)
132132

‎examples/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module(
55

66
bazel_dep(
77
name = "rules_nixpkgs_core",
8-
version = "0.10.0",
8+
version = "0.11.1",
99
)
1010
bazel_dep(
1111
name = "rules_haskell_nix",
@@ -31,7 +31,7 @@ bazel_dep(
3131
)
3232
bazel_dep(
3333
name = "rules_sh",
34-
version = "0.3.0",
34+
version = "0.4.0",
3535
)
3636
bazel_dep(
3737
name = "bazel_skylib",

‎examples/non_module_deps.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ cc_library(
3232
}),
3333
)
3434
""",
35-
sha256 = "b5b06d60ce49c8ba700e0ba517fa07de80b5d4628a037f4be8ad16955be7a7c0",
36-
strip_prefix = "zlib-1.3",
37-
urls = ["https://github.com/madler/zlib/archive/v1.3.tar.gz"],
35+
sha256 = "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23",
36+
strip_prefix = "zlib-1.3.1",
37+
urls = ["https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz"],
3838
)
3939

4040
# Demonstrates a vendored Stackage package to bump a version bound.

‎haskell/cabal.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2136,7 +2136,7 @@ haskell_cabal_binary(
21362136
setup_deps = {setup_deps},
21372137
tools = {tools},
21382138
visibility = ["@{workspace}-exe//{name}:__pkg__"],
2139-
cabalopts = ["--ghc-option=-w", "--ghc-option=-optF=-w"],
2139+
cabalopts = ["--ghc-option=-w", "--ghc-option=-optF=-w", "--ghc-option=-static"],
21402140
verbose = {verbose},
21412141
)
21422142
""".format(

‎haskell/repositories.bzl

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ load(
88
)
99
load(":private/ghc_ci.bzl", "ghc_default_version")
1010

11-
_rules_nixpkgs_version = "0.10.0"
12-
_rules_nixpkgs_sha256 = "980edfceef2e59e1122d9be6c52413bc298435f0a3d452532b8a48d7562ffd67"
11+
_rules_nixpkgs_version = "0.11.1"
12+
_rules_nixpkgs_sha256 = "2a555348d7f8593fca2bf3fc6ce53c5d62929de81b6c292e23f16c557c0ae45a"
1313

1414
_rules_sh_version = "v0.4.0"
1515
_rules_sh_sha256 = "3243af3fcb3768633fd39f3654de773e5fb61471a2fae5762a1653c22c412d2c"
@@ -31,10 +31,10 @@ def rules_haskell_dependencies():
3131
http_archive,
3232
name = "platforms",
3333
urls = [
34-
"https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz",
35-
"https://github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz",
34+
"https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.9/platforms-0.0.9.tar.gz",
35+
"https://github.com/bazelbuild/platforms/releases/download/0.0.9/platforms-0.0.9.tar.gz",
3636
],
37-
sha256 = "8150406605389ececb6da07cbcb509d5637a3ab9a24bc69b1101531367d89d74",
37+
sha256 = "5eda539c841265031c2f82d8ae7a3a6490bd62176e0c038fc469eabf91f6149b",
3838
)
3939

4040
maybe(
@@ -153,18 +153,18 @@ def rules_haskell_dependencies():
153153
http_archive,
154154
name = "zlib",
155155
build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
156-
sha256 = "b5b06d60ce49c8ba700e0ba517fa07de80b5d4628a037f4be8ad16955be7a7c0",
157-
strip_prefix = "zlib-1.3",
158-
urls = ["https://github.com/madler/zlib/archive/v1.3.tar.gz"],
156+
sha256 = "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23",
157+
strip_prefix = "zlib-1.3.1",
158+
urls = ["https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz"],
159159
)
160160
maybe(
161161
http_archive,
162162
name = "rules_pkg",
163163
urls = [
164-
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.9.1/rules_pkg-0.9.1.tar.gz",
165-
"https://github.com/bazelbuild/rules_pkg/releases/download/0.9.1/rules_pkg-0.9.1.tar.gz",
164+
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.10.1/rules_pkg-0.10.1.tar.gz",
165+
"https://github.com/bazelbuild/rules_pkg/releases/download/0.10.1/rules_pkg-0.10.1.tar.gz",
166166
],
167-
sha256 = "8f9ee2dc10c1ae514ee599a8b42ed99fa262b757058f65ad3c384289ff70c4b8",
167+
sha256 = "d250924a2ecc5176808fc4c25d5cf5e9e79e6346d79d5ab1c493e289e722d1d0",
168168
)
169169

170170
# For --incompatible_disable_starlark_host_transitions support (default in bazel 7)
@@ -173,10 +173,10 @@ def rules_haskell_dependencies():
173173
maybe(
174174
http_archive,
175175
name = "rules_license",
176-
sha256 = "4531deccb913639c30e5c7512a054d5d875698daeb75d8cf90f284375fe7c360",
176+
sha256 = "241b06f3097fd186ff468832150d6cc142247dc42a32aaefb56d0099895fd229",
177177
urls = [
178-
"https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz",
179-
"https://github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz",
178+
"https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.8/rules_license-0.0.8.tar.gz",
179+
"https://github.com/bazelbuild/rules_license/releases/download/0.0.8/rules_license-0.0.8.tar.gz",
180180
],
181181
)
182182

‎registry/modules/rules_nixpkgs_cc/0.10.0/source.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎registry/modules/rules_nixpkgs_cc/0.10.0/MODULE.bazel renamed to ‎registry/modules/rules_nixpkgs_cc/0.11.1/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module(
22
name = "rules_nixpkgs_cc",
3-
version = "0.10.0",
3+
version = "0.11.1",
44
)
55

6-
bazel_dep(name = "rules_nixpkgs_core", version = "0.10.0")
6+
bazel_dep(name = "rules_nixpkgs_core", version = "0.11.1")
77
bazel_dep(name = "bazel_skylib", version = "1.0.3")
88
bazel_dep(name = "rules_cc", version = "0.0.1")

‎registry/modules/rules_nixpkgs_cc/0.11.1/source.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"integrity": "sha256-KlVTSNf4WT/KK/P8bOU8XWKSnegbbCkuI/FsVXwK5Fo=",
3+
"strip_prefix": "rules_nixpkgs-0.11.1/toolchains/cc",
4+
"url": "https://github.com/tweag/rules_nixpkgs/releases/download/v0.11.1/rules_nixpkgs-0.11.1.tar.gz"
5+
}

0 commit comments

Comments
 (0)