movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

memos: 0.24.2 -> 0.24.3, fix update script

Browse source
This commit is contained in:
kuflierl 2025-05-22 02:50:37 +02:00
parent d91cb47b10
commit e811962dfb
No known key found for this signature in database
GPG key ID: 0B3842DA5392223D
2 changed files with 16 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

23
pkgs/by-name/me/memos/nixbuild-check.patch
View file

@ -1,23 +0,0 @@
diff --git a/plugin/httpgetter/html_meta_test.go b/plugin/httpgetter/html_meta_test.go
index d0b0d903..d1668db1 100644
--- a/plugin/httpgetter/html_meta_test.go
+++ b/plugin/httpgetter/html_meta_test.go
@@ -2,7 +2,6 @@ package httpgetter
import (
"errors"
- "strings"
"testing"
"github.com/stretchr/testify/require"
@@ -30,10 +29,4 @@ func TestGetHTMLMetaForInternal(t *testing.T) {
if _, err := GetHTMLMeta("http://localhost"); !errors.Is(err, ErrInternalIP) {
t.Errorf("Expected error for resolved internal IP, got %v", err)
}
-
- // test for redirected internal IP
- // 49.232.126.226:1110 will redirects to 127.0.0.1
- if _, err := GetHTMLMeta("http://49.232.126.226:1110"); !(errors.Is(err, ErrInternalIP) && strings.Contains(err.Error(), "redirect")) {
- t.Errorf("Expected error for redirected internal IP, got %v", err)
- }
}

32
pkgs/by-name/me/memos/package.nix
View file

@ -14,15 +14,15 @@
protoc-gen-validate, protoc-gen-validate,
}: }:
let let
version = "0.24.2"; version = "0.24.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "usememos"; owner = "usememos";
repo = "memos"; repo = "memos";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-DWOJ6+lUTbOzMLsfTDNZfhgNomajNCnNi7U1A+tqXm4="; hash = "sha256-lTMHUVrg3JzTneBh874tr0mbQPp7X3rMKrkOe+wcOL4=";
}; };
protobufsGenerated = stdenvNoCC.mkDerivation { memos-protobuf-gen = stdenvNoCC.mkDerivation {
name = "memos-protobuf-gen"; name = "memos-protobuf-gen";
inherit src; inherit src;
@ -52,16 +52,16 @@ let
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHash = "sha256-u+Wq/fXvWTjXdhC2h6RCsn7pjdFJ+gUdTPRvrn9cZ+k="; outputHash = "sha256-cJK9wT5uj1MYjYZkzgMSL9nShCO2xPJOYZT+ebndwlY=";
}; };
frontend = stdenvNoCC.mkDerivation (finalAttrs: { memos-web = stdenvNoCC.mkDerivation (finalAttrs: {
pname = "memos-web"; pname = "memos-web";
inherit version src; inherit version src;
pnpmDeps = pnpm.fetchDeps { pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
sourceRoot = "${finalAttrs.src.name}/web"; sourceRoot = "${finalAttrs.src.name}/web";
hash = "sha256-lopCa7F/foZ42cAwCxE+TWAnglTZg8jY8eRWmeck/W8="; hash = "sha256-ooiH13yzMTCSqzmZVvVy2jWoIfJecMlE6JkwcG5EV5k=";
}; };
pnpmRoot = "web"; pnpmRoot = "web";
nativeBuildInputs = [ nativeBuildInputs = [
@ -69,7 +69,7 @@ let
pnpm.configHook pnpm.configHook
]; ];
preBuild = '' preBuild = ''
cp -r {${protobufsGenerated},.}/web/src/types/proto cp -r {${memos-protobuf-gen},.}/web/src/types/proto
''; '';
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
@ -85,21 +85,21 @@ let
in in
buildGoModule { buildGoModule {
pname = "memos"; pname = "memos";
inherit version src; inherit
version
src
memos-web
memos-protobuf-gen
;
vendorHash = "sha256-hdL4N0tg/lYGTeiKl9P2QsV8HTxlvHfsSqsqq/C0cg8="; vendorHash = "sha256-SWpnsTdti3hD1alvItpXllTJHGxeKP8q7WD2nBzFG7o=";
preBuild = '' preBuild = ''
rm -rf server/router/frontend/dist rm -rf server/router/frontend/dist
cp -r ${frontend} server/router/frontend/dist cp -r ${memos-web} server/router/frontend/dist
cp -r {${protobufsGenerated},.}/proto/gen cp -r {${memos-protobuf-gen},.}/proto/gen
''; '';
patches = [
# to be removed in next release (test was removed upstream as part of a bigger commit)
./nixbuild-check.patch
];
passthru.updateScript = nix-update-script { passthru.updateScript = nix-update-script {
extraArgs = [ extraArgs = [
"--subpackage" "--subpackage"