From 047f6d20d5e6234662ed102e4ef2c6be800829f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 Apr 2009 13:48:22 +0000 Subject: [PATCH] Updated CMake to version 2.6.3. svn path=/nixpkgs/trunk/; revision=15114 --- .../tools/build-managers/cmake/2.6.3.nix | 31 ----------------- .../tools/build-managers/cmake/default.nix | 20 +++++------ pkgs/top-level/all-packages.nix | 34 ++++++++----------- 3 files changed, 25 insertions(+), 60 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/cmake/2.6.3.nix diff --git a/pkgs/development/tools/build-managers/cmake/2.6.3.nix b/pkgs/development/tools/build-managers/cmake/2.6.3.nix deleted file mode 100644 index bb9c3b1485f9..000000000000 --- a/pkgs/development/tools/build-managers/cmake/2.6.3.nix +++ /dev/null @@ -1,31 +0,0 @@ -{fetchurl, stdenv, replace, ncurses}: - -stdenv.mkDerivation rec { - name = "cmake-2.6.3-RC-15"; - - # We look for cmake modules in .../share/cmake-${majorVersion}/Modules. - majorVersion = "2.6"; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = http://www.cmake.org/; - description = "Cross-Platform Makefile Generator"; - }; - - src = fetchurl { - url = "http://www.cmake.org/files/v2.6/${name}.tar.gz"; - sha256 = "476b6daca63c39bc46955f99f2566735d51159c43ccc716fa689ba2a2fa7e432"; - }; - - postUnpack = '' - dontUseCmakeConfigure=1 - source $setupHook - fixCmakeFiles $sourceRoot - echo 'SET (CMAKE_SYSTEM_PREFIX_PATH "'${ncurses}'" CACHE FILEPATH "Root for libs for cmake" FORCE)' > $sourceRoot/cmakeInit.txt - ''; - - configureFlags= [ " --init=cmakeInit.txt " ]; - - postInstall = "fixCmakeFiles $out/share"; -} diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index f46ba5ce9aa5..6948215229b2 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,31 +1,31 @@ {fetchurl, stdenv, replace, ncurses}: stdenv.mkDerivation rec { - name = "cmake-2.6.2"; + name = "cmake-2.6.3"; # We look for cmake modules in .../share/cmake-${majorVersion}/Modules. - majorVersion = "2.6"; - + majorVersion = "2.6"; + setupHook = ./setup-hook.sh; - + meta = { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; }; - + src = fetchurl { - url = "http://www.cmake.org/files/v2.6/${name}.tar.gz"; - sha256 = "b3f5a9dfa97fb82cb1b7d78a62d949f93c8d4317af36674f337d27066fa6b7e9"; + url = "http://www.cmake.org/files/v${majorVersion}/${name}.tar.gz"; + sha256 = "3c3af80526a32bc2afed616e8f486b847144f2fa3a8e441908bd39c38b146450"; }; - + postUnpack = '' dontUseCmakeConfigure=1 source $setupHook fixCmakeFiles $sourceRoot echo 'SET (CMAKE_SYSTEM_PREFIX_PATH "'${ncurses}'" CACHE FILEPATH "Root for libs for cmake" FORCE)' > $sourceRoot/cmakeInit.txt ''; - + configureFlags= [ " --init=cmakeInit.txt " ]; - + postInstall = "fixCmakeFiles $out/share"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cb1ab222fa8..8ef6404d5779 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1167,7 +1167,7 @@ let pythonSexy = builderDefsPackage (import ../development/python-modules/libsexy) { inherit python libsexy pkgconfig libxml2 pygtk; - inherit (gtkLibs) pango gtk glib; + inherit (gtkLibs) pango gtk glib; }; qhull = import ../development/libraries/qhull { @@ -1960,7 +1960,7 @@ let monotone = import ../applications/version-management/monotone { inherit stdenv fetchurl boost zlib botan libidn pcre - sqlite; + sqlite; lua = lua5; }; @@ -2043,7 +2043,7 @@ let metaBuildEnv = import ../development/compilers/meta-environment/meta-build-env { inherit fetchurl stdenv ; - }; + }; swiProlog = composedArgsAndFun (selectVersion ../development/compilers/swi-prolog "5.6.51") { inherit fetchurl stdenv; @@ -2410,10 +2410,6 @@ let inherit fetchurl stdenv replace ncurses; }; - cmakeUnstable = lowPrio (import ../development/tools/build-managers/cmake/2.6.3.nix { - inherit fetchurl stdenv replace ncurses; - }); - cproto = import ../development/tools/misc/cproto { inherit fetchurl stdenv flex bison; }; @@ -2797,7 +2793,7 @@ let boost_1_36_0 = import ../development/libraries/boost/1.36.0.nix { inherit fetchurl stdenv icu expat zlib bzip2 python; }; - + boost = makeOverridable (import ../development/libraries/boost/1.38.0.nix) { inherit fetchurl stdenv icu expat zlib bzip2 python; }; @@ -4193,7 +4189,7 @@ let inherit stdenv fetchurl; ghc = ghc682; }; - + cabal683 = import ../development/libraries/haskell/cabal/cabal.nix { inherit stdenv fetchurl; ghc = ghc683; @@ -6548,7 +6544,7 @@ let }; ejabberd = import ../servers/xmpp/ejabberd { - inherit fetchurl stdenv expat erlang zlib openssl + inherit fetchurl stdenv expat erlang zlib openssl pam; }; @@ -9543,7 +9539,7 @@ let inherit libxml2 guile perl intltool libtool pkgconfig; }; - + ### SCIENCE/BIOLOGY alliance = import ../applications/science/electronics/alliance { @@ -9588,7 +9584,7 @@ let inherit fetchurl stdenv perl paml; }; - + ### SCIENCE/MATH atlas = import ../development/libraries/science/math/atlas { @@ -9599,21 +9595,21 @@ let inherit fetchurl stdenv gfortran; }; */ - + ### SCIENCE/LOGIC coq = import ../applications/science/logic/coq { inherit fetchurl stdenv ocaml ncurses; }; - + ### SCIENCE / ELECTRONICS ngspice = import ../applications/science/electronics/ngspice { inherit fetchurl stdenv readline; }; - + ### SCIENCE / MATH maxima = import ../applications/science/math/maxima { @@ -9632,7 +9628,7 @@ let withX = true; }; - + ### MISC atari800 = import ../misc/emulators/atari800 { @@ -9676,11 +9672,11 @@ let gajim = builderDefsPackage (import ../applications/networking/instant-messengers/gajim) { inherit perl intltool pyGtkGlade gettext pkgconfig makeWrapper pygobject - pyopenssl gtkspell libsexy pycrypto aspell pythonDBus pythonSexy + pyopenssl gtkspell libsexy pycrypto aspell pythonDBus pythonSexy docutils; dbus = dbus.libs; inherit (gnome) gtk libglade; - inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11 + inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11 scrnsaverproto; python = pythonFull; }; @@ -9957,5 +9953,5 @@ let inherit (stdenv) mkDerivation; }; - + }; in pkgs