Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

help2man: fix source file hash #20700

Merged
merged 1 commit into from
Nov 27, 2016
Merged

Conversation

sh01
Copy link
Contributor

@sh01 sh01 commented Nov 24, 2016

Motivation for this change

Cherry-pick hash fix commit from master branch; the current 16.09 hash is for a previous version of the upstream file (it wasn't changed along with the version in 49cf9b9), which makes this package impossible to build.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@sh01, thanks for your PR! By analyzing the history of the files in this pull request, we identified @pSub, @civodul and @edolstra to be potential reviewers.

@sh01
Copy link
Contributor Author

sh01 commented Nov 25, 2016

The test failures are all timeouts. It's extremely unlikely they were caused by this change.

@joachifm
Copy link
Contributor

Please use git cherry-pick -x so that a reference to the original is retained in the history

@sh01
Copy link
Contributor Author

sh01 commented Nov 25, 2016

joachifm: Ah, thanks. Done.

@pSub
Copy link
Member

pSub commented Nov 25, 2016

This changes triggers many builds. I think I should go into staging-16.09 first.

@sh01 sh01 changed the base branch from release-16.09 to staging-16.09 November 25, 2016 20:25
@sh01 sh01 changed the base branch from staging-16.09 to release-16.09 November 25, 2016 20:26
(cherry picked from commit 2ad1395)
@sh01 sh01 changed the base branch from release-16.09 to staging-16.09 November 25, 2016 20:29
@sh01
Copy link
Contributor Author

sh01 commented Nov 25, 2016

Okay; I've switched it to the staging branch.
What's the precise process, here? Will it get merged into release-16.09 automatically after a while, or will I eventually need to follow up with another pull request for that?

@joachifm
Copy link
Contributor

@sh01 somebody will merge staging into release once the rebuild has completed

@vcunat
Copy link
Member

vcunat commented Nov 26, 2016

Maybe we'll need some policy discussion about staging-16.09. Currently it's disabled on Hydra and I'm personally not really convinced of its usefulness (contrary to staging).

The worst outcome is when some people push mass-rebuild stuff through a separate branch and some don't, because it's complicated and it's more work for Hydra than either of the ways (when followed by everyone).

@fpletz
Copy link
Member

fpletz commented Nov 26, 2016

@vcunat We've created staging-16.09 for #18522. We shouldn't use that branch too often or maybe even remove it. It was useful for that PR because we had to check for newly failing builds before pushing that change to 16.09. Most backports that yield full rebuilds for 16.09 should be pretty safe, though, so we could just push to the release branch.

Maybe it would make sense to wait for all packages (or all hydra jobset evaluations for a branch/commit) to be built before releasing a new channel version? Right now we wait for NixOS tests to succeed which is fine for master but not so much for stable because people probably don't want to compile software when they update their stable channels.

@vcunat
Copy link
Member

vcunat commented Nov 26, 2016

I'm confident that channels have always waited for all builds to finish (in addition to updating only if a tested job succeeds). EDIT: in my mind it's related to the fact that it was the point where binaries used to be uploaded to the binary cache, though that's fortunately done immediately after each build nowadays.

@joachifm
Copy link
Contributor

My understanding has been that staging exists to minimize disruption for people developing against master, not as a testing ground for potentially breaking changes. I personally do not develop against release, so would not mind removing staging-16.09.

@sh01
Copy link
Contributor Author

sh01 commented Nov 26, 2016

The long-term fate of staging-16.09 aside, should I modify this particular pull request back to go directly into release-16.09?

@Mic92 Mic92 changed the base branch from staging-16.09 to release-16.09 November 27, 2016 08:35
@Mic92 Mic92 merged commit ca9f853 into NixOS:release-16.09 Nov 27, 2016
@sh01 sh01 deleted the help2man_fixhash branch November 27, 2016 09:03
@vcunat
Copy link
Member

vcunat commented Nov 27, 2016

Hmm, I removed staging-16.09, at least for now.

adrianpk added a commit to adrianpk/nixpkgs that referenced this pull request May 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants