Merge pull request #1307 from tweag/bazel-update

mergify[bot] · web-flow · commit 76f7b1c7328f · 2020-04-21T10:34:09.000Z
Update bazel 2.0.0 --&gt; 2.1.0
diff --git a/.ci/bazel-2.0.0-darwin-x86_64.sha256 b/.ci/bazel-2.0.0-darwin-x86_64.sha256
diff --git a/.ci/bazel-2.0.0-linux-x86_64.sha256 b/.ci/bazel-2.0.0-linux-x86_64.sha256
diff --git a/.ci/bazel-2.0.0-windows-x86_64.exe.sha256 b/.ci/bazel-2.0.0-windows-x86_64.exe.sha256
diff --git a/.ci/bazel-2.1.0-darwin-x86_64.sha256 b/.ci/bazel-2.1.0-darwin-x86_64.sha256
@@ -0,0 +1 @@
+95e00aa0611eb657f3f09e2eb03b8d837a29fcca52a17ebad13f40883ac20647  bazel-2.1.0-darwin-x86_64
diff --git a/.ci/bazel-2.1.0-linux-x86_64.sha256 b/.ci/bazel-2.1.0-linux-x86_64.sha256
@@ -0,0 +1 @@
+e13581d44faad6ac807dd917e682fef20359d26728166ac35dadd8ee653a580d  bazel-2.1.0-linux-x86_64
diff --git a/.ci/bazel-2.1.0-windows-x86_64.exe.sha256 b/.ci/bazel-2.1.0-windows-x86_64.exe.sha256
@@ -0,0 +1 @@
+ee50e52d630ff15efaf0920c22d99839cefb6aafe909554fbd0419fadbb91105  bazel-2.1.0-windows-x86_64.exe
diff --git a/.ci/bazelversion b/.ci/bazelversion
@@ -1 +1 @@
-2.0.0
+2.1.0
diff --git a/.ci/update-bazel-version b/.ci/update-bazel-version
@@ -16,8 +16,9 @@ if [[ $# -ne 1 ]]; then
 fi
 
 VERSION="$1"
-echo "$VERSION" >"$TOP/.ci/bazelversion"
 mkdir -p "$TOP/.ci"
+echo "$VERSION" >"$TOP/.ci/bazelversion"
+rm -f "$TOP"/.ci/bazel-*.sha256
 for OSEXT in windows-x86_64.exe linux-x86_64 darwin-x86_64; do
   URL="https://github.com/bazelbuild/bazel/releases/download/$VERSION/bazel-$VERSION-$OSEXT.sha256"
   (cd "$TOP/.ci" && curl -LO "$URL")
diff --git a/WORKSPACE b/WORKSPACE
@@ -124,11 +124,6 @@ load(
     "nixpkgs_python_configure",
 )
 
-nixpkgs_package(
-    name = "ghc",
-    repository = "@nixpkgs_default",
-)
-
 http_archive(
     name = "rules_proto",
     sha256 = "73ebe9d15ba42401c785f9d0aeebccd73bd80bf6b8ac78f74996d31f2c0ad7a6",
@@ -180,7 +175,7 @@ load(
 )
 
 haskell_register_ghc_nixpkgs(
-    attribute_path = "ghc",
+    attribute_path = "haskell.compiler.ghc865",
     compiler_flags = test_compiler_flags,
     haddock_flags = test_haddock_flags,
     locale_archive = "@glibc_locales//:locale-archive",
@@ -237,13 +232,13 @@ cc_library(
 
 nixpkgs_package(
     name = "c2hs",
-    attribute_path = "haskellPackages.c2hs",
+    attribute_path = "haskell.packages.ghc865.c2hs",
     repository = "@nixpkgs_default",
 )
 
 nixpkgs_package(
     name = "doctest",
-    attribute_path = "haskellPackages.doctest",
+    attribute_path = "haskell.packages.ghc865.doctest",
     repository = "@nixpkgs_default",
 )
 
diff --git a/examples/WORKSPACE b/examples/WORKSPACE
@@ -13,6 +13,7 @@ rules_haskell_dependencies()
 load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
 
 haskell_register_ghc_nixpkgs(
+    attribute_path = "haskell.compiler.ghc865",
     repository = "@rules_haskell//nixpkgs:default.nix",
     version = "8.6.5",
 )
diff --git a/haskell/cabal.bzl b/haskell/cabal.bzl
@@ -929,6 +929,9 @@ def _stack_snapshot_impl(repository_ctx):
     else:
         fail("Please specify one of snapshot or repository_snapshot")
 
+    # Enforce dependency on stack_update
+    repository_ctx.read(repository_ctx.attr.stack_update)
+
     vendored_packages = _invert(repository_ctx.attr.vendored_packages)
     packages = repository_ctx.attr.packages
     core_packages = []
diff --git a/haskell/private/versions.bzl b/haskell/private/versions.bzl
@@ -45,7 +45,7 @@ def check_version(actual_version):
     # Please use length 3 tuples, because bazel versions has 3 members;
     # to avoid surprising behaviors (for example (2,0) >/= (2, 0, 0))
     min_bazel = (0, 29, 0)  # Change THIS LINE when changing bazel min version
-    max_bazel = (2, 0, 0)  # Change THIS LINE when changing bazel max version
+    max_bazel = (2, 1, 0)  # Change THIS LINE when changing bazel max version
 
     actual = tuple(_parse_bazel_version(actual_version))
 
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix
@@ -1,7 +1,7 @@
 let
-  # 2020-01-29
-  sha256 = "1iy3iz91xx58k9wgswalipa8gxxdafqq82lisg6s16ml8y232f00";
-  rev = "42a195919a10ce70309c3666dfe8206e380fae1b";
+  # 2020-04-20
+  sha256 = "011f36kr3c1ria7rag7px26bh73d1b0xpqadd149bysf4hg17rln";
+  rev = "10100a97c8964e82b30f180fda41ade8e6f69e41";
 in
 import (fetchTarball {
   inherit sha256;
diff --git a/tutorial/WORKSPACE b/tutorial/WORKSPACE
@@ -13,6 +13,7 @@ rules_haskell_dependencies()
 load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
 
 haskell_register_ghc_nixpkgs(
+    attribute_path = "haskell.compiler.ghc865",
     repository = "@rules_haskell//nixpkgs:default.nix",
     version = "8.6.5",
 )

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+95e00aa0611eb657f3f09e2eb03b8d837a29fcca52a17ebad13f40883ac20647 bazel-2.1.0-darwin-x86_64`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+e13581d44faad6ac807dd917e682fef20359d26728166ac35dadd8ee653a580d bazel-2.1.0-linux-x86_64`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ee50e52d630ff15efaf0920c22d99839cefb6aafe909554fbd0419fadbb91105 bazel-2.1.0-windows-x86_64.exe`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ rules_haskell_dependencies()`
`13`	`13`	`load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")`
`14`	`14`
`15`	`15`	`haskell_register_ghc_nixpkgs(`
	`16`	`+ attribute_path = "haskell.compiler.ghc865",`
`16`	`17`	`repository = "@rules_haskell//nixpkgs:default.nix",`
`17`	`18`	`version = "8.6.5",`
`18`	`19`	`)`