Skip to content

gcc{6..11}: import a patch into nixpkgs#234204

Merged
Artturin merged 1 commit intoNixOS:stagingfrom
vcunat:p/gcc-nofetch-patch
Jun 8, 2023
Merged

gcc{6..11}: import a patch into nixpkgs#234204
Artturin merged 1 commit intoNixOS:stagingfrom
vcunat:p/gcc-nofetch-patch

Conversation

@vcunat
Copy link
Copy Markdown
Member

@vcunat vcunat commented May 26, 2023

fetchurl can't be used on generated patches this way. The hash doesn't match anymore. fetchpatch would be an alternative.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@vcunat
gcc{6..11}: import a patch into nixpkgs
c98d687 
fetchurl can't be used on generated patches this way.
The hash doesn't match anymore.  fetchpatch would be an alternative.
@vcunat vcunat added 6.topic: reproducible builds Run nix-build twice and get the same result. backport release-23.05 labels May 26, 2023
@vcunat vcunat requested a review from matthewbauer as a code owner May 26, 2023 11:07
@K900
Copy link
Copy Markdown
Contributor

K900 commented May 26, 2023

FWIW, the reason the hash doesn't match is the cgit version trailer.

@vcunat
Copy link
Copy Markdown
Member Author

vcunat commented May 26, 2023

This was discussed in #dev chat.

On 22.11 this would be a huge rebuild, so I guess we can just leave it be. You only encounter this error if you disable using cache.nixos.org

@ofborg ofborg bot requested review from Ericson2314 and Synthetica9 May 26, 2023 11:49
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels May 26, 2023
@vcunat
Copy link
Copy Markdown
Member Author

vcunat commented May 26, 2023

Uh, larger rebuild than I expected, but I don't think this needs to go fast.

@vcunat vcunat changed the base branch from master to staging May 26, 2023 12:04
Artturin
Artturin approved these changes Jun 8, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@Artturin Artturin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

built gcc6

@Artturin Artturin merged commit 69b154f into NixOS:staging Jun 8, 2023
@github-actions github-actions bot mentioned this pull request Jun 8, 2023
Merged
1 task
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jun 8, 2023

Successfully created backport PR for staging-23.05:

@vcunat vcunat deleted the p/gcc-nofetch-patch branch June 8, 2023 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Artturin Artturin Artturin approved these changes

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Synthetica9 Synthetica9 Awaiting requested review from Synthetica9

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

Assignees

No one assigned

Labels

6.topic: reproducible builds Run nix-build twice and get the same result. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@vcunat @K900 @Artturin