From 391945170ce8292ce751fac37feec002a9fcffdd Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 13 Aug 2019 17:08:04 +0200 Subject: [PATCH 1/2] itk: 5.0.0 -> 5.0.1 Changing the source from sourceforge to github. --- pkgs/development/libraries/itk/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index a459bd82755..3577e7a8196 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk, darwin }: +{ stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk, darwin }: stdenv.mkDerivation rec { - name = "itk-5.0.0"; + pname = "itk"; + version = "5.0.1"; - src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-5.0.0.tar.xz; - sha256 = "0bs63mk4q8jmx38f031jy5w5n9yy5ng9x8ijwinvjyvas8cichqi"; + src = fetchFromGitHub { + owner = "InsightSoftwareConsortium"; + repo = "ITK"; + rev = "v${version}"; + sha256 = "0dcjsn5frjnrphfgw8alnd2ahrvicpx2a2ngb5ixaa9anaicz9z1"; }; cmakeFlags = [ From aa239e96b4c0b3c813371c4d93cf59b8d6cf1dc2 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 13 Aug 2019 18:48:02 +0200 Subject: [PATCH 2/2] simpleitk: 1.2.0 -> 1.2.2 Changing the source from sourceforge to github. --- .../development/libraries/simpleitk/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 90dfe8ebfab..1cf40c92db6 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, cmake, git, swig, lua, itk }: +{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk, tcl, tk }: stdenv.mkDerivation rec { - pname = "simpleitk"; - version = "1.2.0"; - name = "${pname}-${version}"; + pname = "simpleitk"; + version = "1.2.2"; - src = fetchurl { - url = "https://sourceforge.net/projects/${pname}/files/SimpleITK/${version}/Source/SimpleITK-${version}.tar.gz"; - sha256 = "10lxsr0144li6bmfgs646cvczczqkgmvvs3ndds66q8lg9zwbnky"; + src = fetchFromGitHub { + owner = "SimpleITK"; + repo = "SimpleITK"; + rev = "v${version}"; + sha256 = "1cgq9cxxplv6bkm2zfvcc0lgyh5zw1hbry30k1429n9737wnadaw"; }; nativeBuildInputs = [ cmake git swig ]; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://www.simpleitk.org; description = "Simplified interface to ITK"; maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.asl20; }; }