Skip to content

Commit

Permalink
Revert "all-packages.nix: remove res. (next stage super)" (#55125)
Browse files Browse the repository at this point in the history 
This reverts commit 3ec0eb4.

See #55061 (comment)
  • Loading branch information
@danbst
danbst authored Feb 3, 2019
1 parent c01eeda commit b251a36
Showing 1 changed file with 37 additions and 37 deletions.
74 changes: 37 additions & 37 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3510,7 +3510,7 @@ in

jid = callPackage ../development/tools/jid { };

jing = jing-trang;
jing = res.jing-trang;
jing-trang = callPackage ../tools/text/xml/jing-trang { };

jira-cli = callPackage ../development/tools/jira_cli { };
Expand Down Expand Up @@ -4805,23 +4805,23 @@ in
libcap = if stdenv.isDarwin then null else libcap;
};

pinentry_ncurses = pinentry.override {
pinentry_ncurses = res.pinentry.override {
gtk2 = null;
};

pinentry_emacs = pinentry.override {
pinentry_emacs = res.pinentry.override {
enableEmacs = true;
};

pinentry_gnome = pinentry.override {
pinentry_gnome = res.pinentry.override {
inherit gcr;
};

pinentry_qt4 = pinentry.override {
pinentry_qt4 = res.pinentry.override {
qt = qt4;
};

pinentry_qt5 = pinentry.override {
pinentry_qt5 = res.pinentry.override {
qt = qt5.qtbase;
};

Expand Down Expand Up @@ -8691,11 +8691,11 @@ in
gputils = callPackage ../development/tools/misc/gputils { };

gradleGen = callPackage ../development/tools/build-managers/gradle { };
gradle = gradleGen.gradle_latest;
gradle_2_14 = gradleGen.gradle_2_14;
gradle_2_5 = gradleGen.gradle_2_5;
gradle_3_5 = gradleGen.gradle_3_5;
gradle_4_10 = gradleGen.gradle_4_10;
gradle = res.gradleGen.gradle_latest;
gradle_2_14 = res.gradleGen.gradle_2_14;
gradle_2_5 = res.gradleGen.gradle_2_5;
gradle_3_5 = res.gradleGen.gradle_3_5;
gradle_4_10 = res.gradleGen.gradle_4_10;

gperf = callPackage ../development/tools/misc/gperf { };
# 3.1 changed some parameters from int to size_t, leading to mismatches.
Expand Down Expand Up @@ -9179,7 +9179,7 @@ in
valgrind = callPackage ../development/tools/analysis/valgrind {
inherit (buildPackages.darwin) xnu bootstrap_cmds cctools;
};
valgrind-light = valgrind.override { gdb = null; };
valgrind-light = res.valgrind.override { gdb = null; };

valkyrie = callPackage ../development/tools/analysis/valkyrie { };

Expand Down Expand Up @@ -9753,7 +9753,7 @@ in
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT;
};
fltk = fltk13;
fltk = res.fltk13;

flyway = callPackage ../development/tools/flyway { };

Expand All @@ -9766,7 +9766,7 @@ in

freetts = callPackage ../development/libraries/freetts { };

frog = languageMachines.frog;
frog = res.languageMachines.frog;

fstrcmp = callPackage ../development/libraries/fstrcmp { };

Expand Down Expand Up @@ -9840,11 +9840,11 @@ in
};

gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix {
gtk = gtk2;
gtk = res.gtk2;
};

gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix {
gtk = gtk2;
gtk = res.gtk2;
};

geoclue2 = callPackage ../development/libraries/geoclue {};
Expand Down Expand Up @@ -10252,7 +10252,7 @@ in
gumbo = callPackage ../development/libraries/gumbo { };

gvfs = callPackage ../development/libraries/gvfs {
gnome = gnome3;
gnome = res.gnome3;
};

gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { };
Expand Down Expand Up @@ -11492,7 +11492,7 @@ in
libxml2 = callPackage ../development/libraries/libxml2 { };

libxml2Python = pkgs.buildEnv { # slightly hacky
name = "libxml2+py-${libxml2.version}";
name = "libxml2+py-${res.libxml2.version}";
paths = with libxml2; [ dev bin py ];
inherit (libxml2) passthru;
# the hook to find catalogs is hidden by buildEnv
Expand Down Expand Up @@ -11940,9 +11940,9 @@ in
};

pcre = callPackage ../development/libraries/pcre { };
pcre16 = pcre.override { variant = "pcre16"; };
pcre16 = res.pcre.override { variant = "pcre16"; };
# pcre32 seems unused
pcre-cpp = pcre.override { variant = "cpp"; };
pcre-cpp = res.pcre.override { variant = "cpp"; };

pcre2 = callPackage ../development/libraries/pcre2 { };

Expand Down Expand Up @@ -15870,7 +15870,7 @@ in
inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom;

tango-icon-theme = callPackage ../data/icons/tango-icon-theme {
gtk = gtk2;
gtk = res.gtk2;
};

themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {};
Expand Down Expand Up @@ -16113,18 +16113,18 @@ in
libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { };


go-ethereum = altcoins.go-ethereum;
ethabi = altcoins.ethabi;
go-ethereum = res.altcoins.go-ethereum;
ethabi = res.altcoins.ethabi;

parity = altcoins.parity;
parity-beta = altcoins.parity-beta;
parity-ui = altcoins.parity-ui;
parity = res.altcoins.parity;
parity-beta = res.altcoins.parity-beta;
parity-ui = res.altcoins.parity-ui;

polkadot = altcoins.polkadot;
polkadot = res.altcoins.polkadot;

stellar-core = altcoins.stellar-core;
stellar-core = res.altcoins.stellar-core;

particl-core = altcoins.particl-core;
particl-core = res.altcoins.particl-core;

aumix = callPackage ../applications/audio/aumix {
gtkGUI = false;
Expand Down Expand Up @@ -16910,7 +16910,7 @@ in
espeak-classic = callPackage ../applications/audio/espeak { };

espeak-ng = callPackage ../applications/audio/espeak-ng { };
espeak = espeak-ng;
espeak = res.espeak-ng;

espeakedit = callPackage ../applications/audio/espeak/edit.nix { };

Expand Down Expand Up @@ -17209,7 +17209,7 @@ in
inherit (pkgs.gnome3) defaultIconTheme;
};

firefox-beta-bin = wrapFirefox firefox-beta-bin-unwrapped {
firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped {
browserName = "firefox";
name = "firefox-beta-bin-" +
(builtins.parseDrvName firefox-beta-bin-unwrapped.name).version;
Expand All @@ -17224,7 +17224,7 @@ in
inherit (pkgs.gnome3) defaultIconTheme;
};

firefox-devedition-bin = wrapFirefox firefox-devedition-bin-unwrapped {
firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {
browserName = "firefox";
nameSuffix = "-devedition";
name = "firefox-devedition-bin-" +
Expand Down Expand Up @@ -21122,7 +21122,7 @@ in

ut2004Packages = callPackage ../games/ut2004 { };

ut2004demo = ut2004Packages.ut2004 [ ut2004Packages.ut2004-demo ];
ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ];

vapor = callPackage ../games/vapor { love = love_0_8; };

Expand Down Expand Up @@ -21259,8 +21259,8 @@ in
# Included for backwards compatibility
libsoup libwnck gtk-doc gnome-doc-utils;

gtk = gtk2;
gtkmm = gtkmm2;
gtk = res.gtk2;
gtkmm = res.gtkmm2;
});

gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { });
Expand Down Expand Up @@ -22314,7 +22314,7 @@ in

fakenes = callPackage ../misc/emulators/fakenes { };

faust = faust2;
faust = res.faust2;

faust1 = callPackage ../applications/audio/faust/faust1.nix { };

Expand Down Expand Up @@ -22814,7 +22814,7 @@ in
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_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { };
samsung-unified-linux-driver = 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 {
gt68xxFirmware = config.sane.gt68xxFirmware or null;
Expand Down

0 comments on commit b251a36

Please sign in to comment.