From b7b77b65a52872d09e8aafff3ba9d2d1180ef058 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sun, 10 Sep 2023 17:01:11 +0200 Subject: [PATCH] pocketbase: 0.16.10 -> 0.18.3 --- pkgs/servers/pocketbase/default.nix | 13 ++++------- .../pocketbase/remove-update-method.patch | 22 ------------------- 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 pkgs/servers/pocketbase/remove-update-method.patch diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 4e5079206bdc..58ee4cab598f 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.16.10"; + version = "0.18.3"; src = fetchFromGitHub { owner = "pocketbase"; - repo = pname; + repo = "pocketbase"; rev = "v${version}"; - sha256 = "sha256-BH3hJ+5xAJkGj2HoKpee+ZNgMmyQoHEVI0wsXRwIdGw="; + hash = "sha256-UwxE36y99vW/45Lnkm5qaevEToxIVs73YUJVDtr8ziA="; }; - vendorHash = "sha256-h3lkmpHEMr/aueP+lJpa9HJCidEpm7xSKws28+ZSeQA="; + vendorHash = "sha256-vb0957zO27OgrSTUiAt+vuo9NKM5ftz8mbFf613l0eM="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; @@ -32,11 +32,6 @@ buildGoModule rec { mv $out/bin/base $out/bin/pocketbase ''; - patches = [ - # To provide a consistent update experience, we remove the built in update method - ./remove-update-method.patch - ]; - meta = with lib; { description = "Open Source realtime backend in 1 file"; homepage = "https://github.com/pocketbase/pocketbase"; diff --git a/pkgs/servers/pocketbase/remove-update-method.patch b/pkgs/servers/pocketbase/remove-update-method.patch deleted file mode 100644 index a68ae58bd0ba..000000000000 --- a/pkgs/servers/pocketbase/remove-update-method.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/examples/base/main.go b/examples/base/main.go -index 908d31d..04b8f1d 100644 ---- a/examples/base/main.go -+++ b/examples/base/main.go -@@ -10,7 +10,6 @@ import ( - "github.com/pocketbase/pocketbase" - "github.com/pocketbase/pocketbase/apis" - "github.com/pocketbase/pocketbase/core" -- "github.com/pocketbase/pocketbase/plugins/ghupdate" - "github.com/pocketbase/pocketbase/plugins/jsvm" - "github.com/pocketbase/pocketbase/plugins/migratecmd" - ) -@@ -80,9 +79,6 @@ func main() { - Dir: migrationsDir, - }) - -- // GitHub selfupdate -- ghupdate.MustRegister(app, app.RootCmd, nil) -- - app.OnAfterBootstrap().Add(func(e *core.BootstrapEvent) error { - app.Dao().ModelQueryTimeout = time.Duration(queryTimeout) * time.Second - return nil