address license/version issues for PR #29782

9 files changed, 31 insertions, 19 deletions

diff --git a/pkgs/applications/science/biology/N3/default.nix b/pkgs/applications/science/biology/N3/default.nix
index feaea5b15342..c14846beec2f 100644
--- a/pkgs/applications/science/biology/N3/default.nix
+++ b/pkgs/applications/science/biology/N3/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   pname = "N3";
-  name  = "${pname}-1.0.20";
+  name  = "${pname}-2017-09-18";
 
   src = fetchFromGitHub {
     owner  = "BIC-MNI";
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     description = "MRI non-uniformity correction for MINC files";
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
+    license   = licenses.free;
   };
 }
diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/applications/science/biology/inormalize/default.nix
index d202db8521cf..f17143ad06bb 100644
--- a/pkgs/applications/science/biology/inormalize/default.nix
+++ b/pkgs/applications/science/biology/inormalize/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   pname = "inormalize";
-  name  = "${pname}-1.0.20";
+  name  = "${pname}-2014-10-21";
 
   src = fetchFromGitHub {
     owner  = "BIC-MNI";
@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
     description = "Program to normalize intensity of MINC files";
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
+    license   = licenses.free;
   };
 }
diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix
index 011db3f0fb86..8e1f74686d1f 100644
--- a/pkgs/applications/science/biology/minc-tools/default.nix
+++ b/pkgs/applications/science/biology/minc-tools/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "minc-tools";
-  name  = "${pname}-2.3.01";
+  name  = "${pname}-2017-09-11";
 
   src = fetchFromGitHub {
     owner  = "BIC-MNI";
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
     description = "Command-line utilities for working with MINC files";
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
+    license   = licenses.free;
   };
 }
diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/pkgs/applications/science/biology/minc-widgets/default.nix
index 0474ad1bff07..9084dfb2e1c3 100644
--- a/pkgs/applications/science/biology/minc-widgets/default.nix
+++ b/pkgs/applications/science/biology/minc-widgets/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   pname = "minc-widgets";
-  name  = "${pname}-1.0.0";
+  name  = "${pname}-2016-04-20";
 
 
   src = fetchFromGitHub {
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     description = "Collection of Perl and shell scripts for processing MINC files";
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
+    license = licenses.free;
   };
 }
diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/applications/science/biology/mni_autoreg/default.nix
index 5e7808918e99..076ecd03a1b1 100644
--- a/pkgs/applications/science/biology/mni_autoreg/default.nix
+++ b/pkgs/applications/science/biology/mni_autoreg/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, cmake, makeWrapper, perl, GetoptTabular, MNI-Perllib, libminc }:
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, perl, GetoptTabular, MNI-Perllib, libminc }:
 
 stdenv.mkDerivation rec {
   pname = "mni_autoreg";
-  name  = "${pname}-0.99.70";
+  name  = "${pname}-2017-09-22";
 
-  src = fetchgit {
-    url = "https://github.com/BIC-MNI/${pname}.git";
-    rev = "a4367b82012fe3b40e794fc1eb6c3c86e86148bf";
-    sha256 = "1j5vk7hf03y38fwb5klfppk3g4d2hx1fg3ikph2708pnssmim2qr";
+  src = fetchFromGitHub {
+    owner = "BIC-MNI";
+    repo = pname;
+    rev = "ab99e29987dc029737785baebf24896ec37a2d76";
+    sha256 = "0axl069nv57vmb2wvqq7s9v3bfxwspzmk37bxm4973ai1irgppjq";
   };
 
   nativeBuildInputs = [ cmake makeWrapper ];
@@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
     description = "Tools for automated registration using the MINC image format";
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
+    license = licenses.free;
   };
 }
 
diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix
index e133e4be01ce..971741a019ca 100644
--- a/pkgs/development/libraries/libminc/default.nix
+++ b/pkgs/development/libraries/libminc/default.nix
@@ -2,11 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libminc";
-  name  = "${pname}-2.3.01";
+  name  = "${pname}-2017-09-14";
 
-  # current master significantly ahead of most recent release
+  owner = "BIC-MNI";
+
+  # current master is significantly ahead of most recent release, so use Git version:
   src = fetchFromGitHub {
-    owner  = "BIC-MNI";
+    inherit owner;
     repo   = pname;
     rev    = "e11c6df9321b4061bf87a7d43171ec55e9e3908f";
     sha256 = "0lmd0js3jgni2mw1zfvd4qg6byxiv3ndgv2z3nm7975i83zw48xk";
@@ -30,9 +32,10 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/BIC-MNI/libminc;
+    homepage = "https://github.com/${owner}/${pname}";
     description = "Medical imaging library based on HDF5";
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
+    license   = licenses.free;
   };
 }
diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix
index 3103eb31fb8c..6ed6c8262a50 100644
--- a/pkgs/development/libraries/science/biology/EBTKS/default.nix
+++ b/pkgs/development/libraries/science/biology/EBTKS/default.nix
@@ -14,14 +14,15 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libminc ];
 
-  cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBUILD_TESTING=FALSE" ];
+  cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
 
-  checkPhase = "ctest --output-on-failure";  # but there are no tests ...
+  checkPhase = "ctest --output-on-failure";  # but cmake doesn't run the tests ...
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/BIC-MNI/${pname}";
     description = "Library for working with MINC files";
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
+    licenses  = licenses.free;
   };
 }
diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix
index 806c7703c889..50a2d71ad224 100644
--- a/pkgs/development/perl-modules/MNI/default.nix
+++ b/pkgs/development/perl-modules/MNI/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, buildPerlPackage, stdenv, perl }:
 
 buildPerlPackage rec {
-  name = "MNI-Perllib-0.08";
+  name = "MNI-Perllib-2012-04-13";
 
   src = fetchFromGitHub {
     owner  = "BIC-MNI";
@@ -14,7 +14,8 @@ buildPerlPackage rec {
 
   doCheck = false;  # TODO: almost all tests fail ... is this a real problem?
 
-  meta = {
-    license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+  meta = with stdenv.lib; {
+    license = with licenses; [ artistic1 gpl1Plus ];
+    maintainer = with maintainers; [ bcdarwin ];
   };
 }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c34986db3859..d67a3f7f1dd4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15012,6 +15012,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://www.shlomifish.org/open-source/projects/Text-Format/;
       description = "Format text";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainer = with maintainers; [ bcdarwin ];
     };
   };