From d5a328b021cc62ce3baecb3895b3a83e77d16c31 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 13:36:57 -0300 Subject: [PATCH 1/6] cosmic-osd: add updateScript --- pkgs/by-name/co/cosmic-osd/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 005826ba40b6..08f238b40665 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -7,6 +7,7 @@ pulseaudio, udev, wayland, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -33,6 +34,15 @@ rustPlatform.buildRustPackage rec { env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1"; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-osd"; description = "OSD for the COSMIC Desktop Environment"; From eee668ebffdecc26cf616df39e746aa940de9af0 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 13:40:07 -0300 Subject: [PATCH 2/6] cosmic-osd: 1.0.0-alpha.2 -> 1.0.0-alpha.5.1 --- pkgs/by-name/co/cosmic-osd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 08f238b40665..9062b3843d60 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-osd"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.5.1"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; rev = "epoch-${version}"; - hash = "sha256-JDdVFNTJI9O88lLKB1esJE4sk7ZZnTMilQRZSAgnTqs="; + hash = "sha256-a5wzCHfp+dhtEkXsJOeEs2ZkmooSWIDGymeAdrXKE+U="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Db1a1FusUdO7rQb0jfznaFNaJjdS9XSDGCMuzV1D79A="; + cargoHash = "sha256-hJC0t8R+cdPWzdpxHA+j7en4IrhZXt5LM3S2V6/bps0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ From 0184c903f20791e3be5204d0adf07fbded475bdb Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 13:41:25 -0300 Subject: [PATCH 3/6] cosmic-osd: use `libcosmicAppHook` --- pkgs/by-name/co/cosmic-osd/package.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 9062b3843d60..e61913a07dee 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -2,11 +2,9 @@ lib, fetchFromGitHub, rustPlatform, - pkg-config, - libxkbcommon, + libcosmicAppHook, pulseaudio, udev, - wayland, nix-update-script, }: @@ -24,11 +22,10 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-hJC0t8R+cdPWzdpxHA+j7en4IrhZXt5LM3S2V6/bps0="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ libcosmicAppHook ]; + buildInputs = [ - libxkbcommon pulseaudio - wayland udev ]; From d052af6b3bb9bfe0114e97a3f89457b269166faf Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 13:42:34 -0300 Subject: [PATCH 4/6] cosmic-osd: remove `with lib` from meta --- pkgs/by-name/co/cosmic-osd/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index e61913a07dee..19e8e36e2af6 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -40,12 +40,12 @@ rustPlatform.buildRustPackage rec { ]; }; - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-osd"; description = "OSD for the COSMIC Desktop Environment"; mainProgram = "cosmic-osd"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ nyabinary ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ nyabinary ]; + platforms = lib.platforms.linux; }; } From 5f4d0356539ef1758a7e8b6040d52a590b8c9dae Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 13:43:28 -0300 Subject: [PATCH 5/6] cosmic-osd: add HeitorAugustoLN to maintainers --- pkgs/by-name/co/cosmic-osd/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 19e8e36e2af6..10d5475daba8 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -45,7 +45,10 @@ rustPlatform.buildRustPackage rec { description = "OSD for the COSMIC Desktop Environment"; mainProgram = "cosmic-osd"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ nyabinary ]; + maintainers = with lib.maintainers; [ + nyabinary + HeitorAugustoLN + ]; platforms = lib.platforms.linux; }; } From 2a985d384cd6ebcbcd97c9e16ee1635aeb900817 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 13:44:34 -0300 Subject: [PATCH 6/6] cosmic-osd: replace `rev` with `tag` in `fetchFromGitHub` --- pkgs/by-name/co/cosmic-osd/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 10d5475daba8..0d6f6ade81c7 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; - rev = "epoch-${version}"; + tag = "epoch-${version}"; hash = "sha256-a5wzCHfp+dhtEkXsJOeEs2ZkmooSWIDGymeAdrXKE+U="; };