From c434c60b3957f8599c4bfd59b56f24326492d8c9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 12:46:33 +0000 Subject: [PATCH 01/59] autoconf270: init at 2.70 Fixes: https://github.com/NixOS/nixpkgs/pull/106642 ("autoconf: 2.69 -> 2.70") --- pkgs/development/tools/misc/autoconf/2.70.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/tools/misc/autoconf/2.70.nix diff --git a/pkgs/development/tools/misc/autoconf/2.70.nix b/pkgs/development/tools/misc/autoconf/2.70.nix new file mode 100644 index 00000000000..57a92cee737 --- /dev/null +++ b/pkgs/development/tools/misc/autoconf/2.70.nix @@ -0,0 +1,54 @@ +{ 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 { + name = "autoconf-2.70"; + + src = fetchurl { + url = "mirror://gnu/autoconf/${name}.tar.xz"; + sha256 = "1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps"; + }; + + nativeBuildInputs = [ m4 perl ]; + buildInputs = [ m4 ]; + + # Work around a known issue in Cygwin. See + # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for + # details. + # There are many test failures on `i386-pc-solaris2.11'. + doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + + # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + enableParallelBuilding = true; + + # Make the Autotest test suite run in parallel. + preCheck ='' + export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" + ''; + + meta = { + homepage = "https://www.gnu.org/software/autoconf/"; + description = "Part of the GNU Build System"; + + longDescription = '' + GNU Autoconf is an extensible package of M4 macros that produce + shell scripts to automatically configure software source code + packages. These scripts can adapt the packages to many kinds of + UNIX-like systems without manual user intervention. Autoconf + creates a configuration script for a package from a template + file that lists the operating system features that the package + can use, in the form of M4 macro calls. + ''; + + license = stdenv.lib.licenses.gpl3Plus; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af3acb1dea8..a8cda5270ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11004,6 +11004,7 @@ in autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; autoconf264 = callPackage ../development/tools/misc/autoconf/2.64.nix { }; + autoconf270 = callPackage ../development/tools/misc/autoconf/2.70.nix { }; autocutsel = callPackage ../tools/X11/autocutsel{ }; From 3f42dfe7d9b0e2cc1485cede6e82b59b09d60838 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 12:47:00 +0000 Subject: [PATCH 02/59] autoconf: 2.69 -> 2.70 --- .../tools/misc/autoconf/{2.70.nix => 2.69.nix} | 16 +++++++--------- pkgs/development/tools/misc/autoconf/default.nix | 11 ++++------- pkgs/top-level/all-packages.nix | 9 +++++++-- 3 files changed, 18 insertions(+), 18 deletions(-) rename pkgs/development/tools/misc/autoconf/{2.70.nix => 2.69.nix} (76%) diff --git a/pkgs/development/tools/misc/autoconf/2.70.nix b/pkgs/development/tools/misc/autoconf/2.69.nix similarity index 76% rename from pkgs/development/tools/misc/autoconf/2.70.nix rename to pkgs/development/tools/misc/autoconf/2.69.nix index 57a92cee737..500d80d4bb8 100644 --- a/pkgs/development/tools/misc/autoconf/2.70.nix +++ b/pkgs/development/tools/misc/autoconf/2.69.nix @@ -1,16 +1,11 @@ { 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 { - name = "autoconf-2.70"; + name = "autoconf-2.69"; src = fetchurl { url = "mirror://gnu/autoconf/${name}.tar.xz"; - sha256 = "1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps"; + sha256 = "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"; }; nativeBuildInputs = [ m4 perl ]; @@ -20,7 +15,8 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # 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 # "fixed" path in generated files! @@ -33,6 +29,8 @@ stdenv.mkDerivation rec { export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" ''; + doInstallCheck = false; # fails + meta = { homepage = "https://www.gnu.org/software/autoconf/"; description = "Part of the GNU Build System"; @@ -47,7 +45,7 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 93add837290..57a92cee737 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -6,11 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "autoconf-2.69"; + name = "autoconf-2.70"; src = fetchurl { url = "mirror://gnu/autoconf/${name}.tar.xz"; - sha256 = "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"; + sha256 = "1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps"; }; nativeBuildInputs = [ m4 perl ]; @@ -20,8 +20,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - #doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); - doCheck = false; + doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! @@ -34,8 +33,6 @@ stdenv.mkDerivation rec { export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" ''; - doInstallCheck = false; # fails - meta = { homepage = "https://www.gnu.org/software/autoconf/"; description = "Part of the GNU Build System"; @@ -50,7 +47,7 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8cda5270ed..baad686af12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -120,6 +120,10 @@ in { deps = [ autoconf264 automake111x gettext libtool ]; } ../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"; } ../build-support/setup-hooks/auto-patchelf.sh; @@ -10998,13 +11002,14 @@ in autobuild = callPackage ../development/tools/misc/autobuild { }; - autoconf = callPackage ../development/tools/misc/autoconf { }; + autoconf = autoconf270; autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { }; autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.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{ }; From ab5c9bdcc2ef417974297993d8d1312c88c19ff4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 12:47:24 +0000 Subject: [PATCH 03/59] ruby: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index baad686af12..5a0ddbdc316 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10774,6 +10774,7 @@ in inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libiconv libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; + autoreconfHook = autoreconfHook269; bison = buildPackages.bison_3_5; }) ruby_2_5 From a777d82a50bd02e848d13fabed85866a61df2256 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 12:47:35 +0000 Subject: [PATCH 04/59] libbfd: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a0ddbdc316..d30f4758020 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12455,7 +12455,9 @@ in belle-sip = callPackage ../development/libraries/belle-sip { }; - libbfd = callPackage ../development/libraries/libbfd { }; + libbfd = callPackage ../development/libraries/libbfd { + autoreconfHook = autoreconfHook269; + }; libopcodes = callPackage ../development/libraries/libopcodes { }; From cb87a87ec96673e18d19de9028220eab39a3fae0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 12:47:48 +0000 Subject: [PATCH 05/59] hidapi: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d30f4758020..bd9ebc8499e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13441,6 +13441,7 @@ in hidapi = callPackage ../development/libraries/hidapi { # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; + autoreconfHook = autoreconfHook269; }; highfive = callPackage ../development/libraries/highfive { }; From 3f803a5a7c50111ee87227c598e951ea70891175 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 12:54:35 +0000 Subject: [PATCH 06/59] fswatch: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd9ebc8499e..7c7047ca413 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11500,6 +11500,7 @@ in fswatch = callPackage ../development/tools/misc/fswatch { inherit (darwin.apple_sdk.frameworks) CoreServices; + autoreconfHook = autoreconfHook269; }; fujprog = callPackage ../development/tools/misc/fujprog { From c3172bf1d440591e597bbb763756e6f56b715130 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 13:01:01 +0000 Subject: [PATCH 07/59] duff: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c7047ca413..70d22b9f2bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3495,7 +3495,9 @@ in duc = callPackage ../tools/misc/duc { }; - duff = callPackage ../tools/filesystems/duff { }; + duff = callPackage ../tools/filesystems/duff { + autoreconfHook = autoreconfHook269; + }; dumptorrent = callPackage ../tools/misc/dumptorrent { }; From 76078d569199054a05812448a4e4b9ce1d35245a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 13:26:01 +0000 Subject: [PATCH 08/59] gsmlib: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70d22b9f2bd..a8180c3c3cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4503,7 +4503,9 @@ in gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; - gsmlib = callPackage ../development/libraries/gsmlib { }; + gsmlib = callPackage ../development/libraries/gsmlib { + autoreconfHook = autoreconfHook269; + }; gssdp = callPackage ../development/libraries/gssdp { }; From 926175b3cfeb0bd34f0dbdf8742636678d967b1a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 14:57:04 +0000 Subject: [PATCH 09/59] libopcodes: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8180c3c3cd..e61720203b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12464,7 +12464,9 @@ in autoreconfHook = autoreconfHook269; }; - libopcodes = callPackage ../development/libraries/libopcodes { }; + libopcodes = callPackage ../development/libraries/libopcodes { + autoreconfHook = autoreconfHook269; + }; bicpl = callPackage ../development/libraries/science/biology/bicpl { }; From afe1cdbfd42931be8bc2024122ad0aa59224c2a7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 15:00:55 +0000 Subject: [PATCH 10/59] libeatmydata: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e61720203b2..90e693430c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14006,7 +14006,9 @@ in libe57format = callPackage ../development/libraries/libe57format { }; - libeatmydata = callPackage ../development/libraries/libeatmydata { }; + libeatmydata = callPackage ../development/libraries/libeatmydata { + autoreconfHook = autoreconfHook269; + }; libeb = callPackage ../development/libraries/libeb { }; From d7f71a57eccd2fe36ddded3185bd59819844d141 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 15:03:43 +0000 Subject: [PATCH 11/59] libcoap: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90e693430c1..acf0dc218da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5172,7 +5172,9 @@ in libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; - libcoap = callPackage ../applications/networking/libcoap {}; + libcoap = callPackage ../applications/networking/libcoap { + autoconf = autoconf269; + }; libcryptui = callPackage ../development/libraries/libcryptui { }; From 174e99d51cff4e0888b0771941b9e9ccef8e6121 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 16:02:32 +0000 Subject: [PATCH 12/59] kallisto: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acf0dc218da..2c27c7907a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26663,7 +26663,9 @@ in neuron-version = neuron.version; }; - kallisto = callPackage ../applications/science/biology/kallisto { }; + kallisto = callPackage ../applications/science/biology/kallisto { + autoconf = autoconf269; + }; kssd = callPackage ../applications/science/biology/kssd { }; From 0b4cac7d0954beaf235f78bdebe2ee902b120066 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 23:05:33 +0000 Subject: [PATCH 13/59] openocd: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c27c7907a9..055c44d6c4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11866,7 +11866,9 @@ in opengrok = callPackage ../development/tools/misc/opengrok { }; - openocd = callPackage ../development/tools/misc/openocd { }; + openocd = callPackage ../development/tools/misc/openocd { + autoreconfHook = autoreconfHook269; + }; oprofile = callPackage ../development/tools/profiling/oprofile { libiberty_static = libiberty.override { staticBuild = true; }; From ba860aea018c73a5e3cfc18e0ca5fda083adcebc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 23:05:42 +0000 Subject: [PATCH 14/59] hivex: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 055c44d6c4f..bb6cc19c60d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13465,7 +13465,9 @@ in hiredis-vip = callPackage ../development/libraries/hiredis-vip { }; - hivex = callPackage ../development/libraries/hivex { }; + hivex = callPackage ../development/libraries/hivex { + autoreconfHook = autoreconfHook269; + }; hound = callPackage ../development/tools/misc/hound { }; From a25cfd537f2ea1b303fd73ca8014920dfd77cd10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 13 Dec 2020 12:15:09 +0100 Subject: [PATCH 15/59] libarchive: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb6cc19c60d..950b2bd7db1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13780,7 +13780,9 @@ in libayatana-appindicator-gtk3 = libayatana-appindicator.override { gtkVersion = "3"; }; libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { }; - libarchive = callPackage ../development/libraries/libarchive { }; + libarchive = callPackage ../development/libraries/libarchive { + autoreconfHook = autoreconfHook269; + }; libasr = callPackage ../development/libraries/libasr { }; From 0be679eabaf9997c3070ea946f58b7de73e158bf Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 12 Dec 2020 12:47:27 +0000 Subject: [PATCH 16/59] elinks: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 950b2bd7db1..bc249e48c47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21019,7 +21019,9 @@ in elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { }; - elinks = callPackage ../applications/networking/browsers/elinks { }; + elinks = callPackage ../applications/networking/browsers/elinks { + autoreconfHook = autoreconfHook269; + }; elvis = callPackage ../applications/editors/elvis { }; From 7787b860b99391f3cd18e2c9c1bf892682cc21ad Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 12 Dec 2020 13:28:38 +0000 Subject: [PATCH 17/59] libcryptui: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc249e48c47..477d0f990fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5176,7 +5176,9 @@ in autoconf = autoconf269; }; - libcryptui = callPackage ../development/libraries/libcryptui { }; + libcryptui = callPackage ../development/libraries/libcryptui { + autoreconfHook = autoreconfHook269; + }; libsmi = callPackage ../development/libraries/libsmi { }; From 7ea2c6c9fbd69b835979cd78b68677e0c5f1efb9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 12 Dec 2020 13:28:50 +0000 Subject: [PATCH 18/59] parcellite: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 477d0f990fe..269f7b497f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6428,7 +6428,9 @@ in parastoo-fonts = callPackage ../data/fonts/parastoo-fonts { }; - parcellite = callPackage ../tools/misc/parcellite { }; + parcellite = callPackage ../tools/misc/parcellite { + autoreconfHook = autoreconfHook269; + }; patchutils = callPackage ../tools/text/patchutils { }; From 7a14f9914fac3c70c9bfdaad32ed0323d080a8e4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 13:54:16 +0000 Subject: [PATCH 19/59] digitalbitbox: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 269f7b497f8..22dc98df473 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -247,7 +247,9 @@ in archiver = callPackage ../applications/misc/archiver { }; # It segfaults if it uses qt5.15 - digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { }; + digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { + autoreconfHook = autoreconfHook269; + }; gretl = callPackage ../applications/science/math/gretl { }; From 4cf137a3d322f076f9492cb5c3811386474099da Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 13:54:24 +0000 Subject: [PATCH 20/59] ttfautohint: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22dc98df473..675cabc37cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7889,7 +7889,9 @@ in ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; - ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint { }; + ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint { + autoreconfHook = autoreconfHook269; + }; ttfautohint-nox = ttfautohint.override { enableGUI = false; }; tty-clock = callPackage ../tools/misc/tty-clock { }; From e1cac2f70682c2f51dc0d9e2b98a14c1dfeef9b5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 13:54:39 +0000 Subject: [PATCH 21/59] dee: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 675cabc37cf..0584603ece3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12738,7 +12738,9 @@ in inherit suidHelper serviceDirectories apparmor; }; - dee = callPackage ../development/libraries/dee { }; + dee = callPackage ../development/libraries/dee { + autoreconfHook = autoreconfHook269; + }; dhex = callPackage ../applications/editors/dhex { }; From 55fd7b0c512d272d2759063c0ebd5f5e4d273450 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 13:54:49 +0000 Subject: [PATCH 22/59] heimdal: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0584603ece3..4100cb71965 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13438,6 +13438,7 @@ in heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; + autoreconfHook = autoreconfHook269; }; libheimdal = heimdal; From dad614d4b0b7becc87a6de0b78c910a8345b40ee Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 13:55:21 +0000 Subject: [PATCH 23/59] tpm2-tss: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4100cb71965..dea0722c185 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16326,7 +16326,9 @@ in totem-pl-parser = callPackage ../development/libraries/totem-pl-parser { }; - tpm2-tss = callPackage ../development/libraries/tpm2-tss { }; + tpm2-tss = callPackage ../development/libraries/tpm2-tss { + autoreconfHook = autoreconfHook269; + }; tremor = callPackage ../development/libraries/tremor { }; From 85e47c89045f35b994a8d7195c493c6787e42955 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 13:55:28 +0000 Subject: [PATCH 24/59] fsv: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dea0722c185..0e6bb0580fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21278,7 +21278,9 @@ in fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; - fsv = callPackage ../applications/misc/fsv { }; + fsv = callPackage ../applications/misc/fsv { + autoreconfHook = autoreconfHook269; + }; ft2-clone = callPackage ../applications/audio/ft2-clone { }; From 8b299b13aa441b3558e941c088428dc357451b7e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 13:55:35 +0000 Subject: [PATCH 25/59] mhwaveedit: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e6bb0580fa..3f75a96ff58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22738,7 +22738,9 @@ in metersLv2 = callPackage ../applications/audio/meters_lv2 { }; - mhwaveedit = callPackage ../applications/audio/mhwaveedit {}; + mhwaveedit = callPackage ../applications/audio/mhwaveedit { + autoreconfHook = autoreconfHook269; + }; michabo = libsForQt5.callPackage ../applications/misc/michabo { }; From 029e852acb43ece6fb5b1687a090c7bafc46f2b1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 13:55:49 +0000 Subject: [PATCH 26/59] msmtp: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f75a96ff58..889df4cc37c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23157,6 +23157,7 @@ in msmtp = callPackage ../applications/networking/msmtp { inherit (darwin.apple_sdk.frameworks) Security; + autoreconfHook = autoreconfHook269; }; imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { From d2b3b485f99f357e06e2fcc40b095c0de872e1a1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 13:55:56 +0000 Subject: [PATCH 27/59] rofi: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 889df4cc37c..2f529ae6a71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23858,7 +23858,9 @@ in rkdeveloptool = callPackage ../misc/rkdeveloptool { }; - rofi-unwrapped = callPackage ../applications/misc/rofi { }; + rofi-unwrapped = callPackage ../applications/misc/rofi { + autoreconfHook = autoreconfHook269; + }; rofi = callPackage ../applications/misc/rofi/wrapper.nix { }; rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; From baf93e470d7c6b965f6bce289fa46a296cf79c08 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 13:56:05 +0000 Subject: [PATCH 28/59] ssr: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f529ae6a71..5c131c1b482 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24166,7 +24166,9 @@ in sslyze = with python3Packages; toPythonApplication sslyze; - ssr = callPackage ../applications/audio/soundscape-renderer {}; + ssr = callPackage ../applications/audio/soundscape-renderer { + autoreconfHook = autoreconfHook269; + }; ssrc = callPackage ../applications/audio/ssrc { }; From 9caa2bafd79ec526beabef0e6bd2719922221bfe Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 13:56:14 +0000 Subject: [PATCH 29/59] x11basic: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c131c1b482..534384dda85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25006,7 +25006,9 @@ in gtk = gtk2; }; - x11basic = callPackage ../development/compilers/x11basic { }; + x11basic = callPackage ../development/compilers/x11basic { + autoconf = autoconf269; + }; x11vnc = callPackage ../tools/X11/x11vnc { }; From c71a8dd7a95c3e987969f9ac908efcdf6f1f9f75 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 13:56:20 +0000 Subject: [PATCH 30/59] freeciv: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 534384dda85..860a640dac2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25715,7 +25715,10 @@ in freecell-solver = callPackage ../games/freecell-solver { }; - freeciv = callPackage ../games/freeciv { qt5 = qt514; }; + freeciv = callPackage ../games/freeciv { + autoreconfHook = autoreconfHook269; + qt5 = qt514; + }; freeciv_gtk = freeciv.override { gtkClient = true; From 64d6d29e9b69e1ea97efa7c61889490ec83fcaf6 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 13:56:30 +0000 Subject: [PATCH 31/59] celestia: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 860a640dac2..b43ff89ef96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27417,6 +27417,7 @@ in boinc = callPackage ../applications/science/misc/boinc { }; celestia = callPackage ../applications/science/astronomy/celestia { + autoreconfHook = autoreconfHook269; lua = lua5_1; inherit (pkgs.gnome2) gtkglext; }; From 5b54c2451a91a4a449b35ea130236e63031e97bf Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 14:04:28 +0000 Subject: [PATCH 32/59] libgpod: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b43ff89ef96..8e9200cc6ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14208,7 +14208,9 @@ in libgpiod = callPackage ../development/libraries/libgpiod { }; - libgpod = callPackage ../development/libraries/libgpod { }; + libgpod = callPackage ../development/libraries/libgpod { + autoreconfHook = autoreconfHook269; + }; libgssglue = callPackage ../development/libraries/libgssglue { }; From 5397cbf79f83d44158f8ae27c7f584b3d58989d7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 14:06:26 +0000 Subject: [PATCH 33/59] apt-dater: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e9200cc6ed..be0d4b026d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1023,7 +1023,9 @@ in apg = callPackage ../tools/security/apg { }; - apt-dater = callPackage ../tools/package-management/apt-dater { }; + apt-dater = callPackage ../tools/package-management/apt-dater { + autoreconfHook = autoreconfHook269; + }; autorevision = callPackage ../tools/misc/autorevision { }; From bee550014f3498af81f368b3e82949090fcf9b6b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 15:38:38 +0000 Subject: [PATCH 34/59] erlang: use autoconf 2.69 Each erlang package is given autoconf269 seperately so that when a new version comes out that supports 2.70, it can use it and not be stuck on the old version just because older erlangs need it. --- pkgs/top-level/beam-packages.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 14399d7ac95..542c721e215 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,4 +1,4 @@ -{ callPackage, wxGTK30, openssl_1_0_2 }: +{ callPackage, wxGTK30, openssl_1_0_2, autoconf269 }: rec { lib = callPackage ../development/beam-modules/lib.nix {}; @@ -20,6 +20,7 @@ rec { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; + autoconf = autoconf269; }; erlangR23_odbc = erlangR23.override { odbcSupport = true; }; erlangR23_javac = erlangR23.override { javacSupport = true; }; @@ -33,6 +34,7 @@ rec { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; + autoconf = autoconf269; }; erlangR22_odbc = erlangR22.override { odbcSupport = true; }; erlangR22_javac = erlangR22.override { javacSupport = true; }; @@ -44,6 +46,7 @@ rec { # R21 erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { wxGTK = wxGTK30; + autoconf = autoconf269; }; erlangR21_odbc = erlangR21.override { odbcSupport = true; }; erlangR21_javac = erlangR21.override { javacSupport = true; }; @@ -55,6 +58,7 @@ rec { # R20 erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { wxGTK = wxGTK30; + autoconf = autoconf269; }; erlangR20_odbc = erlangR20.override { odbcSupport = true; }; erlangR20_javac = erlangR20.override { javacSupport = true; }; @@ -67,6 +71,7 @@ rec { erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; + autoconf = autoconf269; }; erlangR19_odbc = erlangR19.override { odbcSupport = true; }; erlangR19_javac = erlangR19.override { javacSupport = true; }; @@ -79,6 +84,7 @@ rec { erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; + autoconf = autoconf269; }; erlangR18_odbc = erlangR18.override { odbcSupport = true; }; erlangR18_javac = erlangR18.override { javacSupport = true; }; @@ -89,6 +95,7 @@ rec { # Basho fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { + autoconf = autoconf269; }; erlang_basho_R16B02_odbc = erlang_basho_R16B02.override { odbcSupport = true; From 3e6001f9ef134b6b8682a74bfdf51e42689a25e6 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 21:13:16 +0000 Subject: [PATCH 35/59] gdal: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be0d4b026d2..738802e6678 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13040,6 +13040,7 @@ in gdal = callPackage ../development/libraries/gdal { pythonPackages = python3Packages; + autoreconfHook = autoreconfHook269; }; gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; From e27774e9df3ae87cf1654cc1d391288032fd39dd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 15:51:03 +0000 Subject: [PATCH 36/59] linuxPackages.zfs: use autoconf 2.69 I bring in autoreconfHook269 instead of overriding it in all-packages.nix, so that when an unstable version of ZFS comes out that supports autoconf 2.70, it can use the latest autoconf even if stable ZFS still needs the old version. --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index a2464aeb586..8bdf9efd445 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch -, autoreconfHook, util-linux, nukeReferences, coreutils +, autoreconfHook269, util-linux, nukeReferences, coreutils , perl, buildPackages , configFile ? "all" @@ -89,7 +89,7 @@ let "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" ''; - nativeBuildInputs = [ autoreconfHook nukeReferences ] + nativeBuildInputs = [ autoreconfHook269 nukeReferences ] ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]) ++ optional buildUser pkgconfig; buildInputs = optionals buildUser [ zlib libuuid attr libtirpc ] From 5ad04f827785acea535b2f57305d00e6efe8cfdc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 15:52:23 +0000 Subject: [PATCH 37/59] gnash: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 738802e6678..27c07525be6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4271,7 +4271,9 @@ in gmvault = callPackage ../tools/networking/gmvault { }; - gnash = callPackage ../misc/gnash { }; + gnash = callPackage ../misc/gnash { + autoreconfHook = autoreconfHook269; + }; gnirehtet = callPackage ../tools/networking/gnirehtet { }; From a5083f74b94be0a17d92bb3ad227261b28ffe314 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 15:52:32 +0000 Subject: [PATCH 38/59] lxc: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27c07525be6..427d33f7116 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5602,7 +5602,9 @@ in lv = callPackage ../tools/text/lv { }; - lxc = callPackage ../os-specific/linux/lxc { }; + lxc = callPackage ../os-specific/linux/lxc { + autoreconfHook = autoreconfHook269; + }; lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd { }; From 25113b8213b11bc9a626985052768a4b67588684 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 15:53:02 +0000 Subject: [PATCH 39/59] charybdis: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 427d33f7116..0179d2f6820 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17008,7 +17008,9 @@ in cayley = callPackage ../servers/cayley { }; - charybdis = callPackage ../servers/irc/charybdis { }; + charybdis = callPackage ../servers/irc/charybdis { + autoreconfHook = autoreconfHook269; + }; clamsmtp = callPackage ../servers/mail/clamsmtp { }; From e7f1b25df5164cd8f34fe086d6bc81966acc1781 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 15:53:10 +0000 Subject: [PATCH 40/59] gimp: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0179d2f6820..42d528617cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21637,6 +21637,7 @@ in getxbook = callPackage ../applications/misc/getxbook { }; gimp = callPackage ../applications/graphics/gimp { + autoreconfHook = autoreconfHook269; gegl = gegl_0_4; lcms = lcms2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; From 0e214cbcc78a04e4218a0c73a232020c47ce3086 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 15:53:19 +0000 Subject: [PATCH 41/59] mup: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42d528617cd..5d301f12d9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22975,7 +22975,9 @@ in else null; }; - mup = callPackage ../applications/audio/mup { }; + mup = callPackage ../applications/audio/mup { + autoreconfHook = autoreconfHook269; + }; # TODO: we should probably merge these 2 musescore = From 5586017246edebf348cf0e3e120318138a94f04e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 15:53:38 +0000 Subject: [PATCH 42/59] eid-mw: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d301f12d9a..11ab7a57feb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3565,7 +3565,9 @@ in eflite = callPackage ../applications/audio/eflite {}; - eid-mw = callPackage ../tools/security/eid-mw { }; + eid-mw = callPackage ../tools/security/eid-mw { + autoreconfHook = autoreconfHook269; + }; epubcheck = callPackage ../tools/text/epubcheck { }; From ce822a62782bc4ce2c37eb82e664687ebee5fb72 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 15:54:01 +0000 Subject: [PATCH 43/59] libmatheval: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11ab7a57feb..0ad5727bc92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14465,6 +14465,7 @@ in libmatchbox = callPackage ../development/libraries/libmatchbox { }; libmatheval = callPackage ../development/libraries/libmatheval { + autoconf = autoconf269; guile = guile_2_0; }; From a9c1964746d7ec0781fcf1febd234c17c503b0db Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 15:54:46 +0000 Subject: [PATCH 44/59] farstream: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ad5727bc92..cf2550f6042 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12852,6 +12852,7 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav; + autoreconfHook = autoreconfHook269; }; fcgi = callPackage ../development/libraries/fcgi { }; From e2367872c2bb195912c74cd52b461231128e3ed2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 16:13:01 +0000 Subject: [PATCH 45/59] system-config-printer: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf2550f6042..74953269cf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7613,8 +7613,9 @@ in sysbench = callPackage ../development/tools/misc/sysbench {}; system-config-printer = callPackage ../tools/misc/system-config-printer { + autoreconfHook = autoreconfHook269; libxml2 = libxml2Python; - }; + }; systembus-notify = callPackage ../applications/misc/systembus-notify { }; From 047d6d0bf84a020c3a11f24778a948bd9130c133 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 16:13:20 +0000 Subject: [PATCH 46/59] spek: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74953269cf5..8548a0b50ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24153,7 +24153,9 @@ in soxr = callPackage ../applications/misc/audio/soxr { }; - spek = callPackage ../applications/audio/spek { }; + spek = callPackage ../applications/audio/spek { + autoreconfHook = autoreconfHook269; + }; spotify-unwrapped = callPackage ../applications/audio/spotify { libgcrypt = libgcrypt_1_5; From 080d634714700cd4335d780e691ef2a4160242a4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 16:15:40 +0000 Subject: [PATCH 47/59] schroedinger: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8548a0b50ed..97e9b93eae3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15924,7 +15924,9 @@ in sbc = callPackage ../development/libraries/sbc { }; - schroedinger = callPackage ../development/libraries/schroedinger { }; + schroedinger = callPackage ../development/libraries/schroedinger { + autoreconfHook = autoreconfHook269; + }; SDL = callPackage ../development/libraries/SDL ({ inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; From 9889d51cb69c43f09dcd712c230ca5febdf3f8fe Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 16:23:30 +0000 Subject: [PATCH 48/59] xbursttools: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97e9b93eae3..bad8d375b26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8484,6 +8484,7 @@ in # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic; + autoconf = autoconf269; }; clipnotify = callPackage ../tools/misc/clipnotify { }; From 187dc40bbfa91bc1edab87b68c130570786957bd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 16:23:45 +0000 Subject: [PATCH 49/59] zexy: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bad8d375b26..c3a3fb73f03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25337,7 +25337,9 @@ in zeronet = callPackage ../applications/networking/p2p/zeronet { }; - zexy = callPackage ../applications/audio/pd-plugins/zexy { }; + zexy = callPackage ../applications/audio/pd-plugins/zexy { + autoconf = autoconf269; + }; zgrviewer = callPackage ../applications/graphics/zgrviewer {}; From 48f26584bec206c796bdec039ff89168ca2a907b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 16:38:51 +0000 Subject: [PATCH 50/59] zbar: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3a3fb73f03..5cec6107a81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8612,7 +8612,9 @@ in zbackup = callPackage ../tools/backup/zbackup {}; - zbar = libsForQt5.callPackage ../tools/graphics/zbar { }; + zbar = libsForQt5.callPackage ../tools/graphics/zbar { + autoreconfHook = autoreconfHook269; + }; zdelta = callPackage ../tools/compression/zdelta { }; From 2968a9ffe58e126cc9a5dd98a67df56be2205403 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 16:39:12 +0000 Subject: [PATCH 51/59] watchman: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5cec6107a81..015a25638b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8168,6 +8168,7 @@ in watchman = callPackage ../development/tools/watchman { inherit (darwin.apple_sdk.frameworks) CoreServices; + autoconf = autoconf269; }; wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; From d94842b9e7cd9829b013d54b0b35dc1619ab9ba1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 16:39:29 +0000 Subject: [PATCH 52/59] verilog: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 015a25638b5..0eeb775ce24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8059,7 +8059,9 @@ in verilator = callPackage ../applications/science/electronics/verilator {}; - verilog = callPackage ../applications/science/electronics/verilog {}; + verilog = callPackage ../applications/science/electronics/verilog { + autoconf = autoconf269; + }; versus = callPackage ../applications/networking/versus { }; From 045995fe804a64edc4db34a37633c580fbfa8ed3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 16:43:37 +0000 Subject: [PATCH 53/59] souffle: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0eeb775ce24..ee7f8fc2a35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10241,7 +10241,9 @@ in solc = callPackage ../development/compilers/solc { }; - souffle = callPackage ../development/compilers/souffle { }; + souffle = callPackage ../development/compilers/souffle { + autoreconfHook = autoreconfHook269; + }; spasm-ng = callPackage ../development/compilers/spasm-ng { }; From d0811643561a4685e3d8d94c93417a13d04be52a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 17:10:23 +0000 Subject: [PATCH 54/59] uim: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee7f8fc2a35..b6c045c8d29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8293,7 +8293,9 @@ in uhttpmock = callPackage ../development/libraries/uhttpmock { }; - uim = callPackage ../tools/inputmethods/uim { }; + uim = callPackage ../tools/inputmethods/uim { + autoconf = autoconf269; + }; uhub = callPackage ../servers/uhub { }; From 523f844fd5bb617e8283f02e681de8ec91ef9c59 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 17:10:30 +0000 Subject: [PATCH 55/59] torque: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6c045c8d29..c8ab6c9b513 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17843,7 +17843,9 @@ in tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; - torque = callPackage ../servers/computing/torque { }; + torque = callPackage ../servers/computing/torque { + autoreconfHook = autoreconfHook269; + }; tt-rss = callPackage ../servers/tt-rss { }; tt-rss-plugin-ff-instagram = callPackage ../servers/tt-rss/plugin-ff-instagram { }; From 1b631198ae38587fce7e2f62ce27efb67fd51a83 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 17:53:29 +0000 Subject: [PATCH 56/59] gnome3.gnome-panel: use autoconf 2.69 --- pkgs/desktops/gnome-3/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 302ad2c21aa..2bc825d8149 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -264,7 +264,9 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-flashback = callPackage ./misc/gnome-flashback { }; - gnome-panel = callPackage ./misc/gnome-panel { }; + gnome-panel = callPackage ./misc/gnome-panel { + autoreconfHook = pkgs.autoreconfHook269; + }; gnome-tweaks = callPackage ./misc/gnome-tweaks { }; From ab6ac9b40e56f7f7e624df56e91d8c2f9ddcba03 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 17:55:11 +0000 Subject: [PATCH 57/59] orangefs: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8ab6c9b513..5c83bfcdb81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6366,7 +6366,9 @@ in opn2bankeditor = callPackage ../tools/audio/opl3bankeditor/opn2bankeditor.nix { }; - orangefs = callPackage ../tools/filesystems/orangefs { }; + orangefs = callPackage ../tools/filesystems/orangefs { + autoreconfHook = autoreconfHook269; + }; os-prober = callPackage ../tools/misc/os-prober {}; From 1dec1f399a3b857100709227fa67248bd782cf0a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 17:55:30 +0000 Subject: [PATCH 58/59] vcprompt: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c83bfcdb81..858e2ac7313 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24588,7 +24588,9 @@ in vbindiff = callPackage ../applications/editors/vbindiff { }; - vcprompt = callPackage ../applications/version-management/vcprompt { }; + vcprompt = callPackage ../applications/version-management/vcprompt { + autoconf = autoconf269; + }; vcs = callPackage ../applications/video/vcs { }; From e7998a2c5ba7d292fa2c765084f8b36958301890 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Dec 2020 18:06:50 +0000 Subject: [PATCH 59/59] pivxd: use autoconf 2.69 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 858e2ac7313..9e27a0e9fc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25478,7 +25478,10 @@ in nbxplorer = callPackage ../applications/blockchains/nbxplorer { }; pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; - pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; + pivxd = callPackage ../applications/blockchains/pivx.nix { + withGui = false; + autoreconfHook = autoreconfHook269; + }; ethabi = callPackage ../applications/blockchains/ethabi.nix { };