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.

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

chore(nix): update flakes #10484

Merged
merged 4 commits into from
May 7, 2024
Merged

Conversation

anmonteiro
Copy link
Collaborator

No description provided.

@anmonteiro anmonteiro force-pushed the anmonteiro/update-flaes branch from d8bca21 to 16ced83 Compare May 6, 2024 03:33
@anmonteiro
Copy link
Collaborator Author

I don't get why warning 14 starts happening all of a sudden in the tests that disable it. Warning 26 is also disabled and is not showing up.

@emillon
Copy link
Collaborator

emillon commented May 6, 2024

We're installing melange through a git branch, maybe it's just that it has changed in the meantime?

@anmonteiro
Copy link
Collaborator Author

I did update that git branch, so it must be that; I’ll revert the update when I get a chance and stage the update on a different branch.

I think until I do that I’ve broken dune tests.

@emillon
Copy link
Collaborator

emillon commented May 6, 2024

great, thanks. please use a hash instead of the branch name when you do :)

Signed-off-by: Antonio Nuno Monteiro <[email protected]>
@anmonteiro anmonteiro force-pushed the anmonteiro/update-flaes branch from fcc08af to 70efc35 Compare May 6, 2024 23:28
@anmonteiro
Copy link
Collaborator Author

alright, I reverted the update and will be taking a look into it in melange.

also changed from branch to sha

@anmonteiro anmonteiro requested a review from emillon May 7, 2024 01:10
@@ -76,7 +76,7 @@ dev-depext:

.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 😄

anmonteiro added 2 commits May 7, 2024 13:52
Signed-off-by: Antonio Nuno Monteiro <[email protected]>
Signed-off-by: Antonio Nuno Monteiro <[email protected]>
@anmonteiro anmonteiro enabled auto-merge (squash) May 7, 2024 21:32
@anmonteiro anmonteiro merged commit 0d5cc92 into ocaml:main May 7, 2024
1 of 2 checks passed
@anmonteiro anmonteiro deleted the anmonteiro/update-flaes branch May 9, 2024 02:50
@anmonteiro
Copy link
Collaborator Author

FWIW I fixed the issue we found here in melange-re/melange#1118

anmonteiro added a commit to anmonteiro/dune that referenced this pull request Nov 17, 2024
* chore(nix): update flakes

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

* chore: add comment to makefile

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

* last update to nixpkgs

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

---------

Signed-off-by: Antonio Nuno Monteiro <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants