Update sources#621
Merged
Merged
Conversation
conduit-lwt-unix and irmin differ on mtime and we don't want to downgrade conduit-lwt-unix's mtime version
Collaborator
|
I will try to upstream the last patch, I think those libraries are the ones that are OK to be in both right? |
ulrikstrid
reviewed
Jan 30, 2023
| } | ||
| detectOcamlConflicts () { | ||
| local conflict | ||
| conflict="$(ocamlfind list |& grep "has multiple definitions" | grep -vE "bigarray|unix|str|stdlib|compiler-libs|threads|bytes|dynlink|findlib" || true)" |
Collaborator
There was a problem hiding this comment.
This is the changed line compared to upstream.
And this is the PR to upstream it:
NixOS/nixpkgs#213577
Collaborator
Author
There was a problem hiding this comment.
|| true seems to always make it pass, no?
Collaborator
There was a problem hiding this comment.
This is taken from upstream so I assume it's correct 😂
13 tasks
Collaborator
Author
|
OK let's land this until upstream makes up their mind. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
:robot_face: Updating sources to the latest version.
Commits touching OCaml packages:
just like pythonCatchConflictHook
ocamlPackages.findlib: detect conflicts of version early
ocamlPackages.javalib: 3.2.1 → 3.2.2; sawja: 1.5.11 → 1.5.12
ocamlPackages.mdx: 2.1.0 → 2.2.1
hledger-utils: init at 1.12.1 (also init so far unpackaged dependencies)
hledger-utils: init at 1.12.1 (also init so far unpackaged dependencies)
hledger-utils: init at 1.12.1 (also init so far unpackaged dependencies)
hledger-utils: init at 1.12.1 (also init so far unpackaged dependencies)
hledger-utils: init at 1.12.1 (also init so far unpackaged dependencies)
Diff URL: NixOS/nixpkgs@3875a3e...4c4b377