apply patches with patch files #19451
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
siddarthkay
force-pushed
the
patch-libs-with-nix
branch
from
b6324ce
to
82b7b89
Compare
Jenkins BuildsClick to see older builds (54)
|
siddarthkay
commented
Mar 29, 2024
| @@ -4,16 +4,17 @@ | |||
|
|
|||
| { stdenv, deps, nodejs, patchMavenSources }: | |||
|
|
|||
| let | |||
| patchesDir = ./../../../patches; | |||
There was a problem hiding this comment.
wondering if should I move patches directory inside nodejs-patched or keep it in root 🤔
In most projects patches remain in root
There was a problem hiding this comment.
maybe $GITROOT could be used to make this neater?
There was a problem hiding this comment.
No, Nix paths have to be relative here. I don't mind them being at repo root, but they would also make sense here.
There was a problem hiding this comment.
by here do you mean instead of status-mobile/patches we could store patches in status-mobile/nix/deps/nodejs-patched/patches ?
I don't mind actually, I'd be more than happy to get rid of the "./../../../" from the patchesDir variable :D
siddarthkay
commented
Mar 29, 2024
siddarthkay
force-pushed
the
patch-libs-with-nix
branch
7 times, most recently
from
ad15504
to
c5ac62d
Compare
jakubgs
approved these changes
Apr 3, 2024
| @@ -4,16 +4,17 @@ | |||
|
|
|||
| { stdenv, deps, nodejs, patchMavenSources }: | |||
|
|
|||
| let | |||
| patchesDir = ./../../../patches; | |||
There was a problem hiding this comment.
No, Nix paths have to be relative here. I don't mind them being at repo root, but they would also make sense here.
Thanks! |
siddarthkay
force-pushed
the
patch-libs-with-nix
branch
3 times, most recently
from
8c0765c
to
70b5564
Compare
siddarthkay
force-pushed
the
patch-libs-with-nix
branch
4 times, most recently
from
af66bd6
to
4b4e499
Compare
fixes #19449 In this commit we change the way patches are applied. We no longer have to write patches in a patch phase like we used to, we can now place individual changes in a patch file inside the `patches` directory and they will be automatically applied. Because of this change we can get rid of forks and instead have those changes in patch files. To generate a patch file this make command can be used `make patch-file` This will open an interactive shell which will allow you to specify which file you want to patch and then wait till you make those changes and generate a patch for it. ``` make patch-file Configuring Nix shell for target 'default'... Enter the path of the file to patch: ./node_modules/is-glob/index.js File to patch: ./node_modules/is-glob/index.js Temporary directory created: /tmp/tmp-status-mobile-40bc588fa/tmp.xrXarXoTPZ Original file copied to temporary directory. Please make the necessary changes to the file: ./node_modules/is-glob/index.js Press any key when you are done with the changes... Generating patch file... Patch file created at /Users/siddarthkumar/code/status-im/PR/status-mobile/patches/index.js.patch Info: Please execute 'make run-clojure' to test if the patch file works as expected. ``` - Android - iOS
siddarthkay
force-pushed
the
patch-libs-with-nix
branch
from
4b4e499
to
1a56dc2
Compare
This was referenced Apr 17, 2024
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.
fixes #19449
Summary
In this PR we change the way patches are applied.
We no longer have to write patches in a patch phase like we used to, we can now place individual changes in a patch file inside the
patchesdirectory and they will be automatically applied.Because of this change we can get rid of forks and instead have those changes in patch files.
To generate a patch file this make command can be used
make patch-fileThis will open an interactive shell which will allow you to specify which file you want to patch and then wait till you make those changes and generate a patch for it.
Platforms
status: ready