onefetch: 2.21.0 -> 2.22.0, migrate to by-name (#355063)

This commit is contained in:
Franz Pletz 2024-11-24 17:08:52 +01:00 committed by GitHub
commit a0cefba4f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 25 deletions

View File

@ -1,39 +1,48 @@
{ lib {
, rustPlatform lib,
, fetchFromGitHub rustPlatform,
, cmake fetchFromGitHub,
, installShellFiles cmake,
, pkg-config installShellFiles,
, zstd pkg-config,
, stdenv zstd,
, CoreFoundation stdenv,
, libresolv darwin,
, Security git,
, git
}: }:
let
inherit (darwin) libresolv;
in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "onefetch"; pname = "onefetch";
version = "2.21.0"; version = "2.22.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "o2sh"; owner = "o2sh";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-KQs7b+skXQhHbfHIJkgowNY2FB6oS2V8TQFdkmElC/k="; hash = "sha256-Gk1hoC6qsLYm7DbbaRSur6GdC9yXQe+mYLUJklXIwZ4=";
}; };
cargoHash = "sha256-gKA1MMahoaDFia8LR33GG3jRttZzHwpUpFawlCQcy7g="; cargoHash = "sha256-4YB10uj4ULhvhn+Yv0dRZO8fRxwm3lEAZ5v+MYHO7lI=";
cargoPatches = [ cargoPatches = [
# enable pkg-config feature of zstd # enable pkg-config feature of zstd
./zstd-pkg-config.patch ./zstd-pkg-config.patch
]; ];
nativeBuildInputs = [ cmake installShellFiles pkg-config ]; nativeBuildInputs = [
cmake
installShellFiles
pkg-config
];
buildInputs = [ zstd ] buildInputs =
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation libresolv Security ]; [ zstd ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libresolv
];
nativeCheckInputs = [ nativeCheckInputs = [
git git
@ -59,7 +68,11 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/o2sh/onefetch"; homepage = "https://github.com/o2sh/onefetch";
changelog = "https://github.com/o2sh/onefetch/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/o2sh/onefetch/blob/v${version}/CHANGELOG.md";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne figsoda kloenk ]; maintainers = with maintainers; [
Br1ght0ne
figsoda
kloenk
];
mainProgram = "onefetch"; mainProgram = "onefetch";
}; };
} }

View File

@ -17,7 +17,6 @@ index a0a2777..ad146cb 100644
@@ -65,6 +65,7 @@ time-humanize = { version = "0.1.3", features = ["time"] } @@ -65,6 +65,7 @@ time-humanize = { version = "0.1.3", features = ["time"] }
tokei = "12.1.2" tokei = "12.1.2"
typetag = "0.2" typetag = "0.2"
parking_lot = "0.12"
+zstd = { version = "*", features = ["pkg-config"] } +zstd = { version = "*", features = ["pkg-config"] }
[dev-dependencies] [dev-dependencies]

View File

@ -4655,11 +4655,6 @@ with pkgs;
ome_zarr = with python3Packages; toPythonApplication ome-zarr; ome_zarr = with python3Packages; toPythonApplication ome-zarr;
onefetch = callPackage ../tools/misc/onefetch {
inherit (darwin) libresolv;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; }; onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; };
openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; }; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; };