summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2017-08-12 18:49:24 +0200
committerRobin Gloster <mail@glob.in>2017-08-12 18:49:58 +0200
commitbb5702c521e5ac4f23457159064d7b4c94b5f241 (patch)
tree79414595b22bd5dc1d47708d767260394306ac88
parent354b3cda36cddb6c93fbb1313585a0d5116607d2 (diff)
downloadnixpkgs-bb5702c521e5ac4f23457159064d7b4c94b5f241.tar
nixpkgs-bb5702c521e5ac4f23457159064d7b4c94b5f241.tar.gz
nixpkgs-bb5702c521e5ac4f23457159064d7b4c94b5f241.tar.bz2
nixpkgs-bb5702c521e5ac4f23457159064d7b4c94b5f241.tar.lz
nixpkgs-bb5702c521e5ac4f23457159064d7b4c94b5f241.tar.xz
nixpkgs-bb5702c521e5ac4f23457159064d7b4c94b5f241.tar.zst
nixpkgs-bb5702c521e5ac4f23457159064d7b4c94b5f241.zip
treewide: remove automake pinning to the newest version
quasi no-op
-rw-r--r--pkgs/applications/misc/pcmanx-gtk2/default.nix4
-rw-r--r--pkgs/applications/networking/cluster/mesos/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix4
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix
index ad5a0b0ef0d..65366607c50 100644
--- a/pkgs/applications/misc/pcmanx-gtk2/default.nix
+++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk2, libXft, intltool, automake115x, autoconf, libtool, pkgconfig }:
+{ stdenv, fetchurl, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }:
 
 stdenv.mkDerivation {
   name = "pcmanx-gtk2-1.3";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302";
   };
 
-  buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ];
+  buildInputs = [ gtk2 libXft intltool automake autoconf libtool pkgconfig ];
 
   preConfigure = ''
     ./autogen.sh
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index a7cc5d78938..65758fca600 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf
-, automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython
+, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython
 , setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd
 , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
 , ethtool, coreutils, which, iptables
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    makeWrapper autoconf automake115x libtool curl sasl jdk maven
+    makeWrapper autoconf automake libtool curl sasl jdk maven
     python wrapPython boto setuptools leveldb
     subversion apr glog openssl libevent
   ] ++ lib.optionals stdenv.isLinux [
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
index 34cea5141ba..66cc2cb24c7 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
@@ -3,7 +3,7 @@
 , libchamplain, clutter_gtk, geocode_glib
 , bash, wrapGAppsHook, itstool, folks, libnotify, libxml2
 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
-, libsoup, vala_0_32, dbus_glib, automake115x, autoconf }:
+, libsoup, vala_0_32, dbus_glib, automake, autoconf }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
                   libxml2 libsoup gnome3.gnome_online_accounts nspr nss
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
                   libchamplain clutter_gtk geocode_glib
-                  vala_0_32 automake115x autoconf db ];
+                  vala_0_32 automake autoconf db ];
 
   preFixup = ''
     gappsWrapperArgs+=(