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

Jump to bottom

wofi: 1.1 -> 1.1.2 + fix #83283

Merged
merged 2 commits into from Mar 24, 2020
Merged

wofi: 1.1 -> 1.1.2 + fix #83283

merged 2 commits into from Mar 24, 2020

Conversation

ghost
Copy link

@ghost ghost commented Mar 24, 2020 •
edited by ghost

Motivation for this change

On the latest wofi version, when allow_images is set to true while using a custom icon pack, Wofi crashes.

Upstream fixed this issue, but haven't yet released the revision, you can find more details here: https://todo.sr.ht/~scoopta/wofi/54.

In this PR, I have updated wofi to its latest version and applied the fix (it seems to be NixOS related).
Once a release is made with this patch, it will be safe to discard it.

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.

@ofborg ofborg bot requested a review from erictapen March 24, 2020 12:26
erictapen
erictapen approved these changes Mar 24, 2020
View reviewed changes
Copy link
Member

@erictapen erictapen left a comment

Choose a reason for hiding this comment

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

Thanks!
There is a fetchpatch function, that normalizes downloaded patches. But I think this is fine for now.

@ghost
Copy link
Author

ghost commented Mar 24, 2020

Hello @erictapen : Thanks for the quick review ! I've made the change :)

@ofborg ofborg bot requested a review from erictapen March 24, 2020 16:11
@dywedir dywedir changed the title Wofi: 1.1 -> 1.1.2 + fix wofi: 1.1 -> 1.1.2 + fix Mar 24, 2020
@dywedir dywedir merged commit 7e62388 into NixOS:master Mar 24, 2020
@dywedir
Copy link
Member

dywedir commented Mar 24, 2020

Thanks!

@wkral
Copy link
Contributor

wkral commented Mar 27, 2020

I just tried updating after this was merged, and I'm getting a hash mismatch for the patch that is being downloaded.

hash mismatch in fixed-output derivation '/nix/store/09zwrqy73k1dfwpprmp9w78hx45pq5wj-1cbddafac3806afb203940c029e78ce8390d8f49': wanted: sha256:18960y9ajilrwwl6mjnrh6wj0sm4ivczmacck36p2dj9xd0n8vkh got: sha256:1n4jpmh66p7asjhj0z2s94ny91lmaq4hhh2356nj406vlqr15vbb

I wonder is it possible that it changed at the location? Or something else going on?

@ghost
Copy link
Author

ghost commented Mar 27, 2020

The hash has indeed changed. I will add a static version of the match, I will open a new PR for this asap. I'm really surprised to be honest. I'm not familiar with SourceHut.

@ghost ghost mentioned this pull request Mar 27, 2020
Merged
10 tasks
@ghost
Copy link
Author

ghost commented Mar 27, 2020

@wkral : I've opened a PR with the patch file directly available in the directory, can you test if it works correctly for you on the other PR ?

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

@erictapen erictapen Awaiting requested review from erictapen

Assignees
No one assigned
Labels
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
3 participants
@dywedir @wkral @erictapen