From bc6e6d9847423d78dcc25d507e5108d9a6e30351 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Thu, 17 Oct 2024 17:17:54 +0200 Subject: [PATCH 1/3] cosmic-icons: use nix-update-script instead of unstableGitUpdater Use `nix-update-script` instead of `unstableGitUpdater`, Since upstream is now tagging their releases. --- pkgs/by-name/co/cosmic-icons/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 23031d56b9c5..3857050e8cab 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -4,7 +4,7 @@ , just , pop-icon-theme , hicolor-icon-theme -, unstableGitUpdater +, nix-update-script }: stdenvNoCC.mkDerivation rec { pname = "cosmic-icons"; @@ -32,7 +32,12 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "epoch-(.*)" + ]; + }; meta = with lib; { description = "System76 Cosmic icon theme for Linux"; From 7c7ae6a334944343385eceda1c2b8e089d3a48a4 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Thu, 17 Oct 2024 17:18:19 +0200 Subject: [PATCH 2/3] cosmic-icons: inline pname --- pkgs/by-name/co/cosmic-icons/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 3857050e8cab..b88d6e657b00 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -6,13 +6,13 @@ , hicolor-icon-theme , nix-update-script }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "cosmic-icons"; version = "1.0.0-alpha.2"; src = fetchFromGitHub { owner = "pop-os"; - repo = pname; + repo = "cosmic-icons"; rev = "341c84467fd863f0319cadf49b3d4bac1bf3029a"; hash = "sha256-VA2QKuzTQBgubfjPXdpejFtZxqOZUXds/fZrfN6/8Nk="; }; From 15fe493d6fcc60d2f5668db422621b57e245e0d7 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Thu, 17 Oct 2024 19:15:46 +0200 Subject: [PATCH 3/3] cosmic-icons: nixfmt-rfc-style --- pkgs/by-name/co/cosmic-icons/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index b88d6e657b00..5a613ac3104b 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -1,10 +1,11 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, just -, pop-icon-theme -, hicolor-icon-theme -, nix-update-script +{ + lib, + stdenvNoCC, + fetchFromGitHub, + just, + pop-icon-theme, + hicolor-icon-theme, + nix-update-script, }: stdenvNoCC.mkDerivation { pname = "cosmic-icons";