diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-05-06 08:42:50 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-06 08:42:50 +0200 |
| commit | d9f177eb4d5b02a41797f814bcfc94549d02db96 (patch) | |
| tree | 8fb43498bc8d46797dab0cf5a575f1d08de5a08b /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | bc29d22a2cd7edd240ff410d07b0c9ce0c34f24f (diff) | |
| parent | 305e1c94462cc3cd35ec85bfc73c177dfbfbccb9 (diff) | |
Merge branch 'staging-next' into staging
The transmission conflict was non-trivial:
- libbrotli added to apparmor rules <https://github.com/NixOS/nixpkgs/commit/1bdda029cd85b5f4358697afd2c8f6a1996c6ccf>
- apparmor rules rewritten <https://github.com/NixOS/nixpkgs/commit/b280e64078d69c59cf4fccfcaa9d56a59d789dc9>
Chosen the rewrite and verified that brotli is part of the rule set generated by `apparmorRulesFromClosure`.
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions