public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autoconf: 2.69 -> 2.70

Browse Source
This commit is contained in:
Alyssa Ross 2020-12-11 12:47:00 +00:00
parent c434c60b39
commit 3f42dfe7d9
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/tools/misc/autoconf/2.70.nix → pkgs/development/tools/misc/autoconf/2.69.nix
View File

@ -1,16 +1,11 @@
{ stdenv, fetchurl, m4, perl }: { stdenv, fetchurl, m4, perl }:
# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
# cgit) that are needed here should be included directly in Nixpkgs as
# files.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "autoconf-2.70"; name = "autoconf-2.69";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/autoconf/${name}.tar.xz"; url = "mirror://gnu/autoconf/${name}.tar.xz";
sha256 = "1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps"; sha256 = "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4";
}; };
nativeBuildInputs = [ m4 perl ]; nativeBuildInputs = [ m4 perl ];
@ -20,7 +15,8 @@ stdenv.mkDerivation rec {
# http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for
# details. # details.
# There are many test failures on `i386-pc-solaris2.11'. # There are many test failures on `i386-pc-solaris2.11'.
doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); #doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS));
doCheck = false;
# Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the
# "fixed" path in generated files! # "fixed" path in generated files!
@ -33,6 +29,8 @@ stdenv.mkDerivation rec {
export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
''; '';
doInstallCheck = false; # fails
meta = { meta = {
homepage = "https://www.gnu.org/software/autoconf/"; homepage = "https://www.gnu.org/software/autoconf/";
description = "Part of the GNU Build System"; description = "Part of the GNU Build System";
@ -47,7 +45,7 @@ stdenv.mkDerivation rec {
can use, in the form of M4 macro calls. can use, in the form of M4 macro calls.
''; '';
license = stdenv.lib.licenses.gpl3Plus; license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };

11
pkgs/development/tools/misc/autoconf/default.nix
View File

@ -6,11 +6,11 @@
# files. # files.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "autoconf-2.69"; name = "autoconf-2.70";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/autoconf/${name}.tar.xz"; url = "mirror://gnu/autoconf/${name}.tar.xz";
sha256 = "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"; sha256 = "1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps";
}; };
nativeBuildInputs = [ m4 perl ]; nativeBuildInputs = [ m4 perl ];
@ -20,8 +20,7 @@ stdenv.mkDerivation rec {
# http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for
# details. # details.
# There are many test failures on `i386-pc-solaris2.11'. # There are many test failures on `i386-pc-solaris2.11'.
#doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS));
doCheck = false;
# Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the
# "fixed" path in generated files! # "fixed" path in generated files!
@ -34,8 +33,6 @@ stdenv.mkDerivation rec {
export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
''; '';
doInstallCheck = false; # fails
meta = { meta = {
homepage = "https://www.gnu.org/software/autoconf/"; homepage = "https://www.gnu.org/software/autoconf/";
description = "Part of the GNU Build System"; description = "Part of the GNU Build System";
@ -50,7 +47,7 @@ stdenv.mkDerivation rec {
can use, in the form of M4 macro calls. can use, in the form of M4 macro calls.
''; '';
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };

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

@ -120,6 +120,10 @@ in
{ deps = [ autoconf264 automake111x gettext libtool ]; } { deps = [ autoconf264 automake111x gettext libtool ]; }
../build-support/setup-hooks/autoreconf.sh; ../build-support/setup-hooks/autoreconf.sh;
autoreconfHook269 = makeSetupHook
{ deps = [ autoconf269 automake gettext libtool ]; }
../build-support/setup-hooks/autoreconf.sh;
autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; } autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; }
../build-support/setup-hooks/auto-patchelf.sh; ../build-support/setup-hooks/auto-patchelf.sh;
@ -10998,13 +11002,14 @@ in
autobuild = callPackage ../development/tools/misc/autobuild { }; autobuild = callPackage ../development/tools/misc/autobuild { };
autoconf = callPackage ../development/tools/misc/autoconf { }; autoconf = autoconf270;
autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { }; autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { };
autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { };
autoconf264 = callPackage ../development/tools/misc/autoconf/2.64.nix { }; autoconf264 = callPackage ../development/tools/misc/autoconf/2.64.nix { };
autoconf270 = callPackage ../development/tools/misc/autoconf/2.70.nix { }; autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { };
autoconf270 = callPackage ../development/tools/misc/autoconf { };
autocutsel = callPackage ../tools/X11/autocutsel{ }; autocutsel = callPackage ../tools/X11/autocutsel{ };