gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cosmic-*: 1.0.0-alpha.6 -> 1.0.0-alpha.7 (#401497)

Browse Source
This commit is contained in:
Pratham Patel
2025-04-25 10:40:18 +02:00
committed by GitHub
parent 3b8565a235
commit 9e608fbfac
24 changed files with 89 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/co/cosmic-applets/package.nix
+3 -3
View File
@@ -19,17 +19,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-applets";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-applets";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-kRj2hEtE8FYky9Fn8hgHBo+UwWjOoS7/ROh9qz/0Vzs=";
hash = "sha256-DmU9Dlb8w3a8U+oSGwWARPh1SRbv/8TW7TO9SSvDe1U=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-jADtvhMzWdJydT1T14PSk4ggZpWIcXiOK0TW2llKeos=";
cargoHash = "sha256-wWs3B5hh2DP93i+4gGDTi+7NT4bj8ULJ+fT95sXxUdg=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-applibrary/package.nix
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-applibrary";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-applibrary";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-hJOM5dZdLq6uYfhfspZzpbHgUOK/FWuIXuFPoisS8DU=";
hash = "sha256-2rGw4Jmr2rL9X1URA5wVPIZocuroS8yaQs42sJqiTbw=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-95jTSn0yYj2PNVtfumfD1rPf1yLXHUi60FBqENK8CSw=";
cargoHash = "sha256-+nkXcbAPcIkg+p4ct/E0bm5O0n1MGN43AaWPjw13t9s=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-bg/package.nix
+2 -11
View File
@@ -3,7 +3,6 @@
stdenv,
fetchFromGitHub,
rustPlatform,
fetchpatch,
cosmic-wallpapers,
libcosmicAppHook,
just,
@@ -14,23 +13,15 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-bg";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-bg";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-4b4laUXTnAbdngLVh8/dD144m9QrGReSEjRZoNR6Iks=";
hash = "sha256-KMP7TmamtbycF/nKctjYozMJwVr9zdp4A8AWriswo2g=";
};
patches = [
# TOOD: This is merged and will be included in the 7th Alpha release, remove it then.
(fetchpatch {
url = "https://github.com/pop-os/cosmic-bg/commit/6a824a7902d7cc72b5a3117b6486603a1795a1d6.patch";
hash = "sha256-jL0az87BlJU99lDF3jnE74I4m/NV6NViyYXTfZoBDM4=";
})
];
postPatch = ''
substituteInPlace config/src/lib.rs data/v1/all \
--replace-fail '/usr/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg' \
pkgs/by-name/co/cosmic-comp/package.nix
+3 -3
View File
@@ -20,17 +20,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-comp";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-comp";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-CygtVtzO8JJQv+G3yx/OCCy8BlPqyNqcmf3Mv1gFuT4=";
hash = "sha256-2AnGEUWumE1C4Mi5inN7enbxCdWCKbQdYpUvTK3jGQ4=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-bfVsfrxGi0Lq/YRddCVhfqXL8kPGL9p4bqSNPsmjx0o=";
cargoHash = "sha256-fj6TIBuZ5hrds4WMHRa2krXN5fivKriO2Q/FWdnlGaA=";
separateDebugInfo = true;
pkgs/by-name/co/cosmic-edit/package.nix
+4 -4
View File
@@ -21,21 +21,21 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-edit";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-edit";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-mKVZI/x8+LrwFHGnJOzOq/vFkGev7sM9xJQOTA7uZGA=";
hash = "sha256-mgUSkYtc+i9pXv0n3zLHwBXFxfeWlhbsFJKa7X+mI98=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-+b8pSSBUMs1EJDlldgR1UqLLH0sLU/djMOtE3JsDpkQ=";
cargoHash = "sha256-qfPLDgGeYGSO0ZKJooXRK0NnTqzJ6zq6RhBpTTUusQY=";
# COSMIC applications now uses vergen for the About page
# Update the COMMIT_DATE to match when the commit was made
env.VERGEN_GIT_COMMIT_DATE = "2025-02-20";
env.VERGEN_GIT_COMMIT_DATE = "2025-04-17";
env.VERGEN_GIT_SHA = finalAttrs.src.tag;
postPatch = ''
pkgs/by-name/co/cosmic-files/package.nix
+15 -5
View File
@@ -12,20 +12,20 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-files";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-files";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-i1CVhfieexeiKPwp0y29QyrKspzEFkp1+zwIaM9D/Qc=";
hash = "sha256-bI5yTpqU2N6hFwI9wi4b9N5onY5iN+8YDM3bSgdYxjQ=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-I5WRuEogMwa0dB6wxhWDxivqhCdUugvsPrwUvjjDnt8=";
cargoHash = "sha256-7AOdSk9XIXFCDyCus3XgOK3ZBVa4CvX+NFM0jHf7Wbs=";
env = {
VERGEN_GIT_COMMIT_DATE = "2025-02-21";
VERGEN_GIT_COMMIT_DATE = "2025-04-22";
VERGEN_GIT_SHA = finalAttrs.src.tag;
};
@@ -72,7 +72,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
defaultCargoTestFlags="$cargoTestFlags"
cargoTestFlags="$defaultCargoTestFlags --package cosmic-files"
# Some tests with the `compio` runtime expect io_uring support but that
# is disabled in the Nix sandbox and the tests fail because they can't
# run in the sandbox. Ideally, the `compio` crate should fallback to a
# non-io_uring runtime but for some reason, that doesn't happen.
cargoTestFlags="$defaultCargoTestFlags --package cosmic-files -- \
--skip operation::tests::copy_dir_to_same_location \
--skip operation::tests::copy_file_to_same_location \
--skip operation::tests::copy_file_with_diff_name_to_diff_dir \
--skip operation::tests::copy_file_with_extension_to_same_loc \
--skip operation::tests::copy_to_diff_dir_doesnt_dupe_files \
--skip operation::tests::copying_file_multiple_times_to_same_location"
runHook cargoCheckHook
cargoTestFlags="$defaultCargoTestFlags --package cosmic-files-applet"
pkgs/by-name/co/cosmic-greeter/package.nix
+6 -3
View File
@@ -17,17 +17,20 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-greeter";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-greeter";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-K6kCBtlmFfav8UP4zorzDJBzHt4CoSaFFAufrW1DPrw=";
hash = "sha256-o9ZoRHi+k+HCSGfRz1lQFAeJMCqcTQEHf5rf9wn3qqY=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-nmkM/Jm2P5ftZFfzX+O1Fe6eobRbgBkajZsbyI67Zfw=";
cargoHash = "sha256-hUHkyz/avFu9g1FMdC+4vz6xM75CauurrarhouuVZXc=";
env.VERGEN_GIT_COMMIT_DATE = "2025-04-25";
env.VERGEN_GIT_SHA = finalAttrs.src.tag;
cargoBuildFlags = [ "--all" ];
pkgs/by-name/co/cosmic-icons/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cosmic-icons";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-icons";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-j5H2+BOWxq2jShN15QCvj9rY6OK+vlUbyR9R07Ka2rA=";
hash = "sha256-KDmEYeuiDTYvqg2XJK8pMDfsmROKtN+if5Qxz57H5xs=";
};
nativeBuildInputs = [ just ];
pkgs/by-name/co/cosmic-idle/package.nix
+2 -2
View File
@@ -16,13 +16,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-idle";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-idle";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-hORU+iMvWA4XMSWmzir9EwjpLK5vOLR8BgMZz+aIZ4U=";
hash = "sha256-dRvcow+rZ4sJV6pBxRIw6SCmU3aXP9uVKtFEJ9vozzI=";
};
useFetchCargoVendor = true;
pkgs/by-name/co/cosmic-launcher/package.nix
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-launcher";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-launcher";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-BtYnL+qkM/aw+Air5yOKH098V+TQByM5mh1DX7v+v+s=";
hash = "sha256-niMsDLVMUEr8VyubDm6RGgS7p22v5nH/F8cASJOszhs=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-g7Qr3C8jQg65KehXAhftdXCpEukag0w12ClvZFkxfqs=";
cargoHash = "sha256-Wh3vI42RBfXpI7mvPVUmGK3fITGi+EGyo+lG7VnZg3w=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-notifications/package.nix
+3 -3
View File
@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-notifications";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-notifications";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-d6bAiRSO2opKSZfadyQYrU9oIrXwPNzO/g2E2RY6q04=";
hash = "sha256-xcGmcOoxHb7gj6fW7xPZ5R0MTkMVXNJgvr9d5LPy9kw=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-utip7E8NST88mPaKppkuOcdW+QkFoRqWy3a2McvMHo8=";
cargoHash = "sha256-7EDe1OjGS6Xl0N/BrZG8lzWO0pFbwiEp+kn6WyydJQM=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-osd/package.nix
+3 -3
View File
@@ -12,13 +12,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-osd";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-osd";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-ezOeRgqI/GOWFknUVZI7ZLEy1GYaBI+/An83HWKL6ho=";
hash = "sha256-POjuxrNBajp4IOw7YwF2TS4OfoM8Hxo1fO48nkhKj8U=";
};
postPatch = ''
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-vYehF2RjPrTZiuGcRUe4XX3ftRo7f+SIoKizD/kOtR8=";
cargoHash = "sha256-kfExKggQo3MoTXw1JbKWjLu5kwYF0n7DzSQcG6e1+QQ=";
nativeBuildInputs = [ libcosmicAppHook ];
pkgs/by-name/co/cosmic-panel/package.nix
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-panel";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-panel";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-6lt9Rig1pM37B7+nRrR+eYke8umSfYlg8aLB45Q1X+4=";
hash = "sha256-QcrkfU6HNZ2tWfKsMdcv58HC/PE7b4T14AIep85TWOY=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-EIp9s42deMaB7BDe7RAqj2+CnTXjHCtZjS5Iq8l46A4=";
cargoHash = "sha256-qufOJeWPRjj4GgWNJmQfYaGKeYOQbkTeFzrUSi9QNnQ=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-player/package.nix
+3 -3
View File
@@ -18,17 +18,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-player";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-player";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-Ebjj+C+yLCRomZy2W8mYDig1pv7aQcD3A9V2M53RM5U=";
hash = "sha256-/xf3IOFVpctfgaaNNq2HUzK/qHt7Qikcv0JKoPJboRU=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-p1ylYB6xuF0UrhUO+QbGIgxqvZeQ6+GIbSNijTDXyRE=";
cargoHash = "sha256-0RrtErTR2J5mn/Lfppk+5X8UUOC2LN65krAq1uz/O4M=";
postPatch = ''
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
pkgs/by-name/co/cosmic-randr/package.nix
+3 -3
View File
@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-randr";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-randr";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-Sqxe+vKonsK9MmJGtbrZHE7frfrjkHXysm0WQt7WSU4=";
hash = "sha256-vCGbWsG/F3WhWVSy8Z3r4ZHpks/X/57/ZZXuw6BFl+c=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-UQ/fhjUiniVeHRQYulYko4OxcWB6UhFuxH1dVAfAzIY=";
cargoHash = "sha256-lW44Y7RhA1l+cCDwqSq9sbhWi+kONJ0zy1fUu8WPYw0=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-screenshot/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-screenshot";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-screenshot";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-/sGYF+XWmPraNGlBVUcN/nokDB9JwWViEAL9gVH3ZaI=";
hash = "sha256-VvU/9vYdoTvy3yzdeXrhKrtS9tUHMKnaSAeNTEKk5PA=";
};
useFetchCargoVendor = true;
pkgs/by-name/co/cosmic-session/package.nix
+4 -16
View File
@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-session";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-session";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-2EKkVdZ7uNNJ/E/3knmeH3EBa+tkYmIxP3t9d6yacww=";
hash = "sha256-vozm4vcXV3RB9Pk6om1UNCfGh80vIVJvSwbzwGDQw3Y=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-iYObxjWJUKgZKGTkqtYgQK4758k0EYZGhIAM/oLxxso=";
cargoHash = "sha256-68budhhbt8wPY7sfDqwIs4MWB/NBXsswK6HbC2AnHqE=";
postPatch = ''
substituteInPlace data/start-cosmic \
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
(placeholder "out")
"--set"
"cosmic_dconf_profile"
"cosmic"
"${placeholder "out"}/etc/dconf/profile/cosmic"
"--set"
"cargo-target-dir"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}"
@@ -51,18 +51,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
env.XDP_COSMIC = "${xdg-desktop-portal-cosmic}/libexec/xdg-desktop-portal-cosmic";
postInstall = ''
dconf_profile_dst=$out/etc/dconf/profile/cosmic
if [ ! -f $dconf_profile_dst ]; then
install -Dm0644 data/dconf/profile/cosmic $dconf_profile_dst
else
# future proofing
echo 'The Justfile is now correctly installing the dconf profile.'
echo 'Please remove the dconf profile from the `postInstall` phase.'
exit 1
fi
'';
passthru = {
providedSessions = [ "cosmic" ];
tests = {
pkgs/by-name/co/cosmic-settings-daemon/package.nix
+5 -3
View File
@@ -6,6 +6,7 @@
pop-gtk-theme,
adw-gtk3,
pkg-config,
libpulseaudio,
geoclue2-with-demo-agent,
libinput,
udev,
@@ -14,13 +15,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-settings-daemon";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings-daemon";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-DtwW6RxHnNh87Xu0NCULfUsHNzYU9tHtFKE9HO3rvME=";
hash = "sha256-vdhkE5CmgiGYg5TXxN7lLqxjv7apKEKvIscXFIzZfRc=";
};
postPatch = ''
@@ -31,11 +32,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-lGzQBL9IXbPsaKeVHp34xkm5FnTxWvfw4wg3El4LZdA=";
cargoHash = "sha256-Dzv1SDeZFIa+LFQQ91lO7RBHldsjDnGf+R12Ln2WZwU=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libinput
libpulseaudio
udev
];
pkgs/by-name/co/cosmic-settings/package.nix
+3 -12
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
rustPlatform,
cmake,
just,
@@ -28,25 +27,17 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-settings";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-UKg3TIpyaqtynk6wLFFPpv69F74hmqfMVPra2+iFbvE=";
hash = "sha256-rrPgCXl4uD4Gvstgj9Sdv6rB/0d8wa56CdBjAkTLQG8=";
};
patches = [
# TODO: This is merged and will be included in the 7th Alpha release, remove it then.
(fetchpatch {
url = "https://github.com/pop-os/cosmic-settings/commit/2e2898b31fabcb3f3b561e6c4cea2aca9de9b284.patch";
hash = "sha256-ZGJlGmR6lZB697uQ+ZsjvisNbPKBlBdRK/Ti541ZdlE=";
})
];
useFetchCargoVendor = true;
cargoHash = "sha256-mf/Cw3/RLrCYgsk7JKCU2+oPn1VPbD+4JzkUmbd47m8=";
cargoHash = "sha256-7Aoy/okgFSwDU6jMYzTGtwPbK82yMgL5bnKBfBUD3vA=";
nativeBuildInputs = [
cmake
pkgs/by-name/co/cosmic-store/package.nix
+3 -3
View File
@@ -15,17 +15,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-store";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-store";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-ce7PaHBhRFUoujAS6j10XWbD2PxzK6XXIk/ENclT1iY=";
hash = "sha256-skNzkpcdGJkve7enlnnZxYxnScHFmyaCAy0xaMEEsE0=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-kPCE6F8/UsTJOmIjwxBLISk/Jhfljwa666WhXuKkkDE=";
cargoHash = "sha256-2iWJFPSvNQ6JwQwzowKYbgjog2gsjOUlReai/j0d3Do=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-term/package.nix
+4 -4
View File
@@ -15,22 +15,22 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-term";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-term";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-sdeRkT6UcyBKIFnJZn3aGf8LZQimqVPqtXo7RtwUs5M=";
hash = "sha256-leCKdnlevfLiPJkloWCpOjkHaSf7+EYdobZRZ/Jis+4=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-Qznkqp+zWpP/ok2xG7U5lYBW0qo4+ARnm8hgxU20ha0=";
cargoHash = "sha256-Re9t25tkwmrvXB9GmPSVG+QDUZmk5rwrrY2ntlB3Tdw=";
# COSMIC applications now uses vergen for the About page
# Update the COMMIT_DATE to match when the commit was made
env = {
VERGEN_GIT_COMMIT_DATE = "2025-02-21";
VERGEN_GIT_COMMIT_DATE = "2025-04-20";
VERGEN_GIT_SHA = finalAttrs.src.tag;
};
pkgs/by-name/co/cosmic-wallpapers/package.nix
+2 -2
View File
@@ -8,7 +8,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cosmic-wallpapers";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
tag = "epoch-${finalAttrs.version}";
forceFetchGit = true;
fetchLFS = true;
hash = "sha256-Exrps3DicL/G/g0kbSsCvoFhiJn1k3v8I09GhW7EwNM=";
hash = "sha256-XtNmV6fxKFlirXQvxxgAYSQveQs8RCTfcFd8SVdEXtE=";
};
patches = [
pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+3 -20
View File
@@ -3,7 +3,6 @@
stdenv,
rustPlatform,
fetchFromGitHub,
cosmic-wallpapers,
libcosmicAppHook,
pkg-config,
libinput,
@@ -15,33 +14,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-workspaces-epoch";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-workspaces-epoch";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-3jivE0EaSddPxMYn9DDaYUMafPf60XeCwVeQegbt++c=";
hash = "sha256-d7KYZbq8O/t5V/gU+wwstp06vyfnmt6vRKo+54Dct+o=";
};
postPatch = ''
# While the `kate-hazen-COSMIC-desktop-wallpaper.png` image is present
# in the `pop-wallpapers` package, we're using the Orion Nebula image
# from NASA available in the `cosmic-wallpapers` package. Mainly because
# the previous image was used in the GNOME shell extension and the
# Orion Nebula image is widely used in the Rust-based COSMIC DE's
# marketing materials. Another reason to use the Orion Nebula image
# is that it's actually the default wallpaper as configured by the
# `cosmic-bg` package's configuration in upstream [1] [2].
#
# [1]: https://github.com/pop-os/cosmic-bg/blob/epoch-1.0.0-alpha.6/config/src/lib.rs#L142
# [2]: https://github.com/pop-os/cosmic-bg/blob/epoch-1.0.0-alpha.6/data/v1/all#L3
substituteInPlace src/view/mod.rs \
--replace-fail '/usr/share/backgrounds/pop/kate-hazen-COSMIC-desktop-wallpaper.png' "${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg"
'';
useFetchCargoVendor = true;
cargoHash = "sha256-l5y9bOG/h24EfiAFfVKjtzYCzjxU2TI8wh6HBUwoVcE=";
cargoHash = "sha256-TjgnPuFUIDtxx9kpvN9hKiir3/ZVtCc0z1CE4UHre1Q=";
separateDebugInfo = true;
pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+5 -15
View File
@@ -3,7 +3,6 @@
stdenv,
rustPlatform,
fetchFromGitHub,
fetchpatch,
libcosmicAppHook,
pkg-config,
util-linux,
@@ -18,22 +17,22 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "xdg-desktop-portal-cosmic";
version = "1.0.0-alpha.6";
version = "1.0.0-alpha.7";
src = fetchFromGitHub {
owner = "pop-os";
repo = "xdg-desktop-portal-cosmic";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-ymBmnSEXGCNbLTIVzHP3tjKAG0bgvEFU1C8gnxiow98=";
hash = "sha256-7yfrjKHuYOWPMMkHdGZ+g0hynh2TtSf4h8zW13tTus4=";
};
env = {
VERGEN_GIT_COMMIT_DATE = "2025-02-20";
VERGEN_GIT_SHA = finalAttrs.src.rev;
VERGEN_GIT_COMMIT_DATE = "2025-04-08";
VERGEN_GIT_SHA = finalAttrs.src.tag;
};
useFetchCargoVendor = true;
cargoHash = "sha256-FO/GIzv9XVu8SSV+JbOf98UX/XriRgqTthtzvRIWNjo=";
cargoHash = "sha256-fOaLeWtrjgBDSShC5OmBZKODNQn4bp/+iPZX5ZMQFqk=";
separateDebugInfo = true;
@@ -51,15 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
checkInputs = [ gst_all_1.gstreamer ];
# TODO: Remove this when updating to the next version
patches = [
(fetchpatch {
name = "cosmic-portal-fix-examples-after-ashpd-api-update.patch";
url = "https://github.com/pop-os/xdg-desktop-portal-cosmic/commit/df831ce7a48728aa9094fa1f30aed61cf1cc6ac3.diff?full_index=1";
hash = "sha256-yRrB3ds9TtN1OBZEZbnE6h2fkPyP4PP2IJ17n+0ugEo=";
})
];
postPatch = ''
# While the `kate-hazen-COSMIC-desktop-wallpaper.png` image is present
# in the `pop-wallpapers` package, we're using the Orion Nebula image