From 271d4a7ca07cd629c80a73fa1c6d868e66aa3667 Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Mon, 15 Jan 2018 15:19:20 +1000 Subject: [PATCH 1/2] dcm2niix: init at 1.0.20170130 --- lib/maintainers.nix | 1 + .../science/biology/dcm2niix/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/applications/science/biology/dcm2niix/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d335f7f3b93..e45ccbe8f5d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -60,6 +60,7 @@ arobyn = "Alexei Robyn "; artuuge = "Artur E. Ruuge "; ashalkhakov = "Artyom Shalkhakov "; + ashgillman = "Ashley Gillman "; aske = "Kirill Boltaev "; asppsa = "Alastair Pharo "; astsmtl = "Alexander Tsamutali "; diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix new file mode 100644 index 00000000000..b1c66526b12 --- /dev/null +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchFromGitHub +, cmake +, libyamlcpp +}: + +let + version = "v1.0.20170130"; + sha256 = "1f2nzd8flp1rfn725bi64z7aw3ccxyyygzarxijw6pvgl476i532"; + +in stdenv.mkDerivation rec { + name = "dcm2niix-${version}"; + + src = fetchFromGitHub { + inherit sha256; + owner = "rordenlab"; + repo = "dcm2niix"; + rev = version; + }; + + enableParallelBuilding = true; + buildInputs = [ cmake libyamlcpp]; + + meta = { + description = "dcm2niix DICOM to NIfTI converter"; + longDescription = '' + dcm2niix is a designed to convert neuroimaging data from the + DICOM format to the NIfTI format. + ''; + homepage = https://www.nitrc.org/projects/dcm2nii; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.ashgillman ]; + platforms = stdenv.lib.platforms.linux; +}; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad77d0f98a..587f4c18fd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18844,6 +18844,8 @@ with pkgs; bcftools = callPackage ../applications/science/biology/bcftools { }; + dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; + diamond = callPackage ../applications/science/biology/diamond { }; ecopcr = callPackage ../applications/science/biology/ecopcr { }; From 245a67df8bc4f6e1fa0ab40578c1b9668599a042 Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Mon, 15 Jan 2018 16:53:28 +1000 Subject: [PATCH 2/2] dcm2niix: cmake is native, style --- .../science/biology/dcm2niix/default.nix | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index b1c66526b12..781ceb3df59 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -4,32 +4,30 @@ , libyamlcpp }: -let - version = "v1.0.20170130"; - sha256 = "1f2nzd8flp1rfn725bi64z7aw3ccxyyygzarxijw6pvgl476i532"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { + version = "1.0.20170130"; name = "dcm2niix-${version}"; src = fetchFromGitHub { - inherit sha256; owner = "rordenlab"; repo = "dcm2niix"; - rev = version; + rev = "v${version}"; + sha256 = "1f2nzd8flp1rfn725bi64z7aw3ccxyyygzarxijw6pvgl476i532"; }; enableParallelBuilding = true; - buildInputs = [ cmake libyamlcpp]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libyamlcpp ]; - meta = { + meta = with stdenv.lib; { description = "dcm2niix DICOM to NIfTI converter"; longDescription = '' dcm2niix is a designed to convert neuroimaging data from the DICOM format to the NIfTI format. ''; homepage = https://www.nitrc.org/projects/dcm2nii; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.ashgillman ]; - platforms = stdenv.lib.platforms.linux; -}; + license = licenses.bsd3; + maintainers = [ maintainers.ashgillman ]; + platforms = platforms.all; + }; }