From 8fdfc49bfcbb1f9ab8db274f1f4bc3d053e5717c Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 11 Feb 2025 11:42:05 +0800 Subject: [PATCH 1/2] paperlib: refactor --- pkgs/by-name/pa/paperlib/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/paperlib/package.nix b/pkgs/by-name/pa/paperlib/package.nix index 61c7fca9818d..959fbf53e752 100644 --- a/pkgs/by-name/pa/paperlib/package.nix +++ b/pkgs/by-name/pa/paperlib/package.nix @@ -20,14 +20,14 @@ let hash = "sha256-2xbn9UWlcf37n9jZdZKyyevzsag6SW9YuQH/bYCRmLQ="; }; } - .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); passthru = { inherit pname version src; }; meta = { - homepage = "https://github.com/Future-Scholars/paperlib?"; + homepage = "https://github.com/Future-Scholars/paperlib"; description = "Open-source academic paper management tool"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ ByteSudoer ]; @@ -55,8 +55,10 @@ if stdenv.hostPlatform.isDarwin then installPhase = '' runHook preInstall - mkdir -p "$out/Applications" + + mkdir -p $out/Applications mv Paperlib.app $out/Applications/ + runHook postInstall ''; } From 94ae1a6aaec9835fb4f4a5932e127a42b97f3bd5 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 11 Feb 2025 19:08:18 +0800 Subject: [PATCH 2/2] paperlib: 3.1.6 -> 3.1.10 --- pkgs/by-name/pa/paperlib/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pa/paperlib/package.nix b/pkgs/by-name/pa/paperlib/package.nix index 959fbf53e752..3bc6c94decdb 100644 --- a/pkgs/by-name/pa/paperlib/package.nix +++ b/pkgs/by-name/pa/paperlib/package.nix @@ -4,20 +4,25 @@ fetchurl, appimageTools, undmg, + _7zz, }: let pname = "paperlib"; - version = "3.1.6"; + version = "3.1.10"; src = fetchurl { + aarch64-darwin = { + url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}_arm.dmg"; + hash = "sha256-KNMPUeCNtODHzMJhCwI4SJPRfa87RmAe6CRRazgRZCQ="; + }; x86_64-darwin = { url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}.dmg"; - hash = "sha256-d9vEFx59K15PO7DJYJQ2fjiagqa8oJLtoawILDF9IKc="; + hash = "sha256-5QwF0+7Y4LzReHCj8yZrAJDAZVyY0ANC5gjAxdaVRkU="; }; x86_64-linux = { url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}.AppImage"; - hash = "sha256-2xbn9UWlcf37n9jZdZKyyevzsag6SW9YuQH/bYCRmLQ="; + hash = "sha256-uBYhiUL4YWwnLLPvXMoXjlQqlqFep/OpwwnmPx7s5dY="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -32,6 +37,7 @@ let license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ ByteSudoer ]; platforms = [ + "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; @@ -51,7 +57,7 @@ if stdenv.hostPlatform.isDarwin then sourceRoot = "."; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = if stdenv.hostPlatform.isAarch64 then [ _7zz ] else [ undmg ]; installPhase = '' runHook preInstall