From 374bafe5144abe464903e52e1e2e194db63753d8 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 16 Nov 2025 12:23:57 -0500 Subject: [PATCH 1/3] newsflash: prefer nix-update-script over gitUpdater --- pkgs/by-name/ne/newsflash/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix index ec206d87410c..e5fbc803a9d7 100644 --- a/pkgs/by-name/ne/newsflash/package.nix +++ b/pkgs/by-name/ne/newsflash/package.nix @@ -22,7 +22,7 @@ glib-networking, librsvg, gst_all_1, - gitUpdater, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -94,9 +94,11 @@ stdenv.mkDerivation (finalAttrs: { # For https://gitlab.com/news-flash/news_flash_gtk/-/blob/8e5fc4acf5ca6be5b8cd616466a17e7a273f9dda/src/meson.build#L47 env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; - passthru.updateScript = gitUpdater { - rev-prefix = "v."; - ignoredVersions = "(alpha|beta|rc)"; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^v.(\\d+\\.\\d+\\.\\d+)$" + ]; }; meta = { From e125e4c24a9322d996e1da121d235a862a595526 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 16 Nov 2025 14:06:54 -0500 Subject: [PATCH 2/3] newsflash: add changelog --- pkgs/by-name/ne/newsflash/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix index e5fbc803a9d7..656265c6937c 100644 --- a/pkgs/by-name/ne/newsflash/package.nix +++ b/pkgs/by-name/ne/newsflash/package.nix @@ -104,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Modern feed reader designed for the GNOME desktop"; homepage = "https://gitlab.com/news-flash/news_flash_gtk"; + changelog = "https://gitlab.com/news-flash/news_flash_gtk/-/raw/${finalAttrs.src.tag}/data/io.gitlab.news_flash.NewsFlash.appdata.xml.in.in#:~:text=%3Crelease%20version=%22${finalAttrs.version}%22,%3C/release%3E"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ kira-bruneau From 4a321d26ad52e8721bcf6d88d7daed7a6babe864 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 16 Nov 2025 13:38:48 -0500 Subject: [PATCH 3/3] newsflash: 4.1.4 -> 4.2.1 --- pkgs/by-name/ne/newsflash/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix index 656265c6937c..a33d662d400f 100644 --- a/pkgs/by-name/ne/newsflash/package.nix +++ b/pkgs/by-name/ne/newsflash/package.nix @@ -27,18 +27,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "4.1.4"; + version = "4.2.1"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; tag = "v.${finalAttrs.version}"; - hash = "sha256-3RGa1f+V7dIgTxQKOceVSr7RwajUgwq05ypBhg6RjMA="; + hash = "sha256-me9/2sA1Thne10+JrSMvicDRxXuevCnM8Tb+kwXzNDI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-CRQH22EP/G6osjsuZJmTWwjq4C06DxiIXlz6zxgbDv4="; + hash = "sha256-cgu1zP85UCb/6gYNcj/khc6u1kSwX0UZ2oIjM2UUBOA="; }; postPatch = '' @@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { # Provides setup hook to fix "Unrecognized image file format" gdk-pixbuf - ]; buildInputs = [ @@ -91,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { gst-plugins-bad ]); - # For https://gitlab.com/news-flash/news_flash_gtk/-/blob/8e5fc4acf5ca6be5b8cd616466a17e7a273f9dda/src/meson.build#L47 + # For https://gitlab.com/news-flash/news_flash_gtk/-/blob/v.4.2.1/src/meson.build#L48 env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; passthru.updateScript = nix-update-script {