diff options
55 files changed, 214 insertions, 142 deletions
diff --git a/doc/hooks/waf.section.md b/doc/hooks/waf.section.md index 8cacb30ea85..8dc78121cd9 100644 --- a/doc/hooks/waf.section.md +++ b/doc/hooks/waf.section.md @@ -1,16 +1,16 @@ -# wafHook {#wafhook} +# waf.hook {#wafhook} [Waf](https://waf.io) is a Python-based software building system. -In Nixpkgs, `wafHook` overrides the default configure, build, and install phases. +In Nixpkgs, `waf.hook` overrides the default configure, build, and install phases. -## Variables controlling wafHook {#variablesControllingWafHook} +## Variables controlling waf.hook {#variablesControllingWafHook} ### `wafPath` {#wafPath} Location of the `waf` tool. It defaults to `./waf`, to honor software projects that include it directly inside their source trees. -If `wafPath` doesn't exist, then `wafHook` will copy the `waf` provided from Nixpkgs to it. +If `wafPath` doesn't exist, then `waf.hook` will copy the `waf` provided from Nixpkgs to it. ### `wafConfigureFlags` {#wafConfigureFlags} @@ -36,9 +36,9 @@ When set to true, don't use the predefined `wafBuildPhase`. When set to true, don't use the predefined `wafInstallPhase`. -### Variables honored by wafHook {#variablesHonoredByWafHook} +### Variables honored by waf.hook {#variablesHonoredByWafHook} -The following variables commonly used by `stdenv.mkDerivation` are also honored by `wafHook`. +The following variables commonly used by `stdenv.mkDerivation` are also honored by `waf.hook`. - `prefixKey` - `configureTargets` diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 88956a190c4..b771c036814 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkg-config -, wafHook, python3 }: +, waf, python3 }: stdenv.mkDerivation rec { pname = "ams-lv2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk"; }; - nativeBuildInputs = [ pkg-config wafHook python3 ]; + nativeBuildInputs = [ pkg-config waf.hook python3 ]; buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; meta = with lib; { diff --git a/pkgs/applications/audio/ardour/6.nix b/pkgs/applications/audio/ardour/6.nix index 4e0508f00c5..fa6cfce7977 100644 --- a/pkgs/applications/audio/ardour/6.nix +++ b/pkgs/applications/audio/ardour/6.nix @@ -50,7 +50,7 @@ , suil , taglib , vamp-plugin-sdk -, wafHook +, waf , xjadeo , videoSupport ? true }: @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { perl pkg-config python3 - wafHook + waf.hook ]; buildInputs = [ diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 2c8a44f6216..a39aa7242e7 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -52,7 +52,7 @@ , suil , taglib , vamp-plugin-sdk -, wafHook +, waf , xjadeo , videoSupport ? true }: @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { perl pkg-config python3 - wafHook + waf.hook ]; buildInputs = [ diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index 8dc86cb8ccf..14231a1b2ad 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, lv2, pkg-config, python3, wafHook }: +{ lib, stdenv, fetchurl, lv2, pkg-config, python3, waf }: stdenv.mkDerivation rec { pname = "fomp"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-xnGijydiO3B7BjSlryFuH1j/OPio9hCYbniq2IXp2W8="; }; - nativeBuildInputs = [ pkg-config wafHook ]; + nativeBuildInputs = [ pkg-config waf.hook ]; buildInputs = [ lv2 python3 ]; meta = with lib; { diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 3033888996a..e40084ff5a1 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -30,7 +30,7 @@ , serd , sord , sratom -, wafHook +, waf , wrapGAppsHook , zita-convolver , zita-resampler @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { intltool pkg-config python3 - wafHook + waf.hook wrapGAppsHook ]; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 81a97d5a054..7c86d3b76fa 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv , lv2, pkg-config, python3, raul, serd, sord, sratom -, wafHook +, waf , suil }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { deepClone = true; }; - nativeBuildInputs = [ pkg-config wafHook python3 python3.pkgs.wrapPython ]; + nativeBuildInputs = [ pkg-config waf.hook python3 python3.pkgs.wrapPython ]; buildInputs = [ boost ganv glibmm gtkmm2 libjack2 lilv lv2 python3 raul serd sord sratom suil diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index b640b55c547..82c747c2d7a 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python3 -, serd, sord , sratom, suil, wafHook }: +, serd, sord , sratom, suil, waf }: stdenv.mkDerivation rec { pname = "jalv"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ktFBeBtmQ3MgfDQ868XpuM7UYfryb9zLld8AB7BjnhY="; }; - nativeBuildInputs = [ pkg-config wafHook ]; + nativeBuildInputs = [ pkg-config waf.hook ]; buildInputs = [ gtk2 libjack2 lilv lv2 python3 serd sord sratom suil ]; diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 98812bec4d8..269d334fbe9 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkg-config, wafHook, python3 }: +{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkg-config, waf, python3 }: stdenv.mkDerivation rec { pname = "mda-lv2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-zWYRcCSuBJzzrKg/npBKcCdyJOI6lp9yqcXQEKSYV9s="; }; - nativeBuildInputs = [ pkg-config wafHook python3 ]; + nativeBuildInputs = [ pkg-config waf.hook python3 ]; buildInputs = [ fftwSinglePrec lv2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 39b8ecf7a6a..8afcd1c0270 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, python3, cairo, libjpeg, ntk, libjack2 -, libsndfile, ladspaH, liblo, libsigcxx, lrdf, wafHook +, libsndfile, ladspaH, liblo, libsigcxx, lrdf, waf }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "sha256-iMJNMDytNXpEkUhL0RILSd25ixkm8HL/edtOZta0Pf4="; }; - nativeBuildInputs = [ pkg-config wafHook ]; + nativeBuildInputs = [ pkg-config waf.hook ]; buildInputs = [ python3 cairo libjpeg ntk libjack2 libsndfile ladspaH liblo libsigcxx lrdf ]; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 99bbdf693a9..603f4288673 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -10,7 +10,7 @@ , libjack2 , pkg-config , python3 -, wafHook +, waf }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gtkmm2 libjack2 python3 - wafHook + waf.hook ]; meta = { diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix index 925d246ba84..d727257fbec 100644 --- a/pkgs/applications/misc/hamster/default.nix +++ b/pkgs/applications/misc/hamster/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3Packages, intltool, glib, itstool, gtk3 -, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: +, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, waf }: python3Packages.buildPythonApplication rec { pname = "hamster"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook intltool itstool - wafHook + waf.hook glib gobject-introspection ]; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index fbb33c7e096..2e6eedc0cea 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -10,7 +10,7 @@ , desktop-file-utils , shared-mime-info , wrapGAppsHook -, wafHook +, waf , bash , dbus }: @@ -31,7 +31,7 @@ buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook intltool # For setup hook - gobject-introspection wafHook + gobject-introspection waf.hook itstool # for help pages desktop-file-utils # for update-desktop-database shared-mime-info # for update-mime-info diff --git a/pkgs/applications/office/semantik/default.nix b/pkgs/applications/office/semantik/default.nix index 5ceb37b411c..7e240823cb4 100644 --- a/pkgs/applications/office/semantik/default.nix +++ b/pkgs/applications/office/semantik/default.nix @@ -3,7 +3,7 @@ , mkDerivation , fetchFromGitLab , fetchpatch -, wafHook +, waf , pkg-config , cmake , qtbase @@ -65,7 +65,7 @@ mkDerivation rec { --replace /usr/include/KF5/KDELibs4Support "${lib.getDev kdelibs4support}/include/KF5/KDELibs4Support" ''; - nativeBuildInputs = [ (lib.getDev qtsvg) (lib.getLib qtsvg) python3 pkg-config wafHook cmake ]; + nativeBuildInputs = [ (lib.getDev qtsvg) (lib.getLib qtsvg) python3 pkg-config waf.hook cmake ]; buildInputs = [ qtbase diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index 032b29eaef3..6583c8b03a2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, pkg-config, fetchFromGitHub, python3, vala -, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce +, gtk3, libwnck, libxfce4util, xfce4-panel, waf, xfce , gitUpdater }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-aKrJzf9rwCyXAJsRIXdBzmJBASuXD5I5kZrp+atx4FA="; }; - nativeBuildInputs = [ pkg-config vala wafHook python3 ]; + nativeBuildInputs = [ pkg-config vala waf.hook python3 ]; buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ]; postPatch = '' diff --git a/pkgs/development/compilers/rust/1_71.nix b/pkgs/development/compilers/rust/1_72.nix index 75780b55af8..077d8ac903f 100644 --- a/pkgs/development/compilers/rust/1_71.nix +++ b/pkgs/development/compilers/rust/1_72.nix @@ -19,8 +19,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.71.1"; - rustcSha256 = "sha256-b6kNUNHVKadfbMNJeE3lfX7AuiQZsJvefTNcJb1ORy4="; + rustcVersion = "1.72.0"; + rustcSha256 = "sha256-6p1hu7UddrbqaBFW9p8OBZa1lyLwRBSwHG4QC0tb46E="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; @@ -34,25 +34,25 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.70.0"; + bootstrapVersion = "1.71.1"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "119dfd4ee3da6c8fc36444dd15a12187e1f9b34ee6792fb75a6a25d09ea7e865"; - x86_64-unknown-linux-gnu = "8499c0b034dd881cd9a880c44021632422a28dc23d7a81ca0a97b04652245982"; - x86_64-unknown-linux-musl = "d97c2ac1d9f17e754fa6b7d48c28531d16278547e3fa47050a01da037ddb6de3"; - arm-unknown-linux-gnueabihf = "ac98b513c31789d0c3201dfe2bbcc81b9437f7e1a15695d09402efec7934c20e"; - armv7-unknown-linux-gnueabihf = "23e6029c2a7363b307af539f0c81f4bb9f0ade12b588658343c8a8cfa41526ae"; - aarch64-unknown-linux-gnu = "3aa012fc4d9d5f17ca30af41f87e1c2aacdac46b51adc5213e7614797c6fd24c"; - aarch64-unknown-linux-musl = "6381de0b55f1741ac322bf1b56701d8aab4e509ff5302043941170f8df34228e"; - x86_64-apple-darwin = "e5819fdbfc7f1a4d5d82cb4c3b7662250748450b45a585433bfb75648bc45547"; - aarch64-apple-darwin = "75cbc356a06c9b2daf6b9249febda0f0c46df2a427f7cc8467c7edbd44636e53"; - powerpc64le-unknown-linux-gnu = "ba8cb5e3078b1bc7c6b27ab53cfa3af14001728db9a047d0bdf29b8f05a4db34"; - riscv64gc-unknown-linux-gnu = "5964f78e5fb30506101a929162a42be6260b887660b71592c5f38466753440c3"; - mips64el-unknown-linux-gnuabi64 = "de5fd0b249fbb95b9b67928ba08d7ec49f18f0ae25cbe1b0ede3c02390d7b93a"; + i686-unknown-linux-gnu = "ea544e213cdf65194d9650df9d521dd2ed63251e2abe89c8123e336dfe580b21"; + x86_64-unknown-linux-gnu = "34778d1cda674990dfc0537bc600066046ae9cb5d65a07809f7e7da31d4689c4"; + x86_64-unknown-linux-musl = "67acc1744293e52f4b49231f3c503e8ad187c477e7b567e27925ec792d946a01"; + arm-unknown-linux-gnueabihf = "4c88b32849132504fce5b93bebf06dd0fa17988340c7fe97afa661e038dfa258"; + armv7-unknown-linux-gnueabihf = "8f8556dbd8b0350364c7dc8fda57549934bf3c26c65498dda5842087f5c90d60"; + aarch64-unknown-linux-gnu = "c7cf230c740a62ea1ca6a4304d955c286aea44e3c6fc960b986a8c2eeea4ec3f"; + aarch64-unknown-linux-musl = "da87f4ca2534886f1006b2e8abb0dda8db231ce82cc67b4857233ad48a21c87c"; + x86_64-apple-darwin = "916056603da88336aba68bbeab49711cc8fdb9cfb46a49b04850c0c09761f58c"; + aarch64-apple-darwin = "f4061b65b31ac75b9b5384c1f518e555f3da23f93bcf64dce252461ee65e9351"; + powerpc64le-unknown-linux-gnu = "bac57066882366e4628d1ed2bbe4ab19c0b373aaf45582c2da9f639f2f6ea537"; + riscv64gc-unknown-linux-gnu = "fcb67647b764669f3b4e61235fbdc0eca287229adf9aed8c41ce20ffaad4a3ea"; + mips64el-unknown-linux-gnuabi64 = "6523efea9cd48c0375bd621460d890c65457a5534fafb2d8b69a37ee1e2a39ed"; }; - selectRustPackage = pkgs: pkgs.rust_1_71; + selectRustPackage = pkgs: pkgs.rust_1_72; rustcPatches = [ ]; } diff --git a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix index cc4aed0262f..6e982aee01a 100644 --- a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix +++ b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix @@ -1,7 +1,17 @@ -{ lib, runCommand, makeBinaryWrapper, cargo, cargo-auditable }: +{ lib, runCommand, makeBinaryWrapper, rust-audit-info, cargo, cargo-auditable }: +if cargo-auditable.meta.broken then + cargo +else runCommand "auditable-${cargo.name}" { nativeBuildInputs = [ makeBinaryWrapper ]; + + passthru.tests = runCommand "rust-audit-info-test" { + nativeBuildInputs = [ rust-audit-info ]; + } '' + rust-audit-info ${lib.getBin rust-audit-info}/bin/rust-audit-info > $out + ''; + meta = cargo-auditable.meta // { mainProgram = "cargo"; }; @@ -9,5 +19,6 @@ runCommand "auditable-${cargo.name}" { mkdir -p $out/bin makeWrapper ${cargo}/bin/cargo $out/bin/cargo \ --set CARGO_AUDITABLE_IGNORE_UNSUPPORTED 1 \ - --prefix PATH : ${lib.makeBinPath [ cargo cargo-auditable ]} + --prefix PATH : ${lib.makeBinPath [ cargo cargo-auditable ]} \ + --add-flags auditable '' diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 2e8bdc50ca6..673064db7a5 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, alsa-lib, fftw, libjack2, libsamplerate -, libsndfile, pkg-config, python3, wafHook +, libsndfile, pkg-config, python3, waf }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"; }; - nativeBuildInputs = [ pkg-config python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 waf.hook ]; buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ]; strictDeps = true; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 14b0d4c5e46..b51a608c969 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook +{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, waf # test derivations , pipewire @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ ./lilv-pkgconfig.patch ]; - nativeBuildInputs = [ pkg-config python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 waf.hook ]; buildInputs = [ serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; dontAddWafCrossFlags = true; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 9822640f8d6..af784d80a3a 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python3, wafHook }: +{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python3, waf }: stdenv.mkDerivation rec { pname = "lvtk"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-6IoyhBig3Nvc4Y8F0w8b1up6sn8O2RmoUVaBQ//+Aaw="; }; - nativeBuildInputs = [ pkg-config python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 waf.hook ]; buildInputs = [ boost gtkmm2 lv2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index d101e2a960c..3b8ecb807aa 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python3, wafHook }: +{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python3, waf }: stdenv.mkDerivation rec { pname = "ntk"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-NyEdg6e+9CI9V+TIgdpPyH1ei+Vq8pUxD3wPzWY5fEU="; }; - nativeBuildInputs = [ pkg-config wafHook ]; + nativeBuildInputs = [ pkg-config waf.hook ]; buildInputs = [ cairo libjpeg libXft python3 ]; diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index c200d4ab79c..b8e21e36bba 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python3, wafHook }: +{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python3, waf }: stdenv.mkDerivation rec { pname = "raul"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l"; }; - nativeBuildInputs = [ pkg-config wafHook python3 ]; + nativeBuildInputs = [ pkg-config waf.hook python3 ]; buildInputs = [ boost gtk2 ]; strictDeps = true; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 3dc3bb5dacd..f037b61e3bc 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom -, wafHook +, waf , withQt5 ? true, qt5 ? null }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06"; }; - nativeBuildInputs = [ pkg-config wafHook python3 ]; + nativeBuildInputs = [ pkg-config waf.hook python3 ]; buildInputs = [ gtk2 lv2 serd sord sratom ] ++ lib.optionals withQt5 (with qt5; [ qtbase qttools ]); diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index d53206ca667..9818afa9412 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python3, wafHook }: +{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python3, waf }: stdenv.mkDerivation rec { pname = "ganv"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f"; }; - nativeBuildInputs = [ pkg-config wafHook python3 gtk2 ]; + nativeBuildInputs = [ pkg-config waf.hook python3 gtk2 ]; buildInputs = [ graphviz gtkmm2 ]; strictDeps = true; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 95547fb6382..753dee9e3f0 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -11,7 +11,7 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , cmocka -, wafHook +, waf , libxcrypt }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 - wafHook + waf.hook libxslt docbook-xsl-nons docbook_xml_dtd_42 diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 9c04e9b4058..085c4c79bdc 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , python3 @@ -20,29 +19,16 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.7.0"; + version = "1.7.1"; # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - hash = "sha256-3ZVBGd2T5DQKsDEc5a7pS0yz01+rDCszU9ZK0zxvfyQ="; + hash = "sha256-3W0/i6Pu7I7D1zMQhmEqJVsa7PZpKOqU1+udNENSBvM="; }; - patches = [ - (fetchpatch { - name = "darwin-errSSLNetworkTimeout.patch"; - url = "https://github.com/libgit2/libgit2/commit/3e15292d8863da316a57be23fede04f443460686.patch"; - hash = "sha256-N314YK7osO9L3hCXb+FcMoDM8iBW9Bt8D5O2Szdz7YA="; - }) - (fetchpatch { - name = "missing-git_oidarray.patch"; - url = "https://github.com/libgit2/libgit2/commit/085a169c1d73e02888708652d7772b3bc1f1b28b.diff"; - hash = "sha256-l6q1TLuOloyk0Jqvo5Npv4grU/oxlg+RFLa43qENaLI="; - }) - ]; - cmakeFlags = [ "-DUSE_HTTP_PARSER=system" "-DUSE_SSH=ON" diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index d7b31426c4f..7ab607b01f4 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -5,7 +5,7 @@ , pkg-config , python3 , python3Packages -, wafHook +, waf , boost179 , openssl , sqlite @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-nnnxlkYVTSRB6ZcuIUDFol999+amGtqegHXK+06ITK8="; }; - nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; + nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx waf.hook ]; buildInputs = [ boost179 openssl sqlite ]; diff --git a/pkgs/development/libraries/protobuf/3.24.nix b/pkgs/development/libraries/protobuf/3.24.nix new file mode 100644 index 00000000000..2deb155444e --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.24.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic-v3-cmake.nix ({ + version = "3.24.2"; + sha256 = "sha256-yVLszyVtsz1CCzeOkioL4O3mWTFKKVBUyOhwDbC5UqE="; +} // args) diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index bfe38fd4719..5fad3c1c512 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -8,7 +8,7 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , fixDarwinDylibNames -, wafHook +, waf }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 - wafHook + waf.hook docbook-xsl-nons docbook_xml_dtd_42 ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index c166d36d5a6..bf35c5c0d91 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , pkg-config -, wafHook +, waf , python3 , readline , libxslt @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 pkg-config - wafHook + waf.hook libxslt docbook-xsl-nons docbook_xml_dtd_45 diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index bdb6eb21ed4..df773c6eabf 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -9,7 +9,7 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , which -, wafHook +, waf , libxcrypt }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_42 - wafHook + waf.hook ]; buildInputs = [ diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 82874b9a313..3508554d308 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.7.0"; + version = "3.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - hash = "sha256-uXPp2ycYl3T/ybZihDchImC/Yi4qgHI37ZeA+I6dg4c="; + hash = "sha256-9/pAcVTzw9v57E5l4d8zNyBJM+QNGEuLKrQ0WUBW5xw="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 076e045d727..aa762e315c1 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -1,10 +1,10 @@ { lib , stdenv -, callPackage , buildPythonPackage -, fetchPypi +, callPackage , cargo , cffi +, fetchPypi , hypothesis , iso8601 , isPyPy @@ -14,8 +14,8 @@ , pkg-config , pretend , py -, pytestCheckHook , pytest-subtests +, pytestCheckHook , pythonOlder , pytz , rustc @@ -29,20 +29,20 @@ let in buildPythonPackage rec { pname = "cryptography"; - version = "41.0.2"; # Also update the hash in vectors.nix + version = "41.0.3"; # Also update the hash in vectors.nix format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fSML+FYWTeFk7LYVzMFMf8beaQbd1bSR86+Q01FMklw="; + hash = "sha256-bRknQRE+9eMNidy1uVbvThV48wRwhwG4tz044+FGHzQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-hkuoICa/suMXlr4u95JbMlFzi27lJqJRmWnX3nZfzKU="; + hash = "sha256-LQu7waympGUs+CZun2yDQd2gUUAgyisKBG5mddrfSo0="; }; postPatch = '' @@ -62,9 +62,14 @@ buildPythonPackage rec { cffi ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security libiconv ] - ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + libiconv + ] ++ lib.optionals (pythonOlder "3.9") [ + libxcrypt + ]; propagatedBuildInputs = lib.optionals (!isPyPy) [ cffi diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 554873de89e..ff8bfa05ed5 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -1,4 +1,9 @@ -{ buildPythonPackage, fetchPypi, lib, cryptography, setuptools }: +{ lib +, buildPythonPackage +, fetchPypi +, cryptography +, setuptools +}: buildPythonPackage rec { pname = "cryptography-vectors"; @@ -9,15 +14,19 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-Ao3/lKhSLKgYsRKV/xLfVfNI8zoZPAWX3f6COeU9FYI="; + hash = "sha256-gN4EUsSzT1b1UY6B69dba5BfVyiq7VIdQuQfTryKQ/s="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + setuptools + ]; # No tests included doCheck = false; - pythonImportsCheck = [ "cryptography_vectors" ]; + pythonImportsCheck = [ + "cryptography_vectors" + ]; meta = with lib; { description = "Test vectors for the cryptography package"; diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 402272fb54b..5bf9981170b 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "dnspython"; - version = "2.4.1"; + version = "2.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wzlxx5r1vpaLuJfpXCRI4RpkXuhNk7Jlzgt6q+Xf3Kg="; + hash = "sha256-jc+ujHRgovhLQHLibxyfQQHKIMBxZJy3w06LapPViYQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/faust-cchardet/default.nix b/pkgs/development/python-modules/faust-cchardet/default.nix index ad979dbaf6a..6ee8b07137e 100644 --- a/pkgs/development/python-modules/faust-cchardet/default.nix +++ b/pkgs/development/python-modules/faust-cchardet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "faust-cchardet"; - version = "2.1.18"; + version = "2.1.19"; format = "pyproject"; src = fetchFromGitHub { @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = "cChardet"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-jTOqxBss/FAb8nMkU62H6O4ysmirD2FTA9mtvxXh43k="; + hash = "sha256-yY6YEhXC4S47rxnkKAta4m16IVGn7gkHSt056bYOYJ4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index b32fc7b25af..1305234e43f 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = "flask-limiter"; rev = "refs/tags/${version}"; - hash = "sha256-YDVZ/dD+TRJEnJRTRmGEB6EIkK5eQ5MdXh8FideoVDQ="; + hash = "sha256-UtmMd180bwFm426YevARq6r7DL182dI7dGAUPFKLWuM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 66d7cf680bf..01884677f26 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "8.2.1"; + version = "8.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-8uPPEoLxoMRq/tkpThatwjPHZIMYQ8lNL6fLcG+nsnw="; + hash = "sha256-d76s4iJFwhzWSySXTS53PQQuWfWIboIRecEyjzobsME="; }; patches = [ diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix index 4573e25a22b..ca0d947d37b 100644 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k , olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2 , libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy, defusedxml -, pytestCheckHook +, pytestCheckHook, setuptools }@args: import ../pillow/generic.nix (rec { diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index bb669f42117..bf3b1991c39 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -6,7 +6,7 @@ , fetchpatch , isPyPy , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11 -, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook, setuptools # for passthru.tests , imageio, matplotlib, pilkit, pydicom, reportlab }@args: diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix index 95ecce0522c..5186e8a476b 100644 --- a/pkgs/development/python-modules/pillow/generic.nix +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -39,6 +39,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pyroma numpy ]; + nativeBuildInputs = [ setuptools ]; + buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp libxcrypt tcl lcms2 ] ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] ++ lib.optionals (isPyPy) [ tk libX11 ]; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index bc06cb39e24..484a15e8587 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,6 +10,9 @@ , pretend , pytest +# docs +, sphinx + # coupled downsteam dependencies , pip-tools }: @@ -36,18 +39,50 @@ buildPythonPackage rec { installShellFiles setuptools wheel + + # docs + sphinx ]; + outputs = [ + "out" + "man" + ]; + + # pip uses a custom sphinx extension and unusual conf.py location, mimic the internal build rather than attempting + # to fit sphinxHook see https://github.com/pypa/pip/blob/0778c1c153da7da457b56df55fb77cbba08dfb0c/noxfile.py#L129-L148 + postBuild = '' + cd docs + + # remove references to sphinx extentions only required for html doc generation + # sphinx.ext.intersphinx requires network connection or packaged object.inv files for python and pypug + # sphinxcontrib.towncrier is not currently packaged + for ext in sphinx.ext.intersphinx sphinx_copybutton sphinx_inline_tabs sphinxcontrib.towncrier myst_parser; do + substituteInPlace html/conf.py --replace '"'$ext'",' "" + done + + PYTHONPATH=$src/src:$PYTHONPATH sphinx-build -v \ + -d build/doctrees/man \ + -c html \ + -d build/doctrees/man \ + -b man \ + man \ + build/man + cd .. + ''; + nativeCheckInputs = [ mock scripttest virtualenv pretend pytest ]; # Pip wants pytest, but tests are not distributed doCheck = false; postInstall = '' + installManPage docs/build/man/* + installShellCompletion --cmd pip \ - --bash <($out/bin/pip completion --bash) \ - --fish <($out/bin/pip completion --fish) \ - --zsh <($out/bin/pip completion --zsh) + --bash <($out/bin/pip completion --bash --no-cache-dir) \ + --fish <($out/bin/pip completion --fish --no-cache-dir) \ + --zsh <($out/bin/pip completion --zsh --no-cache-dir) ''; passthru.tests = { inherit pip-tools; }; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index d41bed6136e..2df8bf922ea 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2022.10.31"; + version = "2023.8.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-o6mJIdqaG/hFeu7mpVGUioNgFonl7N1zaJTqm77HfoM="; + hash = "sha256-/L3F8rDxzQ9qVs20b+QdLM4eZE47aIMvPu68X7D3cS4="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/ruamel-base/default.nix b/pkgs/development/python-modules/ruamel-base/default.nix index 26b94d0fd91..675ae527b31 100644 --- a/pkgs/development/python-modules/ruamel-base/default.nix +++ b/pkgs/development/python-modules/ruamel-base/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "ruamel.base" ]; + pythonNamespaces = [ "ruamel" ]; + meta = with lib; { description = "Common routines for ruamel packages"; homepage = "https://sourceforge.net/projects/ruamel-base/"; diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 58d3a7d86f4..de4022ed7d7 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, callPackage , ensureNewerSourcesForZipFilesHook , python3 # optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]` @@ -59,6 +60,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + inherit python3 extraTools; + hook = callPackage ./hook.nix { + waf = finalAttrs.finalPackage; + }; + }; + meta = { homepage = "https://waf.io"; description = "The meta build system"; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 21ed258e2be..01ad92c74ae 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, python3Packages, makeWrapper , libsamplerate, libsndfile, readline, eigen, celt -, wafHook +, waf # Darwin Dependencies , aften, AudioUnit, CoreAudio, libobjc, Accelerate @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config python makeWrapper wafHook ]; + nativeBuildInputs = [ pkg-config python makeWrapper waf.hook ]; buildInputs = [ libsamplerate libsndfile readline eigen celt optDbus optPythonDBus optLibffado optAlsaLib optLibopus ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index ce4e18b656a..9ac76160127 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -8,6 +8,7 @@ , fetchurl , flex , gnutls +, installShellFiles , libuuid , meson-tools , ncurses @@ -61,6 +62,7 @@ let bison dtc flex + installShellFiles openssl (buildPackages.python3.withPackages (p: [ p.libfdt @@ -132,6 +134,12 @@ in { dontStrip = false; extraMeta.platforms = lib.platforms.linux; extraMakeFlags = [ "HOST_TOOLS_ALL=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ]; + + outputs = [ "out" "man" ]; + + postInstall = '' + installManPage doc/*.1 + ''; filesToInstall = [ "tools/dumpimage" "tools/fdtgrep" diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix index 1270a9b9494..9d7eac8bee1 100644 --- a/pkgs/os-specific/linux/pflask/default.nix +++ b/pkgs/os-specific/linux/pflask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, wafHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, waf }: stdenv.mkDerivation rec { pname = "pflask"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ python3 wafHook ]; + nativeBuildInputs = [ python3 waf.hook ]; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix index 30f1140ab50..e790d07a8f6 100644 --- a/pkgs/servers/nfd/default.nix +++ b/pkgs/servers/nfd/default.nix @@ -8,7 +8,7 @@ , pkg-config , sphinx , systemd -, wafHook +, waf , websocketpp , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , withWebSocket ? true @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config sphinx wafHook ]; + nativeBuildInputs = [ pkg-config sphinx waf.hook ]; buildInputs = [ libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd; wafConfigureFlags = [ diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 9a5ebd9f63e..1d482208085 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,7 +1,7 @@ { lib, stdenv , buildPackages , fetchurl -, wafHook +, waf , pkg-config , bison , flex @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3Packages.python - wafHook + waf.hook pkg-config bison flex diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix index 4f63cf90a3a..9d7b613bbe0 100644 --- a/pkgs/tools/graphics/blockhash/default.nix +++ b/pkgs/tools/graphics/blockhash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, pkg-config, imagemagick, wafHook }: +{ lib, stdenv, fetchFromGitHub, python3, pkg-config, imagemagick, waf }: stdenv.mkDerivation rec { pname = "blockhash"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0x3lvhnkb4c3pyq6p81qnnqimz35wpippiac506dgjx3b1848v35"; }; - nativeBuildInputs = [ python3 pkg-config wafHook ]; + nativeBuildInputs = [ python3 pkg-config waf.hook ]; buildInputs = [ imagemagick ]; strictDeps = true; diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix index 1cbc6d403a9..01c05a5d1ac 100644 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ b/pkgs/tools/networking/ndn-tools/default.nix @@ -7,7 +7,7 @@ , openssl , pkg-config , sphinx -, wafHook +, waf }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { EOF ''; - nativeBuildInputs = [ pkg-config sphinx wafHook ]; + nativeBuildInputs = [ pkg-config sphinx waf.hook ]; buildInputs = [ libpcap ndn-cxx openssl ]; wafConfigureFlags = [ diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix index d02acb3100a..7f37e61f511 100644 --- a/pkgs/tools/networking/saldl/default.nix +++ b/pkgs/tools/networking/saldl/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , pkg-config -, wafHook +, waf , python3 , asciidoc , docbook_xml_dtd_45 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - wafHook + waf.hook python3 asciidoc docbook_xml_dtd_45 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2fb5821d910..85ea9745786 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1825,7 +1825,7 @@ mapAliases ({ inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17 ### W ### - + wafHook = waf.hook; # Added 2023-08-23 wavesurfer = throw "wavesurfer has been removed: depended on snack which has been removed"; # Added 2022-04-21 waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21 way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df11cbca064..e18de7f5e2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14774,7 +14774,6 @@ with pkgs; volumeicon = callPackage ../tools/audio/volumeicon { }; waf = callPackage ../development/tools/build-managers/waf { }; - wafHook = callPackage ../development/tools/build-managers/waf/hook.nix { }; waf-tester = callPackage ../tools/security/waf-tester { }; @@ -17058,11 +17057,11 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_71 = callPackage ../development/compilers/rust/1_71.nix { + rust_1_72 = callPackage ../development/compilers/rust/1_72.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_16 = llvmPackages_16.libllvm; }; - rust = rust_1_71; + rust = rust_1_72; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -17070,8 +17069,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_71 = rust_1_71.packages.stable; - rustPackages = rustPackages_1_71; + rustPackages_1_72 = rust_1_72.packages.stable; + rustPackages = rustPackages_1_72; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -24645,8 +24644,9 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf3_23; + protobuf = protobuf3_24; + protobuf3_24 = callPackage ../development/libraries/protobuf/3.24.nix { }; protobuf3_23 = callPackage ../development/libraries/protobuf/3.23.nix { }; protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { abseil-cpp = abseil-cpp_202103; |