dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #183012 from bcdarwin/update-mni-autoreg

Browse Source 
mni_autoreg: unstable-2017-09-22 -> unstable-2022-05-20
This commit is contained in:
Mario Rodas 2022-08-13 01:05:26 -05:00 committed by GitHub
commit 0cab4c8f8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/science/biology/mni_autoreg/default.nix
View File

@ -1,26 +1,16 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, perlPackages, libminc }:
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, libminc }:
stdenv.mkDerivation rec {
pname = "mni_autoreg";
version = "unstable-2017-09-22";
version = "unstable-2022-05-20";
src = fetchFromGitHub {
owner = "BIC-MNI";
repo = pname;
rev = "ab99e29987dc029737785baebf24896ec37a2d76";
sha256 = "0axl069nv57vmb2wvqq7s9v3bfxwspzmk37bxm4973ai1irgppjq";
rev = "be7bd25bf7776974e0f2c1d90b6e7f8ccc0c8874";
sha256 = "sGMZbCrdV6yAOgGiqvBFOUr6pGlTCqwy8yNrPxMoKco=";
};
patches = [
# Pull upstream workaround for -fno-common toolchains:
# https://github.com/BIC-MNI/mni_autoreg/pull/28
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/BIC-MNI/mni_autoreg/commit/06adfacbd84369ea3bcc4376596ac1c0f2e49af9.patch";
sha256 = "004sdrbx9kcj1qqwjly6p03svakl0x2sbv83salyg63fv67jynx8";
})
];
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ libminc ];
propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ];

12
pkgs/development/libraries/libminc/default.nix
View File

@ -2,15 +2,15 @@
stdenv.mkDerivation rec {
pname = "libminc";
version = "unstable-2020-07-17";
version = "2.4.05";
owner = "BIC-MNI";
src = fetchFromGitHub {
inherit owner;
repo = pname;
rev = "ffb5fb234a852ea7e8da8bb2b3b49f67acbe56ca";
sha256 = "0yr4ksghpvxh9zg0a4p7hvln3qirsi08plvjp5kxx2qiyj96zsdm";
rev = "aa08255f0856e70fb001c5f9ee1f4e5a8c12d47d"; # new release, but no git tag
sha256 = "XMTO6/HkyrrQ0s5DzJLCmmWheye2DGMnpDbcGdP6J+A=";
};
postPatch = ''
@ -24,14 +24,14 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DLIBMINC_MINC1_SUPPORT=ON"
"-DLIBMINC_BUILD_SHARED_LIBS=ON"
"-DLIBMINC_USE_NIFTI=ON"
"-DLIBMINC_USE_SYSTEM_NIFTI=ON"
];
doCheck = !stdenv.isDarwin;
checkPhase = ''
ctest -j1 -E 'ezminc_rw_test' --output-on-failure
# -j1: see https://github.com/BIC-MNI/libminc/issues/110
# ezminc_rw_test: can't find libminc_io.so.5.2.0
checkPhase = ''
ctest -j1 --output-on-failure
'';
meta = with lib; {

4
pkgs/top-level/all-packages.nix
View File

@ -19545,9 +19545,7 @@ with pkgs;
libmilter = callPackage ../development/libraries/libmilter { };
libminc = callPackage ../development/libraries/libminc {
hdf5 = hdf5_1_10;
};
libminc = callPackage ../development/libraries/libminc { };
libmkv = callPackage ../development/libraries/libmkv { };