Unverified Commit b22d3753 authored by Sefa Eyeoglu's avatar Sefa Eyeoglu Committed by GitHub
Browse files

cargo-tauri: 1.7.1-unstable-2024-08-16 -> 2.1.0 (#346277)

parents 6efe194f 36118d8a
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -311,6 +311,9 @@
- The `mautrix-signal` module was adapted to incorporate the configuration changes that resulted from the update to the mautrix bridgev2 architecture. Pre-0.7.0 configurations should continue to work.
  In case you want to update your configuration, make sure to check the NixOS manual.

- `cargo-tauri` has been updated to major version 2. Please review [the migration guide](https://tauri.app/start/migrate/from-tauri-1/).
  v1 of `cargo-tauri` is still available as `cargo-tauri_1`, but will be removed in future releases.

- The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver.

- `postgresql` no longer accepts the `enableSystemd` override. Use `systemdSupport` instead.
+2 −2
Original line number Diff line number Diff line
{
  buildDotnetModule,
  cargo-about,
  cargo-tauri,
  cargo-tauri_1,
  dotnetCorePackages,
  fetchFromGitHub,
  fetchNpmDeps,
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage {

  nativeBuildInputs = [
    cargo-about
    cargo-tauri.hook
    cargo-tauri_1.hook
    dotnetSdk
    nodejs
    npmHooks.npmConfigHook
+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@
  fetchNpmDeps,
  gtk3,
  wrapGAppsHook3,
  cargo-tauri,
  cargo-tauri_1,
}:

rustPlatform.buildRustPackage rec {
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
  };

  nativeBuildInputs = [
    cargo-tauri.hook
    cargo-tauri_1.hook
    nodejs
    npmHooks.npmConfigHook
    pkg-config
+11659 −0

File added.

Preview size limit exceeded, changes collapsed.

+29 −25
Original line number Diff line number Diff line
@@ -4,55 +4,59 @@
  callPackage,
  rustPlatform,
  fetchFromGitHub,
  darwin,
  gtk3,
  libsoup,
  cargo-tauri,
  gtk4,
  nix-update-script,
  openssl,
  pkg-config,
  webkitgtk_4_0,
  testers,
  webkitgtk_4_1,
}:

rustPlatform.buildRustPackage rec {
  pname = "tauri";
  version = "1.7.1-unstable-2024-08-16";
  version = "2.1.0";

  src = fetchFromGitHub {
    owner = "tauri-apps";
    repo = "tauri";
    rev = "2b61447dfc167ec11724f99671bf9e2de0bf6768";
    hash = "sha256-gKG7olZuTCkW+SKI3FVZqgS6Pp5hFemRJshdma8rpyg=";
    rev = "refs/tags/tauri-v${version}";
    hash = "sha256-n1rSffVef9G9qtLyheuK5k6anAHsZANSu0C73QDdg2o=";
  };

  # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
  # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
  sourceRoot = "${src.name}/tooling/cli";

  cargoHash = "sha256-VXg/dAhwPTSrLwJm8HNzAi/sVF9RqgpHIF3PZe1LjSA=";
  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
      "schemars_derive-0.8.21" = "sha256-AmxBKZXm2Eb+w8/hLQWTol5f22uP8UqaIh+LVLbS20g=";
    };
  };

  nativeBuildInputs = [ pkg-config ];

  buildInputs =
    [ openssl ]
    ++ lib.optionals stdenv.hostPlatform.isLinux [
      gtk3
      libsoup
      webkitgtk_4_0
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin (
      with darwin.apple_sdk.frameworks;
      [
        CoreServices
        Security
        SystemConfiguration
      ]
    );
      gtk4
      webkitgtk_4_1
    ];

  cargoBuildFlags = [ "--package tauri-cli" ];
  cargoTestFlags = cargoBuildFlags;

  passthru = {
    # See ./doc/hooks/tauri.section.md
    hook = callPackage ./hook.nix { };

    tests = {
      setupHooks = callPackage ./test-app.nix { };
      hook = callPackage ./test-app.nix { };
      version = testers.testVersion { package = cargo-tauri; };
    };

    updateScript = nix-update-script {
      extraArgs = [
        "--version-regex"
        "tauri-v(.*)"
      ];
    };
  };

Loading