Skip to content

Upgrade rules_nixpkgs modules to 0.10.0 #2008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 7, 2023
Merged

Upgrade rules_nixpkgs modules to 0.10.0 #2008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67f9799
Upgrade rules_nixpkgs modules to 0.10.0
avdv Nov 6, 2023
87df70c
Upgrade rules_nixpkgs to 0.10.0 in workspace dependencies
avdv Nov 7, 2023
f7f28a6
Merge branch 'master' into upgrade-nixpkgs-module
mergify[bot] Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,27 +119,27 @@ use_repo(npm, "rules_haskell_npm")
#### Development dependencies ####
bazel_dep(
name = "rules_nixpkgs_core",
version = "0.9.0",
version = "0.10.0",
dev_dependency = True,
)
bazel_dep(
name = "rules_nixpkgs_cc",
version = "0.9.0",
version = "0.10.0",
dev_dependency = True,
)
bazel_dep(
name = "rules_nixpkgs_python",
version = "0.9.0",
version = "0.10.0",
dev_dependency = True,
)
bazel_dep(
name = "rules_nixpkgs_go",
version = "0.9.0",
version = "0.10.0",
dev_dependency = True,
)
bazel_dep(
name = "rules_nixpkgs_posix",
version = "0.9.0",
version = "0.10.0",
dev_dependency = True,
)
bazel_dep(
Expand All @@ -150,7 +150,7 @@ bazel_dep(
)
bazel_dep(
name = "rules_nixpkgs_nodejs",
version = "0.9.0",
version = "0.10.0",
dev_dependency = True,
)

Expand Down
2 changes: 1 addition & 1 deletion examples/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module(

bazel_dep(
name = "rules_nixpkgs_core",
version = "0.9.0",
version = "0.10.0",
)
bazel_dep(
name = "rules_haskell_nix",
Expand Down
18 changes: 12 additions & 6 deletions haskell/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ load(
)
load(":private/ghc_ci.bzl", "ghc_default_version")

_rules_nixpkgs_version = "7e627d76ba65d6c42586fc265e46bd370672b4eb"
_rules_nixpkgs_sha256 = "714a0bec45d23bfc23604de5d292a68f6e12272b303fb7bf33567d2878f52612"
_rules_nixpkgs_version = "0.10.0"
_rules_nixpkgs_sha256 = "980edfceef2e59e1122d9be6c52413bc298435f0a3d452532b8a48d7562ffd67"

_rules_sh_version = "v0.3.0"
_rules_sh_sha256 = "d668bb32f112ead69c58bde2cae62f6b8acefe759a8c95a2d80ff6a85af5ac5e"
Expand Down Expand Up @@ -77,12 +77,18 @@ def rules_haskell_dependencies():
#
# See https://github.com/tweag/rules_nixpkgs/issues/182 for the rational

strip_prefix = "rules_nixpkgs-%s" % _rules_nixpkgs_version.lstrip("v")
strip_prefix = "rules_nixpkgs-%s" % _rules_nixpkgs_version

rules_nixpkgs_url = \
"https://github.com/tweag/rules_nixpkgs/releases/download/v{version}/{prefix}.tar.gz".format(
version = _rules_nixpkgs_version,
prefix = strip_prefix,
)

http_archive(
name = "io_tweag_rules_nixpkgs",
strip_prefix = strip_prefix,
urls = ["https://github.com/tweag/rules_nixpkgs/archive/%s.tar.gz" % _rules_nixpkgs_version],
urls = [rules_nixpkgs_url],
sha256 = _rules_nixpkgs_sha256,
)

Expand All @@ -96,15 +102,15 @@ def rules_haskell_dependencies():
http_archive(
name = "rules_nixpkgs_core",
strip_prefix = strip_prefix + "/core",
urls = ["https://github.com/tweag/rules_nixpkgs/archive/%s.tar.gz" % _rules_nixpkgs_version],
urls = [rules_nixpkgs_url],
sha256 = _rules_nixpkgs_sha256,
)

for toolchain in ["cc", "java", "python", "go", "rust", "posix", "nodejs"]:
http_archive(
name = "rules_nixpkgs_" + toolchain,
strip_prefix = strip_prefix + "/toolchains/" + toolchain,
urls = ["https://github.com/tweag/rules_nixpkgs/archive/%s.tar.gz" % _rules_nixpkgs_version],
urls = [rules_nixpkgs_url],
sha256 = _rules_nixpkgs_sha256,
)

Expand Down
4 changes: 2 additions & 2 deletions ...dules/rules_nixpkgs_cc/0.9.0/MODULE.bazel → ...ules/rules_nixpkgs_cc/0.10.0/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module(
name = "rules_nixpkgs_cc",
version = "0.9.0",
version = "0.10.0",
)

bazel_dep(name = "rules_nixpkgs_core", version = "0.9.0")
bazel_dep(name = "rules_nixpkgs_core", version = "0.10.0")
bazel_dep(name = "bazel_skylib", version = "1.0.3")
bazel_dep(name = "rules_cc", version = "0.0.1")
5 changes: 5 additions & 0 deletions registry/modules/rules_nixpkgs_cc/0.10.0/source.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"integrity": "sha256-mA7fzu8uWeESLZvmxSQTvCmENfCj1FJTK4pI11Yv/Wc=",
"strip_prefix": "rules_nixpkgs-0.10.0/toolchains/cc",
"url": "https://github.com/tweag/rules_nixpkgs/releases/download/v0.10.0/rules_nixpkgs-0.10.0.tar.gz"
}
5 changes: 0 additions & 5 deletions registry/modules/rules_nixpkgs_cc/0.9.0/source.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion registry/modules/rules_nixpkgs_cc/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"name": "Andreas Herrmann"
}
],
"versions": ["0.9.0"],
"versions": ["0.10.0"],
"yanked_versions": []
}
16 changes: 0 additions & 16 deletions registry/modules/rules_nixpkgs_core/0.9.0/MODULE.bazel
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions registry/modules/rules_nixpkgs_core/0.9.0/source.json
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions registry/modules/rules_nixpkgs_core/metadata.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...dules/rules_nixpkgs_go/0.9.0/MODULE.bazel → ...ules/rules_nixpkgs_go/0.10.0/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module(
name = "rules_nixpkgs_go",
version = "0.9.0",
version = "0.10.0",
)

bazel_dep(name = "rules_nixpkgs_core", version = "0.9.0")
bazel_dep(name = "rules_nixpkgs_core", version = "0.10.0")
bazel_dep(name = "rules_go", version = "0.39.1", repo_name = "io_bazel_rules_go")
bazel_dep(name = "bazel_skylib", version = "1.0.3")
bazel_dep(name = "platforms", version = "0.0.4")
5 changes: 5 additions & 0 deletions registry/modules/rules_nixpkgs_go/0.10.0/source.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"integrity": "sha256-mA7fzu8uWeESLZvmxSQTvCmENfCj1FJTK4pI11Yv/Wc=",
"strip_prefix": "rules_nixpkgs-0.10.0/toolchains/go",
"url": "https://github.com/tweag/rules_nixpkgs/releases/download/v0.10.0/rules_nixpkgs-0.10.0.tar.gz"
}
5 changes: 0 additions & 5 deletions registry/modules/rules_nixpkgs_go/0.9.0/source.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion registry/modules/rules_nixpkgs_go/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"name": "Andreas Herrmann"
}
],
"versions": ["0.9.0"],
"versions": ["0.10.0"],
"yanked_versions": []
}
4 changes: 2 additions & 2 deletions ...les/rules_nixpkgs_java/0.9.0/MODULE.bazel → ...es/rules_nixpkgs_java/0.10.0/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module(
name = "rules_nixpkgs_java",
version = "0.9.0",
version = "0.10.0",
)

bazel_dep(name = "rules_nixpkgs_core", version = "0.9.0")
bazel_dep(name = "rules_nixpkgs_core", version = "0.10.0")
bazel_dep(name = "rules_java", version = "4.0.0")
bazel_dep(name = "bazel_skylib", version = "1.0.3")
6 changes: 6 additions & 0 deletions registry/modules/rules_nixpkgs_java/0.10.0/source.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"integrity": "sha256-mA7fzu8uWeESLZvmxSQTvCmENfCj1FJTK4pI11Yv/Wc=",
"strip_prefix": "rules_nixpkgs-0.10.0/toolchains/java",
"url": "https://github.com/tweag/rules_nixpkgs/releases/download/v0.10.0/rules_nixpkgs-0.10.0.tar.gz"
}

6 changes: 0 additions & 6 deletions registry/modules/rules_nixpkgs_java/0.9.0/source.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion registry/modules/rules_nixpkgs_java/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"name": "Andreas Herrmann"
}
],
"versions": ["0.9.0"],
"versions": ["0.10.0"],
"yanked_versions": []
}
4 changes: 2 additions & 2 deletions ...s/rules_nixpkgs_nodejs/0.9.0/MODULE.bazel → .../rules_nixpkgs_nodejs/0.10.0/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module(
name = "rules_nixpkgs_nodejs",
version = "0.9.0",
version = "0.10.0",
)

bazel_dep(name = "rules_nixpkgs_core", version = "0.9.0")
bazel_dep(name = "rules_nixpkgs_core", version = "0.10.0")
bazel_dep(name = "rules_nodejs", version = "5.5.3")
bazel_dep(name = "bazel_skylib", version = "1.0.3")
6 changes: 6 additions & 0 deletions registry/modules/rules_nixpkgs_nodejs/0.10.0/source.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"integrity": "sha256-mA7fzu8uWeESLZvmxSQTvCmENfCj1FJTK4pI11Yv/Wc=",
"strip_prefix": "rules_nixpkgs-0.10.0/toolchains/nodejs",
"url": "https://github.com/tweag/rules_nixpkgs/releases/download/v0.10.0/rules_nixpkgs-0.10.0.tar.gz"
}

6 changes: 0 additions & 6 deletions registry/modules/rules_nixpkgs_nodejs/0.9.0/source.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion registry/modules/rules_nixpkgs_nodejs/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"name": "Andreas Herrmann"
}
],
"versions": ["0.9.0"],
"versions": ["0.10.0"],
"yanked_versions": []
}
4 changes: 2 additions & 2 deletions ...es/rules_nixpkgs_posix/0.9.0/MODULE.bazel → ...s/rules_nixpkgs_posix/0.10.0/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module(
name = "rules_nixpkgs_posix",
version = "0.9.0",
version = "0.10.0",
)

bazel_dep(name = "rules_nixpkgs_core", version = "0.9.0")
bazel_dep(name = "rules_nixpkgs_core", version = "0.10.0")
bazel_dep(name = "rules_sh", version = "0.3.0")
bazel_dep(name = "bazel_skylib", version = "1.0.3")
6 changes: 6 additions & 0 deletions registry/modules/rules_nixpkgs_posix/0.10.0/source.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"integrity": "sha256-mA7fzu8uWeESLZvmxSQTvCmENfCj1FJTK4pI11Yv/Wc=",
"strip_prefix": "rules_nixpkgs-0.10.0/toolchains/posix",
"url": "https://github.com/tweag/rules_nixpkgs/releases/download/v0.10.0/rules_nixpkgs-0.10.0.tar.gz"
}

6 changes: 0 additions & 6 deletions registry/modules/rules_nixpkgs_posix/0.9.0/source.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion registry/modules/rules_nixpkgs_posix/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"name": "Andreas Herrmann"
}
],
"versions": ["0.9.0"],
"versions": ["0.10.0"],
"yanked_versions": []
}
4 changes: 2 additions & 2 deletions ...s/rules_nixpkgs_python/0.9.0/MODULE.bazel → .../rules_nixpkgs_python/0.10.0/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module(
name = "rules_nixpkgs_python",
version = "0.9.0",
version = "0.10.0",
)

bazel_dep(name = "rules_nixpkgs_core", version = "0.9.0")
bazel_dep(name = "rules_nixpkgs_core", version = "0.10.0")
bazel_dep(name = "bazel_skylib", version = "1.0.3")
6 changes: 6 additions & 0 deletions registry/modules/rules_nixpkgs_python/0.10.0/source.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"integrity": "sha256-mA7fzu8uWeESLZvmxSQTvCmENfCj1FJTK4pI11Yv/Wc=",
"strip_prefix": "rules_nixpkgs-0.10.0/toolchains/python",
"url": "https://github.com/tweag/rules_nixpkgs/releases/download/v0.10.0/rules_nixpkgs-0.10.0.tar.gz"
}

6 changes: 0 additions & 6 deletions registry/modules/rules_nixpkgs_python/0.9.0/source.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion registry/modules/rules_nixpkgs_python/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"name": "Andreas Herrmann"
}
],
"versions": ["0.9.0"],
"versions": ["0.10.0"],
"yanked_versions": []
}
6 changes: 3 additions & 3 deletions ...les/rules_nixpkgs_rust/0.9.0/MODULE.bazel → ...es/rules_nixpkgs_rust/0.10.0/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module(
name = "rules_nixpkgs_rust",
version = "0.9.0",
version = "0.10.0",
)

bazel_dep(name = "rules_nixpkgs_core", version = "0.9.0")
bazel_dep(name = "rules_nixpkgs_core", version = "0.10.0")
bazel_dep(name = "bazel_skylib", version = "1.0.3")

# TODO: there is no BCR entry for `rules_rust` yet, and you will have to add a
# local registry entry to map a commit to a module "version". the caller will
# also have to know this and point `--registry` at the file from right revision
# on GitHub!
bazel_dep(name = "rules_rust", version = "0.17.0")
bazel_dep(name = "rules_rust", version = "0.22.0")
6 changes: 6 additions & 0 deletions registry/modules/rules_nixpkgs_rust/0.10.0/source.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"integrity": "sha256-mA7fzu8uWeESLZvmxSQTvCmENfCj1FJTK4pI11Yv/Wc=",
"strip_prefix": "rules_nixpkgs-0.10.0/toolchains/rust",
"url": "https://github.com/tweag/rules_nixpkgs/releases/download/v0.10.0/rules_nixpkgs-0.10.0.tar.gz"
}

6 changes: 0 additions & 6 deletions registry/modules/rules_nixpkgs_rust/0.9.0/source.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion registry/modules/rules_nixpkgs_rust/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"name": "Andreas Herrmann"
}
],
"versions": ["0.9.0"],
"versions": ["0.10.0"],
"yanked_versions": []
}
4 changes: 2 additions & 2 deletions rules_haskell_nix/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ bazel_dep(
)
bazel_dep(
name = "rules_nixpkgs_core",
version = "0.9.0",
version = "0.10.0",
)
bazel_dep(
name = "rules_nixpkgs_posix",
version = "0.9.0",
version = "0.10.0",
)
bazel_dep(
name = "platforms",
Expand Down
Loading