mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-20 15:41:16 +00:00
fastmail: 1.2.1 -> 1.3.0, add aarch64-linux support (#537829)
This commit is contained in:
@@ -66,9 +66,18 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
# remove musl-libc dependencies before the autoPatchelfHook
|
||||
preFixup = ''
|
||||
rm -r "$out/opt/fastmail/app.asar.unpacked/node_modules/@img/"{sharp-linuxmusl-x64,sharp-libvips-linuxmusl-x64}
|
||||
'';
|
||||
preFixup =
|
||||
let
|
||||
suffix =
|
||||
{
|
||||
aarch64-linux = "arm64";
|
||||
x86_64-linux = "x64";
|
||||
}
|
||||
.${stdenvNoCC.targetPlatform.system};
|
||||
in
|
||||
''
|
||||
rm -r "$out/opt/fastmail/app.asar.unpacked/node_modules/@img/"{sharp-linuxmusl-${suffix},sharp-libvips-linuxmusl-${suffix}}
|
||||
'';
|
||||
|
||||
meta = meta // {
|
||||
mainProgram = "fastmail";
|
||||
|
||||
@@ -26,6 +26,7 @@ callPackage (if isDarwin then ./darwin.nix else ./linux.nix) {
|
||||
];
|
||||
platforms = [
|
||||
"aarch64-darwin"
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
};
|
||||
|
||||
@@ -1,19 +1,26 @@
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2026-03-23
|
||||
# Last updated: 2026-07-02
|
||||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
aarch64-darwin = {
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.2.1-arm64-mac.zip";
|
||||
hash = "sha512-bu6IeL8X8ogD1qSlAuApWTBTCYIk5QrjWrzjOv8fel+kqYfCIcDXP1DP1FdJwULe91zoZn4M/uDX8CoOPWa0cA==";
|
||||
url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.3.0-arm64-mac.zip";
|
||||
hash = "sha512-6iRUcoI0dsW5ByaQ7dv7Oki5y0Y1wuMlQjjCpqWaThttsNJ4yYXh812RGsPjJTvcwVNMvPRbmPcbb/y//mXqRg==";
|
||||
};
|
||||
};
|
||||
aarch64-linux = {
|
||||
version = "1.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://dl.fastmailcdn.com/desktop/production/linux/arm64/com.fastmail.Fastmail-1.3.0-arm64.AppImage";
|
||||
hash = "sha512-XJdxJVJ3xdhF04TInc3vmEtcUnzPzwujzTix+t2WbRo9qNEPqxnmN6hurGq0dZO/Dnk7jgOfAkjCpVq/kxWVRQ==";
|
||||
};
|
||||
};
|
||||
x86_64-linux = {
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/com.fastmail.Fastmail-1.2.1.AppImage";
|
||||
hash = "sha512-xudOPNjOaumYxD7yZyjQnYhuiKqDO10cBwMdFJtVEOfHVia0jJMgdUTJx03otIBn9ijM3/1Qo6wsq1HF0A/zlQ==";
|
||||
url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/com.fastmail.Fastmail-1.3.0.AppImage";
|
||||
hash = "sha512-KnFAmjGQGXfA83JDynSixecoqqZbnC0bYGFQVf8YfP3ITwspHNDj3TIMp2jqXKtl9j4DlH1w8eLwSbKD0En9Wg==";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,15 +6,19 @@ set -euo pipefail
|
||||
cd "$(readlink -e "$(dirname "${BASH_SOURCE[0]}")")"
|
||||
|
||||
x86_64_linux_info=$(curl -fsS "https://dl.fastmailcdn.com/desktop/production/linux/x64/latest-linux.yml")
|
||||
aarch64_linux_info=$(curl -fsS "https://dl.fastmailcdn.com/desktop/production/linux/arm64/latest-linux-arm64.yml")
|
||||
aarch64_darwin_info=$(curl -fsS "https://dl.fastmailcdn.com/desktop/production/mac/arm64/latest-mac.yml")
|
||||
|
||||
x86_64_linux_version=$(yq -r '.version' <<<"$x86_64_linux_info")
|
||||
aarch64_linux_version=$(yq -r '.version' <<<"$aarch64_linux_info")
|
||||
aarch64_darwin_version=$(yq -r '.version' <<<"$aarch64_darwin_info")
|
||||
|
||||
x86_64_linux_url="https://dl.fastmailcdn.com/desktop/production/linux/x64/$(yq -r '.path' <<<"$x86_64_linux_info")"
|
||||
aarch64_linux_url="https://dl.fastmailcdn.com/desktop/production/linux/arm64/$(yq -r '.path' <<<"$aarch64_linux_info")"
|
||||
aarch64_darwin_url="https://dl.fastmailcdn.com/desktop/production/mac/arm64/$(yq -r '.path' <<<"$aarch64_darwin_info")"
|
||||
|
||||
x86_64_linux_hash=$(nix-hash --type sha512 --to-sri "$(yq -r '.sha512' <<<"$x86_64_linux_info")")
|
||||
aarch64_linux_hash=$(nix-hash --type sha512 --to-sri "$(yq -r '.sha512' <<<"$aarch64_linux_info")")
|
||||
aarch64_darwin_hash=$(nix-hash --type sha512 --to-sri "$(yq -r '.sha512' <<<"$aarch64_darwin_info")")
|
||||
|
||||
cat >sources.nix <<EOF
|
||||
@@ -29,6 +33,13 @@ cat >sources.nix <<EOF
|
||||
hash = "$aarch64_darwin_hash";
|
||||
};
|
||||
};
|
||||
aarch64-linux = {
|
||||
version = "$aarch64_linux_version";
|
||||
src = fetchurl {
|
||||
url = "$aarch64_linux_url";
|
||||
hash = "$aarch64_linux_hash";
|
||||
};
|
||||
};
|
||||
x86_64-linux = {
|
||||
version = "$x86_64_linux_version";
|
||||
src = fetchurl {
|
||||
|
||||
Reference in New Issue
Block a user