diff options
| -rw-r--r-- | pkgs/development/libraries/folly/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/clickhouse/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 4abe7cf8507..45e3c964e99 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -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 = '' diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index cebff700e50..f9b7a24273f 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -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" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index defac535532..6b662c56579 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a998fe461f5..49b9ec3d080 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |