Merge pull request #197111 from mweinelt/wallabag-2.5.2

This commit is contained in:
Martin Weinelt 2022-10-26 22:02:38 +02:00 committed by GitHub
commit b87d5efea7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch
}: }:
# Point the environment variable $WALLABAG_DATA to a data directory # Point the environment variable $WALLABAG_DATA to a data directory
@ -15,19 +16,30 @@
let let
pname = "wallabag"; pname = "wallabag";
version = "2.5.1"; version = "2.5.2";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit pname version; inherit pname version;
# GitHub distribution does not include vendored files # Release tarball includes vendored files
src = fetchurl { src = fetchurl {
url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; urls = [
hash = "sha256-vurjWI5Sh/SFPtxd5cHaaw7edcAzNub/duhOUF+Wshk="; "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"
"https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz"
];
hash = "sha256-Q989SorGPm3KBuQhGAinYU6HGIa9RrhtRPvwGALU6jk=";
}; };
patches = [ patches = [
./wallabag-data.patch # exposes $WALLABAG_DATA ./wallabag-data.patch # exposes $WALLABAG_DATA
# Use sendmail from php.ini instead of FHS path.
(fetchpatch {
url = "https://github.com/symfony/swiftmailer-bundle/commit/31a4fed8f621f141ba70cb42ffb8f73184995f4c.patch";
stripLen = 1;
extraPrefix = "vendor/symfony/swiftmailer-bundle/";
sha256 = "rxHiGhKFd/ZWnIfTt6omFLLoNFlyxOYNCHIv/UtxCho=";
})
]; ];
dontBuild = true; dontBuild = true;