From e19e8d32540c97892521e8f3582951c9cb2706e0 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Tue, 25 Feb 2025 14:42:07 -0300 Subject: [PATCH 1/4] cosmic-icons: remove `with lib` from meta --- pkgs/by-name/co/cosmic-icons/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 75acfc9f88e68..bc883123b66a6 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -40,12 +40,12 @@ stdenvNoCC.mkDerivation { ]; }; - meta = with lib; { + meta = { description = "System76 Cosmic icon theme for Linux"; homepage = "https://github.com/pop-os/cosmic-icons"; - license = with licenses; [ + license = with lib.licenses; [ cc-by-sa-40 ]; - maintainers = with maintainers; [ a-kenji ]; + maintainers = with lib.maintainers; [ a-kenji ]; }; } From d822472abee27ca4c9732ad6c83b88c32175da65 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Tue, 25 Feb 2025 14:43:31 -0300 Subject: [PATCH 2/4] cosmic-icons: replace `rev` with `tag` --- pkgs/by-name/co/cosmic-icons/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index bc883123b66a6..471ebe7cf478d 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -7,14 +7,14 @@ hicolor-icon-theme, nix-update-script, }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-icons"; version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-icons"; - rev = "epoch-1.0.0-alpha.6"; + tag = "epoch-${finalAttrs.version}"; hash = "sha256-j5H2+BOWxq2jShN15QCvj9rY6OK+vlUbyR9R07Ka2rA="; }; @@ -48,4 +48,4 @@ stdenvNoCC.mkDerivation { ]; maintainers = with lib.maintainers; [ a-kenji ]; }; -} +}) From ffaaa6b19b0e52eb45926d0441c50d5d8cbb81cb Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Tue, 25 Feb 2025 14:44:22 -0300 Subject: [PATCH 3/4] cosmic-icons: add HeitorAugustoLN as a maintainer --- pkgs/by-name/co/cosmic-icons/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 471ebe7cf478d..57f66abeebad1 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -46,6 +46,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = with lib.licenses; [ cc-by-sa-40 ]; - maintainers = with lib.maintainers; [ a-kenji ]; + maintainers = with lib.maintainers; [ + a-kenji + HeitorAugustoLN + ]; }; }) From 3d44c8de07c86e24e9250163cc8dacb5d5e54df6 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Tue, 25 Feb 2025 14:46:40 -0300 Subject: [PATCH 4/4] cosmic-icons: fix updateScript --- pkgs/by-name/co/cosmic-icons/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 57f66abeebad1..a400c9eb4c326 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -35,6 +35,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { extraArgs = [ + "--version" + "unstable" "--version-regex" "epoch-(.*)" ];