From 9013dc5826dfd9d2d376fd0f45f4031a8cfa0c55 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Sep 2015 10:52:47 +0200 Subject: [PATCH] inotifyTools -> inotify-tools Fixes #9456. --- .../networking/p2p/transmission/default.nix | 4 +-- pkgs/servers/mail/dovecot/2.2.x.nix | 4 +-- pkgs/servers/mail/dovecot/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 31 ++++++++++--------- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index bf659816c4f..b836e75132c 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper -, openssl, curl, libevent, inotifyTools, systemd +, openssl, curl, libevent, inotify-tools, systemd , enableGTK3 ? false, gtk3 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1sxr1magqb5s26yvr5yhs1f7bmir8gl09niafg64lhgfnhv1kz59"; }; - buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ] + buildInputs = [ pkgconfig intltool file openssl curl libevent inotify-tools ] ++ optionals enableGTK3 [ gtk3 makeWrapper ] ++ optional stdenv.isLinux systemd; diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix index a774777709f..be671b7f0e7 100644 --- a/pkgs/servers/mail/dovecot/2.2.x.nix +++ b/pkgs/servers/mail/dovecot/2.2.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, systemd, openssl, pam, bzip2, zlib, openldap -, inotifyTools, clucene_core_2, sqlite }: +, inotify-tools, clucene_core_2, sqlite }: stdenv.mkDerivation rec { name = "dovecot-2.2.16"; buildInputs = [perl openssl bzip2 zlib openldap clucene_core_2 sqlite] - ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotifyTools ]; + ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotify-tools ]; src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index bd179490c18..3997370154e 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, openssl, pam, bzip2, zlib, inotifyTools, openldap}: +{stdenv, fetchurl, openssl, pam, bzip2, zlib, inotify-tools, openldap}: stdenv.mkDerivation rec { name = "dovecot-2.1.17"; - buildInputs = [openssl bzip2 zlib openldap] ++ stdenv.lib.optionals stdenv.isLinux [pam inotifyTools]; + buildInputs = [openssl bzip2 zlib openldap] ++ stdenv.lib.optionals stdenv.isLinux [pam inotify-tools]; src = fetchurl { url = "http://dovecot.org/releases/2.1/${name}.tar.gz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d87624c37db..abb1462f6a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5639,7 +5639,7 @@ let ino = callPackage ../development/arduino/ino { }; - inotifyTools = callPackage ../development/tools/misc/inotify-tools { }; + inotify-tools = callPackage ../development/tools/misc/inotify-tools { }; intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { inherit (xorg) libpciaccess dri2proto libX11 libXext libXv libXrandr; @@ -15296,24 +15296,25 @@ let arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 bridge_utils = bridge-utils; # added 2015-02-20 - clangAnalyzer = clang-analyzer; # added 2015-02-20 - lttngTools = lttng-tools; # added 2014-07-31 - lttngUst = lttng-ust; # added 2014-07-31 - jquery_ui = jquery-ui; # added 2014-09-07 - youtubeDL = youtube-dl; # added 2014-10-26 - youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 - rdiff_backup = rdiff-backup; # added 2014-11-23 - htmlTidy = html-tidy; # added 2014-12-06 - libtidy = html-tidy; # added 2014-12-21 - speedtest_cli = speedtest-cli; # added 2015-02-17 - sqliteInteractive = sqlite-interactive; # added 2014-12-06 - nfsUtils = nfs-utils; # added 2014-12-06 buildbotSlave = buildbot-slave; # added 2014-12-09 + cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 + clangAnalyzer = clang-analyzer; # added 2015-02-20 cool-old-term = cool-retro-term; # added 2015-01-31 - rssglx = rss-glx; #added 2015-03-25 haskell-ng = haskell; # 2015-04-19 haskellngPackages = haskellPackages; # 2015-04-19 + htmlTidy = html-tidy; # added 2014-12-06 inherit (haskell.compiler) jhc uhc; # 2015-05-15 - cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 + inotifyTools = inotify-tools; + jquery_ui = jquery-ui; # added 2014-09-07 + libtidy = html-tidy; # added 2014-12-21 + lttngTools = lttng-tools; # added 2014-07-31 + lttngUst = lttng-ust; # added 2014-07-31 + nfsUtils = nfs-utils; # added 2014-12-06 + rdiff_backup = rdiff-backup; # added 2014-11-23 + rssglx = rss-glx; #added 2015-03-25 + speedtest_cli = speedtest-cli; # added 2015-02-17 + sqliteInteractive = sqlite-interactive; # added 2014-12-06 + youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 + youtubeDL = youtube-dl; # added 2014-10-26 }; in self; in pkgs