-
-
Notifications
You must be signed in to change notification settings - Fork 13.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
trunk-ng: 0.17.11 -> 0.17.16 #276488
trunk-ng: 0.17.11 -> 0.17.16 #276488
Conversation
Result of 1 package failed to build:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This package does not build on Darwin due to ld: framework not found SystemConfiguration
This patch fixes the build on Darwin:
diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix
index 6ef55446de55..9c9f1594e45a 100644
--- a/pkgs/by-name/tr/trunk-ng/package.nix
+++ b/pkgs/by-name/tr/trunk-ng/package.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config
-, openssl, libiconv, CoreServices, Security }:
+, openssl, libiconv, CoreServices, Security, SystemConfiguration }:
rustPlatform.buildRustPackage rec {
pname = "trunk-ng";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = if stdenv.isDarwin
- then [ libiconv CoreServices Security ]
+ then [ libiconv CoreServices Security SystemConfiguration ]
else [ openssl ];
# requires network
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 030d9a21d55f..8102491b463c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14026,7 +14026,7 @@ with pkgs;
trunk-io = callPackage ../development/tools/trunk-io { };
trunk-ng = callPackage ../by-name/tr/trunk-ng/package.nix {
- inherit (darwin.apple_sdk.frameworks) CoreServices Security;
+ inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
};
tthsum = callPackage ../applications/misc/tthsum { };
@wegank, what is a good way to amend this PRs changes from the @r-ryantm bot account with the patch above?
e0b94c5
to
b3baac4
Compare
What about this: b3baac4? |
Result of 1 package built:
|
Works for me, thanks @wegank! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not too knowledgable about Nixpkgs and the direction that it should evolve to. That said my understanding for packages residing under pkgs/by-name
was to avoid the need for edits in pkgs/top-level/all-packages
.
I like the approach the meson
package has taken as it declares dependancies near the top of the file while not needing an entry in all-packages.nix
.
Do people see value in making a similar change to trunk-ng
in the scope of this PR?
This is of course possible. However, a greater concern of this PR is that it does not build on ofborg due to hash mismatch on darwin, which is a regression. I suspect there's a case-sensitivity issue, but I haven't looked into it yet. |
That's odd. The hash starting with |
Co-authored-by: Alexis Hildebrandt <afh@surryhill.net>
b3baac4
to
f93a946
Compare
@wegank when building error: hash mismatch in fixed-output derivation '/nix/store/9z7gdhxxi1zhih0mz924sakwacqzkfk0-trunk-ng-0.17.16-vendor.tar.gz.drv':
specified: sha256-TwpGw3LH3TmZSbC4DkoOYpQdOpksXXoAoiacyZAefTU=
got: sha256-AivISmT/r8xa/vSXUN8sU7z67t1hcyMQM+t6oXmIOhU= |
That's not the case on my side, though. I suppose you're having a case-insensitive store? |
It seems that the nix-installer set up |
Oh, then probably |
Nope % (cd /tmp; touch foo Foo; ls ?oo)
Foo foo |
Automatic update generated by nixpkgs-update tools. This update was made based on information from https://github.com/ctron/trunk/releases.
meta.description for trunk-ng is: Build, bundle & ship your Rust WASM application to the web
meta.homepage for trunk-ng is: https://github.com/ctron/trunk
Updates performed
To inspect upstream changes
Release on GitHub
Compare changes on GitHub
Impact
Checks done
passthru.tests
, if any, passedRebuild report (if merged into master) (click to expand)
Instructions to test this update (click to expand)
Either download from Cachix:
(The Cachix cache is only trusted for this store-path realization.)
For the Cachix download to work, your user must be in the
trusted-users
list or you can usesudo
since root is effectively trusted.Or, build yourself:
Or:
After you've downloaded or built it, look at the files and if there are any, run the binaries:
Pre-merge build results
We have automatically built all packages that will get rebuilt due to
this change.
This gives evidence on whether the upgrade will break dependent packages.
Note sometimes packages show up as failed to build independent of the
change, simply because they are already broken on the target branch.
Result of
nixpkgs-review
run on x86_64-linux 11 package built:
Maintainer pings
cc @ctron for testing.