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

swift: 5.5.3 -> 5.6.2 #186476

Merged
merged 2 commits into from
Aug 25, 2022
Merged

swift: 5.5.3 -> 5.6.2 #186476

merged 2 commits into from
Aug 25, 2022

Conversation

Trundle
Copy link
Member

@Trundle Trundle commented Aug 13, 2022

Description of changes
  • Several new upstream releases
  • Unbreak build
  • Add myself as maintainer
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.

@ofborg ofborg bot requested review from dtzWill, dduan and trepetti August 13, 2022 18:48
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Aug 13, 2022
@dduan
Copy link
Contributor

dduan commented Aug 13, 2022

Thanks for taking the time to do this!

I'm testing these changes out locally.

It appears that the SHA for swift-format needs an update.

@Trundle
Copy link
Member Author

Trundle commented Aug 13, 2022

Thanks for taking the time to do this!
It appears that the SHA for swift-format needs an update.

Welcome! This PR took me quite a while and I changed from 5.6.1 to 5.6.2 at some point, so it's possible that some other SHAs need updates as well. Meanwhile, I updated the one for swift-format.

@dduan
Copy link
Contributor

dduan commented Aug 13, 2022

+1

Verified build on my Ubuntu setup. All validation tests pass. Simple programs compile and function as expected.

@dduan
Copy link
Contributor

dduan commented Aug 13, 2022

Great work! I recommend adding yourself as a maintainer @Trundle!

@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Aug 13, 2022
@bobby285271 bobby285271 added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Aug 14, 2022
@trepetti
Copy link
Contributor

Result of nixpkgs-review pr 186476 1

1 package built:
  • swift

Copy link
Contributor

@trepetti trepetti left a comment

Choose a reason for hiding this comment

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

LGTM. Thank you for your work. Yes, it is a lot of work updating because of how Apple structures the subrepos and build, which make it basically impossible to automate. There are also some internal inconsistencies in how they invoke Python that don't comply with PEP 394.

@bobby285271 bobby285271 added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Aug 16, 2022
@SuperSandro2000
Copy link
Member

How is x86_64-linux failing but aarch64-linux succeeding?

@Trundle
Copy link
Member Author

Trundle commented Aug 21, 2022

How is x86_64-linux failing but aarch64-linux succeeding?

I haven't seen this before and the previous runs were all successful. Possibly a flaky test or some issue with the runner (e.g. out of memory)

@SuperSandro2000
Copy link
Member

Maybe we should disable the test(s) that are flaky.

@dduan
Copy link
Contributor

dduan commented Aug 22, 2022

the failing test is AutoDiff/compiler_crashers_fixed/sr14290-missing-debug-scopes-in-pullback-trampoline.swift. Pretty random since this type of regression tests don't usually fail (they are there to guard against failures from source changes). Nevertheless we may want to disable it.

@Trundle
Copy link
Member Author

Trundle commented Aug 22, 2022

I personally think it's a bit hasty to call a test flaky if it only failed once for not-so-clear reasons, but if that is what is needed to move this PR forward, I'm happy to disable it.

@superherointj
Copy link
Contributor

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

1 package built:
  • swift

@navinkumarr
Copy link

Hi @Trundle , I am getting following error. Is there any plan to support this in future ?

error: Package ‘swift-5.6.2’ in /nix/store/1is4128ymlh2pd0amyq5hw8d1gm6im4h-source/pkgs/development/compilers/swift/default.nix:464 is not supported on ‘x86_64-darwin’, refusing to evaluate.

@dduan
Copy link
Contributor

dduan commented Aug 23, 2022

We never had Darwin support here. It would be a separate, none trivial effort to enable it.

@SuperSandro2000
Copy link
Member

@ofborg eval

@ofborg ofborg bot requested review from trepetti and dduan August 23, 2022 23:08
@lovesegfault lovesegfault merged commit b2dc702 into NixOS:master Aug 25, 2022
@stephank
Copy link
Contributor

Darwin support is tracked in #37473.

@Trundle Trundle deleted the swift-5.6.2 branch August 26, 2022 09:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants