cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #258567 from Stunkymonkey/newsflash-3.0.0

Browse source 
newsflash: 2.3.1 -> 3.0.2
This commit is contained in:
Kira Bruneau 2023-11-25 23:02:17 -05:00 committed by GitHub
commit c3acd22246
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1017 additions and 877 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1864
pkgs/applications/networking/feedreaders/newsflash/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

16
pkgs/applications/networking/feedreaders/newsflash/default.nix
View file

@ -7,6 +7,7 @@
, ninja , ninja
, pkg-config , pkg-config
, rustc , rustc
, blueprint-compiler
, wrapGAppsHook4 , wrapGAppsHook4
, gdk-pixbuf , gdk-pixbuf
, glib , glib
@ -24,22 +25,22 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "newsflash"; pname = "newsflash";
version = "2.3.1"; version = "3.0.2";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "news-flash"; owner = "news-flash";
repo = "news_flash_gtk"; repo = "news_flash_gtk";
rev = "refs/tags/v.${finalAttrs.version}"; rev = "refs/tags/v.${finalAttrs.version}";
sha256 = "sha256-JUAlDc2mp8M0vjiWcDoyBw/sKCmd4J8e9wEwZoiW0AE="; sha256 = "sha256-tJKr2bGkdpEb+25eN0ZfHhEDl5Zdf8fdaC/rNMbH8Ws=";
}; };
cargoDeps = rustPlatform.importCargoLock { cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"javascriptcore6-0.1.0" = "sha256-7w8CDY13dCRlFc77XxJ2/xZqlKSjqM0eiOvILOrJ4ic="; "news-flash-2.3.0-alpha.0" = "sha256-H0osT7IrPbQ3RQYJZE7J+n7u4UCT86LAybUF3vvIXkA=";
"news-flash-2.3.0-alpha.0" = "sha256-phoZmTY1YVZIIktqLMnal9H5SMgNWwx7m+7AMtDcFJM="; "newsblur_api-0.2.0" = "sha256-eysCB19znQF8mRwQ64nSp6KuvJ1Trot4g4WCdQDedo8=";
"newsblur_api-0.2.0" = "sha256-6vnFeJbdFeIau2rpUk9o72DD2ZCqicljmQjFVhY71NI="; "article_scraper-2.0.0" = "sha256-FnOmrZyYewOuU8Au7fhmSJHN7UPCx/CxBV8UtSHattU=";
"article_scraper-2.0.0-alpha.0" = "sha256-HPEKZc7O7pbgcwR2l0kD/5442W1hzrfMadc0amrjxwI="; "commafeed_api-0.1.0" = "sha256-69UAmyUm0WG3qPoWZw4PekXh1RjIP5l3dx3gjWfxJDQ=";
}; };
}; };
@ -70,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
cargo cargo
rustc rustc
blueprint-compiler
]; ];
buildInputs = [ buildInputs = [
@ -103,6 +105,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ kira-bruneau stunkymonkey ]; maintainers = with maintainers; [ kira-bruneau stunkymonkey ];
platforms = platforms.unix; platforms = platforms.unix;
mainProgram = "com.gitlab.newsflash"; mainProgram = "io.gitlab.news_flash.NewsFlash";
}; };
}) })

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

@ -2,9 +2,13 @@ diff --git a/meson.build b/meson.build
index 1d7089c..1952e7f 100644 index 1d7089c..1952e7f 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -61,5 +61,3 @@ meson.add_dist_script( @@ -58,8 +58,8 @@ meson.add_dist_script(
meson.source_root(), subdir('src')
join_paths(meson.build_root(), 'meson-dist', meson.project_name() + '-' + newsflash_version)
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')