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

xcodes: 1.5.0 -> 1.6.0, move to by name, with lib; cleanup, RFC format #354932

Merged
merged 4 commits into from
Nov 10, 2024

Conversation

matteo-pacini
Copy link
Contributor

@matteo-pacini matteo-pacini commented Nov 10, 2024

Fixes #352844 .

Also:

  • Moved everything into pkgs/by-name (whilst adopting the new implicit apple-sdk pattern)
  • Cleaned up with lib; usage in meta
  • Applied RFC format

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@matteo-pacini matteo-pacini requested review from emilytrau, 0x120581f and a team November 10, 2024 06:46
@matteo-pacini matteo-pacini changed the title xcodes: 1.5.0 -> 1.6.0, move to byname, with lib;` cleanup, RFC format xcodes: 1.5.0 -> 1.6.0, move to by name, with lib; cleanup, RFC format Nov 10, 2024
@emilazy
Copy link
Member

emilazy commented Nov 10, 2024

This doesn’t build for me on x86_64-darwin; is that a known issue?

@matteo-pacini
Copy link
Contributor Author

matteo-pacini commented Nov 10, 2024

@emilazy not entirely sure, but I think it flown below the radar because Swift didn't build on Hydra for a long time, and so did the packages that depend on it?

https://hydra.nixos.org/job/nixpkgs/trunk/xcodes.x86_64-darwin#tabs-status

The error is the following:

#import <CoreServices/CoreServices.h>
        ^
/nix/store/wgcbqi40ahn1ay6905v190x5mlv9xdq9-apple-sdk-13.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MachineExceptions.h:22:10: note: while building module '_Builtin_intrinsics' imported from /nix/store/wgcbqi40ahn1ay6905v190x5mlv9xdq9-apple-sdk-13.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MachineExceptions.h:22:
#include <emmintrin.h>
         ^
<module-includes>:1:9: note: in file included from <module-includes>:1:
#import "immintrin.h"
        ^
/nix/store/d2jm2gdf5qmyfbqk579f7h65sbi497sr-clang-wrapper-16.0.6/resource-root/include/immintrin.h:31:10: note: in file included from /nix/store/d2jm2gdf5qmyfbqk579f7h65sbi497sr-clang-wrapper-16.0.6/resource-root/include/immintrin.h:31:
#include <emmintrin.h>
         ^
/nix/store/d2jm2gdf5qmyfbqk579f7h65sbi497sr-clang-wrapper-16.0.6/resource-root/include/emmintrin.h:45:9: error: _Float16 is not supported on this target
typedef _Float16 __m128h_u __attribute__((__vector_size__(16), __aligned__(1)));

Not familiar with the internals of Clang/LLVM, but it sounds like it's trying to use an unsupported type (_Float16) on x86_64-darwin.

@emilazy
Copy link
Member

emilazy commented Nov 10, 2024

Oh, the problem is that you have to use the Swift stdenv. I forget why.

@matteo-pacini
Copy link
Contributor Author

@emilazy works, thanks!

}:
let
generated = swiftpm2nix.helpers ./generated;
stdenv = swift.stdenv;
Copy link
Member

Choose a reason for hiding this comment

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

I’m not sure if this is any different from swiftPackages.stdenv but I think the latter is canonical.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Searched on the repo, and you're right - it seems to be more widely adopted.
Just pushed this change, thanks!

@emilazy emilazy merged commit 29ba5b9 into NixOS:master Nov 10, 2024
10 of 11 checks passed
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.

Update request: xcodes 1.5.0 → 1.6.0
2 participants