db: make patches and autoreconfHook unconditional #242060
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 tasks
| @@ -3,8 +3,7 @@ | |||
| import ./generic.nix (args // { | |||
| version = "4.8.30"; | |||
| sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; | |||
| extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ] | |||
| ++ lib.optionals stdenv.isDarwin [ ./darwin-mutexes-4.8.patch ]; | |||
| extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ./darwin-mutexes-4.8.patch ]; | |||
There was a problem hiding this comment.
Suggested change
| extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ./darwin-mutexes-4.8.patch ]; | |
| extraPatches = [ | |
| ./clang-4.8.patch | |
| ./CVE-2017-10140-4.8-cwd-db_config.patch | |
| ./darwin-mutexes-4.8.patch | |
| ]; |
to make diffs easier if those ever change
There was a problem hiding this comment.
I reformatted and updated the PR.
reckenrode
force-pushed
the
bdb-clang16-mk2
branch
from
41c3ac1
to
a76023f
Compare
12 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
This simplifies the derivation a little bit by removing unnecessary conditional checks. Thank you to @SuperSandro2000 for the suggestion in #241178.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)