diff --git a/pkgs/by-name/me/memos/nixbuild-check.patch b/pkgs/by-name/me/memos/nixbuild-check.patch deleted file mode 100644 index 9a19c116c97f..000000000000 --- a/pkgs/by-name/me/memos/nixbuild-check.patch +++ /dev/null @@ -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) -- } - } diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix index bdeffac3f194..7a0ca3298dc1 100644 --- a/pkgs/by-name/me/memos/package.nix +++ b/pkgs/by-name/me/memos/package.nix @@ -14,15 +14,15 @@ protoc-gen-validate, }: let - version = "0.24.2"; + version = "0.24.3"; src = fetchFromGitHub { owner = "usememos"; repo = "memos"; rev = "v${version}"; - hash = "sha256-DWOJ6+lUTbOzMLsfTDNZfhgNomajNCnNi7U1A+tqXm4="; + hash = "sha256-lTMHUVrg3JzTneBh874tr0mbQPp7X3rMKrkOe+wcOL4="; }; - protobufsGenerated = stdenvNoCC.mkDerivation { + memos-protobuf-gen = stdenvNoCC.mkDerivation { name = "memos-protobuf-gen"; inherit src; @@ -52,16 +52,16 @@ let outputHashMode = "recursive"; 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"; inherit version src; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/web"; - hash = "sha256-lopCa7F/foZ42cAwCxE+TWAnglTZg8jY8eRWmeck/W8="; + hash = "sha256-ooiH13yzMTCSqzmZVvVy2jWoIfJecMlE6JkwcG5EV5k="; }; pnpmRoot = "web"; nativeBuildInputs = [ @@ -69,7 +69,7 @@ let pnpm.configHook ]; preBuild = '' - cp -r {${protobufsGenerated},.}/web/src/types/proto + cp -r {${memos-protobuf-gen},.}/web/src/types/proto ''; buildPhase = '' runHook preBuild @@ -85,21 +85,21 @@ let in buildGoModule { pname = "memos"; - inherit version src; + inherit + version + src + memos-web + memos-protobuf-gen + ; - vendorHash = "sha256-hdL4N0tg/lYGTeiKl9P2QsV8HTxlvHfsSqsqq/C0cg8="; + vendorHash = "sha256-SWpnsTdti3hD1alvItpXllTJHGxeKP8q7WD2nBzFG7o="; preBuild = '' rm -rf server/router/frontend/dist - cp -r ${frontend} server/router/frontend/dist - cp -r {${protobufsGenerated},.}/proto/gen + cp -r ${memos-web} server/router/frontend/dist + 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 { extraArgs = [ "--subpackage"