diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index fe3a5f043828..e31235421271 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -18,6 +18,8 @@ - Syncthing has been updated to version 2.0.0. +- COSMIC DE has been updated to the beta version, bringing it closer to its first stable release. This includes updates to its core components, applications, and overall stability. + ## New Modules {#sec-release-25.11-new-modules} diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix index 50fe98b6bfcf..eae24f71eacc 100644 --- a/nixos/modules/services/desktop-managers/cosmic.nix +++ b/nixos/modules/services/desktop-managers/cosmic.nix @@ -26,6 +26,7 @@ let cosmic-files config.services.displayManager.cosmic-greeter.package cosmic-idle + cosmic-initial-setup cosmic-launcher cosmic-notifications cosmic-osd @@ -103,6 +104,8 @@ in services.graphical-desktop.enable = true; xdg = { + # Required for cosmic-osd + sounds.enable = true; icons.fallbackCursorThemes = lib.mkDefault [ "Cosmic" ]; portal = { diff --git a/nixos/modules/services/display-managers/cosmic-greeter.nix b/nixos/modules/services/display-managers/cosmic-greeter.nix index fa8c6835bd49..53fd3ace5f31 100644 --- a/nixos/modules/services/display-managers/cosmic-greeter.nix +++ b/nixos/modules/services/display-managers/cosmic-greeter.nix @@ -29,7 +29,7 @@ in settings = { default_session = { user = "cosmic-greeter"; - command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-greeter ${lib.getExe pkgs.cosmic-comp} ${lib.getExe cfg.package}''; + command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" ${lib.getExe' cfg.package "cosmic-greeter-start"}''; }; initial_session = lib.mkIf (cfgAutoLogin.enable && (cfgAutoLogin.user != null)) { user = cfgAutoLogin.user; diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index 65e8721a9f4d..670fff08479b 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, rustPlatform, libcosmicAppHook, just, @@ -12,6 +11,7 @@ glib, libinput, pulseaudio, + pipewire, udev, xkeyboard_config, nix-update-script, @@ -20,31 +20,24 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applets"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applets"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-DmU9Dlb8w3a8U+oSGwWARPh1SRbv/8TW7TO9SSvDe1U="; + hash = "sha256-uUcEwa9rGHLzmlutmLl/e38ZqybfYMU0Dhe+FsT5V/E="; }; - cargoHash = "sha256-wWs3B5hh2DP93i+4gGDTi+7NT4bj8ULJ+fT95sXxUdg="; - - patches = [ - (fetchpatch2 { - name = "fix-bluetooth-dbus-spam.patch"; - url = "https://github.com/pop-os/cosmic-applets/commit/b6bb982f2dace0a3d19c78b4b4247760a8010d5b.patch?full_index=1"; - hash = "sha256-S5F9rqYrB38T9R6i/n/j3s79Xeh6BMmNkC+E2kTsus4="; - }) - ]; + cargoHash = "sha256-RnkyIlTJMxMGu+EsmZwvSIapSqdng+t8bqMVsDXprlU="; nativeBuildInputs = [ just pkg-config util-linuxMinimal libcosmicAppHook + rustPlatform.bindgenHook ]; buildInputs = [ @@ -52,6 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { glib libinput pulseaudio + pipewire udev ]; diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index f28d8ed3b3c3..9d6bcc14f575 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applibrary"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applibrary"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-2rGw4Jmr2rL9X1URA5wVPIZocuroS8yaQs42sJqiTbw="; + hash = "sha256-LVNOUOVeX8QpTbUG3bOhMkdrjkF3M0sZg+agSQyWAfA="; }; - cargoHash = "sha256-+nkXcbAPcIkg+p4ct/E0bm5O0n1MGN43AaWPjw13t9s="; + cargoHash = "sha256-f5uMgscentTlcPXFSan1kKcKh1nk88/3kQPTSuc0wz4="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index 518195809035..db22e05c964e 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-bg"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-bg"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-KMP7TmamtbycF/nKctjYozMJwVr9zdp4A8AWriswo2g="; + hash = "sha256-t5tY7Axiz39lCDhDC/lKSRCURfHspeaP49kNXJvCLC4="; }; postPatch = '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg" ''; - cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk="; + cargoHash = "sha256-+NkraWjWHIMIyktAUlp3q2Ot1ib1QRsBBvfdbr5BXto="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 1011e2cfc43c..a18d018a1ba1 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-comp"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-2AnGEUWumE1C4Mi5inN7enbxCdWCKbQdYpUvTK3jGQ4="; + hash = "sha256-RHeQk1yBNnDN/efuDDWNLn9O7FQTYLBsbs+h+gxi+Xo="; }; - cargoHash = "sha256-fj6TIBuZ5hrds4WMHRa2krXN5fivKriO2Q/FWdnlGaA="; + cargoHash = "sha256-Jaw2v+02lA5wWRAhRNW/lcLnTI7beJIZ43dqcJ60EP0="; separateDebugInfo = true; diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index d38fcae05441..1b8e42fab2e0 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -3,40 +3,30 @@ stdenv, fetchFromGitHub, rustPlatform, - makeBinaryWrapper, - cosmic-icons, + libcosmicAppHook, just, pkg-config, - libglvnd, - libxkbcommon, + glib, libinput, fontconfig, freetype, - libgbm, - wayland, - xorg, - vulkan-loader, nixosTests, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-edit"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-mgUSkYtc+i9pXv0n3zLHwBXFxfeWlhbsFJKa7X+mI98="; + hash = "sha256-Zd/vTNZt9tPXryOwo2U68FtIul7xiRcz5N4Heuyicoc="; }; - 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-04-17"; - env.VERGEN_GIT_SHA = finalAttrs.src.tag; + cargoHash = "sha256-YfD06RAQPZRwapd0fhNsZ0tx+0JMNDXiPJIWwDhmG0M="; postPatch = '' substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" @@ -45,21 +35,18 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ just pkg-config - makeBinaryWrapper + libcosmicAppHook ]; + buildInputs = [ - libxkbcommon - xorg.libX11 + glib libinput - libglvnd fontconfig freetype - libgbm - wayland - vulkan-loader ]; dontUseJustBuild = true; + dontUseJustCheck = true; justFlags = [ "--set" @@ -70,36 +57,32 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-edit" ]; - # Force linking to libEGL, which is always dlopen()ed, and to - # libwayland-client, which is always dlopen()ed except by the - # obscure winit backend. - RUSTFLAGS = map (a: "-C link-arg=${a}") [ - "-Wl,--push-state,--no-as-needed" - "-lEGL" - "-lwayland-client" - "-Wl,--pop-state" - ]; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; - postInstall = '' - wrapProgram "$out/bin/cosmic-edit" \ - --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" - ''; - - passthru.tests = { - inherit (nixosTests) - cosmic - cosmic-autologin - cosmic-noxwayland - cosmic-autologin-noxwayland - ; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-edit"; description = "Text Editor for the COSMIC Desktop Environment"; mainProgram = "cosmic-edit"; - license = licenses.gpl3Only; - teams = [ teams.cosmic ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + teams = [ lib.teams.cosmic ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index 47e94278439e..ba97add394a1 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -12,26 +12,22 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-files"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-files"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-bI5yTpqU2N6hFwI9wi4b9N5onY5iN+8YDM3bSgdYxjQ="; + hash = "sha256-pSjmsWsGGhjCekMTX8iiNVbF5X33zg5YVDWtemjIDWU="; }; - cargoHash = "sha256-7AOdSk9XIXFCDyCus3XgOK3ZBVa4CvX+NFM0jHf7Wbs="; - - env = { - VERGEN_GIT_COMMIT_DATE = "2025-04-22"; - VERGEN_GIT_SHA = finalAttrs.src.tag; - }; + cargoHash = "sha256-7RANj+aXdmBVO66QDgcNrrU4qEGK4Py4+ZctYWU1OO8="; nativeBuildInputs = [ just libcosmicAppHook + rustPlatform.bindgenHook ]; buildInputs = [ glib ]; @@ -72,17 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: { defaultCargoTestFlags="$cargoTestFlags" - # 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" + cargoTestFlags="$defaultCargoTestFlags --package cosmic-files" runHook cargoCheckHook cargoTestFlags="$defaultCargoTestFlags --package cosmic-files-applet" diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index feb5d21dd674..5c8a30e81af9 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -6,6 +6,7 @@ libcosmicAppHook, cmake, just, + cosmic-randr, libinput, linux-pam, udev, @@ -17,19 +18,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-greeter"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-greeter"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-o9ZoRHi+k+HCSGfRz1lQFAeJMCqcTQEHf5rf9wn3qqY="; + hash = "sha256-rMZ+UbHarnvPaVAI5XeBfLduWEZHthguRSKLv3d/Eo0="; }; - cargoHash = "sha256-hUHkyz/avFu9g1FMdC+4vz6xM75CauurrarhouuVZXc="; + cargoHash = "sha256-qioWGfg+cMaRNX6H6IWdcAU2py7oq9eNaxzKWw0H4R4="; - env.VERGEN_GIT_COMMIT_DATE = "2025-04-25"; + env.VERGEN_GIT_COMMIT_DATE = "2025-09-16"; env.VERGEN_GIT_SHA = finalAttrs.src.tag; cargoBuildFlags = [ "--all" ]; @@ -42,6 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; buildInputs = [ + cosmic-randr libinput linux-pam udev diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index a182beced385..5a40a5269324 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -9,14 +9,14 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-icons"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-icons"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-KDmEYeuiDTYvqg2XJK8pMDfsmROKtN+if5Qxz57H5xs="; + hash = "sha256-jxt0x0Ctk0PaaFQjf8p9y1yEgWkuEi7bR2VtybwlQAs="; }; nativeBuildInputs = [ just ]; diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix index 3a7fbb6612f4..ce660c1ad14d 100644 --- a/pkgs/by-name/co/cosmic-idle/package.nix +++ b/pkgs/by-name/co/cosmic-idle/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-idle"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-initial-setup/disable-language-page.patch b/pkgs/by-name/co/cosmic-initial-setup/disable-language-page.patch new file mode 100644 index 000000000000..1276c39cd0ce --- /dev/null +++ b/pkgs/by-name/co/cosmic-initial-setup/disable-language-page.patch @@ -0,0 +1,74 @@ +diff --git a/src/main.rs b/src/main.rs +index a0e8f2e..07cf8b9 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -194,19 +194,19 @@ impl Application for App { + } + } + +- page::Message::Language(message) => { +- if let Some(page) = +- self.pages.get_mut(&TypeId::of::()) +- { +- return page +- .as_any() +- .downcast_mut::() +- .unwrap() +- .update(message) +- .map(Message::PageMessage) +- .map(cosmic::Action::App); +- } +- } ++ // page::Message::Language(message) => { ++ // if let Some(page) = ++ // self.pages.get_mut(&TypeId::of::()) ++ // { ++ // return page ++ // .as_any() ++ // .downcast_mut::() ++ // .unwrap() ++ // .update(message) ++ // .map(Message::PageMessage) ++ // .map(cosmic::Action::App); ++ // } ++ // } + + page::Message::Layout(message) => { + if let Some(page) = self.pages.get_mut(&TypeId::of::()) +diff --git a/src/page/mod.rs b/src/page/mod.rs +index 389728c..937a1b3 100644 +--- a/src/page/mod.rs ++++ b/src/page/mod.rs +@@ -4,7 +4,7 @@ use std::any::{Any, TypeId}; + + pub mod appearance; + pub mod keyboard; +-pub mod language; ++// pub mod language; + pub mod launcher; + pub mod layout; + pub mod location; +@@ -34,10 +34,10 @@ pub fn pages(mode: AppMode) -> IndexMap> { + if let AppMode::NewInstall { create_user } = mode { + pages.insert(TypeId::of::(), Box::new(wifi::Page::default())); + +- pages.insert( +- TypeId::of::(), +- Box::new(language::Page::new()), +- ); ++ // pages.insert( ++ // TypeId::of::(), ++ // Box::new(language::Page::new()), ++ // ); + + pages.insert( + TypeId::of::(), +@@ -95,7 +95,7 @@ pub fn pages(mode: AppMode) -> IndexMap> { + pub enum Message { + Appearance(appearance::Message), + Keyboard(keyboard::Message), +- Language(language::Message), ++ // Language(language::Message), + Layout(layout::Message), + Location(location::Message), + SetTheme(cosmic::Theme), diff --git a/pkgs/by-name/co/cosmic-initial-setup/disable-timezone-page.patch b/pkgs/by-name/co/cosmic-initial-setup/disable-timezone-page.patch new file mode 100644 index 000000000000..5af92f16d5bb --- /dev/null +++ b/pkgs/by-name/co/cosmic-initial-setup/disable-timezone-page.patch @@ -0,0 +1,64 @@ +diff --git a/src/main.rs b/src/main.rs +index a0e8f2e..b6ff8dc 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -221,7 +221,7 @@ impl Application for App { + } + } + +- page::Message::Location(message) => { ++ /* page::Message::Location(message) => { + if let Some(page) = + self.pages.get_mut(&TypeId::of::()) + { +@@ -233,7 +233,7 @@ impl Application for App { + .map(Message::PageMessage) + .map(cosmic::Action::App); + } +- } ++ } */ + + page::Message::User(message) => { + if let Some(page) = self.pages.get_mut(&TypeId::of::()) { +diff --git a/src/page/mod.rs b/src/page/mod.rs +index 389728c..38ced5e 100644 +--- a/src/page/mod.rs ++++ b/src/page/mod.rs +@@ -7,7 +7,7 @@ pub mod keyboard; + pub mod language; + pub mod launcher; + pub mod layout; +-pub mod location; ++// pub mod location; + pub mod new_apps; + pub mod new_shortcuts; + pub mod user; +@@ -48,10 +48,10 @@ pub fn pages(mode: AppMode) -> IndexMap> { + pages.insert(TypeId::of::(), Box::new(user::Page::default())); + } + +- pages.insert( ++ /* pages.insert( + TypeId::of::(), + Box::new(location::Page::new()), +- ); ++ ); */ + } + + pages.insert( +@@ -97,7 +97,7 @@ pub enum Message { + Keyboard(keyboard::Message), + Language(language::Message), + Layout(layout::Message), +- Location(location::Message), ++ // Location(location::Message), + SetTheme(cosmic::Theme), + User(user::Message), + Welcome(welcome::Message), +@@ -150,4 +150,4 @@ pub trait Page { + fn view(&self) -> Element<'_, Message> { + widget::text::body("TODO").into() + } +-} ++} +\ No newline at end of file diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix new file mode 100644 index 000000000000..08aad02cf6b4 --- /dev/null +++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix @@ -0,0 +1,102 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + just, + libcosmicAppHook, + libinput, + openssl, + udev, + nixosTests, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cosmic-initial-setup"; + version = "1.0.0-beta.1.1"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-initial-setup"; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-kjJqGNcIlnzEsfA4eQ9D23ZGgRcmWQyWheAlwpjfALA="; + }; + + cargoHash = "sha256-orwK9gcFXK4/+sfwRubcz0PP6YAFqsENRHnlSLttLxM="; + + # cargo-auditable fails during the build when compiling the `crabtime::function` + # procedural macro. It panics because the `--out-dir` flag is not passed to + # the rustc wrapper. + # + # Reported this issue upstream in: + # https://github.com/rust-secure-code/cargo-auditable/issues/225 + auditable = false; + + nativeBuildInputs = [ + libcosmicAppHook + just + ]; + + buildInputs = [ + libinput + openssl + udev + ]; + + # These are not needed for NixOS + patches = [ + ./disable-language-page.patch + ./disable-timezone-page.patch + ]; + + postPatch = '' + # Installs in $out/etc/xdg/autostart instead of /etc/xdg/autostart + substituteInPlace justfile \ + --replace-fail \ + "autostart-dst := rootdir / 'etc' / 'xdg' / 'autostart' / desktop-entry" \ + "autostart-dst := prefix / 'etc' / 'xdg' / 'autostart' / desktop-entry" + ''; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" + ]; + + env.DISABLE_IF_EXISTS = "/iso/nix-store.squashfs"; + + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; + }; + + meta = { + description = "COSMIC Initial Setup"; + homepage = "https://github.com/pop-os/cosmic-initial-setup"; + license = lib.licenses.gpl3Only; + mainProgram = "cosmic-initial-setup"; + platforms = lib.platforms.linux; + teams = [ lib.teams.cosmic ]; + }; +}) diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index ad97114ee8c8..6595b2bd6595 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-launcher"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-launcher"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-niMsDLVMUEr8VyubDm6RGgS7p22v5nH/F8cASJOszhs="; + hash = "sha256-vAuWH9qmstPcfPvcKoM/2VjGxAfdtO9hhOPaZ5Ft4Y0="; }; - cargoHash = "sha256-Wh3vI42RBfXpI7mvPVUmGK3fITGi+EGyo+lG7VnZg3w="; + cargoHash = "sha256-57rkCufJPWm844/iMIfULfaGR9770q8VgZgnqCM57Zg="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index 5d1f3cd6131a..470359ee8e12 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-notifications"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-notifications"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-xcGmcOoxHb7gj6fW7xPZ5R0MTkMVXNJgvr9d5LPy9kw="; + hash = "sha256-wgOjaiKJ1KYdYsynQV5+KKGhdneELiLTHYqjMEWaxt0="; }; - cargoHash = "sha256-7EDe1OjGS6Xl0N/BrZG8lzWO0pFbwiEp+kn6WyydJQM="; + cargoHash = "sha256-CL8xvj57yq0qzK3tyYh3YXh+fM4ZDsmL8nP1mcqTqeQ="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index c56e0f4baa19..0dcc4b8dc4b5 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -1,10 +1,11 @@ { lib, fetchFromGitHub, - sound-theme-freedesktop, rustPlatform, libcosmicAppHook, pulseaudio, + pipewire, + libinput, udev, nix-update-script, nixosTests, @@ -12,28 +13,28 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-osd"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-POjuxrNBajp4IOw7YwF2TS4OfoM8Hxo1fO48nkhKj8U="; + hash = "sha256-tsP4dlHmzuf5QgByDWbuigMrpgnJAjuNsYwWDSutCoI="; }; - postPatch = '' - substituteInPlace src/components/app.rs \ - --replace-fail '/usr/share/sounds/freedesktop/stereo/audio-volume-change.oga' '${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga' - ''; + cargoHash = "sha256-YcNvvK+Zf8nSS5YjS5iaoipogstiyBdNY7LhWPsz9xQ="; - cargoHash = "sha256-kfExKggQo3MoTXw1JbKWjLu5kwYF0n7DzSQcG6e1+QQ="; - - nativeBuildInputs = [ libcosmicAppHook ]; + nativeBuildInputs = [ + libcosmicAppHook + rustPlatform.bindgenHook + ]; buildInputs = [ pulseaudio udev + libinput + pipewire ]; env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1"; diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 21719aa29b8c..1f9ad5881177 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-panel"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-panel"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-QcrkfU6HNZ2tWfKsMdcv58HC/PE7b4T14AIep85TWOY="; + hash = "sha256-gSTvF6Zcixh5/uYZuUiCIdBlXJj31+lISBwLujTuOfo="; }; - cargoHash = "sha256-qufOJeWPRjj4GgWNJmQfYaGKeYOQbkTeFzrUSi9QNnQ="; + cargoHash = "sha256-8KOl581VmsfE7jiVFXy3ZDIfAqnaJuiDd7paqiFI/mk="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix index 90cc50469e85..5cd04cc15067 100644 --- a/pkgs/by-name/co/cosmic-player/package.nix +++ b/pkgs/by-name/co/cosmic-player/package.nix @@ -18,17 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-player"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-player"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-/xf3IOFVpctfgaaNNq2HUzK/qHt7Qikcv0JKoPJboRU="; + hash = "sha256-oTTVVQkSkON5NTgO5+eUD2wVpiW5MvW3MZyeyqqc3qk="; }; - cargoHash = "sha256-0RrtErTR2J5mn/Lfppk+5X8UUOC2LN65krAq1uz/O4M="; + cargoHash = "sha256-DodFIfthiGFSvXWfPsPjFhNY6G7z3lb6pfc5HtUXhMo="; postPatch = '' substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index 9acaa35d3d3b..c1885e1fc39c 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-randr"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-randr"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-vCGbWsG/F3WhWVSy8Z3r4ZHpks/X/57/ZZXuw6BFl+c="; + hash = "sha256-daP2YZ7B1LXzqh2n0KoSTJbitdK+hlZO+Ydt9behzmQ="; }; - cargoHash = "sha256-lW44Y7RhA1l+cCDwqSq9sbhWi+kONJ0zy1fUu8WPYw0="; + cargoHash = "sha256-tkmBthh+nM3Mb9WoSjxMbx3t0NTf6lv91TwEwEANS6U="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index 6930069fb4d8..43052df88163 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-screenshot"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-screenshot"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-VvU/9vYdoTvy3yzdeXrhKrtS9tUHMKnaSAeNTEKk5PA="; + hash = "sha256-TKR8EDXZwKKC1WSZhlcf5U6tiM4cWCdb24U74vVKTaU="; }; - cargoHash = "sha256-1r0Uwcf4kpHCgWqrUYZELsVXGDzbtbmu/WFeX53fBiQ="; + cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index 884a67c31d61..b097d249adbc 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-session"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-session"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-vozm4vcXV3RB9Pk6om1UNCfGh80vIVJvSwbzwGDQw3Y="; + hash = "sha256-P3xXYd80P+DR1vVE0zZC+v4ARsGhRrG9N9LdP2BEfDA="; }; - cargoHash = "sha256-68budhhbt8wPY7sfDqwIs4MWB/NBXsswK6HbC2AnHqE="; + cargoHash = "sha256-bo46A7hS1U0cOsa/T4oMTKUTjxVCaGuFdN2qCjVHxhg="; postPatch = '' substituteInPlace data/start-cosmic \ diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index f04e53bb61cb..8e3e29e75f6c 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -7,22 +7,22 @@ adw-gtk3, pkg-config, libpulseaudio, - geoclue2-with-demo-agent, libinput, udev, + openssl, nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings-daemon"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings-daemon"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-vdhkE5CmgiGYg5TXxN7lLqxjv7apKEKvIscXFIzZfRc="; + hash = "sha256-tHG/VoaP1tcns6AyedkkVUpWFlcOclWijsHYQ3vOIjs="; }; postPatch = '' @@ -32,17 +32,17 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3' ''; - cargoHash = "sha256-Dzv1SDeZFIa+LFQQ91lO7RBHldsjDnGf+R12Ln2WZwU="; + cargoHash = "sha256-1YQ7eQ6L6OHvVihUUnZCDWXXtVOyaI1pFN7YD/OBcfo="; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libinput libpulseaudio + openssl udev ]; - env.GEOCLUE_AGENT = "${lib.getLib geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent"; - makeFlags = [ "prefix=$(out)" "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}" @@ -59,12 +59,12 @@ rustPlatform.buildRustPackage (finalAttrs: { ; }; - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-settings-daemon"; description = "Settings Daemon for the COSMIC Desktop Environment"; mainProgram = "cosmic-settings-daemon"; - license = licenses.gpl3Only; - teams = [ teams.cosmic ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + teams = [ lib.teams.cosmic ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index fc56867695ed..fcc20c1b18ee 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -27,17 +27,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-rrPgCXl4uD4Gvstgj9Sdv6rB/0d8wa56CdBjAkTLQG8="; + hash = "sha256-Yn5CSp/vsLMbkcQ7mCDw/ErgkSCyEvkwNvWqupVUkZ4="; }; - cargoHash = "sha256-7Aoy/okgFSwDU6jMYzTGtwPbK82yMgL5bnKBfBUD3vA="; + cargoHash = "sha256-dHyUTV5txSLWEDE7Blplz8CBvyuUmYNNr1kbifujHKk="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index e5d5ad91d816..96b3f223db9a 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-store"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-store"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-skNzkpcdGJkve7enlnnZxYxnScHFmyaCAy0xaMEEsE0="; + hash = "sha256-KlXFFoUEa0YTQDEJHMrbWOIEsSnXvJNzzaEFYR83t9s="; }; - cargoHash = "sha256-2iWJFPSvNQ6JwQwzowKYbgjog2gsjOUlReai/j0d3Do="; + cargoHash = "sha256-xdNYQB/zmndnMAkstwJ6Z2uk0fXli3gIYHchUq/3u6k="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index af9742b1a173..390b2a7bab0a 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -15,24 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-term"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-term"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-leCKdnlevfLiPJkloWCpOjkHaSf7+EYdobZRZ/Jis+4="; + hash = "sha256-1kQuPMaLXq+V1fTplXKoXAVOtyuD4Sh8diljHgTDbdI="; }; - 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-04-20"; - VERGEN_GIT_SHA = finalAttrs.src.tag; - }; + cargoHash = "sha256-mpuVSHb9YcDZB+eyyD+5ZNzUeEgx8T25IFjsD/Q/quU="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index b88b9479e476..888b41c96a9b 100644 --- a/pkgs/by-name/co/cosmic-wallpapers/package.nix +++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -2,13 +2,12 @@ lib, stdenvNoCC, fetchFromGitHub, - fetchpatch, nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-wallpapers"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { @@ -20,13 +19,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-XtNmV6fxKFlirXQvxxgAYSQveQs8RCTfcFd8SVdEXtE="; }; - patches = [ - (fetchpatch { - url = "https://github.com/pop-os/cosmic-wallpapers/pull/2/commits/4d17ebe69335f8ffa80fd1c48baa7f3d3efa4dbe.patch"; - hash = "sha256-4QRtX5dbN6C/ZKU3pvV7mTT7EDrMWvRCFB4004RMylM="; - }) - ]; - makeFlags = [ "prefix=${placeholder "out"}" ]; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index 2c080858c52b..c2831c0b3a93 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-workspaces-epoch"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-workspaces-epoch"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-d7KYZbq8O/t5V/gU+wwstp06vyfnmt6vRKo+54Dct+o="; + hash = "sha256-gcS8Q9SR7Dj1FH2Dtdd6jUMX8u5kHJBMvlgqJGw+rjA="; }; - cargoHash = "sha256-TjgnPuFUIDtxx9kpvN9hKiir3/ZVtCc0z1CE4UHre1Q="; + cargoHash = "sha256-BE6s2dmbgXlFXrtd8b9k2LltLnegLzWbIUlaEQvv+5o="; separateDebugInfo = true; diff --git a/pkgs/by-name/po/pop-launcher/package.nix b/pkgs/by-name/po/pop-launcher/package.nix index 364a668bc6b8..b0952796a5f6 100644 --- a/pkgs/by-name/po/pop-launcher/package.nix +++ b/pkgs/by-name/po/pop-launcher/package.nix @@ -10,15 +10,15 @@ libxkbcommon, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "pop-launcher"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "launcher"; - rev = version; - hash = "sha256-CLpquNgdtnGMlMpGLv72WZmizalvYPfMWlE/qLprVrs="; + tag = finalAttrs.version; + hash = "sha256-4wPspv5bpqoG45uUkrtxJTvdbmFkpWv8QBZxsPbGu/M="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { libxkbcommon ]; - cargoHash = "sha256-Htre2gzAlNfxBkBvMMtjYbUcuwNw+tB4DI18iBA+g34="; + cargoHash = "sha256-gc1YhIxHBqmMOE3Gu3T4gmGdAp0t+qiUXDcPYZE6utU="; cargoBuildFlags = [ "--package" @@ -66,12 +66,13 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/bin/gnome-terminal' 'gnome-terminal' ''; - meta = with lib; { + meta = { description = "Modular IPC-based desktop launcher service"; homepage = "https://github.com/pop-os/launcher"; - platforms = platforms.linux; - license = licenses.mpl20; - maintainers = with maintainers; [ samhug ]; + platforms = lib.platforms.linux; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ samhug ]; mainProgram = "pop-launcher"; + teams = [ lib.teams.cosmic ]; }; -} +}) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index 88f98807dde2..d82a321cd69c 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -17,22 +17,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xdg-desktop-portal-cosmic"; - version = "1.0.0-alpha.7"; + version = "1.0.0-beta.1.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "xdg-desktop-portal-cosmic"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-7yfrjKHuYOWPMMkHdGZ+g0hynh2TtSf4h8zW13tTus4="; + hash = "sha256-EkhOa1Tircgyta98Zf4ZaV/tR4zZh4/bU35xjn3xU8c="; }; - env = { - VERGEN_GIT_COMMIT_DATE = "2025-04-08"; - VERGEN_GIT_SHA = finalAttrs.src.tag; - }; - - cargoHash = "sha256-fOaLeWtrjgBDSShC5OmBZKODNQn4bp/+iPZX5ZMQFqk="; + cargoHash = "sha256-uJKwwESkzqweM4JunnMIsDE8xhCyjFFZs1GiJAwnbG8="; separateDebugInfo = true;