From c0212b5665b3da8a22dfdbbd71cf98eccf46c970 Mon Sep 17 00:00:00 2001 From: Peter Frank Date: Sun, 12 Jan 2025 20:36:04 +0100 Subject: [PATCH] surrealist 3.0.8 -> 3.1.9 --- pkgs/by-name/su/surrealist/package.nix | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index e13a41c1bca1f..8f0cc06876ec5 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -1,16 +1,18 @@ { buildGoModule, cairo, - cargo, cargo-tauri, + cargo, esbuild, fetchFromGitHub, gdk-pixbuf, glib-networking, gobject-introspection, + jq, lib, libsoup_3, makeBinaryWrapper, + moreutils, nodejs, openssl, pango, @@ -48,13 +50,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "surrealist"; - version = "3.0.8"; + version = "3.1.9"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealist"; rev = "surrealist-v${finalAttrs.version}"; - hash = "sha256-46CXldjhWc7H6wdKfMK2IlmBqfe0QHi/J1uFhbV42HY="; + hash = "sha256-p+Tyu65A+vykqafu1RCRKYFXb435Uyu9WxUoEqjI8d8="; }; # HACK: A dependency (surrealist -> tauri -> **reqwest**) contains hyper-tls @@ -70,23 +72,25 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) patches src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-HmdEcjgxPyRsQqhU0P/C3KVgwZsSvfHjyzj0OHKe5jY"; + hash = "sha256-8rw3x17f5pLLyvxozFPWq9pJNHy4wXwV9CcaUGAbdd0="; patchFlags = [ "-p2" ]; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-uBDbBfWC9HxxzY1x4+rNo87D5C1zZa2beFLa5NkLs80="; + hash = "sha256-JwOY6Z8UjbrodSQ3csnT+puftbQUDF3NIK7o6rSpl2o="; }; nativeBuildInputs = [ cargo cargo-tauri.hook gobject-introspection + jq makeBinaryWrapper + moreutils nodejs - pnpm.configHook pkg-config + pnpm.configHook rustc rustPlatform.cargoSetupHook ]; @@ -108,6 +112,15 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; + # Deactivate the upstream update mechanism + postPatch = '' + jq ' + .bundle.createUpdaterArtifacts = false | + .plugins.updater = {"active": false, "pubkey": "", "endpoints": []} + ' \ + src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json + ''; + postFixup = '' wrapProgram "$out/bin/surrealist" \ --set GIO_EXTRA_MODULES ${glib-networking}/lib/gio/modules \