diff options
Diffstat (limited to 'pkgs/applications/science/biology')
| -rw-r--r-- | pkgs/applications/science/biology/dcm2niix/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch | 17 |
2 files changed, 8 insertions, 19 deletions
diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index cbde1647db9b..605ecaadf648 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -15,21 +15,21 @@ let cloudflareZlib = fetchFromGitHub { owner = "ningfei"; repo = "zlib"; - # HEAD revision of the gcc.amd64 branch on 2022-04-14. Reminder to update + # HEAD revision of the gcc.amd64 branch on 2023-03-28. Reminder to update # whenever bumping package version. - rev = "fda61188d1d4dcd21545c34c2a2f5cc9b0f5db4b"; - sha256 = "sha256-qySFwY0VI2BQLO2XoCZeYshXEDnHh6SmJ3MvcBUROWU="; + rev = "f49b13c3380cf9677ae9a93641ebc6f770899def"; + sha256 = "sha256-8HNFUGx2uuEb8UrGUiqkN+uVDX83YIisT2uO1Z7GCxc="; }; in stdenv.mkDerivation rec { - version = "1.0.20211006"; + version = "1.0.20230411"; pname = "dcm2niix"; src = fetchFromGitHub { owner = "rordenlab"; repo = "dcm2niix"; rev = "v${version}"; - sha256 = "sha256-fQAVOzynMdSLDfhcYWcaXkFW/mnv4zySGLVJNE7ql/c="; + sha256 = "sha256-kOVEoqrk4l6sH8iDVx1QmOYP5tCufxsWnCnn9BibZ08="; }; patches = lib.optionals withCloudflareZlib [ diff --git a/pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch b/pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch index 493f0fb11f46..a8f97b434fc7 100644 --- a/pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch +++ b/pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch @@ -6,7 +6,7 @@ index 9f064eb..fe74df5 100644 -set(CLOUDFLARE_BRANCH gcc.amd64) # Cloudflare zlib branch - ExternalProject_Add(zlib -- GIT_REPOSITORY "${git_protocol}://github.com/ningfei/zlib.git" +- GIT_REPOSITORY "https://github.com/ningfei/zlib.git" - GIT_TAG "${CLOUDFLARE_BRANCH}" + URL file://@cloudflareZlib@ SOURCE_DIR cloudflare-zlib @@ -16,21 +16,10 @@ diff --git a/SuperBuild/SuperBuild.cmake b/SuperBuild/SuperBuild.cmake index 2a0a956..81354a7 100644 --- a/SuperBuild/SuperBuild.cmake +++ b/SuperBuild/SuperBuild.cmake -@@ -1,17 +1,3 @@ +@@ -1,6 +1,1 @@ -# Check if git exists -find_package(Git) -if(NOT GIT_FOUND) - message(FATAL_ERROR "Cannot find Git. Git is required for Superbuild") -endif() -- --# Use git protocol or not --option(USE_GIT_PROTOCOL "If behind a firewall turn this off to use http instead." ON) --if(USE_GIT_PROTOCOL) -- set(git_protocol "git") --else() -- set(git_protocol "https") --endif() -- - # Basic CMake build settings - if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Release" CACHE STRING + |