svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
2012-01-27 16:43:39 +00:00 · 2012-01-27 16:43:39 +00:00 · b31c67e24d
parent 3256c40575
commit b31c67e24d
6 changed files with 8 additions and 98 deletions
--- a/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch
+++ b/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch
@ -1,88 +0,0 @@
-diff --git a/cmake/modules/FindLibfacile.cmake b/cmake/modules/FindLibfacile.cmake
-index bef726e..043c65f 100644
--- a/cmake/modules/FindLibfacile.cmake
-+++ b/cmake/modules/FindLibfacile.cmake
-@@ -4,7 +4,6 @@
- #  LIBFACILE_FOUND - system has Libfacile
- #  LIBFACILE_INCLUDE_DIR - the Libfacile include directory
- #  LIBFACILE_LIBRARIES - Link these to use Libfacile
-#  LIBFACILE_DEFINITIONS - Compiler switches required for using Libfacile
- #
- # Copyright (c) 2006, Carsten Niehaus, <cniehaus@gmx.de>
- # Copyright (c) 2006, Montel Laurent, <montel@kde.org>
-@@ -14,35 +13,20 @@
- 
- find_package(OCaml)
- 
-set(LIBFACILE_FOUND FALSE)
-
- if( OCAML_FOUND )
-   find_file(LIBFACILE_LIBRARIES NAMES facile.a
-             PATHS
-             ${OCAMLC_DIR}/facile/
-+   find_library(LIBFACILE_LIBRARIES NAMES facile.a
-+       HINTS ${OCAMLC_DIR}
-+       PATH_SUFFIXES facile ocaml/facile
-    )
-   #message(STATUS "LIBFACILE_LIBRARIES :<${LIBFACILE_LIBRARIES}>") 
-   find_path(LIBFACILE_INCLUDE_DIR NAMES facile.a
-             PATHS
-             ${OCAMLC_DIR}/
-             PATH_SUFFIXES facile
-+   find_path(LIBFACILE_INCLUDE_DIR NAMES facile.cmi
-+       HINTS ${OCAMLC_DIR}
-+       PATH_SUFFIXES facile lib/ocaml/facile
-    )
-   #message(STATUS "LIBFACILE_INCLUDE_DIR <${LIBFACILE_INCLUDE_DIR}>")
-   if(LIBFACILE_INCLUDE_DIR AND LIBFACILE_LIBRARIES)
-      set(LIBFACILE_FOUND TRUE)
-   endif(LIBFACILE_INCLUDE_DIR AND LIBFACILE_LIBRARIES)
- endif(OCAML_FOUND)
- 
-
-if(LIBFACILE_FOUND)
-   if(NOT Libfacile_FIND_QUIETLY)
-      message(STATUS "Found Libfacile: ${LIBFACILE_LIBRARIES}")
-   endif(NOT Libfacile_FIND_QUIETLY)
-else(LIBFACILE_FOUND)
-   if(Libfacile_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find Libfacile")
-   endif(Libfacile_FIND_REQUIRED)
-endif(LIBFACILE_FOUND)
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Libfacile DEFAULT_MSG LIBFACILE_INCLUDE_DIR
-+	LIBFACILE_LIBRARIES OCAML_FOUND)
- 
- # show the LIBFACILE_INCLUDE_DIR and LIBFACILE_LIBRARIES variables only in the advanced view
- mark_as_advanced(LIBFACILE_INCLUDE_DIR LIBFACILE_LIBRARIES )
-diff --git a/src/CMakeOCamlInstructions.cmake b/src/CMakeOCamlInstructions.cmake
-index 40b6755..de89253 100644
--- a/src/CMakeOCamlInstructions.cmake
-+++ b/src/CMakeOCamlInstructions.cmake
-@@ -2,7 +2,7 @@ link_directories (${OCAMLC_DIR})
- 
- macro(OCAML_MLI_TO_CMI _cmi _mli)
-    add_custom_command(OUTPUT ${_cmi}
-                      COMMAND ${OCAML_OCAMLC_EXECUTABLE} ARGS -o ${_cmi} -I +facile -c ${_mli} 
-+                      COMMAND ${OCAML_OCAMLC_EXECUTABLE} ARGS -o ${_cmi} -I ${LIBFACILE_INCLUDE_DIR} -c ${_mli} 
-                       DEPENDS ${_mli} ${ARGN}
-                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_cmi})
-@@ -10,7 +10,7 @@ endmacro(OCAML_MLI_TO_CMI)
- 
- macro(OCAML_ML_TO_CMX _cmx _ml)
-    add_custom_command(OUTPUT ${_cmx}
-                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} ARGS -o ${_cmx} -I +facile -c ${_ml} 
-+                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} ARGS -o ${_cmx} -I ${LIBFACILE_INCLUDE_DIR} -c ${_ml} 
-                    DEPENDS ${_ml} ${ARGN}
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_cmx})
-@@ -58,7 +58,7 @@ ocaml_ml_to_cmx(${CMAKE_CURRENT_BINARY_DIR}/lexer.cmx ${CMAKE_CURRENT_SOURCE_DIR
- # object files
- 
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
-                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I +facile -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
-+                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
-                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c ${CMAKE_CURRENT_BINARY_DIR}/solver.o
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o)
--- a/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
+++ b/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
@ -2,8 +2,6 @@
 kde {
  buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];

-  patches = [ ./kalzium-find-libfacile.patch ];
-
  meta = {
    description = "Periodic Table of Elements";
  };
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@ -14,7 +14,7 @@ let
  basename =
    if bleedingEdgeVersion
    then "gdb-7.3.20110726"
-    else "gdb-7.3.1";
+    else "gdb-7.4";

  # Whether (cross-)building for GNU/Hurd.  This is an approximation since
  # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
        url = "mirror://gnu/gdb/${basename}.tar.bz2";
        # md5 is provided by the annoucement page
        # http://www.gnu.org/s/gdb/download/ANNOUNCEMENT
-        md5 = "b89a5fac359c618dda97b88645ceab47";
+        md5 = "95a9a8305fed4d30a30a6dc28ff9d060";
      };

  # I think python is not a native input, but I leave it
@ -75,6 +75,8 @@ stdenv.mkDerivation rec {
       rm -v $out/share/info/{standards,configure,bfd}.info
    '';

+  enableParallelBuilding = true;
+
  # TODO: Investigate & fix the test failures.
  doCheck = false;

--- a/pkgs/misc/tex/texlive/moderncv.nix
+++ b/pkgs/misc/tex/texlive/moderncv.nix
@ -3,7 +3,7 @@ rec {
  name = "moderncv-2012.01.16";
  src = fetchurl {
    url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip";
-    sha256 = "a9d2de7fc03c35c4084915b2788c8d7acfb695f9e27f6cd81427a7dd1a64cb54";
+    sha256 = "1sfpj76p0z128rvxw0svh7dfrvf3zhmi3v7bkzfkll4byij34ni0";
  };

  buildInputs = [texLive unzip];
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@ -5,11 +5,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "nix-1.0pre31729";
+  name = "nix-1.0pre31851";

  src = fetchurl {
-    url = "http://hydra.nixos.org/build/1867511/download/4/${name}.tar.bz2";
-    sha256 = "c2e33d5837a686c42deaab1cfcf8ec0e13b0c841d936086d773a2415e4141d2d";
+    url = "http://hydra.nixos.org/build/1937677/download/4/${name}.tar.bz2";
+    sha256 = "36f07b6b701da74f07d8c8cc43044306e570b6837555ad523701d86e5f567568";
  };

  buildNativeInputs = [ perl pkgconfig ];
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -3131,13 +3131,11 @@ let
  uisp = callPackage ../development/tools/misc/uisp { };

  gdb = callPackage ../development/tools/misc/gdb {
-    readline = readline5;
    hurd = gnu.hurdCross;
    inherit (gnu) mig;
  };

  gdbCross = callPackage ../development/tools/misc/gdb {
-    readline = readline5;
    target = crossSystem;
  };