Merge pull request #326698 from Aleksanaa/newsflash

newsflash: 3.3.0 -> 3.3.2

pkgs/applications/networking/feedreaders/newsflash/default.nix

@@ -1,18 +1,17 @@
 {
   lib,
   stdenv,
-  rustPlatform,
   fetchFromGitLab,
-  substituteAll,
+  rustPlatform,
+  blueprint-compiler,
   cargo,
+  desktop-file-utils,
   meson,
   ninja,
   pkg-config,
   rustc,
-  blueprint-compiler,
   wrapGAppsHook4,
   gdk-pixbuf,
-  glib,
   clapper,
   gtk4,
   libadwaita,
@@ -28,60 +27,46 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "newsflash";
-  version = "3.3.0";
+  version = "3.3.2";
 
   src = fetchFromGitLab {
     owner = "news-flash";
     repo = "news_flash_gtk";
     rev = "refs/tags/v.${finalAttrs.version}";
-    hash = "sha256-s8h/OIJJzMmsCsaQJ0SOjCAVXfYQbjOupdDtLOqM9d0=";
+    hash = "sha256-caINK4tmDsP7AkLUBqbM96Po7sQxFOn/CAq62K+3aoE=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ./Cargo.lock;
     outputHashes = {
+      "article_scraper-2.1.0" = "sha256-0jDXH5kkX34tAWK+3hpmW1LWBsFksVgTnSuQX+XXVEM=";
       "clapper-0.1.0" = "sha256-xQ7l6luO5E4PMjtN9elg0bkJa7IhWzA7KuYDJ+m/VY0=";
-      "news-flash-2.3.0-alpha.0" = "sha256-ZgX6tQmPDMSpLcYD04u2ReQXdzeGzQTwGaUy/y4z4do=";
+      "news-flash-2.3.0-alpha.0" = "sha256-+CYU2CpF2WfSVjhLtLpHjdAGoycdhdbN9UucKO9XKiA=";
       "newsblur_api-0.3.0" = "sha256-m2178zdJzeskl3BQpZr6tlxTAADehxz8uYcZzi15nhQ=";
     };
   };
 
-  patches = [
-    # Post install tries to generate an icon cache & update the
-    # desktop database. The gtk setup hook drop-icon-theme-cache.sh
-    # would strip out the icon cache and the desktop database wouldn't
-    # be included in $out. They will generated by xdg.mime.enable &
-    # gtk.iconCache.enable instead.
-    ./no-post-install.patch
-
-    # Replace placeholder "0.0.0" project version with nixpkgs version
-    (substituteAll {
-      src = ./hardcode-version.patch;
-      inherit (finalAttrs) version;
-    })
-  ];
-
   postPatch = ''
     patchShebangs build-aux/cargo.sh
+    meson rewrite kwargs set project / version '${finalAttrs.version}'
   '';
 
   strictDeps = true;
 
   nativeBuildInputs = [
+    blueprint-compiler
+    cargo
+    desktop-file-utils
     meson
     ninja
     pkg-config
+    rustc
+    rustPlatform.cargoSetupHook
     wrapGAppsHook4
 
     # Provides setup hook to fix "Unrecognized image file format"
     gdk-pixbuf
 
-    # Provides glib-compile-resources to compile gresources
-    glib
-    rustPlatform.cargoSetupHook
-    cargo
-    rustc
-    blueprint-compiler
   ];
 
   buildInputs =
@@ -110,15 +95,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = gitUpdater { rev-prefix = "v."; };
 
-  meta = with lib; {
+  meta = {
     description = "Modern feed reader designed for the GNOME desktop";
     homepage = "https://gitlab.com/news-flash/news_flash_gtk";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       kira-bruneau
       stunkymonkey
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     mainProgram = "io.gitlab.news_flash.NewsFlash";
   };
 })

pkgs/applications/networking/feedreaders/newsflash/hardcode-version.patch

@@ -1,12 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 55a5048a..1c648189 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,6 +1,6 @@
- project(
-   'newsflash', 'rust',
--  version: '0.0.0',
-+  version: '@version@',
-   license: 'GPLv3',
- )
- 

pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch

@@ -1,15 +0,0 @@
-diff --git a/meson.build b/meson.build
-index e554ddd7..55a5048a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -56,10 +56,3 @@ meson.add_dist_script(
- subdir('data')
- subdir('po')
- subdir('src')
--
--gnome.post_install(
--  gtk_update_icon_cache: true,
--  glib_compile_schemas: false,
--  update_desktop_database: true,
--)
--