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

at-spi2-core: propagate glib and dbus #78120

Merged
merged 1 commit into from Jan 23, 2020
Merged

at-spi2-core: propagate glib and dbus #78120

merged 1 commit into from Jan 23, 2020

Conversation

Profpatsch
Copy link
Member

Both libraries are in the pkgconfig Requires field and are needed by
all downstream dependencies of this library.

Fell out of #78051

@Profpatsch Profpatsch mentioned this pull request Jan 20, 2020
Merged
10 tasks
worldofpeace
worldofpeace reviewed Jan 20, 2020
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Should be fine, can't remember how big the rebuild is here (waiting on eval)

@Profpatsch Profpatsch force-pushed the at-spi2-core-propagate-glib-dbus branch from 253a0f2 to 079a91d Compare January 20, 2020 19:04
@worldofpeace
Copy link
Contributor

Ok this is huge ❗ staging please 😄

@Profpatsch Profpatsch changed the base branch from master to staging January 21, 2020 10:33
@Profpatsch Profpatsch force-pushed the at-spi2-core-propagate-glib-dbus branch from 079a91d to 876c4fe Compare January 21, 2020 10:36
@infinisil
Copy link
Member

I think you need to rebase on the merge-base of master and staging, e.g git fetch upstream; git rebase --onto $(git merge-base upstream/master upstream/staging) HEAD~1

@Profpatsch
at-spi2-core: propagate glib and dbus
eea30a7 
Both libraries are in the pkgconfig `Requires` field and are needed by
all downstream dependencies of this library.
@Profpatsch Profpatsch force-pushed the at-spi2-core-propagate-glib-dbus branch from 876c4fe to eea30a7 Compare January 23, 2020 14:09
@Profpatsch
Copy link
Member Author

Profpatsch commented Jan 23, 2020 •
edited

Ah, yes, obviously (r s in magit). Sometimes I forget how to git …

@Profpatsch
Copy link
Member Author

@worldofpeace we can merge into staging when the evaluation succeeds, right?

@ofborg ofborg bot removed 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: haskell 6.topic: nixos 6.topic: pantheon The Pantheon desktop environment 6.topic: python 6.topic: qt/kde 8.has: changelog 8.has: documentation 8.has: module (update) labels Jan 23, 2020
worldofpeace
worldofpeace approved these changes Jan 23, 2020
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Yep @Profpatsch

@worldofpeace
Copy link
Contributor

Ah, yes, obviously (r s in magit). Sometimes I forget how to git …

Literally mood every day 🤣

@Profpatsch Profpatsch merged commit acdb256 into NixOS:staging Jan 23, 2020
@hedning hedning mentioned this pull request Feb 11, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

@jtojnar jtojnar Awaiting requested review from jtojnar

@hedning hedning Awaiting requested review from hedning

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Profpatsch @worldofpeace @infinisil