Skip to content

all-packages.nix: cleanup, remove res. (next stage super) #56119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
oxij wants to merge 2 commits into from
Closed

all-packages.nix: cleanup, remove res. (next stage super) #56119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69e6079
libxml2Python: move from all-packages.nix
oxij Nov 22, 2018
35d6b59
all-packages.nix: kill all noop uses of `res`
oxij Feb 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions pkgs/development/libraries/libxml2/python.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# slightly hacky
{ buildEnv, libxml2 }:

buildEnv {
name = "libxml2+py-${libxml2.version}";
paths = with libxml2; [ dev bin py ];
inherit (libxml2) passthru;
# the hook to find catalogs is hidden by buildEnv
postBuild = ''
mkdir "$out/nix-support"
cp '${libxml2.dev}/nix-support/propagated-build-inputs' "$out/nix-support/"
'';
}
83 changes: 38 additions & 45 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3525,7 +3525,7 @@ in

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

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

jira-cli = callPackage ../development/tools/jira_cli { };
Expand Down Expand Up @@ -4823,27 +4823,29 @@ in

phodav = callPackage ../tools/networking/phodav { };

pinentry = callPackage ../tools/security/pinentry {
pinentry-real = callPackage ../tools/security/pinentry {
Copy link
Member

@matthewbauer matthewbauer Feb 21, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason for doing this? I'd prefer to not introduce any new names like pinentry-real.

Copy link
Member Author

@oxij oxij Feb 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #55061 (comment) and above discussion.

Copy link
Member

@matthewbauer matthewbauer Feb 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess I'd rather have res. than have to deal with the -real derivations. You could also fix the no-x-libs.nix thing by just overriding like:

pinentry = super.pinentry.override {
  gtk2 = null;
}

in no-x-libs.nix

Copy link
Member

@matthewbauer matthewbauer Feb 28, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i suppose this isn't so bad for now. Could you call it pinentry_gtk2 to a be a little more descriptive?

Copy link
Member

@matthewbauer matthewbauer Feb 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What worries me though is having to have a "real" version for every package with an override. That looks like it is needed for the a = a_<flavor>; type overrides to work.

Copy link
Member

@roberth roberth Aug 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has been replaced by a multiple outputs on a single derivation. While that's horrible for derivation closure size and rebuilds, it makes this discussion irrelevant for now.

libcap = if stdenv.isDarwin then null else libcap;
};

pinentry_ncurses = res.pinentry.override {
pinentry = pinentry-real;

pinentry_ncurses = pinentry-real.override {
gtk2 = null;
};

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

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

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

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

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

gradleGen = callPackage ../development/tools/build-managers/gradle { };
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;
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;

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

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

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

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

Expand All @@ -9793,7 +9795,7 @@ in

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

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

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

Expand Down Expand Up @@ -9867,11 +9869,11 @@ in
};

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

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

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

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

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

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

libxml2Python = pkgs.buildEnv { # slightly hacky
name = "libxml2+py-${res.libxml2.version}";
paths = with libxml2; [ dev bin py ];
inherit (libxml2) passthru;
# the hook to find catalogs is hidden by buildEnv
postBuild = ''
mkdir "$out/nix-support"
cp '${libxml2.dev}/nix-support/propagated-build-inputs' "$out/nix-support/"
'';
};
libxml2Python = callPackage ../development/libraries/libxml2/python.nix { };

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

faust = res.faust2;
faust = faust2;

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

Expand Down Expand Up @@ -22767,7 +22760,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 = res.samsung-unified-linux-driver_4_01_17;
samsung-unified-linux-driver = samsung-unified-linux-driver_4_01_17;

sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {});

Expand Down