Merge branch 'master' into cg/run_nix_shell_with_der_path

tweag · Dec 21, 2023 · 043dfd0 · 043dfd0
2 parents 7047041 + f13ebfd
commit 043dfd0
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,26 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
-## Unreleased
+## [0.18] 2023-12-21
+
+[0.18]: https://github.com/tweag/rules_haskell/compare/v0.17...v0.18
+
+### Highlights
+
+* Support for GHC 9.6.x (See https://github.com/tweag/rules_haskell/pull/1921 and https://github.com/tweag/rules_haskell/issues/1986)
+
+### Changed
+
+* Use GHC 9.2.8 by default (See https://github.com/tweag/rules_haskell/pull/1994)
+* Use Bazel 6.4.0 by default (See https://github.com/tweag/rules_haskell/pull/2063)
+* `start` script supports bzlmod with bindists (See https://github.com/tweag/rules_haskell/pull/2046)
+* Support Python Windows App aliases (See https://github.com/tweag/rules_haskell/pull/2060)
+
+### Fixed
+
+* Error using `snapshot` tag from stack_snapshot module extension (See https://github.com/tweag/rules_haskell/issues/2001)
+* Build gi-gtk from stackage (See https://github.com/tweag/rules_haskell/issues/1752)
+* X is not a toolchain library (See https://github.com/tweag/rules_haskell/issues/1920)
 
 ### Removed
 

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -1,6 +1,6 @@
 module(
     name = "rules_haskell",
-    version = "0.17",
+    version = "0.18",
 )
 
 bazel_dep(

diff --git a/docs/haskell-use-cases.rst b/docs/haskell-use-cases.rst
@@ -28,9 +28,9 @@ rules_haskell. To use a released version, do the following::
 
   http_archive(
       name = "rules_haskell",
-      sha256 = "298f6f0db23391274b4eca215daa01797d05699469048ef94540d5829b466377",
-      strip_prefix = "rules_haskell-0.17",
-      url = "https://github.com/tweag/rules_haskell/archive/refs/tags/v0.17.tar.gz",
+      sha256 = "d1f0e1bd4f1d5e248b2882bfdc7c31a146112f9d85b9d2f0ef77e78d02ecba45",
+      strip_prefix = "rules_haskell-0.18",
+      url = "https://github.com/tweag/rules_haskell/releases/download/v0.18/rules_haskell-0.18.tar.gz",
   )
 
 Picking a compiler

diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel
@@ -9,11 +9,11 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_haskell_nix",
-    version = "0.17",
+    version = "0.18",
 )
 bazel_dep(
     name = "rules_haskell",
-    version = "0.17",
+    version = "0.18",
 )
 
 # TODO

diff --git a/...y/modules/rules_haskell/0.17/MODULE.bazel → ...y/modules/rules_haskell/0.18/MODULE.bazel b/...y/modules/rules_haskell/0.17/MODULE.bazel → ...y/modules/rules_haskell/0.18/MODULE.bazel
diff --git a/...ry/modules/rules_haskell/0.17/source.json → ...ry/modules/rules_haskell/0.18/source.json b/...ry/modules/rules_haskell/0.17/source.json → ...ry/modules/rules_haskell/0.18/source.json
diff --git a/registry/modules/rules_haskell/metadata.json b/registry/modules/rules_haskell/metadata.json
@@ -1,6 +1,6 @@
 {
   "homepage": "",
   "maintainers": [],
-  "versions": ["0.17"],
+  "versions": ["0.18"],
   "yanked_versions": []
 }
diff --git a/...dules/rules_haskell_nix/0.17/MODULE.bazel → ...dules/rules_haskell_nix/0.18/MODULE.bazel b/...dules/rules_haskell_nix/0.17/MODULE.bazel → ...dules/rules_haskell_nix/0.18/MODULE.bazel
diff --git a/...odules/rules_haskell_nix/0.17/source.json → ...odules/rules_haskell_nix/0.18/source.json b/...odules/rules_haskell_nix/0.17/source.json → ...odules/rules_haskell_nix/0.18/source.json
diff --git a/registry/modules/rules_haskell_nix/metadata.json b/registry/modules/rules_haskell_nix/metadata.json
@@ -1,6 +1,6 @@
 {
   "homepage": "",
   "maintainers": [],
-  "versions": ["0.17"],
+  "versions": ["0.18"],
   "yanked_versions": []
 }
diff --git a/rules_haskell_nix/MODULE.bazel b/rules_haskell_nix/MODULE.bazel
@@ -1,11 +1,11 @@
 module(
     name = "rules_haskell_nix",
-    version = "0.17",
+    version = "0.18",
 )
 
 bazel_dep(
     name = "rules_haskell",
-    version = "0.17",
+    version = "0.18",
 )
 bazel_dep(
     name = "rules_sh",

diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel
@@ -1,6 +1,6 @@
 module(
     name = "rules_haskell_tests",
-    version = "0.17",
+    version = "0.18",
 )
 
 bazel_dep(
@@ -9,11 +9,11 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_haskell_nix",
-    version = "0.17",
+    version = "0.18",
 )
 bazel_dep(
     name = "rules_haskell",
-    version = "0.17",
+    version = "0.18",
 )
 bazel_dep(
     name = "rules_license",

diff --git a/rules_haskell_tests/tests/bzlmod_runfiles/other_module/MODULE.bazel b/rules_haskell_tests/tests/bzlmod_runfiles/other_module/MODULE.bazel
@@ -5,11 +5,11 @@ module(
 
 bazel_dep(
     name = "rules_haskell_nix",
-    version = "0.17",
+    version = "0.18",
 )
 bazel_dep(
     name = "rules_haskell",
-    version = "0.17",
+    version = "0.18",
 )
 bazel_dep(
     name = "rules_nixpkgs_core",

diff --git a/rules_haskell_tests/tests/run-start-script.sh b/rules_haskell_tests/tests/run-start-script.sh
@@ -29,4 +29,5 @@ NIX_PATH=nixpkgs="$pwd/nixpkgs/default.nix" \
   bazel run \
   --config=ci \
   --override_repository=rules_haskell="$pwd/.." \
+  --override_module=rules_haskell="$pwd/.." \
   //:example
diff --git a/start b/start
@@ -241,9 +241,9 @@ load(
 # Download rules_haskell and make it accessible as "@rules_haskell".
 http_archive(
     name = "rules_haskell",
-    sha256 = "298f6f0db23391274b4eca215daa01797d05699469048ef94540d5829b466377",
-    strip_prefix = "rules_haskell-0.17",
-    url = "https://github.com/tweag/rules_haskell/archive/refs/tags/v0.17.tar.gz",
+    sha256 = "d1f0e1bd4f1d5e248b2882bfdc7c31a146112f9d85b9d2f0ef77e78d02ecba45",
+    strip_prefix = "rules_haskell-0.18",
+    url = "https://github.com/tweag/rules_haskell/releases/download/v0.18/rules_haskell-0.18.tar.gz",
 )
 
 load(
@@ -362,7 +362,7 @@ if $BZLMOD; then
     cat >MODULE.bazel <<EOF
 module(name = "your_project_name_here", version = "0.1")
 
-bazel_dep(name = "rules_haskell", version = "0.17")
+bazel_dep(name = "rules_haskell", version = "0.18")
 bazel_dep(name = "rules_cc", version = "0.0.9")
 
 haskell_toolchains = use_extension(

diff --git a/tutorial/MODULE.bazel b/tutorial/MODULE.bazel
@@ -7,11 +7,11 @@ bazel_dep(
 # toolchains are considered first
 bazel_dep(
     name = "rules_haskell_nix",
-    version = "0.17",
+    version = "0.18",
 )
 bazel_dep(
     name = "rules_haskell",
-    version = "0.17",
+    version = "0.18",
 )
 bazel_dep(
     name = "rules_nixpkgs_core",