From b5d1d50aa90e0780c57fb4b323203ea5056be857 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 25 Jul 2019 09:04:55 +0000
Subject: google-gflags: move to aliases.nix

google-gflags were renamed to gflags in 2012:
https://github.com/gflags/gflags/#25-january-2012

gflags.name will be updated in staging.
---
 pkgs/applications/radio/gnss-sdr/default.nix       |  6 ++--
 pkgs/applications/science/math/caffe/default.nix   |  4 +--
 pkgs/applications/science/misc/openmvs/default.nix |  8 ++---
 .../development/libraries/ceres-solver/default.nix |  8 ++---
 pkgs/development/libraries/folly/default.nix       |  4 +--
 pkgs/development/libraries/gflags/default.nix      | 38 ++++++++++++++++++++++
 .../libraries/google-gflags/default.nix            | 38 ----------------------
 .../libraries/kinetic-cpp-client/default.nix       |  4 +--
 pkgs/development/libraries/opencv/3.x.nix          |  4 +--
 pkgs/development/libraries/opencv/4.x.nix          |  4 +--
 .../libraries/science/math/caffe2/default.nix      |  4 +--
 .../libraries/science/math/or-tools/default.nix    |  6 ++--
 pkgs/tools/system/osquery/default.nix              |  4 +--
 pkgs/top-level/aliases.nix                         |  1 +
 pkgs/top-level/all-packages.nix                    |  5 ++-
 15 files changed, 69 insertions(+), 69 deletions(-)
 create mode 100644 pkgs/development/libraries/gflags/default.nix
 delete mode 100644 pkgs/development/libraries/google-gflags/default.nix

diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix
index 6cbdea8c68671..7e132efefbb15 100644
--- a/pkgs/applications/radio/gnss-sdr/default.nix
+++ b/pkgs/applications/radio/gnss-sdr/default.nix
@@ -5,7 +5,7 @@
 , glog
 , gmock
 , openssl
-, google-gflags
+, gflags
 , gnuradio
 , orc
 , pkgconfig
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     glog
     gmock
     openssl.dev
-    google-gflags
+    gflags
     gnuradio
     orc
     pkgconfig
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   cmakeFlags = [
-    "-DGFlags_ROOT_DIR=${google-gflags}/lib"
+    "-DGFlags_ROOT_DIR=${gflags}/lib"
     "-DGLOG_INCLUDE_DIR=${glog}/include"
     "-DENABLE_UNIT_TESTING=OFF"
 
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index 153ebaa441f50..e8171bcb256a6 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 , cmake
 , boost
-, google-gflags
+, gflags
 , glog
 , hdf5-cpp
 , opencv3
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
       ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"]
       ++ ["-DUSE_LMDB=${toggle lmdbSupport}"];
 
-  buildInputs = [ boost google-gflags glog protobuf hdf5-cpp opencv3 openblas ]
+  buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 openblas ]
                 ++ lib.optional cudaSupport cudatoolkit
                 ++ lib.optional cudnnSupport cudnn
                 ++ lib.optional lmdbSupport lmdb
diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix
index f44d07d36db87..43d57feab71bd 100644
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/pkgs/applications/science/misc/openmvs/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, cmake
 , eigen, opencv, ceres-solver, cgal, boost, vcg
-, gmp, mpfr, glog, google-gflags, libjpeg_turbo }:
+, gmp, mpfr, glog, gflags, libjpeg_turbo }:
 
 stdenv.mkDerivation rec {
   name = "openmvs-unstable-2018-05-26";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "12dgkwwfdp24581y3i41gsd1k9hq0aw917q0ja5s0if4qbmc8pni";
   };
 
-  buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog google-gflags libjpeg_turbo ];
+  buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog gflags libjpeg_turbo ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       "-DCERES_DIR=${ceres-solver}/lib/cmake/Ceres/"
     )
   '';
-  
+
   postFixup = ''
     rp=$(patchelf --print-rpath $out/bin/DensifyPointCloud)
     patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/DensifyPointCloud
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     rp=$(patchelf --print-rpath $out/bin/TextureMesh)
     patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/TextureMesh
   '';
-  
+
   cmakeDir = "./";
 
   dontUseCmakeBuildDir = true;
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix
index 043b9e263d8ac..52e0f06eeec41 100644
--- a/pkgs/development/libraries/ceres-solver/default.nix
+++ b/pkgs/development/libraries/ceres-solver/default.nix
@@ -2,13 +2,13 @@
 , eigen
 , fetchurl
 , cmake
