Merge pull request #328329 from A1ca7raz/ciel

ciel: 3.1.4 -> 3.2.7
This commit is contained in:
Peder Bergebakken Sundt 2024-07-25 22:05:41 +02:00 committed by GitHub
commit 956c99c0af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1020 additions and 672 deletions

File diff suppressed because it is too large Load Diff

View File

@ -16,19 +16,19 @@
rustPlatform.buildRustPackage rec {
pname = "ciel";
version = "3.1.4";
version = "3.2.7";
src = fetchFromGitHub {
owner = "AOSC-Dev";
repo = "ciel-rs";
rev = "refs/tags/v${version}";
hash = "sha256-b8oTVtDcxrV41OtfuthIxjbgZTANCfYHQLRJnnEc93c=";
hash = "sha256-4SVBaQDr0O1Fei8qwNjSNtv3sz9tu7oQPyGmoQypWno=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"libmount-0.1.15" = "sha256-t7CGGqJC85od8lOng9+Cn0+WDef6aciLLgxnQn1MrBk=";
"libmount-0.1.15" = "sha256-JObYz6AUWhvz8q+9DdsbMWm7zNQmMW73WAt+LjY5TV0=";
};
};
@ -38,16 +38,6 @@ rustPlatform.buildRustPackage rec {
# Therefore, bash is required for plugins to work.
buildInputs = [ bash systemd dbus openssl libssh2 libgit2 xz zlib ];
patches = [
# cli,completions: use canonicalize path to find libexec location
# FIXME: remove this patch after https://github.com/AOSC-Dev/ciel-rs/pull/16 is merged
(fetchpatch {
name = "use-canonicalize-path-to-find-libexec.patch";
url = "https://github.com/AOSC-Dev/ciel-rs/commit/17f41538ed1057e855540f5abef7faf6ea4abf5c.patch";
sha256 = "sha256-ELK2KpOuoBS774apomUIo8q1eXYs/FX895G7eBdgOQg=";
})
];
postInstall = ''
mv -v "$out/bin/ciel-rs" "$out/bin/ciel"
@ -66,7 +56,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/AOSC-Dev/ciel-rs";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ yisuidenghua ];
maintainers = with maintainers; [ A1ca7raz yisuidenghua ];
mainProgram = "ciel";
};
}