diff --git a/pkgs/development/tools/build-managers/cmake/3.0.nix b/pkgs/development/tools/build-managers/cmake/3.0.nix deleted file mode 100644 index f4c368c4664..00000000000 --- a/pkgs/development/tools/build-managers/cmake/3.0.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive -, useNcurses ? false, ncurses, useQt4 ? false, qt4 -}: - -with stdenv.lib; - -let - os = stdenv.lib.optionalString; - majorVersion = "3.0"; - minorVersion = "2"; - version = "${majorVersion}.${minorVersion}"; -in - -stdenv.mkDerivation rec { - name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; - - inherit majorVersion; - - src = fetchurl { - url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "0gk90mw7f93sgkrsrxqy2b6fm5j43yfw50xkrk0bxndvmlgackkb"; - }; - - enableParallelBuilding = true; - - patches = - [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959 - name = "FindFreetype-2.5.patch"; - url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; - sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; - })] ++ - # Don't search in non-Nix locations such as /usr, but do search in - # Nixpkgs' Glibc. - optional (stdenv ? glibc) ./search-path-3.0.patch ++ - optional (stdenv ? cross) (fetchurl { - name = "fix-darwin-cross-compile.patch"; - url = "http://public.kitware.com/Bug/file_download.php?" - + "file_id=4981&type=bug"; - sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; - }); - - buildInputs = [ curl expat zlib bzip2 libarchive ] - ++ optional useNcurses ncurses - ++ optional useQt4 qt4; - - CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; - - configureFlags = - "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" - + stdenv.lib.optionalString useQt4 " --qt-gui"; - - setupHook = ./setup-hook.sh; - - dontUseCmakeConfigure = true; - - preConfigure = optionalString (stdenv ? glibc) - '' - source $setupHook - fixCmakeFiles . - substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc} - ''; - - meta = { - homepage = http://www.cmake.org/; - description = "Cross-Platform Makefile Generator"; - platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ urkud mornfall ]; - }; -} diff --git a/pkgs/development/tools/build-managers/cmake/762-13887.patch b/pkgs/development/tools/build-managers/cmake/762-13887.patch deleted file mode 100644 index 3ef27a09b5c..00000000000 --- a/pkgs/development/tools/build-managers/cmake/762-13887.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx -index e7491bb..57b4348 100644 ---- a/Source/CTest/cmCTestTestHandler.cxx -+++ b/Source/CTest/cmCTestTestHandler.cxx -@@ -1303,10 +1303,9 @@ int cmCTestTestHandler::ExecuteCommands(std::vector& vec) - for ( it = vec.begin(); it != vec.end(); ++it ) - { - int retVal = 0; -- std::string cmd = cmSystemTools::ConvertToOutputPath(it->c_str()); -- cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << cmd -+ cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << *it - << std::endl); -- if ( !cmSystemTools::RunSingleCommand(cmd.c_str(), 0, &retVal, 0, -+ if ( !cmSystemTools::RunSingleCommand((*it).c_str(), 0, &retVal, 0, - cmSystemTools::OUTPUT_MERGE - /*this->Verbose*/) || retVal != 0 ) - { diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 20f6ad57b2b..57ccb086d32 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { patches = # Don't search in non-Nix locations such as /usr, but do search in # Nixpkgs' Glibc. - optional (stdenv ? glibc) ./search-path-3.0.patch ++ + optional (stdenv ? glibc) ./search-path-3.2.patch ++ optional (stdenv ? cross) (fetchurl { name = "fix-darwin-cross-compile.patch"; url = "http://public.kitware.com/Bug/file_download.php?" diff --git a/pkgs/development/tools/build-managers/cmake/search-path-3.0.patch b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch similarity index 100% rename from pkgs/development/tools/build-managers/cmake/search-path-3.0.patch rename to pkgs/development/tools/build-managers/cmake/search-path-3.2.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16b673b783c..30f78704116 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4913,7 +4913,6 @@ let cmake = callPackage ../development/tools/build-managers/cmake { jsoncpp = jsoncpp-1_6; }; - cmake-3_0 = callPackage ../development/tools/build-managers/cmake/3.0.nix { }; cmakeCurses = cmake.override { useNcurses = true; };