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

Fix/colliding icon caches #36349

Merged
merged 0 commits into from Mar 5, 2018
Merged

Fix/colliding icon caches #36349

merged 0 commits into from Mar 5, 2018

Conversation

rycee
Copy link
Member

@rycee rycee commented Mar 5, 2018

Motivation for this change

To fix file collision error. See Reddit thread.

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: xfce The Xfce Desktop Environment label Mar 5, 2018
@rycee
Copy link
Member Author

rycee commented Mar 5, 2018

CC @matthiasbeyer

matthiasbeyer
matthiasbeyer approved these changes Mar 5, 2018
View reviewed changes
Copy link
Contributor

@matthiasbeyer matthiasbeyer left a comment

Choose a reason for hiding this comment

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

I see nothing bogus here.

@rycee rycee closed this Mar 5, 2018
@rycee rycee force-pushed the fix/colliding-icon-caches branch from 9922635 to c7f4020 Compare March 5, 2018 20:48
@rycee rycee deleted the fix/colliding-icon-caches branch March 5, 2018 20:48
@rycee
Copy link
Member Author

rycee commented Mar 5, 2018

Thanks @matthiasbeyer! I've merged the commits to master now.

@rycee rycee merged commit c7f4020 into NixOS:master Mar 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthiasbeyer matthiasbeyer matthiasbeyer approved these changes

Assignees
No one assigned
Labels
6.topic: xfce The Xfce Desktop Environment 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
@rycee @matthiasbeyer @GrahamcOfBorg