Skip to content

Commit fe5efac

Browse files
authored
Merge pull request #52 from katrinafyi/basil-fix-protoc-patch
basil: fix protoc reference and update
2 parents 1bd97f0 + 7e3dca8 commit fe5efac

File tree

2 files changed

+8
-20
lines changed

2 files changed

+8
-20
lines changed

basil/0001-basil-protoc-version.patch

-13
This file was deleted.

basil/basil.nix

+8-7
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,26 @@
1111

1212
let
1313
replaceProtocPlaceholder = ''
14-
substituteInPlace build.sbt \
15-
--replace-fail 'PROTOC_PLACEHOLDER' '${lib.getExe protobuf}'
14+
cat <<EOF >> build.sbt
15+
PB.protocExecutable := file("${lib.getExe protobuf}")
16+
EOF
1617
'';
1718
mkSbtDerivation' = mkSbtDerivation.withOverrides { sbt = sbt.override { jre = jdk17; }; };
1819
in
1920
mkSbtDerivation' {
2021
pname = "basil";
21-
version = "0.1.2-alpha-unstable-2025-02-17";
22+
version = "0.1.2-alpha-unstable-2025-02-19";
2223

2324
nativeBuildInputs = [ makeBinaryWrapper ];
2425

2526
src = fetchFromGitHub {
2627
owner = "UQ-PAC";
2728
repo = "bil-to-boogie-translator";
28-
rev = "2d006ebadc761079bcecfd3ae0a683116db72e34";
29-
sha256 = "sha256-yFylN1C6HK32tsokNr0UDhSNESOFOE+abYh3ZLBPEvU=";
29+
rev = "880b0e4ab877253e2d59a6a472a78d8e71a01b1a";
30+
sha256 = "sha256-CqjNS9mP+CeTKnrGIZJhaWemIB/QMq/grGrswWgHPtc=";
3031
};
3132

32-
patches = [ ./0001-basil-protoc-version.patch ] ;
33+
patches = [ ] ;
3334

3435
# we must run the command in both the main derivation
3536
# and the dependency-generating derivation.
@@ -38,7 +39,7 @@ mkSbtDerivation' {
3839
};
3940
postPatch = replaceProtocPlaceholder;
4041

41-
depsSha256 = "sha256-KBhHr11b9/Ku2zhuw8wcNefG41IZSSmgC+AeRyvuZ0M=";
42+
depsSha256 = "sha256-fT9MaztD3YGp36RHa/6quZmWX0OAEpchbxxIcCAcMT4=";
4243

4344
buildPhase = ''
4445
runHook preBuild

0 commit comments

Comments
 (0)