Skip to content

wrapGAppsHook3: rename from wrapGAppsHook#307077

Merged
wegank merged 8 commits intoNixOS:staging-nextfrom
jtojnar:wrapGappsHook3
Apr 27, 2024
Merged

wrapGAppsHook3: rename from wrapGAppsHook#307077
wegank merged 8 commits intoNixOS:staging-nextfrom
jtojnar:wrapGappsHook3

Conversation

@jtojnar
Copy link
Member

@jtojnar jtojnar commented Apr 26, 2024 •
edited by wegank
Loading

Description of changes

GTK 3 is slowly approaching deprecation so let’s not make it default.

Closes #303921.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: qt/kde Object-oriented framework for GUI creation 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: vim Advanced text editor 6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: xfce The Xfce Desktop Environment 6.topic: pantheon The Pantheon desktop environment 6.topic: cinnamon Desktop environment 6.topic: Lumina DE The Lumina Desktop Environment 6.topic: Enlightenment DE The Enlightenment Desktop Environment 6.topic: mate The MATE Desktop Environment labels Apr 26, 2024
@ofborg ofborg bot removed 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Apr 26, 2024
@jtojnar

This comment was marked as resolved.

Sign in to view
@github-actions github-actions bot removed the 8.has: module (update) This PR changes an existing module in `nixos/` label Apr 26, 2024
jtojnar added 3 commits April 27, 2024 02:23
@jtojnar
treewide: wrapGAppsHook → wrapGAppsHook3
eb04659 
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)
@jtojnar
treewide: Adjust wrapGApps* hook references
8210cb2
@jtojnar
wrapGAppsHook: Move to aliases
1d2b048 
Now that there are no references in Nixpkgs.
@ofborg ofborg bot added the 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. label Apr 27, 2024
@wegank wegank merged commit 2521336 into NixOS:staging-next Apr 27, 2024
@jtojnar jtojnar deleted the wrapGappsHook3 branch April 27, 2024 07:00
@trofi
Copy link
Contributor

trofi commented Apr 29, 2024

A bit of fallout:

@Infinidoge
Copy link
Contributor

Infinidoge commented Apr 29, 2024

New PR due to accidental mass ping: #307845

@jackwilsdon jackwilsdon mentioned this pull request May 3, 2024
Merged
13 tasks
@Scrumplex Scrumplex mentioned this pull request May 8, 2024
Merged
13 tasks
imincik added a commit to imincik/geospatial-nix that referenced this pull request May 9, 2024
@imincik
qgis: add wrapgappshook reverse patch
a01dc4a 
Nixpkgs PR:
NixOS/nixpkgs#307077
imincik added a commit to imincik/geospatial-nix that referenced this pull request May 9, 2024
@imincik
grass: add wrapgappshook reverse patch
f1742e8 
Nixpkgs PR:
NixOS/nixpkgs#307077
@Scrumplex Scrumplex mentioned this pull request May 10, 2024
Merged
13 tasks
@jtojnar jtojnar mentioned this pull request May 19, 2024
Closed
@getchoo getchoo mentioned this pull request Nov 19, 2024
Merged
13 tasks
@eclairevoyant eclairevoyant mentioned this pull request Dec 18, 2024
Closed
sigprof added a commit to sigprof/nur-packages that referenced this pull request Oct 30, 2025
@sigprof
virt-manager-2: rename wrapGAppsHook to wrapGAppsHook3
8d9782b 
`wrapGAppsHook` was renamed to `wrapGAppsHook3` in NixOS/nixpkgs#307077
(available since NixOS 24.05), and since NixOS/nixpkgs#456065 the old
name no longer works.  Update the old virt-manager package accordingly.
@sigprof sigprof mentioned this pull request Oct 30, 2025
Merged
@rwxae rwxae mentioned this pull request Oct 30, 2025
Closed
@Ambossmann Ambossmann mentioned this pull request Nov 3, 2025
Merged
8 tasks
jelemux added a commit to jelemux/OpenTabletDriver that referenced this pull request Nov 14, 2025
@jelemux
default.nix: Replace wrapGAppsHook with wrapGAppsHook3
e84e0cb 
Since GTK3 is slowly being deprecated, the nixpkgs developers renamed wrapGAppsHook to wrapGAppsHook3 to not make GTK3 the default anymore. See NixOS/nixpkgs#307077
@jelemux jelemux mentioned this pull request Nov 14, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wegank wegank wegank approved these changes

@mkg20001 mkg20001 Awaiting requested review from mkg20001

@figsoda figsoda Awaiting requested review from figsoda

@adisbladis adisbladis Awaiting requested review from adisbladis

@K900 K900 Awaiting requested review from K900

@NickCao NickCao Awaiting requested review from NickCao

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@mweinelt mweinelt Awaiting requested review from mweinelt

@infinisil infinisil Awaiting requested review from infinisil

@Aleksanaa Aleksanaa Awaiting requested review from Aleksanaa

+1 more reviewer

@amaxine amaxine amaxine approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: cinnamon Desktop environment 6.topic: emacs Text editor 6.topic: Enlightenment DE The Enlightenment Desktop Environment 6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: Lumina DE The Lumina Desktop Environment 6.topic: mate The MATE Desktop Environment 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: vim Advanced text editor 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 6.topic: xfce The Xfce Desktop Environment 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jtojnar @trofi @Infinidoge @wegank @amaxine