commit b31c67e24d56c90a6732d3a310ff13684b73e200 · pyrox.dev/nixpkgs

-88

pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch

···

       1
       1
       -
       diff --git a/cmake/modules/FindLibfacile.cmake b/cmake/modules/FindLibfacile.cmake

     

       2
       2
       -
       index bef726e..043c65f 100644

     

       3
       3
       -
       --- a/cmake/modules/FindLibfacile.cmake

     

       4
       4
       -
       +++ b/cmake/modules/FindLibfacile.cmake

     

       5
       5
       -
       @@ -4,7 +4,6 @@

     

       6
       6
       -
        #  LIBFACILE_FOUND - system has Libfacile

     

       7
       7
       -
        #  LIBFACILE_INCLUDE_DIR - the Libfacile include directory

     

       8
       8
       -
        #  LIBFACILE_LIBRARIES - Link these to use Libfacile

     

       9
       9
       -
       -#  LIBFACILE_DEFINITIONS - Compiler switches required for using Libfacile

     

       10
       10
       -
        #

     

       11
       11
       -
        # Copyright (c) 2006, Carsten Niehaus, <cniehaus@gmx.de>

     

       12
       12
       -
        # Copyright (c) 2006, Montel Laurent, <montel@kde.org>

     

       13
       13
       -
       @@ -14,35 +13,20 @@

     

       14
       14
       -
        

     

       15
       15
       -
        find_package(OCaml)

     

       16
       16
       -
        

     

       17
       17
       -
       -set(LIBFACILE_FOUND FALSE)

     

       18
       18
       -
       -

     

       19
       19
       -
        if( OCAML_FOUND )

     

       20
       20
       -
       -   find_file(LIBFACILE_LIBRARIES NAMES facile.a

     

       21
       21
       -
       -             PATHS

     

       22
       22
       -
       -             ${OCAMLC_DIR}/facile/

     

       23
       23
       -
       +   find_library(LIBFACILE_LIBRARIES NAMES facile.a

     

       24
       24
       -
       +       HINTS ${OCAMLC_DIR}

     

       25
       25
       -
       +       PATH_SUFFIXES facile ocaml/facile

     

       26
       26
       -
           )

     

       27
       27
       -
       -   #message(STATUS "LIBFACILE_LIBRARIES :<${LIBFACILE_LIBRARIES}>") 

     

       28
       28
       -
       -   find_path(LIBFACILE_INCLUDE_DIR NAMES facile.a

     

       29
       29
       -
       -             PATHS

     

       30
       30
       -
       -             ${OCAMLC_DIR}/

     

       31
       31
       -
       -             PATH_SUFFIXES facile

     

       32
       32
       -
       +   find_path(LIBFACILE_INCLUDE_DIR NAMES facile.cmi

     

       33
       33
       -
       +       HINTS ${OCAMLC_DIR}

     

       34
       34
       -
       +       PATH_SUFFIXES facile lib/ocaml/facile

     

       35
       35
       -
           )

     

       36
       36
       -
       -   #message(STATUS "LIBFACILE_INCLUDE_DIR <${LIBFACILE_INCLUDE_DIR}>")

     

       37
       37
       -
       -   if(LIBFACILE_INCLUDE_DIR AND LIBFACILE_LIBRARIES)

     

       38
       38
       -
       -      set(LIBFACILE_FOUND TRUE)

     

       39
       39
       -
       -   endif(LIBFACILE_INCLUDE_DIR AND LIBFACILE_LIBRARIES)

     

       40
       40
       -
        endif(OCAML_FOUND)

     

       41
       41
       -
        

     

       42
       42
       -
       -

     

       43
       43
       -
       -if(LIBFACILE_FOUND)

     

       44
       44
       -
       -   if(NOT Libfacile_FIND_QUIETLY)

     

       45
       45
       -
       -      message(STATUS "Found Libfacile: ${LIBFACILE_LIBRARIES}")

     

       46
       46
       -
       -   endif(NOT Libfacile_FIND_QUIETLY)

     

       47
       47
       -
       -else(LIBFACILE_FOUND)

     

       48
       48
       -
       -   if(Libfacile_FIND_REQUIRED)

     

       49
       49
       -
       -      message(FATAL_ERROR "Could not find Libfacile")

     

       50
       50
       -
       -   endif(Libfacile_FIND_REQUIRED)

     

       51
       51
       -
       -endif(LIBFACILE_FOUND)

     

       52
       52
       -
       +include(FindPackageHandleStandardArgs)

     

       53
       53
       -
       +find_package_handle_standard_args(Libfacile DEFAULT_MSG LIBFACILE_INCLUDE_DIR

     

       54
       54
       -
       +	LIBFACILE_LIBRARIES OCAML_FOUND)

     

       55
       55
       -
        

     

       56
       56
       -
        # show the LIBFACILE_INCLUDE_DIR and LIBFACILE_LIBRARIES variables only in the advanced view

     

       57
       57
       -
        mark_as_advanced(LIBFACILE_INCLUDE_DIR LIBFACILE_LIBRARIES )

     

       58
       58
       -
       diff --git a/src/CMakeOCamlInstructions.cmake b/src/CMakeOCamlInstructions.cmake

     

       59
       59
       -
       index 40b6755..de89253 100644

     

       60
       60
       -
       --- a/src/CMakeOCamlInstructions.cmake

     

       61
       61
       -
       +++ b/src/CMakeOCamlInstructions.cmake

     

       62
       62
       -
       @@ -2,7 +2,7 @@ link_directories (${OCAMLC_DIR})

     

       63
       63
       -
        

     

       64
       64
       -
        macro(OCAML_MLI_TO_CMI _cmi _mli)

     

       65
       65
       -
           add_custom_command(OUTPUT ${_cmi}

     

       66
       66
       -
       -                      COMMAND ${OCAML_OCAMLC_EXECUTABLE} ARGS -o ${_cmi} -I +facile -c ${_mli} 

     

       67
       67
       -
       +                      COMMAND ${OCAML_OCAMLC_EXECUTABLE} ARGS -o ${_cmi} -I ${LIBFACILE_INCLUDE_DIR} -c ${_mli} 

     

       68
       68
       -
                              DEPENDS ${_mli} ${ARGN}

     

       69
       69
       -
                              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

     

       70
       70
       -
           set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_cmi})

     

       71
       71
       -
       @@ -10,7 +10,7 @@ endmacro(OCAML_MLI_TO_CMI)

     

       72
       72
       -
        

     

       73
       73
       -
        macro(OCAML_ML_TO_CMX _cmx _ml)

     

       74
       74
       -
           add_custom_command(OUTPUT ${_cmx}

     

       75
       75
       -
       -                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} ARGS -o ${_cmx} -I +facile -c ${_ml} 

     

       76
       76
       -
       +                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} ARGS -o ${_cmx} -I ${LIBFACILE_INCLUDE_DIR} -c ${_ml} 

     

       77
       77
       -
                           DEPENDS ${_ml} ${ARGN}

     

       78
       78
       -
                           WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

     

       79
       79
       -
           set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_cmx})

     

       80
       80
       -
       @@ -58,7 +58,7 @@ ocaml_ml_to_cmx(${CMAKE_CURRENT_BINARY_DIR}/lexer.cmx ${CMAKE_CURRENT_SOURCE_DIR

     

       81
       81
       -
        # object files

     

       82
       82
       -
        

     

       83
       83
       -
        add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o

     

       84
       84
       -
       -                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I +facile -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o

     

       85
       85
       -
       +                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o

     

       86
       86
       -
                           DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c ${CMAKE_CURRENT_BINARY_DIR}/solver.o

     

       87
       87
       -
                           WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

     

       88
       88
       -
        set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o)

-2

pkgs/desktops/kde-4.8/kdeedu/kalzium.nix

···

       2
       2
        
       kde {

     

       3
       3
        
         buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];

     

       4
       4
        
       

     

       5
       5
       -
         patches = [ ./kalzium-find-libfacile.patch ];

     

       6
       6
       -
       

     

       7
       5
        
         meta = {

     

       8
       6
        
           description = "Periodic Table of Elements";

     

       9
       7
        
         };

+4 -2

pkgs/development/tools/misc/gdb/default.nix

···

       14
       14
        
         basename =

     

       15
       15
        
           if bleedingEdgeVersion

     

       16
       16
        
           then "gdb-7.3.20110726"

     

       17
       17
       -
           else "gdb-7.3.1";

     

       17
       17
       +
           else "gdb-7.4";

     

       18
       18
        
       

     

       19
       19
        
         # Whether (cross-)building for GNU/Hurd.  This is an approximation since

     

       20
       20
        
         # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and

     
···

       40
       40
        
               url = "mirror://gnu/gdb/${basename}.tar.bz2";

     

       41
       41
        
               # md5 is provided by the annoucement page

     

       42
       42
        
               # http://www.gnu.org/s/gdb/download/ANNOUNCEMENT

     

       43
       43
       -
               md5 = "b89a5fac359c618dda97b88645ceab47";

     

       43
       43
       +
               md5 = "95a9a8305fed4d30a30a6dc28ff9d060";

     

       44
       44
        
             };

     

       45
       45
        
       

     

       46
       46
        
         # I think python is not a native input, but I leave it

     
···

       74
       74
        
           '' # Remove Info files already provided by Binutils and other packages.

     

       75
       75
        
              rm -v $out/share/info/{standards,configure,bfd}.info

     

       76
       76
        
           '';

     

       77
       77
       +
       

     

       78
       78
       +
         enableParallelBuilding = true;

     

       77
       79
        
       

     

       78
       80
        
         # TODO: Investigate & fix the test failures.

     

       79
       81
        
         doCheck = false;

+1 -1

pkgs/misc/tex/texlive/moderncv.nix

···

       3
       3
        
         name = "moderncv-2012.01.16";

     

       4
       4
        
         src = fetchurl {

     

       5
       5
        
           url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip";

     

       6
       6
       -
           sha256 = "a9d2de7fc03c35c4084915b2788c8d7acfb695f9e27f6cd81427a7dd1a64cb54";

     

       6
       6
       +
           sha256 = "1sfpj76p0z128rvxw0svh7dfrvf3zhmi3v7bkzfkll4byij34ni0";

     

       7
       7
        
         };

     

       8
       8
        
       

     

       9
       9
        
         buildInputs = [texLive unzip];

+3 -3

pkgs/tools/package-management/nix/unstable.nix

···

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
       -
         name = "nix-1.0pre31729";

     

       8
       8
       +
         name = "nix-1.0pre31851";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
       -
           url = "http://hydra.nixos.org/build/1867511/download/4/${name}.tar.bz2";

     

       12
       12
       -
           sha256 = "c2e33d5837a686c42deaab1cfcf8ec0e13b0c841d936086d773a2415e4141d2d";

     

       11
       11
       +
           url = "http://hydra.nixos.org/build/1937677/download/4/${name}.tar.bz2";

     

       12
       12
       +
           sha256 = "36f07b6b701da74f07d8c8cc43044306e570b6837555ad523701d86e5f567568";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildNativeInputs = [ perl pkgconfig ];

-2

pkgs/top-level/all-packages.nix

···

       3131
       3131
        
         uisp = callPackage ../development/tools/misc/uisp { };

     

       3132
       3132
        
       

     

       3133
       3133
        
         gdb = callPackage ../development/tools/misc/gdb {

     

       3134
       3134
       -
           readline = readline5;

     

       3135
       3134
        
           hurd = gnu.hurdCross;

     

       3136
       3135
        
           inherit (gnu) mig;

     

       3137
       3136
        
         };

     

       3138
       3137
        
       

     

       3139
       3138
        
         gdbCross = callPackage ../development/tools/misc/gdb {

     

       3140
       3140
       -
           readline = readline5;

     

       3141
       3139
        
           target = crossSystem;

     

       3142
       3140
        
         };

     

       3143
       3141