From a112709b02b93f9690a4a5b422119f1a1dd6d8a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 5 Feb 2015 00:02:26 +0100
Subject: [PATCH] automake: use 1.14.* as the default

I see 1.15 has been released recently,
but that's probably too new to be the default.
---
 .../gnome-3/3.12/core/gnome-contacts/default.nix      |  4 ++--
 pkgs/desktops/gnome-3/3.12/core/tracker/default.nix   |  4 ++--
 pkgs/development/tools/misc/fswatch/default.nix       |  4 ++--
 pkgs/top-level/all-packages.nix                       | 11 +++--------
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
index 5b4ca5c3418..49bd7ac70f4 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret
 , bash, makeWrapper, itstool, folks, libnotify, libxml2
 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
-, libsoup, vala, dbus_glib, automake114x, autoconf }:
+, libsoup, vala, dbus_glib, automake, autoconf }:
 
 stdenv.mkDerivation rec {
   name = "gnome-contacts-3.12.0";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
                   libxml2 libsoup gnome3.gnome_online_accounts nspr nss
                   gdk_pixbuf gnome3.gnome_icon_theme librsvg
                   hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  vala automake114x autoconf db ];
+                  vala automake autoconf db ];
 
   preFixup = ''
     for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do
diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
index 0d5cc4d1427..13ea6bb391c 100644
--- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, libxml2, upower
 , pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection
-, bash, makeWrapper, itstool, vala, sqlite, automake114x, autoconf
+, bash, makeWrapper, itstool, vala, sqlite, automake, autoconf
 , gnome3, librsvg, gdk_pixbuf, file, libnotify
 , evolution_data_server, gst_all_1, poppler, libtool
 , icu, taglib, libjpeg, libtiff, giflib, libcue
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   
   buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
                   bzip2 gnome3.totem-pl-parser gobjectIntrospection
-                  automake114x autoconf libtool
+                  automake autoconf libtool
                   gnome3.gsettings_desktop_schemas makeWrapper file
                   gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite
                   upower libnotify evolution_data_server gnome3.libgee
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index a7e42a07a63..35468d1351f 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , fetchFromGitHub
 , autoconf
-, automake114x
+, automake
 , findutils                     # for xargs
 , gettext_0_19
 , libtool
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
     sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4";
   };
 
-  buildInputs = [ autoconf automake114x gettext_0_19 libtool makeWrapper texinfo ];
+  buildInputs = [ autoconf automake gettext_0_19 libtool makeWrapper texinfo ];
 
   preConfigure = ''
     ./autogen.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3dd8284bbc9..8faa7a548a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1294,9 +1294,7 @@ let
 
   freeipmi = callPackage ../tools/system/freeipmi {};
 
-  freetalk = callPackage ../applications/networking/instant-messengers/freetalk {
-    automake = automake114x;
-  };
+  freetalk = callPackage ../applications/networking/instant-messengers/freetalk { };
 
   freetds = callPackage ../development/libraries/freetds { };
 
@@ -4353,7 +4351,6 @@ let
 
   mesos = callPackage ../applications/networking/cluster/mesos {
     sasl = cyrus_sasl;
-    automake = automake114x;
     inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython;
     pythonProtobuf = pythonPackages.protobuf;
   };
@@ -4656,7 +4653,7 @@ let
 
   autocutsel = callPackage ../tools/X11/autocutsel{ };
 
-  automake = automake112x;
+  automake = automake114x;
 
   automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
 
@@ -5203,9 +5200,7 @@ let
 
   adns = callPackage ../development/libraries/adns { };
 
-  afflib = callPackage ../development/libraries/afflib {
-    automake = automake114x;
-  };
+  afflib = callPackage ../development/libraries/afflib { };
 
   agg = callPackage ../development/libraries/agg { };