diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index e45c83086fb5..ffbc7c18e42b 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -684,10 +684,10 @@ class Machine: with self.nested("waiting for {} to appear on tty {}".format(regexp, tty)): retry(tty_matches) - def send_chars(self, chars: str) -> None: + def send_chars(self, chars: str, delay: Optional[float] = 0.01) -> None: with self.nested("sending keys ‘{}‘".format(chars)): for char in chars: - self.send_key(char) + self.send_key(char, delay) def wait_for_file(self, filename: str) -> None: """Waits until the file exists in machine's file system.""" @@ -860,10 +860,11 @@ class Machine: if matches is not None: return - def send_key(self, key: str) -> None: + def send_key(self, key: str, delay: Optional[float] = 0.01) -> None: key = CHAR_TO_KEY.get(key, key) self.send_monitor_command("sendkey {}".format(key)) - time.sleep(0.01) + if delay is not None: + time.sleep(delay) def send_console(self, chars: str) -> None: assert self.process diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b238c4384951..6cb4eb9f5e49 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -491,6 +491,7 @@ in { pgadmin4-standalone = handleTest ./pgadmin4-standalone.nix {}; pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; + phosh = handleTest ./phosh.nix {}; php = handleTest ./php {}; php80 = handleTest ./php { php = pkgs.php80; }; php81 = handleTest ./php { php = pkgs.php81; }; diff --git a/nixos/tests/phosh.nix b/nixos/tests/phosh.nix new file mode 100644 index 000000000000..6c6357f58096 --- /dev/null +++ b/nixos/tests/phosh.nix @@ -0,0 +1,65 @@ +import ./make-test-python.nix ({ pkgs, ...}: let + pin = "1234"; +in { + name = "phosh"; + meta = with pkgs.lib.maintainers; { + maintainers = [ zhaofengli ]; + }; + + nodes = { + phone = { config, pkgs, ... }: { + users.users.nixos = { + isNormalUser = true; + password = pin; + }; + + services.xserver.desktopManager.phosh = { + enable = true; + user = "nixos"; + group = "users"; + + phocConfig = { + outputs.Virtual-1 = { + scale = 2; + }; + }; + }; + + systemd.services.phosh = { + environment = { + # Accelerated graphics fail on phoc 0.20 (wlroots 0.15) + "WLR_RENDERER" = "pixman"; + }; + }; + + virtualisation.resolution = { x = 720; y = 1440; }; + virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci,xres=720,yres=1440" ]; + }; + }; + + enableOCR = true; + + testScript = '' + import time + + start_all() + phone.wait_for_unit("phosh.service") + + with subtest("Check that we can see the lock screen info page"): + # Saturday, January 1 + phone.succeed("timedatectl set-time '2022-01-01 07:00'") + + phone.wait_for_text("Saturday") + phone.screenshot("01lockinfo") + + with subtest("Check that we can unlock the screen"): + phone.send_chars("${pin}", delay=0.2) + time.sleep(1) + phone.screenshot("02unlock") + + phone.send_chars("\n") + + phone.wait_for_text("All Apps") + phone.screenshot("03launcher") + ''; +}) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 038a5277d2f5..8da04de579e6 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-nLXpf0Xi7yuz/Rm8Sfkr1PGLuazN+Lh6sIqkWFBmP3w="; + sha256 = "sha256-NP9cM1xIHblMdUFKIviPKDi6su6Nc3xsX2pnPeP7hdQ="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index d05a12ec30af..5dd17a74f491 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.2.23"; + version = "6.3"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-gl+kT8wXLCWnNmOBx6Vg+FbmJ8kJ8pJKsahpqcYw9Lk="; + sha256 = "sha256-/XSBUM6HkANATl1Y9vs8mQFgBTyVeCv8TxcaIdP/Nm8="; }; configurePhase = '' diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index 54d3fec5cabb..842b8f0aa070 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.6.4.1"; + version = "0.6.4.5"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "sha256-/Z0UDxZtVnGKVmscNCZAvTGMALq/uMd7/h3r/QvUs0M="; + sha256 = "sha256-O7CNPMS0eRcqt2xAtyEFyLSV8U2xbxuV1DpBxZAFwQs="; }; nativeBuildInputs = [ qmake pkg-config ]; diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index d02e08ed6cd4..88deb6653a02 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -7,28 +7,27 @@ , makeDesktopItem , curl , extra-cmake-modules -, libevdev , libpulseaudio , libXrandr , mesa # for libgbm , ninja , pkg-config , qtbase +, qtsvg , qttools , vulkan-loader -#, wayland # Wayland doesn't work correctly this version +, wayland , wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "duckstation"; - version = "unstable-2022-07-08"; - + version = "unstable-2022-11-18"; src = fetchFromGitHub { owner = "stenzek"; repo = pname; - rev = "82965f741e81e4d2f7e1b2abdc011e1f266bfe7f"; - sha256 = "sha256-D8Ps/EQRcHLsps/KEUs56koeioOdE/GPA0QJSrbSdYs="; + rev = "8d7aea5e19859ed483699cc4a5dbd47165c7be8b"; + sha256 = "sha256-92Wn1ZEEZszmVK/KrJqjDuQf/lyD8/VScfTI/St5dY4="; }; nativeBuildInputs = [ @@ -44,18 +43,18 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 curl - libevdev libpulseaudio libXrandr mesa qtbase + qtsvg vulkan-loader - #wayland + wayland ]; cmakeFlags = [ "-DUSE_DRMKMS=ON" - #"-DUSE_WAYLAND=ON" + "-DUSE_WAYLAND=ON" ]; desktopItems = [ @@ -80,7 +79,7 @@ stdenv.mkDerivation rec { cp -r bin $out/share/duckstation ln -s $out/share/duckstation/duckstation-qt $out/bin/ - install -Dm644 ../extras/icons/icon-256px.png $out/share/pixmaps/duckstation.png + install -Dm644 bin/resources/images/duck.png $out/share/pixmaps/duckstation.png runHook postInstall ''; diff --git a/pkgs/applications/kde/kdevelop/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix index 4e7f576398e5..1d34e01813b0 100644 --- a/pkgs/applications/kde/kdevelop/kdevelop.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, cmake, gettext, pkg-config, extra-cmake-modules -, qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase +, qtquickcontrols, qttools, kde-cli-tools, qtbase , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons @@ -24,7 +24,7 @@ mkDerivation rec { ]; propagatedBuildInputs = [ - qtquickcontrols qtwebkit boost libkomparediff2 + qtquickcontrols boost libkomparediff2 kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix index bb5cd80bca23..80f5f4bb6d65 100644 --- a/pkgs/applications/kde/rocs.nix +++ b/pkgs/applications/kde/rocs.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, boost, - qtbase, qtscript, qtquickcontrols, qtwebkit, qtxmlpatterns, grantlee, + qtbase, qtscript, qtquickcontrols, qtxmlpatterns, grantlee, kdoctools, karchive, kxmlgui, kcrash, kdeclarative, ktexteditor, kguiaddons }: @@ -19,7 +19,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost - qtbase qtscript qtquickcontrols qtwebkit qtxmlpatterns grantlee + qtbase qtscript qtquickcontrols qtxmlpatterns grantlee kxmlgui kcrash kdeclarative karchive ktexteditor kguiaddons ]; } diff --git a/pkgs/applications/misc/eureka-ideas/default.nix b/pkgs/applications/misc/eureka-ideas/default.nix index d9016bc341ae..ee15f31632cb 100644 --- a/pkgs/applications/misc/eureka-ideas/default.nix +++ b/pkgs/applications/misc/eureka-ideas/default.nix @@ -2,6 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config +, libgit2 , openssl , stdenv , Security @@ -22,13 +23,15 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - - checkFlags = lib.optionals stdenv.isLinux [ - # failing on linux for unknown reasons - "--skip=config_manager::tests" + buildInputs = [ + libgit2 + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security ]; + dontUseCargoParallelTests = true; + meta = with lib; { description = "CLI tool to input and store your ideas without leaving the terminal"; homepage = "https://github.com/simeg/eureka"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 403b8d5dfd6d..bfc5e828cb27 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -423,13 +423,13 @@ "version": "2.2.0" }, "github": { - "hash": "sha256-cLBBz5qPRY+TpcO0yfyTXOQLQYz58hB1l6ufThbBSuM=", + "hash": "sha256-3ivfHKoj7jXQ3WsoTNSCL1zD93Pr0pjtZ9LneW9My4o=", "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v5.8.0", + "rev": "v5.9.0", "vendorHash": null, - "version": "5.8.0" + "version": "5.9.0" }, "gitlab": { "hash": "sha256-1Ljf9kwpj96mzu/uHqitYCKIixNn/sZL21zOM8xQsU4=", @@ -642,13 +642,13 @@ "version": "1.14.0" }, "kubernetes": { - "hash": "sha256-93cGlfYUH4VTdDYbtGySOUw5Kak7hKs0gxLCT0Bxca4=", + "hash": "sha256-hWFC8VBbM3BRGrX1Y45Znd/W3klYy/7aS7JbbKN7EUg=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.15.0", + "rev": "v2.16.0", "vendorHash": null, - "version": "2.15.0" + "version": "2.16.0" }, "launchdarkly": { "hash": "sha256-AsFtlCIGvlG8c+PilhMhaMowaea/g1+IXYzEiIIbZ44=", @@ -1121,13 +1121,13 @@ "version": "1.78.12" }, "tfe": { - "hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=", + "hash": "sha256-ikuLRGm9Z+tt0Zsx7DYKNBrS08rW4DOvVWYpl3wvaeU=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", - "rev": "v0.38.0", - "vendorHash": "sha256-reXq1MyAhHRet1WwDJZafdOg1r7J4sktQ/QhQUPhDak=", - "version": "0.38.0" + "rev": "v0.39.0", + "vendorHash": "sha256-Ws9IzlZQDDAdQ4JJ326jHXUe9oQphBXb/ZNO7Kl/A1w=", + "version": "0.39.0" }, "thunder": { "hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", diff --git a/pkgs/applications/radio/btlejack/default.nix b/pkgs/applications/radio/btlejack/default.nix index 198c090b0ea1..c5eb8d5cfe4d 100644 --- a/pkgs/applications/radio/btlejack/default.nix +++ b/pkgs/applications/radio/btlejack/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "btlejack"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "virtualabs"; repo = "btlejack"; - rev = "v${version}"; - sha256 = "1r17079kx7dvsrbmw5sgvz3vj5m3pn2543gxj2xmw4s0lcihy378"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Q6y9murV1o2i1sluqTVB5+X3B7ywFsI0ZvlJjHrHSpo="; }; postPatch = '' diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index ddbbc1d1e4f3..e47ea6b12dbe 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.29.9"; + version = "2.30"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-MJMVKdftA4PZ5vmrekcKAKX+0khHl3e83SXsn+P7VT8="; + sha256 = "sha256-Ck+Q7sHhMqUWu6WeA3DhY+svMxH2sU0WvmyvZ5qsW+E="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index 3d76b524e442..76e26ba01766 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "media-downloader"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = pname; rev = "${version}"; - sha256 = "sha256-pDldAg4q6qGvRHuffKU49akDwwSTNCZPJ6AgauxgotI="; + sha256 = "sha256-uu/4S7cVWHOhBq52NF0AargE0nbPwjF0txSWL0DquQo="; }; nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 332fd509e421..d71ff01362d2 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -28,6 +28,7 @@ , polkit , libsecret , evolution-data-server +, nixosTests }: stdenv.mkDerivation rec { @@ -122,6 +123,8 @@ stdenv.mkDerivation rec { providedSessions = [ "sm.puri.Phosh" ]; + + tests.phosh = nixosTests.phosh; }; meta = with lib; { diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 410439da6ca6..cb425ee00cb5 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme"; - version = "22.08.16"; + version = "22.11.17"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-EveIr5XYyQYhz0AqZQBql3j0LnD8taNdzB/6IV7Mz2k="; + sha256 = "sha256-B6Yg9NkPBpByMMV4GcEBmOlSKx1s0MClGWL2RWIJMwA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index bebfbdda8d8b..76f3481386f3 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -69,5 +69,8 @@ qtModule { meta = { maintainers = with lib.maintainers; [ abbradar periklis ]; + knownVulnerabilities = [ + "QtWebkit upstream is unmaintained and receives no security updates, see https://blogs.gnome.org/mcatanzaro/2022/11/04/stop-using-qtwebkit/" + ]; }; } diff --git a/pkgs/development/python-modules/g2pkk/default.nix b/pkgs/development/python-modules/g2pkk/default.nix new file mode 100644 index 000000000000..98e03806d2ff --- /dev/null +++ b/pkgs/development/python-modules/g2pkk/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jamo +, nltk +}: + +buildPythonPackage rec { + pname = "g2pkk"; + version = "0.1.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-YarV1Btn1x3Sm4Vw/JDSyJy3ZJMXAQHZJJJklSG0R+Q="; + }; + + propagatedBuildInputs = [ + jamo + nltk + ]; + + pythonImportsCheck = [ + "g2pkk" + ]; + + doCheck = false; + + meta = with lib; { + description = "Cross-platform g2p for Korean"; + homepage = "https://github.com/harmlessman/g2pkk"; + license = licenses.asl20; + maintainers = teams.tts.members; + }; +} + diff --git a/pkgs/development/python-modules/jamo/default.nix b/pkgs/development/python-modules/jamo/default.nix new file mode 100644 index 000000000000..e7bebd52db44 --- /dev/null +++ b/pkgs/development/python-modules/jamo/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jamo"; + version = "0.4.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "JDongian"; + repo = "python-jamo"; + rev = "refs/tags/v${version}"; + hash = "sha256-QHI3Rqf1aQOsW49A/qnIwRnPuerbtyerf+eWIiEvyho="; + }; + + pythonImportsCheck = [ + "jamo" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/JDongian/python-jamo/releases/tag/v${version}"; + description = "Hangul syllable decomposition and synthesis using jamo"; + homepage = "https://github.com/JDongian/python-jamo"; + license = licenses.asl20; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/coqui-trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix similarity index 97% rename from pkgs/development/python-modules/coqui-trainer/default.nix rename to pkgs/development/python-modules/trainer/default.nix index 4c77506b9881..627c21ee4bf0 100644 --- a/pkgs/development/python-modules/coqui-trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -16,7 +16,7 @@ }: let - pname = "coqui-trainer"; + pname = "trainer"; version = "0.0.16"; in buildPythonPackage { diff --git a/pkgs/development/tools/database/apgdiff/default.nix b/pkgs/development/tools/database/apgdiff/default.nix new file mode 100644 index 000000000000..016259f0bbb4 --- /dev/null +++ b/pkgs/development/tools/database/apgdiff/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, makeWrapper +, jre +}: +stdenvNoCC.mkDerivation (finalAttrs: { + version = "2.7.0"; + pname = "apgdiff"; + + src = fetchurl { + url = "https://github.com/fordfrog/apgdiff/raw/release_${finalAttrs.version}/releases/apgdiff-${finalAttrs.version}.jar"; + sha256 = "sha256-6OempDmedl6LOwP/s5y0hOIxGDWHd7qM7/opW3UwQ+I="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + install -Dm644 $src $out/lib/apgdiff.jar + + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/apgdiff \ + --argv0 apgdiff \ + --add-flags "-jar $out/lib/apgdiff.jar" + ''; + + meta = with lib; { + description = "Another PostgreSQL diff tool"; + homepage = "https://apgdiff.com"; + license = licenses.mit; + inherit (jre.meta) platforms; + sourceProvenance = sourceTypes.binaryBytecode; + maintainers = [ maintainers.misterio77 ]; + }; +}) diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index 4aff90f830a3..19e16bd0da73 100644 --- a/pkgs/development/tools/dump_syms/default.nix +++ b/pkgs/development/tools/dump_syms/default.nix @@ -7,11 +7,16 @@ # darwin , Security + +# tests +, firefox-esr-unwrapped +, firefox-unwrapped +, thunderbird-unwrapped }: let pname = "dump_syms"; - version = "2.0.0"; + version = "2.1.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,10 +25,10 @@ rustPlatform.buildRustPackage { owner = "mozilla"; repo = pname; rev = "v${version}"; - hash = "sha256-ei/ORKKoh9rQg4xZ5j76qaplw1PyEV7ABkyL7e8WIlQ="; + hash = "sha256-Q4opIGG1kOORECNB6al0oT4tjBe++ND6Eb4E86ED2+o="; }; - cargoSha256 = "sha256-t3AQW0j/L/qIUx6RJKqf+Fv/2BNWkWmTc0PDNFlZeaQ="; + cargoSha256 = "sha256-j3bZaHFJEn/LW032CaRBaLN3Pb5GiQv1MReD0LFI8y8="; nativeBuildInputs = [ pkg-config @@ -42,6 +47,10 @@ rustPlatform.buildRustPackage { "--skip windows::pdb::tests::test_oleaut32" ]; + passthru.tests = { + inherit firefox-esr-unwrapped firefox-unwrapped thunderbird-unwrapped; + }; + meta = with lib; { changelog = "https://github.com/mozilla/dump_syms/releases/tag/v${version}"; description = "Command-line utility for parsing the debugging information the compiler provides in ELF or stand-alone PDB files"; diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 8cfa4c802992..2c1a78fec0fd 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-toml"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9m0g8hfJ+gazYHq2TzSN/0d2o789QBhbIpGxdXhNBGk="; + sha256 = "sha256-RXKJJseRrwSTReMAkFjShKvCWGMowruYwsCovHwq4ZQ="; }; - vendorSha256 = "sha256-yDPCfJtYty4aaoDrn3UWFcs1jHJHMJqzc5f06AWQmRc="; + vendorSha256 = "sha256-MMCyFKqsL9aSQqK9VtPzUbgfLTFpzD5g8QYx8qIwktg="; excludedPackages = [ "cmd/gotoml-test-decoder" "cmd/tomltestgen" ]; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index ccd9d3744931..a90eac39bd84 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.126"; + version = "0.0.127"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Qcjj+WgNsdms2VNOT/Ax66TruigxrHmC+tyoe5fCgo4="; + sha256 = "sha256-K2IZtuSbzengPhrOEkDri3D3cy9TmlCgrWm27/bVtxA="; }; - cargoSha256 = "sha256-aIZ3ZBiUFMC/RmJQp/V0Rjq/+oLg61Ve0zZJSZpT7nw="; + cargoSha256 = "sha256-5QuA9/6OyERrR1YSwaeRab91yz4ugsz41JCAhYUwmcA="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index e5601095ebbc..ae249eb9292e 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kcVfqj5vRfPcF6lO1Ley3ctZajNA02jUqQRlpi3MkXc="; + sha256 = "sha256-sqkVi8w4QoktC1ZLUPHzfMUxIzCadcIj3dEYigz854U="; }; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-OW2kutjvQC9neiguixTdJx2hUFsnmQhR9DbniBr6V8w="; + cargoSha256 = "sha256-xRj0bF5VymvFVB0tSBndWA+OHBIEY2/ovRIBdDoOHA4="; # Tests fail with this error: `found argument --test-threads which was not expected` doCheck = false; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 982169125a08..630d7b845b7b 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2238"; + version = "0.20.2264"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "3kYpx3s4gYBTrqSOt7eLOf8x4cPnlDVmesYBbFzRZVU="; + sha256 = "Y1m828STKL4ANuf11oCekvT2ctCRBlT7Blyvvoltdxc="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index 60027e1d02a9..47cf29f55fbe 100644 --- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "artifactory_exporter"; - version = "1.9.4"; + version = "1.9.5"; rev = "v${version}"; src = fetchFromGitHub { owner = "peimanja"; repo = pname; rev = rev; - sha256 = "sha256-vrbuKWoKfDrgJEOYsncwJZ8lyAfanbV8jKQDVCZY2Sg="; + sha256 = "sha256-QUluuxuOgeq5CnpmVh5uDC4SEWD97JbQCHiYjYUs/nI="; }; - vendorSha256 = "sha256-wKBSAZSE/lSUbkHkyBEkO0wvkrK6fKxXIjF6G+ILqHM="; + vendorSha256 = "sha256-5yzBKgjJCv4tgdBS6XmZUq1ebbka0LOuv6BARWO7kQg="; subPackages = [ "." ]; diff --git a/pkgs/servers/monitoring/prometheus/kea-exporter.nix b/pkgs/servers/monitoring/prometheus/kea-exporter.nix index 5fe9c6baee70..003ea6c2af56 100644 --- a/pkgs/servers/monitoring/prometheus/kea-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/kea-exporter.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "kea-exporter"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; src = python3Packages.fetchPypi { inherit pname version; - hash = "sha256-RSW1HStfPV7yiuLgGIuMjS3vPXz8P3vmtfw6tDHXp6o="; + hash = "sha256-rNGA5XEx9xVUP1SeDPgXcaqgDhgX6JFhRX9GM454P5A="; }; nativeBuildInputs = with python3Packages; [ @@ -35,4 +35,3 @@ python3Packages.buildPythonApplication rec { maintainers = with maintainers; [ hexa ]; }; } - diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index f7fde43b75e9..9a7a96d6920f 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -16,14 +16,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-H0OTEaUD6NVzZT0OpPONRl+wuCdrFXbiY9yHqc6/9e0="; - arm64-linux_hash = "sha256-L7jTqC5IMB2pD3d71Uc/kDsfw5LVScJ97sjkq73XgVM="; - x64-osx_hash = "sha256-tFpfgRq7Xlh8uBoNBHb6aXBDzsa48JC8ge9XGdSvZaI="; + x64-linux_hash = "sha256-nzMMVsDwE5GRtqzzBVs04bXfCEbNmRiLeaohBG01NL0="; + arm64-linux_hash = "sha256-av979aV5LYWTsFajihwV0QzYbSwg1rac+q1NCnaU8K0="; + x64-osx_hash = "sha256-9oinpaetF0mphraGjAt3yeDsE+nz+59vxQG5ZTVLWXM="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "0.4.7.2016"; + version = "0.4.9.2083"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 4e9148db9663..9b3bce6f44cf 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -32,14 +32,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.8.0"; - format = "setuptools"; + version = "0.9.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "sha256-A48L1JGXckSEaZra00ZOBVxcYJMvhpQqzE8nABaP0TY="; + sha256 = "sha256-p4I583Rs/4eig7cnOcJjri2ugOLAeF2nvPIvMZrN1Ss="; }; postPatch = let @@ -53,7 +53,6 @@ python.pkgs.buildPythonApplication rec { "numpy" "umap-learn" "unidic-lite" - "pyworld" ]; in '' sed -r -i \ @@ -61,7 +60,6 @@ python.pkgs.buildPythonApplication rec { ''-e 's/${package}.*[<>=]+.*/${package}/g' \'' ) relaxedConstraints)} requirements.txt - sed -i '/tensorboardX/d' requirements.txt ''; nativeBuildInputs = with python.pkgs; [ @@ -71,27 +69,29 @@ python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ anyascii coqpit - coqui-trainer flask fsspec + g2pkk gdown gruut inflect + jamo jieba librosa matplotlib mecab-python3 + nltk numba pandas pypinyin pysbd - pyworld scipy soundfile tensorflow torch-bin torchaudio-bin tqdm + trainer umap-learn unidic-lite webrtcvad @@ -127,15 +127,17 @@ python.pkgs.buildPythonApplication rec { disabledTests = [ # Requires network acccess to download models - "test_synthesize" + "test_korean_text_to_phonemes" + "test_models_offset_0_step_3" + "test_models_offset_1_step_3" + "test_models_offset_2_step_3" "test_run_all_models" + "test_synthesize" + "test_voice_conversion" # Mismatch between phonemes "test_text_to_ids_phonemes_with_eos_bos_and_blank" # Takes too long "test_parametrized_wavernn_dataset" - - # requires network - "test_voice_conversion" ]; disabledTestPaths = [ diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/tools/misc/nncp/default.nix index 497910cd809d..d7dcc901666d 100644 --- a/pkgs/tools/misc/nncp/default.nix +++ b/pkgs/tools/misc/nncp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "nncp"; - version = "8.8.1"; + version = "8.8.2"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; - sha256 = "426463C97211AD88DF74DDDF61BDBB830BAE275668B2F23158D43146517469A6"; + sha256 = "02B98DC4654C46328A043209CD2DA28BF33A53BAF15574429C6C0747AE2FCF39"; }; nativeBuildInputs = [ go redo-apenwarr ]; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 5e438d887211..4b5f335938bb 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -14,14 +14,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "22.3.4"; + version = "22.4"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = "refs/tags/${version}"; - hash = "sha256-agffkTEaURjw/Ro8znYRQLKhDP2Ey0LimuzqbW5xb28="; + hash = "sha256-MsT5t2da79Eb9FlTLPr2893JcF0ujNnToJTCQRT1QEo="; }; patches = [ ./0001-add-nixos-support.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05a73c2e3e51..49f3d3a787d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1553,7 +1553,7 @@ with pkgs; dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; + duckstation = qt6Packages.callPackage ../applications/emulators/duckstation {}; dynamips = callPackage ../applications/emulators/dynamips { }; @@ -16247,6 +16247,8 @@ with pkgs; anybadge = with python3Packages; toPythonApplication anybadge; + apgdiff = callPackage ../development/tools/database/apgdiff { }; + apkg = callPackage ../tools/package-management/apkg { }; augeas = callPackage ../tools/system/augeas { }; @@ -30822,7 +30824,7 @@ with pkgs; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt514.callPackage ../applications/video/smtube {}; + smtube = libsForQt5.callPackage ../applications/video/smtube {}; softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6af64e445511..f72e8f96a538 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1580,8 +1580,6 @@ self: super: with self; { coqpit = callPackage ../development/python-modules/coqpit { }; - coqui-trainer = callPackage ../development/python-modules/coqui-trainer {}; - cepa = callPackage ../development/python-modules/cepa { }; cerberus = callPackage ../development/python-modules/cerberus { }; @@ -3564,6 +3562,8 @@ self: super: with self; { fx2 = callPackage ../development/python-modules/fx2 { }; + g2pkk = callPackage ../development/python-modules/g2pkk { }; + galario = toPythonModule (pkgs.galario.override { enablePython = true; pythonPackages = self; @@ -4655,6 +4655,8 @@ self: super: with self; { jaeger-client = callPackage ../development/python-modules/jaeger-client { }; + jamo = callPackage ../development/python-modules/jamo { }; + janus = callPackage ../development/python-modules/janus { }; jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; @@ -11250,6 +11252,8 @@ self: super: with self; { trackpy = callPackage ../development/python-modules/trackpy { }; + trainer = callPackage ../development/python-modules/trainer {}; + traitlets = callPackage ../development/python-modules/traitlets { }; traits = callPackage ../development/python-modules/traits { };