Skip to content

Commit 1f74d7a

Browse files
Artturinwolfgangwalther
authored andcommitted
treewide: remove = __splicedPackages
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:` https://www.github.com/NixOS/nixpkgs/blob/b6e486730fc875ec79a3dea0f1f46eaf9f6ffa9d/pkgs/top-level/all-packages.nix#L9 instead of the `pkgs` in `with pkgs;`
1 parent 2494e36 commit 1f74d7a

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

pkgs/development/beam-modules/default.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
22
lib,
3-
__splicedPackages,
3+
pkgs,
44
erlang,
55
}:
66

77
let
8-
pkgs = __splicedPackages;
98
inherit (lib) makeExtensible;
109

1110
# FIXME: add support for overrideScope

pkgs/development/interpreters/perl/default.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ let
3030
}:
3131
let
3232
perlPackagesFun = callPackage ../../../top-level/perl-packages.nix {
33-
# allow 'perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig; }; }' like in python3Packages
34-
# most perl packages aren't called with callPackage so it's not possible to override their arguments individually
35-
# the conditional is because the // above won't be applied to __splicedPackages and hopefully no one is doing that when cross-compiling
36-
pkgs = if stdenv.buildPlatform != stdenv.hostPlatform then pkgs.__splicedPackages else pkgs;
37-
inherit stdenv;
33+
inherit stdenv pkgs;
3834
perl = self;
3935
};
4036

pkgs/top-level/all-packages.nix

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4089,11 +4089,7 @@ with pkgs;
40894089

40904090
tldr-hs = haskellPackages.tldr;
40914091

4092-
tmuxPlugins = recurseIntoAttrs (
4093-
callPackage ../misc/tmux-plugins {
4094-
pkgs = pkgs.__splicedPackages;
4095-
}
4096-
);
4092+
tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { });
40974093

40984094
tpm2-totp-with-plymouth = tpm2-totp.override {
40994095
withPlymouth = true;
@@ -4311,9 +4307,7 @@ with pkgs;
43114307
yarn-berry_4 = yarn-berry.override { berryVersion = 4; };
43124308
yarn-berry_3 = yarn-berry.override { berryVersion = 3; };
43134309

4314-
yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea {
4315-
pkgs = pkgs.__splicedPackages;
4316-
};
4310+
yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { };
43174311

43184312
inherit (yarn2nix-moretea)
43194313
yarn2nix
@@ -5015,7 +5009,6 @@ with pkgs;
50155009
idrisPackages = recurseIntoAttrs (
50165010
callPackage ../development/idris-modules {
50175011
idris-no-deps = haskellPackages.idris;
5018-
pkgs = pkgs.__splicedPackages;
50195012
}
50205013
);
50215014

0 commit comments

Comments
 (0)