From cbc8aa437c44c510b54c664364dbfbcd98ac5f18 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 14 Aug 2023 02:49:53 +0300 Subject: treewide: use uncurried version of makeScopeWithSplicing --- pkgs/development/interpreters/perl/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'pkgs/development/interpreters/perl') diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index a2f9862083c9..201a080309d7 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -17,7 +17,7 @@ let # Function that when called # - imports perl-packages.nix # - adds spliced package sets to the package set - ({ stdenv, pkgs, perl, callPackage, makeScopeWithSplicing }: let + ({ stdenv, pkgs, perl, callPackage, makeScopeWithSplicing' }: let perlPackagesFun = callPackage ../../../top-level/perl-packages.nix { # allow 'perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig; }; }' like in python3Packages # most perl packages aren't called with callPackage so it's not possible to override their arguments individually @@ -34,13 +34,10 @@ let selfHostHost = perlOnHostForHost.pkgs; selfTargetTarget = perlOnTargetForTarget.pkgs or {}; }; - keep = self: { }; - extra = spliced0: {}; - in makeScopeWithSplicing - otherSplices - keep - extra - perlPackagesFun) + in makeScopeWithSplicing' { + inherit otherSplices; + f = perlPackagesFun; + }) { perl = self; }; -- cgit v1.2.3