gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove = __splicedPackages

Browse Source 
Now that `pkgs` is `__splicedPackages` on cross we can remove these
variables I set.

Assignments like `patchutils = pkgs.patchutils_0_3_3;` in
`all-packages.nix` cannot be removed because the `pkgs`
in `patchutils = pkgs.patchutils_0_3_3;` in `all-packages.nix` is coming from
this `pkgs:` b6e486730f/pkgs/top-level/all-packages.nix (L9)
instead of the `pkgs` in `with pkgs;`
This commit is contained in:
Artturin
2024-11-01 20:21:38 +02:00
committed by Wolfgang Walther
parent 2494e3664f
commit 1f74d7a2bd
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/beam-modules/default.nix
View File

@@ -1,11 +1,10 @@
{ {
lib, lib,
__splicedPackages, pkgs,
erlang, erlang,
}: }:
let let
pkgs = __splicedPackages;
inherit (lib) makeExtensible; inherit (lib) makeExtensible;
# FIXME: add support for overrideScope # FIXME: add support for overrideScope

6
pkgs/development/interpreters/perl/default.nix
View File

@@ -30,11 +30,7 @@ let
}: }:
let let
perlPackagesFun = callPackage ../../../top-level/perl-packages.nix { perlPackagesFun = callPackage ../../../top-level/perl-packages.nix {
# allow 'perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig; }; }' like in python3Packages inherit stdenv pkgs;
# 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;
perl = self; perl = self;
}; };

11
pkgs/top-level/all-packages.nix
View File

@@ -4089,11 +4089,7 @@ with pkgs;
tldr-hs = haskellPackages.tldr; tldr-hs = haskellPackages.tldr;
tmuxPlugins = recurseIntoAttrs ( tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { });
callPackage ../misc/tmux-plugins {
pkgs = pkgs.__splicedPackages;
}
);
tpm2-totp-with-plymouth = tpm2-totp.override { tpm2-totp-with-plymouth = tpm2-totp.override {
withPlymouth = true; withPlymouth = true;
@@ -4311,9 +4307,7 @@ with pkgs;
yarn-berry_4 = yarn-berry.override { berryVersion = 4; }; yarn-berry_4 = yarn-berry.override { berryVersion = 4; };
yarn-berry_3 = yarn-berry.override { berryVersion = 3; }; yarn-berry_3 = yarn-berry.override { berryVersion = 3; };
yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { };
pkgs = pkgs.__splicedPackages;
};
inherit (yarn2nix-moretea) inherit (yarn2nix-moretea)
yarn2nix yarn2nix
@@ -5015,7 +5009,6 @@ with pkgs;
idrisPackages = recurseIntoAttrs ( idrisPackages = recurseIntoAttrs (
callPackage ../development/idris-modules { callPackage ../development/idris-modules {
idris-no-deps = haskellPackages.idris; idris-no-deps = haskellPackages.idris;
pkgs = pkgs.__splicedPackages;
} }
); );