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

cacert: 3.77 -> 3.80 #178862

Merged
merged 2 commits into from
Jun 27, 2022
Merged

cacert: 3.77 -> 3.80 #178862

merged 2 commits into from
Jun 27, 2022

Conversation

ajs124
Copy link
Member

@ajs124 ajs124 commented Jun 24, 2022

Description of changes

Contains #178809, but targeted against staging, because cacert

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/)
  • 22.11 Release Notes (or backporting 22.05 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@mweinelt mweinelt added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jun 25, 2022
@mweinelt mweinelt merged commit bfffecf into NixOS:staging Jun 27, 2022
@github-actions
Copy link
Contributor

Backport failed for staging-21.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin staging-21.11
git worktree add -d .worktree/backport-178862-to-staging-21.11 origin/staging-21.11
cd .worktree/backport-178862-to-staging-21.11
git checkout -b backport-178862-to-staging-21.11
ancref=$(git merge-base add6a3b7dc1d693654e2973456a0d4992cd38911 04be37dead641c3d08cc179428e106e01352c907)
git cherry-pick -x $ancref..04be37dead641c3d08cc179428e106e01352c907

@github-actions
Copy link
Contributor

Successfully created backport PR #179343 for staging-22.05.

@vcunat
Copy link
Member

vcunat commented Jun 27, 2022

Uh, well now we have two different commits doing the same nss update (on staging, later master), but it's certainly not a big deal.

@ajs124 ajs124 deleted the upd/cacert branch June 27, 2022 17:14
@ajs124
Copy link
Member Author

ajs124 commented Jun 27, 2022

Uh, well now we have two different commits doing the same nss update (on staging, later master), but it's certainly not a big deal.

Would not updating in this PR nss_latest have been the preferred option? If so, I'll try and remember to do that, next time.

@vcunat
Copy link
Member

vcunat commented Jun 27, 2022

Maybe, or we could've used the squash-merge button, as at merge time it was already included in staging.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants