From ab37e6df31abfa69284d5fc55b1437c40eb8b1d3 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 12 Jan 2025 14:27:52 +0100 Subject: [PATCH 1/2] gale: fix build --- pkgs/by-name/ga/gale/package.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index ad176149074e..8c68047157a2 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -4,6 +4,8 @@ rustPlatform, fetchFromGitHub, + jq, + moreutils, fetchNpmDeps, npmHooks, nodejs, @@ -27,6 +29,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yAfQuLfucz522ln0YNMy8nppp2jk6tGJnP/WhK7JdhI="; }; + postPatch = '' + jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json + ''; + npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; @@ -34,8 +40,12 @@ stdenv.mkDerivation (finalAttrs: { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) pname version src; - sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; + inherit (finalAttrs) + pname + version + src + cargoRoot + ; hash = "sha256-u7UbC9TyEQwYpcVWt8/NsweDNWbQi6NuD9ay9gmMDjg="; }; @@ -44,6 +54,8 @@ stdenv.mkDerivation (finalAttrs: { buildAndTestSubdir = finalAttrs.cargoRoot; nativeBuildInputs = [ + jq + moreutils npmHooks.npmConfigHook nodejs rustPlatform.cargoSetupHook From 79b3a27e4245abb66b7cb4dab1a76ca2a24cde82 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 12 Jan 2025 14:33:31 +0100 Subject: [PATCH 2/2] gale: 1.1.4 -> 1.2.2 --- pkgs/by-name/ga/gale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index 8c68047157a2..e0b98cfb0c8a 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gale"; - version = "1.1.4"; + version = "1.2.2"; src = fetchFromGitHub { owner = "Kesomannen"; repo = "gale"; tag = finalAttrs.version; - hash = "sha256-yAfQuLfucz522ln0YNMy8nppp2jk6tGJnP/WhK7JdhI="; + hash = "sha256-bpeRbsbC1x1AXSyEPs1pUqwMouHQqJ/OtXXlNOVYcEA="; }; postPatch = '' @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { src cargoRoot ; - hash = "sha256-u7UbC9TyEQwYpcVWt8/NsweDNWbQi6NuD9ay9gmMDjg="; + hash = "sha256-xaqNps2AimGWKSwtnfkP3RkLgTNlkaAUtOgDWpB2yEg="; }; cargoRoot = "src-tauri";