diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-10-26 22:02:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-26 22:02:38 +0200 |
| commit | b87d5efea78a67a7a268a0faac5c6bc17e260400 (patch) | |
| tree | b3f41f5d38a061894e4dbd57ab23948dead39fbc /pkgs/servers | |
| parent | 45d1ffb078dff0c893c109f5c47c750f26b786de (diff) | |
| parent | f3d6070f25c3a6ed558f2a59b98f29184ba2982f (diff) | |
Merge pull request #197111 from mweinelt/wallabag-2.5.2
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/web-apps/wallabag/default.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index cf11bcf92981b..955eac2c6c334 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch }: # Point the environment variable $WALLABAG_DATA to a data directory @@ -15,19 +16,30 @@ let pname = "wallabag"; - version = "2.5.1"; + version = "2.5.2"; in stdenv.mkDerivation { inherit pname version; - # GitHub distribution does not include vendored files + # Release tarball includes vendored files src = fetchurl { - url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - hash = "sha256-vurjWI5Sh/SFPtxd5cHaaw7edcAzNub/duhOUF+Wshk="; + urls = [ + "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 = [ ./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; |