cbmc: 6.4.0 -> 6.4.1, fix darwin, drop unnecessary cadical dependency #372193
Conversation
This is cruft left over from <https://www.github.com/NixOS/nixpkgs/pull/355122>, which got rid of the patch to use compiled cadical instead of building from source.
Apply portability patch for darwin (makes sense for linux as well). NIX_CFLAGS_COMPILE for GNU don't seem to be necessary anymore.
There's no reason to use passthru.tests for this and manual <doc/stdenv/passthru.chapter.md> recommends to do this by default.
| versionCheckHook | ||
| ]; | ||
| doInstallCheck = true; | ||
| versionCheckProgram = "${placeholder "out"}/bin/cbmc"; |
There was a problem hiding this comment.
Using pname is already the default. I think that you can drop this line.
There was a problem hiding this comment.
I think in general it's discouraged to rely on pname (e.g. in src #277994). I think it applies in this case as well. More fitting would be meta.mainProgram, but cbmc doesn't have a primary binary. Being a bit more explicit in this case doesn't hurt.
There was a problem hiding this comment.
You are right about not relying generally on pname, but here it's not really the same.
The hook rightfully defaults to calling the binary of the same name as the package.
versionCheckProgram is only expected to be provided when the binary has a different name than pname.
|
wegank
added
12.approvals: 1
cadicalinbuildInputs, as since cbmc: 6.0.1 -> 6.4.0 #355122 cadical is compiled from source.versionCheckHookinstead oftesters.testVersion, since that's the recommended thing to do when possible: stdenv documentation.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.