Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

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

atuin: 16.0.0 -> 17.0.1

authored by Janik and committed by GitHub a28ac41f 2695b2dc

+9 -6
+8 -5
pkgs/tools/misc/atuin/default.nix
··· 4 4 , installShellFiles 5 5 , rustPlatform 6 6 , libiconv 7 + , AppKit 7 8 , Security 8 9 , SystemConfiguration 9 10 , nixosTests ··· 11 12 12 13 rustPlatform.buildRustPackage rec { 13 14 pname = "atuin"; 14 - version = "16.0.0"; 15 + version = "17.0.1"; 15 16 16 17 src = fetchFromGitHub { 17 18 owner = "atuinsh"; 18 19 repo = "atuin"; 19 20 rev = "v${version}"; 20 - hash = "sha256-Kh6aaWYV+ZG7Asvw5JdGsV+nxD+xvvQab5wLIedcQcQ="; 21 + hash = "sha256-HJRlZwvBra2D7TzVKvMWJ0Hf17QgIEcBDQEHhxdVLIM="; 21 22 }; 22 23 23 24 # TODO: unify this to one hash because updater do not support this 24 25 cargoHash = 25 26 if stdenv.isLinux 26 - then "sha256-Ami88ScGj58jCCat4MMDvjZtV5WglmrlggpQfo+LPjs=" 27 - else "sha256-HQMZ9w1C6go16XGrPNniQZliIQ/5yAp2w/uUwAOQTM0="; 27 + then "sha256-AhoXmEjXsi/OgFX3htOA6A/lWegUFlsywdotX3PDwcs=" 28 + else "sha256-/nCnZ64pM8oWVX9a4JCeCZRyuo7aVc8YaBVEMbiRsqE="; 28 29 29 30 nativeBuildInputs = [ installShellFiles ]; 30 31 31 - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ]; 32 + buildInputs = lib.optionals stdenv.isDarwin [ libiconv AppKit Security SystemConfiguration ]; 32 33 33 34 postInstall = '' 34 35 installShellCompletion --cmd atuin \ ··· 44 45 checkFlags = [ 45 46 # tries to make a network access 46 47 "--skip=registration" 48 + # No such file or directory (os error 2) 49 + "--skip=sync" 47 50 ]; 48 51 49 52 meta = with lib; {
+1 -1
pkgs/top-level/all-packages.nix
··· 285 285 _0x = callPackage ../tools/misc/0x { }; 286 286 287 287 atuin = callPackage ../tools/misc/atuin { 288 - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; 288 + inherit (darwin.apple_sdk.frameworks) AppKit Security SystemConfiguration; 289 289 }; 290 290 291 291 automatic-timezoned = callPackage ../tools/system/automatic-timezoned { };