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

Update Geary to 0.12.2 from master #40845

Closed
wants to merge 0 commits into from
Closed

Update Geary to 0.12.2 from master #40845

wants to merge 0 commits into from

Conversation

alexeymuranov
Copy link
Contributor

Motivation for this change

Geary 0.12.2 fixes an annoying bug.

I've just copied the file from master branch.

I didn't test it because i do not know how.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added the 6.topic: GNOME GNOME desktop environment and its underlying platform label May 20, 2018
xeji
xeji suggested changes May 20, 2018
View reviewed changes
Copy link
Contributor

@xeji xeji left a comment

Choose a reason for hiding this comment

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

Please use git cherry-pick -x to pick the original commit from master. This allows us to track the origin of the change.

@alexeymuranov
Copy link
Contributor Author

alexeymuranov commented May 20, 2018 •
edited

I do not think that cherry-pick is applicable here...

Well, maybe i should cherry-pick all commits since the branches diverged...

@alexeymuranov
Copy link
Contributor Author

@jtojnar, what would you recommend?

@jtojnar
Copy link
Contributor

jtojnar commented May 21, 2018

If you list the commits that went into the commit, like cherry-pick -x does it will probably be fine. But it is more of a question for someone invested in old NixOS, I would just remove GNOME from release branch and recommend people using it from unstable.

@alexeymuranov
Copy link
Contributor Author

Is there an easy way to use some packages from unstable, but the rest from stable? If i add the unstable channel, then whenever i update something, Nix updates to the version from unstable.

@jtojnar
Copy link
Contributor

jtojnar commented May 21, 2018

See https://nixos.wiki/wiki/FAQ#How_can_I_install_a_package_from_unstable_while_remaining_on_the_stable_channel.3F

@alexeymuranov
Copy link
Contributor Author

alexeymuranov commented May 21, 2018 •
edited

Thanks, but if i do

sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable

i will not be able to update all the manually installed "stable" packages to "stable" versions with

nix-env -u '*'

Will there be a way to update all installed packages from stable to the newer versions from stable?

@jtojnar
Copy link
Contributor

jtojnar commented May 21, 2018

I do not use nix-env but I would think it would remember which channel you used for installing which package. Maybe ask on irc.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xeji xeji xeji requested changes

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 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
4 participants
@alexeymuranov @jtojnar @xeji @GrahamcOfBorg