diff options
19 files changed, 279 insertions, 110 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 7c6356770a5..793c7acc58e 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -287,6 +287,12 @@ This avoids that the password gets exposed in the nix store. </para> </listitem> + <listitem> + <para> + The <literal>wafHook</literal> hook does not wrap Python anymore. + Packages depending on <literal>wafHook</literal> need to include any Python into their <literal>nativeBuildInputs</literal>. + </para> + </listitem> </itemizedlist> </section> diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 34f5667bfca..a978b67c5dc 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig -, wafHook }: +, wafHook, python3 }: stdenv.mkDerivation rec { pname = "ams-lv2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkgconfig wafHook python3 ]; buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 2464abb6585..6e96bf45294 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook }: +{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook, python3 }: stdenv.mkDerivation rec { pname = "mda-lv2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkgconfig wafHook python3 ]; buildInputs = [ fftwSinglePrec lv2 ]; meta = with stdenv.lib; { 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 { }; diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix index b154f80c1dd..46ed3626d2a 100644 --- a/pkgs/development/libraries/gaia/default.nix +++ b/pkgs/development/libraries/gaia/default.nix @@ -5,6 +5,7 @@ , swig , eigen , pkgconfig +, python2 , wafHook , makeWrapper , qt4 @@ -38,9 +39,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - wafHook pkgconfig + python2 # For wafHook swig + wafHook ] # The gaiafusion binary inside $out/bin needs a shebangs patch, and # wrapping with the appropriate $PYTHONPATH diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 654ad3116a4..59685ca07cc 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -43,6 +43,7 @@ , cups ? null , AppKit , Cocoa +, broadwaySupport ? true }: assert cupsSupport -> cups != null; @@ -87,6 +88,7 @@ stdenv.mkDerivation rec { "-Dgtk_doc=${boolToString withGtkDoc}" "-Dtests=false" "-Dtracker3=${boolToString trackerSupport}" + "-Dbroadway_backend=${boolToString broadwaySupport}" ]; # These are the defines that'd you'd get with --enable-debug=minimum (default). diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix index 0d3faf69e3b..168773662f6 100644 --- a/pkgs/development/libraries/libdatrie/default.nix +++ b/pkgs/development/libraries/libdatrie/default.nix @@ -1,23 +1,40 @@ -{ stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libiconv }: +{ stdenv, fetchFromGitHub, makeWrapper +, autoreconfHook, autoconf-archive +, installShellFiles, libiconv }: stdenv.mkDerivation rec { + pname = "libdatrie"; - version = "0.2.12"; + version = "2019-12-20"; - src = fetchurl { - url = "https://github.com/tlwg/libdatrie/releases/download/v${version}/libdatrie-${version}.tar.xz"; - sha256 = "0jdi01pcxv0b24zbjy7zahawsqqqw4mv94f2yy01zh4n796wqba5"; + src = fetchFromGitHub { + owner = "tlwg"; + repo = "libdatrie"; + rev = "d1db08ac1c76f54ba23d63665437473788c999f3"; + sha256 = "03dc363259iyiidrgadzc7i03mmfdj8h78j82vk6z53w6fxq5zxc"; }; - nativeBuildInputs = [ installShellFiles pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + installShellFiles + ]; buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + preAutoreconf = let + reports = "https://github.com/tlwg/libdatrie/issues"; + in + '' + sed -i -e "/AC_INIT/,+3d" configure.ac + sed -i "5iAC_INIT(${pname},${version},[${reports}])" configure.ac + ''; + postInstall = '' installManPage man/trietool.1 ''; - meta = with stdenv.lib;{ + meta = with stdenv.lib; { homepage = "https://linux.thai.net/~thep/datrie/datrie.html"; description = "This is an implementation of double-array structure for representing trie"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 578763478f5..0e18164e6f2 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.2.4"; + version = "20.3.1"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "14m09bk7akj0k02lg8fhvvzbdsashlbdsgl2cw7wbqfj2mhdqwh5"; + sha256 = "03vqm9kqrcpijg6bxldj0bg360z8d7c767n3b16jdc1apd4inxdg"; }; prePatch = "patchShebangs ."; @@ -58,34 +58,14 @@ stdenv.mkDerivation { ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ./opencl-install-dir.patch ./disk_cache-include-dri-driver-path-in-cache-key.patch - ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ - # Fix `-Werror=int-conversion` pthread warnings on musl. - # TODO: Remove when https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121 is merged and available - (fetchpatch { - name = "nine_debug-Make-tid-more-type-correct"; - url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; - sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; - }) - ] - # do not prefix user provided dri-drivers-path - ++ lib.optional (lib.versionOlder version "19.0.0") (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/commit/f6556ec7d126b31da37c08d7cb657250505e01a0.patch"; - sha256 = "0z6phi8hbrbb32kkp1js7ggzviq7faz1ria36wi4jbc4in2392d9"; + # Fix `-Werror=int-conversion` pthread warnings on musl. + # TODO: Remove when https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121 is merged and available + (fetchpatch { + name = "nine_debug-Make-tid-more-type-correct"; + url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; + sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) - ++ lib.optionals (lib.versionOlder version "19.1.0") [ - # do not prefix user provided d3d-drivers-path - (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/commit/dcc48664197c7e44684ccfb970a4ae083974d145.patch"; - sha256 = "1nhs0xpx3hiy8zfb5gx1zd7j7xha6h0hr7yingm93130a5902lkb"; - }) - - # don't build libGLES*.so with GLVND - (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/commit/b01524fff05eef66e8cd24f1c5aacefed4209f03.patch"; - sha256 = "1pszr6acx2xw469zq89n156p3bf3xf84qpbjw5fr1sj642lbyh7c"; - }) - ]; + ]; postPatch = '' substituteInPlace meson.build --replace \ diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index de0db887d4b..d0a9a2e5b49 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, python2 , python3 , pkg-config , readline @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_42 wafHook + python2 # For wafHook ]; buildInputs = [ diff --git a/pkgs/development/tools/build-managers/wafHook/default.nix b/pkgs/development/tools/build-managers/wafHook/default.nix index 4184bd5fe8c..2131caede3c 100644 --- a/pkgs/development/tools/build-managers/wafHook/default.nix +++ b/pkgs/development/tools/build-managers/wafHook/default.nix @@ -1,7 +1,6 @@ -{ lib, stdenv, pkgs, python, makeSetupHook, waf }: +{ lib, stdenv, pkgs, makeSetupHook, waf }: makeSetupHook { - deps = [ python ]; substitutions = { inherit waf; crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) diff --git a/pkgs/development/tools/misc/autoconf/2.69.nix b/pkgs/development/tools/misc/autoconf/2.69.nix new file mode 100644 index 00000000000..500d80d4bb8 --- /dev/null +++ b/pkgs/development/tools/misc/autoconf/2.69.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, m4, perl }: + +stdenv.mkDerivation rec { + name = "autoconf-2.69"; + + src = fetchurl { + url = "mirror://gnu/autoconf/${name}.tar.xz"; + sha256 = "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"; + }; + + 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)); + doCheck = false; + + # 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" + ''; + + doInstallCheck = false; # fails + + 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.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/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index ee0074f7d83..ce57194bc49 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.6.18"; + version = "0.7.0"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "1dh5z210nl8grjxb8zxch8h7799w61bah7r2j0s07091rcpfsrsb"; + sha256 = "0pd1vnpy29fxmf47pvkyxd6bydar8cykfjx0f1bbw3gfk7vychbj"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "1h5wmfmm2a2ilyw3ar88rqm7yvdc2vhyx4pgg781615ax52fhjli"; + sha256 = "10xhd5m63r928gfvr4djmis30mra8wdsx55kgin9kiig2kylx69h"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0ll9p2rbnw46zd9m2bmdmn99v9jjjf8i33xpkvd1rx42ki7sys62"; + cargoSha256 = "1axg0kr8xsb5fm3r8qgc7s3g70pa8g9vc68d6icm7ms77phczx4r"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index b75b67e0528..5d33ae99149 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -52,7 +52,7 @@ let "pak128.german" = { url = "mirror://sourceforge/simutrans/PAK128.german/" + "pak128.german_1.2_for_ST_121.0/PAK128.german_1.2_for_ST_121-0.zip"; - sha256 = "1jxjckz4b02yv1mv1zc3pmajpq740dfnlvhr0x762lbrybymvagi"; + sha256 = "1cv1rzl1a3i5dvk476zq094wawk9hhdh2f0y4xrdny5gn17mb2xi"; }; /* This release contains accented filenames that prevent unzipping. diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index b3de7ceedaa..291630032f0 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -5,19 +5,19 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.9.0"; + version = "5.10.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1kys6dmhrl43iaq95n5sh02p39d7bq8i5y672qrzgwnwpjaaqpd2"; + sha256 = "15pfijbiyv0adrchj3v379w898gxsji33q4ly0k7s22vd93wj20m"; }; preConfigure = '' # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile - # TODO: Drop temporary version fix for 5.9 once 5.10 is out: + # TODO: Drop temporary version fix once 5.11 is out (hopefully :D): substituteInPlace include/version.h \ - --replace "5.8.0" "${version}" + --replace "5.9.0" "${version}" ''; outputs = [ "out" "dev" ]; 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 ] diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix index d51e5515bd6..9c2b4915bf1 100644 --- a/pkgs/tools/networking/saldl/default.nix +++ b/pkgs/tools/networking/saldl/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , pkgconfig , wafHook +, python3 , asciidoc , docbook_xml_dtd_45 , docbook_xsl @@ -25,6 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wafHook + python3 asciidoc docbook_xml_dtd_45 docbook_xsl diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b89e68817f..d5643f5bddc 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; @@ -243,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 { }; @@ -1017,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 { }; @@ -3495,7 +3503,9 @@ in duc = callPackage ../tools/misc/duc { }; - duff = callPackage ../tools/filesystems/duff { }; + duff = callPackage ../tools/filesystems/duff { + autoreconfHook = autoreconfHook269; + }; dumptorrent = callPackage ../tools/misc/dumptorrent { }; @@ -3559,7 +3569,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 { }; @@ -4267,7 +4279,9 @@ in gmvault = callPackage ../tools/networking/gmvault { }; - gnash = callPackage ../misc/gnash { }; + gnash = callPackage ../misc/gnash { + autoreconfHook = autoreconfHook269; + }; gnirehtet = callPackage ../tools/networking/gnirehtet { }; @@ -4503,7 +4517,9 @@ in gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; - gsmlib = callPackage ../development/libraries/gsmlib { }; + gsmlib = callPackage ../development/libraries/gsmlib { + autoreconfHook = autoreconfHook269; + }; gssdp = callPackage ../development/libraries/gssdp { }; @@ -5174,9 +5190,13 @@ in libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; - libcoap = callPackage ../applications/networking/libcoap {}; + libcoap = callPackage ../applications/networking/libcoap { + autoconf = autoconf269; + }; - libcryptui = callPackage ../development/libraries/libcryptui { }; + libcryptui = callPackage ../development/libraries/libcryptui { + autoreconfHook = autoreconfHook269; + }; libsmi = callPackage ../development/libraries/libsmi { }; @@ -5594,7 +5614,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 { }; @@ -6354,7 +6376,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 {}; @@ -6426,7 +6450,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 { }; @@ -7599,8 +7625,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 { }; @@ -7883,7 +7910,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 { }; @@ -8044,7 +8073,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 { }; @@ -8153,6 +8184,7 @@ in watchman = callPackage ../development/tools/watchman { inherit (darwin.apple_sdk.frameworks) CoreServices; + autoconf = autoconf269; }; wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; @@ -8275,7 +8307,9 @@ in uhttpmock = callPackage ../development/libraries/uhttpmock { }; - uim = callPackage ../tools/inputmethods/uim { }; + uim = callPackage ../tools/inputmethods/uim { + autoconf = autoconf269; + }; uhub = callPackage ../servers/uhub { }; @@ -8469,6 +8503,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 { }; @@ -8596,7 +8631,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 { }; @@ -10220,7 +10257,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 { }; @@ -10779,6 +10818,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 @@ -11007,12 +11047,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 { }; + autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { }; + autoconf270 = callPackage ../development/tools/misc/autoconf { }; autocutsel = callPackage ../tools/X11/autocutsel{ }; @@ -11502,6 +11544,7 @@ in fswatch = callPackage ../development/tools/misc/fswatch { inherit (darwin.apple_sdk.frameworks) CoreServices; + autoreconfHook = autoreconfHook269; }; fujprog = callPackage ../development/tools/misc/fujprog { @@ -11861,7 +11904,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; }; @@ -12457,9 +12502,13 @@ 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 { }; + libopcodes = callPackage ../development/libraries/libopcodes { + autoreconfHook = autoreconfHook269; + }; bicpl = callPackage ../development/libraries/science/biology/bicpl { }; @@ -12719,7 +12768,9 @@ in inherit suidHelper serviceDirectories apparmor; }; - dee = callPackage ../development/libraries/dee { }; + dee = callPackage ../development/libraries/dee { + autoreconfHook = autoreconfHook269; + }; dhex = callPackage ../applications/editors/dhex { }; @@ -12823,6 +12874,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 { }; @@ -13017,6 +13069,7 @@ in gdal = callPackage ../development/libraries/gdal { pythonPackages = python3Packages; + autoreconfHook = autoreconfHook269; }; gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; @@ -13417,6 +13470,7 @@ in heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; + autoreconfHook = autoreconfHook269; }; libheimdal = heimdal; @@ -13441,6 +13495,7 @@ in hidapi = callPackage ../development/libraries/hidapi { # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; + autoreconfHook = autoreconfHook269; }; highfive = callPackage ../development/libraries/highfive { }; @@ -13453,7 +13508,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 { }; @@ -13766,7 +13823,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 { }; @@ -13998,7 +14057,9 @@ in libe57format = callPackage ../development/libraries/libe57format { }; - libeatmydata = callPackage ../development/libraries/libeatmydata { }; + libeatmydata = callPackage ../development/libraries/libeatmydata { + autoreconfHook = autoreconfHook269; + }; libeb = callPackage ../development/libraries/libeb { }; @@ -14179,7 +14240,9 @@ in libgpiod = callPackage ../development/libraries/libgpiod { }; - libgpod = callPackage ../development/libraries/libgpod { }; + libgpod = callPackage ../development/libraries/libgpod { + autoreconfHook = autoreconfHook269; + }; libgssglue = callPackage ../development/libraries/libgssglue { }; @@ -14425,6 +14488,7 @@ in libmatchbox = callPackage ../development/libraries/libmatchbox { }; libmatheval = callPackage ../development/libraries/libmatheval { + autoconf = autoconf269; guile = guile_2_0; }; @@ -14978,7 +15042,7 @@ in libGLU = mesa_glu; mesa = callPackage ../development/libraries/mesa { - llvmPackages = llvmPackages_9; + llvmPackages = llvmPackages_latest; inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; }; @@ -15886,7 +15950,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; @@ -16216,9 +16282,7 @@ in taglib-sharp = callPackage ../development/libraries/taglib-sharp { }; - talloc = callPackage ../development/libraries/talloc { - wafHook = wafHook.override { python = python3; }; - }; + talloc = callPackage ../development/libraries/talloc { }; tclap = callPackage ../development/libraries/tclap {}; @@ -16301,7 +16365,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 { }; @@ -16974,7 +17040,9 @@ in cayley = callPackage ../servers/cayley { }; - charybdis = callPackage ../servers/irc/charybdis { }; + charybdis = callPackage ../servers/irc/charybdis { + autoreconfHook = autoreconfHook269; + }; clamsmtp = callPackage ../servers/mail/clamsmtp { }; @@ -17794,7 +17862,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 { }; @@ -21011,7 +21081,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 { }; @@ -21255,7 +21327,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 { }; @@ -21601,6 +21675,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; @@ -22714,7 +22789,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 { }; @@ -22937,7 +23014,9 @@ in else null; }; - mup = callPackage ../applications/audio/mup { }; + mup = callPackage ../applications/audio/mup { + autoreconfHook = autoreconfHook269; + }; # TODO: we should probably merge these 2 musescore = @@ -23131,6 +23210,7 @@ in msmtp = callPackage ../applications/networking/msmtp { inherit (darwin.apple_sdk.frameworks) Security; + autoreconfHook = autoreconfHook269; }; imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { @@ -23831,7 +23911,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 { }; @@ -24105,7 +24187,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; @@ -24137,7 +24221,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 { }; @@ -24523,7 +24609,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 { }; @@ -24986,7 +25074,9 @@ in gtk = gtk2; }; - x11basic = callPackage ../development/compilers/x11basic { }; + x11basic = callPackage ../development/compilers/x11basic { + autoconf = autoconf269; + }; x11vnc = callPackage ../tools/X11/x11vnc { }; @@ -25291,7 +25381,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 {}; @@ -25415,7 +25507,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 { }; @@ -25693,7 +25788,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; @@ -26675,7 +26773,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 { }; @@ -27392,6 +27492,7 @@ in boinc = callPackage ../applications/science/misc/boinc { }; celestia = callPackage ../applications/science/astronomy/celestia { + autoreconfHook = autoreconfHook269; lua = lua5_1; inherit (pkgs.gnome2) gtkglext; }; 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; |