diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 15ddc31e9347..b2c6e263134a 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,11 +1,10 @@ { lib, - __splicedPackages, + pkgs, erlang, }: let - pkgs = __splicedPackages; inherit (lib) makeExtensible; # FIXME: add support for overrideScope diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index b0f3480c01ac..69d02530a90f 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -30,11 +30,7 @@ let }: 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 - # the conditional is because the // above won't be applied to __splicedPackages and hopefully no one is doing that when cross-compiling - pkgs = if stdenv.buildPlatform != stdenv.hostPlatform then pkgs.__splicedPackages else pkgs; - inherit stdenv; + inherit stdenv pkgs; perl = self; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cfde09d7f0e..0625c500cb1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4089,11 +4089,7 @@ with pkgs; tldr-hs = haskellPackages.tldr; - tmuxPlugins = recurseIntoAttrs ( - callPackage ../misc/tmux-plugins { - pkgs = pkgs.__splicedPackages; - } - ); + tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); tpm2-totp-with-plymouth = tpm2-totp.override { withPlymouth = true; @@ -4311,9 +4307,7 @@ with pkgs; yarn-berry_4 = yarn-berry.override { berryVersion = 4; }; yarn-berry_3 = yarn-berry.override { berryVersion = 3; }; - yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { - pkgs = pkgs.__splicedPackages; - }; + yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { }; inherit (yarn2nix-moretea) yarn2nix @@ -5015,7 +5009,6 @@ with pkgs; idrisPackages = recurseIntoAttrs ( callPackage ../development/idris-modules { idris-no-deps = haskellPackages.idris; - pkgs = pkgs.__splicedPackages; } );