diff --git a/pkgs/by-name/op/openlist/frontend.nix b/pkgs/by-name/op/openlist/frontend.nix index 3d4bd099069b..693c50cc69cf 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.0.1"; + version = "4.0.8"; src = fetchFromGitHub { owner = "OpenListTeam"; repo = "OpenList-Frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-WflnK/DXg2kmTcOD97jiZP8kb/cEdW7SrVnNQLrWKjA="; + hash = "sha256-q/FZ9SMdNDPHmZlNeh8GcyRE6iwvI7X+Ic8InerjOps="; }; i18n = fetchzip { url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz"; - hash = "sha256-zms4x4C1CW39o/8uVm5gbasKCJQx6Oh3h66BHF1vnWY="; + hash = "sha256-Doomu3ZkHuUI2V4rRKo8XiOgzS4c35ealOb3iMI/RMg="; stripRoot = false; }; diff --git a/pkgs/by-name/op/openlist/package.nix b/pkgs/by-name/op/openlist/package.nix index 515b7d9b479a..12d2ed62d956 100644 --- a/pkgs/by-name/op/openlist/package.nix +++ b/pkgs/by-name/op/openlist/package.nix @@ -4,7 +4,6 @@ buildGoModule, fetchFromGitHub, callPackage, - buildPackages, installShellFiles, versionCheckHook, fuse, @@ -12,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "openlist"; - version = "4.0.1"; + version = "4.0.8"; src = fetchFromGitHub { owner = "OpenListTeam"; repo = "OpenList"; tag = "v${finalAttrs.version}"; - hash = "sha256-PqCGA2DAfZvDqdnQzqlmz2vlybYokJe+Ybzp5BcJDGU="; + hash = "sha256-pihGG9vm0wyny9DuN110Nb6cwxvG5oP2RqcoWSOWRes="; # 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; @@ -34,7 +33,7 @@ buildGoModule (finalAttrs: { frontend = callPackage ./frontend.nix { }; proxyVendor = true; - vendorHash = "sha256-e1glgNp5aYl1cEuLdMMLa8sE9lSuiLVdPCX9pek5grE="; + vendorHash = "sha256-WnA5iDXCdBlBhnCxvD0PQYfu3bePAv9tJ3WNUTFNURo="; buildInputs = [ fuse ]; @@ -42,9 +41,9 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" - "-X \"github.com/OpenListTeam/OpenList/internal/conf.GitAuthor=The OpenList Projects Contributors \"" - "-X github.com/OpenListTeam/OpenList/internal/conf.Version=${finalAttrs.version}" - "-X github.com/OpenListTeam/OpenList/internal/conf.WebVersion=${finalAttrs.frontend.version}" + "-X \"github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=The OpenList Projects Contributors \"" + "-X github.com/OpenListTeam/OpenList/v4/internal/conf.Version=${finalAttrs.version}" + "-X github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=${finalAttrs.frontend.version}" ]; preConfigure = '' @@ -53,8 +52,8 @@ buildGoModule (finalAttrs: { ''; preBuild = '' - ldflags+=" -X \"github.com/OpenListTeam/OpenList/internal/conf.BuiltAt=$( $out/share/powershell/OpenList.Completion.ps1 - '' - ); + mkdir $out/share/powershell/ -p + $out/bin/OpenList completion powershell > $out/share/powershell/OpenList.Completion.ps1 + ''; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ];