update abseil to cmake version + modules

BlueBrain · Oct 11, 2017 · 1f76f55 · 1f76f55
1 parent 7c97dfb
commit 1f76f55
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/bbp/modules/default.nix b/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

diff --git a/patches/abseil-cpp/default.nix b/patches/abseil-cpp/default.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "adevress";
     repo = "abseil-cpp";
-    rev = "827226585158822f6d20d6899a55ae6f216b80f7";
-    sha256 = "0jkn4g5k80nb1mc3fs64jjyyxx9x7l1z82qw6k274qjj15yy0shf";
+    rev = "977ccb392aa25f026afeed3e12e43a90768e7392";
+    sha256 = "0b5iyjxmc5j9q9dwvxam9d6n509cd39z9fzk82z8kjkp2ay7khg4";
   };
 
   buildInputs = [

diff --git a/patches/default.nix b/patches/default.nix
@@ -397,6 +397,8 @@ let
 
         abseil-cpp = callPackage ./abseil-cpp {
             cctz = patches-pkgs.cctz;
+            gtest = gtest1_8;
+            gmock = gtest1_8;
         };
     };