From 963a5fe26b2650a484bc009230ff5a59d00169be Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 28 Sep 2024 11:09:39 +0800 Subject: [PATCH 1/2] figma-agent: move to by-name; nixfmt --- .../fi/figma-agent/package.nix} | 34 ++++++++----------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 14 insertions(+), 22 deletions(-) rename pkgs/{applications/graphics/figma-agent/default.nix => by-name/fi/figma-agent/package.nix} (62%) diff --git a/pkgs/applications/graphics/figma-agent/default.nix b/pkgs/by-name/fi/figma-agent/package.nix similarity index 62% rename from pkgs/applications/graphics/figma-agent/default.nix rename to pkgs/by-name/fi/figma-agent/package.nix index a6bf008e8295..3af45ee0ff1a 100644 --- a/pkgs/applications/graphics/figma-agent/default.nix +++ b/pkgs/by-name/fi/figma-agent/package.nix @@ -1,23 +1,19 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, pkg-config -, fontconfig -, freetype +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + fontconfig, + freetype, }: -let - inherit (rustPlatform) buildRustPackage bindgenHook; - - version = "0.3.2"; -in -buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "figma-agent"; - inherit version; + version = "0.3.2"; src = fetchFromGitHub { owner = "neetly"; repo = "figma-agent-linux"; - rev = version; + rev = "refs/tags/${version}"; sha256 = "sha256-iXLQOc8gomOik+HIIoviw19II5MD6FM0W5DT3aqtIcM="; }; @@ -25,7 +21,7 @@ buildRustPackage { nativeBuildInputs = [ pkg-config - bindgenHook + rustPlatform.bindgenHook ]; buildInputs = [ @@ -33,13 +29,11 @@ buildRustPackage { freetype ]; - doCheck = true; - - meta = with lib; { + meta = { homepage = "https://github.com/neetly/figma-agent-linux"; description = "Figma Agent for Linux (a.k.a. Font Helper)"; - license = licenses.mit; - maintainers = with maintainers; [ ercao ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ercao ]; mainProgram = "figma-agent"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a83767058ee7..41ba5a295bdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -626,8 +626,6 @@ with pkgs; fh = callPackage ../tools/nix/fh { }; - figma-agent = callPackage ../applications/graphics/figma-agent { }; - firefly-desktop = callPackage ../applications/misc/firefly-desktop { }; frece = callPackage ../development/tools/frece { }; From 4cd1b755652e4a2c6a1be565946d91cf24cd58af Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 28 Sep 2024 11:13:12 +0800 Subject: [PATCH 2/2] figma-agent: fix build --- .../fi/figma-agent/0001-update-time.patch | 59 +++++++++++++++++++ pkgs/by-name/fi/figma-agent/package.nix | 6 +- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/fi/figma-agent/0001-update-time.patch diff --git a/pkgs/by-name/fi/figma-agent/0001-update-time.patch b/pkgs/by-name/fi/figma-agent/0001-update-time.patch new file mode 100644 index 000000000000..b136a02d49eb --- /dev/null +++ b/pkgs/by-name/fi/figma-agent/0001-update-time.patch @@ -0,0 +1,59 @@ +From aaa07b6430c555a8c41f458ccf0eca2213e82317 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Sat, 28 Sep 2024 11:06:40 +0800 +Subject: [PATCH] update time + +--- + Cargo.lock | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 282fe41..8b308d5 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -952,6 +952,12 @@ dependencies = [ + "minimal-lexical", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "object" + version = "0.32.2" +@@ -1313,12 +1319,13 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.31" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", + "powerfmt", + "serde", + "time-core", +@@ -1333,10 +1340,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.16" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +-- +2.46.0 + diff --git a/pkgs/by-name/fi/figma-agent/package.nix b/pkgs/by-name/fi/figma-agent/package.nix index 3af45ee0ff1a..3d01590f725b 100644 --- a/pkgs/by-name/fi/figma-agent/package.nix +++ b/pkgs/by-name/fi/figma-agent/package.nix @@ -17,7 +17,11 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-iXLQOc8gomOik+HIIoviw19II5MD6FM0W5DT3aqtIcM="; }; - cargoHash = "sha256-ulYDKMMtKfBYur34CVhac4uaU0kfdkeBCCP/heuUZek="; + cargoPatches = [ + ./0001-update-time.patch + ]; + + cargoHash = "sha256-4X1sFgvrJuBeEPbcxrAt6tClOG63kwJ6eUzIRIv8tBs="; nativeBuildInputs = [ pkg-config