From d81158d9dc2084cd0a0b176a3f52af90b583ddfe Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 13 Nov 2025 23:07:51 +0900 Subject: [PATCH 1/7] ytui-music: fix build --- ...rors-in-ui-mod-rs-for-rust-1-80-plus.patch | 26 +++++++++++++++++++ pkgs/by-name/yt/ytui-music/package.nix | 5 ++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/by-name/yt/ytui-music/fix-implicit-autoref-errors-in-ui-mod-rs-for-rust-1-80-plus.patch diff --git a/pkgs/by-name/yt/ytui-music/fix-implicit-autoref-errors-in-ui-mod-rs-for-rust-1-80-plus.patch b/pkgs/by-name/yt/ytui-music/fix-implicit-autoref-errors-in-ui-mod-rs-for-rust-1-80-plus.patch new file mode 100644 index 000000000000..9959dac09cb1 --- /dev/null +++ b/pkgs/by-name/yt/ytui-music/fix-implicit-autoref-errors-in-ui-mod-rs-for-rust-1-80-plus.patch @@ -0,0 +1,26 @@ +From 474521f42376b8a374382994313484aa4bba9c85 Mon Sep 17 00:00:00 2001 +From: LATex +Date: Sat, 11 Oct 2025 20:34:31 -0300 +Subject: [PATCH] Fix implicit autoref errors in ui/mod.rs for Rust 1.80+ + +--- + front-end/src/ui/mod.rs | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/front-end/src/ui/mod.rs b/front-end/src/ui/mod.rs +index 81a56e001a7b892d24eeb0404d2bc069fe9c07a3..296fd4711db0d9380b74e07ae933df161b437b36 100644 +--- a/front-end/src/ui/mod.rs ++++ b/front-end/src/ui/mod.rs +@@ -215,9 +215,9 @@ pub fn draw_ui(state: &mut Arc>, cvar: &mut Arc) { + let state_ptr = &mut state_unlocked as *mut std::sync::MutexGuard<'_, State<'_>>; + let (mut music_state, mut playlist_state, mut artist_state); + unsafe { +- music_state = &mut (*state_ptr).musicbar.1; +- playlist_state = &mut (*state_ptr).playlistbar.1; +- artist_state = &mut (*state_ptr).artistbar.1; ++ music_state = &mut (&mut (*state_ptr)).musicbar.1; ++ playlist_state = &mut (&mut (*state_ptr)).playlistbar.1; ++ artist_state = &mut (&mut (*state_ptr)).artistbar.1; + } + + let music_table = MiddleLayout::get_music_container(&mut state_unlocked); diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix index b1588d96e2fe..f7487780f2ca 100644 --- a/pkgs/by-name/yt/ytui-music/package.nix +++ b/pkgs/by-name/yt/ytui-music/package.nix @@ -28,6 +28,11 @@ rustPlatform.buildRustPackage rec { "--skip=tests::inspect_server_list" ]; + patches = [ + # This patch comes from https://github.com/sudipghimire533/ytui-music/pull/57, which was unmerged. + ./fix-implicit-autoref-errors-in-ui-mod-rs-for-rust-1-80-plus.patch + ]; + nativeBuildInputs = [ pkg-config makeBinaryWrapper From 3e5768e6ef996e4cbeb6ae40f368bf71c48f352f Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 13 Nov 2025 23:30:56 +0900 Subject: [PATCH 2/7] ytui-music: modernize * Prefer finalAttrs over rec * Remove `with lib;` * Prefer tag over rev in fetchFromGitHub --- pkgs/by-name/yt/ytui-music/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix index f7487780f2ca..9f68b9ff34dd 100644 --- a/pkgs/by-name/yt/ytui-music/package.nix +++ b/pkgs/by-name/yt/ytui-music/package.nix @@ -10,14 +10,14 @@ makeBinaryWrapper, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "ytui-music"; version = "2.0.0-rc1"; src = fetchFromGitHub { owner = "sudipghimire533"; repo = "ytui-music"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-f/23PVk4bpUCvcQ25iNI/UVXqiPBzPKWq6OohVF41p8="; }; @@ -59,11 +59,11 @@ rustPlatform.buildRustPackage rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { description = "Youtube client in terminal for music"; homepage = "https://github.com/sudipghimire533/ytui-music"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ kashw2 ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ kashw2 ]; mainProgram = "ytui_music"; }; -} +}) From a078decbd4b49e1a515e3289b9a5e7e40d375a57 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 14 Nov 2025 00:08:44 +0900 Subject: [PATCH 3/7] ytui-music: 2.0.0-rc1 -> 0-unstable-2025-03-03 Diff: https://github.com/sudipghimire533/ytui-music/compare/d505c018fa4b093dbd76aaadcccec289b071a989...b90293d226f6fc27835372f145e55d385112768b Using the added updateScript --- pkgs/by-name/yt/ytui-music/package.nix | 35 +++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix index 9f68b9ff34dd..990b097b549d 100644 --- a/pkgs/by-name/yt/ytui-music/package.nix +++ b/pkgs/by-name/yt/ytui-music/package.nix @@ -8,20 +8,23 @@ mpv, yt-dlp, makeBinaryWrapper, + _experimental-update-script-combinators, + unstableGitUpdater, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "ytui-music"; - version = "2.0.0-rc1"; + version = "0-unstable-2025-03-03"; src = fetchFromGitHub { owner = "sudipghimire533"; repo = "ytui-music"; - tag = "v${finalAttrs.version}"; - hash = "sha256-f/23PVk4bpUCvcQ25iNI/UVXqiPBzPKWq6OohVF41p8="; + rev = "b90293d226f6fc27835372f145e55d385112768b"; + hash = "sha256-pRD8ySpkJz8o7DURXG8DmBsbZV9MqVlMN63gAjYl4vc="; }; - cargoHash = "sha256-I+ciLSMvV9EqlfA1+/IC1w7pWpj9HHF/DTfAbKw2CVM="; + cargoHash = "sha256-zwlg4BDHCM+KALjP929upaDpgy1mXEz5PYaVw+BhRp0="; checkFlags = [ "--skip=tests::display_config_path" @@ -59,11 +62,35 @@ rustPlatform.buildRustPackage (finalAttrs: { runHook postInstallCheck ''; + passthru = { + updateScript = _experimental-update-script-combinators.sequence [ + (unstableGitUpdater { + # Since a suitable formatted tag isn't available, using branch is a better way. + # ref: https://github.com/NixOS/nixpkgs/issues/258033#issuecomment-1741070349 + hardcodeZeroVersion = true; + + # * "main" branch is newer than "latest" branch + # * "main" branch is newer than "main" tag + # * The "main" tag doesn't seem to be associated with commits on branches like "main" or "latest". + branch = "main"; + }) + (nix-update-script { + # Updating `cargoHash` + extraArgs = [ "--version=skip" ]; + }) + ]; + }; + meta = { description = "Youtube client in terminal for music"; homepage = "https://github.com/sudipghimire533/ytui-music"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ kashw2 ]; mainProgram = "ytui_music"; + + # On Darwin, this package requires sandbox-relaxed to build. + # If the sandbox is enabled, `fetch-cargo-vendor-util` causes errors. + # This issue may be related to: https://github.com/NixOS/nixpkgs/issues/394972 + # broken = stdenv.hostPlatform.isDarwin; }; }) From ab96539e5b00c8781b799bacb1e446e6f301713e Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 14 Nov 2025 20:24:36 +0900 Subject: [PATCH 4/7] ytui-music: restore using SemVer in version format To test the updater behavior, revert version updates temporarily. --- pkgs/by-name/yt/ytui-music/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix index 990b097b549d..0851ee4181c0 100644 --- a/pkgs/by-name/yt/ytui-music/package.nix +++ b/pkgs/by-name/yt/ytui-music/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ytui-music"; - version = "0-unstable-2025-03-03"; + version = "2.0.0-rc1"; src = fetchFromGitHub { owner = "sudipghimire533"; repo = "ytui-music"; - rev = "b90293d226f6fc27835372f145e55d385112768b"; - hash = "sha256-pRD8ySpkJz8o7DURXG8DmBsbZV9MqVlMN63gAjYl4vc="; + rev = "d505c018fa4b093dbd76aaadcccec289b071a989"; + hash = "sha256-f/23PVk4bpUCvcQ25iNI/UVXqiPBzPKWq6OohVF41p8="; }; cargoHash = "sha256-zwlg4BDHCM+KALjP929upaDpgy1mXEz5PYaVw+BhRp0="; @@ -65,9 +65,8 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru = { updateScript = _experimental-update-script-combinators.sequence [ (unstableGitUpdater { - # Since a suitable formatted tag isn't available, using branch is a better way. - # ref: https://github.com/NixOS/nixpkgs/issues/258033#issuecomment-1741070349 - hardcodeZeroVersion = true; + tagFormat = "v[0-9]*"; + tagPrefix = "v"; # * "main" branch is newer than "latest" branch # * "main" branch is newer than "main" tag From db884abf41bb980ed7231b3e43953f47f96ca3db Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 14 Nov 2025 20:28:41 +0900 Subject: [PATCH 5/7] ytui-music: 2.0.0-rc1 -> 2.0.0-rc1-unstable-2025-03-03 Diff: https://github.com/sudipghimire533/ytui-music/compare/d505c018fa4b093dbd76aaadcccec289b071a989...b90293d226f6fc27835372f145e55d385112768b --- pkgs/by-name/yt/ytui-music/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix index 0851ee4181c0..2eddf21feccc 100644 --- a/pkgs/by-name/yt/ytui-music/package.nix +++ b/pkgs/by-name/yt/ytui-music/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ytui-music"; - version = "2.0.0-rc1"; + version = "2.0.0-rc1-unstable-2025-03-03"; src = fetchFromGitHub { owner = "sudipghimire533"; repo = "ytui-music"; - rev = "d505c018fa4b093dbd76aaadcccec289b071a989"; - hash = "sha256-f/23PVk4bpUCvcQ25iNI/UVXqiPBzPKWq6OohVF41p8="; + rev = "b90293d226f6fc27835372f145e55d385112768b"; + hash = "sha256-pRD8ySpkJz8o7DURXG8DmBsbZV9MqVlMN63gAjYl4vc="; }; cargoHash = "sha256-zwlg4BDHCM+KALjP929upaDpgy1mXEz5PYaVw+BhRp0="; From dab6f88dcf757fb3976f8b9dfc3efa70d2f41ff7 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 14 Nov 2025 21:17:59 +0900 Subject: [PATCH 6/7] ytui-music: add an empty commit to re-run the CI From e4e8a84ed1d6380d997791090ea1ea3f260abd3b Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 14 Nov 2025 21:31:56 +0900 Subject: [PATCH 7/7] ytui-music: remove unused finalAttrs We can remove this since a078decbd4b49e1a515e3289b9a5e7e40d375a57 --- pkgs/by-name/yt/ytui-music/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix index 2eddf21feccc..d2c45c10e931 100644 --- a/pkgs/by-name/yt/ytui-music/package.nix +++ b/pkgs/by-name/yt/ytui-music/package.nix @@ -13,7 +13,7 @@ nix-update-script, }: -rustPlatform.buildRustPackage (finalAttrs: { +rustPlatform.buildRustPackage { pname = "ytui-music"; version = "2.0.0-rc1-unstable-2025-03-03"; @@ -92,4 +92,4 @@ rustPlatform.buildRustPackage (finalAttrs: { # This issue may be related to: https://github.com/NixOS/nixpkgs/issues/394972 # broken = stdenv.hostPlatform.isDarwin; }; -}) +}