From 85189bee5b53b2f81f78a22c33cf4f298bffcfb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 17 Aug 2024 21:35:54 +0200 Subject: [PATCH] attic-client: 0-unstable-2024-08-01 -> 0-unstable-2024-08-19 --- pkgs/by-name/at/attic-client/Cargo.lock | 20 +++++++++++++++++--- pkgs/by-name/at/attic-client/package.nix | 8 ++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/at/attic-client/Cargo.lock b/pkgs/by-name/at/attic-client/Cargo.lock index 165b9a97c872..a8bd1f01fcfe 100644 --- a/pkgs/by-name/at/attic-client/Cargo.lock +++ b/pkgs/by-name/at/attic-client/Cargo.lock @@ -230,6 +230,7 @@ dependencies = [ "async-stream", "base64 0.22.1", "bytes", + "cc", "cxx", "cxx-build", "digest", @@ -250,6 +251,7 @@ dependencies = [ "tempfile", "tokio", "tokio-test", + "version-compare", "wildmatch", "xdg", ] @@ -1050,13 +1052,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -3960,6 +3962,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -4891,6 +4899,12 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + [[package]] name = "version_check" version = "0.9.4" diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index c2b73ed985c6..e9b89cf6d54b 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage { pname = "attic"; - version = "0-unstable-2024-08-01"; + version = "0-unstable-2024-08-19"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "attic"; - rev = "e127acbf9a71ebc0c26bc8e28346822e0a6e16ba"; - hash = "sha256-GJIz4M5HDB948Ex/8cPvbkrNzl/eKUE7/c21JBu4lb8="; + rev = "acf3c351f8de47c6857f31948ab253f9c7ce2a6f"; + hash = "sha256-jcY81r8PdMQ9dCGhT0YLZzxPj3kQJXyWCmvQLXbR1EI="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage { }; cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates; - ATTIC_DISTRIBUTOR = "attic"; + ATTIC_DISTRIBUTOR = "nixpkgs"; NIX_INCLUDE_PATH = "${lib.getDev nix}/include"; # Attic interacts with Nix directly and its tests require trusted-user access