-, google-gflags
+, gflags
 , glog
 , runTests ? false
 }:
 
-# google-gflags is required to run tests
-assert runTests -> google-gflags != null;
+# gflags is required to run tests
+assert runTests -> gflags != null;
 
 stdenv.mkDerivation rec {
   name = "ceres-solver-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ eigen glog ]
-    ++ stdenv.lib.optional runTests google-gflags;
+    ++ stdenv.lib.optional runTests gflags;
 
   # The Basel BUILD file conflicts with the cmake build directory on
   # case-insensitive filesystems, eg. darwin.
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 61a96af618a49..78e32192fb4cf 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, boost, libevent, double-conversion, glog
-, google-gflags, libiberty, openssl }:
+, gflags, libiberty, openssl }:
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     boost
     double-conversion
     glog
-    google-gflags
+    gflags
     libevent
     libiberty
     openssl
diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix
new file mode 100644
index 0000000000000..fefc3a8b4b81a
--- /dev/null
+++ b/pkgs/development/libraries/gflags/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "google-gflags-${version}";
+  version = "2.2.2";
+
+  src = fetchFromGitHub {
+    owner = "gflags";
+    repo = "gflags";
+    rev = "v${version}";
+    sha256 = "147i3md3nxkjlrccqg4mq1kyzc7yrhvqv5902iibc7znkvzdvlp0";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  # This isn't used by the build and breaks the CMake build on case-insensitive filesystems (e.g., on Darwin)
+  preConfigure = "rm BUILD";
+
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DBUILD_STATIC_LIBS=ON"
+  ];
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A C++ library that implements commandline flags processing";
+    longDescription = ''
+      The gflags package contains a C++ library that implements commandline flags processing.
+      As such it's a replacement for getopt().
+      It was owned by Google. google-gflags project has been renamed to gflags and maintained by new community.
+    '';
+    homepage = https://gflags.github.io/gflags/;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.linquize ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix
deleted file mode 100644
index fefc3a8b4b81a..0000000000000
--- a/pkgs/development/libraries/google-gflags/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake }:
-
-stdenv.mkDerivation rec {
-  name = "google-gflags-${version}";
-  version = "2.2.2";
-
-  src = fetchFromGitHub {
-    owner = "gflags";
-    repo = "gflags";
-    rev = "v${version}";
-    sha256 = "147i3md3nxkjlrccqg4mq1kyzc7yrhvqv5902iibc7znkvzdvlp0";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  # This isn't used by the build and breaks the CMake build on case-insensitive filesystems (e.g., on Darwin)
-  preConfigure = "rm BUILD";
-
-  cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=ON"
-    "-DBUILD_STATIC_LIBS=ON"
-  ];
-
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "A C++ library that implements commandline flags processing";
-    longDescription = ''
-      The gflags package contains a C++ library that implements commandline flags processing.
-      As such it's a replacement for getopt().
-      It was owned by Google. google-gflags project has been renamed to gflags and maintained by new community.
-    '';
-    homepage = https://gflags.github.io/gflags/;
-    license = licenses.bsd3;
-    maintainers = [ maintainers.linquize ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix
index 0fa46dde23e2a..1ebf2c2e21e54 100644
--- a/pkgs/development/libraries/kinetic-cpp-client/default.nix
+++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, fetchurl, cmake, protobuf, libunwind, openssl, glog
-, google-gflags, gmock, gtest
+, gflags, gmock, gtest
 }:
 
 let
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ cmake protobuf ];
-  buildInputs = [ libunwind glog google-gflags gmock gtest ];
+  buildInputs = [ libunwind glog gflags gmock gtest ];
 
   # The headers and library include from these and there is no provided pc file
   propagatedBuildInputs = [ protobuf openssl ];
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 43a68abf82570..7055645fe89fa 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchFromGitHub, fetchpatch
 , cmake, pkgconfig, unzip, zlib, pcre, hdf5
-, glog, boost, google-gflags, protobuf
+, glog, boost, gflags, protobuf
 , config
 
 , enableJPEG      ? true, libjpeg
@@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs =
-       [ zlib pcre hdf5 glog boost google-gflags ]
+       [ zlib pcre hdf5 glog boost gflags ]
     ++ lib.optional useSystemProtobuf protobuf
     ++ lib.optional enablePython pythonPackages.python
     ++ lib.optional enableGtk2 gtk2
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index f96e6bf94bb01..85bb2f1effd98 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchurl, fetchFromGitHub
 , cmake, pkgconfig, unzip, zlib, pcre, hdf5
-, glog, boost, google-gflags, protobuf
+, glog, boost, gflags, protobuf
 , config
 
 , enableJPEG      ? true, libjpeg
@@ -187,7 +187,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs =
-       [ zlib pcre hdf5 glog boost google-gflags protobuf ]
+       [ zlib pcre hdf5 glog boost gflags protobuf ]
     ++ lib.optional enablePython pythonPackages.python
     ++ lib.optional enableGtk2 gtk2
     ++ lib.optional enableGtk3 gtk3
diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix
index d568e94520213..4746f77a21646 100644
--- a/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, config, fetchFromGitHub
 , cmake
-, glog, google-gflags, gtest
+, glog, gflags, gtest
 , protobuf, snappy
 , python, future, six, python-protobuf, numpy, pydot
 , eigen
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "out" ];
   propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle
 
-  buildInputs = [ glog google-gflags protobuf snappy eigen ]
+  buildInputs = [ glog gflags protobuf snappy eigen ]
     ++ lib.optional useCuda cudatoolkit
     ++ lib.optional useCudnn cudnn
     ++ lib.optional useOpenmp openmp
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index ba6827bf6947f..2dd63ebfc854f 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, abseil-cpp, google-gflags, which
+{ stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which
 , lsb-release, glog, protobuf, cbc, zlib
 , ensureNewerSourcesForZipFilesHook, python, swig
 , pythonProtobuf }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     cat <<EOF > Makefile.local
     UNIX_ABSL_DIR=${abseil-cpp}
-    UNIX_GFLAGS_DIR=${google-gflags}
+    UNIX_GFLAGS_DIR=${gflags}
     UNIX_GLOG_DIR=${glog}
     UNIX_PROTOBUF_DIR=${protobuf}
     UNIX_CBC_DIR=${cbc}
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     python.pkgs.setuptools python.pkgs.wheel
   ];
   propagatedBuildInputs = [
-    abseil-cpp google-gflags glog protobuf cbc
+    abseil-cpp gflags glog protobuf cbc
     pythonProtobuf python.pkgs.six
   ];
 
diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix
index 80341e88dd064..c34b53c1e62db 100644
--- a/pkgs/tools/system/osquery/default.nix
+++ b/pkgs/tools/system/osquery/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, pkgconfig, cmake, python
 , udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive
 , libgpgerror, libuuid, iptables, dpkg, lzma, bzip2, rpm
-, beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags
+, beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, gflags
 , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy
 , openssl, file, doxygen
 , gtest, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl, libelfin
@@ -53,7 +53,7 @@ let
 
     # filter out static linking configuration to avoid that the library will
     # be linked both statically and dynamically.
-    gflags = google-gflags.overrideAttrs (old: {
+    gflags = gflags.overrideAttrs (old: {
       cmakeFlags = stdenv.lib.filter (f: (builtins.match ".*STATIC.*" f) == null) old.cmakeFlags;
     });
   };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fd873605056ba..db980c05fb076 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -123,6 +123,7 @@ mapAliases ({
   go-pup = pup; # added 2017-12-19
   gobjectIntrospection = gobject-introspection; # added 2018-12-02
   goimports = gotools; # added 2018-09-16
+  google-gflags = gflags; # added 2019-07-25
   googleAuthenticator = google-authenticator; # added 2016-10-16
   grantlee5 = libsForQt5.grantlee;  # added 2015-12-19
   gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4c044e5312d3..c94c2999c1775 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1263,7 +1263,7 @@ in
   cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { };
 
   ceres-solver = callPackage ../development/libraries/ceres-solver {
-    google-gflags = null; # only required for examples/tests
+    gflags = null; # only required for examples/tests
   };
 
   gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { };
@@ -10776,8 +10776,7 @@ in
   goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { };
   goocanvasmm2 = callPackage ../development/libraries/goocanvasmm { };
 
-  google-gflags = callPackage ../development/libraries/google-gflags { };
-  gflags = google-gflags; # TODO: move to aliases.nix
+  gflags = callPackage ../development/libraries/gflags { };
 
   gperftools = callPackage ../development/libraries/gperftools { };
 
-- 
cgit 1.4.1