mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-20 03:43:45 +00:00
Merge pull request #324551 from pmiddend/joplin-desktop-update-3.0.12
joplin-desktop: 2.14.17 -> 3.0.12
This commit is contained in:
commit
3f96cf580c
@ -1,8 +1,8 @@
|
|||||||
{ lib, stdenv, appimageTools, fetchurl, makeWrapper, undmg }:
|
{ lib, stdenv, appimageTools, fetchurl, makeWrapper, _7zz }:
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "joplin-desktop";
|
pname = "joplin-desktop";
|
||||||
version = "2.14.17";
|
version = "3.0.12";
|
||||||
|
|
||||||
inherit (stdenv.hostPlatform) system;
|
inherit (stdenv.hostPlatform) system;
|
||||||
throwSystem = throw "Unsupported system: ${system}";
|
throwSystem = throw "Unsupported system: ${system}";
|
||||||
@ -16,9 +16,9 @@ let
|
|||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}";
|
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}";
|
||||||
sha256 = {
|
sha256 = {
|
||||||
x86_64-linux = "sha256-u4wEchyljurmwVZsRnmUBITZUR6SxDxyGczZjXNsJkg=";
|
x86_64-linux = "sha256-vMz+ZeBHP+9Ugy8KO8lbp8zqC8VHtf1TWw10YytQFSs=";
|
||||||
x86_64-darwin = "sha256-KjNwAnJZGX/DvHDPw15vGlSbJ47s6YT59EalARt1mx4=";
|
x86_64-darwin = "sha256-XZN1jTv/FhJXuFxZ6D6h/vFMdKi84Z9UWfj2CrMgBBA=";
|
||||||
aarch64-darwin = "sha256-OYpsHPI+7riMVNAp2JpBlmdFdJUSNqNvBmeYHDw6yzY=";
|
aarch64-darwin = "sha256-lsODOBkZ4+x5D6Er2/paTzAMKZvqIBVkKrWHh5iRvrk=";
|
||||||
}.${system} or throwSystem;
|
}.${system} or throwSystem;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -39,7 +39,7 @@ let
|
|||||||
homepage = "https://joplinapp.org";
|
homepage = "https://joplinapp.org";
|
||||||
license = licenses.agpl3Plus;
|
license = licenses.agpl3Plus;
|
||||||
maintainers = with maintainers; [ hugoreeves qjoly ];
|
maintainers = with maintainers; [ hugoreeves qjoly ];
|
||||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin"];
|
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
linux = appimageTools.wrapType2 rec {
|
linux = appimageTools.wrapType2 rec {
|
||||||
@ -64,7 +64,7 @@ let
|
|||||||
darwin = stdenv.mkDerivation {
|
darwin = stdenv.mkDerivation {
|
||||||
inherit pname version src meta;
|
inherit pname version src meta;
|
||||||
|
|
||||||
nativeBuildInputs = [ undmg ];
|
nativeBuildInputs = [ _7zz ];
|
||||||
|
|
||||||
sourceRoot = "Joplin.app";
|
sourceRoot = "Joplin.app";
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user