Skip to content

Commit

Permalink
Merge pull request #250489 from amjoseph-nixpkgs/pr/gcc/deduplicate-s…
Browse files Browse the repository at this point in the history
…taging

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.
  • Loading branch information
Adam Joseph committed Aug 21, 2023
2 parents 92ccc5f + b955304 commit ed70e8c
Show file tree
Hide file tree
Showing 67 changed files with 717 additions and 3,254 deletions.
296 changes: 0 additions & 296 deletions pkgs/development/compilers/gcc/10/default.nix

This file was deleted.

Loading

0 comments on commit ed70e8c

Please sign in to comment.