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

Merge pull request #55097 from Ericson2314/remove-res

Browse Source 
all-packages: Just refer to `self`, not `super`, or `res`
This commit is contained in:
John Ericson 2019-02-02 17:38:21 -05:00 committed by GitHub
commit e375f6d5ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/servers/sql/postgresql/default.nix
View File

@ -153,9 +153,9 @@ let
''; '';
}; };
in self: super: { in self: {
postgresql_9_4 = super.callPackage generic { postgresql_9_4 = self.callPackage generic {
version = "9.4.20"; version = "9.4.20";
psqlSchema = "9.4"; psqlSchema = "9.4";
sha256 = "0zzqjz5jrn624hzh04drpj6axh30a9k6bgawid6rwk45nbfxicgf"; sha256 = "0zzqjz5jrn624hzh04drpj6axh30a9k6bgawid6rwk45nbfxicgf";
@ -163,7 +163,7 @@ in self: super: {
inherit self; inherit self;
}; };
postgresql_9_5 = super.callPackage generic { postgresql_9_5 = self.callPackage generic {
version = "9.5.15"; version = "9.5.15";
psqlSchema = "9.5"; psqlSchema = "9.5";
sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv"; sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv";
@ -171,7 +171,7 @@ in self: super: {
inherit self; inherit self;
}; };
postgresql_9_6 = super.callPackage generic { postgresql_9_6 = self.callPackage generic {
version = "9.6.11"; version = "9.6.11";
psqlSchema = "9.6"; psqlSchema = "9.6";
sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q"; sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q";
@ -179,7 +179,7 @@ in self: super: {
inherit self; inherit self;
}; };
postgresql_10 = super.callPackage generic { postgresql_10 = self.callPackage generic {
version = "10.6"; version = "10.6";
psqlSchema = "10.0"; psqlSchema = "10.0";
sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38"; sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38";
@ -187,7 +187,7 @@ in self: super: {
inherit self; inherit self;
}; };
postgresql_11 = super.callPackage generic { postgresql_11 = self.callPackage generic {
version = "11.1"; version = "11.1";
psqlSchema = "11.1"; psqlSchema = "11.1";
sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch"; sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch";

22
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;
@ -13872,7 +13858,7 @@ in
timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { };
inherit (import ../servers/sql/postgresql pkgs super) inherit (import ../servers/sql/postgresql pkgs)
postgresql_9_4 postgresql_9_4
postgresql_9_5 postgresql_9_5
postgresql_9_6 postgresql_9_6
@ -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);