Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(nix): update flakes #10484

Merged
merged 4 commits into from
May 7, 2024
Merged

chore(nix): update flakes #10484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70efc35
chore(nix): update flakes
anmonteiro May 6, 2024
80490da
chore: add comment to makefile
anmonteiro May 7, 2024
7a7aec4
last update to nixpkgs
anmonteiro May 7, 2024
6955fbd
Merge branch 'main' into anmonteiro/update-flaes
anmonteiro May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@ install-ocamlformat:
dev-depext:
opam depext -y $(TEST_DEPS)

# v4-414-dev
.PHONY: melange
melange:
opam pin add -n melange.dev https://github.com/melange-re/melange.git#v4-414-dev
opam pin add -n melange.dev https://github.com/melange-re/melange.git#24e21cc42
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it worth adding a comment to explain to which branch the hash is pointing to? Like in the nix case. For those of us that are not hip 😄


.PHONY: dev-deps
dev-deps: melange
Expand Down
22 changes: 11 additions & 11 deletions flake.lock
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
};
melange = {
# When moving the compiler tests to OCaml 5.1, change to v4-51-dev
url = "github:melange-re/melange/v4-414-dev";
url = "github:melange-re/melange?rev=24e21cc4284ffb18b3a856c1d730f06f34d32737";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
Expand Down
Loading