diff options
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/build-fhs-userenv/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/docker/default.nix | 1 | ||||
-rw-r--r-- | pkgs/build-support/emacs/elpa.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/emacs/melpa.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/fetchdarcs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/fetchdocker/credentials.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/fetchdocker/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/fetchgit/private.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/fetchgitlocal/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/fetchhg/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/fetchnuget/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/fetchs3/default.nix | 1 | ||||
-rw-r--r-- | pkgs/build-support/rust/build-rust-crate.nix | 16 | ||||
-rw-r--r-- | pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/rust/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/singularity-tools/default.nix | 3 |
16 files changed, 21 insertions, 24 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index 219530a67bd8..c733556de45c 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,4 +1,4 @@ -{ callPackage, runCommand, lib, writeScript, stdenv, coreutils }: +{ callPackage, runCommand, writeScript, stdenv, coreutils }: let buildFHSEnv = callPackage ./env.nix { }; in diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ff45cf81d7e5..950c0c86a6e4 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -1,5 +1,4 @@ { - callPackage, coreutils, docker, e2fsprogs, diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index 79a26abcb831..e6f6c23e449f 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -1,6 +1,6 @@ # builder for Emacs packages built for packages.el -{ lib, stdenv, fetchurl, emacs, texinfo }: +{ lib, stdenv, emacs, texinfo }: with lib; diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index f55c91f82c7d..5fa45b154a37 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -1,7 +1,7 @@ # builder for Emacs packages built for packages.el # using MELPA package-build.el -{ lib, stdenv, fetchurl, fetchFromGitHub, emacs, texinfo }: +{ lib, stdenv, fetchFromGitHub, emacs, texinfo }: with lib; diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index 3b965b06662c..02777c9900dc 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, darcs, nix, cacert}: +{stdenvNoCC, darcs, cacert}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}: diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix index c01288dbf53a..001693501ccb 100644 --- a/pkgs/build-support/fetchdocker/credentials.nix +++ b/pkgs/build-support/fetchdocker/credentials.nix @@ -32,7 +32,7 @@ let pathParts = (builtins.filter - ({path, prefix}: "DOCKER_CREDENTIALS" == prefix) + ({prefix}: "DOCKER_CREDENTIALS" == prefix) builtins.nixPath); in if (pathParts != []) then (builtins.head pathParts).path else "" diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix index ae3ae4185e05..3556df32d926 100644 --- a/pkgs/build-support/fetchdocker/default.nix +++ b/pkgs/build-support/fetchdocker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, coreutils, bash, gnutar, jq, writeText }: +{ stdenv, lib, coreutils, bash, gnutar, writeText }: let stripScheme = builtins.replaceStrings [ "https://" "http://" ] [ "" "" ]; diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix index 4dcf6d06718a..59376f3b0424 100644 --- a/pkgs/build-support/fetchgit/private.nix +++ b/pkgs/build-support/fetchgit/private.nix @@ -1,4 +1,4 @@ -{ fetchgit, runCommand, makeWrapper, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // { +{ fetchgit, runCommand, makeWrapper, openssh }: args: derivation ((fetchgit args).drvAttrs // { SSH_AUTH_SOCK = if (builtins.tryEval <ssh-auth-sock>).success then builtins.toString <ssh-auth-sock> else null; diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix index 7a25966e9fb5..fa1945775537 100644 --- a/pkgs/build-support/fetchgitlocal/default.nix +++ b/pkgs/build-support/fetchgitlocal/default.nix @@ -1,4 +1,4 @@ -{ runCommand, git, nix }: src: +{ runCommand, git }: src: let srcStr = toString src; diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 36a48ce9f170..40ead021cdbf 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}: +{stdenvNoCC, mercurial}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}: if md5 != null then throw "fetchhg does not support md5 anymore, please use sha256" diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix index 40ba79ec4353..960bc3c1ffb2 100644 --- a/pkgs/build-support/fetchnuget/default.nix +++ b/pkgs/build-support/fetchnuget/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl, buildDotnetPackage, unzip }: +{ fetchurl, buildDotnetPackage, unzip }: attrs @ { baseName diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index 14dac9997d94..3dbde203374d 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -5,7 +5,6 @@ , sha256 , region ? "us-east-1" , credentials ? null # Default to looking at local EC2 metadata service -, executable ? false , recursiveHash ? false , postFetch ? null }: diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index 7f21b66ce129..6c7dd67c4002 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -53,7 +53,7 @@ let makeDeps = dependencies: ''; configureCrate = - { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member, extraLinkFlags }: + { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, workspace_member, extraLinkFlags }: let version_ = lib.splitString "-" crateVersion; versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; version = lib.splitString "." (lib.head version_); @@ -181,9 +181,9 @@ let makeDeps = dependencies: runHook postConfigure ''; - buildCrate = { crateName, crateVersion, crateAuthors, - dependencies, completeDeps, completeBuildDeps, - crateFeatures, libName, build, release, libPath, + buildCrate = { crateName, + dependencies, + crateFeatures, libName, release, libPath, crateType, metadata, crateBin, finalBins, extraRustcOpts, verbose, colors }: @@ -422,16 +422,16 @@ stdenv.mkDerivation (rec { colors = lib.attrByPath [ "colors" ] "always" crate; extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []); configurePhase = configureCrate { - inherit crateName dependencies buildDependencies completeDeps completeBuildDeps + inherit crateName buildDependencies completeDeps completeBuildDeps crateFeatures libName build workspace_member release libPath crateVersion extraLinkFlags crateAuthors verbose colors; }; extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else []; buildPhase = buildCrate { - inherit crateName dependencies completeDeps completeBuildDeps - crateFeatures libName build release libPath crateType - crateVersion crateAuthors metadata crateBin finalBins verbose colors + inherit crateName dependencies + crateFeatures libName release libPath crateType + metadata crateBin finalBins verbose colors extraRustcOpts; }; installPhase = installCrate crateName metadata; diff --git a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix index ac6bb6ab1bd4..486f365f78ac 100644 --- a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix +++ b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix @@ -1,5 +1,5 @@ # Generated by carnix 0.5.2: carnix Cargo.lock -o cargo-vendor.nix -{ lib, buildPlatform, buildRustCrate, fetchgit }: +{ lib, buildPlatform, buildRustCrate }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; hasFeature = feature: diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 59e8c3e7f7ed..fb1d6e390ae1 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, stdenv, path, cacert, git, rust, cargo-vendor }: +{ stdenv, cacert, git, rust, cargo-vendor }: let fetchcargo = import ./fetchcargo.nix { inherit stdenv cacert git rust cargo-vendor; diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index db2bef367e9e..5179f47eaa5e 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -8,8 +8,7 @@ , vmTools , gawk , utillinux -, e2fsprogs -, squashfsTools }: +, e2fsprogs }: rec { shellScript = name: text: |