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

gitg: 41 -> 44 #301869

Merged
merged 1 commit into from
Apr 16, 2024
Merged

gitg: 41 -> 44 #301869

merged 1 commit into from
Apr 16, 2024

Conversation

Luflosi
Copy link
Contributor

@Luflosi Luflosi commented Apr 5, 2024

Description of changes

https://download.gnome.org/sources/gitg/44/gitg-44.news

Also:

  • Add myself as a maintainer
  • Enable strictDeps
  • Run the tests again since they now work
  • Use --replace-fail instead of --replace for substituteInPlace

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:
  • 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.05 Release Notes (or backporting 23.05 and 23.11 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.

@Luflosi Luflosi requested a review from jtojnar as a code owner April 5, 2024 15:01
@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Apr 5, 2024
@amaxine
Copy link
Contributor

amaxine commented Apr 5, 2024

Also included in #291339.

@Luflosi Luflosi marked this pull request as draft April 5, 2024 15:30
@Luflosi
Copy link
Contributor Author

Luflosi commented Apr 5, 2024

Ah, a GitHub search for "gitg" didn't find that.
How should we best combine our changes into one commit? Each of the two commits has improvements not included in the other.

@ofborg ofborg bot requested a review from domenkozar April 5, 2024 15:34
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Apr 5, 2024
@amaxine
Copy link
Contributor

amaxine commented Apr 7, 2024

@Luflosi feel free to integrate the changes from the gnome-46 branch into this PR, or PR your changes to the gnome-46 branch, whichever works for you. I don't believe this is actively blocked on anything that's included in the gnome-46 branch, so whichever way you prefer is good.

@Luflosi Luflosi marked this pull request as ready for review April 14, 2024 11:06
@Luflosi
Copy link
Contributor Author

Luflosi commented Apr 14, 2024

I updated my PR to also remove adwaita-icon-theme like in the gnome-46 branch.

This PR should now be a strict superset of the commit in the gnome-46 branch.

@amaxine
Copy link
Contributor

amaxine commented Apr 15, 2024

I'll make a note to drop the commit from gnome-46 during next rebase.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3796

@amaxine
Copy link
Contributor

amaxine commented Apr 16, 2024

I think this is missing gvfs as a dep, or possibly is a side effect of me running it on my gnome 46 system and it doesn't like newer gvfs.

/nix/store/39vd62yh0j8zgrm20f9rv2mwynq7gs0j-gvfs-1.54.0/lib/gvfs/libgvfscommon.so: undefined symbol: g_once_init_leave_pointer
Failed to load module: /nix/store/39vd62yh0j8zgrm20f9rv2mwynq7gs0j-gvfs-1.54.0/lib/gio/modules/libgvfsdbus.so

@Luflosi Luflosi marked this pull request as draft April 16, 2024 12:41
https://download.gnome.org/sources/gitg/44/gitg-44.news

Also:
- Add myself as a maintainer
- Enable `strictDeps`
- Run the tests again since they now work
- Use `--replace-fail` instead of `--replace` for `substituteInPlace`
@Luflosi
Copy link
Contributor Author

Luflosi commented Apr 16, 2024

I added gvfs as a dependency. Can you please check if you still have the same problem?

@amaxine
Copy link
Contributor

amaxine commented Apr 16, 2024

I built it that way locally before leaving the comment, so yes 😅

@Luflosi Luflosi marked this pull request as ready for review April 16, 2024 13:40
@Luflosi
Copy link
Contributor Author

Luflosi commented Apr 16, 2024

Okay, thank you.
So this should be ready for merging, right?

@amaxine amaxine merged commit f1901cf into NixOS:master Apr 16, 2024
17 of 19 checks passed
@Luflosi Luflosi deleted the update/gitg branch April 16, 2024 14:06
@Luflosi
Copy link
Contributor Author

Luflosi commented Apr 16, 2024

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants