Skip to content

Commit 4deb4be

Browse files
authored
Merge pull request #1192 from IntersectMBO/remove-srp-for-haskell-llmdb-mock
Remove SRP for `haskell-lmdb-mock`
2 parents e97192a + 9130bd0 commit 4deb4be

3 files changed

Lines changed: 19 additions & 6 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
description: Removed SRP for `haskell-lmdb-mock` which is no longer needed.
2+
kind:
3+
- maintenance
4+
pr: 1192
5+
project: cardano-wasm

cabal.project

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,6 @@ if arch(wasm32)
9494
criterion-measurement
9595
--sha256: sha256-wzEwOUTeFL0C3QnS25/3X1ue2tUuedrLqtT0h1JZW6c=
9696

97-
source-repository-package
98-
type: git
99-
location: https://github.com/palas/haskell-lmdb-mock.git
100-
tag: c8d61e6eee03ee271e7768c0576110da885aec48
101-
--sha256: sha256-+gB1MmM6qRApz1p7tFsdvKoAWDrYB4a+bJ9Djm6ieYI=
102-
10397
source-repository-package
10498
type: git
10599
location: https://github.com/palas/double-conversion.git

flake.nix

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,19 @@
294294
src = nixpkgs.blst.src;
295295
});
296296
};
297+
# Stub pkg-config file so the cabal solver can resolve
298+
# cardano-lmdb (a transitive dependency of ouroboros-consensus
299+
# that nothing in this project actually needs). Without this,
300+
# the solver rejects cardano-lmdb because lmdb is not
301+
# available for wasm. Per-component builds ensure it is never
302+
# actually compiled.
303+
lmdb-pkg-config-stub = wasm-pkgs.writeTextDir "lib/pkgconfig/lmdb.pc" ''
304+
Name: lmdb
305+
Description: Stub for cabal solver — not actually built
306+
Version: 0.9.33
307+
Libs: -llmdb
308+
Cflags:
309+
'';
297310
in
298311
lib.optionalAttrs (system != "x86_64-darwin") {
299312
wasm = wasm-pkgs.mkShell {
@@ -308,6 +321,7 @@
308321
wasm.libsodium
309322
wasm.secp256k1
310323
wasm.blst
324+
lmdb-pkg-config-stub
311325
]
312326
++ lib.optional (system == "x86_64-linux" || system == "aarch64-linux") wasm-pkgs.envoy-bin;
313327
};

0 commit comments

Comments
 (0)