Skip to content

valgrind: disable on darwin#101442

Merged
zowoq merged 2 commits intoNixOS:masterfrom
zowoq:valgrind
Oct 23, 2020
Merged

valgrind: disable on darwin#101442
zowoq merged 2 commits intoNixOS:masterfrom
zowoq:valgrind

Conversation

@zowoq
Copy link
Contributor

@zowoq zowoq commented Oct 23, 2020

Our macOS SDKs are from 10.12 but our cctools is from 10.14 so I think that basically kills off valgrind on darwin as upstream doesn't support it on >= 10.13 and no one seems to be building it on >= 10.14.

https://valgrind.org/
22 June 2020: valgrind-3.16.1 is available. This release supports: .... X86/MacOSX 10.12 and AMD64/MacOSX 10.12.

homebrew valgrind
depends_on maximum_macos: :high_sierra

macports valgrind
is not presently compatible with macOS Mojave or newer


The libpsl commit should be enough to unblock nixpkgs-unstable.

@ofborg ofborg bot requested a review from c0bw3b October 23, 2020 06:24
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Oct 23, 2020
@ofborg ofborg bot added 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Oct 23, 2020
@zowoq zowoq changed the title valgrind valgrind: disable on darwin Oct 23, 2020
@zowoq
Copy link
Contributor Author

zowoq commented Oct 23, 2020

cc @matthewbauer @marsam @vcunat

@zowoq zowoq marked this pull request as ready for review October 23, 2020 07:16
@vcunat vcunat added the 1.severity: channel blocker Blocks a channel label Oct 23, 2020
Comment on lines +34 to 36
(stdenv.lib.optionalString (!stdenv.isDarwin) valgrind)
libxslt
];
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
(stdenv.lib.optionalString (!stdenv.isDarwin) valgrind)
libxslt
];
libxslt
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ valgrind ];

besides that, LGTM

Copy link
Contributor Author

@zowoq zowoq Oct 23, 2020

Choose a reason for hiding this comment

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

That is what I did first but it causes unnecessary rebuilds on linux.

Copy link
Contributor

Choose a reason for hiding this comment

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

oh, interesting, I'm not sure why it should cause rebuilds on Linux

Copy link
Member

Choose a reason for hiding this comment

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

The order of build inputs is preserved into the build process itself.

Copy link
Contributor

Choose a reason for hiding this comment

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

TIL thanks!

@zowoq zowoq merged commit 76d8e2f into NixOS:master Oct 23, 2020
@zowoq zowoq deleted the valgrind branch October 23, 2020 14:10
@zowoq
Copy link
Contributor Author

zowoq commented Oct 24, 2020

Pushed a cleaned up version of this to staging: d126f0b

@vcunat
Copy link
Member

vcunat commented Oct 24, 2020

should be enough to unblock nixpkgs-unstable.

Unfortunately there's another problem: https://hydra.nixos.org/job/nixpkgs/trunk/nix-info-tested.x86_64-darwin

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

Labels

1.severity: channel blocker Blocks a channel 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants