From a4533710cf9f8d37122a41b209b97674cf7cbe50 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Mon, 29 Sep 2025 13:40:14 +0800 Subject: [PATCH 1/2] openlist: 4.1.0 -> 4.1.3 Downgrade pnpm to v9 to fix openlist.frontend.pnpmDeps --- pkgs/by-name/op/openlist/frontend.nix | 16 ++++++++-------- pkgs/by-name/op/openlist/package.nix | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/op/openlist/frontend.nix b/pkgs/by-name/op/openlist/frontend.nix index e77a1a611279..b6e51683576a 100644 --- a/pkgs/by-name/op/openlist/frontend.nix +++ b/pkgs/by-name/op/openlist/frontend.nix @@ -5,35 +5,35 @@ fetchzip, nodejs, - pnpm_10, + pnpm_9, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "openlist-frontend"; - version = "4.1.0"; + version = "4.1.3"; src = fetchFromGitHub { owner = "OpenListTeam"; repo = "OpenList-Frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-E1kdoTLL9SloSJBYB277BVYwgKp8rmFYmCj9yb6Otuw="; + hash = "sha256-HYXYBK+7/Tbov55vqVmxb4Vb5yy0qqW2WheOJSfgwEs="; }; i18n = fetchzip { url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz"; - hash = "sha256-/g6TXeCo+tkqE5xF2foghATErGEWUZuxtg70uDA5UFA="; + hash = "sha256-zj3LQ9NfFYQavcD/W8qwLCLahsDXdaen+noFVZ8NcBg="; stripRoot = false; }; nativeBuildInputs = [ nodejs - pnpm_10.configHook + pnpm_9.configHook ]; - pnpmDeps = pnpm_10.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 1; - hash = "sha256-lWrh7jRx8DkwPZkk5Eh9YndfLsPIwCOUeLdieonZBgI="; + fetcherVersion = 2; + hash = "sha256-0XmUcM+sZnoHF1N9gdnScGwEqH55eLv9I+7xYN7CnIA="; }; buildPhase = '' diff --git a/pkgs/by-name/op/openlist/package.nix b/pkgs/by-name/op/openlist/package.nix index 3132672e117f..adfba471baa8 100644 --- a/pkgs/by-name/op/openlist/package.nix +++ b/pkgs/by-name/op/openlist/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "openlist"; - version = "4.1.0"; + version = "4.1.3"; src = fetchFromGitHub { owner = "OpenListTeam"; repo = "OpenList"; tag = "v${finalAttrs.version}"; - hash = "sha256-505rEnqIwn1EGhzqhcVWYgYqyPsV/obJzaHaK9W2tVA="; + hash = "sha256-Pz6sW7cF3PTTPi4xyJEPkKVpN9tLP17n4O9dW5bGnUU="; # 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; @@ -33,7 +33,7 @@ buildGoModule (finalAttrs: { frontend = callPackage ./frontend.nix { }; proxyVendor = true; - vendorHash = "sha256-J8ssJbILb3Gf6Br/PYkRAn4Haduf82iCYCfSAEi3nO4="; + vendorHash = "sha256-HMUP6u5JXnj9My/8GxGex0GsJE96W/Ez6wzYSbDP8aU="; buildInputs = [ fuse ]; From 7db71fc7d360afa860e0790492a5ba940e0e1458 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 2 Oct 2025 07:00:50 +0000 Subject: [PATCH 2/2] openlist: 4.1.3 -> 4.1.4 --- pkgs/by-name/op/openlist/frontend.nix | 8 ++++---- pkgs/by-name/op/openlist/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/op/openlist/frontend.nix b/pkgs/by-name/op/openlist/frontend.nix index b6e51683576a..a366940e7d5c 100644 --- a/pkgs/by-name/op/openlist/frontend.nix +++ b/pkgs/by-name/op/openlist/frontend.nix @@ -10,18 +10,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "openlist-frontend"; - version = "4.1.3"; + version = "4.1.4"; src = fetchFromGitHub { owner = "OpenListTeam"; repo = "OpenList-Frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-HYXYBK+7/Tbov55vqVmxb4Vb5yy0qqW2WheOJSfgwEs="; + hash = "sha256-crQm74JxVhEDbFQKWJzE6T6qKVMaQbJilI9hoGIxUYU="; }; i18n = fetchzip { url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz"; - hash = "sha256-zj3LQ9NfFYQavcD/W8qwLCLahsDXdaen+noFVZ8NcBg="; + hash = "sha256-4v+hNQl7tSm331CPpqYGMIJXEeOSB0QyQNeQCL5zeFg="; stripRoot = false; }; @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-0XmUcM+sZnoHF1N9gdnScGwEqH55eLv9I+7xYN7CnIA="; + hash = "sha256-8wP57qIUGGccLX4oKkqQmibAoAHwnORhBFp80d+ltA4="; }; buildPhase = '' diff --git a/pkgs/by-name/op/openlist/package.nix b/pkgs/by-name/op/openlist/package.nix index adfba471baa8..f12ac9f7eaab 100644 --- a/pkgs/by-name/op/openlist/package.nix +++ b/pkgs/by-name/op/openlist/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "openlist"; - version = "4.1.3"; + version = "4.1.4"; src = fetchFromGitHub { owner = "OpenListTeam"; repo = "OpenList"; tag = "v${finalAttrs.version}"; - hash = "sha256-Pz6sW7cF3PTTPi4xyJEPkKVpN9tLP17n4O9dW5bGnUU="; + hash = "sha256-CNnDPA/zByhR6GOmzxOZRc8F/QqGIxTGSIKXOCwlwwg="; # 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; @@ -33,7 +33,7 @@ buildGoModule (finalAttrs: { frontend = callPackage ./frontend.nix { }; proxyVendor = true; - vendorHash = "sha256-HMUP6u5JXnj9My/8GxGex0GsJE96W/Ez6wzYSbDP8aU="; + vendorHash = "sha256-MHqQ/2FrqxufSa9OG3MWkm401qeIszK9rpgDR0jdCo4="; buildInputs = [ fuse ];