Skip to content

Comments

pls: 4.0.3 -> 5.0.0#174515

Merged
SuperSandro2000 merged 1 commit intoNixOS:staging-nextfrom
arjan-s:pls-5.0.0
May 30, 2022
Merged

pls: 4.0.3 -> 5.0.0#174515
SuperSandro2000 merged 1 commit intoNixOS:staging-nextfrom
arjan-s:pls-5.0.0

Conversation

@arjan-s
Copy link
Contributor

@arjan-s arjan-s commented May 25, 2022

Description of changes

Package upgrade of pls.
Depends on #175437 to be merged first.

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

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels May 25, 2022
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented May 27, 2022

Either we target staging or you need to ping me or someone else when the rich update is in master or we widen the version constraint.

@arjan-s
Copy link
Contributor Author

arjan-s commented May 27, 2022

Either we target staging or you need to ping me or someone else when the rich update is in master or we widen the version constraint.

Oh, I totally missed that the rich PR targeted staging. When I get back to my pc in a few days I'll post a PR for it targeting master, if noone has done it yet. Since it's required from upstream, this PR will have to wait. I'll ping you here once rich is merged.

@jonringer
Copy link
Contributor

you can rebase this PR on staging-next as the related staging changes are on there

@jonringer
Copy link
Contributor

jonringer commented May 30, 2022

If you do want to target the staging-next branch:

# finding the common merge base will avoid pinging all CODEOWNERs
common=$(git merge-base origin/master origin/staging-next)
git rebase --onto=$common HEAD~1 # or however many commits you want to pull
git push .. ... --force

then change the base branch in the github PR from master -> staging-next

See https://nixos.org/nixpkgs/manual/#submitting-changes-staging-branch for more details on staging branch

@arjan-s arjan-s changed the base branch from master to staging-next May 30, 2022 07:55
@arjan-s
Copy link
Contributor Author

arjan-s commented May 30, 2022

Sorry, I'm new to all this, I just contributed some small changes to master before. Thank you for providing guidance!
If I understand everything right, this PR is now ready.

@jonringer
Copy link
Contributor

Sorry, I'm new to all this, I just contributed some small changes to master before. Thank you for providing guidance! If I understand everything right, this PR is now ready.

Yea, looks fine, just waiting on ofborg to go green

@arjan-s
Copy link
Contributor Author

arjan-s commented May 30, 2022

Result of nixpkgs-review pr 174515 run on x86_64-linux 1

1 package built:
  • pls

@arjan-s
Copy link
Contributor Author

arjan-s commented May 30, 2022

@jonringer It seems the darwin checks aren't successful, with one skipped and one errored out on building twisted. Is this something I can fix? I don't have darwin nor do I know what the error means...

@SuperSandro2000
Copy link
Member

That needs fixing in twisted. Doing that right now.

@SuperSandro2000 SuperSandro2000 merged commit f17c5a1 into NixOS:staging-next May 30, 2022
@arjan-s
Copy link
Contributor Author

arjan-s commented May 30, 2022

Thank you!

@arjan-s arjan-s deleted the pls-5.0.0 branch May 30, 2022 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants