Unverified Commit 31c1dfe8 authored by Felix Bühler's avatar Felix Bühler Committed by GitHub
Browse files

Merge pull request #299291 from Stunkymonkey/newslfash-3.2.0 

newsflash: 3.1.6 -> 3.2.0
parents 86d31b52 c65decab

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

+625 −243

File changed.

Preview size limit exceeded, changes collapsed.

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

+11 −5
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, stdenv

, rustPlatform

, fetchFromGitLab

, substituteAll

, cargo

, meson

, ninja
@@ -25,21 +26,20 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "newsflash";

  version = "3.1.6";

  version = "3.2.0";



  src = fetchFromGitLab {

    owner = "news-flash";

    repo = "news_flash_gtk";

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

    hash = "sha256-zEf61aKtiuTCmhzkfVkTLtIRCb4DVXVtI+9Az9dU9HE=";

    hash = "sha256-buXFQ/QAFOcdcywlacySuq8arqPEJIti1nK+yl3yWck=";

  };



  cargoDeps = rustPlatform.importCargoLock {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "news-flash-2.3.0-alpha.0" = "sha256-Gr7EyAbIFABZx9GR/WvshF0vfJaul7wz4pro2EbwSM8=";

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

      "article_scraper-2.0.0" = "sha256-URiteEJ1kXoGfRopGoRI/4iPbzd+F9bQaMJKpkrh/sE=";

      "news-flash-2.3.0-alpha.0" = "sha256-WITvnqeEDp793AlZ3gj8Tg0dfccuOj0Us5H5FaEtkxk=";

      "newsblur_api-0.3.0" = "sha256-m2178zdJzeskl3BQpZr6tlxTAADehxz8uYcZzi15nhQ=";

    };

  };
@@ -50,6 +50,12 @@ stdenv.mkDerivation (finalAttrs: { 
    # 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 = ''

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

0 → 100644
+12 −0
Original line number Diff line number Diff line 
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',

 )