cosmic-applets: deduplicate cosmic-settings
This commit is contained in:
@@ -0,0 +1,58 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 7c10e63a..052a5852 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1658,7 +1658,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-settings-a11y-manager-subscription"
|
||||
version = "1.0.2"
|
||||
-source = "git+https://github.com/pop-os/cosmic-settings#55b502dff39bf4be056c23888aaad185f9227eb2"
|
||||
+source = "git+https://github.com/pop-os/cosmic-settings#b46a55d4237f1fd6e1bacc852ceb053e6a26c2fe"
|
||||
dependencies = [
|
||||
"cosmic-protocols",
|
||||
"iced_futures",
|
||||
@@ -1672,7 +1672,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-settings-accessibility-subscription"
|
||||
version = "1.0.2"
|
||||
-source = "git+https://github.com/pop-os/cosmic-settings#55b502dff39bf4be056c23888aaad185f9227eb2"
|
||||
+source = "git+https://github.com/pop-os/cosmic-settings#b46a55d4237f1fd6e1bacc852ceb053e6a26c2fe"
|
||||
dependencies = [
|
||||
"cosmic-dbus-a11y",
|
||||
"futures",
|
||||
@@ -1685,7 +1685,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-settings-airplane-mode-subscription"
|
||||
version = "1.0.2"
|
||||
-source = "git+https://github.com/pop-os/cosmic-settings#55b502dff39bf4be056c23888aaad185f9227eb2"
|
||||
+source = "git+https://github.com/pop-os/cosmic-settings#b46a55d4237f1fd6e1bacc852ceb053e6a26c2fe"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_futures",
|
||||
@@ -1718,7 +1718,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-settings-daemon-subscription"
|
||||
version = "1.0.2"
|
||||
-source = "git+https://github.com/pop-os/cosmic-settings#55b502dff39bf4be056c23888aaad185f9227eb2"
|
||||
+source = "git+https://github.com/pop-os/cosmic-settings#b46a55d4237f1fd6e1bacc852ceb053e6a26c2fe"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_futures",
|
||||
@@ -1731,7 +1731,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-settings-network-manager-subscription"
|
||||
version = "1.0.2"
|
||||
-source = "git+https://github.com/pop-os/cosmic-settings#55b502dff39bf4be056c23888aaad185f9227eb2"
|
||||
+source = "git+https://github.com/pop-os/cosmic-settings#b46a55d4237f1fd6e1bacc852ceb053e6a26c2fe"
|
||||
dependencies = [
|
||||
"bitflags 2.10.0",
|
||||
"cosmic-dbus-networkmanager",
|
||||
@@ -1765,7 +1765,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-settings-upower-subscription"
|
||||
version = "1.0.2"
|
||||
-source = "git+https://github.com/pop-os/cosmic-settings#55b502dff39bf4be056c23888aaad185f9227eb2"
|
||||
+source = "git+https://github.com/pop-os/cosmic-settings#b46a55d4237f1fd6e1bacc852ceb053e6a26c2fe"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_futures",
|
||||
@@ -30,7 +30,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
hash = "sha256-x2FHzgbxxHJEYlCK0bi5j7WdAqAlcocLYW20y2ionBc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FWpfgqPqjbzzv6yaBKx9eq+PHCCQ/TErx+TGWqmXqXA=";
|
||||
cargoPatches = [
|
||||
# The lockfile references two different revisions of the same internal repository cosmic-settings,
|
||||
# which likely is unintentional and currently causing issues with fetchCargoVendor.
|
||||
# Upstream already resolved this because of a general dependency update, so this can be removed on the
|
||||
# next update.
|
||||
./dedup-cosmic-settings.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-R9d7slLid3x7NYXkMfcRRa4zY8/RxW+QLMZGsvHdfCw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
|
||||
Reference in New Issue
Block a user