diff options
-rw-r--r-- | pkgs/tools/admin/awscli/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/admin/azure-cli/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/admin/azure-cli/python-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/admin/credhub-cli/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/admin/cw/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/admin/gixy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/admin/google-cloud-sdk/components.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/admin/google-cloud-sdk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/admin/kics/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/admin/meshcentral/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/admin/ossutil/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/admin/syft/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 1 |
14 files changed, 17 insertions, 21 deletions
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index ac119e7d1c3..dc5b34184ad 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -8,7 +8,7 @@ let py = python3.override { packageOverrides = self: super: { - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + pyyaml = super.pyyaml.overridePythonAttrs rec { version = "5.4.1"; src = fetchFromGitHub { owner = "yaml"; @@ -21,7 +21,7 @@ let PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all runHook postCheck ''; - }); + }; }; self = py; }; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index fcfc16f7e82..786620088a1 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -14,7 +14,7 @@ let # put packages that needs to be overridden in the py package scope py = import ./python-packages.nix { - inherit stdenv lib src version python3 fetchPypi; + inherit stdenv src version python3 fetchPypi; }; in py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 3fbd9e8f1ac..303e0ffacc3 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchPypi, lib, src, version }: +{ stdenv, python3, fetchPypi, src, version }: let buildAzureCliPackage = with py.pkgs; buildPythonPackage; diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index f87723cc310..c2849d6afd4 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "credhub-cli"; diff --git a/pkgs/tools/admin/cw/default.nix b/pkgs/tools/admin/cw/default.nix index 413fad40dcc..1a194136941 100644 --- a/pkgs/tools/admin/cw/default.nix +++ b/pkgs/tools/admin/cw/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cw"; diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index bd216050b20..e8d400d7f66 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -3,7 +3,7 @@ let python = python3.override { packageOverrides = self: super: { - pyparsing = super.pyparsing.overridePythonAttrs (oldAttrs: rec { + pyparsing = super.pyparsing.overridePythonAttrs rec { version = "2.4.7"; src = fetchFromGitHub { owner = "pyparsing"; @@ -14,7 +14,7 @@ let nativeBuildInputs = [ super.setuptools ]; - }); + }; }; }; in diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix index f4e5bca7307..2b25d65a7f2 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -1,12 +1,10 @@ -{ stdenv -, lib -, google-cloud-sdk +{ lib +, stdenv , system , snapshotPath , autoPatchelfHook , python3 , libxcrypt-legacy -, ... }: let @@ -143,7 +141,7 @@ let { url = src; inherit sha256; - }) ; + }); dontUnpack = true; installPhase = '' mkdir -p $out/google-cloud-sdk/.install diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 9401523e345..f354dde039c 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -7,7 +7,7 @@ # 3) used by `google-cloud-sdk` only on GCE guests # -{ stdenv, lib, fetchurl, makeWrapper, nixosTests, python, openssl, jq, callPackage, with-gce ? false }: +{ stdenv, lib, fetchurl, makeWrapper, python, openssl, jq, callPackage, with-gce ? false }: let pythonEnv = python.withPackages (p: with p; [ diff --git a/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix b/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix index 1260f9673a2..c71f23c978b 100644 --- a/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix +++ b/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix @@ -1,4 +1,4 @@ -{ lib, google-cloud-sdk, callPackage, runCommand, components }: +{ lib, google-cloud-sdk, runCommand, components }: comps_: diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index b06c2fde645..e5b4733332c 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , buildGoModule , fetchFromGitHub -, lib , testers , kics }: diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 62e0d302486..5d511368ef1 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs_18, jq, dos2unix }: +{ lib, fetchzip, yarn2nix-moretea, nodejs_18, dos2unix }: yarn2nix-moretea.mkYarnPackage { version = "1.1.6"; diff --git a/pkgs/tools/admin/ossutil/default.nix b/pkgs/tools/admin/ossutil/default.nix index 478c7d46c81..be5f8f91402 100644 --- a/pkgs/tools/admin/ossutil/default.nix +++ b/pkgs/tools/admin/ossutil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { version = "1.7.16"; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 0f2fa51e374..1f03755ef91 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "syft"; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index a405f10671c..d1a0d8cf416 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , xorg , xkeyboard_config , zlib |