From 13a5ded55f21a17a54a70f8b8cba740cae5af3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Chocholat=C3=BD?= Date: Tue, 24 Mar 2026 14:05:40 +0100 Subject: [PATCH] atuin-desktop: Fix build by removing no longer necessary patches --- ...ate-dependency-entry-for-tauri-build.patch | 53 ------------------- pkgs/by-name/at/atuin-desktop/package.nix | 16 ++---- 2 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 pkgs/by-name/at/atuin-desktop/0001-fix-Remove-duplicate-dependency-entry-for-tauri-build.patch diff --git a/pkgs/by-name/at/atuin-desktop/0001-fix-Remove-duplicate-dependency-entry-for-tauri-build.patch b/pkgs/by-name/at/atuin-desktop/0001-fix-Remove-duplicate-dependency-entry-for-tauri-build.patch deleted file mode 100644 index 2206de17ef9e..000000000000 --- a/pkgs/by-name/at/atuin-desktop/0001-fix-Remove-duplicate-dependency-entry-for-tauri-build.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7534c427f720ce2134a4fba7b7c3f8cddadf9069 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?David=20Chocholat=C3=BD?= -Date: Sat, 31 Jan 2026 11:04:04 +0100 -Subject: [PATCH] fix: Remove duplicate dependency entry for tauri-build - ---- - Cargo.lock | 23 ----------------------- - 1 file changed, 23 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 80a7920f..92a7bef6 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -590,7 +590,6 @@ dependencies = [ - "sqlx", - "syntect", - "tauri", -- "tauri-build 2.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tauri-plugin-deep-link", - "tauri-plugin-dialog", - "tauri-plugin-fs", -@@ -8932,28 +8931,6 @@ dependencies = [ - "windows 0.61.1", - ] - --[[package]] --name = "tauri-build" --version = "2.5.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "17fcb8819fd16463512a12f531d44826ce566f486d7ccd211c9c8cebdaec4e08" --dependencies = [ -- "anyhow", -- "cargo_toml", -- "dirs 6.0.0", -- "glob", -- "heck 0.5.0", -- "json-patch", -- "schemars", -- "semver", -- "serde", -- "serde_json", -- "tauri-utils", -- "tauri-winres", -- "toml 0.9.8", -- "walkdir", --] -- - [[package]] - name = "tauri-build" - version = "2.5.3" --- -2.51.2 - diff --git a/pkgs/by-name/at/atuin-desktop/package.nix b/pkgs/by-name/at/atuin-desktop/package.nix index 411a27bbd67f..254e156b8884 100644 --- a/pkgs/by-name/at/atuin-desktop/package.nix +++ b/pkgs/by-name/at/atuin-desktop/package.nix @@ -31,20 +31,10 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoRoot = "./."; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) - # TMP: Include patches from root to ensure Cargo.lock consistency between root and deps. - patches - src - ; - hash = "sha256-eOFMUxXPQrhBthuQLgBsixe1vsniGUnoHb2EOhZQ/iY="; + inherit (finalAttrs) src; + hash = "sha256-68yQkgIVpqUo5tOcvxKh6NOkW565V94zHIZeI4q7nNA="; }; - patches = [ - # TMP: Until a duplicate entry for `tauri-build` dependency in `Cargo.lock` is resolved - # (https://github.com/atuinsh/desktop/issues/364), remove one of the duplicated entries. - ./0001-fix-Remove-duplicate-dependency-entry-for-tauri-build.patch - ]; - node_modules = stdenv.mkDerivation { inherit (finalAttrs) src version; pname = "${finalAttrs.pname}-node_modules"; @@ -139,7 +129,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cp -R ${finalAttrs.node_modules} node_modules/ - # Bun takes executables from this folder + # Bun takes executables from this folder. chmod -R u+rw node_modules chmod -R u+x node_modules/.bin