Unverified Commit 3f96cf58 authored by Aaron Andersen's avatar Aaron Andersen Committed by GitHub
Browse files

Merge pull request #324551 from pmiddend/joplin-desktop-update-3.0.12 

joplin-desktop: 2.14.17 -> 3.0.12
parents f32a8ac9 c8da1c41

pkgs/applications/misc/joplin-desktop/default.nix

+7 −7
Original line number Diff line number Diff line 
{ lib, stdenv, appimageTools, fetchurl, makeWrapper, undmg }:

{ lib, stdenv, appimageTools, fetchurl, makeWrapper, _7zz }:



let

  pname = "joplin-desktop";

  version = "2.14.17";

  version = "3.0.12";



  inherit (stdenv.hostPlatform) system;

  throwSystem = throw "Unsupported system: ${system}";
@@ -16,9 +16,9 @@ let 
  src = fetchurl {

    url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}";

    sha256 = {

      x86_64-linux = "sha256-u4wEchyljurmwVZsRnmUBITZUR6SxDxyGczZjXNsJkg=";

      x86_64-darwin = "sha256-KjNwAnJZGX/DvHDPw15vGlSbJ47s6YT59EalARt1mx4=";

      aarch64-darwin = "sha256-OYpsHPI+7riMVNAp2JpBlmdFdJUSNqNvBmeYHDw6yzY=";

      x86_64-linux = "sha256-vMz+ZeBHP+9Ugy8KO8lbp8zqC8VHtf1TWw10YytQFSs=";

      x86_64-darwin = "sha256-XZN1jTv/FhJXuFxZ6D6h/vFMdKi84Z9UWfj2CrMgBBA=";

      aarch64-darwin = "sha256-lsODOBkZ4+x5D6Er2/paTzAMKZvqIBVkKrWHh5iRvrk=";

    }.${system} or throwSystem;

  };
@@ -64,7 +64,7 @@ let 
  darwin = stdenv.mkDerivation {

    inherit pname version src meta;



    nativeBuildInputs = [ undmg ];

    nativeBuildInputs = [ _7zz ];



    sourceRoot = "Joplin.app";