public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

google-gflags: move to aliases.nix

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

gflags.name will be updated in staging.
This commit is contained in:
Orivej Desh 2019-07-25 09:04:55 +00:00
parent 2f55e705e2
commit b5d1d50aa9
14 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/radio/gnss-sdr/default.nix
View File

@ -5,7 +5,7 @@
, glog , glog
, gmock , gmock
, openssl , openssl
, google-gflags , gflags
, gnuradio , gnuradio
, orc , orc
, pkgconfig , pkgconfig
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
glog glog
gmock gmock
openssl.dev openssl.dev
google-gflags gflags
gnuradio gnuradio
orc orc
pkgconfig pkgconfig
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
cmakeFlags = [ cmakeFlags = [
"-DGFlags_ROOT_DIR=${google-gflags}/lib" "-DGFlags_ROOT_DIR=${gflags}/lib"
"-DGLOG_INCLUDE_DIR=${glog}/include" "-DGLOG_INCLUDE_DIR=${glog}/include"
"-DENABLE_UNIT_TESTING=OFF" "-DENABLE_UNIT_TESTING=OFF"

4
pkgs/applications/science/math/caffe/default.nix
View File

@ -3,7 +3,7 @@
, fetchurl , fetchurl
, cmake , cmake
, boost , boost
, google-gflags , gflags
, glog , glog
, hdf5-cpp , hdf5-cpp
, opencv3 , opencv3
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"]
++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; ++ ["-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 cudaSupport cudatoolkit
++ lib.optional cudnnSupport cudnn ++ lib.optional cudnnSupport cudnn
++ lib.optional lmdbSupport lmdb ++ lib.optional lmdbSupport lmdb

4
pkgs/applications/science/misc/openmvs/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake { stdenv, fetchFromGitHub, pkgconfig, cmake
, eigen, opencv, ceres-solver, cgal, boost, vcg , eigen, opencv, ceres-solver, cgal, boost, vcg
, gmp, mpfr, glog, google-gflags, libjpeg_turbo }: , gmp, mpfr, glog, gflags, libjpeg_turbo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openmvs-unstable-2018-05-26"; name = "openmvs-unstable-2018-05-26";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "12dgkwwfdp24581y3i41gsd1k9hq0aw917q0ja5s0if4qbmc8pni"; 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 ]; nativeBuildInputs = [ cmake pkgconfig ];

8
pkgs/development/libraries/ceres-solver/default.nix
View File

@ -2,13 +2,13 @@
, eigen , eigen
, fetchurl , fetchurl
, cmake , cmake
, google-gflags , gflags
, glog , glog
, runTests ? false , runTests ? false
}: }:
# google-gflags is required to run tests # gflags is required to run tests
assert runTests -> google-gflags != null; assert runTests -> gflags != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ceres-solver-${version}"; name = "ceres-solver-${version}";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ eigen glog ] 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 # The Basel BUILD file conflicts with the cmake build directory on
# case-insensitive filesystems, eg. darwin. # case-insensitive filesystems, eg. darwin.

4
pkgs/development/libraries/folly/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, boost, libevent, double-conversion, glog { stdenv, fetchFromGitHub, cmake, boost, libevent, double-conversion, glog
, google-gflags, libiberty, openssl }: , gflags, libiberty, openssl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "folly-${version}"; name = "folly-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
boost boost
double-conversion double-conversion
glog glog
google-gflags gflags
libevent libevent
libiberty libiberty
openssl openssl

0
pkgs/development/libraries/google-gflags/default.nix → pkgs/development/libraries/gflags/default.nix
View File

4
pkgs/development/libraries/kinetic-cpp-client/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, fetchurl, cmake, protobuf, libunwind, openssl, glog { stdenv, fetchgit, fetchurl, cmake, protobuf, libunwind, openssl, glog
, google-gflags, gmock, gtest , gflags, gmock, gtest
}: }:
let let
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ cmake protobuf ]; 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 # The headers and library include from these and there is no provided pc file
propagatedBuildInputs = [ protobuf openssl ]; propagatedBuildInputs = [ protobuf openssl ];

4
pkgs/development/libraries/opencv/3.x.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub, fetchpatch , fetchFromGitHub, fetchpatch
, cmake, pkgconfig, unzip, zlib, pcre, hdf5 , cmake, pkgconfig, unzip, zlib, pcre, hdf5
, glog, boost, google-gflags, protobuf , glog, boost, gflags, protobuf
, config , config
, enableJPEG ? true, libjpeg , enableJPEG ? true, libjpeg
@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = buildInputs =
[ zlib pcre hdf5 glog boost google-gflags ] [ zlib pcre hdf5 glog boost gflags ]
++ lib.optional useSystemProtobuf protobuf ++ lib.optional useSystemProtobuf protobuf
++ lib.optional enablePython pythonPackages.python ++ lib.optional enablePython pythonPackages.python
++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk2 gtk2

4
pkgs/development/libraries/opencv/4.x.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv { lib, stdenv
, fetchurl, fetchFromGitHub , fetchurl, fetchFromGitHub
, cmake, pkgconfig, unzip, zlib, pcre, hdf5 , cmake, pkgconfig, unzip, zlib, pcre, hdf5
, glog, boost, google-gflags, protobuf , glog, boost, gflags, protobuf
, config , config
, enableJPEG ? true, libjpeg , enableJPEG ? true, libjpeg
@ -187,7 +187,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = buildInputs =
[ zlib pcre hdf5 glog boost google-gflags protobuf ] [ zlib pcre hdf5 glog boost gflags protobuf ]
++ lib.optional enablePython pythonPackages.python ++ lib.optional enablePython pythonPackages.python
++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk2 gtk2
++ lib.optional enableGtk3 gtk3 ++ lib.optional enableGtk3 gtk3

4
pkgs/development/libraries/science/math/caffe2/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, config, fetchFromGitHub { stdenv, lib, config, fetchFromGitHub
, cmake , cmake
, glog, google-gflags, gtest , glog, gflags, gtest
, protobuf, snappy , protobuf, snappy
, python, future, six, python-protobuf, numpy, pydot , python, future, six, python-protobuf, numpy, pydot
, eigen , eigen
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "out" ]; outputs = [ "bin" "out" ];
propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle 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 useCuda cudatoolkit
++ lib.optional useCudnn cudnn ++ lib.optional useCudnn cudnn
++ lib.optional useOpenmp openmp ++ lib.optional useOpenmp openmp

6
pkgs/development/libraries/science/math/or-tools/default.nix
View File

@ -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 , lsb-release, glog, protobuf, cbc, zlib
, ensureNewerSourcesForZipFilesHook, python, swig , ensureNewerSourcesForZipFilesHook, python, swig
, pythonProtobuf }: , pythonProtobuf }:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
configurePhase = '' configurePhase = ''
cat <<EOF > Makefile.local cat <<EOF > Makefile.local
UNIX_ABSL_DIR=${abseil-cpp} UNIX_ABSL_DIR=${abseil-cpp}
UNIX_GFLAGS_DIR=${google-gflags} UNIX_GFLAGS_DIR=${gflags}
UNIX_GLOG_DIR=${glog} UNIX_GLOG_DIR=${glog}
UNIX_PROTOBUF_DIR=${protobuf} UNIX_PROTOBUF_DIR=${protobuf}
UNIX_CBC_DIR=${cbc} UNIX_CBC_DIR=${cbc}
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
python.pkgs.setuptools python.pkgs.wheel python.pkgs.setuptools python.pkgs.wheel
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
abseil-cpp google-gflags glog protobuf cbc abseil-cpp gflags glog protobuf cbc
pythonProtobuf python.pkgs.six pythonProtobuf python.pkgs.six
]; ];

4
pkgs/tools/system/osquery/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, python { stdenv, lib, fetchFromGitHub, pkgconfig, cmake, python
, udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive , udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive
, libgpgerror, libuuid, iptables, dpkg, lzma, bzip2, rpm , 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 , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy
, openssl, file, doxygen , openssl, file, doxygen
, gtest, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl, libelfin , gtest, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl, libelfin
@ -53,7 +53,7 @@ let
# filter out static linking configuration to avoid that the library will # filter out static linking configuration to avoid that the library will
# be linked both statically and dynamically. # 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; cmakeFlags = stdenv.lib.filter (f: (builtins.match ".*STATIC.*" f) == null) old.cmakeFlags;
}); });
}; };

1
pkgs/top-level/aliases.nix
View File

@ -123,6 +123,7 @@ mapAliases ({
go-pup = pup; # added 2017-12-19 go-pup = pup; # added 2017-12-19
gobjectIntrospection = gobject-introspection; # added 2018-12-02 gobjectIntrospection = gobject-introspection; # added 2018-12-02
goimports = gotools; # added 2018-09-16 goimports = gotools; # added 2018-09-16
google-gflags = gflags; # added 2019-07-25
googleAuthenticator = google-authenticator; # added 2016-10-16 googleAuthenticator = google-authenticator; # added 2016-10-16
grantlee5 = libsForQt5.grantlee; # added 2015-12-19 grantlee5 = libsForQt5.grantlee; # added 2015-12-19
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25

5
pkgs/top-level/all-packages.nix
View File

@ -1263,7 +1263,7 @@ in
cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { };
ceres-solver = callPackage ../development/libraries/ceres-solver { 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 { }; gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { };
@ -10776,8 +10776,7 @@ in
goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { };
goocanvasmm2 = callPackage ../development/libraries/goocanvasmm { }; goocanvasmm2 = callPackage ../development/libraries/goocanvasmm { };
google-gflags = callPackage ../development/libraries/google-gflags { }; gflags = callPackage ../development/libraries/gflags { };
gflags = google-gflags; # TODO: move to aliases.nix
gperftools = callPackage ../development/libraries/gperftools { }; gperftools = callPackage ../development/libraries/gperftools { };