Merge pull request #166605 from siraben/remove-redundant-stdenv

This commit is contained in:
Artturi 2022-04-22 20:25:38 +03:00 committed by GitHub
commit 785373a76f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
74 changed files with 89 additions and 151 deletions

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }:
{ lib, stdenv, fetchurl, makeWrapper, bc, findutils, flac, lame, opusTools, procps, sox }:
stdenv.mkDerivation rec {
pname = "caudec";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
patchShebangs ./install.sh
'';
nativeBuildInputs = [ bash makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
./install.sh --prefix=$out/bin

View file

@ -10,7 +10,6 @@
, writeScript
, bash
, tor
, gnutar
, zip
, xz
}:
@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
sha256 = "09bpkmn22kal3cxg8sil02wy2f2gplsbdkp4viagn0jppma02jid";
};
nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg gnutar zip xz ];
nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ];
desktopItems = [
(makeDesktopItem {

View file

@ -95,7 +95,6 @@ in stdenv.mkDerivation (rec {
clang
makeWrapper
nodePackages.esy
bash
perl
which
nasm

View file

@ -43,7 +43,6 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
};
}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {
nativeBuildInputs = nativeBuildInputs ++ [
bash
jq
autoPatchelfHook
makeWrapper

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool
, gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida
, wrapGAppsHook, fetchpatch, bash, doxygen
, wrapGAppsHook, fetchpatch, doxygen
, nix-update-script
}:
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs =
[ pkg-config autoconf automake gettext intltool
wrapGAppsHook bash doxygen
wrapGAppsHook doxygen
];
buildInputs = [

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }:
{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb-compat-0_1 }:
let
myPatchElf = file: with lib; ''
patchelf --set-interpreter \
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
tar xfvz data.tar.gz
'';
nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ];
nativeBuildInputs = [ makeWrapper patchelf udevRules ];
buildInputs = [ libusb-compat-0_1 ];
dontBuild = true;

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb1, avahi-compat, glib, libredirect, nixosTests }:
{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }:
let
myPatchElf = file: with lib; ''
patchelf --set-interpreter \
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
tar xfv data.tar.xz
'';
nativeBuildInputs = [ makeWrapper patchelf coreutils ];
nativeBuildInputs = [ makeWrapper patchelf ];
buildInputs = [ libusb1 avahi-compat stdenv.cc.cc glib ];
dontBuild = true;

View file

@ -1,4 +1,4 @@
{ version ? "release", lib, fetchFromGitHub, buildGoModule, coreutils }:
{ version ? "release", lib, fetchFromGitHub, buildGoModule }:
let
@ -39,8 +39,6 @@ buildGoModule {
inherit (versionSpec) rev sha256;
};
nativeBuildInputs = [ coreutils ];
subPackages = [ "cmd/bee" ];
# no symbol table, no debug info, and pass the commit for the version string

View file

@ -7,7 +7,7 @@
# Native build inputs:
, ninja, pkg-config
, python3, perl
, gnutar, which
, which
, llvmPackages
# postPatch:
, pkgsBuildHost
@ -133,7 +133,7 @@ let
nativeBuildInputs = [
ninja pkg-config
python3WithPackages perl
gnutar which
which
llvmPackages.bintools
];

View file

@ -24,7 +24,6 @@
# build time
, autoconf
, cargo
, gnused
, makeWrapper
, nodejs
, perl
@ -208,7 +207,6 @@ buildStdenv.mkDerivation ({
nativeBuildInputs = [
autoconf
cargo
gnused
llvmPackages.llvm # llvm-objdump
makeWrapper
nodejs

View file

@ -13,7 +13,6 @@
, ffmpeg
, gdk-pixbuf
, glib
, gnused
, graphviz
, gtk2
, intltool
@ -120,7 +119,6 @@ mkDerivation rec {
nativeBuildInputs = [
bcunit
cmake
gnused
graphviz
intltool
makeWrapper

View file

@ -6,7 +6,6 @@
, dbus
, sqlite
, file
, gzip
, makeWrapper
, notmuch
# Build with support for notmuch backend
@ -25,7 +24,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-ZE653OtXyZ9454bKPApmuL2kVko/hGBWEAya1L1KIoc=";
nativeBuildInputs = [ pkg-config gzip makeWrapper ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }:
{ lib, stdenv, fetchFromGitHub, mercury, pandoc, ncurses, gpgme }:
stdenv.mkDerivation rec {
pname = "notmuch-bower";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0r5s16pc3ym5nd33lv9ljv1p1gpb7yysrdni4g7w7yvjrnwk35l6";
};
nativeBuildInputs = [ gawk mercury pandoc ];
nativeBuildInputs = [ mercury pandoc ];
buildInputs = [ ncurses gpgme ];

View file

@ -2,7 +2,6 @@
, stdenv
, fetchFromGitHub
, appstream
, bash
, coreutils
, curl
, desktop-file-utils
@ -40,7 +39,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
bash
meson
ninja
pkg-config

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python3Packages, zlib, bash, coreutils }:
{ lib, stdenv, fetchurl, python3Packages, zlib, bash }:
let
pythonPackages = python3Packages;
@ -16,8 +16,6 @@ pythonPackages.buildPythonApplication rec {
pythonPath = with pythonPackages; [ simplejson joblib setuptools matplotlib ];
nativeBuildInputs = [ coreutils ];
buildInputs = [ zlib ] ++ pythonPath;
dontConfigure = true;

View file

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, last, exonerate, minia, python3, bwa
, samtools, findutils }:
, samtools }:
python3.pkgs.buildPythonApplication rec {
pname = "tebreak";
@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "13mgh775d8hkl340923lfwwm4r5ps70girn8d6wgfxzwzxylz8iz";
};
nativeBuildInputs = [ findutils python3.pkgs.cython ];
nativeBuildInputs = [ python3.pkgs.cython ];
propagatedBuildInputs = with python3.pkgs; [
pysam
scipy

View file

@ -6,7 +6,6 @@
, nixosTests
, cmake
, gzip
, installShellFiles
, makeWrapper
, ncurses
@ -68,7 +67,6 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
cmake
gzip
installShellFiles
makeWrapper
ncurses

View file

@ -4,7 +4,6 @@
, alsa-lib
, autoPatchelfHook
, binutils-unwrapped
, gnutar
, libav_0_8
, libnotify
, libresample
@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoPatchelfHook
binutils-unwrapped
gnutar
rpmextract
unzip
];

View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
, pkg-config, cmake, gnumake, yasm, python3Packages
, pkg-config, cmake, yasm, python3Packages
, libgcrypt, libgpg-error, libunistring
, boost, avahi, lame
, gettext, pcre-cpp, yajl, fribidi, which
@ -160,7 +160,7 @@ in stdenv.mkDerivation {
doxygen
makeWrapper
which
pkg-config gnumake
pkg-config
autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
jre_headless yasm gettext python3Packages.python flatbuffers

View file

@ -10,7 +10,6 @@
, appstream-glib
, pkg-config
, txt2man
, gzip
, vala
, wrapGAppsHook
, gsettings-desktop-schemas
@ -50,7 +49,6 @@ stdenv.mkDerivation rec {
appstream-glib
desktop-file-utils
gettext
gzip
meson
ninja
libxml2

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gnumake,
{ lib, stdenv, fetchFromGitHub,
libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }:
stdenv.mkDerivation {
pname = "wmfs";
@ -12,10 +12,6 @@ stdenv.mkDerivation {
rev = "b7b8ff812d28c79cb22a73db2739989996fdc6c2";
};
nativeBuildInputs = [
gnumake
];
buildInputs = [
imlib2
libX11

View file

@ -8,7 +8,6 @@
, fakechroot
, fakeNss
, fakeroot
, findutils
, go
, jq
, jshon
@ -556,7 +555,7 @@ rec {
};
result = runCommand "docker-image-${baseName}.tar.gz"
{
nativeBuildInputs = [ jshon pigz coreutils findutils jq moreutils ];
nativeBuildInputs = [ jshon pigz jq moreutils ];
# Image name must be lowercase
imageName = lib.toLower name;
imageTag = if tag == null then "" else tag;

View file

@ -1,4 +1,4 @@
{stdenv, lib, coreutils, unzip, jq, zip, fetchurl,writeScript, ...}:
{stdenv, unzip, jq, zip, fetchurl,writeScript, ...}:
{
name
@ -40,5 +40,5 @@ stdenv.mkDerivation {
zip -r -q -FS "$out/$UUID.xpi" *
rm -r "$out/$UUID"
'';
nativeBuildInputs = [ coreutils unzip zip jq ];
nativeBuildInputs = [ unzip zip jq ];
}

View file

@ -1,4 +1,4 @@
{ stdenv, gnutar, findutils, fetchurl, ... }:
{ stdenv, fetchurl, ... }:
{ name
, url
, version
@ -13,11 +13,6 @@ stdenv.mkDerivation {
inherit url sha256;
};
nativeBuildInputs = [
gnutar
findutils
];
unpackPhase = ''
tar -xzpf $src
'';

View file

@ -1,4 +1,4 @@
{ pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gawk, gnused, gixy }:
{ pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy }:
let
aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {};
@ -205,7 +205,7 @@ let
writeNginxConfig = name: text: pkgs.runCommandLocal name {
inherit text;
passAsFile = [ "text" ];
nativeBuildInputs = [ gawk gnused gixy ];
nativeBuildInputs = [ gixy ];
} /* sh */ ''
# nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16
awk -f ${awkFormatNginx} "$textPath" | sed '/^\s*$/d' > $out

View file

@ -3,7 +3,7 @@
, xorgproto, libX11, bison, ksh, perl, gnum4
, libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps
, libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf
, ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales, gawk
, ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales
, autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot
, rpcsvc-proto }:
@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
libjpeg libXmu libXdmcp libXScrnSaver tcl libXaw ksh
];
nativeBuildInputs = [
bison ncompress gawk autoPatchelfHook makeWrapper fakeroot
bison ncompress autoPatchelfHook makeWrapper fakeroot
rpcsvc-proto
];
# build fails otherwise

View file

@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
# Used during the configure phase
ENVCMD = "${coreutils}/bin/env";
nativeBuildInputs = [ coreutils ];
buildInputs = [ perl ];
meta = with lib; {

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
nativeBuildInputs = [ coreutils ] ++ lib.optional stdenv.isDarwin cctools;
nativeBuildInputs = lib.optional stdenv.isDarwin cctools;
buildInputs = [ ncurses libiconv libX11 libuuid ];
enableParallelBuilding = true;

View file

@ -1,6 +1,6 @@
# Binaries provided by Open Dylan to be used to bootstrap from source.
# The binaries can also be used as is.
{lib, stdenv, fetchurl, patchelf, boehmgc, gnused, gcc, makeWrapper}:
{lib, stdenv, fetchurl, patchelf, boehmgc, gcc, makeWrapper}:
stdenv.mkDerivation rec {
pname = "opendylan";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
}
else throw "platform ${stdenv.hostPlatform.system} not supported.";
nativeBuildInputs = [ patchelf boehmgc gnused makeWrapper ];
nativeBuildInputs = [ patchelf boehmgc makeWrapper ];
buildCommand = ''
mkdir -p "$out"

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, fetchzip
, autoconf, automake, autoreconfHook, bash, clang, dos2unix, file, gzip, perl
, autoconf, automake, autoreconfHook, clang, dos2unix, file, perl
, pkg-config
, alsa-lib, coreutils, freetype, glib, glibc, gnugrep, libpulseaudio, libtool
, libuuid, openssl, pango, xorg
@ -75,11 +75,9 @@ in stdenv.mkDerivation {
autoconf
automake
autoreconfHook
bash
clang
dos2unix
file
gzip
perl
pkg-config
];

View file

@ -10,7 +10,6 @@
, pkg-config
, sqlite
, swig
, bash
, libxml2
, clang_10
, python3
@ -29,7 +28,6 @@
, libgit2
, fetchFromGitHub
, fetchpatch
, findutils
, makeWrapper
, gnumake
, file
@ -188,12 +186,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [
autoconf
automake
bash
cmake
coreutils
findutils
git
gnumake
libtool
makeWrapper
ninja

View file

@ -1,4 +1,4 @@
{ lib, bash, which, autoconf, automake,
{ lib, which, autoconf, automake,
mkCoqDerivation, coq, version ? null }:
with lib; mkCoqDerivation {
@ -16,7 +16,7 @@ with lib; mkCoqDerivation {
release."2.6.1".sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj";
releaseRev = v: "flocq-${v}";
nativeBuildInputs = [ bash which autoconf ];
nativeBuildInputs = [ which autoconf ];
mlPlugin = true;
useMelquiondRemake.logpath = "Flocq";

View file

@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile_1_8;
nativeBuildInputs = [
gawk
makeWrapper
pkg-config
];

View file

@ -42,7 +42,6 @@ builder rec {
nativeBuildInputs = [
makeWrapper
gawk
pkg-config
];
buildInputs = [

View file

@ -40,7 +40,6 @@ builder rec {
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile;
nativeBuildInputs = [
gawk
makeWrapper
pkg-config
];

View file

@ -40,7 +40,6 @@ builder rec {
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile;
nativeBuildInputs = [
gawk
makeWrapper
pkg-config
];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, bash, perl }:
{ lib, stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
pname = "gecode";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77";
};
nativeBuildInputs = [ bash perl ];
nativeBuildInputs = [ perl ];
preConfigure = "patchShebangs configure";

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, ragel, python3
, coreutils, gnused, util-linux, fetchpatch
, util-linux, fetchpatch
, boost
, withStatic ? false # build only shared libs by default, build static+shared if true
}:
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
cmake ragel python3
# Consider simply using busybox for these
# Need at least: rev, sed, cut, nm
coreutils gnused util-linux
util-linux
];
cmakeFlags = [

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, postgresql, doxygen, xmlto, python2, gnused }:
{ lib, stdenv, fetchFromGitHub, postgresql, doxygen, xmlto, python2 }:
stdenv.mkDerivation rec {
pname = "libpqxx";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0djmjr2b5x5nd2a4idv5j8s6w0kdmvil910iv1kyc7x94dirbrni";
};
nativeBuildInputs = [ gnused python2 ];
nativeBuildInputs = [ python2 ];
buildInputs = [ postgresql doxygen xmlto ];
preConfigure = ''

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, postgresql, python3, gnused }:
{ lib, stdenv, fetchFromGitHub, postgresql, python3 }:
stdenv.mkDerivation rec {
pname = "libpqxx";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-O30czHwEDXz5xY4o3MWhmEK06OKTKMQCy0M6qwSEpy8=";
};
nativeBuildInputs = [ gnused python3 ];
nativeBuildInputs = [ python3 ];
buildInputs = [ postgresql ];
preConfigure = ''

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, coreutils, gfortran, gnused
{ lib, stdenv, fetchFromGitHub, gfortran
, python3, util-linux, which
, enableStatic ? stdenv.hostPlatform.isStatic
@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
coreutils
gfortran
gnused
python3
util-linux
which

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }:
{ lib, stdenv, fetchurl, gfortran, imake, makedepend, motif, xorg }:
stdenv.mkDerivation rec {
version = "2006";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs = with xorg; [ gfortran motif libX11 libXft libXt ];
nativeBuildInputs = [ gnumake imake makedepend ];
nativeBuildInputs = [ imake makedepend ];
sourceRoot = ".";
patches = [ ./patch.patch ./0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch ];

View file

@ -1,7 +1,7 @@
{ qtModule
, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel
, bison, coreutils, flex, git, gperf, ninja, pkg-config, python2, which
, bison, flex, git, gperf, ninja, pkg-config, python2, which
, nodejs, qtbase, perl
, xorg, libXcursor, libXScrnSaver, libXrandr, libXtst
@ -30,7 +30,7 @@ qtModule {
pname = "qtwebengine";
qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
nativeBuildInputs = [
bison coreutils flex git gperf ninja pkg-config python2 which gn nodejs
bison flex git gperf ninja pkg-config python2 which gn nodejs
] ++ lib.optional stdenv.isDarwin xcbuild;
doCheck = true;
outputs = [ "bin" "dev" "out" ];

View file

@ -3,7 +3,6 @@
, fetchPypi
, python-dateutil
, pkgs
, coreutils
, which
}:
@ -16,7 +15,6 @@ buildPythonPackage rec {
sha256 = "38b9e61735a3161f9211a5773c5f5ea698f36af4ff7f77fa03e8d1ff0caa117f";
};
nativeBuildInputs = [ coreutils ];
checkInputs = [ which ];
propagatedBuildInputs = [ python-dateutil ];

View file

@ -530,7 +530,6 @@ stdenv.mkDerivation rec {
# when a command cant be found in a bazel build, you might also
# need to add it to `defaultShellPath`.
nativeBuildInputs = [
coreutils
installShellFiles
makeWrapper
python3

View file

@ -525,7 +525,6 @@ stdenv.mkDerivation rec {
# when a command cant be found in a bazel build, you might also
# need to add it to `defaultShellPath`.
nativeBuildInputs = [
coreutils
installShellFiles
makeWrapper
python3

View file

@ -1,4 +1,4 @@
{ stdenv, lib, python3, fetchFromGitHub, which, findutils, coreutils
{ stdenv, lib, python3, fetchFromGitHub, which, coreutils
, perl, installShellFiles
, doCheck ? true
}: stdenv.mkDerivation rec {
@ -52,7 +52,6 @@
python3
(with python3.pkgs; [ beautifulsoup4 markdown ])
which
findutils
installShellFiles
];

View file

@ -6,7 +6,6 @@
, dbus
, sqlite
, file
, gzip
, makeWrapper
}:
@ -25,7 +24,6 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
pkg-config
gzip
makeWrapper
];

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ autoreconfHook coreutils pkg-config python3Packages.docutils ];
nativeBuildInputs = [ autoreconfHook pkg-config python3Packages.docutils ];
buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv;
# to generate makefile.in

View file

@ -6,7 +6,6 @@
, pkg-config
, scdoc
, gnome-builder
, gnused
, glib
, libgee
, json-glib
@ -37,7 +36,6 @@ stdenv.mkDerivation rec {
pkg-config
scdoc
# GNOME Builder Plugin
gnused
gnome-builder
];

View file

@ -1,5 +1,5 @@
{
autoreconfHook, cups, gzip, libjpeg, rpmextract,
autoreconfHook, cups, libjpeg, rpmextract,
fetchurl, lib, stdenv
}:
@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
};
sourceRoot = srcdirs.filter;
nativeBuildInputs = [ autoreconfHook gzip rpmextract ];
nativeBuildInputs = [ autoreconfHook rpmextract ];
buildInputs = [ cups libjpeg ];
unpackPhase = ''

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, gnumake, pkg-config, wget, unzip, gawk
{ stdenv, lib, fetchFromGitHub, pkg-config, wget, unzip
, sqlite, which, lua, installShellFiles, makeWrapper
}:
let
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
gnumake pkg-config wget unzip gawk sqlite which installShellFiles makeWrapper
pkg-config wget unzip sqlite which installShellFiles makeWrapper
];
buildInputs = [ luaEnv ];

View file

@ -192,7 +192,6 @@ let
nativeBuildInputs = [
pkg-config
libapparmor
gawk
which
];

View file

@ -1,9 +1,9 @@
{ lib, stdenvNoCC, dtc, findutils }:
{ lib, stdenvNoCC, dtc }:
with lib; {
applyOverlays = (base: overlays': stdenvNoCC.mkDerivation {
name = "device-tree-overlays";
nativeBuildInputs = [ dtc findutils ];
nativeBuildInputs = [ dtc ];
buildCommand = let
overlays = toList overlays';
in ''

View file

@ -1,5 +1,5 @@
{ lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
, libelf, cpio, elfutils, zstd, gawk, python3Minimal, zlib, pahole
, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole
, writeTextFile
}:
@ -320,7 +320,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat
enableParallelBuilding = true;
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd python3Minimal ]
nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal ]
++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools
++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf
# Removed util-linuxMinimal since it should not be a dependency.

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c, kmod, nixosTests }:
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, lvm2, libaio, readline, systemd, liburcu, json_c, kmod, nixosTests }:
stdenv.mkDerivation rec {
pname = "multipath-tools";
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
$(find * -name Makefile\*)
'';
nativeBuildInputs = [ gzip pkg-config perl ];
nativeBuildInputs = [ pkg-config perl ];
buildInputs = [ systemd lvm2 libaio readline liburcu json_c ];
makeFlags = [

View file

@ -3,7 +3,7 @@
# (which will eventually become the default version.)
{ gcc6Stdenv, lib, fetchurl, fetchFromGitHub
, which, findutils, m4, gawk
, which, m4
, python2, openjdk, mono, libressl
, ...
}:
@ -51,7 +51,7 @@ let
inherit rev sha256;
};
nativeBuildInputs = [ python2 openjdk gawk which m4 findutils mono ];
nativeBuildInputs = [ python2 openjdk which m4 mono ];
buildInputs = [ libressl boost ];
inherit patches;

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, removeReferencesTo
, file, openssl, perl, perlPackages, nettools, gnused
, file, openssl, perl, perlPackages, nettools
, withPerlTools ? false }: let
perlWithPkgs = perl.withPackages (ps: with ps; [
@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat"
'';
nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo gnused file ];
nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo file ];
buildInputs = [ openssl ]
++ lib.optional withPerlTools perlWithPkgs;

View file

@ -9,7 +9,6 @@
, procps
, which
, jre
, coreutils
, nixosTests
# generation is the attribute version suffix such as 3_11 in pkgs.cassandra_3_11
, generation
@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
url = "mirror://apache/cassandra/${version}/apache-cassandra-${version}-bin.tar.gz";
};
nativeBuildInputs = [ makeWrapper coreutils ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall

View file

@ -1,11 +1,11 @@
{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man, texinfo, libtool, cppzmq, libarchive
{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq, libarchive
, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2, nanodbc, fmt
, nlohmann_json, spdlog }:
# Common attributes of irods packages
{
nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ];
nativeBuildInputs = [ autoconf automake cmake help2man texinfo which gcc ];
buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc libkrb5 boost
libcxx catch2 nanodbc fmt nlohmann_json spdlog ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man, texinfo, libtool, cppzmq
{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, help2man, texinfo, libtool, cppzmq
, libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2
, nanodbc_llvm, fmt, nlohmann_json, spdlog }:
@ -8,7 +8,7 @@ let
in
let
common = import ./common.nix {
inherit lib stdenv bzip2 zlib autoconf automake cmake gnumake
inherit lib stdenv bzip2 zlib autoconf automake cmake
help2man texinfo libtool cppzmq libarchive jansson
zeromq openssl pam libiodbc libkrb5 gcc libcxx
boost avro-cpp which catch2 nanodbc fmt nlohmann_json
@ -99,4 +99,3 @@ rec {
};
});
}

View file

@ -1,7 +1,6 @@
{ stdenv
, lib
, autoreconfHook
, gnused
, boost
, fuse
, log4cxx
@ -15,7 +14,7 @@ stdenv.mkDerivation rec {
sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-contrib/zookeeper-contrib-zkfuse";
nativeBuildInputs = [ autoreconfHook gnused ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ zookeeper_mt log4cxx boost fuse ];
postPatch = ''

View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, makeWrapper, gawk
{ lib, fetchFromGitHub, makeWrapper
, makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages
, stdenv, shortenPerlShebang
}:
@ -22,7 +22,7 @@ perlPackages.buildPerlPackage rec {
outputs = [ "out" ];
nativeBuildInputs = [ makeWrapper gawk ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;
buildInputs = [ gnuplot perl ]
++ (with perlPackages; [ ListMoreUtils IPCRun StringShellQuote ]);

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, bat
{ lib, stdenv, fetchFromGitHub, makeWrapper, bat
# batdiff, batgrep, and batwatch
, coreutils
, getconf
@ -33,7 +33,7 @@ let
};
# bat needs to be in the PATH during building so EXECUTABLE_BAT picks it up
nativeBuildInputs = [ bash bat ];
nativeBuildInputs = [ bat ];
dontConfigure = true;
@ -93,7 +93,7 @@ let
src = core;
nativeBuildInputs = [ bash makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
# Make the dependencies available to the tests.
buildInputs = dependencies;

View file

@ -6,7 +6,6 @@
, nix-update-script
, dsq
, testVersion
, diffutils
}:
buildGoModule rec {
@ -22,8 +21,6 @@ buildGoModule rec {
vendorSha256 = "sha256-mSF2oNdTKAg3iRejKkn24hSCJDM6iOkRMruic73ceX4=";
nativeBuildInputs = [ diffutils ];
ldflags = [ "-X" "main.Version=${version}" ];
passthru = {

View file

@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, emacs, gnulib, autoconf, bison, automake, gettext, gperf, texinfo, perl, rsync, gawk}:
{ fetchurl, lib, stdenv, emacs, gnulib, autoconf, bison, automake, gettext, gperf, texinfo, perl, rsync}:
stdenv.mkDerivation rec {
pname = "idutils";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = lib.optional stdenv.isLinux emacs;
nativeBuildInputs = [ gnulib autoconf bison automake gettext gperf texinfo perl rsync gawk ];
nativeBuildInputs = [ gnulib autoconf bison automake gettext gperf texinfo perl rsync ];
doCheck = !stdenv.isDarwin;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc, callPackage }:
{ lib, stdenv, fetchurl, php, which, makeWrapper, gnumake, gcc, callPackage }:
stdenv.mkDerivation rec {
pname = "phoronix-test-suite";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ php ];
nativeBuildInputs = [ which gnused makeWrapper ];
nativeBuildInputs = [ which makeWrapper ];
installPhase = ''
runHook preInstall

View file

@ -40,7 +40,7 @@
];
buildInputs = [ perl ];
nativeBuildInputs = [ makeWrapper gnused ];
nativeBuildInputs = [ makeWrapper ];
# XXX: While [1] states that DESTDIR should not be used, and that the correct
# variable to set is, in fact, PREFIX, tlp thinks otherwise. The Makefile for

View file

@ -1,5 +1,5 @@
{ lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkg-config
, file, findutils
, file
, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret
, withGnome ? true, libnma, glib }:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ networkmanager ppp glib ]
++ lib.optionals withGnome [ gtk3 libsecret libnma ];
nativeBuildInputs = [ autoreconfHook libtool intltool pkg-config file findutils ];
nativeBuildInputs = [ autoreconfHook libtool intltool pkg-config file ];
preConfigure = ''
intltoolize -f

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, bash, autoreconfHook
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, autoreconfHook
, zeromq, ndpi, json_c, openssl, libpcap, libcap, curl, libmaxminddb
, rrdtool, sqlite, libmysqlclient, expat, net-snmp
}:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ bash autoreconfHook pkg-config ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
zeromq ndpi json_c openssl libpcap curl libmaxminddb rrdtool sqlite

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, gawk, gnused, libgcrypt, zlib, bzip2 }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libgcrypt, zlib, bzip2 }:
stdenv.mkDerivation rec {
pname = "munge";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "15h805rwcb9f89dyrkxfclzs41n3ff8x7cc1dbvs8mb0ds682c4j";
};
nativeBuildInputs = [ autoreconfHook gawk gnused ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libgcrypt zlib bzip2 ];
preAutoreconf = ''

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, buildPackages
, gzip, libiconv, nkf, perl, which
, libiconv, nkf, perl, which
, skk-dicts
}:
@ -17,7 +17,7 @@ stdenv.mkDerivation {
sha256 = "0xrblwhaf70m0knkd5584iahaq84rlk0926bhdsrzmakpw77hils";
};
nativeBuildInputs = [ gzip libiconv nkf perl which ];
nativeBuildInputs = [ libiconv nkf perl which ];
postUnpack = ''
cp ${skk-dicts}/share/SKK-JISYO.L source/dict/

View file

@ -17133,7 +17133,6 @@ let
sha256 = "0xl8lcv9gfv0nn8vrrxa4az359whqdhmzw4r51nn3add8pn3s9ip";
};
buildInputs = [ pkgs.zookeeper_mt ];
nativeBuildInputs = [ pkgs.gnused ];
# fix "error: format not a string literal and no format arguments [-Werror=format-security]"
hardeningDisable = [ "format" ];
# Make the async API accessible

View file

@ -7418,7 +7418,7 @@ in {
pynanoleaf = callPackage ../development/python-modules/pynanoleaf { };
pync = callPackage ../development/python-modules/pync {
inherit (pkgs) coreutils which;
inherit (pkgs) which;
};
pynello = callPackage ../development/python-modules/pynello { };