From 7bb88994c146189d3caac37b049ab518ced4350f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 3 Dec 2023 13:25:34 +0100 Subject: [PATCH 1/6] libfmvoice: init at 0.0.0-unstable-2023-05-21 --- pkgs/by-name/li/libfmvoice/package.nix | 52 ++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/li/libfmvoice/package.nix diff --git a/pkgs/by-name/li/libfmvoice/package.nix b/pkgs/by-name/li/libfmvoice/package.nix new file mode 100644 index 0000000000000..b2f71ac50bdfa --- /dev/null +++ b/pkgs/by-name/li/libfmvoice/package.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libfmvoice"; + version = "0.0.0-unstable-2023-05-21"; + + src = fetchFromGitHub { + owner = "vampirefrog"; + repo = "libfmvoice"; + rev = "d4a2cd0ce0f934e511ef0bebbc060ba6e1b7f21f"; + hash = "sha256-GbwnXmCe/ktl4l/lAdYLg5eu49+hUwbHa61P93CQGh4="; + }; + + strictDeps = true; + + enableParallelBuilding = true; + + buildInputs = [ + zlib + ]; + + buildFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + installPhase = '' + runHook preInstall + + for prog in $(grep 'PROGS=' Makefile | cut -d'=' -f2); do + install -Dm755 $prog $out/bin/$prog + done + + runHook postInstall + ''; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = with lib; { + description = "C library for loading, saving and converting FM sound chip voice files in various formats"; + homepage = "https://github.com/vampirefrog/libfmvoice"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +}) From 0a152135e37830a8d50475951d693a4660fea65a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 3 Dec 2023 13:27:21 +0100 Subject: [PATCH 2/6] vgm2x: init at 0.0.0-unstable-2023-05-10 --- pkgs/by-name/vg/vgm2x/package.nix | 56 +++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/vg/vgm2x/package.nix diff --git a/pkgs/by-name/vg/vgm2x/package.nix b/pkgs/by-name/vg/vgm2x/package.nix new file mode 100644 index 0000000000000..8df1bf12f8d84 --- /dev/null +++ b/pkgs/by-name/vg/vgm2x/package.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, libfmvoice +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vgm2x"; + version = "0.0.0-unstable-2023-05-10"; + + src = fetchFromGitHub { + owner = "vampirefrog"; + repo = "vgm2x"; + rev = "c46c63c84d79aaa274f5259b5d7967181282cc0b"; + hash = "sha256-Y5O82Y1882Dokz6tuEPqbkKvzoZbUiJlj6lFK9GCUuY="; + }; + + postPatch = '' + rmdir libfmvoice + cp --no-preserve=all -r ${libfmvoice.src} libfmvoice + ''; + + strictDeps = true; + + enableParallelBuilding = true; + + buildInputs = [ + zlib + ]; + + buildFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 vgm2opm $out/bin/vgm2opm + + runHook postInstall + ''; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = with lib; { + description = "VGM file extraction tools"; + homepage = "https://github.com/vampirefrog/vgm2x"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +}) From e64a39372f7e455d8ec861a0c9eaeed81835402c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 3 Dec 2023 13:29:58 +0100 Subject: [PATCH 3/6] fmtoy: unstable-2022-12-23 -> 0.0.0-unstable-2023-05-21 --- pkgs/tools/audio/fmtoy/default.nix | 56 ++++++++++++++---------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/pkgs/tools/audio/fmtoy/default.nix b/pkgs/tools/audio/fmtoy/default.nix index 69a0f570d3bc0..a3fe819ae759e 100644 --- a/pkgs/tools/audio/fmtoy/default.nix +++ b/pkgs/tools/audio/fmtoy/default.nix @@ -2,71 +2,69 @@ , lib , fetchFromGitHub , unstableGitUpdater -, dos2unix -, pkg-config -, zlib , alsa-lib +, libfmvoice , libjack2 +, pkg-config +, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fmtoy"; - version = "unstable-2022-12-23"; + version = "0.0.0-unstable-2023-05-21"; src = fetchFromGitHub { owner = "vampirefrog"; repo = "fmtoy"; - rev = "78b61b5e9bc0c6874962dc4040456581c9999b36"; - sha256 = "r5zbr6TCxzDiQvDsLQu/QwNfem1K4Ahaji0yIz/2yl0="; + rev = "2b54180d8edd0de90e2af01bf9ff303bc916e893"; + hash = "sha256-qoMw4P+QEw4Q/wKBvFPh+WxkmOW6qH9FuFFkO2ZRrMc="; }; postPatch = '' - dos2unix Makefile - # Don't hardcode compilers - sed -i -e '/CC=/d' -e '/CXX=/d' Makefile - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Remove Linux-only program & its dependencies - sed -i -e '/PROGS/ s/fmtoy_jack//' Makefile + rmdir libfmvoice + cp --no-preserve=all -r ${libfmvoice.src} libfmvoice + substituteInPlace Makefile \ - --replace '$(shell pkg-config alsa jack --cflags)' "" + --replace 'pkg-config' "$PKG_CONFIG" ''; + strictDeps = true; + nativeBuildInputs = [ - dos2unix - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = [ - zlib - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 + zlib ]; enableParallelBuilding = true; + buildFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + ]; + installPhase = '' runHook preInstall - for prog in $(grep 'PROGS=' Makefile | cut -d= -f2-); do - install -Dm755 $prog $out/bin/$prog - done + install -Dm755 fmtoy_jack $out/bin/fmtoy_jack runHook postInstall ''; - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/vampirefrog/fmtoy.git"; + passthru = { + updateScript = unstableGitUpdater { }; }; meta = with lib; { + description = "FM synthesiser based on emulated Yamaha YM chips (OPL, OPM and OPN series)"; homepage = "https://github.com/vampirefrog/fmtoy"; - description = "Tools for FM voices for Yamaha YM chips (OPL, OPM and OPN series)"; - # Unclear if gpl3Only or gpl3Plus - # https://github.com/vampirefrog/fmtoy/issues/1 - license = licenses.gpl3; + license = licenses.gpl3Only; + mainProgram = "fmtoy_jack"; maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.all; + platforms = platforms.linux; }; -} +}) From a585f9402c16e16019b5e4b872085cdbe24bae41 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 3 Dec 2023 13:31:02 +0100 Subject: [PATCH 4/6] fmtoy: Move to pkgs/by-name --- .../audio/fmtoy/default.nix => by-name/fm/fmtoy/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/audio/fmtoy/default.nix => by-name/fm/fmtoy/package.nix} (100%) diff --git a/pkgs/tools/audio/fmtoy/default.nix b/pkgs/by-name/fm/fmtoy/package.nix similarity index 100% rename from pkgs/tools/audio/fmtoy/default.nix rename to pkgs/by-name/fm/fmtoy/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 274e3bc36e98b..d2de2760992c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31960,8 +31960,6 @@ with pkgs; firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { }; - fmtoy = callPackage ../tools/audio/fmtoy { }; - flac = callPackage ../applications/audio/flac { }; redoflacs = callPackage ../applications/audio/redoflacs { }; From 08038ebd545060a813554d70e1b893412d80cf89 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 2 Aug 2023 16:43:55 +0200 Subject: [PATCH 5/6] vgm2x: 0.0.0-unstable-2023-05-10 -> 0.0.0-unstable-2023-08-27 --- pkgs/by-name/vg/vgm2x/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vg/vgm2x/package.nix b/pkgs/by-name/vg/vgm2x/package.nix index 8df1bf12f8d84..ff2fa28e7be79 100644 --- a/pkgs/by-name/vg/vgm2x/package.nix +++ b/pkgs/by-name/vg/vgm2x/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vgm2x"; - version = "0.0.0-unstable-2023-05-10"; + version = "0.0.0-unstable-2023-08-27"; src = fetchFromGitHub { owner = "vampirefrog"; repo = "vgm2x"; - rev = "c46c63c84d79aaa274f5259b5d7967181282cc0b"; - hash = "sha256-Y5O82Y1882Dokz6tuEPqbkKvzoZbUiJlj6lFK9GCUuY="; + rev = "5128055ab2b356e173b53e2afd31202a59505a39"; + hash = "sha256-DwDcSUdfOsDlajYtzg5xM5P9QPOqLp8b0sEpE18kfzA="; }; postPatch = '' @@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { description = "VGM file extraction tools"; homepage = "https://github.com/vampirefrog/vgm2x"; license = licenses.gpl3Only; + mainProgram = "vgm2opm"; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; }; From 31dfe8bca0479e9df6ae72551a4bf7c7244f8886 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 5 Dec 2023 16:59:46 +0100 Subject: [PATCH 6/6] libfmvoice: 0.0.0-unstable-2023-05-21 -> 0.0.0-unstable-2023-12-05 --- pkgs/by-name/li/libfmvoice/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libfmvoice/package.nix b/pkgs/by-name/li/libfmvoice/package.nix index b2f71ac50bdfa..06284bfd5eafb 100644 --- a/pkgs/by-name/li/libfmvoice/package.nix +++ b/pkgs/by-name/li/libfmvoice/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libfmvoice"; - version = "0.0.0-unstable-2023-05-21"; + version = "0.0.0-unstable-2023-12-05"; src = fetchFromGitHub { owner = "vampirefrog"; repo = "libfmvoice"; - rev = "d4a2cd0ce0f934e511ef0bebbc060ba6e1b7f21f"; - hash = "sha256-GbwnXmCe/ktl4l/lAdYLg5eu49+hUwbHa61P93CQGh4="; + rev = "38b1a0c627ef66fcd9c672c215d2b9849163df12"; + hash = "sha256-kXthY9TynIXNX9wmgn13vs4Mrrv/dmEr7zlWiKstjGk="; }; strictDeps = true;