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.

Sign up for GitHub

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

Jump to bottom

libhandy_1: init at 1.0.2 (backport) #106680

Closed
wants to merge 4 commits into from
Closed

libhandy_1: init at 1.0.2 (backport) #106680

wants to merge 4 commits into from

Conversation

unode
Copy link
Member

@unode unode commented Dec 11, 2020

This commit follows the same naming scheme currently in use in for libhandy in the 'master' branch.
References to libhandy were renamed to libhandy_0.

Effectively the changes introduced are only meant to allow libhandy to be upgraded to 1.x without breaking depending packages.

Motivation for this change

cpupower-gui v1.0.0 requires libhandy 1.x .

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.

@unode
Copy link
Member Author

unode commented Dec 11, 2020

nixpkgs-review is still compiling on my system:

1 package added:
libhandy_0 (init at 0.0.13)

31 packages updated:
adapta-gtk-theme appcenter calls chrome-gnome-shell contrast elementary-greeter elementary-gsettings-desktop-schemas elementary-onboarding elementary-session-settings-unstable epiphany fractal geary gnome-calendar gnome-clocks gnome-contacts gnome-control-center gnome-notes gnome-podcasts gnome-session gnome-shell gnome-shell-extension-night-theme-switcher gnome-shell-gsconnect gnome-shell-pomodoro gnome-terminal gnome-tweaks libhandy (0.0.13 → 1.0.2) newsflash seahorse shortwave wingpanel wingpanel-applications-menu

but no failures are expected since this is only a package rename.

@ofborg ofborg bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: pantheon The Pantheon desktop environment labels Dec 11, 2020
@unode unode mentioned this pull request Dec 11, 2020
Merged
10 tasks
jonringer
jonringer reviewed Dec 11, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

pkgs/top-level/all-packages.nix Outdated
Comment on lines 5155 to 5160
libhandy = callPackage ../development/libraries/libhandy { };

# Needed for apps that still depend on the unstable verison of the library (not libhandy-1)
libhandy_0 = callPackage ../development/libraries/libhandy/0.x.nix { };
Copy link
Contributor

Choose a reason for hiding this comment

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

I would do something like this, and then remove all of the fixup commits

Suggested change
libhandy = callPackage ../development/libraries/libhandy { };
# Needed for apps that still depend on the unstable verison of the library (not libhandy-1)
libhandy_0 = callPackage ../development/libraries/libhandy/0.x.nix { };
libhandy = libhandy_0;
# stable branch
libhandy_1 = callPackage ../development/libraries/libhandy { };
# unstable verison of the library (not libhandy-1)
libhandy_0 = callPackage ../development/libraries/libhandy/0.x.nix { };

@jonringer
Copy link
Contributor

also, backports target the release-YY.MM branch. the nixos-* channels are meant to match the nix-channel

@unode
Copy link
Member Author

unode commented Dec 11, 2020

Result of nixpkgs-review 1

32 packages built:
  • adapta-gtk-theme
  • calls
  • chrome-gnome-shell
  • contrast
  • epiphany
  • fractal
  • gnome-podcasts
  • gnome3.bijiben
  • gnome3.geary
  • gnome3.gnome-calendar
  • gnome3.gnome-clocks
  • gnome3.gnome-contacts
  • gnome3.gnome-control-center
  • gnome3.gnome-session
  • gnome3.gnome-shell
  • gnome3.gnome-terminal
  • gnome3.gnome-tweak-tool
  • gnome3.pomodoro
  • gnome3.seahorse
  • gnomeExtensions.gsconnect
  • gnomeExtensions.night-theme-switcher
  • libhandy
  • libhandy_0
  • newsflash
  • pantheon.appcenter
  • pantheon.elementary-greeter
  • pantheon.elementary-gsettings-schemas
  • pantheon.elementary-onboarding
  • pantheon.elementary-session-settings
  • pantheon.wingpanel-applications-menu
  • pantheon.wingpanel-with-indicators
  • shortwave

@unode
Copy link
Member Author

unode commented Dec 11, 2020

@jonringer Oops, my bad. I'll follow accordingly.

worldofpeace and others added 4 commits December 11, 2020 22:17
@worldofpeace @unode
libhandy: 0.0.13 -> 1.0.0
4a148b8 
* adapt for the move under the gnome project
  The gnome team now maintains this
* format
* cleanup meson flags
  The auto features are enabled automatically
* drop gnome3.gnome-desktop
  It doesn't seem to be neeeded in meson.build

https://gitlab.gnome.org/GNOME/libhandy/-/tags/v0.80.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.81.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.82.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.83.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.84.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.85.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.90.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.91.0
https://gitlab.gnome.org/GNOME/libhandy/-/tags/1.0.0
(cherry picked from commit 431c2c3)
@worldofpeace @unode
libhandy_0: init at 0.0.13
01fc608 
(cherry picked from commit f904737)
@wamserma @unode
libhandy: 1.0.0 -> 1.0.1, reenable checks
4c44bcf 
(cherry picked from commit 3f857b8)
@jtojnar @unode
libhandy: 1.0.1 → 1.0.2
7efacb1 
https://ftp.gnome.org/pub/GNOME/sources/libhandy/1.0/libhandy-1.0.2.news
(cherry picked from commit bfadfd5)
@unode unode force-pushed the backport-20.09-libhandy-0.x+1.x branch from d5bdf9b to 7efacb1 Compare December 11, 2020 23:04
@unode unode changed the base branch from nixos-20.09 to release-20.09 December 11, 2020 23:05
@unode
Copy link
Member Author

unode commented Dec 11, 2020

Result of nixpkgs-review pr 106680 1

1 package built:
  • libhandy_1

@ofborg ofborg bot added 6.topic: nixos 8.has: module (update) and removed 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: pantheon The Pantheon desktop environment labels Dec 11, 2020
@unode unode changed the title libhandy: 0.0.13 -> 1.0.2 and keep 0.0.13 as libhandy_0 libhandy_1: init at 1.0.2 (backport) Dec 11, 2020
@unode
Copy link
Member Author

unode commented Dec 11, 2020

Ready from my side

@jonringer
Copy link
Contributor

was this ever in master?

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

@jonringer
Copy link
Contributor

generally new additions land in master, I'm fine with backporting new packages, but the release branch should always contain packages that have at least existed in master

@unode
Copy link
Member Author

unode commented Dec 12, 2020 •
edited

@jonringer All cherry picked commits are from master with git cherry-pick -x <rev>.

The only change I introduced was to point libhandy to libhandy_0 as you suggested above.
This avoids having to patch every package that depends on it since most packages are not compatible with libhandy 1.x.

If you are referring to libhandy_1 not currently existing in master, 7454e95 part of #100120 should address that once it gets merged.

If this is too confusing, I'm happy to make an independent pull request to add libhandy_1 to master and cherry pick it here. Would then also remove it from #100120

lasandell
lasandell approved these changes Dec 13, 2020
View reviewed changes
Copy link
Contributor

@lasandell lasandell left a comment

Choose a reason for hiding this comment

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

Tested building/running shortwave.

@stale
Copy link

stale bot commented Jun 16, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 16, 2021
@unode
Copy link
Member Author

unode commented Jun 17, 2021

Backport shouldn't be necessary anymore now that a new release is out.

@unode unode closed this Jun 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@lasandell lasandell lasandell approved these changes

@craigem craigem Awaiting requested review from craigem

@hedning hedning Awaiting requested review from hedning

@jtojnar jtojnar Awaiting requested review from jtojnar

@dtzWill dtzWill Awaiting requested review from dtzWill

@lheckemann lheckemann Awaiting requested review from lheckemann

@kira-bruneau kira-bruneau Awaiting requested review from kira-bruneau

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

Assignees
No one assigned
Labels
2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@unode @jonringer @lasandell @worldofpeace @wamserma @jtojnar