mesonlsp: init at 4.2.2 #269042
Merged
mesonlsp: init at 4.2.2 #269042
Conversation
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
ofborg
bot
added
8.has: package (new)
paveloom
force-pushed
the
swift-mesonlsp
branch
from
0f715a6 to
f935ae7
Compare
|
(Author of Swift-MesonLSP; not using nix) here. Thanks a lot for your efforts. It seems you are missing a few optional runtime dependencies (While they are optional, not having them removes a few features):
|
paveloom
force-pushed
the
swift-mesonlsp
branch
from
f935ae7 to
c9956ba
Compare
Member
Author
|
Added those as runtime dependencies. |
Contributor
|
When trying to build this on top of your other PR for Diff from your generated files to the ones I got today (click to expand)diff --git a/pkgs/by-name/sw/swift-mesonlsp/generated/default.nix b/pkgs/by-name/sw/swift-mesonlsp/generated/default.nix
index f6111300ff76..031954131be3 100644
--- a/pkgs/by-name/sw/swift-mesonlsp/generated/default.nix
+++ b/pkgs/by-name/sw/swift-mesonlsp/generated/default.nix
@@ -3,8 +3,8 @@
workspaceStateFile = ./workspace-state.json;
hashes = {
"BitByteData" = "1bvbf89q6ivvy5q87k3jc07d5if5gvimz0shir8d6jw1pv5mn4ws";
- "console-kit" = "0j249lzx9sywj80a9glwv480lzybf9a4cznhdfw5qrk7n7ckf13y";
- "indexstore-db" = "02al5rk807685ian3xckpdl00yplm8v92b7gq1prw7abll8k6hnq";
+ "console-kit" = "1pn61rigw0svwig6d194sd0gqzfdxvra8vdkdyi5pqawra3xqgyd";
+ "indexstore-db" = "0plwcrh8z321x0i4psqg5lja2bm0lyc79winbx3v2jhdq5l1v9rg";
"Perfect-INIParser" = "1v7q0bj4x87npanczn7yiicbg3c78wxjyww6cfkd1ipnvjh1gjmx";
"sourcekit-lsp" = "1ybi92zspb20zx969xhcf9hzrjv5p01fjq9jibpk41pqqjch1whi";
"SWCompression" = "1arjrx1w78v9p8ma8gp8fj79bggnp014433r46gxq8jja3qilwic";
@@ -15,12 +15,12 @@
"swift-certificates" = "1kfgmwg9pdihnxq9b5r22b9w2fxcmciac24rl0az1v0zkzj495wz";
"swift-collections" = "11d2vs2xxxbkvqqhm941y3an58qh52gfi6pv6xlar9873igijryq";
"swift-crypto" = "1vng5mpbjx73w8z9a5j3mbpyq6mnqzc8rsqk9b3mckzznvvpih4m";
- "swift-driver" = "108a1qr4syzngscb9lxil0r53l4ldjk56h0mr2jys52nlj543ad8";
- "swift-llbuild" = "0q0ia2sfcdpkm29www34sdjgw9820xjbyc2gsi1gv6di0b5ar2aw";
+ "swift-driver" = "1cxl25kiz90kn4wldq64v9p1dyvggyfibf7f96anf130j9kg9rvx";
+ "swift-llbuild" = "19la95ld4vs3xlfvf560q1kq039f5dyj3rsmh0wzfaivxl9p5w83";
"swift-log" = "17yshnwxr69d852a852l7dfhbja8gg7xah1pj7m5snah1q3k9vy7";
"swift-nio" = "1gdhprgcp8kh9pg00j6rg7v3wcc7xkv5bgx2sfcdgcic1jh9lm0n";
- "swift-package-manager" = "1wnyadisrwyjbb0xi3axpwrlxc9zjy0ckzg9j025c24saf1p952w";
- "swift-syntax" = "1mz92x9hjs14wfp4qhj8dy35b7jkksj9lig6sm2rp2dqi6psbnxd";
+ "swift-package-manager" = "183pdf6m6rmh7ww854bzwvz47wkj9z4w4a3k697jasc8dka7lbmi";
+ "swift-syntax" = "18lvnz4j44f01srk129k2p4gjb143992ysqc2q3cwyfwsfk2gqcd";
"swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";
"swift-tools-support-core" = "0lmib1d16q0yidxaxl5szfcqwni9i1916pcqgy572h4i06qn20m2";
"SwiftTreeSitter" = "13a8x2mms4dhv9rl94zv1jkmjbs718fawxnb0cw23qwnba17xv26";
diff --git a/pkgs/by-name/sw/swift-mesonlsp/generated/workspace-state.json b/pkgs/by-name/sw/swift-mesonlsp/generated/workspace-state.json
index d5658a76a613..91e112effb90 100644
--- a/pkgs/by-name/sw/swift-mesonlsp/generated/workspace-state.json
+++ b/pkgs/by-name/sw/swift-mesonlsp/generated/workspace-state.json
@@ -29,8 +29,8 @@
},
"state": {
"checkoutState": {
- "revision": "2e3e205e8d7563d5c1a6f1c8992616d337f632e6",
- "version": "4.11.0"
+ "revision": "a7dd7001196d39b758e4990ec0f26f80162f4c84",
+ "version": "4.14.0"
},
"name": "sourceControlCheckout"
},
@@ -47,7 +47,7 @@
"state": {
"checkoutState": {
"branch": "main",
- "revision": "89ec16c2ac1bb271614e734a2ee792224809eb20"
+ "revision": "5eac09c9a7b92303780e1ce7ea4aa5ee70226d56"
},
"name": "sourceControlCheckout"
},
@@ -233,7 +233,7 @@
"state": {
"checkoutState": {
"branch": "main",
- "revision": "e0604b6195ccd53072c9455ee8f99b6bb094e911"
+ "revision": "d5c60fe47675e787f7589b04426e8aad127c90a8"
},
"name": "sourceControlCheckout"
},
@@ -250,7 +250,7 @@
"state": {
"checkoutState": {
"branch": "main",
- "revision": "8333c9db6a0fde517c5527540b859d3ec41c5e08"
+ "revision": "bc3ffd54c2bfa8ce2214d1342860f07ae44922d1"
},
"name": "sourceControlCheckout"
},
@@ -301,7 +301,7 @@
"state": {
"checkoutState": {
"branch": "main",
- "revision": "8e318dc5e3e7beafcd1f224daea10ffdc0ce8707"
+ "revision": "b368b96f9c3b5d360cd9e058fa106eff029c5fb3"
},
"name": "sourceControlCheckout"
},
@@ -318,7 +318,7 @@
"state": {
"checkoutState": {
"branch": "main",
- "revision": "7c1c56c0aa505c939b210b9f3b6797417107820a"
+ "revision": "184930ad29dbfa924e9568f49daee8ad0f376223"
},
"name": "sourceControlCheckout"
},Not quite sure what would cause these changes since everything else seems to have stayed the same, especially the |
Member
Author
|
I can't reproduce this. I get the same hashes when running git checkout swiftpm
git checkout -b swift-mesonlsp-merge
git cherry-pick swift-mesonlsp
nix build -Lv --rebuild .#swift-mesonlsp |
Contributor
|
Sorry for only replying again now. I also just cherry-picked your swiftpm and swift-mesonlsp changes in my first attempt. To verify again I've now did exactly what you described, but this gets me the same error I got initially: I ran I'm also still confused as to what is happening here, since I should have exactly the same sources and inputs as you? Maybe some hashing doesn't work the same for you as it does for me? Maybe a fetcher doesn't produce the same results? I've tested this on both NixOS (running a flake-y system tracking nixos-unstable) and on Arch with a nix installed via pacman. Here's the full log, perhaps you can diff this with yours: Full nix log (click to expand) |
Contributor
|
I've also just now tried to get the same generated files with To generate the files I ran {
inputs = {
nixpkgs.url = "git+file:///path/to/nixpkgs/";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, flake-utils, }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
{
devShells.default = pkgs.mkShell.override { stdenv = pkgs.swift.stdenv; } {
buildInputs = with pkgs;[
swift
swiftpm
swiftpm2nix
swiftPackages.Foundation
];
};
});
}The local nixpkgs clone is checked out on the swift-mesonlsp-merge branch created as described above. Not sure if this is the recommended way to do this, but this is the first way that I tried that worked, after digging around some about how to get |
Member
Author
|
Okay, so
That's why I was getting the same hashes. I pruned Swift's package manager's cache with Nixpkgs will cache Swift's packages after this pull request is merged, so this shouldn't be a problem. However, pinning the dependencies to a commit upstream would be beneficial. |
paveloom
force-pushed
the
swift-mesonlsp
branch
from
c9956ba to
40bcc3e
Compare
Contributor
|
Thanks for clearing that up. I guess I should expect not quite guaranteed the same inputs made ok by caching a bit more. |
paveloom
force-pushed
the
swift-mesonlsp
branch
from
40bcc3e to
2182f4e
Compare
7 tasks
Contributor
|
Version 4.0.2 re-written in C++ was just recently released :/ |
paveloom
force-pushed
the
swift-mesonlsp
branch
from
4a4458a to
14e4f75
Compare
paveloom
force-pushed
the
swift-mesonlsp
branch
2 times, most recently
from
2d036d0 to
1e69547
Compare
Contributor
|
Result of 1 package failed to build:
|
Contributor
|
Result of 1 package failed to build:
|
Contributor
|
Result of 1 package built:
|
Contributor
|
Result of 1 package built:
|
Contributor
|
Fails on darwin with: |
Member
Author
|
@GaetanLepage While I'm looking into this, I'm curious... do you just happen to have the four operating systems with these platforms? Or is there a way to cross-compile for Darwin while on Linux that I am missing? |
paveloom
force-pushed
the
swift-mesonlsp
branch
4 times, most recently
from
14ebb9f to
baf554d
Compare
Contributor
Well, I only own |
Contributor
|
On |
ofborg
bot
added
10.rebuild-darwin: 0
Member
Author
|
Stuck at figuring out why the polyfill for the |
Contributor
|
In the worst case the package could be marked linux only until someone with a darwin machine wants to debug it |
Contributor
|
Result of |
Contributor
|
Result of 1 package built:
|
Contributor
|
Result of 1 package built:
|
Contributor
|
Result of 1 package built:
|
GaetanLepage
approved these changes
Jun 25, 2024
Contributor
GaetanLepage
left a comment
GaetanLepage
left a comment
There was a problem hiding this comment.
Looks like it builds fine on all platforms !
Good for me !
wegank
added
the
12.approvals: 3+
ghost
approved these changes
Jun 27, 2024
ghost
left a comment
ghost
left a comment
There was a problem hiding this comment.
Been using this for a few days on x86_64-linux without issue.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 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.
Description of changes
https://github.com/JCWasmx86/Swift-MesonLSP
Depends on #269015.
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/)Priorities
Add a 👍 reaction to pull requests you find important.