Skip to content

Commit

Permalink
Update sources (#1705)
Browse files Browse the repository at this point in the history
* Update sources

* ocaml-protoc-plugin: don't run tests

* disable hermes+musl for now

---------

Co-authored-by: UpdateBot <ulrikstrid@users.noreply.github.com>
  • Loading branch information
anmonteiro and ulrikstrid authored Oct 14, 2024
1 parent e0eb147 commit f54d412
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
5 changes: 4 additions & 1 deletion ci/hydra.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ with filter;
{ inherit (pkgs) melange-relay-compiler hermes; } //
(if stdenv.isLinux then {
inherit (pkgs) esy kubernetes;
hermes-musl64 = pkgs.pkgsCross.musl64.hermes;
# disabled after musl 1.2.5 upgrade. should be easy to find / replace
# lseek{64,} but likely not worth it as we'd like to move to the static
# branch in the future.
# hermes-musl64 = pkgs.pkgsCross.musl64.hermes;
} else { });

arm64_4_14 = (if system == "x86_64-linux" then
Expand Down
8 changes: 4 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
};

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs?rev=fe17be0af8ff0de556b774b0fb176e96cb0ab080";
nixpkgs.url = "github:NixOS/nixpkgs?rev=73057677e8557925e999ac54196423fa34418c24";
flake-utils.url = "github:numtide/flake-utils";
};

Expand Down
1 change: 1 addition & 0 deletions ocaml/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1737,6 +1737,7 @@ with oself;
sha256 = "0yy5d2ih21inx02gdylcscp30gd9vvrm7ky1abyzahcypz3x2m32";
};
buildInputs = o.buildInputs ++ [ ptime base64 dune-configurator ];
doCheck = false;
});

ocamlformat = osuper.ocamlformat.overrideAttrs (_: {
Expand Down

0 comments on commit f54d412

Please sign in to comment.