Skip to content

Commit 13e01cd

Browse files
committed
Add proto-js-bundle to hydra
1 parent df4e3c7 commit 13e01cd

File tree

1 file changed

+22
-11
lines changed

1 file changed

+22
-11
lines changed

flake.nix

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
};
7575
inherit (nixpkgs) lib;
7676

77-
proto-js-bundle-drv = import ./nix/proto-to-js.nix { pkgs = nixpkgs; };
77+
proto-js-bundle-drv = import ./nix/proto-to-js.nix {pkgs = nixpkgs;};
7878

7979
# We use cabalProject' to ensure we don't build the plan for
8080
# all systems.
@@ -152,7 +152,11 @@
152152
};
153153
};
154154
})
155-
({pkgs, config, ...}: let
155+
({
156+
pkgs,
157+
config,
158+
...
159+
}: let
156160
generatedExampleFiles = ["cardano-wasm/lib-wrapper/cardano-api.d.ts"];
157161
exportWasmPath = "export CARDANO_WASM=${config.hsPkgs.cardano-wasm.components.exes.cardano-wasm}/bin/cardano-wasm${pkgs.stdenv.hostPlatform.extensions.executable}";
158162
in {
@@ -210,16 +214,16 @@
210214
};
211215
};
212216
playwrightShell = let
213-
playwright-pkgs = inputs.nixpkgs.legacyPackages.${system};
214-
in {
215-
playwright = playwright-pkgs.mkShell {
216-
packages = [
217-
playwright-pkgs.playwright-test
218-
playwright-pkgs.python313Packages.docopt
219-
playwright-pkgs.python313Packages.httpserver
220-
];
221-
};
217+
playwright-pkgs = inputs.nixpkgs.legacyPackages.${system};
218+
in {
219+
playwright = playwright-pkgs.mkShell {
220+
packages = [
221+
playwright-pkgs.playwright-test
222+
playwright-pkgs.python313Packages.docopt
223+
playwright-pkgs.python313Packages.httpserver
224+
];
222225
};
226+
};
223227
flakeWithWasmShell = nixpkgs.lib.recursiveUpdate flake {
224228
devShells = wasmShell;
225229
hydraJobs = {devShells = wasmShell;};
@@ -240,7 +244,14 @@
240244
// {
241245
# This ensure hydra send a status for the required job (even if no change other than commit hash)
242246
revision = nixpkgs.writeText "revision" (inputs.self.rev or "dirty");
247+
proto-js-bundle = proto-js-bundle-drv;
243248
};
249+
}
250+
// lib.optionalAttrs (system != "aarch64-darwin")
251+
{
252+
packages = {
253+
proto-js-bundle = proto-js-bundle-drv;
254+
};
244255
};
245256
legacyPackages = {
246257
inherit cabalProject nixpkgs;

0 commit comments

Comments
 (0)