diff --git a/lib/tests/modules/define-_module-args-custom.nix b/lib/tests/modules/define-_module-args-custom.nix index e565fd215a57..8e53e84c042b 100644 --- a/lib/tests/modules/define-_module-args-custom.nix +++ b/lib/tests/modules/define-_module-args-custom.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { config = { diff --git a/lib/tests/modules/define-enable-with-custom-arg.nix b/lib/tests/modules/define-enable-with-custom-arg.nix index 7da74671d148..9794bf8edf9e 100644 --- a/lib/tests/modules/define-enable-with-custom-arg.nix +++ b/lib/tests/modules/define-enable-with-custom-arg.nix @@ -1,4 +1,4 @@ -{ lib, custom, ... }: +{ custom, ... }: { config = { diff --git a/lib/tests/modules/disable-declare-enable.nix b/lib/tests/modules/disable-declare-enable.nix index a373ee7e550e..19d2e13c786a 100644 --- a/lib/tests/modules/disable-declare-enable.nix +++ b/lib/tests/modules/disable-declare-enable.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { disabledModules = [ ./declare-enable.nix ]; diff --git a/lib/tests/modules/disable-define-enable-string-path.nix b/lib/tests/modules/disable-define-enable-string-path.nix index 6429a6d6354a..5354a72bba41 100644 --- a/lib/tests/modules/disable-define-enable-string-path.nix +++ b/lib/tests/modules/disable-define-enable-string-path.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { disabledModules = [ (toString ./define-enable.nix) ]; diff --git a/lib/tests/modules/disable-define-enable.nix b/lib/tests/modules/disable-define-enable.nix index 0d84a7c3cb6c..67fefa733586 100644 --- a/lib/tests/modules/disable-define-enable.nix +++ b/lib/tests/modules/disable-define-enable.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { disabledModules = [ ./define-enable.nix ]; diff --git a/lib/tests/modules/disable-enable-modules.nix b/lib/tests/modules/disable-enable-modules.nix index c325f4e07431..af4d7e60b984 100644 --- a/lib/tests/modules/disable-enable-modules.nix +++ b/lib/tests/modules/disable-enable-modules.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { disabledModules = [ "define-enable.nix" "declare-enable.nix" ]; diff --git a/lib/tests/modules/doRename-condition-enable.nix b/lib/tests/modules/doRename-condition-enable.nix index e6eabfa6f89a..9e0db126b575 100644 --- a/lib/tests/modules/doRename-condition-enable.nix +++ b/lib/tests/modules/doRename-condition-enable.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: { config = { services.foo.enable = true; diff --git a/lib/tests/modules/doRename-condition-migrated.nix b/lib/tests/modules/doRename-condition-migrated.nix index 8d21610e8ec6..fd20ee87f23a 100644 --- a/lib/tests/modules/doRename-condition-migrated.nix +++ b/lib/tests/modules/doRename-condition-migrated.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: { config = { services.foos."".bar = "baz"; diff --git a/lib/tests/modules/doRename-condition-no-enable.nix b/lib/tests/modules/doRename-condition-no-enable.nix index 66ec004d3147..9b0427cff047 100644 --- a/lib/tests/modules/doRename-condition-no-enable.nix +++ b/lib/tests/modules/doRename-condition-no-enable.nix @@ -1,4 +1,4 @@ -{ config, lib, options, ... }: +{ config, options, ... }: { config = { result = diff --git a/lib/tests/modules/import-from-store.nix b/lib/tests/modules/import-from-store.nix index f5af22432ce1..c45ccbed76b6 100644 --- a/lib/tests/modules/import-from-store.nix +++ b/lib/tests/modules/import-from-store.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { imports = [ diff --git a/lib/tests/modules/merge-typeless-option.nix b/lib/tests/modules/merge-typeless-option.nix index 627d90b15db2..fcd72634c166 100644 --- a/lib/tests/modules/merge-typeless-option.nix +++ b/lib/tests/modules/merge-typeless-option.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: let typeless = diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix index 4698971de8ff..5468488fafed 100644 --- a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, modulesPath, ... }: +{ modulesPath, ... }: { imports = diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix index d1264fa04304..5931a561b31c 100644 --- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, modulesPath, ... }: +{ modulesPath, ... }: { imports = diff --git a/nixos/modules/profiles/docker-container.nix b/nixos/modules/profiles/docker-container.nix index 5365e49711dc..199156edfdc6 100644 --- a/nixos/modules/profiles/docker-container.nix +++ b/nixos/modules/profiles/docker-container.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: let inherit (pkgs) writeScript; diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix index a7015c8bcc61..3dbbbbea182e 100644 --- a/nixos/modules/profiles/qemu-guest.nix +++ b/nixos/modules/profiles/qemu-guest.nix @@ -1,7 +1,7 @@ # Common configuration for virtual machines running under QEMU (using # virtio). -{ config, lib, ... }: +{ ... }: { boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; diff --git a/nixos/modules/security/apparmor/profiles.nix b/nixos/modules/security/apparmor/profiles.nix index 0bf90a008655..46af0f15f761 100644 --- a/nixos/modules/security/apparmor/profiles.nix +++ b/nixos/modules/security/apparmor/profiles.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: let apparmor = config.security.apparmor; in { config.security.apparmor.packages = [ pkgs.apparmor-profiles ]; diff --git a/nixos/tests/common/acme/client/default.nix b/nixos/tests/common/acme/client/default.nix index 503e610d1ac9..f9b08b519dbe 100644 --- a/nixos/tests/common/acme/client/default.nix +++ b/nixos/tests/common/acme/client/default.nix @@ -1,4 +1,4 @@ -{ lib, nodes, pkgs, ... }: +{ nodes, ... }: let caCert = nodes.acme.test-support.acme.caCert; caDomain = nodes.acme.test-support.acme.caDomain; diff --git a/nixos/tests/installed-tests/ostree.nix b/nixos/tests/installed-tests/ostree.nix index 90e09ad4ddf4..b90870204225 100644 --- a/nixos/tests/installed-tests/ostree.nix +++ b/nixos/tests/installed-tests/ostree.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, makeInstalledTest, ... }: +{ pkgs, makeInstalledTest, ... }: makeInstalledTest { tested = pkgs.ostree; diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix index 0a6a9bf38865..85a3295fb064 100644 --- a/pkgs/applications/backup/timeshift/default.nix +++ b/pkgs/applications/backup/timeshift/default.nix @@ -1,6 +1,5 @@ { callPackage , timeshift-unwrapped -, lib , rsync , coreutils , mount diff --git a/pkgs/applications/blockchains/sparrow/fhsenv.nix b/pkgs/applications/blockchains/sparrow/fhsenv.nix index 26bf9da0b85d..671da04b6921 100644 --- a/pkgs/applications/blockchains/sparrow/fhsenv.nix +++ b/pkgs/applications/blockchains/sparrow/fhsenv.nix @@ -1,5 +1,4 @@ -{ lib -, buildFHSEnv +{ buildFHSEnv , sparrow-unwrapped }: diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index c2e6b565de28..9152d93c1544 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -1,6 +1,6 @@ # run tests by building `neovim.tests` { vimUtils, writeText, neovim, vimPlugins -, lib, neovimUtils, wrapNeovimUnstable +, neovimUtils, wrapNeovimUnstable , neovim-unwrapped , fetchFromGitLab , runCommandLocal diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 8b19c70c3b4d..e5e744b37467 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,5 +1,4 @@ -{ lib -, makeWrapper +{ makeWrapper , nixosTests , symlinkJoin diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index b551fe0a1e44..bcf99a5f4e4f 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -1,5 +1,4 @@ -{ lib -, makeWrapper +{ makeWrapper , nixosTests , symlinkJoin diff --git a/pkgs/applications/misc/blender/wrapper.nix b/pkgs/applications/misc/blender/wrapper.nix index 7450827a8fa9..8b5e8916a138 100644 --- a/pkgs/applications/misc/blender/wrapper.nix +++ b/pkgs/applications/misc/blender/wrapper.nix @@ -1,5 +1,4 @@ { stdenv -, lib , blender , makeWrapper , extraModules ? [] diff --git a/pkgs/applications/networking/cluster/tubekit/wrapper.nix b/pkgs/applications/networking/cluster/tubekit/wrapper.nix index 7cba11c97a3a..d12f69adbfb9 100644 --- a/pkgs/applications/networking/cluster/tubekit/wrapper.nix +++ b/pkgs/applications/networking/cluster/tubekit/wrapper.nix @@ -1,5 +1,4 @@ -{ lib -, runCommand +{ runCommand , makeWrapper , tubekit-unwrapped , pname ? "tubekit" diff --git a/pkgs/applications/networking/mailreaders/mailspring/darwin.nix b/pkgs/applications/networking/mailreaders/mailspring/darwin.nix index cccc46a4f5eb..e0166e361fe9 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/darwin.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/darwin.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchurl , pname , version diff --git a/pkgs/applications/science/logic/msat/default.nix b/pkgs/applications/science/logic/msat/default.nix index 299fe95224eb..3c27493baff8 100644 --- a/pkgs/applications/science/logic/msat/default.nix +++ b/pkgs/applications/science/logic/msat/default.nix @@ -1,4 +1,4 @@ -{ lib, ocamlPackages }: +{ ocamlPackages }: with ocamlPackages; buildDunePackage { pname = "msat-bin"; diff --git a/pkgs/applications/science/math/wolfram-engine/notebook.nix b/pkgs/applications/science/math/wolfram-engine/notebook.nix index 85570eeca7fb..07cd0afa3099 100644 --- a/pkgs/applications/science/math/wolfram-engine/notebook.nix +++ b/pkgs/applications/science/math/wolfram-engine/notebook.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScriptBin, jupyter, wolfram-for-jupyter-kernel }: +{ stdenv, writeScriptBin, jupyter, wolfram-for-jupyter-kernel }: let wolfram-jupyter = jupyter.override { definitions = { wolfram = wolfram-for-jupyter-kernel.definition; }; }; diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix index 14e4cf215e7b..b6aa8009dcd0 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix @@ -1,9 +1,6 @@ -{ lib -, appimageTools +{ appimageTools , fetchurl , makeWrapper -, gtk3 -, gsettings-desktop-schemas , pname , version , hash diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index 062fc2a3771d..16f6d38b222c 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }: +{ stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }: let taffybarEnv = ghcWithPackages (self: [ diff --git a/pkgs/build-support/fetchtorrent/tests.nix b/pkgs/build-support/fetchtorrent/tests.nix index e8cc3f33878b..05c91111ab68 100644 --- a/pkgs/build-support/fetchtorrent/tests.nix +++ b/pkgs/build-support/fetchtorrent/tests.nix @@ -1,4 +1,4 @@ -{ testers, fetchtorrent, lib, ... }: +{ testers, fetchtorrent, ... }: let wired-cd.meta.license = [ diff --git a/pkgs/build-support/trivial-builders/test/concat-test.nix b/pkgs/build-support/trivial-builders/test/concat-test.nix index 5ce435619069..7d023503c002 100644 --- a/pkgs/build-support/trivial-builders/test/concat-test.nix +++ b/pkgs/build-support/trivial-builders/test/concat-test.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, pkgs, runCommand, concatText, writeText, hello, emptyFile }: +{ runCommand, concatText, writeText, hello, emptyFile }: let stri = writeText "pathToTest"; txt1 = stri "abc"; diff --git a/pkgs/by-name/au/authentik/ldap.nix b/pkgs/by-name/au/authentik/ldap.nix index d2e40497ce9b..1e1a5abf8754 100644 --- a/pkgs/by-name/au/authentik/ldap.nix +++ b/pkgs/by-name/au/authentik/ldap.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, authentik }: +{ buildGoModule, authentik }: buildGoModule { pname = "authentik-ldap-outpost"; diff --git a/pkgs/by-name/au/authentik/radius.nix b/pkgs/by-name/au/authentik/radius.nix index 957fd3702b77..04efa139efea 100644 --- a/pkgs/by-name/au/authentik/radius.nix +++ b/pkgs/by-name/au/authentik/radius.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, authentik }: +{ buildGoModule, authentik }: buildGoModule { pname = "authentik-radius-outpost"; diff --git a/pkgs/by-name/cu/cue/tests/001-all-good.nix b/pkgs/by-name/cu/cue/tests/001-all-good.nix index d9919cd7fee4..f7fc46eebea6 100644 --- a/pkgs/by-name/cu/cue/tests/001-all-good.nix +++ b/pkgs/by-name/cu/cue/tests/001-all-good.nix @@ -1,5 +1,4 @@ -{ lib -, cue +{ cue , runCommand }: diff --git a/pkgs/by-name/de/deltachat-repl/package.nix b/pkgs/by-name/de/deltachat-repl/package.nix index 3de470c08524..fe97f891caa7 100644 --- a/pkgs/by-name/de/deltachat-repl/package.nix +++ b/pkgs/by-name/de/deltachat-repl/package.nix @@ -1,5 +1,4 @@ -{ lib -, rustPlatform +{ rustPlatform , libdeltachat , perl , pkg-config diff --git a/pkgs/by-name/de/deltachat-rpc-server/package.nix b/pkgs/by-name/de/deltachat-rpc-server/package.nix index 6c57548cf9e8..b7d0dbef2374 100644 --- a/pkgs/by-name/de/deltachat-rpc-server/package.nix +++ b/pkgs/by-name/de/deltachat-rpc-server/package.nix @@ -1,5 +1,4 @@ -{ lib -, rustPlatform +{ rustPlatform , libdeltachat , perl , pkg-config diff --git a/pkgs/by-name/du/duckstation/shaderc-patched.nix b/pkgs/by-name/du/duckstation/shaderc-patched.nix new file mode 100644 index 000000000000..3211925699e1 --- /dev/null +++ b/pkgs/by-name/du/duckstation/shaderc-patched.nix @@ -0,0 +1,20 @@ +{ + fetchpatch, + duckstation, + shaderc, +}: + +shaderc.overrideAttrs (old: { + pname = "shaderc-patched-for-duckstation"; + patches = (old.patches or [ ]) ++ [ + (fetchpatch { + url = "file://${duckstation.src}/scripts/shaderc-changes.patch"; + hash = "sha256-Ps/D+CdSbjVWg3ZGOEcgbpQbCNkI5Nuizm4E5qiM9Wo="; + excludes = [ + "CHANGES" + "CMakeLists.txt" + "libshaderc/CMakeLists.txt" + ]; + }) + ]; +}) diff --git a/pkgs/by-name/ei/eintopf/frontend.nix b/pkgs/by-name/ei/eintopf/frontend.nix index 0a7bdd15dee9..f16198b30484 100644 --- a/pkgs/by-name/ei/eintopf/frontend.nix +++ b/pkgs/by-name/ei/eintopf/frontend.nix @@ -1,9 +1,7 @@ -{ lib -, stdenv +{ stdenv , fetchYarnDeps , fixup-yarn-lock , yarn -, fetchFromGitea , src , version , nodejs diff --git a/pkgs/by-name/el/elvish/tests/expect-version.nix b/pkgs/by-name/el/elvish/tests/expect-version.nix index 406f2131199d..b7935ceea671 100644 --- a/pkgs/by-name/el/elvish/tests/expect-version.nix +++ b/pkgs/by-name/el/elvish/tests/expect-version.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , elvish , substituteAll }: diff --git a/pkgs/by-name/gh/ghdl/test-simple.nix b/pkgs/by-name/gh/ghdl/test-simple.nix index ae265cfba82c..bf034441be25 100644 --- a/pkgs/by-name/gh/ghdl/test-simple.nix +++ b/pkgs/by-name/gh/ghdl/test-simple.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, ghdl-llvm, ghdl-mcode, ghdl-gcc, backend }: +{ stdenv, ghdl-llvm, ghdl-mcode, ghdl-gcc, backend }: let ghdl = if backend == "llvm" then ghdl-llvm else if backend == "gcc" then ghdl-gcc else ghdl-mcode; diff --git a/pkgs/by-name/ha/haunt/tests/001-test-version.nix b/pkgs/by-name/ha/haunt/tests/001-test-version.nix index 726a7ac95713..026d580c1965 100644 --- a/pkgs/by-name/ha/haunt/tests/001-test-version.nix +++ b/pkgs/by-name/ha/haunt/tests/001-test-version.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , haunt }: diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index dae243747292..2a96f05bebe6 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -1,7 +1,6 @@ { stdenv , fetchurl , undmg -, lib , meta , pname , version diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index d5647e72caaa..f4ed1b048000 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -1,5 +1,4 @@ -{ lib -, appimageTools +{ appimageTools , fetchurl , version , pname diff --git a/pkgs/by-name/pa/parsedmarc/package.nix b/pkgs/by-name/pa/parsedmarc/package.nix index fab1e01e8ba4..6c08dced6326 100644 --- a/pkgs/by-name/pa/parsedmarc/package.nix +++ b/pkgs/by-name/pa/parsedmarc/package.nix @@ -1,5 +1,4 @@ -{ lib -, python3 +{ python3 , fetchFromGitHub }: diff --git a/pkgs/by-name/ra/ratchet/tests.nix b/pkgs/by-name/ra/ratchet/tests.nix index 7585c06d9172..75ae285d734e 100644 --- a/pkgs/by-name/ra/ratchet/tests.nix +++ b/pkgs/by-name/ra/ratchet/tests.nix @@ -1,5 +1,4 @@ { - lib, runCommand, ratchet, }: let diff --git a/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix index 7b2f6523f13b..6f1f113665e9 100644 --- a/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix @@ -1,5 +1,4 @@ -{ lib -, stdenvNoCC +{ stdenvNoCC , fetchurl , undmg , pname diff --git a/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix index 30d2b60c2042..3d13bfdf9dc4 100644 --- a/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchurl , autoPatchelfHook , rpmextract diff --git a/pkgs/by-name/sd/SDL2_image_2_0/package.nix b/pkgs/by-name/sd/SDL2_image_2_0/package.nix index c52a60637766..98de34a2530a 100644 --- a/pkgs/by-name/sd/SDL2_image_2_0/package.nix +++ b/pkgs/by-name/sd/SDL2_image_2_0/package.nix @@ -1,9 +1,5 @@ # Dependency of pygame, toppler -{ - lib, - SDL2_image, - fetchurl, -}: +{ SDL2_image, fetchurl }: SDL2_image.overrideAttrs (oldAttrs: { version = "2.0.5"; diff --git a/pkgs/by-name/sd/SDL2_image_2_6/package.nix b/pkgs/by-name/sd/SDL2_image_2_6/package.nix index ef57e146098e..edd912311b82 100644 --- a/pkgs/by-name/sd/SDL2_image_2_6/package.nix +++ b/pkgs/by-name/sd/SDL2_image_2_6/package.nix @@ -1,10 +1,6 @@ # Dependency for hedgewars: # https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786 -{ - lib, - SDL2_image, - fetchurl, -}: +{ SDL2_image, fetchurl }: SDL2_image.overrideAttrs (oldAttrs: { version = "2.6.3"; diff --git a/pkgs/by-name/sp/spigot/tests/approximation.nix b/pkgs/by-name/sp/spigot/tests/approximation.nix index ffb329e6a317..fbf4875e1e61 100644 --- a/pkgs/by-name/sp/spigot/tests/approximation.nix +++ b/pkgs/by-name/sp/spigot/tests/approximation.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , spigot }: diff --git a/pkgs/by-name/sw/swayfx/package.nix b/pkgs/by-name/sw/swayfx/package.nix index 9583f9b7a710..d9fe039a2a53 100644 --- a/pkgs/by-name/sw/swayfx/package.nix +++ b/pkgs/by-name/sw/swayfx/package.nix @@ -1,5 +1,4 @@ { - lib, swayfx-unwrapped, sway, # Used by the NixOS module: diff --git a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix index b783953acd93..a3bbf153aaa3 100644 --- a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix +++ b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , boost , libX11 , libXext diff --git a/pkgs/by-name/tu/tuxclocker-plugins/package.nix b/pkgs/by-name/tu/tuxclocker-plugins/package.nix index 12deedd5c56f..2da3202e2332 100644 --- a/pkgs/by-name/tu/tuxclocker-plugins/package.nix +++ b/pkgs/by-name/tu/tuxclocker-plugins/package.nix @@ -1,7 +1,5 @@ -{ lib -, stdenv +{ stdenv , boost -, cmake , gettext , libdrm , meson diff --git a/pkgs/by-name/uc/ucg/tests/simple.nix b/pkgs/by-name/uc/ucg/tests/simple.nix index 09910d0829da..033f408ce1b7 100644 --- a/pkgs/by-name/uc/ucg/tests/simple.nix +++ b/pkgs/by-name/uc/ucg/tests/simple.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , ucg }: diff --git a/pkgs/by-name/wa/waf/hook.nix b/pkgs/by-name/wa/waf/hook.nix index f97a4ed22146..37757aec1888 100644 --- a/pkgs/by-name/wa/waf/hook.nix +++ b/pkgs/by-name/wa/waf/hook.nix @@ -1,6 +1,4 @@ -{ lib -, pkgs -, makeSetupHook +{ makeSetupHook , waf }: diff --git a/pkgs/by-name/ye/yeswiki/package.nix b/pkgs/by-name/ye/yeswiki/package.nix index 64ccd4353525..0e0562eaf52a 100644 --- a/pkgs/by-name/ye/yeswiki/package.nix +++ b/pkgs/by-name/ye/yeswiki/package.nix @@ -1,5 +1,4 @@ { - lib, stdenv, fetchurl, unzip, diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix index 3777f69fa567..497b9bb9cb03 100644 --- a/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl }: +{ stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation rec { pname = "baekmuk-ttf"; diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index 1d305674e6aa..fa3e0e40f773 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl }: +{ stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation rec { pname = "bakoma-ttf"; diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index 85aa7060ea05..f567e5ed7557 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl }: +{ stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation rec { pname = "lmodern"; diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index d5623d907bee..bc66982256ff 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchzip }: +{ stdenvNoCC, fetchzip }: stdenvNoCC.mkDerivation rec { pname = "mph-2b-damase"; diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix index a37a8cfe12b8..7409cf2d54db 100644 --- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix +++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , kdoctools , libdbusmenu diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index 753938e95aa3..708640c8719c 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,7 +1,7 @@ # This derivation is a reduced-functionality variant of Gambit stable, # used to compile the full version of Gambit stable *and* unstable. -{ gccStdenv, lib, fetchurl, autoconf, gcc, coreutils, gambit-support, ... }: +{ gccStdenv, fetchurl, autoconf, gcc, coreutils, gambit-support, ... }: # As explained in build.nix, GCC compiles Gambit 10x faster than Clang, for code 3x better gccStdenv.mkDerivation { diff --git a/pkgs/development/compilers/zig/0.10/hook.nix b/pkgs/development/compilers/zig/0.10/hook.nix index 1d3439b1af62..aec36a2c0a82 100644 --- a/pkgs/development/compilers/zig/0.10/hook.nix +++ b/pkgs/development/compilers/zig/0.10/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.11/hook.nix b/pkgs/development/compilers/zig/0.11/hook.nix index fb0e1aa564d1..399b3889a226 100644 --- a/pkgs/development/compilers/zig/0.11/hook.nix +++ b/pkgs/development/compilers/zig/0.11/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.12/hook.nix b/pkgs/development/compilers/zig/0.12/hook.nix index 8d3e6206d155..1f920af318be 100644 --- a/pkgs/development/compilers/zig/0.12/hook.nix +++ b/pkgs/development/compilers/zig/0.12/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.13/hook.nix b/pkgs/development/compilers/zig/0.13/hook.nix index 2d379f1b7caf..1618702ecaec 100644 --- a/pkgs/development/compilers/zig/0.13/hook.nix +++ b/pkgs/development/compilers/zig/0.13/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.9/hook.nix b/pkgs/development/compilers/zig/0.9/hook.nix index 1d3439b1af62..aec36a2c0a82 100644 --- a/pkgs/development/compilers/zig/0.9/hook.nix +++ b/pkgs/development/compilers/zig/0.9/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/coq-modules/coq-hammer/default.nix b/pkgs/development/coq-modules/coq-hammer/default.nix index f332f0e3a82e..33785178228f 100644 --- a/pkgs/development/coq-modules/coq-hammer/default.nix +++ b/pkgs/development/coq-modules/coq-hammer/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, coq-hammer-tactics, version ? null }: +{ mkCoqDerivation, coq, coq-hammer-tactics, version ? null }: mkCoqDerivation { inherit version; diff --git a/pkgs/development/embedded/teensy-cmake-macros/hook.nix b/pkgs/development/embedded/teensy-cmake-macros/hook.nix index b0abdbdc681e..55f9aec729f5 100644 --- a/pkgs/development/embedded/teensy-cmake-macros/hook.nix +++ b/pkgs/development/embedded/teensy-cmake-macros/hook.nix @@ -1,5 +1,4 @@ -{ lib -, makeSetupHook +{ makeSetupHook , teensy-cmake-macros }: diff --git a/pkgs/development/interpreters/lua-5/wrap-lua.nix b/pkgs/development/interpreters/lua-5/wrap-lua.nix index c5e7c806cd17..1b9409ff948e 100644 --- a/pkgs/development/interpreters/lua-5/wrap-lua.nix +++ b/pkgs/development/interpreters/lua-5/wrap-lua.nix @@ -1,5 +1,4 @@ -{ lib -, lua +{ lua , makeSetupHook , makeWrapper }: diff --git a/pkgs/development/interpreters/octave/wrap-octave.nix b/pkgs/development/interpreters/octave/wrap-octave.nix index 1959ba6c4925..18a532226efe 100644 --- a/pkgs/development/interpreters/octave/wrap-octave.nix +++ b/pkgs/development/interpreters/octave/wrap-octave.nix @@ -1,5 +1,4 @@ -{ lib -, octave +{ octave , makeSetupHook , makeWrapper }: diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index a15bca1e013e..ab712cb734ea 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-html"; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index 54b28992d472..0ae044db37c9 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-pdf-a4"; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index 84cf35f385a1..85593000d421 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-pdf-letter"; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index 5d25344e4bdc..24a22dd14675 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-text"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix index 6efe8d571a77..0cbe633c63b1 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-html"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix index 1cbbf179a2e2..bb98fdffb005 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-pdf-a4"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix index 6b24450855b2..8bd6298fe151 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-pdf-letter"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix index 694ed0e9ad94..35664e17cd68 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-texinfo"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix index 4ada4e2b704d..eec0bf140961 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-text"; diff --git a/pkgs/development/interpreters/python/cpython/docs/template-info.nix b/pkgs/development/interpreters/python/cpython/docs/template-info.nix index 4f5d4b3e37ab..f1551e1f61ef 100644 --- a/pkgs/development/interpreters/python/cpython/docs/template-info.nix +++ b/pkgs/development/interpreters/python/cpython/docs/template-info.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, fetchurl }: stdenv.mkDerivation { pname = "pythonMAJORMINOR-docs-TYPE"; diff --git a/pkgs/development/interpreters/python/cpython/docs/template.nix b/pkgs/development/interpreters/python/cpython/docs/template.nix index fff6e0bedb18..adf64ddd6224 100644 --- a/pkgs/development/interpreters/python/cpython/docs/template.nix +++ b/pkgs/development/interpreters/python/cpython/docs/template.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, fetchurl }: stdenv.mkDerivation { pname = "pythonMAJORMINOR-docs-TYPE"; diff --git a/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix b/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix index 0254d843a4cf..3d3bf549d91c 100644 --- a/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix +++ b/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix @@ -1,4 +1,4 @@ -{ interpreter, lib, gdb, writeText, runCommand }: +{ interpreter, gdb, writeText, runCommand }: let crashme-py = writeText "crashme.py" '' diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index ef350835f05d..20ae20f9e99e 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qtbase, qttools }: diff --git a/pkgs/development/libraries/libde265/test-corpus-decode.nix b/pkgs/development/libraries/libde265/test-corpus-decode.nix index 763c93e6a993..9c184362d10b 100644 --- a/pkgs/development/libraries/libde265/test-corpus-decode.nix +++ b/pkgs/development/libraries/libde265/test-corpus-decode.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchFromGitHub , libde265 }: diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index fe548129b3fb..39a6b84bf238 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -1,5 +1,4 @@ -{ lib -, qtModule, python3, qtbase, qtsvg }: +{ qtModule, python3, qtbase, qtsvg }: qtModule { pname = "qtdeclarative"; diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index 75e58dcff799..c8f4efa7f7ac 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -1,5 +1,4 @@ -{ lib -, callPackage +{ callPackage , fetchurl , tcl , ... diff --git a/pkgs/development/python-modules/bootstrap/build/default.nix b/pkgs/development/python-modules/bootstrap/build/default.nix index 2101ee06c6bb..0d693e2dde58 100644 --- a/pkgs/development/python-modules/bootstrap/build/default.nix +++ b/pkgs/development/python-modules/bootstrap/build/default.nix @@ -1,5 +1,4 @@ { - lib, stdenv, python, build, diff --git a/pkgs/development/python-modules/bootstrap/flit-core/default.nix b/pkgs/development/python-modules/bootstrap/flit-core/default.nix index d348b1f877c8..bdd4a0f535ff 100644 --- a/pkgs/development/python-modules/bootstrap/flit-core/default.nix +++ b/pkgs/development/python-modules/bootstrap/flit-core/default.nix @@ -1,5 +1,4 @@ { - lib, stdenv, python, flit-core, diff --git a/pkgs/development/python-modules/bootstrap/installer/default.nix b/pkgs/development/python-modules/bootstrap/installer/default.nix index 454ec2a239a1..9f396bb6275a 100644 --- a/pkgs/development/python-modules/bootstrap/installer/default.nix +++ b/pkgs/development/python-modules/bootstrap/installer/default.nix @@ -1,5 +1,4 @@ { - lib, stdenv, python, flit-core, diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix index 2ea42160a892..964921eda9f4 100644 --- a/pkgs/development/python-modules/deltachat/default.nix +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, pkg-config, diff --git a/pkgs/development/python-modules/edlib/default.nix b/pkgs/development/python-modules/edlib/default.nix index 64f9f96db407..5a16cd6e023f 100644 --- a/pkgs/development/python-modules/edlib/default.nix +++ b/pkgs/development/python-modules/edlib/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, edlib, diff --git a/pkgs/development/python-modules/eduvpn-common/default.nix b/pkgs/development/python-modules/eduvpn-common/default.nix index 8c17edcf2df6..9d2bfda4ee8d 100644 --- a/pkgs/development/python-modules/eduvpn-common/default.nix +++ b/pkgs/development/python-modules/eduvpn-common/default.nix @@ -1,7 +1,5 @@ { - lib, buildPythonPackage, - callPackage, libeduvpn-common, selenium, setuptools, diff --git a/pkgs/development/python-modules/horizon-eda/default.nix b/pkgs/development/python-modules/horizon-eda/default.nix index dc0a91b6d757..2741dbc3675a 100644 --- a/pkgs/development/python-modules/horizon-eda/default.nix +++ b/pkgs/development/python-modules/horizon-eda/default.nix @@ -1,7 +1,5 @@ { - lib, buildPythonPackage, - callPackage, horizon-eda, mesa, pycairo, diff --git a/pkgs/development/python-modules/linien-common/tests.nix b/pkgs/development/python-modules/linien-common/tests.nix index b070abf40e0d..40a69986187c 100644 --- a/pkgs/development/python-modules/linien-common/tests.nix +++ b/pkgs/development/python-modules/linien-common/tests.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, linien-common, linien-client, diff --git a/pkgs/development/python-modules/llama-index/default.nix b/pkgs/development/python-modules/llama-index/default.nix index 97cfb265396d..e8bc753eb273 100644 --- a/pkgs/development/python-modules/llama-index/default.nix +++ b/pkgs/development/python-modules/llama-index/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, poetry-core, llama-index-agent-openai, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix index 0dc9b6a42382..cd23b6b9d1f0 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix index 5df83c4ad433..2e55477ffc0a 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, deprecated, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix index 2bab0a3bb80c..0599140c562b 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, deprecated, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix index 710674a0b9bb..3bf2f7b04c2c 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix index ef0d80d4b65c..36b4b4cb5449 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix index 0da97f5a2316..04c5debd2f5c 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix index 9d745e0261d3..a177ae42af16 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, asgiref, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index 30b2fd0e35fc..5a85e42a04d3 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, django, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix index 178c39fffb34..310d85e53f0e 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, fastapi, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix index eaca2e81e161..e640ec959754 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-proto/default.nix b/pkgs/development/python-modules/opentelemetry-proto/default.nix index a2036ddfb77b..8fcaf2a3b516 100644 --- a/pkgs/development/python-modules/opentelemetry-proto/default.nix +++ b/pkgs/development/python-modules/opentelemetry-proto/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-sdk/default.nix b/pkgs/development/python-modules/opentelemetry-sdk/default.nix index 29f69f428b88..cfa6e6249512 100644 --- a/pkgs/development/python-modules/opentelemetry-sdk/default.nix +++ b/pkgs/development/python-modules/opentelemetry-sdk/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, flaky, diff --git a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix index b6af8dea4f4f..24ee1af9e91a 100644 --- a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix +++ b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, asgiref, diff --git a/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/pkgs/development/python-modules/opentelemetry-util-http/default.nix index ee1d76c04a99..e1bcc59c2e8e 100644 --- a/pkgs/development/python-modules/opentelemetry-util-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-util-http/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/python-olm/default.nix b/pkgs/development/python-modules/python-olm/default.nix index 7af0f8fd7c63..642af55ed786 100644 --- a/pkgs/development/python-modules/python-olm/default.nix +++ b/pkgs/development/python-modules/python-olm/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, isPy3k, olm, diff --git a/pkgs/development/python-modules/simpleitk/default.nix b/pkgs/development/python-modules/simpleitk/default.nix index e69f39820c47..f241cd0a2968 100644 --- a/pkgs/development/python-modules/simpleitk/default.nix +++ b/pkgs/development/python-modules/simpleitk/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, cmake, diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index c0a6665a41ce..6cf9a308b820 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, fetchPypi, jupyter-packaging, diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 320b1d1d6ab1..bf2c8908d286 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, cmake, diff --git a/pkgs/development/python-modules/zxing-cpp/default.nix b/pkgs/development/python-modules/zxing-cpp/default.nix index 511a939cf6fb..42372a283f39 100644 --- a/pkgs/development/python-modules/zxing-cpp/default.nix +++ b/pkgs/development/python-modules/zxing-cpp/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, cmake, setuptools-scm, diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix index b20b61d6c58d..2b65bb3d82da 100644 --- a/pkgs/development/r-modules/wrapper-rstudio.nix +++ b/pkgs/development/r-modules/wrapper-rstudio.nix @@ -1,5 +1,4 @@ -{ lib -, runCommand +{ runCommand , R , rstudio , makeWrapper diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix b/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix index 814aab16cb00..90c14554b509 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, js_of_ocaml-compiler, ppxlib }: +{ buildDunePackage, js_of_ocaml-compiler, ppxlib }: buildDunePackage { pname = "js_of_ocaml-toplevel"; diff --git a/pkgs/development/tools/ocaml/merlin/lib.nix b/pkgs/development/tools/ocaml/merlin/lib.nix index 27c8035a5e3b..4a9bc320cdc2 100644 --- a/pkgs/development/tools/ocaml/merlin/lib.nix +++ b/pkgs/development/tools/ocaml/merlin/lib.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, merlin, csexp }: +{ buildDunePackage, merlin, csexp }: buildDunePackage { pname = "merlin-lib"; diff --git a/pkgs/development/tools/ocaml/opam/installer.nix b/pkgs/development/tools/ocaml/opam/installer.nix index a56621267df3..a96fd9d5f5ea 100644 --- a/pkgs/development/tools/ocaml/opam/installer.nix +++ b/pkgs/development/tools/ocaml/opam/installer.nix @@ -1,4 +1,4 @@ -{ lib, unzip, opam, ocamlPackages }: +{ unzip, opam, ocamlPackages }: ocamlPackages.buildDunePackage { pname = "opam-installer"; diff --git a/pkgs/development/tools/rust/rust-analyzer/wrapper.nix b/pkgs/development/tools/rust/rust-analyzer/wrapper.nix index 6fa5207de6eb..af0a2953edee 100644 --- a/pkgs/development/tools/rust/rust-analyzer/wrapper.nix +++ b/pkgs/development/tools/rust/rust-analyzer/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, runCommand, makeWrapper, rust-analyzer-unwrapped +{ rustPlatform, runCommand, makeWrapper, rust-analyzer-unwrapped , pname ? "rust-analyzer" , version ? rust-analyzer-unwrapped.version # Use name from `RUST_SRC_PATH` diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 371ac99b4f66..cd8142574d8d 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,5 +1,4 @@ -{ lib -, python +{ python , fetchurl , anki }: diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index 1f0e9ae18a64..3068f5a004e2 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchFromGitHub , fetchzip , SDL2 diff --git a/pkgs/games/shticker-book-unwritten/unwrapped.nix b/pkgs/games/shticker-book-unwritten/unwrapped.nix index d87a7f45a956..71b4477f493f 100644 --- a/pkgs/games/shticker-book-unwritten/unwrapped.nix +++ b/pkgs/games/shticker-book-unwritten/unwrapped.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchCrate, pkg-config, openssl }: +{ rustPlatform, fetchCrate, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "shticker-book-unwritten"; diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index cfe6080b020a..2d599a7c56e7 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -1,5 +1,4 @@ { - lib, makeScopeWithSplicing', generateSplicesForMkScope, callPackage, diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix index b7600185ae07..450cdfde0eaa 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib }: +{ mkDerivation }: mkDerivation { path = "lib/libutil"; extraPaths = [ "lib/libc/gen" ]; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix b/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix index 04a45ff980cb..8ccf12f846b3 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix @@ -1,5 +1,4 @@ { - lib, mkDerivation, bsdSetupHook, freebsdSetupHook, diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix index cb9951cb8cf1..934d4d862458 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix @@ -1,5 +1,4 @@ { - lib, mkDerivation, libterminfo, libcurses, diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix index 6652d5454387..4cbb488dc3c6 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix @@ -1,8 +1,4 @@ -{ - lib, - mkDerivation, - make-rules, -}: +{ mkDerivation, make-rules }: mkDerivation { path = "usr.bin/make"; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/include/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/include/package.nix index 481e302065fc..019f428713ff 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/include/package.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/include/package.nix @@ -1,5 +1,4 @@ { - lib, mkDerivation, makeMinimal, bsdSetupHook, diff --git a/pkgs/os-specific/linux/nftables/python.nix b/pkgs/os-specific/linux/nftables/python.nix index 7980b8ff6de6..bb9ebd621fcd 100644 --- a/pkgs/os-specific/linux/nftables/python.nix +++ b/pkgs/os-specific/linux/nftables/python.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , setuptools , nftables }: diff --git a/pkgs/pkgs-lib/formats/hocon/test/backwards-compatibility/default.nix b/pkgs/pkgs-lib/formats/hocon/test/backwards-compatibility/default.nix index 5f0b3d12a2d0..8b9196b16428 100644 --- a/pkgs/pkgs-lib/formats/hocon/test/backwards-compatibility/default.nix +++ b/pkgs/pkgs-lib/formats/hocon/test/backwards-compatibility/default.nix @@ -1,4 +1,4 @@ -{ lib, formats, stdenvNoCC, writeText, ... }: +{ formats, stdenvNoCC, ... }: let hocon = formats.hocon { }; diff --git a/pkgs/servers/apache-airflow/default.nix b/pkgs/servers/apache-airflow/default.nix index 5021f66390ba..1055f79806d4 100644 --- a/pkgs/servers/apache-airflow/default.nix +++ b/pkgs/servers/apache-airflow/default.nix @@ -1,5 +1,4 @@ -{ lib -, fetchFromGitHub +{ fetchFromGitHub , fetchPypi , python3 }: diff --git a/pkgs/servers/mlflow-server/default.nix b/pkgs/servers/mlflow-server/default.nix index a043d22aa978..6916b3b65547 100644 --- a/pkgs/servers/mlflow-server/default.nix +++ b/pkgs/servers/mlflow-server/default.nix @@ -1,4 +1,4 @@ -{lib, python3, writeText}: +{ python3, writeText}: let py = python3.pkgs; diff --git a/pkgs/servers/monitoring/loki/promtail.nix b/pkgs/servers/monitoring/loki/promtail.nix index e8539ee60a32..15bf192e2351 100644 --- a/pkgs/servers/monitoring/loki/promtail.nix +++ b/pkgs/servers/monitoring/loki/promtail.nix @@ -1,4 +1,4 @@ -{ lib, grafana-loki }: +{ grafana-loki }: grafana-loki.overrideAttrs (o: { pname = "promtail"; diff --git a/pkgs/servers/nosql/apache-jena/fuseki-test.nix b/pkgs/servers/nosql/apache-jena/fuseki-test.nix index bbf98a838259..dd8a82d8494f 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-test.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-test.nix @@ -1,4 +1,4 @@ -{ lib, runCommand, apache-jena-fuseki, curl }: +{ runCommand, apache-jena-fuseki, curl }: runCommand "fuseki-test-${apache-jena-fuseki.name}" { nativeBuildInputs = [ curl apache-jena-fuseki ]; } '' export FUSEKI_BASE="$PWD/fuseki-base" diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index 537fe93e01c5..4e1df2d7a297 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, fetchpatch +{ stdenv, callPackage, fetchpatch , sasl, boost, Security, CoreFoundation, cctools , avxSupport ? stdenv.hostPlatform.avxSupport }: diff --git a/pkgs/test/dhall/buildDhallUrl/default.nix b/pkgs/test/dhall/buildDhallUrl/default.nix index a75101a303d6..f266cde11a51 100644 --- a/pkgs/test/dhall/buildDhallUrl/default.nix +++ b/pkgs/test/dhall/buildDhallUrl/default.nix @@ -1,4 +1,4 @@ -{ dhallPackages, lib }: +{ dhallPackages }: # This file tests that dhallPackages.buildDhallUrl is able to successfully # build a Nix Dhall package for a given remote Dhall import. diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index 75633adbd1a5..5a3bf376fb88 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -1,7 +1,4 @@ -{ vimUtils, vim-full, writeText, vimPlugins -, lib -, pkgs -}: +{ vimUtils, vim-full, vimPlugins, pkgs }: let inherit (vimUtils) buildVimPlugin; diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix index 61b5969701ca..ebb58191a3ca 100644 --- a/pkgs/tools/audio/beets/builtin-plugins.nix +++ b/pkgs/tools/audio/beets/builtin-plugins.nix @@ -3,11 +3,9 @@ , flac , imagemagick , keyfinder-cli -, lib , mp3gain , mp3val , python3Packages -, version , ... }: { absubmit = { diff --git a/pkgs/tools/networking/xrootd/test-runner.nix b/pkgs/tools/networking/xrootd/test-runner.nix index 5bcf1ae86759..b878febc7bff 100644 --- a/pkgs/tools/networking/xrootd/test-runner.nix +++ b/pkgs/tools/networking/xrootd/test-runner.nix @@ -1,7 +1,4 @@ -{ lib -, runCommand -, xrootd -}: +{ runCommand, xrootd }: # These tests are specified in the test procedure of the upstream CD: # https://github.com/xrootd/xrootd/blob/master/.github/workflows/build.yml#L90-L98