Skip to content

[Backport release-26.05] COSMIC stable 1.0.16#531964

Merged
alyssais merged 27 commits into
NixOS:release-26.05from
thefossguy:backport-530443-to-release-26.0
Jun 15, 2026
Merged

[Backport release-26.05] COSMIC stable 1.0.16#531964
alyssais merged 27 commits into
NixOS:release-26.05from
thefossguy:backport-530443-to-release-26.0

Conversation

@thefossguy

Copy link
Copy Markdown
Member

Things done

A backport of #530443 with manual assistance since automation failed.

(cherry picked from commit de97844)
(cherry picked from commit 4fd38cc)
(cherry picked from commit 6426216)
(cherry picked from commit fa83f19)
(cherry picked from commit 9fc8e2b)
(cherry picked from commit d74923a)
(cherry picked from commit 0222a82)
(cherry picked from commit 72f2c6d)
(cherry picked from commit d484d8e)
(cherry picked from commit cc68250)
(cherry picked from commit 0a02121)
(cherry picked from commit 7430762)
(cherry picked from commit 968794b)
(cherry picked from commit 266e078)

@nixpkgs-commit-check nixpkgs-commit-check Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Difference between e773a21 and original 760bdf2 may warrant inspection.

Show diff
@@ Metadata
 Author: Pratham Patel <prathampatel@thefossguy.com>
 
  ## Commit message ##
-    cosmic-reader: 0-unstable-2026-05-20 -> 0-unstable-2026-06-06
+    cosmic-reader: 0-unstable-2026-05-12 -> 0-unstable-2026-06-06
+
+    (cherry picked from commit 760bdf2a67cf3c465cbf33e96d864c263e612555)
 
  ## pkgs/by-name/co/cosmic-reader/package.nix ##
 @@
  }:
  rustPlatform.buildRustPackage (finalAttrs: {
    pname = "cosmic-reader";
--  version = "0-unstable-2026-05-20";
+-  version = "0-unstable-2026-05-12";
 +  version = "0-unstable-2026-06-06";
  
    src = fetchFromGitHub {
      owner = "pop-os";
      repo = "cosmic-reader";
--    rev = "c29b3e82c0827133b24dcdb43e1f28a1c7df37a1";
--    hash = "sha256-YsRXWSf2l8RfIEXKxvJtYWxhma8N2Y+0/HZwhs7d5k8=";
+-    rev = "0dde6aed2c51b16e48d2756ceeb0c92620442418";
+-    hash = "sha256-Is6SRWn7BbsT6GRsmPMDxQNzdGxSMXKM3hNVMV2NM7c=";
 +    rev = "31485419db10e12c2942029d673836343e4609dd";
 +    hash = "sha256-XZ5A7Qi+sxlUel1Fpr9wy8o0MD9mtyqFIwBN4Rf7CcU=";
    };
  
--  cargoHash = "sha256-P9ZC7721MjC/h7sbf7x91WGfMbT4tA46HrYhDgCeiWE=";
+-  cargoHash = "sha256-p0dg5RNXkzbi+/RB5k+jr34RNOp+Irahj0BiFUddfnk=";
 +  cargoHash = "sha256-DPGpGWzAgdpHp3qzksLtLnfqk+DJsaukdT2ekFFiGaM=";
  
    separateDebugInfo = true;

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

@thefossguy thefossguy force-pushed the backport-530443-to-release-26.0 branch from 4e2cafd to 0a4059a Compare June 15, 2026 14:02
@thefossguy

Copy link
Copy Markdown
Member Author

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Sometimes it is not possible to cherry-pick exactly the same patch. This most frequently happens when resolving merge conflicts. The range-diff will help to review the resolution of conflicts.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Difference between 1ebfdd4 and original 760bdf2 may warrant inspection.
Show diff

@@ Metadata
  ## Commit message ##
     cosmic-reader: 0-unstable-2026-05-20 -> 0-unstable-2026-06-06
 
+    (cherry picked from commit 760bdf2a67cf3c465cbf33e96d864c263e612555)
+
  ## pkgs/by-name/co/cosmic-reader/package.nix ##
 @@
  }:
  rustPlatform.buildRustPackage (finalAttrs: {
    pname = "cosmic-reader";
--  version = "0-unstable-2026-05-20";
+-  version = "0-unstable-2026-05-12";
 +  version = "0-unstable-2026-06-06";
  
    src = fetchFromGitHub {
      owner = "pop-os";
      repo = "cosmic-reader";
--    rev = "c29b3e82c0827133b24dcdb43e1f28a1c7df37a1";
--    hash = "sha256-YsRXWSf2l8RfIEXKxvJtYWxhma8N2Y+0/HZwhs7d5k8=";
+-    rev = "0dde6aed2c51b16e48d2756ceeb0c92620442418";
+-    hash = "sha256-Is6SRWn7BbsT6GRsmPMDxQNzdGxSMXKM3hNVMV2NM7c=";
 +    rev = "31485419db10e12c2942029d673836343e4609dd";
 +    hash = "sha256-XZ5A7Qi+sxlUel1Fpr9wy8o0MD9mtyqFIwBN4Rf7CcU=";
    };
  
--  cargoHash = "sha256-P9ZC7721MjC/h7sbf7x91WGfMbT4tA46HrYhDgCeiWE=";
+-  cargoHash = "sha256-p0dg5RNXkzbi+/RB5k+jr34RNOp+Irahj0BiFUddfnk=";
 +  cargoHash = "sha256-DPGpGWzAgdpHp3qzksLtLnfqk+DJsaukdT2ekFFiGaM=";
  
    separateDebugInfo = true;

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

This is because the cosmic-reader was older in stale than unstable and therefore, in stable, the bump is 0-unstable-2026-05-12 -> 0-unstable-2026-06-06 while unstable only needed 0-unstable-2026-05-20 -> 0-unstable-2026-06-06.

@thefossguy thefossguy requested a review from a team June 15, 2026 14:03
@nixpkgs-ci nixpkgs-ci Bot added 8.has: package (update) This PR updates a package to a newer version 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 6.topic: COSMIC COSMIC is a software platform for designing beautiful user experiences 4.workflow: backport This targets a stable branch labels Jun 15, 2026
@alyssais alyssais added this pull request to the merge queue Jun 15, 2026
Merged via the queue into NixOS:release-26.05 with commit f732b95 Jun 15, 2026
34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 6.topic: COSMIC COSMIC is a software platform for designing beautiful user experiences 8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants