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

[20.09] Added mime info path for mimemagic #119757

Merged

Conversation

nixy
Copy link
Contributor

@nixy nixy commented Apr 17, 2021

Motivation for this change

The fixes done to make mimemagic continue to work with Nix should be backported to the current stable version since there is currently no version of mimemagic available that can be built without these fixes.

Original commits/discussion in #117702

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.

@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 119757 run on x86_64-linux 1

1 package marked as broken and skipped:
  • frab
4 packages built:
  • gitlab
  • gitlab-ee
  • iruby
  • redmine

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

Please follow the contributing guide when backporting commits.

@nixy
Copy link
Contributor Author

nixy commented Apr 19, 2021

Please follow the contributing guide when backporting commits.

I am unsure what changes are being requested here. I made a best effort attempt at following the contributing guidelines here and if I have made some mistake it isn't obvious to me. Happy to make any changes but not sure what needs to be done here.

@nixy nixy force-pushed the release-20.09-backport-mimemagic branch from 2c8a579 to d369e85 Compare April 19, 2021 01:41
@SuperSandro2000
Copy link
Member

The important part for this PR is https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes and especially the git cherry-pick -x part.

(cherry picked from commit cb7b5a0dfdf30747164204c69927df26af338111)
(cherry picked from commit 75bc87f6f89552a5f3d75588394bf261d260eabf)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
(cherry picked from commit d369e8534151fb9ebe54f1fc2e4f6fa73ff298e3)
@nixy nixy force-pushed the release-20.09-backport-mimemagic branch from d369e85 to f57ce8c Compare April 19, 2021 12:41
@aanderse
Copy link
Member

This is needed to resolve #120413, so this indirectly becomes a "security" tag.

ping @SuperSandro2000 please ❤️

@aanderse aanderse mentioned this pull request Apr 23, 2021
10 tasks
@SuperSandro2000 SuperSandro2000 merged commit 694850d into NixOS:release-20.09 Apr 24, 2021
@aanderse
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants