Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fe7d82e6a692
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 593e71889f87
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 15, 2018

  1. itk: 4.11.0 -> 4.12.2, fix build

    @xeji
    xeji committed Mar 15, 2018
    Copy the full SHA
    f43e06e View commit details

Commits on Mar 17, 2018

  1. Merge pull request #37101 from xeji/p/itk 

    itk: 4.11.0 -> 4.12.2, fix build
    @gebner
    gebner authored Mar 17, 2018
    Copy the full SHA
    593e718 View commit details
Showing with 3 additions and 10 deletions.
  1. +3 −10 pkgs/development/libraries/itk/default.nix
13 changes: 3 additions & 10 deletions pkgs/development/libraries/itk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
{ stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }:

stdenv.mkDerivation rec {
name = "itk-4.11.0";
name = "itk-4.12.2";

src = fetchurl {
url = mirror://sourceforge/itk/InsightToolkit-4.11.0.tar.xz;
sha256 = "0axvyds0gads5914g0m70z5q16gzghr0rk0hy3qjpf1k9bkxvcq6";
url = mirror://sourceforge/itk/InsightToolkit-4.12.2.tar.xz;
sha256 = "1qw9mxbh083siljygahl4gdfv91xvfd8hfl7ghwii19f60xrvn2w";
};

# Clang 4 dislikes signed comparisons of pointers against integers. Should no longer be
# necessary once we get past ITK 4.11.
patches = [ (fetchpatch {
url = "https://github.com/InsightSoftwareConsortium/ITK/commit/d1407a55910ad9c232f3d241833cfd2e59024946.patch";
sha256 = "0h851afkv23fwgkibjss30fkbz4nkfg6rmmm4pfvkwpml23gzz7s";
}) ];

cmakeFlags = [
"-DBUILD_TESTING=OFF"
"-DBUILD_EXAMPLES=OFF"