diff --git a/.github/workflows/Dockerfile.stack-deps b/.github/workflows/Dockerfile.stack-deps index a3a9a337bfe..9ff869e992b 100644 --- a/.github/workflows/Dockerfile.stack-deps +++ b/.github/workflows/Dockerfile.stack-deps @@ -22,6 +22,7 @@ RUN groupadd -g $GROUP_ID $GROUP && useradd -m -u $USER_ID -s /bin/sh -g $GROUP USER $USER:$GROUP ENV LC_ALL=C.UTF-8 -ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/stack.yaml /home/$USER/.tmp-haskell/ -ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/kore/kore.cabal /home/$USER/.tmp-haskell/kore/ +ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/stack.yaml /home/$USER/.tmp-haskell/ +ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/kore/kore.cabal /home/$USER/.tmp-haskell/kore/ +ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/kore-rpc-types/kore-rpc-types.cabal /home/$USER/.tmp-haskell/kore-rpc-types/ RUN cd /home/$USER/.tmp-haskell && stack build --only-snapshot diff --git a/Dockerfile b/Dockerfile index 55a6c45277a..17334df1a67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,8 +60,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib ENV PATH=/home/user/hub-linux-amd64-2.14.0/bin:$PATH ENV LC_ALL=C.UTF-8 -ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/stack.yaml .tmp-haskell/ -ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/kore/kore.cabal .tmp-haskell/kore/ +ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/stack.yaml .tmp-haskell/ +ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/kore/kore.cabal .tmp-haskell/kore/ +ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/kore-rpc-types/kore-rpc-types.cabal .tmp-haskell/kore-rpc-types/ RUN cd .tmp-haskell && stack build --only-snapshot ADD pom.xml .tmp-maven/ diff --git a/flake.lock b/flake.lock index 8b965cfe3c1..d714c6a4ed4 100644 --- a/flake.lock +++ b/flake.lock @@ -365,11 +365,11 @@ "z3-src": "z3-src" }, "locked": { - "lastModified": 1677110667, - "narHash": "sha256-Z8SXi8hYYfhlGKphJkGwPmVoGDg5N1n6miBShwlT1w8=", + "lastModified": 1677844963, + "narHash": "sha256-VTYMtLkhwrxt0sA02/yunAKe0qG7DAumpU1+A/9bySk=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "6b574836fb2af7265cab719ccdae6b960fea6f72", + "rev": "559424aa4841449a0e83d7c555264d68b03cf475", "type": "github" }, "original": { diff --git a/haskell-backend/src/main/native/haskell-backend b/haskell-backend/src/main/native/haskell-backend index 6b574836fb2..559424aa484 160000 --- a/haskell-backend/src/main/native/haskell-backend +++ b/haskell-backend/src/main/native/haskell-backend @@ -1 +1 @@ -Subproject commit 6b574836fb2af7265cab719ccdae6b960fea6f72 +Subproject commit 559424aa4841449a0e83d7c555264d68b03cf475 diff --git a/k-distribution/tests/regression-new/issue-1682-korePrettyPrint/1.test.out b/k-distribution/tests/regression-new/issue-1682-korePrettyPrint/1.test.out index b5d5565ddc3..409d08dec4d 100644 --- a/k-distribution/tests/regression-new/issue-1682-korePrettyPrint/1.test.out +++ b/k-distribution/tests/regression-new/issue-1682-korePrettyPrint/1.test.out @@ -1,16 +1,16 @@ -/* Fl Fn D Sfa */ +/* T Fn D Sfa */ Lbl'-LT-'generatedTop'-GT-'{}( - /* Fl Fn D Sfa */ + /* T Fn D Sfa */ Lbl'-LT-'k'-GT-'{}( - /* Fl Fn D Sfa */ + /* T Fn D Sfa */ kseq{}( - /* Fl Fn D Sfa */ + /* T Fn D Sfa */ /* Inj: */ inj{SortInt{}, SortKItem{}}( - /* Fl Fn D Sfa */ Var'QuesUnds'Gen0:SortInt{} + /* T Fn D Sfa */ Var'QuesUnds'Gen0:SortInt{} ), - /* Fl Fn D Sfa Cl */ dotk{}() + /* T Fn D Sfa Cl */ dotk{}() ) ), - /* Fl Fn D Sfa Cl */ - Lbl'-LT-'generatedCounter'-GT-'{}(/* Fl Fn D Sfa Cl */ \dv{SortInt{}}("0")) + /* T Fn D Sfa Cl */ + Lbl'-LT-'generatedCounter'-GT-'{}(/* T Fn D Sfa Cl */ \dv{SortInt{}}("0")) ) diff --git a/package/arch/Dockerfile.stack-deps b/package/arch/Dockerfile.stack-deps index 772ab373974..42d333b5952 100644 --- a/package/arch/Dockerfile.stack-deps +++ b/package/arch/Dockerfile.stack-deps @@ -19,6 +19,7 @@ RUN groupadd -g $GROUP_ID $GROUP && useradd -m -u $USER_ID -s /bin/sh -g $GROUP USER $USER:$GROUP ENV LC_ALL=C.UTF-8 -ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/stack.yaml /home/$USER/.tmp-haskell/ -ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/kore/kore.cabal /home/$USER/.tmp-haskell/kore/ +ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/stack.yaml /home/$USER/.tmp-haskell/ +ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/kore/kore.cabal /home/$USER/.tmp-haskell/kore/ +ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/kore-rpc-types/kore-rpc-types.cabal /home/$USER/.tmp-haskell/kore-rpc-types/ RUN cd /home/$USER/.tmp-haskell && stack build --only-snapshot diff --git a/package/debian/Dockerfile b/package/debian/Dockerfile index 423c8cfa5f8..48b14edb1fc 100644 --- a/package/debian/Dockerfile +++ b/package/debian/Dockerfile @@ -66,8 +66,9 @@ RUN groupadd -g $GROUP_ID user \ USER $USER_ID:$GROUP_ID ENV LC_ALL=C.UTF-8 -ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/stack.yaml /home/user/.tmp-haskell/ -ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/kore/kore.cabal /home/user/.tmp-haskell/kore/ +ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/stack.yaml /home/user/.tmp-haskell/ +ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/kore/kore.cabal /home/user/.tmp-haskell/kore/ +ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/kore-rpc-types/kore-rpc-types.cabal /home/user/.tmp-haskell/kore-rpc-types/ RUN cd /home/user/.tmp-haskell \ && stack build --only-snapshot