Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
- pkgs/applications/graphics/seamly2d/default.nix

lib/tests/modules/define-_module-args-custom.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 
 {
   config = {

lib/tests/modules/define-enable-with-custom-arg.nix

@@ -1,4 +1,4 @@
-{ lib, custom, ... }:
+{ custom, ... }:
 
 {
   config = {

lib/tests/modules/disable-declare-enable.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 
 {
   disabledModules = [ ./declare-enable.nix ];

lib/tests/modules/disable-define-enable-string-path.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 
 {
   disabledModules = [ (toString ./define-enable.nix) ];

lib/tests/modules/disable-define-enable.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 
 {
   disabledModules = [ ./define-enable.nix ];

lib/tests/modules/disable-enable-modules.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 
 {
   disabledModules = [ "define-enable.nix" "declare-enable.nix" ];

lib/tests/modules/doRename-condition-enable.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, ... }:
 {
   config = {
     services.foo.enable = true;

lib/tests/modules/doRename-condition-migrated.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, ... }:
 {
   config = {
     services.foos."".bar = "baz";

lib/tests/modules/doRename-condition-no-enable.nix

@@ -1,4 +1,4 @@
-{ config, lib, options, ... }:
+{ config, options, ... }:
 {
   config = {
     result =

lib/tests/modules/import-from-store.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 {
 
   imports = [

lib/tests/modules/merge-typeless-option.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 
 let
   typeless =

maintainers/maintainer-list.nix

@@ -5447,6 +5447,13 @@
     githubId = 1931963;
     name = "David Sferruzza";
   };
+  dstengele = {
+    name = "Dennis Stengele";
+    email = "dennis@stengele.me";
+    matrix = "@dstengele:pango.place";
+    github = "dstengele";
+    githubId = 1706418;
+  };
   dsuetin = {
     name = "Danil Suetin";
     email = "suetin085+nixpkgs@protonmail.com";

nixos/doc/manual/release-notes/rl-2411.section.md

@@ -42,6 +42,8 @@
 
 - [Music Assistant](https://music-assistant.io/), a music library manager for your offline and online music sources which can easily stream your favourite music to a wide range of supported players. Available as [services.music-assistant](#opt-services.music-assistant.enable).
 
+- [zeronsd](https://github.com/zerotier/zeronsd), a DNS server for ZeroTier users. Available with [services.zeronsd.servedNetworks](#opt-services.zeronsd.servedNetworks).
+
 - [wg-access-server](https://github.com/freifunkMUC/wg-access-server/), an all-in-one WireGuard VPN solution with a web ui for connecting devices. Available at [services.wg-access-server](#opt-services.wg-access-server.enable).
 
 - [Envision](https://gitlab.com/gabmus/envision), a UI for building, configuring and running Monado, the open source OpenXR runtime. Available as [programs.envision](#opt-programs.envision.enable).

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 =

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 =

nixos/modules/module-list.nix

@@ -1259,6 +1259,7 @@
   ./services/networking/zerobin.nix
   ./services/networking/zeronet.nix
   ./services/networking/zerotierone.nix
+  ./services/networking/zeronsd.nix
   ./services/networking/znc/default.nix
   ./services/printing/cupsd.nix
   ./services/printing/ipp-usb.nix

nixos/modules/profiles/docker-container.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 let
   inherit (pkgs) writeScript;

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" ];

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 ];

nixos/modules/services/databases/surrealdb.nix

@@ -58,7 +58,7 @@ in {
     environment.systemPackages = [ cfg.package ] ;
 
     systemd.services.surrealdb = {
-      description = "A scalable, distributed, collaborative, document-graph database, for the realtime web ";
+      description = "A scalable, distributed, collaborative, document-graph database, for the realtime web";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
 

nixos/modules/services/monitoring/nagios.nix

@@ -175,7 +175,7 @@ in
 
   config = mkIf cfg.enable {
     users.users.nagios = {
-      description = "Nagios user ";
+      description = "Nagios user";
       uid         = config.ids.uids.nagios;
       home        = nagiosState;
       group       = "nagios";

nixos/modules/services/networking/antennas.nix

@@ -38,7 +38,7 @@ in
 
   config = mkIf cfg.enable {
     systemd.services.antennas = {
-      description = "Antennas HDHomeRun emulator for Tvheadend. ";
+      description = "Antennas HDHomeRun emulator for Tvheadend.";
       wantedBy    = [ "multi-user.target" ];
 
       # Config

nixos/modules/services/networking/zeronsd.nix

@@ -0,0 +1,117 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.zeronsd;
+  settingsFormat = pkgs.formats.json { };
+in
+{
+  options.services.zeronsd.servedNetworks = lib.mkOption {
+    default = { };
+    example = {
+      "a8a2c3c10c1a68de".settings.token = "/var/lib/zeronsd/apitoken";
+    };
+    description = "ZeroTier Networks to start zeronsd instances for.";
+    type = lib.types.attrsOf (
+      lib.types.submodule {
+        options = {
+          package = lib.mkPackageOption pkgs "zeronsd" { };
+
+          settings = lib.mkOption {
+            description = "Settings for zeronsd";
+            default = { };
+            type = lib.types.submodule {
+              freeformType = settingsFormat.type;
+
+              options = {
+                domain = lib.mkOption {
+                  default = "home.arpa";
+                  type = lib.types.singleLineStr;
+                  description = "Domain under which ZeroTier records will be available.";
+                };
+
+                token = lib.mkOption {
+                  type = lib.types.path;
+                  description = "Path to a file containing the API Token for ZeroTier Central.";
+                };
+
+                log_level = lib.mkOption {
+                  default = "warn";
+                  type = lib.types.enum [
+                    "off"
+                    "error"
+                    "warn"
+                    "info"
+                    "debug"
+                    "trace"
+                  ];
+                  description = "Log Level.";
+                };
+
+                wildcard = lib.mkOption {
+                  default = false;
+                  type = lib.types.bool;
+                  description = "Whether to serve a wildcard record for ZeroTier Nodes.";
+                };
+              };
+            };
+          };
+        };
+      }
+    );
+  };
+
+  config = lib.mkIf (cfg.servedNetworks != { }) {
+    assertions = [
+      {
+        assertion = config.services.zerotierone.enable;
+        message = "zeronsd needs a configured zerotier-one";
+      }
+    ];
+
+    systemd.services = lib.mapAttrs' (netname: netcfg: {
+      name = "zeronsd-${netname}";
+      value = {
+        description = "ZeroTier DNS server for Network ${netname}";
+
+        wantedBy = [ "multi-user.target" ];
+        after = [
+          "network.target"
+          "zerotierone.service"
+        ];
+        wants = [ "network-online.target" ];
+
+        serviceConfig =
+          let
+            configFile = pkgs.writeText "zeronsd.json" (builtins.toJSON netcfg.settings);
+          in
+          {
+            ExecStart = "${netcfg.package}/bin/zeronsd start --config ${configFile} --config-type json ${netname}";
+            Restart = "on-failure";
+            RestartSec = 2;
+            TimeoutStopSec = 5;
+            User = "zeronsd";
+            Group = "zeronsd";
+            AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+          };
+      };
+    }) cfg.servedNetworks;
+
+    systemd.tmpfiles.rules = [
+      "a+ /var/lib/zerotier-one - - - - u:zeronsd:x"
+      "a+ /var/lib/zerotier-one/authtoken.secret - - - - mask::r,u:zeronsd:r"
+    ];
+
+    users.users.zeronsd = {
+      group = "zeronsd";
+      description = "Service user for running zeronsd";
+      isSystemUser = true;
+    };
+
+    users.groups.zeronsd = { };
+  };
+}

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;

nixos/tests/installed-tests/ostree.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, makeInstalledTest, ... }:
+{ pkgs, makeInstalledTest, ... }:
 
 makeInstalledTest {
   tested = pkgs.ostree;

pkgs/applications/accessibility/squeekboard/default.nix

@@ -5,7 +5,6 @@
 , meson
 , ninja
 , pkg-config
-, gnome
 , gnome-desktop
 , glib
 , gtk3

pkgs/applications/audio/famistudio/default.nix

@@ -9,7 +9,6 @@
 , libglvnd
 , libogg
 , libvorbis
-, makeWrapper
 , openal
 , portaudio
 , rtmidi

pkgs/applications/audio/faust/faust2lv2.nix

@@ -2,7 +2,6 @@
 , faust
 , lv2
 , qtbase
-, which
 }:
 
 faust.wrapWithBuildEnv {

pkgs/applications/audio/in-formant/default.nix

@@ -13,7 +13,6 @@
 , pkg-config
 , autoPatchelfHook
 , soxr
-, freetype
 , libsamplerate
 , armadillo
 , tomlplusplus

pkgs/applications/audio/open-music-kontrollers/generic.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libGLU, lv2, serd, sord, libX11, libXext, glew, lv2lint
+{ stdenv, lib, fetchurl, pkg-config, meson, ninja, lv2, sord, libX11, libXext, glew, lv2lint
 , pname, version, sha256, description
 , url ? "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-${version}.tar.xz"
 , additionalBuildInputs ? []

pkgs/applications/audio/pipecontrol/default.nix

@@ -4,7 +4,6 @@
 , pipewire
 , cmake
 , extra-cmake-modules
-, gnumake
 , wrapQtAppsHook
 , qtbase
 , qttools

pkgs/applications/audio/viper4linux/default.nix

@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, pkg-config
 , gst_all_1
 , libviperfx
 , makeWrapper

pkgs/applications/backup/timeshift/default.nix

@@ -1,6 +1,5 @@
 { callPackage
 , timeshift-unwrapped
-, lib
 , rsync
 , coreutils
 , mount

pkgs/applications/blockchains/bitcoin-knots/default.nix

@@ -19,7 +19,6 @@
 , qtbase ? null
 , qttools ? null
 , python3
-, nixosTests
 , withGui
 , withWallet ? true
 }:

pkgs/applications/blockchains/electrs/default.nix

@@ -2,7 +2,6 @@
 , stdenv
 , rustPlatform
 , fetchFromGitHub
-, llvmPackages
 , rocksdb_7_10
 , Security
 }:

pkgs/applications/blockchains/gridcoin-research/default.nix

@@ -1,6 +1,5 @@
 { fetchFromGitHub
 , stdenv
-, makeDesktopItem
 , lib
 , openssl
 , boost

pkgs/applications/blockchains/lighthouse/default.nix

@@ -1,5 +1,4 @@
-{ clang
+{ cmake
-, cmake
 , CoreFoundation
 , fetchFromGitHub
 , fetchurl
@@ -18,7 +17,6 @@
 , stdenv
 , SystemConfiguration
 , testers
-, unzip
 }:
 
 rustPlatform.buildRustPackage rec {

pkgs/applications/blockchains/lnd/default.nix

@@ -1,7 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
 , lib
-, go
 , tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" "kvdb_postgres" "kvdb_etcd" ]
 }:
 

pkgs/applications/blockchains/nearcore/default.nix

@@ -1,6 +1,6 @@
 { rustPlatform, lib, fetchFromGitHub
 , zlib, openssl
-, pkg-config, protobuf, llvmPackages
+, pkg-config, protobuf
 }:
 rustPlatform.buildRustPackage rec {
   pname = "nearcore";

pkgs/applications/blockchains/snarkos/default.nix

@@ -6,7 +6,6 @@
 , curl
 , pkg-config
 , openssl
-, llvmPackages
 }:
 rustPlatform.buildRustPackage rec {
   pname = "snarkos";

pkgs/applications/blockchains/solana-validator/default.nix

@@ -96,7 +96,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = with lib; {
-    description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces. ";
+    description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces.";
     homepage = "https://solana.com";
     license = licenses.asl20;
     maintainers = with maintainers; [ adjacentresearch ];

pkgs/applications/blockchains/sparrow/fhsenv.nix

@@ -1,5 +1,4 @@
-{ lib
+{ buildFHSEnv
-, buildFHSEnv
 , sparrow-unwrapped
 }:
 

pkgs/applications/blockchains/terra-station/default.nix

@@ -1,8 +1,6 @@
 { lib, stdenv
 , fetchurl
 , dpkg
-, util-linux
-, bash
 , makeWrapper
 , electron
 , asar

pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix

@@ -8,7 +8,6 @@
   markdown-mode,
   melpaBuild,
   unstableGitUpdater,
-  writeText,
 }:
 
 melpaBuild {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix

@@ -1,6 +1,5 @@
 { lib
 , stdenv
-, writeText
 , melpaStablePackages
 , runCommand
 , tree-sitter-grammars

pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix

@@ -1,10 +1,7 @@
 { lib
-, callPackage
 , clangStdenv
 , cmake
 , fetchFromGitHub
-, gcc
-, git
 , llvmPackages_13
 # Libraries
 , argparse

pkgs/applications/editors/micro/test-with-expect.nix

@@ -1,4 +1,4 @@
-{ micro, expect, runCommand, writeScript, runtimeShell }:
+{ micro, expect, runCommand, writeScript }:
 
 let expect-script = writeScript "expect-script" ''
   #!${expect}/bin/expect -f

pkgs/applications/editors/nano/test-with-expect.nix

@@ -1,4 +1,4 @@
-{ nano, expect, runCommand, writeScriptBin, runtimeShell }:
+{ nano, expect, runCommand, writeScriptBin }:
 
 let expect-script = writeScriptBin "expect-script" ''
   #!${expect}/bin/expect -f

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

pkgs/applications/editors/quartus-prime/default.nix

@@ -1,4 +1,4 @@
-{ lib, buildFHSEnv, callPackage, makeDesktopItem, writeScript, runtimeShell
+{ lib, buildFHSEnv, callPackage, makeDesktopItem, runtimeShell
 , runCommand, unstick, quartus-prime-lite
 , withQuesta ? true
 , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ]

pkgs/applications/editors/rstudio/default.nix

@@ -2,7 +2,6 @@
 , stdenv
 , mkDerivation
 , fetchurl
-, fetchpatch
 , fetchFromGitHub
 , makeDesktopItem
 , copyDesktopItems

pkgs/applications/editors/thonny/default.nix

@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3, tk, makeDesktopItem, copyDesktopItems }:
+{ lib, fetchFromGitHub, python3, makeDesktopItem, copyDesktopItems }:
 
 with python3.pkgs;
 

pkgs/applications/editors/typora/default.nix

@@ -5,14 +5,12 @@
 , glib
 , nss
 , nspr
-, at-spi2-atk
 , cups
 , dbus
 , libdrm
 , gtk3
 , pango
 , cairo
-, xorg
 , libxkbcommon
 , mesa
 , expat

pkgs/applications/editors/vim/full.nix

@@ -5,7 +5,6 @@
 , vimPlugins
 , makeWrapper
 , wrapGAppsHook3
-, runtimeShell
 
 # apple frameworks
 , CoreServices, CoreData, Cocoa, Foundation, libobjc

pkgs/applications/editors/vim/plugins/generated.nix

@@ -9833,18 +9833,6 @@ final: prev:
     meta.homepage = "https://github.com/rust-lang/rust.vim/";
   };
 
-  rustaceanvim = buildNeovimPlugin {
-    pname = "rustaceanvim";
-    version = "2024-07-10";
-    src = fetchFromGitHub {
-      owner = "mrcjkb";
-      repo = "rustaceanvim";
-      rev = "047f9c9d8cd2861745eb9de6c1570ee0875aa795";
-      sha256 = "0q06rkg8dfzxvlwp7svp8sjkk0f2x5vvjkv6grdmm302s43jj7rk";
-    };
-    meta.homepage = "https://github.com/mrcjkb/rustaceanvim/";
-  };
-
   sad-vim = buildVimPlugin {
     pname = "sad.vim";
     version = "2019-02-18";

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -1380,6 +1380,8 @@
     dependencies = with self; [ nvim-lspconfig ];
   };
 
+  rustaceanvim = neovimUtils.buildNeovimPlugin { luaAttr = "rustaceanvim"; };
+
   sg-nvim = super.sg-nvim.overrideAttrs (old:
     let
       sg-nvim-rust = rustPlatform.buildRustPackage {

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -827,7 +827,6 @@ https://github.com/keith/rspec.vim/,,
 https://github.com/ccarpita/rtorrent-syntax-file/,,
 https://github.com/simrat39/rust-tools.nvim/,,
 https://github.com/rust-lang/rust.vim/,,
-https://github.com/mrcjkb/rustaceanvim/,HEAD,
 https://github.com/hauleth/sad.vim/,,
 https://github.com/vmware-archive/salt-vim/,,
 https://github.com/lewis6991/satellite.nvim/,HEAD,

pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  bash,
   ocaml,
   ocamlPackages,
   dune_3,

pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix

@@ -1,8 +1,6 @@
 {
   lib,
   vscode-utils,
-  writeScript,
-  runtimeShell,
   jq,
   clang-tools,
   gdbUseFixed ? true,

pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   stdenv,
   fetchFromGitHub,

pkgs/applications/file-managers/portfolio-filemanager/default.nix

@@ -4,7 +4,6 @@
 , appstream-glib
 , desktop-file-utils
 , gettext
-, glib
 , gobject-introspection
 , gtk3
 , gtk4

pkgs/applications/file-managers/ranger/default.nix

@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, ranger, imagemagick, testers
+{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, imagemagick
 , imagePreviewSupport ? true
 , sixelPreviewSupport ? true
 , neoVimSupport ? true

pkgs/applications/gis/qgis/default.nix

@@ -1,5 +1,4 @@
-{ lib
+{ makeWrapper
-, makeWrapper
 , nixosTests
 , symlinkJoin
 

pkgs/applications/gis/qgis/ltr.nix

@@ -1,5 +1,4 @@
-{ lib
+{ makeWrapper
-, makeWrapper
 , nixosTests
 , symlinkJoin
 

pkgs/applications/graphics/epick/default.nix

@@ -8,7 +8,6 @@
 , freetype
 , libGL
 , xorg
-, darwin
 , AppKit
 }:
 

pkgs/applications/graphics/gimp/plugins/default.nix

@@ -2,7 +2,7 @@
 # If you just want a subset of plug-ins, you can specify them explicitly:
 # `gimp-with-plugins.override { plugins = with gimpPlugins; [ gap ]; }`.
 
-{ config, lib, pkgs }:
+{ lib, pkgs }:
 
 let
   inherit (pkgs) stdenv fetchurl fetchpatch fetchpatch2 pkg-config intltool glib fetchFromGitHub fetchFromGitLab;

pkgs/applications/graphics/lazpaint/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, lazarus, fpc, pango, cairo, glib
-, atk, gtk2, libX11, gdk-pixbuf, busybox, python3
+, atk, gtk2, libX11, gdk-pixbuf, python3
 , makeWrapper
 }:
 

pkgs/applications/graphics/ocrfeeder/default.nix

@@ -10,7 +10,6 @@
 , goocanvas2
 , gtkspell3
 , isocodes
-, gnome
 , python3
 , tesseract4
 , extraOcrEngines ? [] # other supported engines are: ocrad gocr cuneiform

pkgs/applications/graphics/pick-colour-picker/default.nix

@@ -7,7 +7,6 @@
 , gtk3
 , gobject-introspection
 , wrapGAppsHook3
-, python
 }:
 
 buildPythonPackage rec {

pkgs/applications/graphics/pixinsight/default.nix

@@ -3,7 +3,6 @@
 , requireFile
 , wrapQtAppsHook
 , autoPatchelfHook
-, makeWrapper
 , unixtools
 , fakeroot
 , mailcap

pkgs/applications/graphics/pizarra/default.nix

@@ -1,9 +1,7 @@
 { lib
 , fetchFromGitLab
 , rustPlatform
-, cargo
 , pkg-config
-, binutils-unwrapped
 , gtk3-x11
 , atk
 , glib

pkgs/applications/graphics/qscreenshot/default.nix

@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchgit
-, dos2unix
 , qtbase
 , qttools
 , qtx11extras

pkgs/applications/graphics/sane/backends/brscan5/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }:
+{ stdenv, lib, fetchurl, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }:
 let
   myPatchElf = file: with lib; ''
     patchelf --set-interpreter \

pkgs/applications/graphics/seamly2d/default.nix

@@ -1,6 +1,6 @@
 { stdenv, lib, qtbase, wrapQtAppsHook, fetchFromGitHub,
-  addDriverRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, gcc, xvfb-run,
+  addDriverRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, xvfb-run,
-  fontconfig, freetype, xorg, ccache, qmake, python3, qttools, git
+  fontconfig, freetype, xorg, qmake, python3, qttools, git
 }:
 let
   qtPython = python3.withPackages (pkgs: with pkgs; [ pyqt5 ]);

pkgs/applications/graphics/trimage/default.nix

@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, substituteAll
 
 , python3
 , installShellFiles

pkgs/applications/graphics/vengi-tools/default.nix

@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, writeText
 
 , cmake
 , pkg-config

pkgs/applications/kde/kdevelop/kdevelop.nix

@@ -1,5 +1,5 @@
 { mkDerivation, lib, cmake, gettext, pkg-config, extra-cmake-modules
-, qtquickcontrols, qttools, kde-cli-tools, qtbase
+, qtquickcontrols, qttools, kde-cli-tools
 , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
 , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
 , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons

pkgs/applications/kde/palapeli.nix

@@ -2,7 +2,6 @@
 , mkDerivation
 , extra-cmake-modules
 , shared-mime-info
-, kconfig
 , kdoctools
 , kio
 , ktextwidgets

pkgs/applications/maui/mauikit.nix

@@ -7,7 +7,6 @@
 , ki18n
 , knotifications
 , mauiman
-, qtbase
 , qtquickcontrols2
 , qtx11extras
 }:

pkgs/applications/misc/auto-multiple-choice/default.nix

@@ -21,7 +21,6 @@
 , perl
 , pkg-config
 , poppler
-, auto-multiple-choice
 }:
 stdenv.mkDerivation (finalAttrs: rec {
   pname = "auto-multiple-choice";

pkgs/applications/misc/bemenu/default.nix

@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, cairo, libxkbcommon
-, pango, fribidi, harfbuzz, pcre, pkg-config, scdoc
+, pango, fribidi, harfbuzz, pkg-config, scdoc
 , ncursesSupport ? true, ncurses
 , waylandSupport ? true, wayland, wayland-protocols, wayland-scanner
 , x11Support ? true, xorg

pkgs/applications/misc/blender/wrapper.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , blender
 , makeWrapper
 , extraModules ? []

pkgs/applications/misc/cardpeek/default.nix

@@ -10,7 +10,6 @@
 , curl
 , readline
 , PCSC
-, xcbuild
 }:
 let
   version = "0.8.4";

pkgs/applications/misc/cask-server/default.nix

@@ -1,5 +1,4 @@
 { lib
-, pkgs
 , mkDerivation
 , fetchFromGitHub
 , cmake

pkgs/applications/misc/clipmenu/default.nix

@@ -4,7 +4,6 @@
 , makeWrapper
 , clipnotify
 , coreutils
-, dmenu
 , gawk
 , util-linux
 , xdotool

pkgs/applications/misc/conduktor/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchzip, jdk11, unzip, makeWrapper, makeDesktopItem, copyDesktopItems }:
+{ stdenv, lib, fetchurl, fetchzip, jdk11, makeWrapper, makeDesktopItem, copyDesktopItems }:
 
 stdenv.mkDerivation rec {
   pname = "conduktor";

pkgs/applications/misc/gollum/default.nix

@@ -1,4 +1,4 @@
-{ lib, bundlerApp, bundlerUpdateScript, ruby, makeWrapper, git, docutils, nixosTests }:
+{ lib, bundlerApp, bundlerUpdateScript, ruby, makeWrapper, nixosTests }:
 
 bundlerApp rec {
   pname = "gollum";

pkgs/applications/misc/hollywood/default.nix

@@ -19,13 +19,6 @@
 , findutils
 , ccze
 , ncurses
-, python3
-, wget
-, libcaca
-, newsboat
-, rsstail
-, w3m
-, ticker
 , tmux
 }:
 

pkgs/applications/misc/holochain-launcher/default.nix

@@ -2,7 +2,6 @@
 , lib
 , fetchurl
 , autoPatchelfHook
-, pkg-config
 , dpkg
 , openssl
 , webkitgtk

pkgs/applications/misc/huggle/default.nix

@@ -5,7 +5,6 @@
 , ncurses
 , which
 , cmake
-, unzip
 , wrapQtAppsHook
 , qtwebengine
 , yaml-cpp

pkgs/applications/misc/makehuman/default.nix

@@ -4,7 +4,6 @@
 , fetchFromGitHub
 , python3
 , qtbase
-, qttools
 , git-lfs
 , wrapQtAppsHook
 }:

pkgs/applications/misc/nix-tour/default.nix

@@ -2,7 +2,6 @@
 , stdenv
 , fetchFromGitHub
 , electron
-, runtimeShell
 , makeWrapper
 , copyDesktopItems
 , makeDesktopItem

pkgs/applications/misc/opencpn/default.nix

@@ -41,7 +41,6 @@
 , rapidjson
 , sqlite
 , tinyxml
-, udev
 , util-linux
 , wxGTK32
 , xorg

pkgs/applications/misc/pagefind/default.nix

@@ -1,5 +1,4 @@
 { lib
-, callPackage
 , rustPlatform
 , fetchFromGitHub
 , fetchNpmDeps

pkgs/applications/misc/pw-viz/default.nix

@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec {
   env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ];
 
   meta = with lib; {
-    description = "Simple and elegant pipewire graph editor ";
+    description = "Simple and elegant pipewire graph editor";
     homepage = "https://github.com/ax9d/pw-viz";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ figsoda ];

pkgs/applications/misc/q4wine/default.nix

@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, mkDerivation, cmake, sqlite
 , qtbase, qtsvg, qttools, wrapQtAppsHook
 , icoutils # build and runtime deps.
-, wget, fuseiso, wine, sudo, which # runtime deps.
+, wget, fuseiso, wine, which # runtime deps.
 }:
 
 mkDerivation rec {

pkgs/applications/misc/raider/default.nix

@@ -2,8 +2,6 @@
 , blueprint-compiler
 , desktop-file-utils
 , fetchFromGitHub
-, gettext
-, glib
 , gtk4
 , lib
 , libadwaita

pkgs/applications/misc/remarkable/restream/default.nix

@@ -5,7 +5,6 @@
 , fetchFromGitHub
 , openssh
 , netcat
-, makeWrapper
 }:
 
 stdenv.mkDerivation rec {

pkgs/applications/misc/remontoire/default.nix

@@ -7,7 +7,6 @@
 , gtk3
 , json-glib
 , libgee
-, librsvg
 , meson
 , ninja
 , pkg-config

pkgs/applications/misc/schemes/default.nix

@@ -7,7 +7,6 @@
 , gtk4
 , gtksourceview5
 , libadwaita
-, libgee
 , libpanel
 , meson
 , ninja