fix: Fix support for Haskell IDEs, including vscode.

Also auto-generate haskell targets for the HIE BIOS.

Author: iphydf

.bazelrc

@@ -322,12 +322,12 @@ build:gnulike --per_file_copt='external/com_google_absl[:/]@-UNO_FRAME_POINTER,-
 build:linux-arm64-musl --per_file_copt='external/com_google_absl/absl/base/internal/low_level_alloc.cc@-Doff64_t=long'
 
 # Compile toxcore as C++.
-build:clang --per_file_copt='//c-toxcore/@-xc++,-std=c++17'
-build:clang --per_file_copt='//c-toxcore/@-Wno-alloca'
-build:clang --per_file_copt='//c-toxcore/@-Wno-c99-extensions'
-build:clang --per_file_copt='//c-toxcore/@-Wno-old-style-cast'
-build:clang --per_file_copt='//c-toxcore/@-Wno-unreachable-code-return'
-build:clang --per_file_copt='//c-toxcore/@-Wno-unused-macros'
+build:c-as-cpp --per_file_copt='//c-toxcore/@-xc++,-std=c++17'
+build:c-as-cpp --per_file_copt='//c-toxcore/@-Wno-alloca'
+build:c-as-cpp --per_file_copt='//c-toxcore/@-Wno-c99-extensions'
+build:c-as-cpp --per_file_copt='//c-toxcore/@-Wno-old-style-cast'
+build:c-as-cpp --per_file_copt='//c-toxcore/@-Wno-unreachable-code-return'
+build:c-as-cpp --per_file_copt='//c-toxcore/@-Wno-unused-macros'
 
 # Cython code isn't very clean.
 build:clang --per_file_copt='//py_toxcore_c[:/]@-Wno-cast-function-type-strict'

.bazelversion

@@ -34,9 +34,6 @@
 [submodule "hs-msgpack-binary"]
 	path = hs-msgpack-binary
 	url = https://github.com/TokTok/hs-msgpack-binary
-[submodule "hs-msgpack-persist"]
-	path = hs-msgpack-persist
-	url = https://github.com/TokTok/hs-msgpack-persist
 [submodule "hs-msgpack-rpc-conduit"]
 	path = hs-msgpack-rpc-conduit
 	url = https://github.com/TokTok/hs-msgpack-rpc-conduit

.gitmodules

@@ -2,13 +2,25 @@
 import os
 import subprocess
 
-subprocess.run(
-    ["bazel", "build", "//tools:hie-bios", "--output_groups=hie_bios"],
-    check=True)
+subprocess.run(["tools/haskell/gen_haskell_targets"], check=True)
+result = subprocess.run(
+    ["bazel", "run", "//tools:hie-bios@bios", "--output_groups=hie_bios"],
+    check=True,
+    capture_output=True,
+)
 with open(os.environ["HIE_BIOS_OUTPUT"], "w") as fh:
-    fh.write("-hide-all-packages\n")
-    with open("bazel-bin/tools/hie-bios@hie-bios", "r") as bios:
-        for line in bios.readlines():
+    prev = None
+    for line in result.stdout.decode("utf-8").splitlines(keepends=True):
+        line = line.replace(
+            "/home/builder/.cache/bazel/_bazel_builder/a08c2e4811c846650b733c6fc815a920/execroot/toktok/bazel-out/k8-fastbuild/bin/",
+            "/src/workspace/bazel-bin/",
+        )
+        line = line.replace(
+            "/home/builder/.cache/bazel/_bazel_builder/a08c2e4811c846650b733c6fc815a920/execroot/toktok/",
+            "/src/workspace/",
+        )
+        if line != prev and not line.startswith("-l"):
             fh.write(line)
+        prev = line
     # Make warnings non-fatal
     fh.write("-Wwarn\n")

.hie-bios

@@ -53,15 +53,15 @@ install_deps()
 github_archive(
     name = "io_bazel_rules_go",
     repo = "bazelbuild/rules_go",
-    sha256 = "2c6388e97cb4fb30546d65e983c45bb422bfe32c6e946af329cd1c52f1eaf836",
-    version = "v0.39.1",
+    sha256 = "82f7ae1c9ffcfde827f4164123a6775c5c28d9993d291e4fd40bf40698926569",
+    version = "v0.41.0",
 )
 
 github_archive(
     name = "bazel_gazelle",
     repo = "bazelbuild/bazel-gazelle",
-    sha256 = "1e246edb247c76ddf698ddc58fec7d3a9f908131b356133e6dccf91194d47aee",
-    version = "v0.33.0",
+    sha256 = "4aa8e6c9cb98a9814c82289e4a87c661aa16c8b31bffa448163da8fd20a5bb93",
+    version = "v0.35.0",
 )
 
 load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies")
@@ -74,8 +74,9 @@ go_rules_dependencies()
 github_archive(
     name = "rules_haskell",
     repo = "tweag/rules_haskell",
-    sha256 = "c9c2dc3d1a97e8b16d85c73d45d7f8c3a8d3bb7b35783c4305e61e0aed8a3ea5",
-    version = "2d0942ec1d9ad239c44c6cfc635fa7e51cd0f0f3",
+    sha256 = "713d03014f08f20ad9d68fe458703f3f7bdbc8c94c21be22748af5728f5c7c4b",
+    # TODO(https://github.com/tweag/rules_haskell/issues/2097): Upgrade once this bug is fixed.
+    version = "d14584e7f227fee55d857694d6ba7dc7e74d8f3c",
 )
 
 load(
@@ -103,8 +104,8 @@ load(
 
 nixpkgs_git_repository(
     name = "nixpkgs",
-    revision = "23.05",
-    sha256 = "f2b96094f6dfbb53b082fe8709da94137475fcfead16c960f2395c98fc014b68",
+    revision = "23.11",
+    sha256 = "bc9a0a74e8d7fb0e11434dd3abaa0cb0572ccd3a65b5a192eea41832b286e8a0",
 )
 
 FULLY_STATIC = False
@@ -114,8 +115,8 @@ NIXPKGS = {
     "prefix": "pkgsStatic.",
     "suffix": ".pkgsStatic",
 } if FULLY_STATIC else {
-    #"cc": "llvmPackages_16.libcxxClang",
-    "cc": "llvmPackages_16.clang",
+    #"cc": "libcxxClang",
+    "cc": "clang",
     "prefix": "",
     "suffix": "",
 }
@@ -143,7 +144,7 @@ nixpkgs_package(
 
 nixpkgs_package(
     name = "libllvm",
-    attribute_path = "llvmPackages_16.libllvm",
+    attribute_path = "libllvm",
     build_file = "//third_party:BUILD.libllvm",
     repository = "@nixpkgs",
 )
@@ -220,16 +221,16 @@ http_archive(
     patch_cmds = [
         "chmod 755 java_tools/ijar/ijar",
         "{patchelf} --set-interpreter {ld_linux} --add-rpath {gcc_lib} java_tools/ijar/ijar".format(
-            gcc_lib = "/nix/store/yazs3bdl481s2kyffgsa825ihy1adn8f-gcc-12.2.0-lib/lib",
-            ld_linux = "/nix/store/yaz7pyf0ah88g2v505l38n0f3wg2vzdj-glibc-2.37-8/lib64/ld-linux-x86-64.so.2",
-            patchelf = "/nix/store/ywwjpdyhar4f3vcqf4qk77vrbr3vj5wl-patchelf-0.15.0/bin/patchelf",
+            gcc_lib = "/nix/store/myw67gkgayf3s2mniij7zwd79lxy8v0k-gcc-12.3.0-lib/lib",
+            ld_linux = "/nix/store/qn3ggz5sf3hkjs2c797xf7nan3amdxmp-glibc-2.38-27/lib64/ld-linux-x86-64.so.2",
+            patchelf = "/nix/store/85jldj870vzcl72yz03labc93bwvqayx-patchelf-0.15.0/bin/patchelf",
         ),
         "chmod 555 java_tools/ijar/ijar",
         "chmod 755 java_tools/src/tools/singlejar/singlejar_local",
         "{patchelf} --set-interpreter {ld_linux} --add-rpath {gcc_lib} java_tools/src/tools/singlejar/singlejar_local".format(
-            gcc_lib = "/nix/store/yazs3bdl481s2kyffgsa825ihy1adn8f-gcc-12.2.0-lib/lib",
-            ld_linux = "/nix/store/yaz7pyf0ah88g2v505l38n0f3wg2vzdj-glibc-2.37-8/lib64/ld-linux-x86-64.so.2",
-            patchelf = "/nix/store/ywwjpdyhar4f3vcqf4qk77vrbr3vj5wl-patchelf-0.15.0/bin/patchelf",
+            gcc_lib = "/nix/store/myw67gkgayf3s2mniij7zwd79lxy8v0k-gcc-12.3.0-lib/lib",
+            ld_linux = "/nix/store/qn3ggz5sf3hkjs2c797xf7nan3amdxmp-glibc-2.38-27/lib64/ld-linux-x86-64.so.2",
+            patchelf = "/nix/store/85jldj870vzcl72yz03labc93bwvqayx-patchelf-0.15.0/bin/patchelf",
         ),
         "chmod 555 java_tools/src/tools/singlejar/singlejar_local",
     ],
@@ -282,7 +283,8 @@ load(
 # https://api.haskell.build/haskell/nixpkgs.html#haskell_register_ghc_nixpkgs
 haskell_register_ghc_nixpkgs(
     attribute_path = "ghc",
-    compiler_flags = [
+    #fully_static_link = True,
+    ghcopts = [
         "-Wall",
         "-Werror",
         "-XHaskell2010",
@@ -292,11 +294,10 @@ haskell_register_ghc_nixpkgs(
         "-optc=-Wno-unused-command-line-argument",
         "-optl=-Wl,--no-fatal-warnings",
     ],
-    #fully_static_link = True,
     nix_file = "//:ghc.nix",
     repositories = {"nixpkgs": "@nixpkgs"},
     #static_runtime = True,
-    version = "9.2.7",
+    version = "9.4.8",
 )
 
 [nixpkgs_package(

WORKSPACE

@@ -57,7 +57,6 @@ with (import <nixpkgs> { });
     mtl
     network
     parallel
-    persist
     pretty
     process
     QuickCheck

c-toxcore-hs

@@ -1,4 +1,4 @@
 cradle:
   bios:
     program: ".hie-bios"
-    with-ghc: "bazel-workspace/external/rules_haskell_ghc_linux_amd64/bin/ghc"
+    with-ghc: "bazel-workspace/external/rules_haskell_ghc_nixpkgs/bin/ghc"

dockerfiles

@@ -5,7 +5,6 @@ packages:
   - hs-github-tools/
   - hs-msgpack-arbitrary/
   - hs-msgpack-binary/
-  - hs-msgpack-persist/
   - hs-msgpack-rpc-conduit/
   - hs-msgpack-testsuite/
   - hs-msgpack-types/
@@ -16,7 +15,6 @@ packages:
 resolver: lts-21.9
 extra-deps:
   - monad-validate-1.3.0.0
-  - persist-0.1.1.5
   - suspend-0.2.0.0
   - timers-0.2.0.4
 allow-newer: true

ghc.nix

@@ -62,7 +62,6 @@ licenses(["notice"])
     "mtl",
     "network",
     "parallel",
-    "persist",
     "pretty",
     "process",
     "QuickCheck",

hie.yaml

@@ -38,7 +38,7 @@ def hspec_library(name, src_strip_prefix, **kwargs):
         **kwargs
     )
 
-def hspec_test(name, **kwargs):
+def hspec_test(name, visibility=["//tools/haskell:__pkg__"], **kwargs):
     """HSpec test."""
     srcs = native.glob(["test/*/**/*.*hs"])
 
@@ -58,5 +58,6 @@ def hspec_test(name, **kwargs):
         srcs = srcs + [name + "_hspec_driver"],
         main_file = "test/Spec.hs",
         src_strip_prefix = "test",
+        visibility = visibility,
         **kwargs
     )

hs-apigen

@@ -56,7 +56,7 @@
 #define ZMQ_HAVE_PTHREAD_SET_AFFINITY
 #define HAVE_ACCEPT4
 #define HAVE_STRNLEN
-/* #undef ZMQ_HAVE_STRLCPY */
+#define ZMQ_HAVE_STRLCPY
 /* #undef ZMQ_HAVE_LIBBSD */
 
 #define ZMQ_HAVE_IPC

hs-cimple

@@ -285,7 +285,7 @@ def qt_test(name, src, deps, copts = [], mocopts = [], size = None):
         srcs = [src],
         copts = copts + ["-I$(GENDIR)/%s/%s" % (native.package_name(), src[:src.rindex("/")])],
         # TODO(iphydf): Infer this, rather than hard-coding the Qt version number.
-        env = {"QT_PLUGIN_PATH": "external/qt5.qtbase.bin/lib/qt-5.15.9/plugins"},
+        env = {"QT_PLUGIN_PATH": "external/qt5.qtbase.bin/lib/qt-5.15.11/plugins"},
         data = ["@qt//:qt_platform"],
         deps = deps + [
             ":%s_moc" % name,

hs-github-tools

@@ -1,4 +1,3 @@
-load("@rules_haskell//haskell:defs.bzl", "haskell_repl")
 load("//tools/project:build_defs.bzl", "workspace")
 
 workspace(projects = [
@@ -14,7 +13,6 @@ workspace(projects = [
     "hs-github-tools",
     "hs-msgpack-arbitrary",
     "hs-msgpack-binary",
-    "hs-msgpack-persist",
     "hs-msgpack-rpc-conduit",
     "hs-msgpack-testsuite",
     "hs-msgpack-types",
@@ -33,25 +31,6 @@ workspace(projects = [
     "website",
 ])
 
-haskell_repl(
-    name = "hie-bios",
-    collect_data = False,
-    deps = [
-        "//hs-cimple",
-        "//hs-github-tools",
-        "//hs-msgpack-arbitrary",
-        "//hs-msgpack-binary",
-        "//hs-msgpack-persist",
-        "//hs-msgpack-rpc-conduit",
-        "//hs-msgpack-testsuite",
-        "//hs-msgpack-types",
-        "//hs-schema",
-        "//hs-tokstyle",
-        "//hs-toxcore",
-        "//hs-toxcore-c",
-    ],
-)
-
 exports_files(srcs = [
     "LICENSE.gpl3",
     "LICENSE.hs-msgpack",

hs-msgpack-arbitrary

@@ -13,8 +13,8 @@ FROM toxchat/toktok-stack:latest-fastbuild
 ENV USER=builder
 
 RUN sudo nix-daemon --daemon & sleep 1 \
- && nix-channel --add https://github.com/NixOS/nixpkgs/archive/refs/tags/23.05.tar.gz nixpkgs \
- && nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager \
+ && nix-channel --add https://github.com/NixOS/nixpkgs/archive/refs/tags/23.11.tar.gz nixpkgs \
+ && nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager \
  && nix-channel --update \
  && nix-shell '<home-manager>' -A install
 

hs-msgpack-binary

@@ -13,7 +13,6 @@ COPY --chown=builder:users hs-cimple/ /work/hs-cimple/
 COPY --chown=builder:users hs-github-tools/ /work/hs-github-tools/
 COPY --chown=builder:users hs-msgpack-arbitrary/ /work/hs-msgpack-arbitrary/
 COPY --chown=builder:users hs-msgpack-binary/ /work/hs-msgpack-binary/
-COPY --chown=builder:users hs-msgpack-persist/ /work/hs-msgpack-persist/
 COPY --chown=builder:users hs-msgpack-rpc-conduit/ /work/hs-msgpack-rpc-conduit/
 COPY --chown=builder:users hs-msgpack-testsuite/ /work/hs-msgpack-testsuite/
 COPY --chown=builder:users hs-msgpack-types/ /work/hs-msgpack-types/

hs-msgpack-persist

@@ -8,11 +8,14 @@ RUN ["mkdir", "/tmp/cirrus-ci-build"]
 # minimum number of files to avoid rebuilding this when making changes to the
 # toktok-stack tools.
 COPY --chown=builder:users tools/bazelrc.boot /src/workspace/.bazelrc
-COPY --chown=builder:users BUILD.bazel WORKSPACE .bazelignore .bazelversion ghc.nix /src/workspace/
+COPY --chown=builder:users BUILD.bazel WORKSPACE .bazelignore ghc.nix /src/workspace/
 COPY --chown=builder:users third_party /src/workspace/third_party
 COPY --chown=builder:users tools/config /src/workspace/tools/config
 COPY --chown=builder:users tools/workspace /src/workspace/tools/workspace
 WORKDIR /src/workspace
 RUN sudo nix-daemon --daemon & bazel aquery --output=proto --show_timestamps //... > /dev/null
 
+# TODO(https://github.com/tweag/rules_nixpkgs/issues/439): Remove.
+RUN sudo sed -Eie "s!\b(mktemp|rm)\b!$(echo -n /nix/store/*-coreutils-9.3/bin/)\1!" /nix/store/*-clang-wrapper-*/bin/cc
+
 # vim:ft=dockerfile