From 4717737a69019f97223f7d332c6f3d79b23d74a2 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 22 Mar 2024 18:11:05 +0100 Subject: [PATCH] lsd: update to 1.1.0 --- .../lsd/patches/{bump-git2.patch => downgrade-git2.patch} | 8 ++++---- srcpkgs/lsd/template | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) rename srcpkgs/lsd/patches/{bump-git2.patch => downgrade-git2.patch} (68%) diff --git a/srcpkgs/lsd/patches/bump-git2.patch b/srcpkgs/lsd/patches/downgrade-git2.patch similarity index 68% rename from srcpkgs/lsd/patches/bump-git2.patch rename to srcpkgs/lsd/patches/downgrade-git2.patch index 54319caba11e90..749ce03865ab05 100644 --- a/srcpkgs/lsd/patches/bump-git2.patch +++ b/srcpkgs/lsd/patches/downgrade-git2.patch @@ -1,13 +1,13 @@ diff --git a/Cargo.toml b/Cargo.toml -index 30fa892..460cf13 100644 +index 1fa32ac..815cbda 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -45,7 +45,7 @@ vsort = "0.1.0" +@@ -46,7 +46,7 @@ xdg = "2.5" [target."cfg(not(all(windows, target_arch = \"x86\", target_env = \"gnu\")))".dependencies] # if ssl feature is enabled compilation will fail on arm-unknown-linux-gnueabihf and i686-pc-windows-gnu --git2 = { version = "0.16", optional = true, default-features = false } +-git2 = { version = "0.18", optional = true, default-features = false } +git2 = { version = "0.17", optional = true, default-features = false } [target.'cfg(unix)'.dependencies] - users = "0.11.*" + users = { version = "0.11.3", package = "uzers" } diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template index b07f510bff495a..5a41bba80a287f 100644 --- a/srcpkgs/lsd/template +++ b/srcpkgs/lsd/template @@ -1,6 +1,6 @@ # Template file for 'lsd' pkgname=lsd -version=1.0.0 +version=1.1.0 revision=1 build_style=cargo hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://github.com/lsd-rs/lsd" changelog="https://raw.githubusercontent.com/Peltoche/lsd/master/CHANGELOG.md" distfiles="https://github.com/lsd-rs/lsd/archive/refs/tags/v${version}.tar.gz" -checksum=ab34e9c85bc77cfa42b43bfb54414200433a37419f3b1947d0e8cfbb4b7a6325 +checksum=4bbd180deeef2674e55724bb4297ee0442bea956e36f9c4cd2fcca4e82bb4026 conflicts="disputils" # The 'cannot_access_subdir_exit_status' fails on CI @@ -25,7 +25,7 @@ fi export SHELL_COMPLETIONS_DIR="${wrksrc}" post_patch() { - cargo update --package git2@0.16.1 --precise 0.17.2 + cargo update --package git2@0.18.2 --precise 0.17.2 } post_install() {