diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/netatalk/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/bogofilter/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/man-db/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/isync/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/webalizer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/rpm/default.nix | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 26ffc9d50c252..850e168124888 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, db4, libgcrypt, avahi, libiconv, pam, openssl }: +{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl }: stdenv.mkDerivation rec { name = "netatalk-3.1.0"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq"; }; - buildInputs = [ pkgconfig db4 libgcrypt avahi libiconv pam openssl ]; + buildInputs = [ pkgconfig db libgcrypt avahi libiconv pam openssl ]; configureFlags = [ - "--with-bdb=${db4}" + "--with-bdb=${db}" "--with-openssl=${openssl}" ]; diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 09d8e888837e3..f7c121d825e29 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, flex, db4}: +{fetchurl, stdenv, flex, db}: stdenv.mkDerivation rec { name = "bogofilter-1.2.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # FIXME: We would need `pax' as a "propagated build input" (for use # by the `bf_tar' script) but we don't have it currently. - buildInputs = [ flex db4 ]; + buildInputs = [ flex db ]; meta = { homepage = http://bogofilter.sourceforge.net/; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 5374cb7436181..121a92b845d66 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, db4, groff}: +{stdenv, fetchurl, db, groff}: stdenv.mkDerivation { name = "man-db-2.5.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "178w1fk23ffh8vabj29cn0yyg5ps7bwy1zrrrcsw8aypbh3sfjy3"; }; - buildInputs = [db4 groff]; + buildInputs = [db groff]; configureFlags = '' --disable-setuid diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 30ee63f257a4e..86986ed9b9540 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, openssl, pkgconfig, db4 }: +{ fetchurl, stdenv, openssl, pkgconfig, db }: stdenv.mkDerivation rec { name = "isync-1.0.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; patches = [ ./isync-recursice-imap.patch ]; # usefull patch to enable subfolders listing - buildInputs = [ openssl pkgconfig db4 ]; + buildInputs = [ openssl pkgconfig db ]; meta = { homepage = http://isync.sourceforge.net/; diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index efa29e8140732..99fde38712909 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, libpng, gd, geoip, db4}: +{stdenv, fetchurl, zlib, libpng, gd, geoip, db}: stdenv.mkDerivation { name = "webalizer-2.23-05"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { --replace "--static" "" ''; - buildInputs = [zlib libpng gd geoip db4]; + buildInputs = [zlib libpng gd geoip db]; configureFlags = "--enable-dns --enable-geoip --disable-static --enable-shared"; } diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 9a96baf5fe00f..4b1b8aeb28dca 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4, xz, python }: +{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db, xz, python }: stdenv.mkDerivation rec { name = "rpm-4.7.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0"; }; - buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 xz python ]; + buildInputs = [ cpio zlib bzip2 file nspr nss popt db xz python ]; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. |