diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-07-05 02:22:26 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-07-05 02:22:26 +0200 |
| commit | 2819e547d3042da197b1f8d3c1e5b7264256654d (patch) | |
| tree | 47acb6ef1e0a63078cbf44271f44b17d23bd1dd5 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | fb7b05b21dba1d6d81a3a91015730d61a119fd59 (diff) | |
| parent | c0ba7fbc99d9fbd27769055a428ed62d399eb806 (diff) | |
Merge branch 'staging-next' into staging
; Conflicts:
; pkgs/development/libraries/nss/generic.nix
- bb53634671d5bb63e060919d5062d079b5e50b98 removed the conditionals since firefox-esr-91 and nss <3.69 has been dropped a while ago.
- cb3762857d1aa0951b3bd4b427994eab9002e517 updated the conditionals to always partition the tests based on the nss_latest version. Chosen that since it will remain future proof.
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions