haskellPackages.hermes-json: fix vendored simdjson with clang-19#355529
Merged
emilazy merged 1 commit intoNixOS:llvm-19from Nov 13, 2024
paparodeo:hermes-json-fix-vendored-simjson
Merged
haskellPackages.hermes-json: fix vendored simdjson with clang-19#355529emilazy merged 1 commit intoNixOS:llvm-19from paparodeo:hermes-json-fix-vendored-simjson
emilazy merged 1 commit intoNixOS:llvm-19from
paparodeo:hermes-json-fix-vendored-simjson
Conversation
github-actions
bot
added
the
6.topic: haskell
Contributor
Author
|
could un-vendor by taking ToT from https://github.com/velveteer/hermes. one hacky way to do it is pulling patches. diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c89549e52162..e2aff42ce78a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2585,7 +2585,29 @@ self: super: {
# vendored simdjson breaks with clang-19
# https://github.com/simdjson/simdjson/commit/5d35e7ca1f1727ca57d31d4ae5f3954fe96337e3
- patches = drv.patches or [] ++ [ ./patches/hermes-json-clang-19.diff ];
+ #patches = drv.patches or [] ++ [ ./patches/hermes-json-clang-19.diff ];
+ patches = drv.patches or [] ++ [
+ (fetchpatch {
+ url = "https://github.com/velveteer/hermes/commit/6fd9904d93a5c001aadb27c114345a6958904d71.patch";
+ hash = "sha256-Pv09XP0/VjUiAFp237Adj06PIZU21mQRh7guTlKksvA=";
+ excludes = [
+ ".github/*"
+ "hermes-bench/*"
+ ];
+ })
+ (fetchpatch {
+ url = "https://github.com/velveteer/hermes/commit/ca8dddbf52f9d7788460a056fefeb241bcd09190.patch";
+ hash = "sha256-tDDGS0QZ3YWe7+SP09wnxx6lIWL986ce5Zhqr7F2sBk=";
+ excludes = [
+ "README.md"
+ ".github/*"
+ "hermes-bench/*"
+ ];
+ })
+ ];
+ postPatch = drv.postPatch or "" + ''
+ ln -fs ${pkgs.simdjson.src} simdjson
+ '';
}) super.hermes-json;
# Disabling doctests. |
Member
|
I’d prefer that hack, if you don’t mind. |
Member
|
I take it there's no way to give this package a pre built |
ofborg
bot
added
10.rebuild-darwin: 1-10
Contributor
Author
tho note that simdjson is not built as a shared library, contains a 4MB header, 2MB cpp file and the .a file is 88K |
Member
|
OK, works for me then. @maralorn Is there a way to just use a GitHub source directly for a Haskell package rather than reconstructing it with patches? |
Member
|
Sure there is, just override the |
Member
|
Fair enough. I am fine with @paparodeo’s proposed diff, then. |
emilazy
approved these changes
Nov 13, 2024
emilazy
added a commit
to emilazy/nixpkgs
that referenced
this pull request
Nov 16, 2024
emilazy
added a commit
that referenced
this pull request
Nov 17, 2024
emilazy
added a commit
to emilazy/nixpkgs
that referenced
this pull request
Nov 18, 2024
emilazy
added a commit
that referenced
this pull request
Nov 18, 2024
emilazy
added a commit
that referenced
this pull request
Nov 20, 2024
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
updated code taken from simdjson/simdjson@5d35e7c
tried to un-vendor but the tests failed so created a patch
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.
@emilazy