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)
Note: Since Gammastep is a fork of Redshift the mkRedshift will be
reused as long as they don't diverge too far.
Also: Gammastep should eventually replace redshift-wlr.
redshift-wlr is a fork of redshift that adds support for the
wlr-gamma-control protocol. This supports sway and any other Wayland
compositors that implement the standard in the future.
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
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/redshift/versions.
These checks were done:
- built on NixOS
- Warning: no invocation of /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/redshift-gtk had a zero exit code or showed the expected version
- /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/redshift passed the binary check.
- /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/.redshift-wrapped passed the binary check.
- Warning: no invocation of /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/..redshift-gtk-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/.redshift-gtk-wrapped had a zero exit code or showed the expected version
- 2 of 5 passed binary check by having a zero exit code.
- 2 of 5 passed binary check by having the new version present in output.
- found 1.12 with grep in /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12
- directory tree listing: https://gist.github.com/c74af938c0883f174e37490cc75bdd47
- du listing: https://gist.github.com/e9328410b87b5cff576fd12cc6120fb6
This is done already in the setup hook of hicolor-icon-theme itself, so
no need to do it again.
Since the removal in the redshift derivation is in postFixup (as opposed
to the removal done by the setup hook in preFixup) and it's also not
using the -f flag of rm, the build fails.
Signed-off-by: aszlig <aszlig@nix.build>
