Skip to content

Commit 9ae02ff

Browse files
getchoogetchoo
committed
treewide: adopt new cargo-tauri versions
1 parent a6e5c11 commit 9ae02ff

File tree

13 files changed

+24
-62
lines changed

13 files changed

+24
-62
lines changed

‎pkgs/by-name/al/alcom/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
buildDotnetModule,
33
cargo-about,
4-
cargo-tauri,
4+
cargo-tauri_1,
55
dotnetCorePackages,
66
fetchFromGitHub,
77
fetchNpmDeps,
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage {
5959

6060
nativeBuildInputs = [
6161
cargo-about
62-
cargo-tauri.hook
62+
cargo-tauri_1.hook
6363
dotnetSdk
6464
nodejs
6565
npmHooks.npmConfigHook

‎pkgs/by-name/al/alexandria/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
fetchNpmDeps,
1212
gtk3,
1313
wrapGAppsHook3,
14-
cargo-tauri,
14+
cargo-tauri_1,
1515
}:
1616

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

4545
nativeBuildInputs = [
46-
cargo-tauri.hook
46+
cargo-tauri_1.hook
4747
nodejs
4848
npmHooks.npmConfigHook
4949
pkg-config

‎pkgs/by-name/ci/cinny-desktop/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
darwin,
55
fetchFromGitHub,
66
rustPlatform,
7-
cargo-tauri,
7+
cargo-tauri_1,
88
cinny,
99
desktop-file-utils,
1010
wrapGAppsHook3,
@@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec {
7171
nativeBuildInputs = [
7272
wrapGAppsHook3
7373
pkg-config
74-
cargo-tauri.hook
74+
cargo-tauri_1.hook
7575
desktop-file-utils
7676
];
7777

‎pkgs/by-name/en/en-croissant/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
pnpm_9,
88
nodejs,
9-
cargo-tauri,
9+
cargo-tauri_1,
1010
pkg-config,
1111
wrapGAppsHook3,
1212
makeBinaryWrapper,
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
5050
[
5151
pnpm_9.configHook
5252
nodejs
53-
cargo-tauri.hook
53+
cargo-tauri_1.hook
5454
pkg-config
5555
]
5656
++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]

‎pkgs/by-name/ga/gale/package.nix‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,6 @@
1616
webkitgtk_4_1,
1717
}:
1818

19-
let
20-
cargo-tauri_2 =
21-
let
22-
pname = "cargo-tauri";
23-
version = "2.0.0-rc.3";
24-
src = fetchFromGitHub {
25-
owner = "tauri-apps";
26-
repo = "tauri";
27-
rev = "tauri-v${version}";
28-
hash = "sha256-PV8m/MzYgbY4Hv71dZrqVbrxmxrwFfOAraLJIaQk6FQ=";
29-
};
30-
in
31-
cargo-tauri.overrideAttrs {
32-
inherit src version;
33-
cargoDeps = rustPlatform.fetchCargoTarball {
34-
inherit pname version src;
35-
sourceRoot = "${src.name}/tooling/cli";
36-
hash = "sha256-JPlMaoPw6a7D20KQH7iuhHKfGT5oUKf55tMaMYEM/Z4=";
37-
};
38-
};
39-
in
4019
stdenv.mkDerivation (finalAttrs: {
4120
pname = "gale";
4221
version = "0.8.11";
@@ -68,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
6847
npmHooks.npmConfigHook
6948
nodejs
7049
rustPlatform.cargoSetupHook
71-
(cargo-tauri.hook.override { cargo-tauri = cargo-tauri_2; })
50+
cargo-tauri.hook
7251
rustPlatform.cargoCheckHook
7352
pkg-config
7453
wrapGAppsHook3

‎pkgs/by-name/gi/gitbutler/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
fetchFromGitHub,
77
pnpm_9,
88
wrapGAppsHook3,
9-
cargo-tauri,
9+
cargo-tauri_1,
1010
darwin,
1111
desktop-file-utils,
1212
esbuild,
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec {
5555
};
5656

5757
nativeBuildInputs = [
58-
cargo-tauri.hook
58+
cargo-tauri_1.hook
5959
desktop-file-utils
6060
jq
6161
moreutils

‎pkgs/by-name/in/insulator2/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
, stdenv
1515
, yarnConfigHook
1616
, nodejs-slim
17-
, cargo-tauri
17+
, cargo-tauri_1
1818
, cargo
1919
, rustPlatform
2020
, rustc
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
7373
rustPlatform.cargoSetupHook
7474
cargo
7575
rustc
76-
cargo-tauri.hook
76+
cargo-tauri_1.hook
7777
yarnConfigHook
7878
nodejs-slim
7979
cyrus_sasl

‎pkgs/by-name/mo/modrinth-app-unwrapped/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
fetchFromGitHub,
55
rustPlatform,
66
cacert,
7-
cargo-tauri,
7+
cargo-tauri_1,
88
darwin,
99
desktop-file-utils,
1010
libsoup,
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
4545

4646
nativeBuildInputs = [
4747
cacert # required for turbo
48-
cargo-tauri.hook
48+
cargo-tauri_1.hook
4949
desktop-file-utils
5050
nodejs
5151
pkg-config

‎pkgs/by-name/mo/mouse-actions-gui/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
rustPlatform,
1111
cargo,
1212
rustc,
13-
cargo-tauri,
13+
cargo-tauri_1,
1414

1515
pkg-config,
1616
wrapGAppsHook3,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
4040
rustPlatform.cargoSetupHook
4141
cargo
4242
rustc
43-
cargo-tauri.hook
43+
cargo-tauri_1.hook
4444
pkg-config
4545
wrapGAppsHook3
4646
];

‎pkgs/by-name/po/pot/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
wrapGAppsHook3,
99
cargo,
1010
rustc,
11-
cargo-tauri,
11+
cargo-tauri_1,
1212
pkg-config,
1313
esbuild,
1414
buildGoModule,
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
6060
rustPlatform.cargoSetupHook
6161
cargo
6262
rustc
63-
cargo-tauri.hook
63+
cargo-tauri_1.hook
6464
nodejs
6565
pnpm.configHook
6666
wrapGAppsHook3

0 commit comments

Comments
 (0)