Skip to content

Commit

Permalink
Add source artifacts for Scala compiler bridge (#1016)
Browse files Browse the repository at this point in the history
#1006 is failing
because the Scala Maven plugin is trying to download the sources for the
compiler bridge, but can't do so outside of a Nix FOD. This PR adds the
bridge to the manually-downloaded Maven artifacts (as we did in
runtimeverification/k#4055)
  • Loading branch information
Baltoli authored Mar 18, 2024
1 parent 6974d78 commit f303f5b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
5 changes: 5 additions & 0 deletions matching/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@
<version>1.4</version>
<classifier>linux64</classifier>
</dependency>
<dependency>
<groupId>org.scala-sbt</groupId>
<artifactId>compiler-bridge_2.12</artifactId>
<version>1.8.0</version>
</dependency>
</dependencies>

<build>
Expand Down
6 changes: 6 additions & 0 deletions nix/llvm-backend-matching.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,17 @@ let self = maven.buildMavenPackage rec {
"org.apache.maven.plugins:maven-compiler-plugin:3.7.0"
];

manualMvnSourceArtifacts = [
"org.scala-sbt:compiler-bridge_2.12"
];

passthru = {
jar =
"${self}/share/java/llvm-backend-matching-1.0-SNAPSHOT-jar-with-dependencies.jar";
};

mvnParameters = "-DsecondaryCacheDir=secondary-cache";

installPhase = ''
mkdir -p $out/share/java
install -Dm644 target/*.jar $out/share/java
Expand Down
2 changes: 1 addition & 1 deletion nix/overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ let

llvm-backend-matching = import ./llvm-backend-matching.nix {
src = prev.llvm-backend-matching-src;
mvnHash = "sha256-5wHyZF/a4seBo3gOHXkhNJimMyUaXxlSSbMeBH7ET7k=";
mvnHash = "sha256-2X8G3T05Pk1apA0f04Mdu/8DAB89oB9XwTBQ3KVoc/A=";
inherit (final) maven;
};

Expand Down

0 comments on commit f303f5b

Please sign in to comment.