gale: 1.7.1 -> 1.8.6, switch to pnpm, add updateScript (#424855)
This commit is contained in:
		
						commit
						03e72fc2f4
					
				@ -18311,6 +18311,13 @@
 | 
				
			|||||||
    githubId = 1254858;
 | 
					    githubId = 1254858;
 | 
				
			||||||
    keys = [ { fingerprint = "BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103"; } ];
 | 
					    keys = [ { fingerprint = "BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103"; } ];
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					  notohh = {
 | 
				
			||||||
 | 
					    email = "contact@notohh.dev";
 | 
				
			||||||
 | 
					    github = "notohh";
 | 
				
			||||||
 | 
					    githubId = 31116143;
 | 
				
			||||||
 | 
					    name = "notohh";
 | 
				
			||||||
 | 
					    keys = [ { fingerprint = "C3CB 3B31 AF3F 986C 39E0  BE5B BD47 506D 475E E86D"; } ];
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
  notthebee = {
 | 
					  notthebee = {
 | 
				
			||||||
    email = "moe@notthebe.ee";
 | 
					    email = "moe@notthebe.ee";
 | 
				
			||||||
    github = "notthebee";
 | 
					    github = "notthebee";
 | 
				
			||||||
 | 
				
			|||||||
@ -2,11 +2,11 @@
 | 
				
			|||||||
  lib,
 | 
					  lib,
 | 
				
			||||||
  rustPlatform,
 | 
					  rustPlatform,
 | 
				
			||||||
  fetchFromGitHub,
 | 
					  fetchFromGitHub,
 | 
				
			||||||
 | 
					  nix-update-script,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  jq,
 | 
					  jq,
 | 
				
			||||||
  moreutils,
 | 
					  moreutils,
 | 
				
			||||||
  fetchNpmDeps,
 | 
					  pnpm_10,
 | 
				
			||||||
  npmHooks,
 | 
					 | 
				
			||||||
  nodejs,
 | 
					  nodejs,
 | 
				
			||||||
  cargo-tauri,
 | 
					  cargo-tauri,
 | 
				
			||||||
  pkg-config,
 | 
					  pkg-config,
 | 
				
			||||||
@ -20,34 +20,33 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
rustPlatform.buildRustPackage (finalAttrs: {
 | 
					rustPlatform.buildRustPackage (finalAttrs: {
 | 
				
			||||||
  pname = "gale";
 | 
					  pname = "gale";
 | 
				
			||||||
  version = "1.7.1";
 | 
					  version = "1.8.6";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  src = fetchFromGitHub {
 | 
					  src = fetchFromGitHub {
 | 
				
			||||||
    owner = "Kesomannen";
 | 
					    owner = "Kesomannen";
 | 
				
			||||||
    repo = "gale";
 | 
					    repo = "gale";
 | 
				
			||||||
    tag = finalAttrs.version;
 | 
					    tag = finalAttrs.version;
 | 
				
			||||||
    hash = "sha256-OaUpyG+XdP7AIA55enPf6/viBGBBQVuNi2QxgD5EVNc=";
 | 
					    hash = "sha256-5xUBW9Owyeet8Jyc+7TQr6XQTbkopbJLeyI5c35iqr0=";
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  postPatch = ''
 | 
					  postPatch = ''
 | 
				
			||||||
    jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
 | 
					    jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
 | 
				
			||||||
  '';
 | 
					  '';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  npmDeps = fetchNpmDeps {
 | 
					  pnpmDeps = pnpm_10.fetchDeps {
 | 
				
			||||||
    name = "gale-${finalAttrs.version}-npm-deps";
 | 
					    inherit (finalAttrs) pname version src;
 | 
				
			||||||
    inherit (finalAttrs) src;
 | 
					    hash = "sha256-QQXP/x7AjDtUpe6h+pC6vUsIAptv1kN/1MJZjHAIdMo=";
 | 
				
			||||||
    hash = "sha256-yaPUNtlb2vMwK42u+3/rViGx6YzhYxRDJylPu++tbNs=";
 | 
					 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  cargoRoot = "src-tauri";
 | 
					  cargoRoot = "src-tauri";
 | 
				
			||||||
  buildAndTestSubdir = finalAttrs.cargoRoot;
 | 
					  buildAndTestSubdir = finalAttrs.cargoRoot;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  cargoHash = "sha256-v0/A4jUq5t61KB7NLwvsl6wR7N0UUbdVCk7nFZVTOi8=";
 | 
					  cargoHash = "sha256-6yWRl9WAPJoqoXm0kLfZhEf7AYD6J//FlOmDxzeknFo=";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  nativeBuildInputs = [
 | 
					  nativeBuildInputs = [
 | 
				
			||||||
    jq
 | 
					    jq
 | 
				
			||||||
    moreutils
 | 
					    moreutils
 | 
				
			||||||
    npmHooks.npmConfigHook
 | 
					    pnpm_10.configHook
 | 
				
			||||||
    nodejs
 | 
					    nodejs
 | 
				
			||||||
    cargo-tauri.hook
 | 
					    cargo-tauri.hook
 | 
				
			||||||
    pkg-config
 | 
					    pkg-config
 | 
				
			||||||
@ -61,12 +60,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
 | 
				
			|||||||
    webkitgtk_4_1
 | 
					    webkitgtk_4_1
 | 
				
			||||||
  ];
 | 
					  ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  passthru.updateScript = nix-update-script { };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  meta = {
 | 
					  meta = {
 | 
				
			||||||
    description = "Lightweight Thunderstore client";
 | 
					    description = "Lightweight Thunderstore client";
 | 
				
			||||||
    homepage = "https://github.com/Kesomannen/gale";
 | 
					    homepage = "https://github.com/Kesomannen/gale";
 | 
				
			||||||
    license = lib.licenses.gpl3Only;
 | 
					    license = lib.licenses.gpl3Only;
 | 
				
			||||||
    mainProgram = "gale";
 | 
					    mainProgram = "gale";
 | 
				
			||||||
    maintainers = with lib.maintainers; [ tomasajt ];
 | 
					    maintainers = with lib.maintainers; [
 | 
				
			||||||
 | 
					      tomasajt
 | 
				
			||||||
 | 
					      notohh
 | 
				
			||||||
 | 
					    ];
 | 
				
			||||||
    platforms = lib.platforms.linux;
 | 
					    platforms = lib.platforms.linux;
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
})
 | 
					})
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user