From 0f4252aa0aedd008ebb0845280eaf07e913f85e7 Mon Sep 17 00:00:00 2001 From: OTABI Tomoya Date: Fri, 5 May 2023 01:35:39 +0900 Subject: [PATCH] tone: fix build, update description, restrict the platform to "x86_64-linux" (#229434) --- pkgs/applications/audio/tone/default.nix | 13 ++++--------- pkgs/applications/audio/tone/nuget-deps.nix | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/tone/default.nix b/pkgs/applications/audio/tone/default.nix index c235fff4b72..230d78ddbfe 100644 --- a/pkgs/applications/audio/tone/default.nix +++ b/pkgs/applications/audio/tone/default.nix @@ -1,11 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, fetchNuGet, linkFarmFromDrvs, buildDotnetModule, ffmpeg-full, msbuild, dotnetCorePackages }: +{ lib, fetchFromGitHub, buildDotnetModule, ffmpeg-full, dotnetCorePackages }: -let - nugetSource = linkFarmFromDrvs "nuget-packages" ( - import ./nuget-deps.nix { inherit fetchNuGet; } - ); - -in buildDotnetModule rec { +buildDotnetModule rec { pname = "tone"; version = "0.1.5"; @@ -31,9 +26,9 @@ in buildDotnetModule rec { meta = with lib; { homepage = "https://github.com/sandreas/tone"; - description = "tone is a cross platform utility to dump and modify audio metadata for a wide variety of formats"; + description = "A cross platform utility to dump and modify audio metadata for a wide variety of formats"; license = licenses.asl20; maintainers = [ maintainers.jvanbruegge ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/tone/nuget-deps.nix b/pkgs/applications/audio/tone/nuget-deps.nix index 4b372fe5124..3093809f2bd 100644 --- a/pkgs/applications/audio/tone/nuget-deps.nix +++ b/pkgs/applications/audio/tone/nuget-deps.nix @@ -28,7 +28,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "7.0.0"; sha256 = "1liyprh0zha2vgmqh92n8kkjz61zwhr7g16f0gmr297z2rg1j5pj"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.15"; sha256 = "0lcz7dniv3arkdzlmjgr9168rjb0an9xf3v3m3pdwjmy8yaipfba"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.16"; sha256 = "0rn46d2lrdyv8cjl2xxjj8zgahv1x4mz4z56vvw6zqfa10g5cnjh"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) (fetchNuGet { pname = "Sandreas.AudioMetadata"; version = "0.1.1"; sha256 = "11ibv23h7qj5qshibmlsqmjca51dqbhib9p1gz66c5kqhk7ci38j"; }) (fetchNuGet { pname = "Sandreas.Files"; version = "1.1.2"; sha256 = "08qk229q2y1dpdxdnp8xi9mgk8fgpjxrxm4z6ak8n09npp67nhn0"; })