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

diamond: init at 0.8.36 #23111

Closed
wants to merge 9 commits into from
Closed

diamond: init at 0.8.36 #23111

wants to merge 9 commits into from

Conversation

coissac
Copy link

@coissac coissac commented Feb 23, 2017

Motivation for this change

This is a new package, DIAMOND, a bioinformatics tool to perform that implements an accelerated BLAST compatible local sequence aligner.

B. Buchfink, Xie C., D. Huson, Fast and sensitive protein alignment using DIAMOND, Nature Methods 12, 59-60 (2015).

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@matthiasbeyer
Copy link
Contributor

Any comment (in the package source) why the patch is necessary would be nice. Also: If this patch is needed to be able to compile the package, consider contributing this patch upstream!

@coissac
Copy link
Author

coissac commented Feb 24, 2017

The patch is just to remove two warnings during the compilation. I can send it to the authors but in the meantime where and how should I explain the patch ? in the default.nix file ?


patches = [
./diamond-0.8.36.patch
];
Copy link
Member

Choose a reason for hiding this comment

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

Indent 2 spaces left.


sourceRoot = "diamond-0.8.36";

buildInputs = [ cmake gcc zlib ];
Copy link
Member

Choose a reason for hiding this comment

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

gcc should not be necessary. cmake should be in nativeBuildInputs.

DNA-protein search on short reads and longer sequences including contigs
and assemblies, providing a speedup of BLAST ranging up to x20,000.

DIAMOND is developed by Benjamin Buchfink. Feel free to contact him for support (Email Twitter).
Copy link
Member

Choose a reason for hiding this comment

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

Indent whole longDescription two spaces right.

If you use DIAMOND in published research, please cite
B. Buchfink, Xie C., D. Huson,
"Fast and sensitive protein alignment using DIAMOND",
Nature Methods 12, 59-60 (2015).
Copy link
Member

Choose a reason for hiding this comment

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

Indent this paragraph 6 spaces right.

homepage = https://github.com/bbuchfink/diamond;
license = {
fullName = "University of Tuebingen, Benjamin Buchfink";
url = https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING;
Copy link
Member

Choose a reason for hiding this comment

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

Indent 4 space left.

license = {
fullName = "University of Tuebingen, Benjamin Buchfink";
url = https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING;
};
Copy link
Member

Choose a reason for hiding this comment

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

Indent 2 spaces right.

}



Copy link
Member

Choose a reason for hiding this comment

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

Please remove the empty lines here.

./diamond-0.8.36.patch
];

sourceRoot = "diamond-0.8.36";
Copy link
Member

Choose a reason for hiding this comment

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

Are you sure this is necessary? This should be detected automatically.

};

patches = [
./diamond-0.8.36.patch
Copy link
Member

Choose a reason for hiding this comment

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

You could give the patch a more telling name like fix-warnings.patch.

@coissac
Copy link
Author

coissac commented Apr 11, 2017

Thank you for your comments. With the commit 20fd13d86caa4be6b872283d7038a3c2f7df05f3, I hope that I have fulfill all the requests from the previous review.

Copy link
Contributor

@matthiasbeyer matthiasbeyer left a comment

Choose a reason for hiding this comment

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

Maintainer, please do not merge. Reason: Look at commit history. It should be cleaned up first!

@coissac
Copy link
Author

coissac commented Apr 11, 2017

I had some problems because of a synchronization between the NixOS:master and of metabarcoding:master. I tried to isolate the diamond package in a single commit by merging the different branches on our side before recreating the files and commit them in a single commit : 20fd13d86caa4be6b872283d7038a3c2f7df05f3. Now I don't know how to "It should be cleaned up first!"

@matthiasbeyer
Copy link
Contributor

metabarcoding:master

what is that for a repository and why do you need it? And why do you need to stay up to date with nixos master branch for a new package?

@coissac
Copy link
Author

coissac commented Apr 12, 2017

Ok, it did a mistake, perhaps I didn't say it enough clearly. But now that the mistake exists how can I clean things to be in the right way ?

Perhaps can I clear the metabarcoding:diamond branch, create a new one and ask for a new Pull request, this should clean up the extra commits

Thank you for your help.

@matthiasbeyer
Copy link
Contributor

So it seems that your branch is based on 9ae8ce8. I guess you can git rebase -i 9ae8ce813e7ed78c138e432c2f04995d5f56dd62 your branch, then remove all the merge commits and other stuff and only leave commits where you added or removed content. From what I can see, this should be only 20fd13d86c.

Then, you can push this branch again...

@matthiasbeyer matthiasbeyer mentioned this pull request Apr 12, 2017
1 task
@matthiasbeyer
Copy link
Contributor

@fpletz I re-submitted this PR in #24840 - feel free to cherry-pick onto master. See initial PR message for what I did there.

@Mic92
Copy link
Member

Mic92 commented Apr 13, 2017

was merged in #24840

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants