From 98f26993f2194fff34acd6c7c96b7df000584474 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 4 Mar 2021 19:54:50 +0700 Subject: [PATCH] treewide: remove stdenv where not needed --- pkgs/applications/misc/prusa-slicer/super-slicer.nix | 2 +- pkgs/applications/networking/bee/bee.nix | 2 +- .../networking/cluster/cloudfoundry-cli/default.nix | 2 +- pkgs/applications/networking/cluster/kube-capacity/default.nix | 2 +- pkgs/build-support/docker/default.nix | 1 - pkgs/build-support/fetchs3/default.nix | 2 +- pkgs/build-support/writers/test.nix | 1 - pkgs/development/compilers/llvm/rocm/default.nix | 2 +- pkgs/development/libraries/vapoursynth/editor.nix | 2 +- pkgs/development/ocaml-modules/mariadb/default.nix | 2 +- pkgs/development/python-modules/protobuf/default.nix | 1 - pkgs/development/python-modules/sphinx-autobuild/default.nix | 1 - pkgs/development/tools/checkmake/default.nix | 2 +- pkgs/development/tools/rust/cargo-valgrind/default.nix | 1 - pkgs/games/dwarf-fortress/legends-browser/default.nix | 2 +- pkgs/misc/documentation-highlighter/default.nix | 2 +- pkgs/servers/monitoring/prometheus/flow-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/smokeping-prober.nix | 2 +- pkgs/tools/networking/chisel/default.nix | 1 - pkgs/tools/networking/getmail6/default.nix | 2 +- pkgs/tools/security/proxmark3/proxmark3-rrg.nix | 2 +- 21 files changed, 15 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 14894159843..6b9b619f40f 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,5 +1,5 @@ { - stdenv, lib, fetchFromGitHub, makeDesktopItem, prusa-slicer + lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }: let appname = "SuperSlicer"; diff --git a/pkgs/applications/networking/bee/bee.nix b/pkgs/applications/networking/bee/bee.nix index 988a322e9f9..b0d05d928c0 100644 --- a/pkgs/applications/networking/bee/bee.nix +++ b/pkgs/applications/networking/bee/bee.nix @@ -1,4 +1,4 @@ -{ version ? "release", stdenv, lib, fetchFromGitHub, buildGoModule, coreutils }: +{ version ? "release", lib, fetchFromGitHub, buildGoModule, coreutils }: let diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index de032cc60e9..a251886ebdd 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchurl, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, fetchurl, installShellFiles }: buildGoModule rec { pname = "cloudfoundry-cli"; diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index 08dfa8bcdf0..78cbaca80ab 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kube-capacity"; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index c4e266d6c5d..da3e7b96010 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -21,7 +21,6 @@ runtimeShell, shadow, skopeo, - stdenv, storeDir ? builtins.storeDir, substituteAll, symlinkJoin, diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index 8c551c20aa0..acad0749b66 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, runCommand, awscli }: +{ lib, runCommand, awscli }: { s3url , name ? builtins.baseNameOf s3url diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 7b7a698376a..a3f15ffe366 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -7,7 +7,6 @@ python2Packages, python3Packages, runCommand, - stdenv, writers, writeText }: diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index 54a7733f4ba..5f9dba0fc3c 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, callPackage, wrapCCWith }: +{ lib, fetchFromGitHub, callPackage, wrapCCWith }: let version = "4.0.1"; diff --git a/pkgs/development/libraries/vapoursynth/editor.nix b/pkgs/development/libraries/vapoursynth/editor.nix index 26a1a6d6808..5cd4b4608ec 100644 --- a/pkgs/development/libraries/vapoursynth/editor.nix +++ b/pkgs/development/libraries/vapoursynth/editor.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand +{ lib, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand , python3, vapoursynth , qmake, qtbase, qtwebsockets }: diff --git a/pkgs/development/ocaml-modules/mariadb/default.nix b/pkgs/development/ocaml-modules/mariadb/default.nix index ed3e5999b41..2c3c7c423ac 100644 --- a/pkgs/development/ocaml-modules/mariadb/default.nix +++ b/pkgs/development/ocaml-modules/mariadb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildOasisPackage +{ lib, fetchFromGitHub, buildOasisPackage , ctypes, mariadb, libmysqlclient }: buildOasisPackage rec { diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index aa4d00892dd..60c6f333275 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -1,6 +1,5 @@ { buildPackages , lib -, stdenv , fetchpatch , python , buildPythonPackage diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix index 958c1a6b19c..739ea2afa82 100644 --- a/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , sphinx diff --git a/pkgs/development/tools/checkmake/default.nix b/pkgs/development/tools/checkmake/default.nix index c48dbe68023..3c21af8ff38 100644 --- a/pkgs/development/tools/checkmake/default.nix +++ b/pkgs/development/tools/checkmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, git, pandoc, lib }: +{ buildGoPackage, fetchFromGitHub, git, pandoc, lib }: buildGoPackage rec { pname = "checkmake"; diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix index 50cffe74848..1c1a4c32c62 100644 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , nix-update-script diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/pkgs/games/dwarf-fortress/legends-browser/default.nix index 1efae4d2802..2a3da233b45 100644 --- a/pkgs/games/dwarf-fortress/legends-browser/default.nix +++ b/pkgs/games/dwarf-fortress/legends-browser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, buildEnv, writeShellScriptBin, fetchurl, jre }: +{ lib, buildEnv, writeShellScriptBin, fetchurl, jre }: let name = "legends-browser-${version}"; diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix index 022cc4aa834..2a34e36742d 100644 --- a/pkgs/misc/documentation-highlighter/default.nix +++ b/pkgs/misc/documentation-highlighter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommand }: +{ lib, runCommand }: runCommand "documentation-highlighter" { meta = { description = "Highlight.js sources for the Nix Ecosystem's documentation"; diff --git a/pkgs/servers/monitoring/prometheus/flow-exporter.nix b/pkgs/servers/monitoring/prometheus/flow-exporter.nix index 4b2e76f7043..c4b9f06fdde 100644 --- a/pkgs/servers/monitoring/prometheus/flow-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/flow-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "flow-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index b1c3bc6999f..d21ddcf5647 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: let baseVersion = "0.3.1"; diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/tools/networking/chisel/default.nix index 8533958ac2b..5d82a549e88 100644 --- a/pkgs/tools/networking/chisel/default.nix +++ b/pkgs/tools/networking/chisel/default.nix @@ -1,7 +1,6 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv }: buildGoModule rec { diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix index 40be3d2944a..90f969f2d76 100644 --- a/pkgs/tools/networking/getmail6/default.nix +++ b/pkgs/tools/networking/getmail6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, lib }: +{ fetchFromGitHub, python3Packages, lib }: python3Packages.buildPythonApplication rec { pname = "getmail6"; diff --git a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix index 04def66d03c..2ae34439472 100644 --- a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix +++ b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 +{ lib, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 , readline , hardwarePlatform ? "PM3RDV4"