Skip to content

gnome: rename from gnome3#122107

Merged
jtojnar merged 1 commit intomasterfrom
no-gnome-three
May 8, 2021
Merged

gnome: rename from gnome3#122107
jtojnar merged 1 commit intomasterfrom
no-gnome-three

Conversation

@jtojnar
Copy link
Member

@jtojnar jtojnar commented May 7, 2021

Motivation for this change

Since GNOME version is now 40, it no longer makes sense to use the old attribute name.

cc @jonringer @vcunat @NixOS/gnome

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: cinnamon Desktop environment 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: haskell General-purpose, statically typed, purely functional programming language 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: steam Steam game store/launcher (store.steampowered.com) 6.topic: vim Advanced text editor 6.topic: xfce The Xfce Desktop Environment 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels May 7, 2021
Copy link
Member Author

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Tried my best with sd and then manual review.

Copy link
Member Author

Choose a reason for hiding this comment

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

Does the test name need to be updated in Hydra job? Or is nixos/release-combined.nix enough?

Copy link
Member

@vcunat vcunat May 7, 2021

Choose a reason for hiding this comment

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

This should be fine (as I see you updated the tested job, too). It will be like removing the gnome3 job and adding a gnome job; I don't think there's any way around that. Well, overall I rather see more potential costs from these mass "renamings" in code.

Copy link
Member Author

Choose a reason for hiding this comment

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

What kinds of costs? We do have aliases.

Copy link
Member

Choose a reason for hiding this comment

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

Say, various kinds of merge conflicts.

Copy link
Member Author

Choose a reason for hiding this comment

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

Or maybe this closure?

Copy link
Member Author

Choose a reason for hiding this comment

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

I wonder why we even had this.

Copy link
Member Author

Choose a reason for hiding this comment

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

This is curious. This must have been always null.

Copy link
Member Author

Choose a reason for hiding this comment

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

grilo has been in top-level for a while.

Copy link
Member Author

Choose a reason for hiding this comment

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

Had to unref the links since the options have been renamed now but we should preserve the old options in old RNs.

Copy link
Member Author

Choose a reason for hiding this comment

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

Also mentioned the rename in the current RN.

@ofborg ofborg bot added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 2.status: merge conflict This PR has merge conflicts with the target branch labels May 7, 2021
@jonringer
Copy link
Contributor

I'm fine with renaming. I agree it's awkward to have gnome3 -> gnome40

Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
@jtojnar jtojnar requested a review from maralorn as a code owner May 8, 2021 07:03
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label May 8, 2021
@jtojnar jtojnar merged commit 468cb59 into master May 8, 2021
@jtojnar jtojnar deleted the no-gnome-three branch May 8, 2021 07:47
}) {inherit (pkgs.gnome3) gnome-keyring;
}) {inherit (pkgs.gnome) gnome-keyring;
Copy link
Member

Choose a reason for hiding this comment

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

@sternenseemann Do we need to change something so that we don‘t override this?

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, looks like we are probably fine.

jtojnar added a commit that referenced this pull request May 12, 2021
This got missed in the move (#122107) because it is in a “hidden” directory.
kira-bruneau added a commit to kira-bruneau/nur-packages that referenced this pull request May 12, 2021
sigprof added a commit to sigprof/nur-packages that referenced this pull request Sep 26, 2022
The rename was done long ago in NixOS/nixpkgs#122107 (back in 21.05),
and since NixOS/nixpkgs#192681 the old `gnome3` name no longer works.
Update the old virt-manager package accordingly.
sigprof added a commit to sigprof/nur-packages that referenced this pull request Sep 26, 2022
The rename was done long ago in NixOS/nixpkgs#122107 (back in 21.05),
and since NixOS/nixpkgs#192681 the old `gnome3` name no longer works.
Update the old virt-manager package accordingly.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cinnamon Desktop environment 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: haskell General-purpose, statically typed, purely functional programming language 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: steam Steam game store/launcher (store.steampowered.com) 6.topic: vim Advanced text editor 6.topic: xfce The Xfce Desktop Environment 8.has: changelog This PR adds or changes release notes 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants