diff options
| author | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-08-21 09:17:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-21 09:17:48 +0000 |
| commit | ed70e8c52dbe98f130fad2c011f1084f53c45118 (patch) | |
| tree | 651c23b5be7973e3c03d67f377fbeac2e901da26 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 92ccc5f48b4f59e36175115abf334a1cc7d2c48e (diff) | |
| parent | b955304456e58c3be8df824d7ad2ffc997411945 (diff) | |
Merge pull request #250489 from amjoseph-nixpkgs/pr/gcc/deduplicate-staging
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