From f32b5f997fcd515dd7ab3b1335f40d4e56064688 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sun, 24 Nov 2024 17:33:18 +0800
Subject: [PATCH 1/3] alist: split webVersion from version

---
 pkgs/by-name/al/alist/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix
index 4e92f00123e4..358a9ad4b836 100644
--- a/pkgs/by-name/al/alist/package.nix
+++ b/pkgs/by-name/al/alist/package.nix
@@ -11,6 +11,7 @@
 buildGoModule rec {
   pname = "alist";
   version = "3.39.2";
+  webVersion = "3.39.2";
 
   src = fetchFromGitHub {
     owner = "AlistGo";
@@ -29,7 +30,7 @@ buildGoModule rec {
     '';
   };
   web = fetchurl {
-    url = "https://github.com/AlistGo/alist-web/releases/download/${version}/dist.tar.gz";
+    url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz";
     hash = "sha256-2ZgxWv9VROfXJIIU0Co7BKkjZr8KxQ+0eRsjgz6LVDo=";
   };
 
@@ -45,11 +46,10 @@ buildGoModule rec {
     "-w"
     "-X \"github.com/alist-org/alist/v3/internal/conf.GitAuthor=Xhofe <i@nn.ci>\""
     "-X github.com/alist-org/alist/v3/internal/conf.Version=${version}"
-    "-X github.com/alist-org/alist/v3/internal/conf.WebVersion=${version}"
+    "-X github.com/alist-org/alist/v3/internal/conf.WebVersion=${webVersion}"
   ];
 
   preConfigure = ''
-    # use matched web files
     rm -rf public/dist
     tar -xzf ${web}
     mv -f dist public

From 8ccddb644140ac7d96149955b356d28bd28d519f Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sun, 24 Nov 2024 17:37:06 +0800
Subject: [PATCH 2/3] alist: use fetchzip to get web dist

---
 pkgs/by-name/al/alist/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix
index 358a9ad4b836..f55bd2564edb 100644
--- a/pkgs/by-name/al/alist/package.nix
+++ b/pkgs/by-name/al/alist/package.nix
@@ -2,7 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  fetchurl,
+  fetchzip,
   fuse,
   stdenv,
   installShellFiles,
@@ -29,9 +29,9 @@ buildGoModule rec {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  web = fetchurl {
+  web = fetchzip {
     url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz";
-    hash = "sha256-2ZgxWv9VROfXJIIU0Co7BKkjZr8KxQ+0eRsjgz6LVDo=";
+    hash = "sha256-vc/pwu6TohHVydhMJ5xOXPLogV0WodT/YnGIXtIsLlk=";
   };
 
   proxyVendor = true;
@@ -51,8 +51,7 @@ buildGoModule rec {
 
   preConfigure = ''
     rm -rf public/dist
-    tar -xzf ${web}
-    mv -f dist public
+    cp -r ${web} public/dist
   '';
 
   preBuild = ''

From f7b82e06e3f1cf971a996aa30a1a5bf7404051da Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sun, 24 Nov 2024 17:38:05 +0800
Subject: [PATCH 3/3] alist: 3.39.2 -> 3.40.0

---
 pkgs/by-name/al/alist/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix
index f55bd2564edb..885c3a13e4c0 100644
--- a/pkgs/by-name/al/alist/package.nix
+++ b/pkgs/by-name/al/alist/package.nix
@@ -10,14 +10,14 @@
 }:
 buildGoModule rec {
   pname = "alist";
-  version = "3.39.2";
+  version = "3.40.0";
   webVersion = "3.39.2";
 
   src = fetchFromGitHub {
     owner = "AlistGo";
     repo = "alist";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ayIbmoemaDKZu+jYJ33GXq5XORNn6rJ3yOpDgFeXA/4=";
+    hash = "sha256-2cpYe00OoTLvbN2BeB50wiAcfrrXCp3DXb5xCZaVMPA=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;