Unverified Commit 551e5304 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

atuin: 18.0.0 -> 18.0.1
parents 399d51fb d471567b

pkgs/by-name/at/atuin/package.nix

+5 −15
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, installShellFiles

, rustPlatform

, libiconv
@@ -11,29 +10,20 @@ 


rustPlatform.buildRustPackage rec {

  pname = "atuin";

  version = "18.0.0";

  version = "18.0.1";



  src = fetchFromGitHub {

    owner = "atuinsh";

    repo = "atuin";

    rev = "v${version}";

    hash = "sha256-2nBaGoaTd1TGm8aZnrNA66HkW7+OrD6gOmj+uSFz020=";

    hash = "sha256-fuVSn1vhKn2+Tw5f6zBYHFW3QSL4eisZ6d5pxsj5hh4=";

  };



  patches = [

    # https://github.com/atuinsh/atuin/pull/1694

    (fetchpatch {

      name = "0001-atuin_src_command_client_search_interactive.rs.patch";

      url = "https://github.com/atuinsh/atuin/commit/6bc38f4cf3c8d2b6fbd135998a4e64e6abfb2566.patch";

      hash = "sha256-pUiuECiAmq7nmKO/cOHZ1V5Iy3zDzZyBNNCH7Czo/NA=";

    })

  ];



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

  cargoHash =

    if stdenv.isLinux

    then "sha256-Y+49R/foid+V83tY3bqf644OkMPukJxg2/ZVfJxDaFg="

    else "sha256-gT2JRzBAF4IsXVv1Hvo6kr9qrNE/3bojtULCx6YawhA=";

    then "sha256-lHWgsVnjSeBmd7O4Fn0pUtTn4XbkBOAouaRHRozil50="

    else "sha256-LxfpllzvgUu7ZuD97n3W+el3bdOt5QGXzJbDQ0w8seo=";



  nativeBuildInputs = [ installShellFiles ];
@@ -60,7 +50,7 @@ rustPlatform.buildRustPackage rec { 
    "--skip=registration"

    # No such file or directory (os error 2)

    "--skip=sync"

    # further failing tests

    # PermissionDenied (Operation not permitted)

    "--skip=change_password"

    "--skip=multi_user_test"

  ];