diff options
author | figsoda <figsoda@pm.me> | 2023-07-26 12:01:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-26 12:01:09 -0400 |
commit | 6bbf5ef59d9d0591c456d720ada9d838a20b90d6 (patch) | |
tree | 1ad2d94fdc8ff2c945131273fa86865f27bfc506 | |
parent | 9a9896271477aac554d602e3d3756ec7f4065ccb (diff) | |
parent | 0d6cac9f5ad3f18cfda8513671eb02b16ce51eb7 (diff) |
Merge pull request #245411 from figsoda/unused-3
19 files changed, 19 insertions, 30 deletions
diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix index 3df316ef9e354..0cbf0f6b106dc 100644 --- a/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/pkgs/tools/nix/cached-nix-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, nix, openssl, pkg-config, ronn, rustPlatform }: +{ lib, fetchFromGitHub, nix, ronn, rustPlatform }: let blake3-src = fetchFromGitHub { diff --git a/pkgs/tools/nix/manix/default.nix b/pkgs/tools/nix/manix/default.nix index 768a283ebd262..6975e61fa6cb2 100644 --- a/pkgs/tools/nix/manix/default.nix +++ b/pkgs/tools/nix/manix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "manix"; diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 785261a8e0925..7fc47ef91a724 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "nixdoc"; diff --git a/pkgs/tools/nix/nixos-install-tools/default.nix b/pkgs/tools/nix/nixos-install-tools/default.nix index 8a00c15d905ca..63f2da0df21c0 100644 --- a/pkgs/tools/nix/nixos-install-tools/default.nix +++ b/pkgs/tools/nix/nixos-install-tools/default.nix @@ -63,7 +63,7 @@ in touch $out ''; }; -}).overrideAttrs (o: { +}).overrideAttrs { inherit version; pname = "nixos-install-tools"; -}) +} diff --git a/pkgs/tools/nix/npins/default.nix b/pkgs/tools/nix/npins/default.nix index 96f2f55488847..b9b589ebd22c5 100644 --- a/pkgs/tools/nix/npins/default.nix +++ b/pkgs/tools/nix/npins/default.nix @@ -1,7 +1,5 @@ { lib , rustPlatform -, fetchFromGitHub -, nix-gitignore , makeWrapper , stdenv , darwin diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index 3fa9528add12b..d11cd16127589 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -17,7 +17,7 @@ let }; # squashfuse adapted to nix from cmake experession in "${appimagekit_src}/lib/libappimage/cmake/dependencies.cmake" - appimagekit_squashfuse = squashfuse.overrideAttrs (attrs: rec { + appimagekit_squashfuse = squashfuse.overrideAttrs rec { pname = "squashfuse"; version = "unstable-2016-10-09"; @@ -61,7 +61,7 @@ let cp -v ./.libs/*.a $out/lib cp -v ./*.h $out/include ''; - }); + }; in stdenv.mkDerivation rec { pname = "appimagekit"; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index dedb57960b35a..27f055c089cb8 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, dysnomia, libintl, libiconv }: +{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, dysnomia, libintl, libiconv }: stdenv.mkDerivation rec { pname = "disnix"; diff --git a/pkgs/tools/package-management/fusesoc/default.nix b/pkgs/tools/package-management/fusesoc/default.nix index 92a8dc1807b98..99926fd5c0471 100644 --- a/pkgs/tools/package-management/fusesoc/default.nix +++ b/pkgs/tools/package-management/fusesoc/default.nix @@ -4,7 +4,6 @@ , verilog , verilator , gnumake -, gcc , edalize , fastjsonschema , pyparsing diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 89a626fef6727..c65b244cb96f9 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -14,7 +14,7 @@ , unstableGitUpdater }: -stdenvNoCC.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation { pname = "home-manager"; version = "2023-05-30"; @@ -89,4 +89,4 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ AndersonTorres ]; }; -}) +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index f55b2bb8688ce..6ff28eb4e6517 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -76,10 +76,10 @@ let aws-sdk-cpp-nix = (aws-sdk-cpp.override { apis = [ "s3" "transfer" ]; customMemoryManagement = false; - }).overrideAttrs (args: { + }).overrideAttrs { # only a stripped down version is build which takes a lot less resources to build requiredSystemFeatures = [ ]; - }); + }; common = args: diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 8e057daaa2a39..dba9d11b47296 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -13,7 +13,7 @@ let # 3. Ansible being unable to upgrade to a later version of resolvelib # see here for more details: https://github.com/NixOS/nixpkgs/pull/155380/files#r786255738 packageOverrides = self: super: { - resolvelib = super.resolvelib.overridePythonAttrs (attrs: rec { + resolvelib = super.resolvelib.overridePythonAttrs rec { version = "1.0.1"; src = fetchFromGitHub { owner = "sarugaku"; @@ -21,7 +21,7 @@ let rev = "/refs/tags/${version}"; hash = "sha256-oxyPn3aFPOyx/2aP7Eg2ThtPbyzrFT1JzWqy6GqNbzM="; }; - }); + }; }; self = python; }; diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 3bef287ccf04f..9ca18b06203df 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -1,6 +1,5 @@ { lib, stdenv , curl -, darwin , hiredis , iptables , jdk @@ -19,7 +18,6 @@ , libsigrok , libvirt , libxml2 -, libapparmor, libcap_ng, numactl , lua , lvm2 , lm_sensors diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 079b6b6943604..d83e4aa383bc6 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchpatch, makeWrapper, coreutils }: +{ lib, stdenv, fetchgit, makeWrapper, coreutils }: stdenv.mkDerivation rec { pname = "datefudge"; diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index c7e25e5785208..1fef47933bb5c 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -1,9 +1,7 @@ { lib, fetchFromGitHub, python3Packages }: let - inherit (python3Packages) python; pname = "honcho"; - in python3Packages.buildPythonApplication rec { diff --git a/pkgs/tools/system/hw-probe/default.nix b/pkgs/tools/system/hw-probe/default.nix index ee538f92668a0..501ae69dbfd2b 100644 --- a/pkgs/tools/system/hw-probe/default.nix +++ b/pkgs/tools/system/hw-probe/default.nix @@ -1,6 +1,5 @@ -{ config +{ lib , stdenv -, lib , fetchFromGitHub , makeWrapper , makePerlPath diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index 0b55c3522fb0b..5a3450df08660 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -1,7 +1,6 @@ -{ fetchFromGitHub -, fetchpatch -, lib +{ lib , rustPlatform +, fetchFromGitHub , withCmd ? false }: diff --git a/pkgs/tools/system/minijail/tools.nix b/pkgs/tools/system/minijail/tools.nix index caaba84c08330..f54e76777612a 100644 --- a/pkgs/tools/system/minijail/tools.nix +++ b/pkgs/tools/system/minijail/tools.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, pkgsBuildTarget, python, minijail }: +{ lib, buildPythonApplication, pkgsBuildTarget, python, minijail }: let targetClang = pkgsBuildTarget.targetPackages.clangStdenv.cc; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 8ccb540e4ec7d..665be5cbabfe4 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub , talloc , pkg-config -, git , ncurses , docutils, swig, python3, coreutils, enablePython ? true }: diff --git a/pkgs/tools/system/s0ix-selftest-tool/default.nix b/pkgs/tools/system/s0ix-selftest-tool/default.nix index 193fbb0aef5fd..f75ba42ac90ae 100644 --- a/pkgs/tools/system/s0ix-selftest-tool/default.nix +++ b/pkgs/tools/system/s0ix-selftest-tool/default.nix @@ -12,7 +12,6 @@ pciutils, powertop, resholve, - stdenv, util-linux, xorg, xxd, |