From 82454e9df8d54c5afaa23055b4fbc656e347c71e Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 27 Jan 2021 17:21:31 +0700 Subject: treewide: remove implicit use of stdenv.lib --- pkgs/build-support/coq/default.nix | 2 +- pkgs/build-support/coq/meta-fetch/default.nix | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index 7e925e2473e1..8d86602bf38e 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -35,7 +35,7 @@ let "extraInstallFlags" "setCOQBIN" "mlPlugin" "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; fetch = import ../coq/meta-fetch/default.nix - { inherit stdenv fetchzip; } ({ + { inherit lib stdenv fetchzip; } ({ inherit release releaseRev; location = { inherit domain owner repo; }; } // optionalAttrs (args?fetcher) {inherit fetcher;}); diff --git a/pkgs/build-support/coq/meta-fetch/default.nix b/pkgs/build-support/coq/meta-fetch/default.nix index 580d58395ef4..b01ae72a2089 100644 --- a/pkgs/build-support/coq/meta-fetch/default.nix +++ b/pkgs/build-support/coq/meta-fetch/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchzip }@args: -let lib = import ../extra-lib.nix {inherit (args.stdenv) lib;}; in +{ lib, stdenv, fetchzip }@args: +let lib' = lib; in +let lib = import ../extra-lib.nix {lib = lib';}; in with builtins; with lib; let default-fetcher = {domain ? "github.com", owner ? "", repo, rev, name ? "source", sha256 ? null, ...}@args: -- cgit 1.4.1