From d20a86ccc104e906c057019e69fca4416ecb0258 Mon Sep 17 00:00:00 2001 From: Yohann Boniface Date: Thu, 23 May 2024 13:43:35 +0200 Subject: [PATCH] pkgs/development/libraries: remove unused fetchpatch and other arguments (#313402) --- pkgs/development/libraries/abseil-cpp/202111.nix | 1 - pkgs/development/libraries/allegro/5.nix | 1 - pkgs/development/libraries/apr/default.nix | 2 +- pkgs/development/libraries/boost/1.75.nix | 2 +- pkgs/development/libraries/boost/1.77.nix | 2 +- pkgs/development/libraries/boost/1.78.nix | 2 +- pkgs/development/libraries/boost/1.79.nix | 2 +- pkgs/development/libraries/boost/1.80.nix | 2 +- pkgs/development/libraries/boost/1.81.nix | 2 +- pkgs/development/libraries/boost/1.82.nix | 2 +- pkgs/development/libraries/boost/1.83.nix | 2 +- pkgs/development/libraries/boost/1.84.nix | 2 +- pkgs/development/libraries/boost/1.85.nix | 2 +- pkgs/development/libraries/cairo/default.nix | 2 +- pkgs/development/libraries/cereal/1.3.2.nix | 1 - pkgs/development/libraries/ceres-solver/default.nix | 1 - pkgs/development/libraries/cmocka/default.nix | 2 +- pkgs/development/libraries/cogl/default.nix | 1 - pkgs/development/libraries/crocoddyl/default.nix | 1 - pkgs/development/libraries/drogon/default.nix | 2 +- pkgs/development/libraries/duckdb/default.nix | 2 -- pkgs/development/libraries/egl-wayland/default.nix | 1 - pkgs/development/libraries/exiv2/default.nix | 1 - pkgs/development/libraries/fcgi/default.nix | 2 +- pkgs/development/libraries/fcl/default.nix | 2 +- pkgs/development/libraries/fmt/default.nix | 2 +- pkgs/development/libraries/fox/default.nix | 1 - pkgs/development/libraries/fuzzylite/default.nix | 1 - pkgs/development/libraries/geoclue/default.nix | 1 - pkgs/development/libraries/giflib/default.nix | 1 - pkgs/development/libraries/globalarrays/default.nix | 2 +- pkgs/development/libraries/gvfs/default.nix | 1 - pkgs/development/libraries/hpp-fcl/default.nix | 1 - pkgs/development/libraries/kde-frameworks/baloo.nix | 1 - .../libraries/kde-frameworks/knewstuff/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/krunner.nix | 2 +- pkgs/development/libraries/kde-frameworks/purpose.nix | 2 +- pkgs/development/libraries/libbladeRF/default.nix | 2 +- pkgs/development/libraries/libbluray/default.nix | 2 +- pkgs/development/libraries/libcdr/default.nix | 2 +- pkgs/development/libraries/libdigidocpp/default.nix | 2 +- pkgs/development/libraries/libevdev/default.nix | 2 +- pkgs/development/libraries/libewf/default.nix | 2 +- pkgs/development/libraries/libffi/3.3.nix | 3 +-- pkgs/development/libraries/libffi/default.nix | 3 +-- pkgs/development/libraries/libgdiplus/default.nix | 2 +- pkgs/development/libraries/libmd/default.nix | 2 +- pkgs/development/libraries/libopenshot-audio/default.nix | 1 - pkgs/development/libraries/libopus/default.nix | 1 - pkgs/development/libraries/libraspberrypi/default.nix | 1 - pkgs/development/libraries/libschrift/default.nix | 2 +- pkgs/development/libraries/libunwind/default.nix | 2 +- pkgs/development/libraries/libusb1/default.nix | 1 - pkgs/development/libraries/libvncserver/default.nix | 1 - pkgs/development/libraries/malcontent/default.nix | 1 - pkgs/development/libraries/mediastreamer/msopenh264.nix | 1 - pkgs/development/libraries/minizip-ng/default.nix | 1 - pkgs/development/libraries/minizip/default.nix | 2 +- pkgs/development/libraries/monocypher/default.nix | 2 +- pkgs/development/libraries/mtxclient/default.nix | 1 - pkgs/development/libraries/opencascade-occt/default.nix | 1 - pkgs/development/libraries/opencv/3.x.nix | 1 - pkgs/development/libraries/physics/geant4/default.nix | 2 +- pkgs/development/libraries/physics/rivet/default.nix | 2 +- pkgs/development/libraries/proj/default.nix | 1 - pkgs/development/libraries/python-qt/default.nix | 1 - pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 2 +- pkgs/development/libraries/range-v3/default.nix | 2 +- pkgs/development/libraries/rocksdb/default.nix | 1 - .../libraries/science/math/libamplsolver/default.nix | 2 +- .../libraries/science/math/zn_poly/default.nix | 1 - pkgs/development/libraries/spandsp/3.nix | 9 +-------- pkgs/development/libraries/spandsp/default.nix | 9 +-------- pkgs/development/libraries/tk/8.6.nix | 1 - pkgs/development/libraries/umockdev/default.nix | 1 - pkgs/development/libraries/zziplib/default.nix | 1 - 76 files changed, 42 insertions(+), 93 deletions(-) diff --git a/pkgs/development/libraries/abseil-cpp/202111.nix b/pkgs/development/libraries/abseil-cpp/202111.nix index 0c1a173eca44b..076d1e8504833 100644 --- a/pkgs/development/libraries/abseil-cpp/202111.nix +++ b/pkgs/development/libraries/abseil-cpp/202111.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , static ? stdenv.hostPlatform.isStatic , cxxStandard ? null diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index eaf227fa60d14..ac9704b617e97 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -3,7 +3,6 @@ , cmake , enet , fetchFromGitHub -, fetchpatch , flac , freetype , gtk3 diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 6428489173daa..dfa97d200e913 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, buildPackages, autoreconfHook }: +{ lib, stdenv, fetchurl, buildPackages, autoreconfHook }: stdenv.mkDerivation rec { pname = "apr"; diff --git a/pkgs/development/libraries/boost/1.75.nix b/pkgs/development/libraries/boost/1.75.nix index ec77070c932c0..c8971119c9924 100644 --- a/pkgs/development/libraries/boost/1.75.nix +++ b/pkgs/development/libraries/boost/1.75.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.75.0"; diff --git a/pkgs/development/libraries/boost/1.77.nix b/pkgs/development/libraries/boost/1.77.nix index 3da1a455ead4b..72663044d9c93 100644 --- a/pkgs/development/libraries/boost/1.77.nix +++ b/pkgs/development/libraries/boost/1.77.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.77.0"; diff --git a/pkgs/development/libraries/boost/1.78.nix b/pkgs/development/libraries/boost/1.78.nix index 2cc818e63ce03..53a3f300a792b 100644 --- a/pkgs/development/libraries/boost/1.78.nix +++ b/pkgs/development/libraries/boost/1.78.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.78.0"; diff --git a/pkgs/development/libraries/boost/1.79.nix b/pkgs/development/libraries/boost/1.79.nix index 87975e2846d30..91e13edf2265a 100644 --- a/pkgs/development/libraries/boost/1.79.nix +++ b/pkgs/development/libraries/boost/1.79.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.79.0"; diff --git a/pkgs/development/libraries/boost/1.80.nix b/pkgs/development/libraries/boost/1.80.nix index 1aab51af78a74..79281cd1c70a0 100644 --- a/pkgs/development/libraries/boost/1.80.nix +++ b/pkgs/development/libraries/boost/1.80.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.80.0"; diff --git a/pkgs/development/libraries/boost/1.81.nix b/pkgs/development/libraries/boost/1.81.nix index 2376255303e29..3d8474f1df6ab 100644 --- a/pkgs/development/libraries/boost/1.81.nix +++ b/pkgs/development/libraries/boost/1.81.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.81.0"; diff --git a/pkgs/development/libraries/boost/1.82.nix b/pkgs/development/libraries/boost/1.82.nix index 193d07ef7562f..cf3a7fe3734c9 100644 --- a/pkgs/development/libraries/boost/1.82.nix +++ b/pkgs/development/libraries/boost/1.82.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.82.0"; diff --git a/pkgs/development/libraries/boost/1.83.nix b/pkgs/development/libraries/boost/1.83.nix index df5c5a5bbd31c..446c759d335f9 100644 --- a/pkgs/development/libraries/boost/1.83.nix +++ b/pkgs/development/libraries/boost/1.83.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.83.0"; diff --git a/pkgs/development/libraries/boost/1.84.nix b/pkgs/development/libraries/boost/1.84.nix index a55f55afaae0e..bfcfdfbfd7cfd 100644 --- a/pkgs/development/libraries/boost/1.84.nix +++ b/pkgs/development/libraries/boost/1.84.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.84.0"; diff --git a/pkgs/development/libraries/boost/1.85.nix b/pkgs/development/libraries/boost/1.85.nix index 2a3252d38c574..a95789800e1bd 100644 --- a/pkgs/development/libraries/boost/1.85.nix +++ b/pkgs/development/libraries/boost/1.85.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.85.0"; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 7408a43272e97..e2483bb141a57 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, gtk-doc, meson, ninja, pkg-config, python3 +{ lib, stdenv, fetchurl, gtk-doc, meson, ninja, pkg-config, python3 , docbook_xsl, fontconfig, freetype, libpng, pixman, zlib , x11Support? !stdenv.isDarwin || true, libXext, libXrender , gobjectSupport ? true, glib diff --git a/pkgs/development/libraries/cereal/1.3.2.nix b/pkgs/development/libraries/cereal/1.3.2.nix index 5a44b26426c79..0005df8818441 100644 --- a/pkgs/development/libraries/cereal/1.3.2.nix +++ b/pkgs/development/libraries/cereal/1.3.2.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake }: diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 7052c98d8ef8f..da5afde02627a 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchurl , blas , cmake diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix index 6c88d1baebfa8..9a7ea037785bf 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, stdenv, cmake }: +{ fetchurl, lib, stdenv, cmake }: stdenv.mkDerivation rec { pname = "cmocka"; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 987d90e269955..93f75767697f9 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , pkg-config , libGL , glib diff --git a/pkgs/development/libraries/crocoddyl/default.nix b/pkgs/development/libraries/crocoddyl/default.nix index efba136122988..d9bb52f617acc 100644 --- a/pkgs/development/libraries/crocoddyl/default.nix +++ b/pkgs/development/libraries/crocoddyl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , example-robot-data , pinocchio diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 2cdc6cfafb366..1710d6046e338 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib, fetchpatch +{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib # optional but of negligible size , openssl, brotli, c-ares # optional databases diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 343574f251a8b..c222b117fff94 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -1,8 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch -, substituteAll , cmake , ninja , openssl diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index f84b44007e299..626cd52df7a84 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , eglexternalplatform , pkg-config , meson diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 0ef833b8aa234..5880ea1feed5e 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , doxygen , gettext diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 5c7f0c44f91c9..5b87be3b1a634 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "fcgi"; diff --git a/pkgs/development/libraries/fcl/default.nix b/pkgs/development/libraries/fcl/default.nix index 4e13a3f7113f3..0c6790db9f702 100644 --- a/pkgs/development/libraries/fcl/default.nix +++ b/pkgs/development/libraries/fcl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, eigen, libccd, octomap }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, libccd, octomap }: stdenv.mkDerivation rec { pname = "fcl"; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 4dd6d86fdaeb4..9ce329df79573 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitHub, fetchpatch +, fetchFromGitHub , cmake , enableShared ? !stdenv.hostPlatform.isStatic diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 49526b99c53b9..2715e2c80ca43 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , libpng , libjpeg , libtiff diff --git a/pkgs/development/libraries/fuzzylite/default.nix b/pkgs/development/libraries/fuzzylite/default.nix index 1fd6d6506c288..6f07d6a034274 100644 --- a/pkgs/development/libraries/fuzzylite/default.nix +++ b/pkgs/development/libraries/fuzzylite/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , ninja , useFloat ? false diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index df58e5dc9e193..3c6a40eeb5cb4 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , intltool , meson , mesonEmulatorHook diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 677db06e5083c..5e60b3d9a57b6 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , fixDarwinDylibNames , pkgsStatic }: diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index f7bc072f1757d..ee7876e548d40 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , blas, gfortran, openssh, mpi } : diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index aba944becf763..31bed4c108b46 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch2 , meson , ninja , pkg-config diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index 59bf04f726091..64a4d08832369 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , doxygen , boost diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 2a264d47c24c9..c7a813058454c 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -1,6 +1,5 @@ { mkDerivation , lib -, fetchpatch , extra-cmake-modules , kauth , kconfig diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix index 6e554b5faaadf..0e1633b2f1c12 100644 --- a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchpatch, + mkDerivation, extra-cmake-modules, attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio, kitemviews, kpackage, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase, diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index a56e56a2fe092..1ed8619a2fa27 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchpatch, + mkDerivation, extra-cmake-modules, kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase, qtdeclarative, solid, threadweaver, kwindowsystem diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix index ee4e9584641c1..cdc8d4d32d23f 100644 --- a/pkgs/development/libraries/kde-frameworks/purpose.nix +++ b/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, intltool, qtbase , accounts-qt, qtdeclarative, kaccounts-integration, kconfig, kcoreaddons, ki18n, kio, kirigami2 -, fetchpatch, signond +, signond }: mkDerivation { diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index ce570b76bc082..158493b80e905 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 552259ce3babe..f50172851d618 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, fontconfig, autoreconfHook, DiskArbitration +{ lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration , withJava ? false, jdk17, ant, stripJavaArchivesHook , withAACS ? false, libaacs , withBDplus ? false, libbdplus diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 64695aaa55d72..bf08acf001288 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: +{ lib, stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: stdenv.mkDerivation rec { pname = "libcdr"; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 7f706a220afcf..d957d2d05d0d2 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, minizip, pcsclite, opensc, openssl +{ lib, stdenv, fetchurl, cmake, minizip, pcsclite, opensc, openssl , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index c8db600dce810..34af29955abbf 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3 }: +{ lib, stdenv, fetchurl, python3 }: stdenv.mkDerivation rec { pname = "libevdev"; diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index dffacc7d276c7..6c149b0186ee2 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, stdenv, zlib, openssl, libuuid, pkg-config, bzip2 }: +{ fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config, bzip2 }: stdenv.mkDerivation rec { version = "20231119"; diff --git a/pkgs/development/libraries/libffi/3.3.nix b/pkgs/development/libraries/libffi/3.3.nix index 294717d1fb1cd..76d1113eae19e 100644 --- a/pkgs/development/libraries/libffi/3.3.nix +++ b/pkgs/development/libraries/libffi/3.3.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch -, autoreconfHook +{ lib, stdenv, fetchurl , doCheck ? true # test suite depends on dejagnu which cannot be used during bootstrapping , dejagnu diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index edd16ec21506e..6028cf3f736d4 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch -, autoreconfHook +{ lib, stdenv, fetchurl # test suite depends on dejagnu which cannot be used during bootstrapping # dejagnu also requires tcl which can't be built statically at the moment diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index e71aedd2cbcfa..4d315b042ee99 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip, pkg-config, glib, cairo, Carbon, fontconfig , libtiff, giflib, libjpeg, libpng -, libXrender, libexif, autoreconfHook, fetchpatch }: +, libXrender, libexif, autoreconfHook }: stdenv.mkDerivation (finalAttrs: { pname = "libgdiplus"; diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index bf156fb1c55dd..867bd5dc9ba3e 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation (finalAttrs: { pname = "libmd"; diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/development/libraries/libopenshot-audio/default.nix index bbec90a4055ae..005422295236e 100644 --- a/pkgs/development/libraries/libopenshot-audio/default.nix +++ b/pkgs/development/libraries/libopenshot-audio/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , alsa-lib , cmake , doxygen diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index d247b8b0efa6c..a841d1cfa903d 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchurl , gitUpdater , meson diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index 14f02d8481e95..bb7508b1cec5f 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config }: diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/development/libraries/libschrift/default.nix index 443550e8a0a16..c1a7e1bc7703f 100644 --- a/pkgs/development/libraries/libschrift/default.nix +++ b/pkgs/development/libraries/libschrift/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libschrift"; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 5144abc6dc5b6..d13cc33fae312 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, xz, buildPackages }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, xz, buildPackages }: stdenv.mkDerivation rec { pname = "libunwind"; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 9114fe5ec47f5..bd8561e0e8a3f 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , doxygen , pkg-config diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 4880c835a1eb3..84e0dba1dd252 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , libjpeg , openssl diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index f346906eadc23..2f4044aaed349 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 83a96175cba55..353dcd4aafdf1 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -1,7 +1,6 @@ { autoreconfHook , cmake , fetchFromGitLab -, fetchpatch , mediastreamer , openh264 , pkg-config diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index 5be1f2e519253..baf6a4f687a43 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , gtest , pkg-config diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index 586dd113f1d10..44cba9767b36e 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, zlib, autoreconfHook, fetchpatch }: +{ lib, stdenv, zlib, autoreconfHook }: stdenv.mkDerivation { pname = "minizip"; diff --git a/pkgs/development/libraries/monocypher/default.nix b/pkgs/development/libraries/monocypher/default.nix index b37cfffabc0ee..f5853385ba913 100644 --- a/pkgs/development/libraries/monocypher/default.nix +++ b/pkgs/development/libraries/monocypher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "monocypher"; diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 13816faefce9a..1c589f1af6d54 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , coeurl diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix index 664968de64324..a09cacaf39286 100644 --- a/pkgs/development/libraries/opencascade-occt/default.nix +++ b/pkgs/development/libraries/opencascade-occt/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , cmake , ninja , tcl diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 5e9409368cc70..140eee9c06e84 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , callPackage , cmake, pkg-config, unzip, zlib, pcre, hdf5 , glog, boost, gflags, protobuf_21 diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 9dcaea8be041a..ded942cca26fe 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -9,7 +9,7 @@ , enableRaytracerX11 ? false # Standard build environment with cmake. -, lib, stdenv, fetchurl, fetchpatch, cmake +, lib, stdenv, fetchurl, cmake , clhep , expat diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index a59b34147a9f4..24bc628201946 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texliveBasic, yoda, which, makeWrapper }: +{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texliveBasic, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index daab5ac2a5663..0a0ae87dc628d 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , buildPackages diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 2b7ac684974e6..404aa4921c4ef 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, python3, qmake, qtwebengine, diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 44007bec07b84..0194d3b43902c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -24,7 +24,7 @@ , MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML, OpenDirectory, Accelerate , cups, openbsm, runCommand, xcbuild, writeScriptBin , ffmpeg_4 ? null -, lib, stdenv, fetchpatch +, lib, stdenv , version ? null , qtCompatVersion , pipewireSupport ? stdenv.isLinux diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index 77db5869f62a1..9b9c2bd39d648 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "range-v3"; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index c584ef2976d1c..f07a43cfbec0b 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , ninja , bzip2 diff --git a/pkgs/development/libraries/science/math/libamplsolver/default.nix b/pkgs/development/libraries/science/math/libamplsolver/default.nix index a40091bac8b50..cbcc9ce766db7 100644 --- a/pkgs/development/libraries/science/math/libamplsolver/default.nix +++ b/pkgs/development/libraries/science/math/libamplsolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, substitute, fetchurl, fetchpatch }: +{ lib, stdenv, substitute, fetchurl }: stdenv.mkDerivation rec { pname = "libamplsolver"; diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index bdaf6e6284ef1..1c61bb07471be 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , gmp , python3 , tune ? false # tune to hardware, impure diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix index 9e916273809f0..772388405c49f 100644 --- a/pkgs/development/libraries/spandsp/3.nix +++ b/pkgs/development/libraries/spandsp/3.nix @@ -1,11 +1,4 @@ -{ lib -, stdenv -, fetchFromGitHub -, audiofile -, libtiff -, autoreconfHook -, fetchpatch -, buildPackages +{ fetchFromGitHub , callPackage }: diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index cf5e53c3f9117..38e250ddef907 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -1,11 +1,4 @@ -{ lib -, stdenv -, fetchurl -, audiofile -, libtiff -, buildPackages -, fetchpatch -, autoreconfHook +{ fetchurl , callPackage }: diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index fbf4560517547..c5317a8545dd5 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -2,7 +2,6 @@ , stdenv , callPackage , fetchurl -, fetchpatch , tcl , ... } @ args: diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 2d543f5a5364f..6576377e549f9 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -2,7 +2,6 @@ , lib , docbook-xsl-nons , fetchurl -, fetchpatch , glib , gobject-introspection , gtk-doc diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index c40cf9594cfa9..cae01170f290b 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , perl , pkg-config