atuin: 18.2.0 -> 18.3.0

This commit is contained in:
0x4A6F 2024-06-11 13:25:42 +02:00
parent 051f920625
commit b79dc362ea
No known key found for this signature in database
GPG Key ID: 8DEDBA5BE07080E1

View File

@ -4,43 +4,51 @@
, installShellFiles , installShellFiles
, rustPlatform , rustPlatform
, libiconv , libiconv
, protobuf
, darwin , darwin
, nixosTests , nixosTests
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "atuin"; pname = "atuin";
version = "18.2.0"; version = "18.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "atuinsh"; owner = "atuinsh";
repo = "atuin"; repo = "atuin";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-TTQ2XLqng7TMLnRsLDb/50yyHYuMSPZJ4H+7CEFWQQ0="; hash = "sha256-Q3UI1IUD5Jz2O4xj3mFM7DqY3lTy3WhWYPa8QjJHTKE=";
}; };
# TODO: unify this to one hash because updater do not support this # TODO: unify this to one hash because updater do not support this
cargoHash = cargoHash =
if stdenv.isLinux if stdenv.isLinux
then "sha256-KMH19Op7uyb3Z/cjT6bdmO+JEp1o2n6rWRNYmn1+0hE=" then "sha256-K4Vw/d0ZOROWujWr76I3QvfKefLhXLeFufUrgStAyjQ="
else "sha256-mBOyo6bKipMfmsowQujeUpog12jXAiqx5CtkwCxquRU="; else "sha256-8NAfE7cGFT64ntNXK9RT0D/MbDJweN7vvsG/KlrY4K4=";
# atuin's default features include 'check-updates', which do not make sense # atuin's default features include 'check-updates', which do not make sense
# for distribution builds. List all other default features. # for distribution builds. List all other default features.
buildNoDefaultFeatures = true; buildNoDefaultFeatures = true;
buildFeatures = [ buildFeatures = [
"client" "sync" "server" "clipboard" "client" "sync" "server" "clipboard" "daemon"
]; ];
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = [
protobuf
] ++ lib.optionals stdenv.isDarwin [
libiconv libiconv
darwin.apple_sdk_11_0.frameworks.AppKit darwin.apple_sdk_11_0.frameworks.AppKit
darwin.apple_sdk_11_0.frameworks.Security darwin.apple_sdk_11_0.frameworks.Security
darwin.apple_sdk_11_0.frameworks.SystemConfiguration darwin.apple_sdk_11_0.frameworks.SystemConfiguration
]; ];
preBuild = ''
export PROTOC=${protobuf}/bin/protoc
export PROTOC_INCLUDE="${protobuf}/include";
'';
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd atuin \ installShellCompletion --cmd atuin \
--bash <($out/bin/atuin gen-completions -s bash) \ --bash <($out/bin/atuin gen-completions -s bash) \
@ -60,6 +68,7 @@ rustPlatform.buildRustPackage rec {
# PermissionDenied (Operation not permitted) # PermissionDenied (Operation not permitted)
"--skip=change_password" "--skip=change_password"
"--skip=multi_user_test" "--skip=multi_user_test"
"--skip=store::var::tests::build_vars"
# Tries to touch files # Tries to touch files
"--skip=build_aliases" "--skip=build_aliases"
]; ];