From a2353716f6adc0ec2616492f9e8f6e4f36fa40c9 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 20 May 2024 05:17:03 +0200 Subject: [PATCH] treewide: remove unused occurence of fetchurl argument --- pkgs/applications/editors/l3afpad/default.nix | 2 +- .../editors/vscode/extensions/ms-vscode.cpptools/default.nix | 1 - .../networking/instant-messengers/signald/default.nix | 2 +- pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix | 1 - pkgs/applications/office/wpsoffice/default.nix | 1 - pkgs/applications/science/biology/whisper/default.nix | 2 +- .../science/chemistry/quantum-espresso/default.nix | 1 - pkgs/applications/terminal-emulators/contour/default.nix | 1 - pkgs/applications/version-management/gitlab/default.nix | 2 +- pkgs/by-name/nx/nxengine-evo/package.nix | 1 - pkgs/data/documentation/linux-manual/default.nix | 2 +- pkgs/data/fonts/gohufont/default.nix | 2 +- pkgs/development/libraries/arrow-glib/default.nix | 1 - pkgs/development/libraries/cminpack/default.nix | 1 - pkgs/development/libraries/libagar/libagar_test.nix | 2 +- pkgs/development/libraries/libimagequant/default.nix | 1 - pkgs/development/libraries/mp4v2/default.nix | 2 +- pkgs/development/libraries/sharness/default.nix | 1 - pkgs/development/libraries/spandsp/common.nix | 1 - pkgs/development/ocaml-modules/cooltt/default.nix | 1 - pkgs/development/ocaml-modules/lun/ppx.nix | 2 +- pkgs/development/ocaml-modules/lwd/nottui-lwt.nix | 2 +- pkgs/development/ocaml-modules/lwd/nottui-pretty.nix | 2 +- pkgs/development/ocaml-modules/lwd/nottui.nix | 2 +- pkgs/development/ocaml-modules/lwd/tyxml-lwd.nix | 2 +- pkgs/development/ocaml-modules/mirage-time/unix.nix | 2 +- pkgs/development/ocaml-modules/mirage/runtime.nix | 2 +- .../ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix | 2 +- pkgs/development/ocaml-modules/odoc/default.nix | 2 +- pkgs/development/ocaml-modules/opium/default.nix | 1 - pkgs/development/ocaml-modules/saturn/default.nix | 2 +- pkgs/development/ocaml-modules/yaml/yaml-sexp.nix | 2 +- pkgs/development/python-modules/bpycv/default.nix | 1 - pkgs/development/python-modules/eduvpn-common/default.nix | 1 - pkgs/development/tools/analysis/clang-analyzer/default.nix | 2 +- .../tools/continuous-integration/gitlab-runner/default.nix | 2 +- pkgs/development/tools/language-servers/zls/default.nix | 1 - pkgs/development/tools/misc/patchelf/unstable.nix | 2 +- pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix | 2 +- pkgs/development/tools/rust/duckscript/default.nix | 1 - pkgs/games/deliantra/data.nix | 2 +- pkgs/games/frogatto/engine.nix | 2 +- pkgs/games/liberation-circuit/default.nix | 2 +- pkgs/games/planetaryannihilation/default.nix | 2 +- pkgs/games/system-syzygy/default.nix | 2 +- .../darwin/apple-source-releases/diskdev_cmds/default.nix | 2 +- pkgs/os-specific/linux/anbox/default.nix | 2 +- pkgs/os-specific/linux/lenovo-legion/default.nix | 2 +- pkgs/os-specific/linux/numworks-udev-rules/default.nix | 2 +- pkgs/os-specific/linux/xone/default.nix | 2 +- pkgs/pkgs-lib/formats/java-properties/test/default.nix | 3 +-- pkgs/servers/http/apache-modules/mod_fastcgi/default.nix | 2 +- pkgs/servers/jellyfin/default.nix | 1 - pkgs/servers/plik/programs.nix | 2 +- pkgs/servers/pulseaudio/qpaeq.nix | 1 - pkgs/tools/security/yubikey-touch-detector/default.nix | 2 +- pkgs/tools/typesetting/biber-ms/default.nix | 2 +- pkgs/tools/typesetting/biber/default.nix | 2 +- 58 files changed, 39 insertions(+), 59 deletions(-) diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix index f9632def1771..1ad346ed01de 100644 --- a/pkgs/applications/editors/l3afpad/default.nix +++ b/pkgs/applications/editors/l3afpad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkg-config, gtk3, fetchFromGitHub +{ lib, stdenv, intltool, pkg-config, gtk3, fetchFromGitHub , autoreconfHook, wrapGAppsHook3 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index 20c38168178b..0e23614a166d 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -1,7 +1,6 @@ { lib, vscode-utils, - fetchurl, writeScript, runtimeShell, jq, diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index f99954d39467..2f83d994973b 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused, +{ lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused, gradle, git, perl, makeWrapper, fetchpatch, substituteAll, jre_minimal }: diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index c454c3ad2053..994c5a4b11d4 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchurl , fetchFromGitHub , autoreconfHook , autoconf-archive diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 99c58ba5360d..8f6b0d650b28 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchurl , dpkg , autoPatchelfHook , alsa-lib diff --git a/pkgs/applications/science/biology/whisper/default.nix b/pkgs/applications/science/biology/whisper/default.nix index 4cc211547610..a69b39f4e089 100644 --- a/pkgs/applications/science/biology/whisper/default.nix +++ b/pkgs/applications/science/biology/whisper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, fetchurl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "whisper"; diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 4c4482919772..2c565cb5db9f 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitLab , fetchFromGitHub -, fetchurl , git , cmake , gnum4 diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index 19793c384f1b..a255b2fb99db 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchurl , cmake , pkg-config , boxed-cpp diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 2e440e2b9766..c7a2823c6608 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv +{ stdenv, lib, fetchpatch, fetchFromGitLab, bundlerEnv , ruby_3_1, tzdata, git, nettools, nixosTests, nodejs, openssl , defaultGemConfig, buildRubyGem , gitlabEnterprise ? false, callPackage, yarn diff --git a/pkgs/by-name/nx/nxengine-evo/package.nix b/pkgs/by-name/nx/nxengine-evo/package.nix index 4503c0ec9b2c..cb4c480137fe 100644 --- a/pkgs/by-name/nx/nxengine-evo/package.nix +++ b/pkgs/by-name/nx/nxengine-evo/package.nix @@ -8,7 +8,6 @@ ninja, fetchFromGitHub, fetchpatch, - fetchurl, libpng, stdenv, }: diff --git a/pkgs/data/documentation/linux-manual/default.nix b/pkgs/data/documentation/linux-manual/default.nix index 27690f9b99cd..e9cfe258a7fa 100644 --- a/pkgs/data/documentation/linux-manual/default.nix +++ b/pkgs/data/documentation/linux-manual/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, linuxPackages_latest }: +{ lib, stdenv, perl, linuxPackages_latest }: stdenv.mkDerivation rec { pname = "linux-manual"; diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index 37fb622e1310..6892742de799 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , xorg, bdf2psf, bdftopcf , libfaketime }: diff --git a/pkgs/development/libraries/arrow-glib/default.nix b/pkgs/development/libraries/arrow-glib/default.nix index 2e283d3c52ef..cce59dc026e9 100644 --- a/pkgs/development/libraries/arrow-glib/default.nix +++ b/pkgs/development/libraries/arrow-glib/default.nix @@ -1,6 +1,5 @@ { stdenv , arrow-cpp -, fetchurl , glib , gobject-introspection , lib diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index bebb59334f15..20782c8499cb 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -3,7 +3,6 @@ , cmake , darwin , fetchFromGitHub -, fetchurl , withBlas ? true, blas }: diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index e365479f90a5..0582019d72f5 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }: +{ lib, stdenv, bsdbuild, libagar, perl, libjpeg, libpng, openssl }: stdenv.mkDerivation { pname = "libagar-test"; diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 3473a7aa4e16..e4d3f4d0fe01 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchurl , rust , rustPlatform , cargo-c diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index b9b0589bd80d..1fdb48dab4c4 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mp4v2"; diff --git a/pkgs/development/libraries/sharness/default.nix b/pkgs/development/libraries/sharness/default.nix index ec064a74c72f..7829b0009b49 100644 --- a/pkgs/development/libraries/sharness/default.nix +++ b/pkgs/development/libraries/sharness/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchurl , perl , perlPackages , sharnessExtensions ? {} }: diff --git a/pkgs/development/libraries/spandsp/common.nix b/pkgs/development/libraries/spandsp/common.nix index 6b58230b80da..0701bf74d2c6 100644 --- a/pkgs/development/libraries/spandsp/common.nix +++ b/pkgs/development/libraries/spandsp/common.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchurl , audiofile , libtiff , buildPackages diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix index 7cf63e5c0b11..8a9a4d95c1ab 100644 --- a/pkgs/development/ocaml-modules/cooltt/default.nix +++ b/pkgs/development/ocaml-modules/cooltt/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchurl , buildDunePackage , bos , bwd diff --git a/pkgs/development/ocaml-modules/lun/ppx.nix b/pkgs/development/ocaml-modules/lun/ppx.nix index fc138f1a6f8a..d4212a3d9595 100644 --- a/pkgs/development/ocaml-modules/lun/ppx.nix +++ b/pkgs/development/ocaml-modules/lun/ppx.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchurl, fmt, lun, ppxlib }: +{ lib, buildDunePackage, fmt, lun, ppxlib }: buildDunePackage { pname = "ppx_lun"; diff --git a/pkgs/development/ocaml-modules/lwd/nottui-lwt.nix b/pkgs/development/ocaml-modules/lwd/nottui-lwt.nix index 84df8db4ea37..09a4a8ba228e 100644 --- a/pkgs/development/ocaml-modules/lwd/nottui-lwt.nix +++ b/pkgs/development/ocaml-modules/lwd/nottui-lwt.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, lwd, lwt, nottui }: +{ lib, buildDunePackage, lwd, lwt, nottui }: buildDunePackage { pname = "nottui-lwt"; diff --git a/pkgs/development/ocaml-modules/lwd/nottui-pretty.nix b/pkgs/development/ocaml-modules/lwd/nottui-pretty.nix index e411255c58c4..9a0267379dc2 100644 --- a/pkgs/development/ocaml-modules/lwd/nottui-pretty.nix +++ b/pkgs/development/ocaml-modules/lwd/nottui-pretty.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, lwd, nottui }: +{ lib, buildDunePackage, lwd, nottui }: buildDunePackage { pname = "nottui-pretty"; diff --git a/pkgs/development/ocaml-modules/lwd/nottui.nix b/pkgs/development/ocaml-modules/lwd/nottui.nix index 6427ca9630c4..bffab13a5e1d 100644 --- a/pkgs/development/ocaml-modules/lwd/nottui.nix +++ b/pkgs/development/ocaml-modules/lwd/nottui.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, lwd, notty }: +{ lib, buildDunePackage, lwd, notty }: buildDunePackage { pname = "nottui"; diff --git a/pkgs/development/ocaml-modules/lwd/tyxml-lwd.nix b/pkgs/development/ocaml-modules/lwd/tyxml-lwd.nix index 0aad68fa5a0b..f391eba7d622 100644 --- a/pkgs/development/ocaml-modules/lwd/tyxml-lwd.nix +++ b/pkgs/development/ocaml-modules/lwd/tyxml-lwd.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchpatch, buildDunePackage, js_of_ocaml, js_of_ocaml-ppx, lwd, tyxml }: +{ lib, fetchpatch, buildDunePackage, js_of_ocaml, js_of_ocaml-ppx, lwd, tyxml }: buildDunePackage { pname = "tyxml-lwd"; diff --git a/pkgs/development/ocaml-modules/mirage-time/unix.nix b/pkgs/development/ocaml-modules/mirage-time/unix.nix index 9678815edf05..5771a3e2deea 100644 --- a/pkgs/development/ocaml-modules/mirage-time/unix.nix +++ b/pkgs/development/ocaml-modules/mirage-time/unix.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, fetchurl, mirage-time, lwt, duration }: +{ buildDunePackage, mirage-time, lwt, duration }: buildDunePackage { pname = "mirage-time-unix"; diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix index 7e20e3363a47..627e9432efb5 100644 --- a/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchurl, ipaddr, functoria-runtime +{ lib, buildDunePackage, ipaddr, functoria-runtime , logs, lwt , alcotest }: diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix index ca78efad3748..d8dc1d54ffc0 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix @@ -1,5 +1,5 @@ # Version can be selected with the 'version' argument, see generic.nix. -{ lib, fetchurl, buildDunePackage, ocaml, csexp, sexplib0, callPackage, ... }@args: +{ lib, buildDunePackage, ocaml, csexp, sexplib0, callPackage, ... }@args: let # for compat with ocaml-lsp diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index 92d605be157a..96a1200a0f28 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, ocaml +{ lib, buildDunePackage, ocaml , ocaml-crunch , astring, cmdliner, cppo, fpath, result, tyxml , markup, yojson, sexplib0, jq diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix index b98d892696ec..b11ab3a8ec95 100644 --- a/pkgs/development/ocaml-modules/opium/default.nix +++ b/pkgs/development/ocaml-modules/opium/default.nix @@ -1,6 +1,5 @@ { buildDunePackage , lib -, fetchurl , astring , base64 , cmdliner diff --git a/pkgs/development/ocaml-modules/saturn/default.nix b/pkgs/development/ocaml-modules/saturn/default.nix index 855935aff672..582f0e7f5aea 100644 --- a/pkgs/development/ocaml-modules/saturn/default.nix +++ b/pkgs/development/ocaml-modules/saturn/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, ocaml +{ lib, buildDunePackage, ocaml , saturn_lockfree , dscheck , qcheck, qcheck-alcotest, qcheck-stm diff --git a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix index e0cc9fac177d..051019c73479 100644 --- a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix +++ b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib +{ lib, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib , junit_alcotest }: diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix index 84085488ae4c..b72261296b25 100644 --- a/pkgs/development/python-modules/bpycv/default.nix +++ b/pkgs/development/python-modules/bpycv/default.nix @@ -7,7 +7,6 @@ , buildPythonPackage , fetchFromGitHub , fetchPypi -, fetchurl , minexr , opencv4 , python3Packages diff --git a/pkgs/development/python-modules/eduvpn-common/default.nix b/pkgs/development/python-modules/eduvpn-common/default.nix index 8dfce8d9ebb2..5ecdbf12fcdb 100644 --- a/pkgs/development/python-modules/eduvpn-common/default.nix +++ b/pkgs/development/python-modules/eduvpn-common/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , callPackage -, fetchurl , libeduvpn-common , selenium , setuptools diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix index 46e04aaf389f..67a38a526be2 100644 --- a/pkgs/development/tools/analysis/clang-analyzer/default.nix +++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper, python3 }: +{ lib, stdenv, clang, llvmPackages, perl, makeWrapper, python3 }: stdenv.mkDerivation rec { pname = "clang-analyzer"; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index a0e41743b8de..1c6cfdc5090e 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: +{ lib, buildGoModule, fetchFromGitLab, bash }: let version = "16.11.1"; diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix index 71a9a53a3fee..1642d495b1d8 100644 --- a/pkgs/development/tools/language-servers/zls/default.nix +++ b/pkgs/development/tools/language-servers/zls/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchurl , zig_0_12 , callPackage }: diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 212f0b8cebc4..551b9b484f92 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub, unstableGitUpdater }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "patchelf"; diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index 2d572364005a..ef30a51a7e6a 100644 --- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, yojson, csexp, findlib, buildDunePackage, merlin-lib, merlin, result }: +{ lib, yojson, csexp, findlib, buildDunePackage, merlin-lib, merlin, result }: buildDunePackage rec { pname = "dot-merlin-reader"; diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index 3b8c27ddbb1a..41e394bda440 100644 --- a/pkgs/development/tools/rust/duckscript/default.nix +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchurl , runCommand , fetchCrate , rustPlatform diff --git a/pkgs/games/deliantra/data.nix b/pkgs/games/deliantra/data.nix index 31ed7d0f0118..8e8c7e310df7 100644 --- a/pkgs/games/deliantra/data.nix +++ b/pkgs/games/deliantra/data.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, deliantra-maps, deliantra-arch, deliantra-server, symlinkJoin }: +{ stdenv, lib, deliantra-maps, deliantra-arch, deliantra-server, symlinkJoin }: symlinkJoin rec { name = "deliantra-data-${version}"; diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index 95e2135660fd..1efdb2ceee04 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, which +{ lib, stdenv, fetchFromGitHub, which , boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf , glew, zlib, icu, pkg-config, cairo, libvpx, glm }: diff --git a/pkgs/games/liberation-circuit/default.nix b/pkgs/games/liberation-circuit/default.nix index cfae4282a04a..a9bceda06adb 100644 --- a/pkgs/games/liberation-circuit/default.nix +++ b/pkgs/games/liberation-circuit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, pkg-config, allegro5, libGL, wrapGAppsHook3 }: +{ stdenv, lib, fetchFromGitHub, pkg-config, allegro5, libGL, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "liberation-circuit"; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 73adffab475a..e99f5541f284 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk +{ lib, stdenv, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk , nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg, requireFile }: stdenv.mkDerivation rec { diff --git a/pkgs/games/system-syzygy/default.nix b/pkgs/games/system-syzygy/default.nix index dee96f392c54..3e86eb6c50c9 100644 --- a/pkgs/games/system-syzygy/default.nix +++ b/pkgs/games/system-syzygy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, fetchurl, SDL2, makeWrapper, makeDesktopItem}: +{ stdenv, lib, rustPlatform, fetchFromGitHub, SDL2, makeWrapper, makeDesktopItem}: let desktopFile = makeDesktopItem { diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index e4431c68c9aa..b642b993df0e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -1,5 +1,5 @@ { lib, appleDerivation, xcbuildHook, Libc, stdenv, macosPackages_11_0_1, xnu -, fetchurl, libutil }: +, libutil }: let xnu-src = if stdenv.isAarch64 then macosPackages_11_0_1.xnu.src else xnu.src; diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index a3724c792482..3a5649d9f288 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl +{ lib, stdenv, fetchFromGitHub , callPackage , fetchpatch , cmake, pkg-config, dbus, makeWrapper diff --git a/pkgs/os-specific/linux/lenovo-legion/default.nix b/pkgs/os-specific/linux/lenovo-legion/default.nix index 527f1852f1e0..a79c901a1312 100644 --- a/pkgs/os-specific/linux/lenovo-legion/default.nix +++ b/pkgs/os-specific/linux/lenovo-legion/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, kernel, bash, lenovo-legion }: +{ lib, stdenv, kernel, bash, lenovo-legion }: stdenv.mkDerivation { pname = "lenovo-legion-module"; diff --git a/pkgs/os-specific/linux/numworks-udev-rules/default.nix b/pkgs/os-specific/linux/numworks-udev-rules/default.nix index aae7507f50cd..dbea6e4df79d 100644 --- a/pkgs/os-specific/linux/numworks-udev-rules/default.nix +++ b/pkgs/os-specific/linux/numworks-udev-rules/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv }: stdenv.mkDerivation rec { pname = "numworks-udev-rules"; diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index b1e2ce570a2d..92a10878a36a 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel, fetchurl, fetchpatch }: +{ stdenv, lib, fetchFromGitHub, kernel, fetchpatch }: stdenv.mkDerivation (finalAttrs: { pname = "xone"; diff --git a/pkgs/pkgs-lib/formats/java-properties/test/default.nix b/pkgs/pkgs-lib/formats/java-properties/test/default.nix index 4a51179d1c86..3c03ec66bd12 100644 --- a/pkgs/pkgs-lib/formats/java-properties/test/default.nix +++ b/pkgs/pkgs-lib/formats/java-properties/test/default.nix @@ -1,5 +1,4 @@ -{ fetchurl -, formats +{ formats , glibcLocales , jdk , lib diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index a67ea3cc03e7..bb1d3acc4a29 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, apacheHttpd }: +{ lib, stdenv, fetchFromGitHub, apacheHttpd }: stdenv.mkDerivation rec { pname = "mod_fastcgi"; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 61e1c99ac945..ce59d31ce303 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchurl , nixosTests , stdenv , dotnetCorePackages diff --git a/pkgs/servers/plik/programs.nix b/pkgs/servers/plik/programs.nix index 1ab4342f6c31..b76d46925557 100644 --- a/pkgs/servers/plik/programs.nix +++ b/pkgs/servers/plik/programs.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchurl, makeWrapper, runCommand }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, runCommand }: let version = "1.3.8"; diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix index 417647f9a3c1..4ccb8e7f50cf 100644 --- a/pkgs/servers/pulseaudio/qpaeq.nix +++ b/pkgs/servers/pulseaudio/qpaeq.nix @@ -1,7 +1,6 @@ { mkDerivation , makeDesktopItem , python3 -, fetchurl , lib , pulseaudio }: diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/tools/security/yubikey-touch-detector/default.nix index 36822b6728e6..b6ce85819cee 100644 --- a/pkgs/tools/security/yubikey-touch-detector/default.nix +++ b/pkgs/tools/security/yubikey-touch-detector/default.nix @@ -1,4 +1,4 @@ -{ lib, libnotify, gpgme, buildGoModule, fetchFromGitHub, fetchurl, pkg-config }: +{ lib, libnotify, gpgme, buildGoModule, fetchFromGitHub, pkg-config }: buildGoModule rec { pname = "yubikey-touch-detector"; diff --git a/pkgs/tools/typesetting/biber-ms/default.nix b/pkgs/tools/typesetting/biber-ms/default.nix index 9cf2bbe014f1..27821bbd8ada 100644 --- a/pkgs/tools/typesetting/biber-ms/default.nix +++ b/pkgs/tools/typesetting/biber-ms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, perlPackages, shortenPerlShebang, texlive }: +{ lib, stdenv, fetchFromGitHub, perlPackages, shortenPerlShebang, texlive }: let biberSource = texlive.pkgs.biber-ms.texsource; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 08038c41377f..f14096900ed9 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, shortenPerlShebang, texlive }: +{ lib, stdenv, perlPackages, shortenPerlShebang, texlive }: let biberSource = texlive.pkgs.biber.texsource;