From 2f516fbf27d3670da84a31ba2278b3a7ac014174 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 6 Oct 2022 21:03:43 +0100 Subject: [PATCH 01/14] strongswan: add patch for CVE-2022-40617 --- pkgs/tools/networking/strongswan/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 560457bdaa5d..a148db0ddaf6 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -8,6 +8,7 @@ , enableNetworkManager ? false, networkmanager , darwin , nixosTests +, fetchpatch }: # Note on curl support: If curl is built with gnutls as its backend, the @@ -41,6 +42,11 @@ stdenv.mkDerivation rec { ./ext_auth-path.patch ./firewall_defaults.patch ./updown-path.patch + (fetchpatch { + name = "CVE-2022-40617.patch"; + url = "https://download.strongswan.org/security/CVE-2022-40617/strongswan-5.1.0-5.9.7_cert_online_validate.patch"; + sha256 = "sha256-xjKK1vsHmBLAnyXF5FTdb0LE6wPzSovLWcaApuox92s="; + }) ]; postPatch = optionalString stdenv.isLinux '' From 14a91dbdefc79d663f7f638723bd8b4abd1fb7f0 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 3 Jun 2022 16:14:21 +0200 Subject: [PATCH 02/14] cosign: 1.8.0 -> 1.9.0 Release notes: https://github.com/sigstore/cosign/releases/tag/v1.9.0 (cherry picked from commit 85ac5d8c9b6e61e847b246c87aaeb683ea07a4b0) --- pkgs/tools/security/cosign/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index b4d33a172916..99f8c728935b 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9zA50tnUWR8dglPvMagiGcJDkPHs7yXuqYV2jnRdWqA="; + sha256 = "sha256-l+jM0GCjaqbaoIcjUgnIZJqSGIsirWMwJWPrilBdps8="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,7 +16,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-buOdutDZUFu+GbjyF0Ql8QAXpNEv2ej0mwjSZMHDmdA="; + vendorSha256 = "sha256-mZeCQOnAVZrJmi9F+y7QPPXXl48f7HAjJCmri01hYew="; subPackages = [ "cmd/cosign" From ccc96b2e891786489c9c837a0c90ea330023e98b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 23 Jul 2022 14:31:51 +0200 Subject: [PATCH 03/14] cosign: 1.9.0 -> 1.10.0 `cosigned` is no more part of the cosign repository and it has been moved into a `sigstore/policy-controller` repository. A new package should probably be created to replace it. https://github.com/sigstore/cosign/releases/tag/v1.10.0 (cherry picked from commit 595932cd2b3916a2937de1e5fe7a482b5397f797) --- pkgs/tools/security/cosign/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 99f8c728935b..4fe0fba4f65d 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-l+jM0GCjaqbaoIcjUgnIZJqSGIsirWMwJWPrilBdps8="; + sha256 = "sha256-EJ1NOaGLLBkEkWLWn8wfyFA6Kgsb9mctkw4G2um9cWE="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,11 +16,10 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-mZeCQOnAVZrJmi9F+y7QPPXXl48f7HAjJCmri01hYew="; + vendorSha256 = "sha256-JL7bqdLrNwOQPVUhlIktRM1cAPycq0PVpB1xXXiJiKM="; subPackages = [ "cmd/cosign" - "cmd/cosign/webhook" "cmd/sget" ]; @@ -33,19 +32,12 @@ buildGoModule rec { "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" ]; - postBuild = '' - # cmd/cosign/webhook should be called cosigned - mv $GOPATH/bin/{webhook,cosigned} - ''; - preCheck = '' # test all paths unset subPackages - rm cmd/cosign/cli/fulcio/fulcioroots/fulcioroots_test.go # Require network access - rm pkg/cosign/kubernetes/webhook/validator_test.go # Require network access rm pkg/cosign/tlog_test.go # Require network access - rm pkg/cosign/tuf/client_test.go # Require network access + rm pkg/cosign/verify_test.go # Require network access ''; postInstall = '' From 643240adc4c02fa3a34db15fad2d854fbe7f5c60 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 5 Aug 2022 09:01:25 +0200 Subject: [PATCH 04/14] cosign: 1.10.0 -> 1.10.1 https://github.com/sigstore/cosign/releases/tag/v1.10.1 Includes a fix for CVE-2022-35929 https://github.com/sigstore/cosign/security/advisories/GHSA-vjxv-45g9-9296 (cherry picked from commit 958dd9a8c7c335f7063bb0f73d02e6adb719683f) --- pkgs/tools/security/cosign/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 4fe0fba4f65d..c698fa4fa9e9 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EJ1NOaGLLBkEkWLWn8wfyFA6Kgsb9mctkw4G2um9cWE="; + sha256 = "sha256-DMNjzTor22uyTzieWsni9wvscfU7uCFuf3AXOYP4LRo="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,7 +16,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-JL7bqdLrNwOQPVUhlIktRM1cAPycq0PVpB1xXXiJiKM="; + vendorSha256 = "sha256-onRfo3ZK/+uEa0xR7P9IlEsd2aXy9foJjZl0UBO/cbs="; subPackages = [ "cmd/cosign" From 6e62007038ca099a7751dca3e6e86cbcff81f55d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Aug 2022 20:37:19 +0000 Subject: [PATCH 05/14] cosign: 1.10.1 -> 1.11.0 (cherry picked from commit c7f4385e84c77917cbdd55c333996213ec452af8) --- pkgs/tools/security/cosign/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index c698fa4fa9e9..9679ebb53c40 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DMNjzTor22uyTzieWsni9wvscfU7uCFuf3AXOYP4LRo="; + sha256 = "sha256-fEgcxxDbSr8rVZ35MwLjT7tinQ1JuqddWRtftTjDdpY="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,7 +16,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-onRfo3ZK/+uEa0xR7P9IlEsd2aXy9foJjZl0UBO/cbs="; + vendorSha256 = "sha256-AdsXijxqpsx2Mh0xAvUoie6Oy3ywnGJ1WMg9ZBLWHgc="; subPackages = [ "cmd/cosign" From 8b3ce5a49b56fd480d186d56351836899a40711b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 26 Aug 2022 08:47:06 +0200 Subject: [PATCH 06/14] cosign: 1.11.0 -> 1.11.1 https://github.com/sigstore/cosign/releases/tag/v1.11.1 (cherry picked from commit f9cd86edd563bbef6b8f84c9e57c61b041382518) --- pkgs/tools/security/cosign/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 9679ebb53c40..058db50eeba9 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fEgcxxDbSr8rVZ35MwLjT7tinQ1JuqddWRtftTjDdpY="; + sha256 = "sha256-LKnv/+6R/RaVdRYYdp+EqVQZtUn8SnYLCr5rqgGrq68="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,7 +16,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-AdsXijxqpsx2Mh0xAvUoie6Oy3ywnGJ1WMg9ZBLWHgc="; + vendorSha256 = "sha256-ao1WI8M3T/oSxYM0OrW1L3/JQf9S2C7AzE4HA6VIx5w="; subPackages = [ "cmd/cosign" From 5e728491b9b34809109e8d42d176de94f36957e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 08:00:04 +0000 Subject: [PATCH 07/14] cosign: 1.11.1 -> 1.12.0 (cherry picked from commit f5357321bace1f2b8f47868414f9ff420cbef8c3) --- pkgs/tools/security/cosign/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 058db50eeba9..a417a35c5a61 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LKnv/+6R/RaVdRYYdp+EqVQZtUn8SnYLCr5rqgGrq68="; + sha256 = "sha256-TfPxLSUVs/b9krexTa1wzBkaUAL8xggfpJOlxdHLzjA="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,7 +16,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-ao1WI8M3T/oSxYM0OrW1L3/JQf9S2C7AzE4HA6VIx5w="; + vendorSha256 = "sha256-gL5VCFcKz+hrwJ+KZifgBtgrgpKcBbvE4mFAg0LnOgc="; subPackages = [ "cmd/cosign" From fde3553bff2d77d012ae9c0c770e85e83d9bf71b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 19 Sep 2022 09:30:40 +0200 Subject: [PATCH 08/14] cosign: build with Go 1.18 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 871d739c0841..b1acc7e17bff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2097,6 +2097,7 @@ with pkgs; corsair = with python3Packages; toPythonApplication corsair-scan; cosign = callPackage ../tools/security/cosign { + buildGoModule = buildGo118Module; inherit (darwin.apple_sdk.frameworks) PCSC; }; From 3c8c4ca82acc7d2b4c4e1d214b88294f33a630f0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 10 Oct 2022 21:54:00 +0200 Subject: [PATCH 09/14] chromium: 106.0.5249.91 -> 106.0.5249.103 https://chromereleases.googleblog.com/2022/10/stable-channel-update-for-desktop.html (cherry picked from commit 420363e3ce35ad5c1ae19e3d46e88f3265ed840b) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index ed11ac6f1c01..0e4ad042288e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "106.0.5249.91", - "sha256": "16jlwzlfqdhhyajsxxrdfcqmh76ds8g1w4xd5mz3bdbd81mljh2p", - "sha256bin64": "1cfhsar79f319417cx4blcg5hk7b7ix45r7vhrbbwla18p0jij5y", + "version": "106.0.5249.103", + "sha256": "0k2f3hc6mdmwzw9zzwcv6pnpibdz47a3xxkhfcvdki5gbag6cpr2", + "sha256bin64": "0bg6d9fv3ha7iql17nj8h22klbs3ls2nlvabczhh067mh3fpzf5x", "deps": { "gn": { "version": "2022-08-11", From 9ee9dc18cd5180aa93f0cbb15b831bb9979a6bc2 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Sun, 2 Oct 2022 22:57:30 -0700 Subject: [PATCH 10/14] zoom-us: 5.11.{9.10046,10.4400} -> 5.12.0.{11129,4682} (cherry picked from commit a4d7d4b0007079f78238d574725c4b6067c87a45) --- .../instant-messengers/zoom-us/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 7b5c737d7c67..cb5cd4240bf6 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -47,23 +47,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.11.9.10046"; - versions.x86_64-darwin = "5.11.9.10046"; - versions.x86_64-linux = "5.11.10.4400"; + versions.aarch64-darwin = "5.12.0.11129"; + versions.x86_64-darwin = "5.12.0.11129"; + versions.x86_64-linux = "5.12.0.4682"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-Z+K811azMRnhptZ1UvM+o5IgE0F4p9BrntJC9IgPU7U="; + hash = "sha256-0XhqJrls4X8wO9VNmmmUGexJkA9NDkwJkYRjmyV1kAU="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-7U7qT3xlm5LqcJByMWxhZnqs6XBzylEGhqTNUgiaXJY="; + hash = "sha256-E7+zMrW4y1RfsR1LrxCJRRVlA+BuhzwMI/sfzqNHObo="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-Pi1MtuCHzkQACamsNOIS6pbM03L1CmyosbpdrYVNCkQ="; + hash = "sha256-UNtxyR4SMCP9c1Dre/arfdSVZbAV8qoHyHlvj3ZbXIs="; }; }; From da6a5c82971ab37677f421556c376ac98bdbe9e5 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 10 Oct 2022 18:19:42 +0300 Subject: [PATCH 11/14] Revert "parlatype: remove" This reverts commit 3d957ef33b5603d025935b4950a423ddc5054f40. (cherry picked from commit 8a4c3732163f847455b3e6940f24cabe361829e4) --- 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 5093c0626a3e..3ba7d4b284c1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -969,7 +969,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 871d739c0841..5027cdfa0def 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28964,6 +28964,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 47aba9bc768436e8ad94c15537d5a1b5620bd500 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 10 Oct 2022 18:22:58 +0300 Subject: [PATCH 12/14] parlatype: disable pocketsphinx integration (cherry picked from commit 81738843e9511ef7609a46496ea8b07cacde1107) --- 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 56651c23da795d089bfe8437c11fb82cc8e657a5 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 10 Oct 2022 18:23:19 +0300 Subject: [PATCH 13/14] parlatype: 2.1 -> 3.1 (cherry picked from commit 0aa7db6030704cfef15de8e3fd90bfe26b01793c) --- 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 0ec9204ab69bae22c8f4833440ead7c3b56f8dd2 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 12 Oct 2022 14:41:20 +0300 Subject: [PATCH 14/14] parlatype: sort dependencies and reformat (cherry picked from commit 16ead09b5e3ab9b1c7a5dc43bb6ad497ccba8f4d) --- 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;