atuin: 16.0.0 -> 17.0.1 #263530
Merged
atuin: 16.0.0 -> 17.0.1 #263530
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
ofborg
bot
added
11.by: package-maintainer
r-vdp
approved these changes
Oct 26, 2023
delroth
added
the
12.approvals: 1
delroth
removed
the
12.approvals: 1
|
With the fix from the most recent change the build starts for me too. Unfortunately on aarch64-darwin the build fails when doing: Full errorI tried adding Full log |
|
This should fix the darwin build: r-vdp@f730413 @ljrk0: apple SDK stuff is not in the global namespace used by |
|
I could fix this:
Now everything builds successfully. Patch: From baf4bb8a715a2fe435704fd9a7d22ed773255dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janis=20K=C3=B6nig?= <[email protected]>
Date: Thu, 26 Oct 2023 18:09:13 +0200
Subject: [PATCH] Fix missing framework: AppKit
Error on aarch64-darwin:
ld: framework not found AppKit
---
pkgs/tools/misc/atuin/default.nix | 3 ++-
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/atuin/default.nix b/pkgs/tools/misc/atuin/default.nix
index 4ce035300400..4b1de31970fd 100644
--- a/pkgs/tools/misc/atuin/default.nix
+++ b/pkgs/tools/misc/atuin/default.nix
@@ -6,6 +6,7 @@
, libiconv
, Security
, SystemConfiguration
+, AppKit
, nixosTests
}:
@@ -28,7 +29,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ installShellFiles ];
- buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ];
+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration AppKit ];
postInstall = ''
installShellCompletion --cmd atuin \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 365bde606773..8fa6f73e5543 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -285,7 +285,7 @@ with pkgs;
_0x = callPackage ../tools/misc/0x { };
atuin = callPackage ../tools/misc/atuin {
- inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
+ inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration AppKit;
};
automatic-timezoned = callPackage ../tools/system/automatic-timezoned { };
--
2.39.3 (Apple Git-145)EDIT: Haha, @r-vdp beat me to it by the second :'D |
SuperSandro2000
approved these changes
Oct 26, 2023
delroth
added
the
12.approvals: 2
delroth
removed
the
12.approvals: 2
0x4A6F
added
the
12.approvals: 2
delroth
removed
the
12.approvals: 2
devusb
reviewed
Oct 29, 2023
|
Result of 1 package built:
|
devusb
approved these changes
Oct 29, 2023
delroth
added
the
12.approvals: 3+
|
Thanks for the great Darwin support on this PR. ❤️ |
|
I just tried it locally and it works fine there but the nixos test fails 🤔 |
|
I'll merge this since the test failures are unrelated to this pr |
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.
Description of changes
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/)