From 8a4c3732163f847455b3e6940f24cabe361829e4 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 10 Oct 2022 18:19:42 +0300 Subject: [PATCH 1/4] Revert "parlatype: remove" This reverts commit 3d957ef33b5603d025935b4950a423ddc5054f40. --- pkgs/applications/audio/parlatype/default.nix | 66 +++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 + 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/parlatype/default.nix diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix new file mode 100644 index 000000000000..c1bb1102bf1b --- /dev/null +++ b/pkgs/applications/audio/parlatype/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "parlatype"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "gkarsay"; + repo = pname; + rev = "v${version}"; + sha256 = "1k53q0kbwpnbgyr0lmfzf5sm4f93d8nbjrzdz9pdhzpxgihndg25"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + appstream-glib + python3 + gobject-introspection + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + at-spi2-core + dbus + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav + sphinxbase + pocketsphinx + glib + gsettings-desktop-schemas + hicolor-icon-theme + ]; + + postPatch = '' + chmod +x data/meson_post_install.py + patchShebangs data/meson_post_install.py + ''; + + doCheck = false; + + buildPhase = '' + export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + + meta = with lib; { + description = "GNOME audio player for transcription"; + longDescription = '' + Parlatype is a minimal audio player for manual speech transcription, written for the GNOME desktop environment. + It plays audio sources to transcribe them in your favourite text application. + It’s intended to be useful for journalists, students, scientists and whoever needs to transcribe audio files. + ''; + homepage = "https://gkarsay.github.io/parlatype/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.melchips ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 47c6302adac5..4bc8a92cbf39 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1023,7 +1023,6 @@ mapAliases ({ paperless-ng = paperless-ngx; # Added 2022-04-11 parity = openethereum; # Added 2020-08-01 parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 - parlatype = throw "parlatype has been removed: unmaintained"; # Added 2022-04-24 parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22 patchmatrix = throw "'patchmatrix' has been renamed to/replaced by 'open-music-kontrollers.patchmatrix'"; # Added 2022-03-09 pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c308e39f19e4..c6131e90d5ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30019,6 +30019,8 @@ with pkgs; paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; + parlatype = callPackage ../applications/audio/parlatype { }; + packet = callPackage ../development/tools/packet { }; packet-sd = callPackage ../development/tools/packet-sd { }; From 81738843e9511ef7609a46496ea8b07cacde1107 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 10 Oct 2022 18:22:58 +0300 Subject: [PATCH 2/4] parlatype: disable pocketsphinx integration --- pkgs/applications/audio/parlatype/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index c1bb1102bf1b..ca18acd048cd 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav - sphinxbase - pocketsphinx glib gsettings-desktop-schemas hicolor-icon-theme @@ -47,6 +45,8 @@ stdenv.mkDerivation rec { doCheck = false; + mesonFlags = [ "-Dasr=false" ]; + buildPhase = '' export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" ''; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gkarsay.github.io/parlatype/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.melchips ]; + maintainers = with maintainers; [ alexshpilkin melchips ]; platforms = platforms.linux; }; } From 0aa7db6030704cfef15de8e3fd90bfe26b01793c Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 10 Oct 2022 18:23:19 +0300 Subject: [PATCH 3/4] parlatype: 2.1 -> 3.1 --- pkgs/applications/audio/parlatype/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index ca18acd048cd..71cfe338c62b 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, meson, gtk3, dbus, gst_all_1, ninja, gettext, appstream-glib, python3, desktop-file-utils, glib, gobject-introspection, gsettings-desktop-schemas, isocodes, itstool, libxml2, wrapGAppsHook, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "parlatype"; - version = "2.1"; + version = "3.1"; src = fetchFromGitHub { owner = "gkarsay"; repo = pname; rev = "v${version}"; - sha256 = "1k53q0kbwpnbgyr0lmfzf5sm4f93d8nbjrzdz9pdhzpxgihndg25"; + sha256 = "1a4xlsbszb50vnz1g7kf7hl7aywp7s7xaravkcx13csn0a7l3x45"; }; nativeBuildInputs = [ @@ -18,14 +18,15 @@ stdenv.mkDerivation rec { gettext appstream-glib python3 + desktop-file-utils gobject-introspection itstool + libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 - at-spi2-core dbus gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -36,21 +37,16 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas hicolor-icon-theme + isocodes ]; postPatch = '' - chmod +x data/meson_post_install.py patchShebangs data/meson_post_install.py + patchShebangs libparlatype/tests/data/generate_config_data ''; doCheck = false; - mesonFlags = [ "-Dasr=false" ]; - - buildPhase = '' - export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - meta = with lib; { description = "GNOME audio player for transcription"; longDescription = '' @@ -58,7 +54,7 @@ stdenv.mkDerivation rec { It plays audio sources to transcribe them in your favourite text application. It’s intended to be useful for journalists, students, scientists and whoever needs to transcribe audio files. ''; - homepage = "https://gkarsay.github.io/parlatype/"; + homepage = "https://www.parlatype.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ alexshpilkin melchips ]; platforms = platforms.linux; From 16ead09b5e3ab9b1c7a5dc43bb6ad497ccba8f4d Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 12 Oct 2022 14:41:20 +0300 Subject: [PATCH 4/4] parlatype: sort dependencies and reformat --- pkgs/applications/audio/parlatype/default.nix | 61 +++++++++++++------ 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index 71cfe338c62b..6aa92a3a99fa 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -1,41 +1,62 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, meson, gtk3, dbus, gst_all_1, ninja, gettext, appstream-glib, python3, desktop-file-utils, glib, gobject-introspection, gsettings-desktop-schemas, isocodes, itstool, libxml2, wrapGAppsHook, hicolor-icon-theme }: +{ lib +, stdenv +, fetchFromGitHub +, appstream-glib +, dbus +, desktop-file-utils +, gettext +, glib +, gobject-introspection +, gsettings-desktop-schemas +, gst_all_1 +, gtk3 +, hicolor-icon-theme +, isocodes +, itstool +, libxml2 +, meson +, ninja +, pkg-config +, python3 +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "parlatype"; version = "3.1"; src = fetchFromGitHub { - owner = "gkarsay"; - repo = pname; - rev = "v${version}"; + owner = "gkarsay"; + repo = pname; + rev = "v${version}"; sha256 = "1a4xlsbszb50vnz1g7kf7hl7aywp7s7xaravkcx13csn0a7l3x45"; }; nativeBuildInputs = [ - pkg-config - meson - ninja - gettext appstream-glib - python3 desktop-file-utils + gettext gobject-introspection itstool libxml2 + meson + ninja + pkg-config + python3 wrapGAppsHook ]; buildInputs = [ - gtk3 dbus - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav glib gsettings-desktop-schemas + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + gst_all_1.gstreamer + gtk3 hicolor-icon-theme isocodes ]; @@ -50,9 +71,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNOME audio player for transcription"; longDescription = '' - Parlatype is a minimal audio player for manual speech transcription, written for the GNOME desktop environment. - It plays audio sources to transcribe them in your favourite text application. - It’s intended to be useful for journalists, students, scientists and whoever needs to transcribe audio files. + Parlatype is a minimal audio player for manual speech transcription, + written for the GNOME desktop environment. It plays audio sources to + transcribe them in your favourite text application. It’s intended to be + useful for journalists, students, scientists and whoever needs to + transcribe audio files. ''; homepage = "https://www.parlatype.org/"; license = licenses.gpl3Plus;