Unverified Commit 2acca4b4 authored by Felix Bühler's avatar Felix Bühler Committed by GitHub
Browse files

Merge pull request #270039 from NixOS/backport-258567-to-release-23.11 

[Backport release-23.11] newsflash: 2.3.1 -> 3.0.2
parents f616fe0b 57bda1ed

pkgs/applications/networking/feedreaders/newsflash/Cargo.lock

+984 −850

File changed.

Preview size limit exceeded, changes collapsed.

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

+9 −7
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
, ninja

, pkg-config

, rustc

, blueprint-compiler

, wrapGAppsHook4

, gdk-pixbuf

, glib
@@ -24,22 +25,22 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "newsflash";

  version = "2.3.1";

  version = "3.0.2";



  src = fetchFromGitLab {

    owner = "news-flash";

    repo = "news_flash_gtk";

    rev = "refs/tags/v.${finalAttrs.version}";

    sha256 = "sha256-JUAlDc2mp8M0vjiWcDoyBw/sKCmd4J8e9wEwZoiW0AE=";

    sha256 = "sha256-tJKr2bGkdpEb+25eN0ZfHhEDl5Zdf8fdaC/rNMbH8Ws=";

  };



  cargoDeps = rustPlatform.importCargoLock {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "javascriptcore6-0.1.0" = "sha256-7w8CDY13dCRlFc77XxJ2/xZqlKSjqM0eiOvILOrJ4ic=";

      "news-flash-2.3.0-alpha.0" = "sha256-phoZmTY1YVZIIktqLMnal9H5SMgNWwx7m+7AMtDcFJM=";

      "newsblur_api-0.2.0" = "sha256-6vnFeJbdFeIau2rpUk9o72DD2ZCqicljmQjFVhY71NI=";

      "article_scraper-2.0.0-alpha.0" = "sha256-HPEKZc7O7pbgcwR2l0kD/5442W1hzrfMadc0amrjxwI=";

      "news-flash-2.3.0-alpha.0" = "sha256-H0osT7IrPbQ3RQYJZE7J+n7u4UCT86LAybUF3vvIXkA=";

      "newsblur_api-0.2.0" = "sha256-eysCB19znQF8mRwQ64nSp6KuvJ1Trot4g4WCdQDedo8=";

      "article_scraper-2.0.0" = "sha256-FnOmrZyYewOuU8Au7fhmSJHN7UPCx/CxBV8UtSHattU=";

      "commafeed_api-0.1.0" = "sha256-69UAmyUm0WG3qPoWZw4PekXh1RjIP5l3dx3gjWfxJDQ=";

    };

  };
@@ -70,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { 
    rustPlatform.cargoSetupHook

    cargo

    rustc

    blueprint-compiler

  ];



  buildInputs = [
@@ -103,6 +105,6 @@ stdenv.mkDerivation (finalAttrs: { 
    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ kira-bruneau stunkymonkey ];

    platforms = platforms.unix;

    mainProgram = "com.gitlab.newsflash";

    mainProgram = "io.gitlab.news_flash.NewsFlash";

  };

})

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

+9 −5
Original line number Diff line number Diff line
@@ -2,9 +2,13 @@ diff --git a/meson.build b/meson.build 
index 1d7089c..1952e7f 100644

--- a/meson.build

+++ b/meson.build

@@ -61,5 +61,3 @@ meson.add_dist_script(

   meson.source_root(),

   join_paths(meson.build_root(), 'meson-dist', meson.project_name() + '-' + newsflash_version)

@@ -58,8 +58,8 @@ meson.add_dist_script(

 subdir('src')



 gnome.post_install(

-  gtk_update_icon_cache: true,

+  gtk_update_icon_cache: false,

   glib_compile_schemas: false,

-  update_desktop_database: true,

+  update_desktop_database: false,

 )
 
-

-meson.add_install_script('build-aux/meson_post_install.py')