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

Merge pull request #51401 from roberth/all-packages-res

Browse Source 
all-packages.nix: Alias self to res, deprecating self
This commit is contained in:
John Ericson 2018-12-03 18:06:48 -05:00 committed by GitHub
commit 805d32dbf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,10 +6,23 @@
* Hint: ### starts category names. * Hint: ### starts category names.
*/ */
{ lib, noSysDirs, config}: { lib, noSysDirs, config}:
self: pkgs: res: pkgs: super:
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
@ -815,7 +828,7 @@ with pkgs;
androidsdk = androidenv.androidsdk_8_0; androidsdk = androidenv.androidsdk_8_0;
androidsdk_extras = self.androidenv.androidsdk_8_0_extras; androidsdk_extras = res.androidenv.androidsdk_8_0_extras;
webos = recurseIntoAttrs { webos = recurseIntoAttrs {
cmake-modules = callPackage ../development/mobile/webos/cmake-modules.nix { }; cmake-modules = callPackage ../development/mobile/webos/cmake-modules.nix { };
@ -3531,7 +3544,7 @@ with pkgs;
jid = callPackage ../development/tools/jid { }; jid = callPackage ../development/tools/jid { };
jing = self.jing-trang; jing = res.jing-trang;
jing-trang = callPackage ../tools/text/xml/jing-trang { }; jing-trang = callPackage ../tools/text/xml/jing-trang { };
jira-cli = callPackage ../development/tools/jira_cli { }; jira-cli = callPackage ../development/tools/jira_cli { };
@ -4828,23 +4841,23 @@ with pkgs;
libcap = if stdenv.isDarwin then null else libcap; libcap = if stdenv.isDarwin then null else libcap;
}; };
pinentry_ncurses = self.pinentry.override { pinentry_ncurses = res.pinentry.override {
gtk2 = null; gtk2 = null;
}; };
pinentry_emacs = self.pinentry.override { pinentry_emacs = res.pinentry.override {
enableEmacs = true; enableEmacs = true;
}; };
pinentry_gnome = self.pinentry.override { pinentry_gnome = res.pinentry.override {
gcr = gnome3.gcr; gcr = gnome3.gcr;
}; };
pinentry_qt4 = self.pinentry.override { pinentry_qt4 = res.pinentry.override {
qt = qt4; qt = qt4;
}; };
pinentry_qt5 = self.pinentry.override { pinentry_qt5 = res.pinentry.override {
qt = qt5.qtbase; qt = qt5.qtbase;
}; };
@ -8578,11 +8591,11 @@ with pkgs;
gputils = callPackage ../development/tools/misc/gputils { }; gputils = callPackage ../development/tools/misc/gputils { };
gradleGen = callPackage ../development/tools/build-managers/gradle { }; gradleGen = callPackage ../development/tools/build-managers/gradle { };
gradle = self.gradleGen.gradle_latest; gradle = res.gradleGen.gradle_latest;
gradle_2_14 = self.gradleGen.gradle_2_14; gradle_2_14 = res.gradleGen.gradle_2_14;
gradle_2_5 = self.gradleGen.gradle_2_5; gradle_2_5 = res.gradleGen.gradle_2_5;
gradle_3_5 = self.gradleGen.gradle_3_5; gradle_3_5 = res.gradleGen.gradle_3_5;
gradle_4_10 = self.gradleGen.gradle_4_10; gradle_4_10 = res.gradleGen.gradle_4_10;
gperf = callPackage ../development/tools/misc/gperf { }; gperf = callPackage ../development/tools/misc/gperf { };
# 3.1 changed some parameters from int to size_t, leading to mismatches. # 3.1 changed some parameters from int to size_t, leading to mismatches.
@ -9065,7 +9078,7 @@ with pkgs;
valgrind = callPackage ../development/tools/analysis/valgrind { valgrind = callPackage ../development/tools/analysis/valgrind {
inherit (darwin) xnu bootstrap_cmds cctools; inherit (darwin) xnu bootstrap_cmds cctools;
}; };
valgrind-light = self.valgrind.override { gdb = null; }; valgrind-light = res.valgrind.override { gdb = null; };
valkyrie = callPackage ../development/tools/analysis/valkyrie { }; valkyrie = callPackage ../development/tools/analysis/valkyrie { };
@ -9650,7 +9663,7 @@ with pkgs;
inherit (darwin) cf-private; inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT;
}; };
fltk = self.fltk13; fltk = res.fltk13;
flyway = callPackage ../development/tools/flyway { }; flyway = callPackage ../development/tools/flyway { };
@ -9663,7 +9676,7 @@ with pkgs;
freetts = callPackage ../development/libraries/freetts { }; freetts = callPackage ../development/libraries/freetts { };
frog = self.languageMachines.frog; frog = res.languageMachines.frog;
fstrcmp = callPackage ../development/libraries/fstrcmp { }; fstrcmp = callPackage ../development/libraries/fstrcmp { };
@ -9731,11 +9744,11 @@ with pkgs;
}; };
gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix {
gtk = self.gtk2; gtk = res.gtk2;
}; };
gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix {
gtk = self.gtk2; gtk = res.gtk2;
}; };
geoclue2 = callPackage ../development/libraries/geoclue {}; geoclue2 = callPackage ../development/libraries/geoclue {};
@ -10133,7 +10146,7 @@ with pkgs;
gumbo = callPackage ../development/libraries/gumbo { }; gumbo = callPackage ../development/libraries/gumbo { };
gvfs = callPackage ../development/libraries/gvfs { gvfs = callPackage ../development/libraries/gvfs {
gnome = self.gnome3; gnome = res.gnome3;
}; };
gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { };
@ -11362,7 +11375,7 @@ with pkgs;
libxml2 = callPackage ../development/libraries/libxml2 { }; libxml2 = callPackage ../development/libraries/libxml2 { };
libxml2Python = pkgs.buildEnv { # slightly hacky libxml2Python = pkgs.buildEnv { # slightly hacky
name = "libxml2+py-${self.libxml2.version}"; name = "libxml2+py-${res.libxml2.version}";
paths = with libxml2; [ dev bin py ]; paths = with libxml2; [ dev bin py ];
inherit (libxml2) passthru; inherit (libxml2) passthru;
# the hook to find catalogs is hidden by buildEnv # the hook to find catalogs is hidden by buildEnv
@ -11802,9 +11815,9 @@ with pkgs;
}; };
pcre = callPackage ../development/libraries/pcre { }; pcre = callPackage ../development/libraries/pcre { };
pcre16 = self.pcre.override { variant = "pcre16"; }; pcre16 = res.pcre.override { variant = "pcre16"; };
# pcre32 seems unused # pcre32 seems unused
pcre-cpp = self.pcre.override { variant = "cpp"; }; pcre-cpp = res.pcre.override { variant = "cpp"; };
pcre2 = callPackage ../development/libraries/pcre2 { }; pcre2 = callPackage ../development/libraries/pcre2 { };
@ -12705,7 +12718,7 @@ with pkgs;
stdenv = overrideCC stdenv gcc6; stdenv = overrideCC stdenv gcc6;
}); });
v8_static = lowPrio (self.v8.override { static = true; }); v8_static = lowPrio (res.v8.override { static = true; });
vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
@ -15639,7 +15652,7 @@ with pkgs;
inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom;
tango-icon-theme = callPackage ../data/icons/tango-icon-theme { tango-icon-theme = callPackage ../data/icons/tango-icon-theme {
gtk = self.gtk2; gtk = res.gtk2;
}; };
themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {};
@ -15881,16 +15894,16 @@ with pkgs;
libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { }; libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { };
go-ethereum = self.altcoins.go-ethereum; go-ethereum = res.altcoins.go-ethereum;
ethabi = self.altcoins.ethabi; ethabi = res.altcoins.ethabi;
parity = self.altcoins.parity; parity = res.altcoins.parity;
parity-beta = self.altcoins.parity-beta; parity-beta = res.altcoins.parity-beta;
parity-ui = self.altcoins.parity-ui; parity-ui = res.altcoins.parity-ui;
stellar-core = self.altcoins.stellar-core; stellar-core = res.altcoins.stellar-core;
particl-core = self.altcoins.particl-core; particl-core = res.altcoins.particl-core;
aumix = callPackage ../applications/audio/aumix { aumix = callPackage ../applications/audio/aumix {
gtkGUI = false; gtkGUI = false;
@ -15985,7 +15998,7 @@ with pkgs;
}; };
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 (self) bitwig-studio1; inherit (res) bitwig-studio1;
}; };
bitwig-studio = bitwig-studio2; bitwig-studio = bitwig-studio2;
@ -16665,7 +16678,7 @@ with pkgs;
espeak-classic = callPackage ../applications/audio/espeak { }; espeak-classic = callPackage ../applications/audio/espeak { };
espeak-ng = callPackage ../applications/audio/espeak-ng { }; espeak-ng = callPackage ../applications/audio/espeak-ng { };
espeak = self.espeak-ng; espeak = res.espeak-ng;
espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
@ -16958,7 +16971,7 @@ with pkgs;
inherit (pkgs.gnome3) defaultIconTheme; inherit (pkgs.gnome3) defaultIconTheme;
}; };
firefox-beta-bin = self.wrapFirefox firefox-beta-bin-unwrapped { firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped {
browserName = "firefox"; browserName = "firefox";
name = "firefox-beta-bin-" + name = "firefox-beta-bin-" +
(builtins.parseDrvName firefox-beta-bin-unwrapped.name).version; (builtins.parseDrvName firefox-beta-bin-unwrapped.name).version;
@ -16973,7 +16986,7 @@ with pkgs;
inherit (pkgs.gnome3) defaultIconTheme; inherit (pkgs.gnome3) defaultIconTheme;
}; };
firefox-devedition-bin = self.wrapFirefox firefox-devedition-bin-unwrapped { firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {
browserName = "firefox"; browserName = "firefox";
nameSuffix = "-devedition"; nameSuffix = "-devedition";
name = "firefox-devedition-bin-" + name = "firefox-devedition-bin-" +
@ -20867,7 +20880,7 @@ with pkgs;
ut2004Packages = callPackage ../games/ut2004 { }; ut2004Packages = callPackage ../games/ut2004 { };
ut2004demo = self.ut2004Packages.ut2004 [ self.ut2004Packages.ut2004-demo ]; ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ];
vapor = callPackage ../games/vapor { love = love_0_8; }; vapor = callPackage ../games/vapor { love = love_0_8; };
@ -21004,8 +21017,8 @@ with pkgs;
# Included for backwards compatibility # Included for backwards compatibility
libsoup libwnck gtk-doc gnome-doc-utils; libsoup libwnck gtk-doc gnome-doc-utils;
gtk = self.gtk2; gtk = res.gtk2;
gtkmm = self.gtkmm2; gtkmm = res.gtkmm2;
}); });
gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { });
@ -22059,7 +22072,7 @@ with pkgs;
fakenes = callPackage ../misc/emulators/fakenes { }; fakenes = callPackage ../misc/emulators/fakenes { };
faust = self.faust2; faust = res.faust2;
faust1 = callPackage ../applications/audio/faust/faust1.nix { }; faust1 = callPackage ../applications/audio/faust/faust1.nix { };
@ -22282,7 +22295,7 @@ with pkgs;
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 (self.path + "/nixos/lib/eval-config.nix") { (import (res.path + "/nixos/lib/eval-config.nix") {
inherit (pkgs.stdenv.hostPlatform) system; inherit (pkgs.stdenv.hostPlatform) system;
modules = [( modules = [(
{ lib, ... }: { { lib, ... }: {
@ -22561,7 +22574,7 @@ with pkgs;
samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { };
samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { };
samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { };
samsung-unified-linux-driver = self.samsung-unified-linux-driver_4_01_17; samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17;
sane-backends = callPackage ../applications/graphics/sane/backends { sane-backends = callPackage ../applications/graphics/sane/backends {
gt68xxFirmware = config.sane.gt68xxFirmware or null; gt68xxFirmware = config.sane.gt68xxFirmware or null;

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

@ -91,7 +91,7 @@ let
allPackages = self: super: allPackages = self: super:
let res = import ./all-packages.nix let res = import ./all-packages.nix
{ inherit lib noSysDirs config; } { inherit lib noSysDirs config; }
res self; res self super;
in res; 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);