Unverified Commit a28ac41f authored by Janik's avatar Janik Committed by GitHub
Browse files

Merge pull request #263530 from 0x4A6F/master-atuin 

atuin: 16.0.0 -> 17.0.1
parents 2695b2dc 17983c80

pkgs/tools/misc/atuin/default.nix

+8 −5
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, installShellFiles

, rustPlatform

, libiconv

, AppKit

, Security

, SystemConfiguration

, nixosTests
@@ -11,24 +12,24 @@ 


rustPlatform.buildRustPackage rec {

  pname = "atuin";

  version = "16.0.0";

  version = "17.0.1";



  src = fetchFromGitHub {

    owner = "atuinsh";

    repo = "atuin";

    rev = "v${version}";

    hash = "sha256-Kh6aaWYV+ZG7Asvw5JdGsV+nxD+xvvQab5wLIedcQcQ=";

    hash = "sha256-HJRlZwvBra2D7TzVKvMWJ0Hf17QgIEcBDQEHhxdVLIM=";

  };



  # TODO: unify this to one hash because updater do not support this

  cargoHash =

    if stdenv.isLinux

    then "sha256-Ami88ScGj58jCCat4MMDvjZtV5WglmrlggpQfo+LPjs="

    else "sha256-HQMZ9w1C6go16XGrPNniQZliIQ/5yAp2w/uUwAOQTM0=";

    then "sha256-AhoXmEjXsi/OgFX3htOA6A/lWegUFlsywdotX3PDwcs="

    else "sha256-/nCnZ64pM8oWVX9a4JCeCZRyuo7aVc8YaBVEMbiRsqE=";



  nativeBuildInputs = [ installShellFiles ];



  buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ];

  buildInputs = lib.optionals stdenv.isDarwin [ libiconv AppKit Security SystemConfiguration ];



  postInstall = ''

    installShellCompletion --cmd atuin \
@@ -44,6 +45,8 @@ rustPlatform.buildRustPackage rec { 
  checkFlags = [

    # tries to make a network access

    "--skip=registration"

    # No such file or directory (os error 2)

    "--skip=sync"

  ];



  meta = with lib; {

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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) AppKit Security SystemConfiguration;















  };





























  automatic-timezoned = callPackage ../tools/system/automatic-timezoned { };