Skip to content
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.

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

Move various packages out of gnome scope #319659

Merged
merged 47 commits into from
Jul 2, 2024
Merged

Conversation

jtojnar
Copy link
Member

@jtojnar jtojnar commented Jun 13, 2024

Description of changes

We have been slowly disbanding it since it offers little benefit.

Extracted from #319535

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:
    • nixosTests.{gnome,gnome-xorg,cinnamon,pantheon}
    • and/or package tests
    • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
    • made sure NixOS tests are linked to the relevant packages
  • 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.11 Release Notes (or backporting 23.11 and 24.05 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.

Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

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

Diff and commits look good, and I'm not against this change, but I don't fully understand the motivation for it.

@jtojnar
Copy link
Member Author

jtojnar commented Jun 14, 2024

Mainly, the consensus of GNOME maintainers a long time ago was that the scope is more trouble than it’s worth:

  • Overlays are even harder (overrideScope required).
  • Referring to non-leaf packages outside the scope is annoying – callPackage can only inject the scope, and overriding the dependencies requires modifying the scope.
  • Attributes already have gnome- as prefix so it would be duplicated in the scope name.
  • Selection criteria are unclear – should this just be core package set?
  • Upstream package status is fluent – what should we do if an app becomes a part of core, what if it gets removed?
  • Main benefit was ability to update all GNOME packages at once but we still needed to do libraries like GLib or GTK manually. Nowadays we use predicate matching on updateScript name but there is still room for improvement (e.g. adding tags).

Edit: Added a comment to the top of the scope.

@doronbehar
Copy link
Contributor

OK then, I fully support this PR.

@emilylange
Copy link
Member

Can you please squash all those /Move from gnome scope to top-level/ commits into a single treewide one?

@doronbehar
Copy link
Contributor

I tend to like how there the PR is split to multiple commits - makes reviewing easier.

@jtojnar jtojnar merged commit 0f56e32 into NixOS:master Jul 2, 2024
26 checks passed
@jtojnar jtojnar deleted the gnome-extract branch July 2, 2024 06:03
@linsui
Copy link
Contributor

linsui commented Jul 4, 2024

Why are some packages still kept in gnome scope? And I thought we should add some aliases?

@jtojnar
Copy link
Member Author

jtojnar commented Jul 4, 2024

It is lot of work so I am doing it in waves – more will be come later (help appreciated). Aliases should have been added – if I missed any we should fix that.

@linsui
Copy link
Contributor

linsui commented Jul 4, 2024

Ah, sorry, I forgot that I disabled allowAliases. 🤦 it takes me some time to figure out which packages are moved and fix all of them.

8bitbuddhist added a commit to 8bitbuddhist/nix-configuration that referenced this pull request Jul 5, 2024
jtojnar added a commit to jtojnar/nixfiles that referenced this pull request Jul 9, 2024
Flake lock file updates:

• Updated input 'agenix':
    'github:ryantm/agenix/3a56735779db467538fb2e577eda28a9daacaca6' (2024-06-14)
  → 'github:ryantm/agenix/de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6' (2024-07-09)
• Updated input 'home-manager':
    'github:nix-community/home-manager/59ce796b2563e19821361abbe2067c3bb4143a7d' (2024-07-01)
  → 'github:nix-community/home-manager/2fb5c1e0a17bc6059fa09dc411a43d75f35bb192' (2024-07-08)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/7f993cdf26ccef564eabf31fdb40d140821e12bc' (2024-07-01)
  → 'github:nixos/nixpkgs/655a58a72a6601292512670343087c2d75d859c1' (2024-07-08)

  - large `gnome` extraction (NixOS/nixpkgs#319659)
  - PAM module switched `u2f` to RFC42 settings (NixOS/nixpkgs#276106)
  - Proper GDM fingerprint support (NixOS/nixpkgs#324347)
@cafkafk cafkafk mentioned this pull request Jul 16, 2024
12 tasks
tomodachi94 added a commit to tomodachi94/home-manager that referenced this pull request Jul 24, 2024
The ``pkgs.gnome.gnome-terminal`` package was moved to
``pkgs.gnome-terminal``. The former is now a deprecated alias that
throws a warning whenever a configuration enabling the module is used:

```
The ‘gnome.gnome-terminal’ was moved to top-level. Please use
‘pkgs.gnome-terminal’ directly.
```

Related: NixOS/nixpkgs#319659
Related: nix-community#5611
rycee pushed a commit to tomodachi94/home-manager that referenced this pull request Jul 27, 2024
The `pkgs.gnome.gnome-terminal` package was moved to
`pkgs.gnome-terminal`. The former is now a deprecated alias that
throws a warning whenever a configuration enabling the module is used:

```
The ‘gnome.gnome-terminal’ was moved to top-level. Please use
‘pkgs.gnome-terminal’ directly.
```

Related: NixOS/nixpkgs#319659
Related: nix-community#5611
Nanotwerp added a commit to Nanotwerp/home-manager that referenced this pull request Aug 7, 2024
…ita-icon-theme`

`adwaita-icon-theme` has been moved out of the `gnome` scope and into the top level with NixOS/nixpkgs#319659
Nanotwerp added a commit to Nanotwerp/home-manager that referenced this pull request Aug 7, 2024
…ita-icon-theme` in the examples

`adwaita-icon-theme` has been moved out of the `gnome` scope and into the top level with NixOS/nixpkgs#319659
philiptaron added a commit to philiptaron/flock.nix that referenced this pull request Aug 21, 2024
octvs added a commit to octvs/deepl that referenced this pull request Aug 25, 2024
- Follow renaming of `pkgs.gnome.adwaita-icon-theme` to top level from
  upstream nixpkgs [1].

[1] NixOS/nixpkgs#319659
PerchunPak pushed a commit to PerchunPak/home-manager that referenced this pull request Sep 17, 2024
The `pkgs.gnome.gnome-terminal` package was moved to
`pkgs.gnome-terminal`. The former is now a deprecated alias that
throws a warning whenever a configuration enabling the module is used:

```
The ‘gnome.gnome-terminal’ was moved to top-level. Please use
‘pkgs.gnome-terminal’ directly.
```

Related: NixOS/nixpkgs#319659
Related: nix-community#5611
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants