From c4c5f75404de1dddfaf7b5867ca3fd2c6fce6252 Mon Sep 17 00:00:00 2001
From: "G. Weinholt" <git@weinholt.se>
Date: Sat, 30 Sep 2023 11:31:07 +0200
Subject: [PATCH] ypsilon: Use the upstream repository

---
 .github/workflows/ypsilon-push-action.yml                 | 8 ++++----
 .../ypsilon/{head-lambdaconservatory => head}/Dockerfile  | 7 ++++++-
 .../{head-lambdaconservatory => head}/scheme-script       | 0
 scripts/implementations.scm                               | 6 +++---
 4 files changed, 13 insertions(+), 8 deletions(-)
 rename implementations/ypsilon/{head-lambdaconservatory => head}/Dockerfile (82%)
 rename implementations/ypsilon/{head-lambdaconservatory => head}/scheme-script (100%)

diff --git a/.github/workflows/ypsilon-push-action.yml b/.github/workflows/ypsilon-push-action.yml
index 815089c..9d5f3e9 100644
--- a/.github/workflows/ypsilon-push-action.yml
+++ b/.github/workflows/ypsilon-push-action.yml
@@ -25,12 +25,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Build and push schemers/ypsilon:head-lambdaconservatory
+        name: Build and push schemers/ypsilon:head
         uses: docker/build-push-action@v2
         with:
           push: true
-          context: implementations/ypsilon/head-lambdaconservatory/
+          context: implementations/ypsilon/head/
           tags: |
-            schemers/ypsilon:head-lambdaconservatory
-            schemers/ypsilon:head-lambdaconservatory-bullseye-slim
+            schemers/ypsilon:head
+            schemers/ypsilon:head-bullseye-slim
             schemers/ypsilon:latest
diff --git a/implementations/ypsilon/head-lambdaconservatory/Dockerfile b/implementations/ypsilon/head/Dockerfile
similarity index 82%
rename from implementations/ypsilon/head-lambdaconservatory/Dockerfile
rename to implementations/ypsilon/head/Dockerfile
index 8ee3691..caa6ba4 100644
--- a/implementations/ypsilon/head-lambdaconservatory/Dockerfile
+++ b/implementations/ypsilon/head/Dockerfile
@@ -7,9 +7,13 @@ RUN apt-get update && apt-get -y --no-install-recommends install \
       git \
       libffi-dev \
       libgmp-dev \
+      llvm \
+      clang \
+      llvm-dev \
+      lld \
  && rm -rf /var/lib/apt/lists/*
 WORKDIR /build/
-RUN git clone https://github.com/lambdaconservatory/ypsilon.git --depth 1
+RUN git clone https://github.com/fujita-y/ypsilon.git --depth 1
 WORKDIR /build/ypsilon
 RUN make
 RUN make check
@@ -19,6 +23,7 @@ FROM debian:bullseye-slim
 RUN apt-get update && apt-get -y --no-install-recommends install \
       libffi7 \
       libgmp10 \
+      libllvm11 \
  && rm -rf /var/lib/apt/lists/*
 COPY --from=build /usr/local/ /usr/local/
 COPY scheme-script /usr/local/bin
diff --git a/implementations/ypsilon/head-lambdaconservatory/scheme-script b/implementations/ypsilon/head/scheme-script
similarity index 100%
rename from implementations/ypsilon/head-lambdaconservatory/scheme-script
rename to implementations/ypsilon/head/scheme-script
diff --git a/scripts/implementations.scm b/scripts/implementations.scm
index e2a1b9f..b334845 100644
--- a/scripts/implementations.scm
+++ b/scripts/implementations.scm
@@ -394,8 +394,8 @@
 (define-implementation
   (name "ypsilon")
   (versions (version
-             (name "head-lambdaconservatory")
-             (tags "head-lambdaconservatory"
-                   "head-lambdaconservatory-bullseye-slim"
+             (name "head")
+             (tags "head"
+                   "head-bullseye-slim"
                    "latest"))))