From 5cee72e10c38b3195311dba898074c030a9c1bf7 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Fri, 21 Mar 2025 17:17:36 -0300 Subject: [PATCH 1/5] cosmic-panel: refactor --- pkgs/by-name/co/cosmic-panel/package.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 951c3ef3869f..2c1cd5dcb0c3 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -1,23 +1,23 @@ { lib, stdenv, + rustPlatform, fetchFromGitHub, just, pkg-config, - rustPlatform, libglvnd, libxkbcommon, wayland, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-panel"; version = "1.0.0-alpha.5.1"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-panel"; - tag = "epoch-${version}"; + tag = "epoch-${finalAttrs.version}"; hash = "sha256-nO7Y1SpwvfHhL0OSy7Ti+e8NPzfknW2SGs7IYoF1Jow="; }; @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { just pkg-config ]; + buildInputs = [ libglvnd libxkbcommon @@ -35,6 +36,7 @@ rustPlatform.buildRustPackage rec { ]; dontUseJustBuild = true; + dontUseJustCheck = true; justFlags = [ "--set" @@ -54,15 +56,15 @@ rustPlatform.buildRustPackage rec { "-Wl,--pop-state" ]; - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-panel"; description = "Panel for the COSMIC Desktop Environment"; mainProgram = "cosmic-panel"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ qyliss nyabinary ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) From e6918c79f5f78d94d9d17d1d5edcf9c188af3a2c Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Fri, 21 Mar 2025 17:19:00 -0300 Subject: [PATCH 2/5] cosmic-panel: use libcosmicAppHook --- pkgs/by-name/co/cosmic-panel/package.nix | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 2c1cd5dcb0c3..51dde281a9d4 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -3,11 +3,8 @@ stdenv, rustPlatform, fetchFromGitHub, + libcosmicAppHook, just, - pkg-config, - libglvnd, - libxkbcommon, - wayland, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -26,13 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ just - pkg-config - ]; - - buildInputs = [ - libglvnd - libxkbcommon - wayland + libcosmicAppHook ]; dontUseJustBuild = true; @@ -47,15 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel" ]; - # Force linking to libEGL, which is always dlopen()ed. - "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = - map (a: "-C link-arg=${a}") - [ - "-Wl,--push-state,--no-as-needed" - "-lEGL" - "-Wl,--pop-state" - ]; - meta = { homepage = "https://github.com/pop-os/cosmic-panel"; description = "Panel for the COSMIC Desktop Environment"; From 46e8a27d0970a957711c0edbca7d41bb08e94e9d Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Fri, 21 Mar 2025 17:20:52 -0300 Subject: [PATCH 3/5] cosmic-panel: add updateScript --- pkgs/by-name/co/cosmic-panel/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 51dde281a9d4..83ae46b3bd3f 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, libcosmicAppHook, just, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -38,6 +39,15 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; + meta = { homepage = "https://github.com/pop-os/cosmic-panel"; description = "Panel for the COSMIC Desktop Environment"; From 4c6fe8ccc2776d24440647aa2783795d3537b2ff Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Fri, 21 Mar 2025 17:22:31 -0300 Subject: [PATCH 4/5] cosmic-panel: 1.0.0-alpha.5.1 -> 1.0.0-alpha.6 --- pkgs/by-name/co/cosmic-panel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 83ae46b3bd3f..b40b3383610f 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-panel"; - version = "1.0.0-alpha.5.1"; + version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-panel"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-nO7Y1SpwvfHhL0OSy7Ti+e8NPzfknW2SGs7IYoF1Jow="; + hash = "sha256-6lt9Rig1pM37B7+nRrR+eYke8umSfYlg8aLB45Q1X+4="; }; useFetchCargoVendor = true; From ab309e4e1d0eca664b23287eaccc32a20cbb5485 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Fri, 21 Mar 2025 17:25:59 -0300 Subject: [PATCH 5/5] cosmic-panel: add HeitorAugustoLN as a maintainer --- pkgs/by-name/co/cosmic-panel/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index b40b3383610f..279addbd48b7 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -56,6 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ qyliss nyabinary + HeitorAugustoLN ]; platforms = lib.platforms.linux; };