diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/etcd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/etcd/deps.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/openresty/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/monitoring/newrelic-sysmond/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/2.0.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/2.2.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/nosql/influxdb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/restund/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/samba/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/oracle-xe/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/virtuoso/6.x.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/virtuoso/7.x.nix | 2 |
13 files changed, 21 insertions, 21 deletions
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index ea91993e7231..5d5939f83bef 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.5.0-alpha.4"; + version = "2.0.0-rc.1"; name = "etcd-${version}"; src = import ./deps.nix { diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix index 1cd8309ad5d0..b07ee1d74892 100644 --- a/pkgs/servers/etcd/deps.nix +++ b/pkgs/servers/etcd/deps.nix @@ -8,8 +8,8 @@ let src = fetchFromGitHub { owner = "coreos"; repo = "etcd"; - rev = "d01d6119e54f729f54e9776ad5729277fcf38668"; - sha256 = "0h9d6rc8yx7vyv2ggvzsddyng03pjhyb7avm9wrc805qr7p8nhns"; + rev = "221abdcb3b755b36d1e7d70149f6de3450351619"; + sha256 = "1wkd238ap9gp5irrb3f6nnh83rzizwfrfac76j0dvqdka35l247k"; }; } ]; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 8c878e856b80..65c81c455b9e 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openresty-${version}"; - version = "1.7.4.1rc2"; + version = "1.7.7.1"; src = fetchurl { url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz"; - sha256 = "1208snm0g1x2p9ybl8br7mmcl5c4g4xzhm80n5jfjprr85gb7ajx"; + sha256 = "1m541k2lys3155f0r94abgcmm2hgvv56q0i4fk58w6fa8n4h62z0"; }; buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags" - export PATH="$PATH:${stdenv.gcc.libc}/sbin" + export PATH="$PATH:${stdenv.cc.libc}/sbin" patchShebangs . ''; diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix index 7551bdf96692..777cfe805bf6 100644 --- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin install -v -m755 daemon/nrsysmond.x64 $out/bin/nrsysmond - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/nrsysmond ''; diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index 399fb54875a4..9ce027409fdf 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -17,8 +17,8 @@ let '' substituteInPlace ./configure \ --replace " -static" "" \ - ${stdenv.lib.optionalString (stdenv.gcc.libc != null) '' - --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h + ${stdenv.lib.optionalString (stdenv.cc.libc != null) '' + --replace /usr/include/iconv.h ${stdenv.cc.libc}/include/iconv.h ''} ''; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index df9da3c467b1..1e8d03ec2b66 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -22,8 +22,8 @@ let '' substituteInPlace ./configure \ --replace " -static" "" \ - ${stdenv.lib.optionalString (stdenv.gcc.libc != null) '' - --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h + ${stdenv.lib.optionalString (stdenv.cc.libc != null) '' + --replace /usr/include/iconv.h ${stdenv.cc.libc}/include/iconv.h ''} ''; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 47f1b7a867b0..5d8541ab870e 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -13,8 +13,8 @@ let '' substituteInPlace ./configure \ --replace " -static" "" \ - ${stdenv.lib.optionalString (stdenv.gcc.libc != null) '' - --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h + ${stdenv.lib.optionalString (stdenv.cc.libc != null) '' + --replace /usr/include/iconv.h ${stdenv.cc.libc}/include/iconv.h ''} ''; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 3eba1b9f8956..343360952146 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { installPhase = '' install -D influxdb $out/bin/influxdb - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/bin/influxdb + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/influxdb wrapProgram "$out/bin/influxdb" \ - --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64:${zlib}/lib:${bzip2}/lib" + --prefix LD_LIBRARY_PATH : "${stdenv.cc.gcc}/lib:${stdenv.cc.gcc}/lib64:${zlib}/lib:${bzip2}/lib" mkdir -p $out/share/influxdb cp -R admin scripts config.toml $out/share/influxdb diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix index cf07d0e6e3e1..b6fd650086f9 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { ''PREFIX=$(out)'' "USE_MYSQL=1" ] - ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}" - ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}" + ++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}" + ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; NIX_LDFLAGS='' -L${mysql}/lib/mysql ''; meta = { diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 08f12d975062..b0b1b152e9b7 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ] ++ (stdenv.lib.optional winbind "--with-winbind") - ++ (stdenv.lib.optional (stdenv.gcc.libc != null) "--with-libiconv=${stdenv.gcc.libc}"); + ++ (stdenv.lib.optional (stdenv.cc.libc != null) "--with-libiconv=${stdenv.cc.libc}"); # Need to use a DESTDIR because `make install' tries to write in /var and /etc. installFlags = "DESTDIR=$(TMPDIR)/inst"; diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index cd333152a2ae..cb150fc5fd4c 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { \( -name '*.sh' \ -o -path "$basedir/bin/*" \ \) -print -exec "${patchelf}/bin/patchelf" \ - --interpreter "$(cat "$NIX_GCC/nix-support/dynamic-linker")" \ + --interpreter "$(cat "$NIX_CC/nix-support/dynamic-linker")" \ --set-rpath "${libs}:$out/libexec/oracle/lib" \ --force-rpath '{}' \; ''; diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 9453b8d2cdb2..4de0ace0c03a 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 openssl readline gawk ]; - CPP = "${stdenv.gcc}/bin/gcc -E"; + CPP = "${stdenv.cc}/bin/gcc -E"; configureFlags = " --enable-shared --disable-all-vads --with-readline=${readline} diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index 0c310b18901f..de610f9a7294 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 openssl readline gawk ]; - CPP = "${stdenv.gcc}/bin/gcc -E"; + CPP = "${stdenv.cc}/bin/gcc -E"; configureFlags = " --enable-shared --disable-all-vads --with-readline=${readline} |