feat: Add happy-arbitrary to the stack.

TokTok · Jan 9, 2024 · 60b6095 · 60b6095
1 parent b6801c6
commit 60b6095
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -28,6 +28,9 @@
 [submodule "hs-github-tools"]
 	path = hs-github-tools
 	url = https://github.com/TokTok/hs-github-tools
+[submodule "hs-happy-arbitrary"]
+	path = hs-happy-arbitrary
+	url = https://github.com/TokTok/hs-happy-arbitrary
 [submodule "hs-msgpack-arbitrary"]
 	path = hs-msgpack-arbitrary
 	url = https://github.com/TokTok/hs-msgpack-arbitrary

diff --git a/.hie-bios b/.hie-bios
@@ -4,6 +4,13 @@ import re
 import subprocess
 import sys
 
+
+def skip(line: str) -> bool:
+    # Ignore linker flags (don't need them for HLS).
+    # Ignore preprocessor defines (they can differ per project).
+    return line.startswith("-l") or line.startswith("-D")
+
+
 if "--regenerate" in sys.argv:
     subprocess.run(["tools/haskell/gen_haskell_targets"], check=True)
 subprocess.run(["bazel", "build", "//tools/haskell:hie-bios@bios"], check=True)
@@ -28,7 +35,7 @@ with open(os.environ["HIE_BIOS_OUTPUT"], "w") as fh:
             "/src/workspace/",
             line,
         )
-        if line != prev and not line.startswith("-l"):
+        if line != prev and not skip(line):
             fh.write(line)
         prev = line
     # Make warnings non-fatal

diff --git a/dockerfiles b/dockerfiles
diff --git a/ghc.nix b/ghc.nix
@@ -32,6 +32,7 @@ with (import <nixpkgs> { });
     exceptions
     expiring-cache-map
     extra
+    file-embed
     filepath
     generic-arbitrary
     github

diff --git a/hs-apigen b/hs-apigen
diff --git a/hs-github-tools b/hs-github-tools
diff --git a/hs-happy-arbitrary b/hs-happy-arbitrary
diff --git a/py_toxcore_c b/py_toxcore_c
diff --git a/stack.yaml b/stack.yaml
@@ -3,6 +3,7 @@ packages:
   - hs-apigen/
   - hs-cimple/
   - hs-github-tools/
+  - hs-happy-arbitrary/
   - hs-msgpack-arbitrary/
   - hs-msgpack-binary/
   - hs-msgpack-rpc-conduit/

diff --git a/third_party/haskell/BUILD.bazel b/third_party/haskell/BUILD.bazel
@@ -40,6 +40,7 @@ licenses(["notice"])
     "exceptions",
     "expiring-cache-map",
     "extra",
+    "file-embed",
     "filepath",
     "generic-arbitrary",
     "github",

diff --git a/tools/.github b/tools/.github
diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel
@@ -11,6 +11,7 @@ workspace(projects = [
     "hs-apigen",
     "hs-cimple",
     "hs-github-tools",
+    "hs-happy-arbitrary",
     "hs-msgpack-arbitrary",
     "hs-msgpack-binary",
     "hs-msgpack-rpc-conduit",

diff --git a/tools/built/src/Dockerfile.haskell b/tools/built/src/Dockerfile.haskell
@@ -11,6 +11,7 @@ RUN cmake -Bc-toxcore/_build -Hc-toxcore -GNinja -DBOOTSTRAP_DAEMON=OFF -DCMAKE_
 COPY --chown=builder:users hs-apigen/ /work/hs-apigen/
 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-happy-arbitrary/ /work/hs-happy-arbitrary/
 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-rpc-conduit/ /work/hs-msgpack-rpc-conduit/

diff --git a/tools/built/src/home/.config/home-manager/home.nix b/tools/built/src/home/.config/home-manager/home.nix
@@ -94,6 +94,7 @@
       nnoremap <C-l> :noh<CR><C-l>
       map Q gqap
 
+      au BufEnter *.x,*.y set ts=8 sw=8 noexpandtab
       au BufEnter BUILD.* set ft=bzl
       au FileType sh,javascript set ts=2 sw=2
       au FileType go set noexpandtab

diff --git a/tools/git-remotes b/tools/git-remotes
@@ -86,6 +86,10 @@ our %REPOS = (
       upstream => 'toktok',
       repo 'iphydf',
    }],
+   'hs-happy-arbitrary' => ['hs-happy-arbitrary', {
+      upstream => 'toktok',
+      repo 'iphydf',
+   }],
    'hs-msgpack-arbitrary' => ['hs-msgpack-arbitrary', {
       upstream => 'toktok',
       repo 'iphydf',

diff --git a/tools/haskell/haskell_targets.bzl b/tools/haskell/haskell_targets.bzl
@@ -15,6 +15,8 @@ HASKELL_TARGETS = [
     "//hs-github-tools:github-events",
     "//hs-github-tools:hs-github-tools",
     "//hs-github-tools:testsuite",
+    "//hs-happy-arbitrary:hs-happy-arbitrary",
+    "//hs-happy-arbitrary:testsuite",
     "//hs-msgpack-arbitrary:hs-msgpack-arbitrary",
     "//hs-msgpack-arbitrary:testsuite",
     "//hs-msgpack-binary:hs-msgpack-binary",
+2 −0		.circleci/build-image
+0 −10		.circleci/config.yml
+16 −0		.circleci/wait-image
+1 −1		.github/workflows/docker.yml
+19 −19		infer/Dockerfile
+11 −9		.circleci/config.yml
+0 −1		.cirrus.yml
+1 −0		.dockerignore
+3 −14		.github/workflows/ci.yml
+3 −0		.gitignore
+10 −23		BUILD.bazel
+4 −3		Dockerfile
+34 −0		pytox/common.py
+3 −6		pytox/toxav/toxav.pxd
+85 −0		pytox/toxav/toxav.pyi
+63 −28		pytox/toxav/toxav.pyx
+14 −43		pytox/toxcore/tox.pxd
+504 −0		pytox/toxcore/tox.pyi
+437 −360		pytox/toxcore/tox.pyx
+4 −6		pytox/toxencryptsave/toxencryptsave.pxd
+42 −0		pytox/toxencryptsave/toxencryptsave.pyi
+39 −39		pytox/toxencryptsave/toxencryptsave.pyx
+1 −0		setup.py
+1 −1		test/auto_tests/self_connection_status_test.py
+4 −3		test/tox_options_test.py
+27 −18		test/tox_test.py
+6 −2		test/toxav_test.py
+13 −8		test/toxencryptsave_test.py
+1 −2		tools/BUILD.bazel
+2 −1		tools/gen-api
+152 −2		tools/stubgen.py