From cc8120d3ff134c155a0288aee9092fdbfbf4ba2a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 24 May 2024 02:45:55 +0200 Subject: [PATCH 1/2] pkgs/by-name: remove unuseed fetchpatch arguments --- pkgs/by-name/bm/bmake/package.nix | 1 - pkgs/by-name/bp/bpftrace/package.nix | 2 +- pkgs/by-name/co/connman/package.nix | 1 - pkgs/by-name/de/dependabot-cli/package.nix | 1 - pkgs/by-name/dt/dtools/package.nix | 1 - pkgs/by-name/ic/icewm/package.nix | 1 - pkgs/by-name/im/imhex/package.nix | 1 - pkgs/by-name/ki/kikit/solidpython/default.nix | 4 ---- pkgs/by-name/li/libbfio/package.nix | 1 - pkgs/by-name/li/libcpuid/package.nix | 2 +- pkgs/by-name/li/libewf-legacy/package.nix | 1 - pkgs/by-name/li/libiconv-darwin/package.nix | 1 - pkgs/by-name/ml/mlx42/package.nix | 1 - pkgs/by-name/mo/mommy/package.nix | 1 - pkgs/by-name/op/opensnitch/package.nix | 2 -- pkgs/by-name/op/openturns/package.nix | 1 - pkgs/by-name/pe/perf_data_converter/package.nix | 2 -- pkgs/by-name/pe/perl-debug-adapter/package.nix | 1 - pkgs/by-name/rc/rcu/package.nix | 1 - pkgs/by-name/re/reactphysics3d/package.nix | 2 +- pkgs/by-name/re/recoverdm/package.nix | 1 - pkgs/by-name/re/redict/package.nix | 2 +- pkgs/by-name/sc/scion/package.nix | 1 - pkgs/by-name/si/silicon/package.nix | 1 - pkgs/by-name/sw/swaylock/package.nix | 2 +- pkgs/by-name/tp/tpnote/package.nix | 1 - pkgs/by-name/un/undbx/package.nix | 1 - pkgs/by-name/ze/zesarux/package.nix | 1 - 28 files changed, 5 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index fe4e8b6ed6dd..f1440556f6f4 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , getopt , ksh , bc diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 6e516c5806ee..bc5aab6a9406 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , llvmPackages, elfutils, bcc , libbpf, libbfd, libopcodes , cereal, asciidoctor diff --git a/pkgs/by-name/co/connman/package.nix b/pkgs/by-name/co/connman/package.nix index a90fb1ffd727..c3bb59b6ab8a 100644 --- a/pkgs/by-name/co/connman/package.nix +++ b/pkgs/by-name/co/connman/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , autoreconfHook , dbus , file diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix index b5b8eadad45b..13d53ad70442 100644 --- a/pkgs/by-name/de/dependabot-cli/package.nix +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -1,7 +1,6 @@ { buildGoModule , dependabot-cli , fetchFromGitHub -, fetchpatch , installShellFiles , lib , testers diff --git a/pkgs/by-name/dt/dtools/package.nix b/pkgs/by-name/dt/dtools/package.nix index 9de7ed6b125b..feb4dc740b80 100644 --- a/pkgs/by-name/dt/dtools/package.nix +++ b/pkgs/by-name/dt/dtools/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , ldc , curl }: diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 2d606a0c3aac..c4f7e28c7df7 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , expat , flac diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index d10ffb8a56e9..da3a2b4e20fa 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -3,7 +3,6 @@ , cmake , llvm , fetchFromGitHub -, fetchpatch , mbedtls , gtk3 , pkg-config diff --git a/pkgs/by-name/ki/kikit/solidpython/default.nix b/pkgs/by-name/ki/kikit/solidpython/default.nix index c03637907a36..2244166bbfea 100644 --- a/pkgs/by-name/ki/kikit/solidpython/default.nix +++ b/pkgs/by-name/ki/kikit/solidpython/default.nix @@ -1,15 +1,11 @@ # SolidPython is an unmaintained library with old dependencies. { buildPythonPackage -, callPackage , fetchFromGitHub -, fetchFromGitLab -, fetchpatch , lib , pythonRelaxDepsHook , poetry-core , prettytable -, pypng , ply , setuptools , euclid3 diff --git a/pkgs/by-name/li/libbfio/package.nix b/pkgs/by-name/li/libbfio/package.nix index ccc4c640677c..1695b65272d2 100644 --- a/pkgs/by-name/li/libbfio/package.nix +++ b/pkgs/by-name/li/libbfio/package.nix @@ -1,6 +1,5 @@ { lib , fetchzip -, fetchpatch , stdenv , gettext , libtool diff --git a/pkgs/by-name/li/libcpuid/package.nix b/pkgs/by-name/li/libcpuid/package.nix index cf4afd8df7d5..6cbc2c689cab 100644 --- a/pkgs/by-name/li/libcpuid/package.nix +++ b/pkgs/by-name/li/libcpuid/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libcpuid"; diff --git a/pkgs/by-name/li/libewf-legacy/package.nix b/pkgs/by-name/li/libewf-legacy/package.nix index 536a28eceebe..3d2aee4d2874 100644 --- a/pkgs/by-name/li/libewf-legacy/package.nix +++ b/pkgs/by-name/li/libewf-legacy/package.nix @@ -1,6 +1,5 @@ { lib , fetchurl -, fetchpatch , stdenv , zlib , openssl diff --git a/pkgs/by-name/li/libiconv-darwin/package.nix b/pkgs/by-name/li/libiconv-darwin/package.nix index bb5291831b65..0cb34224a6c7 100644 --- a/pkgs/by-name/li/libiconv-darwin/package.nix +++ b/pkgs/by-name/li/libiconv-darwin/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, atf, libiconvReal, meson, diff --git a/pkgs/by-name/ml/mlx42/package.nix b/pkgs/by-name/ml/mlx42/package.nix index 3387dec3378d..31df5cf11e17 100644 --- a/pkgs/by-name/ml/mlx42/package.nix +++ b/pkgs/by-name/ml/mlx42/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , glfw , darwin diff --git a/pkgs/by-name/mo/mommy/package.nix b/pkgs/by-name/mo/mommy/package.nix index 8d2187068514..280b8caae996 100644 --- a/pkgs/by-name/mo/mommy/package.nix +++ b/pkgs/by-name/mo/mommy/package.nix @@ -4,7 +4,6 @@ , makeWrapper , writeText , shellspec -, fetchpatch # usage: # pkgs.mommy.override { # mommySettings.sweetie = "catgirl"; diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix index df8647bdeb05..52b8b9ef80b4 100644 --- a/pkgs/by-name/op/opensnitch/package.nix +++ b/pkgs/by-name/op/opensnitch/package.nix @@ -1,13 +1,11 @@ { buildGoModule , fetchFromGitHub -, fetchpatch , protobuf , go-protobuf , pkg-config , libnetfilter_queue , libnfnetlink , lib -, coreutils , iptables , makeWrapper , protoc-gen-go-grpc diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix index 152714133fa7..e6f3fb3a5ff7 100644 --- a/pkgs/by-name/op/openturns/package.nix +++ b/pkgs/by-name/op/openturns/package.nix @@ -7,7 +7,6 @@ darwin, dlib, fetchFromGitHub, - fetchpatch, hdf5, hmat-oss, ipopt, diff --git a/pkgs/by-name/pe/perf_data_converter/package.nix b/pkgs/by-name/pe/perf_data_converter/package.nix index 22f6e5aa9a8d..c8d49ab84c92 100644 --- a/pkgs/by-name/pe/perf_data_converter/package.nix +++ b/pkgs/by-name/pe/perf_data_converter/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, buildBazelPackage, fetchFromGitHub, - fetchpatch, bazel_6, jdk, elfutils, diff --git a/pkgs/by-name/pe/perl-debug-adapter/package.nix b/pkgs/by-name/pe/perl-debug-adapter/package.nix index 4b1dd4e09ee6..eb9dd371a9b9 100644 --- a/pkgs/by-name/pe/perl-debug-adapter/package.nix +++ b/pkgs/by-name/pe/perl-debug-adapter/package.nix @@ -1,7 +1,6 @@ { lib , buildNpmPackage , fetchFromGitHub -, fetchpatch , makeWrapper , perl # Needed if you want to use it for a perl script with dependencies. diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 250dda8940e6..4ae6c6894d08 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -1,7 +1,6 @@ { stdenv , lib , requireFile -, fetchpatch , runCommand , rcu , testers diff --git a/pkgs/by-name/re/reactphysics3d/package.nix b/pkgs/by-name/re/reactphysics3d/package.nix index 2245eeee4214..a4f8edc823c0 100644 --- a/pkgs/by-name/re/reactphysics3d/package.nix +++ b/pkgs/by-name/re/reactphysics3d/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation (finalAttrs: { pname = "reactphysics3d"; diff --git a/pkgs/by-name/re/recoverdm/package.nix b/pkgs/by-name/re/recoverdm/package.nix index b0de4b7d1cfe..647f50e97a8c 100644 --- a/pkgs/by-name/re/recoverdm/package.nix +++ b/pkgs/by-name/re/recoverdm/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , installShellFiles }: diff --git a/pkgs/by-name/re/redict/package.nix b/pkgs/by-name/re/redict/package.nix index 39133faa9b1b..c64f6b7b63bd 100644 --- a/pkgs/by-name/re/redict/package.nix +++ b/pkgs/by-name/re/redict/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitea, fetchurl, fetchpatch, lua, jemalloc, pkg-config, nixosTests +{ lib, stdenv, fetchFromGitea, fetchurl, lua, jemalloc, pkg-config, nixosTests , tcl, which, ps, getconf , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd # dependency ordering is broken at the moment when building with openssl diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix index 9044dc44f2a5..2044b994673b 100644 --- a/pkgs/by-name/sc/scion/package.nix +++ b/pkgs/by-name/sc/scion/package.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch2 , nixosTests }: let diff --git a/pkgs/by-name/si/silicon/package.nix b/pkgs/by-name/si/silicon/package.nix index 57a86a27213d..18edc3b84948 100644 --- a/pkgs/by-name/si/silicon/package.nix +++ b/pkgs/by-name/si/silicon/package.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitHub -, fetchpatch , pkg-config , cmake , expat diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix index 0b438df13d28..0ba3b727c949 100644 --- a/pkgs/by-name/sw/swaylock/package.nix +++ b/pkgs/by-name/sw/swaylock/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index eec1f68f5f44..267b9766abdb 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , rustPlatform , cmake , pkg-config diff --git a/pkgs/by-name/un/undbx/package.nix b/pkgs/by-name/un/undbx/package.nix index 69db03479e99..269abccdbdf2 100644 --- a/pkgs/by-name/un/undbx/package.nix +++ b/pkgs/by-name/un/undbx/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook }: diff --git a/pkgs/by-name/ze/zesarux/package.nix b/pkgs/by-name/ze/zesarux/package.nix index 096f4bf2b0ec..b75e4ade88eb 100644 --- a/pkgs/by-name/ze/zesarux/package.nix +++ b/pkgs/by-name/ze/zesarux/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , SDL2 , aalib , alsa-lib From 203a48ad353b4a5ab287e57b5f4958fe9753787a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 24 May 2024 02:43:14 +0200 Subject: [PATCH 2/2] pkgs/development: remove unused fetchpatch arguments --- pkgs/development/ada-modules/gprbuild/default.nix | 2 -- pkgs/development/compilers/ccl/default.nix | 2 +- pkgs/development/compilers/ghc/common-hadrian.nix | 1 - pkgs/development/compilers/ghdl/default.nix | 1 - pkgs/development/compilers/ispc/default.nix | 2 +- pkgs/development/compilers/ocaml/ber-metaocaml.nix | 1 - pkgs/development/compilers/openjdk/openjfx/20.nix | 2 +- pkgs/development/compilers/openjdk/openjfx/21.nix | 2 +- pkgs/development/compilers/openjdk/openjfx/22.nix | 1 - pkgs/development/compilers/solc/default.nix | 1 - pkgs/development/compilers/souffle/default.nix | 2 +- pkgs/development/compilers/vala/default.nix | 2 +- pkgs/development/interpreters/lfe/2.1.nix | 2 +- pkgs/development/interpreters/lua-5/default.nix | 2 +- pkgs/development/libraries/mesa/default.nix | 1 - pkgs/development/libraries/qt-6/default.nix | 1 - pkgs/development/ocaml-modules/bap/default.nix | 2 +- pkgs/development/ocaml-modules/bisect_ppx/default.nix | 2 +- pkgs/development/ocaml-modules/bistro/default.nix | 2 -- pkgs/development/ocaml-modules/git/unix.nix | 4 ++-- pkgs/development/ocaml-modules/httpaf/default.nix | 2 +- pkgs/development/ocaml-modules/piqi-ocaml/default.nix | 2 +- pkgs/development/ocaml-modules/pyml/default.nix | 1 - pkgs/development/ocaml-modules/uring/default.nix | 1 - pkgs/development/perl-modules/Bio-BigFile/default.nix | 2 -- pkgs/development/php-packages/apcu/default.nix | 2 -- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- pkgs/development/tools/analysis/frama-c/default.nix | 2 +- pkgs/development/tools/analysis/radare2/default.nix | 1 - pkgs/development/tools/analysis/rr/default.nix | 2 +- pkgs/development/tools/build-managers/alire/default.nix | 1 - .../tools/build-managers/bazel/bazel_5/default.nix | 2 +- .../tools/build-managers/bazel/bazel_6/default.nix | 2 +- pkgs/development/tools/build-managers/bear/default.nix | 1 - pkgs/development/tools/build-managers/msbuild/default.nix | 2 +- pkgs/development/tools/capnproto-java/default.nix | 2 +- pkgs/development/tools/esbuild/netlify.nix | 1 - pkgs/development/tools/misc/gdb/default.nix | 2 +- pkgs/development/tools/misc/jcli/default.nix | 2 +- pkgs/development/tools/misc/libtool/libtool2.nix | 2 +- pkgs/development/tools/misc/nix-bisect/default.nix | 1 - pkgs/development/tools/rust/cargo-readme/default.nix | 2 +- pkgs/development/web/nodejs/v18.nix | 2 +- 43 files changed, 26 insertions(+), 48 deletions(-) diff --git a/pkgs/development/ada-modules/gprbuild/default.nix b/pkgs/development/ada-modules/gprbuild/default.nix index 00eaa7209767..f1cf28f00af3 100644 --- a/pkgs/development/ada-modules/gprbuild/default.nix +++ b/pkgs/development/ada-modules/gprbuild/default.nix @@ -1,7 +1,5 @@ { lib , stdenv -, fetchFromGitHub -, fetchpatch , gprbuild-boot , which , gnat diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 332e0b1bccf4..9fe1a8aa8e56 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: +{ lib, stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: let options = rec { diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 5db97cc0d976..55cc96dfd3ed 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -19,7 +19,6 @@ , autoconf , automake , coreutils -, fetchpatch , fetchurl , fetchgit , perl diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index 96f1db0e6492..3a28aa03c110 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, fetchpatch , callPackage , gnat , zlib diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index b7f2ad1228b7..ee162260929b 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb # the default test target is sse4, but that is not supported by all Hydra agents , testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index 230c911ef68c..5279fc7481b6 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchurl , ncurses , libX11, xorgproto, buildEnv -, fetchpatch , useX11 ? stdenv.hostPlatform.isx86 }: diff --git a/pkgs/development/compilers/openjdk/openjfx/20.nix b/pkgs/development/compilers/openjdk/openjfx/20.nix index 794590dc7e60..9485498c4f64 100644 --- a/pkgs/development/compilers/openjdk/openjfx/20.nix +++ b/pkgs/development/compilers/openjdk/openjfx/20.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless +{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand , withMedia ? true diff --git a/pkgs/development/compilers/openjdk/openjfx/21.nix b/pkgs/development/compilers/openjdk/openjfx/21.nix index f49dbe3b0e98..071420100e97 100644 --- a/pkgs/development/compilers/openjdk/openjfx/21.nix +++ b/pkgs/development/compilers/openjdk/openjfx/21.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless +{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand , withMedia ? true diff --git a/pkgs/development/compilers/openjdk/openjfx/22.nix b/pkgs/development/compilers/openjdk/openjfx/22.nix index d585dbdf0141..2b9db91c0274 100644 --- a/pkgs/development/compilers/openjdk/openjfx/22.nix +++ b/pkgs/development/compilers/openjdk/openjfx/22.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , fetchurl , runCommand , writeText diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 0603706164ae..2147d59ffd93 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -3,7 +3,6 @@ , boost , cmake , coreutils -, fetchpatch , jq , ncurses , python3 diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 68ceb1a7d7f6..770d84573dbe 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , bash-completion, perl, ncurses, zlib, sqlite, libffi , mcpp, cmake, bison, flex, doxygen, graphviz , makeWrapper diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index a7041bfc6a29..1b880b61a05a 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook +{ stdenv, lib, fetchurl, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook , gnome, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll, vala, gobject-introspection }: diff --git a/pkgs/development/interpreters/lfe/2.1.nix b/pkgs/development/interpreters/lfe/2.1.nix index f239aa94b78f..2270c0a219d6 100644 --- a/pkgs/development/interpreters/lfe/2.1.nix +++ b/pkgs/development/interpreters/lfe/2.1.nix @@ -1,4 +1,4 @@ -{ fetchpatch, mkDerivation }: +{ mkDerivation }: mkDerivation { version = "2.1.3"; diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index bbd93c725f73..a7587dafe392 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -1,5 +1,5 @@ # similar to interpreters/python/default.nix -{ stdenv, config, lib, callPackage, fetchFromGitHub, fetchurl, fetchpatch, makeBinaryWrapper }: +{ stdenv, config, lib, callPackage, fetchFromGitHub, fetchurl, makeBinaryWrapper }: let diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 80621fd9bbb5..79c9c0cdf18b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -7,7 +7,6 @@ , elfutils , expat , fetchCrate -, fetchpatch , fetchurl , file , flex diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index c4b851207954..c724bd21d11f 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -4,7 +4,6 @@ , generateSplicesForMkScope , makeScopeWithSplicing' , fetchurl -, fetchpatch , fetchpatch2 , makeSetupHook , makeWrapper diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 0d2b4247bd42..a56bce316ef6 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchurl , ocaml, findlib, ocamlbuild, ocaml_oasis , bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, mmap, lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp , utop, libxml2, ncurses diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index 114e638fa6c4..4d01125188dc 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, cmdliner, ppxlib }: +{ lib, fetchFromGitHub, buildDunePackage, cmdliner, ppxlib }: buildDunePackage rec { pname = "bisect_ppx"; diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index fd409b51091d..bb424a5ce9ae 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/pkgs/development/ocaml-modules/bistro/default.nix @@ -1,6 +1,4 @@ { lib -, ocaml -, fetchpatch , fetchFromGitHub , buildDunePackage , base64 diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index 28bfb40cf8cb..adad5dc0792e 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -1,11 +1,11 @@ -{ buildDunePackage, fetchpatch, git +{ buildDunePackage, git , rresult, result, bigstringaf , fmt, bos, fpath, uri, digestif, logs, lwt , mirage-clock, mirage-clock-unix, astring, awa, cmdliner , decompress, domain-name, ipaddr, mtime , tcpip, awa-mirage, mirage-flow, mirage-unix , alcotest, alcotest-lwt, base64, cstruct -, ke, mirage-crypto-rng, ocurl, git-binary +, ke, mirage-crypto-rng, git-binary , ptime, mimic, ca-certs-nss, tls, tls-mirage , cacert, happy-eyeballs-lwt, git-mirage }: diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix index 6dce28fb2020..336b74f8277b 100644 --- a/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/pkgs/development/ocaml-modules/httpaf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, buildDunePackage +{ lib, fetchFromGitHub, buildDunePackage , angstrom, faraday, result, alcotest }: diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 39ae5a86c598..ae1efafb2251 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims, num }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, piqi, stdlib-shims, num }: stdenv.mkDerivation rec { version = "0.7.8"; diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix index ed7f2ef559ed..d5840c8af53d 100644 --- a/pkgs/development/ocaml-modules/pyml/default.nix +++ b/pkgs/development/ocaml-modules/pyml/default.nix @@ -1,7 +1,6 @@ { buildDunePackage , lib , fetchFromGitHub -, fetchpatch , utop , python3 , stdcompat diff --git a/pkgs/development/ocaml-modules/uring/default.nix b/pkgs/development/ocaml-modules/uring/default.nix index 9da63a8cd895..c78e794b8034 100644 --- a/pkgs/development/ocaml-modules/uring/default.nix +++ b/pkgs/development/ocaml-modules/uring/default.nix @@ -3,7 +3,6 @@ , cstruct , dune-configurator , fetchurl -, fetchpatch , fmt , optint , mdx diff --git a/pkgs/development/perl-modules/Bio-BigFile/default.nix b/pkgs/development/perl-modules/Bio-BigFile/default.nix index 516b6d014c5a..3c360c2396a8 100644 --- a/pkgs/development/perl-modules/Bio-BigFile/default.nix +++ b/pkgs/development/perl-modules/Bio-BigFile/default.nix @@ -3,14 +3,12 @@ IOString, buildPerlModule, fetchFromGitHub, - fetchpatch, fetchurl, kent, lib, libmysqlclient, libpng, openssl, - perl }: buildPerlModule rec { diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index f8b8ff1d83b7..9cfe9b96cf34 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -3,8 +3,6 @@ lib, pcre2, fetchFromGitHub, - php, - fetchpatch, }: let diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 02d014bef899..3a64f7d2fd9d 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -28,7 +28,7 @@ , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie , CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libepoxy, libxkbcommon, libmaxminddb, libyaml , cargo, rustc, rustPlatform -, autoSignDarwinBinariesHook, fetchpatch +, autoSignDarwinBinariesHook }@args: let diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 26cd487d9ebe..2467b124170b 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, writeText +{ lib, stdenv, fetchurl, writeText , graphviz, doxygen , ocamlPackages, ltl2ba, coq, why3 , gdk-pixbuf, wrapGAppsHook3 diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 61ac7bbfe464..0efbd75773ff 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , buildPackages , pkg-config , meson diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 587bb7758909..3a2ecc4c6d48 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , cmake, pkg-config, which, makeWrapper , libpfm, zlib, python3Packages, procps, gdb, capnproto }: diff --git a/pkgs/development/tools/build-managers/alire/default.nix b/pkgs/development/tools/build-managers/alire/default.nix index b7613fe6e045..6d2e8cce61a8 100644 --- a/pkgs/development/tools/build-managers/alire/default.nix +++ b/pkgs/development/tools/build-managers/alire/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , gprbuild , gnat }: diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 5ef2a183fa0a..2e1459c16bea 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, installShellFiles +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 186d585d626e..5521fcf0d53d 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, installShellFiles +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 2b8d3106f3ce..2e0c1d54122b 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake , ninja , pkg-config diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index 1f5261649b85..c9d6c19c450e 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, glibcLocales, mono, nuget, unzip, dotnetCorePackages, writeText, roslyn }: +{ lib, stdenv, fetchurl, makeWrapper, glibcLocales, mono, nuget, unzip, dotnetCorePackages, writeText, roslyn }: let diff --git a/pkgs/development/tools/capnproto-java/default.nix b/pkgs/development/tools/capnproto-java/default.nix index fa59a5ad2abf..73c068543fb3 100644 --- a/pkgs/development/tools/capnproto-java/default.nix +++ b/pkgs/development/tools/capnproto-java/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, capnproto, pkg-config }: +{ lib, stdenv, fetchFromGitHub, capnproto, pkg-config }: stdenv.mkDerivation rec { pname = "capnproto-java"; diff --git a/pkgs/development/tools/esbuild/netlify.nix b/pkgs/development/tools/esbuild/netlify.nix index 1ed35d64f027..0d754060c211 100644 --- a/pkgs/development/tools/esbuild/netlify.nix +++ b/pkgs/development/tools/esbuild/netlify.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch , netlify-cli }: diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index e607967a1205..30f824c4e476 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, targetPackages # Build time -, fetchurl, fetchpatch, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages +, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time , ncurses, readline, gmp, mpfr, expat, libipt, zlib, zstd, xz, dejagnu, sourceHighlight, libiconv diff --git a/pkgs/development/tools/misc/jcli/default.nix b/pkgs/development/tools/misc/jcli/default.nix index f5d9d7a85899..2b7f14284f16 100644 --- a/pkgs/development/tools/misc/jcli/default.nix +++ b/pkgs/development/tools/misc/jcli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "jcli"; diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 50c064cadfd0..259fb2b113c7 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, m4 +{ lib, stdenv, fetchurl, m4 , runtimeShell , file }: diff --git a/pkgs/development/tools/misc/nix-bisect/default.nix b/pkgs/development/tools/misc/nix-bisect/default.nix index 7c9f474ab531..9927be16d36a 100644 --- a/pkgs/development/tools/misc/nix-bisect/default.nix +++ b/pkgs/development/tools/misc/nix-bisect/default.nix @@ -1,5 +1,4 @@ { lib -, fetchpatch , fetchFromGitHub , python3 }: diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/development/tools/rust/cargo-readme/default.nix index 2b5fb7abc69b..aa4a6cf5ea37 100644 --- a/pkgs/development/tools/rust/cargo-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-readme/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-readme"; diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index c4a97a47a4b6..6b3ca7635e43 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, overrideCC, pkgs, buildPackages, fetchpatch, openssl, python3, enableNpm ? true }: +{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python3, enableNpm ? true }: let # Clang 16+ cannot build Node v18 due to -Wenum-constexpr-conversion errors.