diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-06-20 23:11:17 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-09-09 18:16:29 +0000 |
| commit | 41704412383b3e36a64e47756a083c8cb3aa0aaa (patch) | |
| tree | 5d54f6e04871355adbd04c73ec3fd707ae525d6f | |
| parent | Merge pull request #254169 from angerman/backport-253939-to-release-23.05 (diff) | |
| download | nixpkgs-origin/backport-238828-to-release-23.05.tar.gz | |
wallabag: 2.5.4 -> 2.6.6origin/backport-238828-to-release-23.05
https://github.com/wallabag/wallabag/releases/tag/2.6.0
https://github.com/wallabag/wallabag/releases/tag/2.6.1
https://github.com/wallabag/wallabag/releases/tag/2.6.2
https://github.com/wallabag/wallabag/releases/tag/2.6.3
https://github.com/wallabag/wallabag/releases/tag/2.6.4
https://github.com/wallabag/wallabag/releases/tag/2.6.5
https://github.com/wallabag/wallabag/releases/tag/2.6.6
Dropped the swiftmailer patch, because wallabag migrated to symfony
mailer.
https://github.com/advisories/GHSA-p8gp-899c-jvq9
https://github.com/advisories/GHSA-gjvc-55fw-v6vq
https://github.com/wallabag/wallabag/pull/6924
Fixes: CVE-2023-4454, CVE-2023-4455
(cherry picked from commit 0f9a86c000df68e6a36e511283f1def4dd5cc360)
| -rw-r--r-- | pkgs/servers/web-apps/wallabag/default.nix | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 1e6763c39c3e..251735e0f78e 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch }: # Point the environment variable $WALLABAG_DATA to a data directory @@ -16,30 +15,19 @@ let pname = "wallabag"; - version = "2.5.4"; + version = "2.6.6"; in stdenv.mkDerivation { inherit pname version; # Release tarball includes vendored files src = fetchurl { - 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-yVMQXjGB8Yv1klQaHEbDGMZmOtANRocFJnawKn10xhg="; + url = "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz"; + hash = "sha256-0CkJFSHPnOz333+7uMUqXI3A9dsA9FchZXXmwq7F09o="; }; 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; |