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
several MINC additions/updates in separate commits: libminc, minc-tools, minc-widgets, N3, inormalize, EBTKS, mni_autoreg, and some Perl modules #29782
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Despite the number of comments, nothing major here, these are really all just nitpicks regarding version numbers, licenses etc. 👍 🙂
description = "MRI non-uniformity correction for MINC files"; | ||
maintainers = with maintainers; [ bcdarwin ]; | ||
platforms = platforms.unix; | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure what the exact license is, but it seems to be free software, so can you add a license field here? license = licenses.free;
|
||
stdenv.mkDerivation rec { | ||
pname = "N3"; | ||
name = "${pname}-1.0.20"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where did you get this version number?
|
||
stdenv.mkDerivation rec { | ||
pname = "inormalize"; | ||
name = "${pname}-1.0.20"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This version number doesn't correspond to the git revision. For the 79cea9c
revision, a date version should be used: "${pname}-2014-10-21"
. Or if you want to use this version:
{
pname = "inormalize";
version = "1.0.20";
name = "${pname}-${version}";
src = fetchFromGitHub {
# ...
rev = "release-${version}";
# ...
};
}
description = "Program to normalize intensity of MINC files"; | ||
maintainers = with maintainers; [ bcdarwin ]; | ||
platforms = platforms.unix; | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
license = licenses.free;
for prog in minccomplete minchistory mincpik; do | ||
wrapProgram $out/bin/$prog --prefix PERL5LIB : $PERL5LIB | ||
done | ||
''; | ||
|
||
meta = with stdenv.lib; { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you also add a license = licenses.free;
field for meta in this update too?
checkPhase = '' | ||
export LD_LIBRARY_PATH="$(pwd)" # see #22060 | ||
ctest -E ezminc_rw_test --output-on-failure # ezminc_rw_test can't find libminc_io.so.5.2.0 | ||
''; | ||
doCheck = true; | ||
|
||
meta = with stdenv.lib; { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you also add a license = licenses.free;
field for this package too while you're at it?
description = "Library for working with MINC files"; | ||
maintainers = with maintainers; [ bcdarwin ]; | ||
platforms = platforms.unix; | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
license = licenses.free;
|
||
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBUILD_TESTING=FALSE" ]; | ||
|
||
checkPhase = "ctest --output-on-failure"; # but there are no tests ... |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't testing/ebtks_test_fft.cc
a test file?
|
||
stdenv.mkDerivation rec { | ||
pname = "EBTKS"; | ||
name = "${pname}-1.6.50"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Version number doesn't correspond to the git revision.
pkgs/top-level/perl-packages.nix
Outdated
homepage = http://www.shlomifish.org/open-source/projects/Text-Format/; | ||
description = "Format text"; | ||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you want to maintain this package as well?
@vyp all addressed. |
The minc-widgets maintainers have updated the license information to confirm that they're indeed free software; I used 'licenses.free' in the packages so everything's fine. |
9d75e04
to
773b609
Compare
homepage = http://www.shlomifish.org/open-source/projects/Text-Format/; | ||
description = "Format text"; | ||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; | ||
maintainer = with maintainers; [ bcdarwin ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
with stdenv.lib.maintainers;
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
perl-packages has stdenv.lib.maintainers in scope
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My bad, thanks.
The EBTKS version number still doesn't correspond to the git revision. Everything else except for the above review comment looks good though, thanks! 👍 |
EBTKS version also now updated. |
travis build is failing for unrelated reasons |
as far as I can tell everything is good here; is there a way to notify someone who could merge it or should I open a new PR? |
Motivation for this change
Things done
build-use-sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)