From 5ce9c57e1a23ae50aed8f33265a9c09b3ffc2a81 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 15 May 2023 10:12:32 +0200 Subject: [PATCH 1/2] muso: avoid build failure using an updated lockfile Signed-off-by: Sefa Eyeoglu --- pkgs/applications/audio/muso/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index 29a97b94dcac..b4d5fb12636b 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -4,13 +4,13 @@ rustPlatform.buildRustPackage rec { pname = "muso"; - version = "2.0.0"; + version = "unstable-2021-09-02"; src = fetchFromGitHub { owner = "quebin31"; repo = pname; - rev = "68cc90869bcc0f202830a318fbfd6bb9bdb75a39"; - sha256 = "1dnfslliss173igympl7h1zc0qz0g10kf96dwrcj6aglmvvw426p"; + rev = "6dd1c6d3a82b21d4fb2606accf2f26179eb6eaf9"; + hash = "sha256-09DWUER0ZWQuwfE3sjov2GjJNI7coE3D3E5iUy9mlSE="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { cp share/* $out/share/muso/ ''; - cargoSha256 = "1hgdzyz005244f2mh97js9ga0a6s2hcd6iydz07f1hmhsh1j2bwy"; + cargoHash = "sha256-+UVUejKCfjC6zdW315wmu7f3A5GmnoQ3rIk8SK6LIRI="; meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; From f3587b78c38ba82d8818bb9ed3e3e7bab1502c40 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 15 May 2023 11:07:38 +0200 Subject: [PATCH 2/2] muso: don't mark as broken on aarch64-linux Signed-off-by: Sefa Eyeoglu --- pkgs/applications/audio/muso/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index b4d5fb12636b..95c45216ef2e 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+UVUejKCfjC6zdW315wmu7f3A5GmnoQ3rIk8SK6LIRI="; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; description = "An automatic music sorter (based on ID3 tags)"; homepage = "https://github.com/quebin31/muso"; license = with licenses; [ gpl3Plus ];