From 0010d951740bc74e6ab4c2f8a26c87ea9f2dd786 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 20 Sep 2024 21:08:18 +0800 Subject: [PATCH 1/2] boilr: run nixfmt --- pkgs/by-name/bo/boilr/package.nix | 37 +++++++++++++++++-------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix index d7e95b5a8bf9033..0cf3ff119dd3e66 100644 --- a/pkgs/by-name/bo/boilr/package.nix +++ b/pkgs/by-name/bo/boilr/package.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, clangStdenv -, gtk3 -, xorg -, perl -, openssl -, speechd-minimal -, libxkbcommon -, libGL -, wayland +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + clangStdenv, + gtk3, + xorg, + perl, + openssl, + speechd-minimal, + libxkbcommon, + libGL, + wayland, }: let rpathLibs = [ @@ -38,7 +39,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { src = fetchFromGitHub { owner = "PhilipK"; repo = "BoilR"; - rev = "v.${version}"; + rev = "refs/tags/v.${version}"; hash = "sha256-bwCTsoZ/9TeO3wyEcOqxKePnj9glsDXWUBCLd3nVT80="; }; @@ -57,10 +58,12 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { dontPatchELF = true; meta = { - description = - "Automatically adds (almost) all your games to your Steam library (including image art)"; + description = "Automatically adds (almost) all your games to your Steam library (including image art)"; homepage = "https://github.com/PhilipK/BoilR"; - license = with lib.licenses; [ asl20 mit ]; + license = with lib.licenses; [ + asl20 + mit + ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ foolnotion ]; mainProgram = "boilr"; From 5a44a67c873775af1a37ad1edf3d9e9397e65568 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 20 Sep 2024 21:38:09 +0800 Subject: [PATCH 2/2] boilr: fix build --- pkgs/by-name/bo/boilr/0001-update-time.patch | 287 +++++++++++++++++++ pkgs/by-name/bo/boilr/package.nix | 6 +- 2 files changed, 292 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/bo/boilr/0001-update-time.patch diff --git a/pkgs/by-name/bo/boilr/0001-update-time.patch b/pkgs/by-name/bo/boilr/0001-update-time.patch new file mode 100644 index 000000000000000..334d0fe1e9b3c91 --- /dev/null +++ b/pkgs/by-name/bo/boilr/0001-update-time.patch @@ -0,0 +1,287 @@ +From 047681f1425c7cd68b77fdd729ea4664f73126b8 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Mon, 23 Sep 2024 15:11:09 +0800 +Subject: [PATCH] update time + +--- + Cargo.lock | 87 +++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 56 insertions(+), 31 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index be4fbeb..42f29b8 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -265,7 +265,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -282,7 +282,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -467,7 +467,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -809,6 +809,15 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] ++ + [[package]] + name = "derivative" + version = "2.2.0" +@@ -1007,7 +1016,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1259,7 +1268,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2002,6 +2011,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.45" +@@ -2156,7 +2171,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2308,7 +2323,7 @@ dependencies = [ + "pest_meta", + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2339,7 +2354,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2389,6 +2404,12 @@ dependencies = [ + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -2407,9 +2428,9 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.57" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] +@@ -2425,9 +2446,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.27" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -2711,22 +2732,22 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.163" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.163" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2748,7 +2769,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2981,9 +3002,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.16" ++version = "2.0.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -3035,7 +3056,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3061,11 +3082,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.21" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -3073,16 +3097,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.9" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -3153,7 +3178,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3260,7 +3285,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3443,7 +3468,7 @@ dependencies = [ + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + "wasm-bindgen-shared", + ] + +@@ -3477,7 +3502,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +-- +2.46.0 + diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix index 0cf3ff119dd3e66..83a83011c1c9953 100644 --- a/pkgs/by-name/bo/boilr/package.nix +++ b/pkgs/by-name/bo/boilr/package.nix @@ -43,7 +43,11 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { hash = "sha256-bwCTsoZ/9TeO3wyEcOqxKePnj9glsDXWUBCLd3nVT80="; }; - cargoHash = "sha256-nAZU1xVpeRXubotla4I6InGMH4lisPMOnoqaK5mBPCM="; + cargoPatches = [ + ./0001-update-time.patch + ]; + + cargoHash = "sha256-09vPP+kNrmk0nN3Bdn9T7QjvuZvJeqQ56lCQIFb+Zrs="; nativeBuildInputs = [ perl ];