diff options
| author | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-08-21 09:17:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-21 09:17:31 +0000 |
| commit | e61c8da98dd6846c1adb4dd0afacfbe3f485b414 (patch) | |
| tree | 83929e06389d977620b10b27cb94773bbda4f773 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | c0a2484c2c5a5dc9e98fa15ef9323fea793c87f4 (diff) | |
| parent | 1b0ed9f81b357f0ac7e383bb26014b441f7edfb1 (diff) | |
Merge pull request #249707 from amjoseph-nixpkgs/pr/gcc/deduplicate
gcc: deduplicate version expressions
The last merge of `staging` into `master` caused a really nasty merge conflict here.
Since this is strictly cleanup (no change after eval), in order to prevent that from happening again I am merging this to both `master` and `staging`. It's much easier to rebase other patches past this one than it is to rebase this one past other patches.
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions