double-conversion: rename attr from double_conversion

This commit is contained in:
Orivej Desh 2017-11-22 23:34:18 +00:00
parent f6dfa221c9
commit eb23772c10
4 changed files with 6 additions and 5 deletions

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, boost, libevent
, double_conversion, glog, google-gflags, python, libiberty, openssl }:
, double-conversion, glog, google-gflags, python, libiberty, openssl }:
stdenv.mkDerivation rec {
name = "folly-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook python pkgconfig ];
buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ];
buildInputs = [ libiberty boost libevent double-conversion glog google-gflags openssl ];
postPatch = "cd folly";
preBuild = ''

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, libtool, boost, double_conversion, gperftools, icu, libmysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC, zookeeper_mt, zstd }:
{ stdenv, fetchFromGitHub, cmake, libtool, boost, double-conversion, gperftools, icu, libmysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC, zookeeper_mt, zstd }:
stdenv.mkDerivation rec {
name = "clickhouse-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake libtool ];
buildInputs = [ boost double_conversion gperftools icu libmysql lz4 openssl poco re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd ];
buildInputs = [ boost double-conversion gperftools icu libmysql lz4 openssl poco re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd ];
cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ];

View file

@ -47,6 +47,7 @@ mapAliases (rec {
cv = progress; # added 2015-09-06
debian_devscripts = debian-devscripts; # added 2016-03-23
digikam5 = digikam; # added 2017-02-18
double_conversion = double-conversion; # 2017-11-22
dwarf_fortress = dwarf-fortress; # added 2016-01-23
dwbWrapper = dwb; # added 2015-01
enblendenfuse = enblend-enfuse; # 2015-09-30

View file

@ -8062,7 +8062,7 @@ with pkgs;
dhex = callPackage ../applications/editors/dhex { };
double_conversion = callPackage ../development/libraries/double-conversion { };
double-conversion = callPackage ../development/libraries/double-conversion { };
dclib = callPackage ../development/libraries/dclib { };