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

all-packages: Just refer to self, not super, or res

Browse Source 
This ends a years-long process to removoe pointless fixed points in this
file!
This commit is contained in:
John Ericson 2019-02-02 15:58:17 -05:00
parent c85a8a1fad
commit 755e824291
2 changed files with 4 additions and 21 deletions

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

@ -6,25 +6,11 @@
* Hint: ### starts category names. * Hint: ### starts category names.
*/ */
{ lib, noSysDirs, config}: { lib, noSysDirs, config}:
res: pkgs: super: pkgs:
with pkgs; with pkgs;
let
self =
builtins.trace ''
It seems that you are using a patched Nixpkgs that references the self
variable in pkgs/top-level/all-packages.nix. This variable was incorrectly
named, so its usage needs attention. Please use pkgs for packages or super
for functions.
''
res; # Do *NOT* use res in your fork. It will be removed.
# TODO: turn self into an error
in
{ {
# Allow callPackage to fill in the pkgs argument # Allow callPackage to fill in the pkgs argument
inherit pkgs; inherit pkgs;
@ -16218,7 +16204,7 @@ in
}; };
bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix {
inherit (gnome3) zenity; inherit (gnome3) zenity;
inherit (res) bitwig-studio1; inherit (pkgs) bitwig-studio1;
}; };
bitwig-studio = bitwig-studio2; bitwig-studio = bitwig-studio2;
@ -22528,7 +22514,7 @@ in
parameter set to the right value for your deployment target. parameter set to the right value for your deployment target.
*/ */
nixos = configuration: nixos = configuration:
(import (res.path + "/nixos/lib/eval-config.nix") { (import (pkgs.path + "/nixos/lib/eval-config.nix") {
inherit (pkgs.stdenv.hostPlatform) system; inherit (pkgs.stdenv.hostPlatform) system;
modules = [( modules = [(
{ lib, ... }: { { lib, ... }: {

5
pkgs/top-level/stage.nix
View File

@ -89,10 +89,7 @@ let
splice = self: super: import ./splice.nix lib self (buildPackages != null); splice = self: super: import ./splice.nix lib self (buildPackages != null);
allPackages = self: super: allPackages = self: super:
let res = import ./all-packages.nix import ./all-packages.nix { inherit lib noSysDirs config; } self;
{ inherit lib noSysDirs config; }
res self super;
in res;
aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super); aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super);