ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

automake: use 1.14.* as the default

Browse Source 
I see 1.15 has been released recently,
but that's probably too new to be the default.
This commit is contained in:
Vladimír Čunát 2015-02-05 00:02:26 +01:00
parent bb8d3ad2de
commit a112709b02
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
View File

@ -2,7 +2,7 @@
, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret , pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret
, bash, makeWrapper, itstool, folks, libnotify, libxml2 , bash, makeWrapper, itstool, folks, libnotify, libxml2
, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
, libsoup, vala, dbus_glib, automake114x, autoconf }: , libsoup, vala, dbus_glib, automake, autoconf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-contacts-3.12.0"; name = "gnome-contacts-3.12.0";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
libxml2 libsoup gnome3.gnome_online_accounts nspr nss libxml2 libsoup gnome3.gnome_online_accounts nspr nss
gdk_pixbuf gnome3.gnome_icon_theme librsvg gdk_pixbuf gnome3.gnome_icon_theme librsvg
hicolor_icon_theme gnome3.gnome_icon_theme_symbolic hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
vala automake114x autoconf db ]; vala automake autoconf db ];
preFixup = '' preFixup = ''
for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do

4
pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, libxml2, upower { stdenv, intltool, fetchurl, libxml2, upower
, pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection , 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 , gnome3, librsvg, gdk_pixbuf, file, libnotify
, evolution_data_server, gst_all_1, poppler, libtool , evolution_data_server, gst_all_1, poppler, libtool
, icu, taglib, libjpeg, libtiff, giflib, libcue , icu, taglib, libjpeg, libtiff, giflib, libcue
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
bzip2 gnome3.totem-pl-parser gobjectIntrospection bzip2 gnome3.totem-pl-parser gobjectIntrospection
automake114x autoconf libtool automake autoconf libtool
gnome3.gsettings_desktop_schemas makeWrapper file gnome3.gsettings_desktop_schemas makeWrapper file
gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite
upower libnotify evolution_data_server gnome3.libgee upower libnotify evolution_data_server gnome3.libgee

4
pkgs/development/tools/misc/fswatch/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, autoconf , autoconf
, automake114x , automake
, findutils # for xargs , findutils # for xargs
, gettext_0_19 , gettext_0_19
, libtool , libtool
@ -24,7 +24,7 @@ in stdenv.mkDerivation {
sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4"; sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4";
}; };
buildInputs = [ autoconf automake114x gettext_0_19 libtool makeWrapper texinfo ]; buildInputs = [ autoconf automake gettext_0_19 libtool makeWrapper texinfo ];
preConfigure = '' preConfigure = ''
./autogen.sh ./autogen.sh

11
pkgs/top-level/all-packages.nix
View File

@ -1294,9 +1294,7 @@ let
freeipmi = callPackage ../tools/system/freeipmi {}; freeipmi = callPackage ../tools/system/freeipmi {};
freetalk = callPackage ../applications/networking/instant-messengers/freetalk { freetalk = callPackage ../applications/networking/instant-messengers/freetalk { };
automake = automake114x;
};
freetds = callPackage ../development/libraries/freetds { }; freetds = callPackage ../development/libraries/freetds { };
@ -4353,7 +4351,6 @@ let
mesos = callPackage ../applications/networking/cluster/mesos { mesos = callPackage ../applications/networking/cluster/mesos {
sasl = cyrus_sasl; sasl = cyrus_sasl;
automake = automake114x;
inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython; inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython;
pythonProtobuf = pythonPackages.protobuf; pythonProtobuf = pythonPackages.protobuf;
}; };
@ -4656,7 +4653,7 @@ let
autocutsel = callPackage ../tools/X11/autocutsel{ }; autocutsel = callPackage ../tools/X11/autocutsel{ };
automake = automake112x; automake = automake114x;
automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
@ -5203,9 +5200,7 @@ let
adns = callPackage ../development/libraries/adns { }; adns = callPackage ../development/libraries/adns { };
afflib = callPackage ../development/libraries/afflib { afflib = callPackage ../development/libraries/afflib { };
automake = automake114x;
};
agg = callPackage ../development/libraries/agg { }; agg = callPackage ../development/libraries/agg { };