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.

Sign up for GitHub

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

treewide: unpin apple-sdk_11 #370445

Merged
merged 1 commit into from
Jan 3, 2025
Merged

treewide: unpin apple-sdk_11 #370445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions pkgs/development/compilers/go/1.23.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
tzdata,
substituteAll,
iana-etc,
apple-sdk_11,
xcbuild,
mailcap,
buildPackages,
Expand Down Expand Up @@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];

depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
apple-sdk_11
xcbuild
];
Comment on lines 65 to 67
Copy link
Member

Choose a reason for hiding this comment

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

BTW, I’m not sure we need xcbuild here any more. xcrun is in the stdenv already and I’d be surprised if many Go packages need xcodebuild itself. cc @zowoq

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like it was xcrun: #107937 (comment).

#370779


Expand Down
3 changes: 0 additions & 3 deletions pkgs/development/python-modules/watchdog/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
pythonOlder,
pyyaml,
setuptools,
apple-sdk_11,
}:

buildPythonPackage rec {
Expand All @@ -26,8 +25,6 @@ buildPythonPackage rec {

build-system = [ setuptools ];

buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;

optional-dependencies.watchmedo = [ pyyaml ];

nativeCheckInputs =
Expand Down
Loading