Merge pull request #278723 from nyabinary/cosmic-settings

cosmic-settings: unstable-2023-10-26 -> unstable-2024-01-09
This commit is contained in:
Weijia Wang 2024-01-12 22:49:15 +01:00 committed by GitHub
commit 21321ea504
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 901 additions and 1076 deletions

View File

@ -1,10 +1,9 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, rust
, rustPlatform , rustPlatform
, cmake , cmake
, makeWrapper , makeBinaryWrapper
, cosmic-icons , cosmic-icons
, just , just
, pkg-config , pkg-config
@ -15,35 +14,34 @@
, wayland , wayland
, expat , expat
, udev , udev
, which
, lld
, util-linuxMinimal
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cosmic-settings"; pname = "cosmic-settings";
version = "unstable-2023-10-26"; version = "unstable-2024-01-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pop-os"; owner = "pop-os";
repo = pname; repo = pname;
rev = "d15ebbd340dee7adf184831311b5da73faaa80f5"; rev = "f2148eed9a56ef1b5ba73db73e15486e188e01b7";
hash = "sha256-OlQ2jjT/ygO+hpl5Cc3h8Yp/SVo+pmI/EH7pqvY9GXI="; hash = "sha256-JUiUC/RNR1cqJouUEneHZotkN2M18vJhv+ATvGFrQxU=";
}; };
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"accesskit-0.11.0" = "sha256-/6KUCH1CwMHd5YEMOpAdVeAxpjl9JvrzDA4Xnbd1D9k="; "accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE=";
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
"cosmic-bg-config-0.1.0" = "sha256-fdRFndhwISmbTqmXfekFqh+Wrtdjg3vSZut4IAQUBbA="; "cosmic-bg-config-0.1.0" = "sha256-fdRFndhwISmbTqmXfekFqh+Wrtdjg3vSZut4IAQUBbA=";
"cosmic-comp-config-0.1.0" = "sha256-q0LP8TODETobYg0S6XDsP0Lw/RJIB8YB4jiUkRHpsio="; "cosmic-comp-config-0.1.0" = "sha256-xN5VbxRO50BPU0VP1rSOkq3TS2WTiCGavJS8o05Jw50=";
"cosmic-config-0.1.0" = "sha256-+mnvf/IM9cqoZv5zHW8uBAqeY2pG3IOiOWIESVExnqg="; "cosmic-config-0.1.0" = "sha256-/oAG5xu0Lnsw/CIGXrvoC3pKkj5aS0qubWIPozQDSsY=";
"cosmic-panel-config-0.1.0" = "sha256-U5FYZ5hjJ5s6lYfWrgyuy8zLjiXGQV+OKwf6nzHZT6w="; "cosmic-client-toolkit-0.1.0" = "sha256-AEgvF7i/OWPdEMi8WUaAg99igBwE/AexhAXHxyeJMdc=";
"smithay-client-toolkit-0.17.0" = "sha256-vDY4cqz5CZD12twElUWVCsf4N6VO9O+Udl8Dc4arWK4="; "cosmic-panel-config-0.1.0" = "sha256-SDqNLuj219FMqlO2devw/DD04RJfSBJLDLH/4ObRCl8=";
"softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY="; "glyphon-0.3.0" = "sha256-Uw1zbHVAjB3pUfUd8GnFUnske3Gxs+RktrbaFJfK430=";
"taffy-0.3.11" = "sha256-gPHJhYmDb3Pj7eM8eFv1kPoODk0BGiw+yMj9ROXIjAU="; "smithay-client-toolkit-0.18.0" = "sha256-9NwNrEC+csTVtmXrNQFvOgohTGUO2VCvqOME7SnDCOg=";
"winit-0.28.6" = "sha256-8IQ6HyvD09v8+KWO5jbAkouRTTX/Des4Pn/sjGrtdok="; "softbuffer-0.3.3" = "sha256-eKYFVr6C1+X6ulidHIu9SP591rJxStxwL9uMiqnXx4k=";
"xdg-shell-wrapper-config-0.1.0" = "sha256-pvaI/joul7jWTdIrPq3PbBcQGMLZLd2rTu1aIwXiZN8="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
"xdg-shell-wrapper-config-0.1.0" = "sha256-3Dc2fU8xBVUmAs0Q1zEdcdG7vlxpBO+UIlyM/kzGcC4=";
}; };
}; };
@ -51,7 +49,7 @@ rustPlatform.buildRustPackage rec {
substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
''; '';
nativeBuildInputs = [ cmake just pkg-config which lld util-linuxMinimal makeWrapper ]; nativeBuildInputs = [ cmake just pkg-config makeBinaryWrapper ];
buildInputs = [ libxkbcommon libinput fontconfig freetype wayland expat udev ]; buildInputs = [ libxkbcommon libinput fontconfig freetype wayland expat udev ];
dontUseJustBuild = true; dontUseJustBuild = true;
@ -76,5 +74,6 @@ rustPlatform.buildRustPackage rec {
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ nyanbinary ]; maintainers = with maintainers; [ nyanbinary ];
platforms = platforms.linux; platforms = platforms.linux;
mainProgram = "cosmic-settings";
}; };
} }

View File

@ -30959,8 +30959,6 @@ with pkgs;
cordless = callPackage ../applications/networking/instant-messengers/cordless { }; cordless = callPackage ../applications/networking/instant-messengers/cordless { };
cosmic-settings = callPackage ../applications/window-managers/cosmic/settings { };
coursera-dl = callPackage ../applications/misc/coursera-dl { }; coursera-dl = callPackage ../applications/misc/coursera-dl { };
coyim = callPackage ../applications/networking/instant-messengers/coyim { }; coyim = callPackage ../applications/networking/instant-messengers/coyim { };