Merge pull request #454 from BlueBrain/abseil

abseil integration based on @adevress ongoing work

bbp/modules/default.nix

@@ -1382,6 +1382,20 @@ let
         };
 
 
+        abseil = pkgs.envModuleGen rec {
+            name = "abseil";
+            isLibrary = true;
+            setRoot = "ABSEIL";
+            description = "abseil module generated by nix";
+            packages = [
+                            pkgs.abseil-cpp pkgs.cctz
+                       ];
+            conflicts = conflicts-modules;
+        };
+
+
+
+
         openssl = pkgs.envModuleGen rec {
             name = "openssl";
             version = "1.0.0";
@@ -1959,9 +1973,9 @@ let
         paths =
         [
             boost  hdf5 libxml2 zlib phdf5 hdf5-cpp adios assimp libjpeg-turbo
-            openblas openblas64ABI openssl petsc folly scorec hwloc
+            openblas openblas64ABI openssl petsc scorec hwloc
             bison flex swig gcc gsl freetype gmp libpng hadoken libspatialindex
-            sdl2 autotools 
+            sdl2 autotools folly abseil
 
             cmake vtk itk readline ncurses 
             python27-light python27-full manylinux1-python

patches/abseil-cpp/default.nix

@@ -0,0 +1,28 @@
+{
+  cctz,
+  cmake,
+  fetchFromGitHub,
+  gmock,
+  gtest,
+  stdenv
+}:
+
+stdenv.mkDerivation rec {
+  name = "abseil-${version}";
+  version = builtins.substring 0 6 src.rev;
+
+  src = fetchFromGitHub {
+    owner = "adevress";
+    repo = "abseil-cpp";
+    rev = "977ccb392aa25f026afeed3e12e43a90768e7392";
+    sha256 = "0b5iyjxmc5j9q9dwvxam9d6n509cd39z9fzk82z8kjkp2ay7khg4";
+  };
+
+  buildInputs = [
+    cctz
+    cmake
+    gmock
+    gtest
+    stdenv
+  ];
+}

patches/cctz/default.nix

@@ -0,0 +1,30 @@
+{
+  stdenv,
+  fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  name = "cctz-${version}";
+  version = "2.0";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "cctz";
+    rev = "d5e227e6bfdb365abb12ec7528d79292732ce0bc";
+    sha256 = "1j60kz9jwnh9nabwbaavi7d57l0w1candyydqscn4ymafkzn9dhh";
+  };
+
+  buildInputs = [
+    stdenv
+  ];
+
+  configurePhase = ''
+    mkdir build
+    export PREFIX=$out
+    echo Output is $out
+  '';
+
+  makeFlags = ''-C build -f ../Makefile SRC=../  CCTZ_SHARED_LIB=libcctz.so.2.0'';
+
+  installTargets = "install install_shared_lib";
+}

patches/default.nix

@@ -392,6 +392,14 @@ let
             pythonPackages = patches-pkgs.python27Packages;
         };
 
+        cctz = callPackage ./cctz {
+        };
+
+        abseil-cpp = callPackage ./abseil-cpp {
+            cctz = patches-pkgs.cctz;
+            gtest = gtest1_8;
+            gmock = gtest1_8;
+        };
     };
 
     additionalPythonPackages = MergePkgs.callPackage ./additionalPythonPackages ({