diff options
Diffstat (limited to 'pkgs')
70 files changed, 52 insertions, 97 deletions
diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index 953989db2ec4b..6436e692ae441 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl , cmake, pkg-config, perl, go, python3 , protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2 }: diff --git a/pkgs/tools/misc/arch-install-scripts/default.nix b/pkgs/tools/misc/arch-install-scripts/default.nix index 50510512dc9c7..a872683092526 100644 --- a/pkgs/tools/misc/arch-install-scripts/default.nix +++ b/pkgs/tools/misc/arch-install-scripts/default.nix @@ -7,7 +7,6 @@ , gawk , gnugrep , gnum4 -, makeWrapper , pacman , util-linux , chrootPath ? [ diff --git a/pkgs/tools/misc/asdf-vm/default.nix b/pkgs/tools/misc/asdf-vm/default.nix index 1341207a83bc1..092607f8cbe59 100644 --- a/pkgs/tools/misc/asdf-vm/default.nix +++ b/pkgs/tools/misc/asdf-vm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, installShellFiles, bash, coreutils, curl, git, writeScript }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, installShellFiles, bash, curl, git, writeScript }: let asdfReshimFile = writeScript "asdf-reshim" '' diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index 424497ee182b7..e1bb2f0841108 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, bash }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { pname = "autojump"; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 51654320e0cd5..efcf679c19947 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper -, ncurses, python3, perl, textual-window-manager +, python3, perl, textual-window-manager , gettext, vim, bc, screen }: let diff --git a/pkgs/tools/misc/cfonts/default.nix b/pkgs/tools/misc/cfonts/default.nix index d04e88bded842..a4faf4866585e 100644 --- a/pkgs/tools/misc/cfonts/default.nix +++ b/pkgs/tools/misc/cfonts/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchCrate }: diff --git a/pkgs/tools/misc/cope/default.nix b/pkgs/tools/misc/cope/default.nix index ffa25ba9530b1..9facf9816b626 100644 --- a/pkgs/tools/misc/cope/default.nix +++ b/pkgs/tools/misc/cope/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, perl, perlPackages, makeWrapper, }: +{ lib, fetchFromGitHub, perl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "cope"; diff --git a/pkgs/tools/misc/coreboot-configurator/default.nix b/pkgs/tools/misc/coreboot-configurator/default.nix index 87c4573e95eb1..9d61b795ce541 100644 --- a/pkgs/tools/misc/coreboot-configurator/default.nix +++ b/pkgs/tools/misc/coreboot-configurator/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , inkscape , meson diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index a1b64442c0bcc..58f6d0ef7ceb1 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }: +{ lib, stdenv, fetchurl, autoreconfHook, tzdata }: stdenv.mkDerivation rec { version = "0.4.10"; diff --git a/pkgs/tools/misc/depotdownloader/default.nix b/pkgs/tools/misc/depotdownloader/default.nix index 9e0263013e684..419b58bfa722c 100644 --- a/pkgs/tools/misc/depotdownloader/default.nix +++ b/pkgs/tools/misc/depotdownloader/default.nix @@ -1,7 +1,6 @@ -{ stdenv -, lib -, fetchFromGitHub +{ lib , buildDotnetModule +, fetchFromGitHub }: buildDotnetModule rec { diff --git a/pkgs/tools/misc/dgoss/default.nix b/pkgs/tools/misc/dgoss/default.nix index d33b17cfe550c..66474c88f5e74 100644 --- a/pkgs/tools/misc/dgoss/default.nix +++ b/pkgs/tools/misc/dgoss/default.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , resholve -, substituteAll , bash , coreutils , goss diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 9c8e33d182de5..d4e8c538b8e70 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , abootimg -, acl , apksigcopier , apksigner , apktool diff --git a/pkgs/tools/misc/dotter/default.nix b/pkgs/tools/misc/dotter/default.nix index ce92e18da224e..6bf8982c8655c 100644 --- a/pkgs/tools/misc/dotter/default.nix +++ b/pkgs/tools/misc/dotter/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchFromGitHub , nix-update-script , rustPlatform diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index 66d5544de88b3..e5dcb85cacb0a 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -1,10 +1,7 @@ { lib -, stdenv , fetchFromGitHub , buildGoModule -, runCommand , nix-update-script -, fetchurl , testers , python3 , curl diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index 249db52b1b2ba..f12d5a09f2367 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -4,7 +4,7 @@ , unstableGitUpdater }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "edid-decode"; version = "unstable-2022-12-14"; @@ -34,4 +34,4 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ Madouura ]; platforms = platforms.all; }; -}) +} diff --git a/pkgs/tools/misc/enumer/default.nix b/pkgs/tools/misc/enumer/default.nix index 0b2cd46463b30..1eea3c699416c 100644 --- a/pkgs/tools/misc/enumer/default.nix +++ b/pkgs/tools/misc/enumer/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromGitHub , buildGoModule +, fetchFromGitHub }: buildGoModule rec { diff --git a/pkgs/tools/misc/esptool/3.nix b/pkgs/tools/misc/esptool/3.nix index dcf30ea743df3..a0b13ece16468 100644 --- a/pkgs/tools/misc/esptool/3.nix +++ b/pkgs/tools/misc/esptool/3.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, python3, openssl }: +{ lib, fetchFromGitHub, fetchpatch, python3 }: python3.pkgs.buildPythonApplication rec { pname = "esptool"; diff --git a/pkgs/tools/misc/flitter/default.nix b/pkgs/tools/misc/flitter/default.nix index 34ae369350f92..5df3d168a9b0a 100644 --- a/pkgs/tools/misc/flitter/default.nix +++ b/pkgs/tools/misc/flitter/default.nix @@ -1,12 +1,11 @@ { lib -, stdenv , ocamlPackages , fetchFromGitHub , makeWrapper , python3 }: -ocamlPackages.buildDunePackage rec { +ocamlPackages.buildDunePackage { pname = "flitter"; # request to tag releases: https://github.com/alexozer/flitter/issues/34 version = "unstable-2020-10-05"; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index f82da495662a0..c6e939d5b505f 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchpatch, fetchFromGitHub, lib -, cmake, perl, uthash, pkg-config, gettext +{ stdenv, fetchFromGitHub, lib +, cmake, uthash, pkg-config , python, freetype, zlib, glib, giflib, libpng, libjpeg, libtiff, libxml2, cairo, pango , readline, woff2, zeromq , withSpiro ? false, libspiro diff --git a/pkgs/tools/misc/gazelle-origin/default.nix b/pkgs/tools/misc/gazelle-origin/default.nix index 800904e909c57..19955c56d02c9 100644 --- a/pkgs/tools/misc/gazelle-origin/default.nix +++ b/pkgs/tools/misc/gazelle-origin/default.nix @@ -4,7 +4,6 @@ , bencoder , pyyaml , requests -, setuptools }: buildPythonApplication rec { pname = "gazelle-origin"; diff --git a/pkgs/tools/misc/gwe/default.nix b/pkgs/tools/misc/gwe/default.nix index 2d1c127dc8ab0..7e68790b2dc9c 100644 --- a/pkgs/tools/misc/gwe/default.nix +++ b/pkgs/tools/misc/gwe/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitLab , wrapGAppsHook -, makeWrapper , pkg-config , meson , ninja diff --git a/pkgs/tools/misc/h/default.nix b/pkgs/tools/misc/h/default.nix index 7a7ac20025444..8f44ed1b210bf 100644 --- a/pkgs/tools/misc/h/default.nix +++ b/pkgs/tools/misc/h/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, ruby }: +{ lib, stdenv, fetchFromGitHub, ruby }: stdenv.mkDerivation rec { pname = "h"; diff --git a/pkgs/tools/misc/handlr-regex/default.nix b/pkgs/tools/misc/handlr-regex/default.nix index 5a52f63f0cc4f..15b993564ee42 100644 --- a/pkgs/tools/misc/handlr-regex/default.nix +++ b/pkgs/tools/misc/handlr-regex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, shared-mime-info, libiconv, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, shared-mime-info, libiconv, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "handlr-regex"; diff --git a/pkgs/tools/misc/haste-client/default.nix b/pkgs/tools/misc/haste-client/default.nix index 0005e94fe05c4..905d4bedf5460 100644 --- a/pkgs/tools/misc/haste-client/default.nix +++ b/pkgs/tools/misc/haste-client/default.nix @@ -1,10 +1,8 @@ { lib , bundlerApp -, buildRubyGem -, ruby }: -bundlerApp rec { +bundlerApp { pname = "haste"; gemdir = ./.; exes = [ "haste" ]; diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix index 1ff4b392d769e..dcfcf4a6a5446 100644 --- a/pkgs/tools/misc/hdf5/1.10.nix +++ b/pkgs/tools/misc/hdf5/1.10.nix @@ -9,7 +9,7 @@ , jdk }: -let inherit (lib) optional optionals; in +let inherit (lib) optional; in stdenv.mkDerivation rec { version = "1.10.9"; diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index e2228df32302d..c4cb324a2b27f 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ant, jdk, nettools, hdf4, hdf5, makeDesktopItem, copyDesktopItems }: +{ lib, stdenv, fetchurl, ant, jdk, hdf4, hdf5, makeDesktopItem, copyDesktopItems }: stdenv.mkDerivation rec { pname = "hdfview"; diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index 59646ef72df3c..40fc9a2cab483 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, pkgs }: buildGoModule rec { diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 51548f5822a58..828f0d80c11c4 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchurl, lib, - extra-cmake-modules, kdoctools, wrapGAppsHook, + extra-cmake-modules, kdoctools, kconfig, kcrash, kinit }: diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index 5a1d87a53f846..37b0edcf982b0 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, makeWrapper, perl, procps, file, gnused, bash }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, procps, file, gnused, bash }: stdenv.mkDerivation rec { pname = "lesspipe"; diff --git a/pkgs/tools/misc/license-cli/default.nix b/pkgs/tools/misc/license-cli/default.nix index 586ef7508f4dd..bd90516daa200 100644 --- a/pkgs/tools/misc/license-cli/default.nix +++ b/pkgs/tools/misc/license-cli/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromSourcehut , rustPlatform , installShellFiles diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix index 8a81286eebbe6..2972eb8bbb61b 100644 --- a/pkgs/tools/misc/licensor/default.nix +++ b/pkgs/tools/misc/licensor/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , rustPlatform }: diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index b03ac6c785fe2..95d8f9e3bb7b9 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, glib, readline -, bison, flex, pkg-config, autoreconfHook, libxslt, makeWrapper +, bison, flex, pkg-config, autoreconfHook , txt2man, which }: diff --git a/pkgs/tools/misc/melody/default.nix b/pkgs/tools/misc/melody/default.nix index 4633d66eebf44..d17f8ef6f083b 100644 --- a/pkgs/tools/misc/melody/default.nix +++ b/pkgs/tools/misc/melody/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchCrate, rustPlatform }: +{ lib, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "melody"; diff --git a/pkgs/tools/misc/mpy-utils/default.nix b/pkgs/tools/misc/mpy-utils/default.nix index ea816126858bd..0ee7701b730bf 100644 --- a/pkgs/tools/misc/mpy-utils/default.nix +++ b/pkgs/tools/misc/mpy-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3, buildPythonApplication, fetchPypi, fusepy, pyserial }: +{ stdenv, lib, buildPythonApplication, fetchPypi, fusepy, pyserial }: buildPythonApplication rec { pname = "mpy-utils"; diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index aa808612a849c..6918e8fe3ecf0 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config, cmake }: +{ lib, stdenv, fetchFromGitHub, ncurses, pkg-config, cmake }: stdenv.mkDerivation rec { version = "7.0.0"; diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/tools/misc/mutagen-compose/default.nix index ed6aaaac334df..5b379b2773f42 100644 --- a/pkgs/tools/misc/mutagen-compose/default.nix +++ b/pkgs/tools/misc/mutagen-compose/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, fetchzip }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "mutagen-compose"; diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 3e17dada1eb39..5cfdff54a708c 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, fetchzip }: +{ lib, buildGoModule, fetchFromGitHub, fetchzip }: buildGoModule rec { pname = "mutagen"; diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix index 54416bb29da92..4a115499d7a23 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -9,7 +9,6 @@ , gsettings-desktop-schemas , gtk3 , python3 -, substituteAll , wrapGAppsHook }: diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/tools/misc/nncp/default.nix index e91ccf6f33ddb..f859345e0e47a 100644 --- a/pkgs/tools/misc/nncp/default.nix +++ b/pkgs/tools/misc/nncp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, go, fetchurl, redo-apenwarr, curl, perl, genericUpdater -, writeShellScript, nixosTests, cfgPath ? "/etc/nncp.hjson" }: +, writeShellScript, cfgPath ? "/etc/nncp.hjson" }: stdenv.mkDerivation rec { pname = "nncp"; diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index 25239554bf2b5..a6a4e7c188928 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -18,14 +18,14 @@ let ntfy-webpush = self.callPackage ./webpush.nix { }; # databases, on which slack-sdk depends, is incompatible with SQLAlchemy 2.0 - sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { + sqlalchemy = super.sqlalchemy.overridePythonAttrs rec { version = "1.4.46"; src = fetchPypi { pname = "SQLAlchemy"; inherit version; hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; }; - }); + }; }; }; in python.pkgs.buildPythonApplication rec { diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 2ed19e4760237..3662c9793c430 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -2,11 +2,9 @@ , stdenv , autoconf , automake -, bash , curl , fetchFromGitHub , fetchMavenArtifact -, fetchurl , fetchpatch , git , jdk8 diff --git a/pkgs/tools/misc/oscclip/default.nix b/pkgs/tools/misc/oscclip/default.nix index ea715fe934ecb..6c68c4a6f24a0 100644 --- a/pkgs/tools/misc/oscclip/default.nix +++ b/pkgs/tools/misc/oscclip/default.nix @@ -1,8 +1,6 @@ -{ fetchFromGitHub +{ lib , python3Packages -, stdenv -, writeText -, lib +, fetchFromGitHub }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 013c5d72f8c8b..12d0cf0bee1c5 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -13,7 +13,6 @@ , luajit , libosmium , protozero -, rapidjson , testers }: diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index ea1b04de25cc0..c8485d4a2fa45 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , substituteAll , pkg-config , gtk-doc @@ -38,9 +37,9 @@ }: let - testPython = (python3.withPackages (p: with p; [ + testPython = python3.withPackages (p: with p; [ pyyaml - ])); + ]); in stdenv.mkDerivation rec { pname = "ostree"; version = "2023.2"; diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/tools/misc/otel-cli/default.nix index 992dd9c71d165..25c57be9664c5 100644 --- a/pkgs/tools/misc/otel-cli/default.nix +++ b/pkgs/tools/misc/otel-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, bash, buildGoModule, fetchFromGitHub, getent, coreutils, nix-update-script, stdenv }: +{ lib, buildGoModule, fetchFromGitHub, getent, coreutils, nix-update-script, stdenv }: buildGoModule rec { pname = "otel-cli"; diff --git a/pkgs/tools/misc/pandoc-drawio-filter/default.nix b/pkgs/tools/misc/pandoc-drawio-filter/default.nix index 73dd658dfb161..f868b36a5b254 100644 --- a/pkgs/tools/misc/pandoc-drawio-filter/default.nix +++ b/pkgs/tools/misc/pandoc-drawio-filter/default.nix @@ -5,10 +5,7 @@ , pandoc , pandocfilters , runCommand -, runtimeShell , texlive -, writeScriptBin -, xvfb-run }: let diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 1db73c2594335..f1ed977e9a60c 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , lvm2 , libuuid , gettext diff --git a/pkgs/tools/misc/pcb2gcode/default.nix b/pkgs/tools/misc/pcb2gcode/default.nix index 7d371cc6e1838..2db24a46bfe09 100644 --- a/pkgs/tools/misc/pcb2gcode/default.nix +++ b/pkgs/tools/misc/pcb2gcode/default.nix @@ -8,7 +8,6 @@ , gtkmm2 , gerbv , librsvg -, bash }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/pmbootstrap/default.nix b/pkgs/tools/misc/pmbootstrap/default.nix index ab30518ffd897..d982e94403c1c 100644 --- a/pkgs/tools/misc/pmbootstrap/default.nix +++ b/pkgs/tools/misc/pmbootstrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, git, openssl, makeWrapper, buildPythonApplication, pytestCheckHook, ps +{ stdenv, lib, git, openssl, buildPythonApplication, pytestCheckHook, ps , fetchPypi, fetchFromGitLab, sudo }: buildPythonApplication rec { diff --git a/pkgs/tools/misc/pouf/default.nix b/pkgs/tools/misc/pouf/default.nix index d9a4004110333..6b4f812bf3b27 100644 --- a/pkgs/tools/misc/pouf/default.nix +++ b/pkgs/tools/misc/pouf/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromGitHub , rustPlatform +, fetchFromGitHub }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/misc/r3ctl/default.nix b/pkgs/tools/misc/r3ctl/default.nix index 4821434e3e23b..f76f704fc2a78 100644 --- a/pkgs/tools/misc/r3ctl/default.nix +++ b/pkgs/tools/misc/r3ctl/default.nix @@ -1,15 +1,13 @@ { lib , qt5 , qtbase -, qtsvg -, qtx11extras , qttools , qtwebsockets , qtmultimedia , fetchFromGitHub }: -qt5.mkDerivation rec { +qt5.mkDerivation { pname = "r3ctl"; version = "a82cb5b3123224e706835407f21acea9dc7ab0f0"; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index a11a59fade2b1..945e592e848a3 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchurl , tk , tcllib @@ -8,7 +7,7 @@ }: let - inherit (lib) optional optionals optionalString; + inherit (lib) optionals optionalString; tclLibraries = optionals tkremind [ tcllib tk ]; tkremindPatch = optionalString tkremind '' substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish" diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index e3969d01eec3e..121e574358e6f 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , cairo , fetchFromGitHub -, gettext , glib , gobject-introspection , gtksourceview3 diff --git a/pkgs/tools/misc/sensible-utils/default.nix b/pkgs/tools/misc/sensible-utils/default.nix index f6e8d95f5cd30..d585632810f4f 100644 --- a/pkgs/tools/misc/sensible-utils/default.nix +++ b/pkgs/tools/misc/sensible-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitLab, makeWrapper, bash }: +{ stdenv, lib, fetchFromGitLab, makeWrapper }: stdenv.mkDerivation rec { pname = "sensible-utils"; diff --git a/pkgs/tools/misc/snore/default.nix b/pkgs/tools/misc/snore/default.nix index 0e1636bced412..a5351794acf7c 100644 --- a/pkgs/tools/misc/snore/default.nix +++ b/pkgs/tools/misc/snore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "0.3.1"; diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix index 0a3806415bf79..2f89b8c36223b 100644 --- a/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -11,7 +11,7 @@ let py = python3.override { packageOverrides = self: super: { # sqlite3-to-mysql is incompatible with versions > 1.4.44 of sqlalchemy - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + sqlalchemy = super.sqlalchemy.overridePythonAttrs rec { version = "1.4.44"; format = "setuptools"; src = fetchPypi { @@ -19,7 +19,7 @@ let inherit version; hash = "sha256-LdpflnGa6Js+wPG3lpjYbrmuyx1U6ZCrs/3ZLAS0apA="; }; - }); + }; }; self = py; }; diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index d414d36070bda..72d3e64214d90 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl -, dpkg, patchelf, wrapGAppsHook +, dpkg, wrapGAppsHook , hicolor-icon-theme , gtk3, glib, systemd , xorg, nss, nspr diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index e903b064d0223..0c43ac74ec079 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "steampipe"; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index aafdfe07ff9b0..c8d3df4e2b27a 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkg-config, glib, xmlto, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, udev, intltool, pkg-config, glib, xmlto, wrapGAppsHook , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , gobject-introspection, libsecret, packagekit diff --git a/pkgs/tools/misc/todo/default.nix b/pkgs/tools/misc/todo/default.nix index dc63a1c04b6a7..6b6c858490a16 100644 --- a/pkgs/tools/misc/todo/default.nix +++ b/pkgs/tools/misc/todo/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, stdenv, openssl }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "todo"; diff --git a/pkgs/tools/misc/twitch-dl/default.nix b/pkgs/tools/misc/twitch-dl/default.nix index dd24c1c64447d..e42e26a989aa7 100644 --- a/pkgs/tools/misc/twitch-dl/default.nix +++ b/pkgs/tools/misc/twitch-dl/default.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , python3Packages -, ffmpeg , installShellFiles , scdoc }: diff --git a/pkgs/tools/misc/ugs/default.nix b/pkgs/tools/misc/ugs/default.nix index 8ee88c61e0d42..4350c23ac773d 100644 --- a/pkgs/tools/misc/ugs/default.nix +++ b/pkgs/tools/misc/ugs/default.nix @@ -5,7 +5,6 @@ , makeWrapper , jre , fetchzip -, bash }: let desktopItem = makeDesktopItem { diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 4630ec31ebbae..33a738f1643c2 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,14 +1,11 @@ { lib , stdenv , fetchurl -, autoconf -, automake , autoreconfHook , gettext , libftdi1 , libtool , libusb-compat-0_1 -, makeWrapper , pkg-config , readline , which diff --git a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix index 1c7dfd20330cb..a018604a84fce 100644 --- a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix +++ b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, gnumake, qmake }: +{ lib, mkDerivation, fetchFromGitHub, qmake }: mkDerivation rec { pname = "veikk-linux-driver-gui"; diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix index c77f623c5dcd3..a610a461656cc 100644 --- a/pkgs/tools/misc/vimpager/build.nix +++ b/pkgs/tools/misc/vimpager/build.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , coreutils , sharutils -, runtimeShell , version , sha256 }: diff --git a/pkgs/tools/misc/waylevel/default.nix b/pkgs/tools/misc/waylevel/default.nix index f02ada3ab8640..78ebcf6c5a6e8 100644 --- a/pkgs/tools/misc/waylevel/default.nix +++ b/pkgs/tools/misc/waylevel/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromSourcehut -, makeWrapper , rustPlatform , wayland }: diff --git a/pkgs/tools/misc/writedisk/default.nix b/pkgs/tools/misc/writedisk/default.nix index 5fb958f3f0efa..cbceb9b7cb108 100644 --- a/pkgs/tools/misc/writedisk/default.nix +++ b/pkgs/tools/misc/writedisk/default.nix @@ -2,7 +2,6 @@ , rustPlatform , fetchCrate , pkg-config -, stdenv }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 9acd4c442a7bc..a9ec5d5d0eeb7 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook -, xflux, librsvg, gtk3, gobject-introspection, pango, gdk-pixbuf, atk +, xflux, gtk3, gobject-introspection, pango, gdk-pixbuf, atk , pexpect, pygobject3, pyxdg, libappindicator-gtk3 }: buildPythonApplication rec { diff --git a/pkgs/tools/misc/xq/default.nix b/pkgs/tools/misc/xq/default.nix index d7464c25cb6e0..c02321a6a7c39 100644 --- a/pkgs/tools/misc/xq/default.nix +++ b/pkgs/tools/misc/xq/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchCrate -, stdenv }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/misc/ytarchive/default.nix b/pkgs/tools/misc/ytarchive/default.nix index cf3652fbec60a..67698c4fdc6bb 100644 --- a/pkgs/tools/misc/ytarchive/default.nix +++ b/pkgs/tools/misc/ytarchive/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, makeBinaryWrapper, ffmpeg }: +{ lib, buildGoModule, fetchFromGitHub, makeBinaryWrapper, ffmpeg }: buildGoModule rec { pname = "ytarchive"; |