This was achieved using the following command:
sd 'wrapGAppsHook\b' wrapGAppsHook3 (rg -l 'wrapGAppsHook\b')
And then manually reverted the following changes:
- alias in top-level.nix
- function name in wrap-gapps-hook.sh
- comment in postFixup of at-spi2-core
- comment in gtk4
- comment in preFixup of 1password-gui/linux.nix
- comment in postFixup of qgis/unwrapped-ltr.nix and qgis/unwrapped.nix
- comment in postFixup of telegram-desktop
- comment in postFixup of fwupd
- buildCommand of mongodb-compass
- postFixup of xflux-gui
- comment in a patch in kdePackages.kde-gtk-config and plasma5Packages.kde-gtk-config
- description of programs.sway.wrapperFeatures.gtk NixOS option (manual rebuild)
The nixpkgs-unstable channel's programs.sqlite was used to identify
packages producing exactly one binary, and these automatically added
to their package definitions wherever possible.
The lib.getExe function's feature of assuming the program name from the
package is depracated, and it says to specify it here.
I was not sure whether I should do zotero itself, or .zotero-wrapped. I
put just zotero here, but I will change it if it should be the wrapped
version.
I didn't see any meta.mainProgam use the wrapped one, so I didn't use it
here.
Zotero 6 is based on Firefox 60 and has not patched this vulnerability.
The next version is based on Firefox 102 (ESR) and has patched this, but
is is still in beta.
See also NixOS/nixpkgs#258048.
zotero currently fails in pure environments with:
.zotero-wrapped: line 12: readlink: command not found
.zotero-wrapped: line 12: dirname: command not found
.zotero-wrapped: line 13: /zotero-bin: No such file or directory
Because the script assumes that readlink and dirname are
available. Fix by adding coreutils to PATH using the wrapper.
There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299