Merge pull request #68 from FormationAI/simspace-test

Update rules_haskell and tests

.circleci/config.yml

@@ -18,7 +18,7 @@ jobs:
           command: |
             set -x
             export USER=circleci
-            VERSION=0.15.2
+            VERSION=0.21.0
             INSTALLER=bazel-$VERSION-installer-linux-x86_64.sh
             wget https://github.com/bazelbuild/bazel/releases/download/$VERSION/$INSTALLER
             chmod +x $INSTALLER
@@ -29,7 +29,7 @@ jobs:
           command: |
             sudo mkdir -p /nix
             sudo chown -R circleci /nix
-            NIX_RELEASE=1.11.14
+            NIX_RELEASE=2.1.3
             ARCH=x86_64
             wget https://nixos.org/releases/nix/nix-${NIX_RELEASE}/nix-${NIX_RELEASE}-${ARCH}-linux.tar.bz2
             tar -xjvf nix-${NIX_RELEASE}-${ARCH}-linux.tar.bz2

BUILD

@@ -2,6 +2,7 @@ load("@io_tweag_rules_haskell//haskell:haskell.bzl",
   "haskell_toolchain",
   "haskell_doctest_toolchain",
 )
+load("@io_tweag_rules_haskell//haskell:c2hs.bzl", "c2hs_toolchain")
 load("//tools:mangling.bzl", "hazel_binary")
 
 exports_files([
@@ -15,3 +16,8 @@ haskell_doctest_toolchain(
     name = "doctest",
     doctest = hazel_binary("doctest"),
 )
+
+c2hs_toolchain(
+  name ="c2hs",
+  c2hs = "@c2hs//:bin",
+)

BUILD.ghc

@@ -2,6 +2,7 @@
 package(default_visibility = [ "//visibility:public" ])
 
 load("@io_tweag_rules_haskell//haskell:haskell.bzl", "haskell_toolchain")
+load("@io_tweag_rules_haskell//haskell:c2hs.bzl", "c2hs_toolchain")
 
 filegroup(
     name = "bin",
@@ -40,7 +41,6 @@ cc_library(
 
 haskell_toolchain(
     name = "ghc",
-    c2hs = "@c2hs//:bin",
     version = "8.2.2",
     tools = ":bin",
     locale_archive = select({

WORKSPACE

@@ -14,10 +14,11 @@ load("@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl", "nixpkgs_git_repository", "
 
 nixpkgs_git_repository(
     name = "nixpkgs",
-    revision = "ee80654b5267b07ba10d62d143f211e0be81549e",
+    revision = "c37ae1dcf669b5b262350ddbb75a40be166e7e88",
 )
 
 load("//:cc_configure_custom.bzl", "cc_configure_custom")
+
 nixpkgs_package(
     name = "compiler",
     repository = "@nixpkgs",
@@ -36,7 +37,7 @@ cc_configure_custom(
     ld = "@binutils//:bin/ld",
 )
 
-RULES_HASKELL_SHA = "8bc2b2c847c54f3d9f6bd5000f8deefa1cf4c995"
+RULES_HASKELL_SHA = "8221d03cd38cee9cd956dd8f3e48ea0fa4440770"
 
 http_archive(
     name = "io_tweag_rules_haskell",
@@ -151,6 +152,7 @@ filegroup(
 
 register_toolchains(
     "@ghc//:ghc",
+    "//:c2hs",
     "//:doctest",
 )
 
@@ -194,7 +196,7 @@ hazel_custom_package_github(
   github_user = "FormationAI",
   github_repo = "wai",
   strip_prefix = "wai-app-static",
-  repo_sha = "aaa0dca56231c060372004cda46d719ec6cc3ec5",
+  repo_sha = "9217512fae1d6c2317447b257f478005efb55ef7",
 )
 
 load("//:packages.bzl", "packages", "core_packages")

test-packages.txt

@@ -1,19 +1,18 @@
-aeson
-aeson_extra
-cassava
-conduit
-entropy
-fuzzyset
-hsndfile
-htaglib
-http_client
-language_c
-lens
-network
-postgresql_libpq
-pretty_show
-text_metrics
-unix_compat
-unix_time
-wai_app_static
-zlib
+aeson_92704494
+aeson_extra_2122370161
+cassava_555306702
+entropy__1591567247
+fuzzyset_1745887768
+hsndfile__1202908931
+htaglib_1224840979
+http_client__884921168
+language_c__176479442
+lens_3318014
+network_1843485230
+postgresql_libpq_275795853
+pretty_show_1195896308
+text_metrics_1740008483
+unix_compat__2123728025
+unix_time__403943438
+wai_app_static__1453541560
+zlib_3741643

third_party/cabal2bazel/bzl/cabal_package.bzl

@@ -21,11 +21,11 @@ and {hash} is the Bazel hash of the original package name.
 """
 load("@bazel_skylib//:lib.bzl", "paths")
 load("@io_tweag_rules_haskell//haskell:haskell.bzl",
-     "c2hs_library",
      "haskell_library",
      "haskell_binary",
      "haskell_cc_import",
 )
+load("@io_tweag_rules_haskell//haskell:c2hs.bzl", "c2hs_library")
 load(":bzl/alex.bzl", "genalex")
 load(":bzl/cabal_paths.bzl", "cabal_paths")
 load(":bzl/happy.bzl", "genhappy")

third_party/haskell/BUILD.conduit

@@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"])
 load("@io_tweag_rules_haskell//haskell:haskell.bzl",
   "haskell_library",
 )
-load("//tools:mangling.bzl", "hazel_library")
+load("@ai_formation_hazel//:hazel.bzl", "hazel_library")
 
 haskell_library(
   name = "conduit",