From 0c302dfb30ce47d035da648e160e93c394db0e9f Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 20 Mar 2025 15:18:40 -0300 Subject: [PATCH 1/4] cosmic-protocols: refactor --- pkgs/by-name/co/cosmic-protocols/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix index 192b83393042..c8367f23abac 100644 --- a/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/pkgs/by-name/co/cosmic-protocols/package.nix @@ -1,7 +1,7 @@ { lib, - fetchFromGitHub, stdenv, + fetchFromGitHub, wayland-scanner, }: @@ -19,14 +19,14 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=${placeholder "out"}" ]; nativeBuildInputs = [ wayland-scanner ]; - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-protocols"; description = "Additional wayland-protocols used by the COSMIC desktop environment"; - license = [ - licenses.mit - licenses.gpl3Only + license = with lib.licenses; [ + mit + gpl3Only ]; - maintainers = with maintainers; [ nyabinary ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ nyabinary ]; + platforms = lib.platforms.linux; }; } From f75841100f38a35167dabeef349b16a1bcc3cd2c Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 20 Mar 2025 15:20:08 -0300 Subject: [PATCH 2/4] cosmic-protocols: add updateScript --- pkgs/by-name/co/cosmic-protocols/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix index c8367f23abac..e70b163a7393 100644 --- a/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/pkgs/by-name/co/cosmic-protocols/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, wayland-scanner, + nix-update-script, }: stdenv.mkDerivation { @@ -19,6 +20,13 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=${placeholder "out"}" ]; nativeBuildInputs = [ wayland-scanner ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch=HEAD" + ]; + }; + meta = { homepage = "https://github.com/pop-os/cosmic-protocols"; description = "Additional wayland-protocols used by the COSMIC desktop environment"; From 31f8d91a37c7c4f148f2ae78a799d2db010b0da4 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 20 Mar 2025 15:20:25 -0300 Subject: [PATCH 3/4] cosmic-protocols: add HeitorAugustoLN as a maintainer --- pkgs/by-name/co/cosmic-protocols/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix index e70b163a7393..a6718d96c732 100644 --- a/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/pkgs/by-name/co/cosmic-protocols/package.nix @@ -34,7 +34,10 @@ stdenv.mkDerivation { mit gpl3Only ]; - maintainers = with lib.maintainers; [ nyabinary ]; + maintainers = with lib.maintainers; [ + nyabinary + HeitorAugustoLN + ]; platforms = lib.platforms.linux; }; } From fd847c76417ad02c1aec987216e8e401bcdb8508 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 20 Mar 2025 15:21:23 -0300 Subject: [PATCH 4/4] cosmic-protocols: 0-unstable-2024-07-31 -> 0-unstable-2025-03-05 --- pkgs/by-name/co/cosmic-protocols/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix index a6718d96c732..b954c13a8895 100644 --- a/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/pkgs/by-name/co/cosmic-protocols/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "cosmic-protocols"; - version = "0-unstable-2024-07-31"; + version = "0-unstable-2025-03-05"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-protocols"; - rev = "de2fead49d6af3a221db153642e4d7c2235aafc4"; - hash = "sha256-qgo8FMKo/uCbhUjfykRRN8KSavbyhZpu82M8npLcIPI="; + rev = "6b05c2a157118979cb472a38455ba78ca9729196"; + hash = "sha256-ozyReur1jjMl8fDUrdWbgcKedf+RDH5xCRsmEcnPQ9U="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ];