Conversation
|
Stuck at
|
|
@ofborg eval You need to rebase btw., the package has been moved to by-name. |
93fd49e to
e1c335a
Compare
e1c335a to
3563ed2
Compare
|
Thanks for the support Atemu! |
Atemu
left a comment
There was a problem hiding this comment.
I'm not super familiar with cargo packaging but the diff LGTM.
|
How would I verify whether prql support works? I don't know what that is. |
|
2e29c4f to
8ed461c
Compare
https://lnav.org/2024/03/29/prql-support.html In a version with no support you get |
symphorien
left a comment
There was a problem hiding this comment.
Fails to build
error: builder for '/nix/store/1ji2immm5l9mfn19fr4y04qfq01yds6c-cargo-deps-vendor-staging.drv' failed with exit code 1;
last 2 log lines:
> Running phase: unpackPhase
> variable $src or $srcs should point to the source
|
Fixed. |
|
Does bumping the sdk mean that we cannot backport this PR to 24.11 as it's a breaking change (and we should only backport the commit making gpm optional)? |
|
I don't think we should backport this in any case. |
|
@ofborg build lnav |
|
x86_64-darwin appears to still be broken. Could you just test this locally via |
|
I guess it's clang 19 problem so it should fail on aarch64-darwin too. |
|
|
I just ran into the issue of As you can see above, aarch64-darwin works with this PR, but x86_64 fails with this error: This comes from the 10.12 macOS SDK, so the diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix
index 628703a6e50a..1cbe887b1f07 100644
--- a/pkgs/by-name/ln/lnav/package.nix
+++ b/pkgs/by-name/ln/lnav/package.nix
@@ -19,7 +19,7 @@
cargo,
rustPlatform,
rustc,
- darwinMinVersionHook,
+ apple-sdk_11,
}:
stdenv.mkDerivation rec {
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
libarchive
]
++ lib.optionals stdenv.isDarwin [
- (darwinMinVersionHook "10.13")
+ apple-sdk_11
]
++ lib.optionals (!stdenv.isDarwin) [
gpm |
8dc5730 to
13cbe83
Compare
|
Thanks @ofalvai! |
|
I'm not sure cross-compilation fully works between two Darwin archs, but you can use Rosetta for testing with the |
|
You can also use |
Added PRQL support for lnav.
PRQL support was introduced recently and for recent builds you would get a
when you tried querying.
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.