diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-03 18:14:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 18:14:40 +0000 |
| commit | 1aeec1f039ecfb360c0ee931af15458452dd3871 (patch) | |
| tree | 8846aaf219de5c884b8e80610609a3752c746d42 /pkgs/applications/misc | |
| parent | 5b73e3087ae63d404f94a76781b281e73a33922b (diff) | |
| parent | 555641c50462d5ab87afe9ceab7df9d8c7755a37 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/archivy/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/joplin-desktop/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index d2fa48cd2348..09779f8876f8 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -5,11 +5,11 @@ watchdog, wtforms }: python3.pkgs.buildPythonApplication rec { pname = "archivy"; - version = "0.8.5"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "144ckgxjaw29yp5flyxd1rnkm7hlim4zgy6xng7x0a9j54h527iq"; + sha256 = "5cb760da57dc9dcdd62c0af824993d1715ec7035915629b4046d8bf50442756c"; }; # Relax some dependencies diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index fccf15c0241b..bcd4f686f818 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.4.15"; + version = "1.4.19"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "12wh7f1a9sn250lqnb8c9b5gqr8r76kxrhl0kgsm2lg93jgpvvbb"; - x86_64-darwin = "1jzfqwyz3vkmmkdzx3iw36fbjq7fns46v8crmg5n09w9kvf22qil"; + x86_64-linux = "1xyj30pnlczchbh4awb955sxh51v89d170f4yk0v1jkj7dg2wjgj"; + x86_64-darwin = "166yp2rr87p0lh64ngs498a50ahcann8z5s0g2p0azs6wi54a6kw"; }.${system} or throwSystem; }; |