Skip to content

nlohmann_json: allow overrides by eliminating use of rec#181654

Merged
winterqt merged 1 commit intomasterfrom
unknown repository
Jul 17, 2022
Merged

nlohmann_json: allow overrides by eliminating use of rec#181654
winterqt merged 1 commit intomasterfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Jul 15, 2022

Description of changes

The existing nlohmann_json expression prevents users from overriding fields (like doCheck) because it uses rec in the argument to mkDerivation. Let's use the shiny new pass-a-function-to-mkDerivation feature to do the same thing without blocking overrides.

Things done
  • Built on platform(s)
    • mips64el-linux-
  • 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
  • Fits CONTRIBUTING.md.

The existing nlohmann_json expression prevents users from overriding
fields (like `doCheck`) because it uses `rec` in the argument to
`mkDerivation`.  Let's use the shiny new
pass-a-function-to-`mkDerivation` feature to do the same thing without
blocking overrides.
@ghost ghost mentioned this pull request Jul 15, 2022
3 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jul 15, 2022
@ghost
Copy link
Author

ghost commented Jul 16, 2022

@ofborg eval

I think OfBorg's aarch64-darwin is stuck again

@winterqt
Copy link
Member

Nice catch :)

@winterqt winterqt merged commit 57bfdfa into NixOS:master Jul 17, 2022
@ghost ghost deleted the pr/nlohmann_json/allow_overrides branch July 17, 2022 02: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: 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.

1 participant