diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-05-03 15:14:25 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-05-07 11:19:19 +0200 |
commit | d92b2b6a1bbd322dd65a8b6f51019610d350046e (patch) | |
tree | 7f7c21927b9cc05676501f297c51eb76b49e326c /nixpkgs/pkgs/applications/audio | |
parent | 93c9e56b40530cc627d921cfc255c05b495d4017 (diff) | |
parent | 49050352f602fe87d16ff7b2b6a05b79eb20dc6f (diff) | |
download | nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.gz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.bz2 nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.lz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.xz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.zst nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'
Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/audio')
98 files changed, 2222 insertions, 1112 deletions
diff --git a/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix b/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix index 08ef2d083088..517db11c2865 100644 --- a/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix +++ b/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, pkg-config, alsa-lib, dbus, libjack2 -, python3Packages , meson, ninja }: +{ lib, stdenv, fetchFromGitea, makeWrapper, pkg-config, alsa-lib, dbus, libjack2 +, python3Packages , meson, ninja, gitUpdater }: stdenv.mkDerivation rec { pname = "a2jmidid"; - version = "9"; + version = "12"; - src = fetchFromGitHub { - owner = "linuxaudio"; - repo = pname; - rev = version; - sha256 = "sha256-WNt74tSWV8bY4TnpLp86PsnrjkqWynJJt3Ra4gZl2fQ="; + src = fetchFromGitea { + domain = "gitea.ladish.org"; + owner = "LADI"; + repo = "a2jmidid"; + rev = "refs/tags/${version}"; + fetchSubmodules = true; + hash = "sha256-PZKGhHmPMf0AucPruOLB9DniM5A3BKdghFCrd5pTzeM="; }; nativeBuildInputs = [ pkg-config makeWrapper meson ninja ]; @@ -21,9 +23,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/a2j --replace "a2j_control" "$out/bin/a2j_control" ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; - license = licenses.gpl2; + homepage = "https://a2jmidid.ladish.org/"; + license = licenses.gpl2Only; maintainers = [ maintainers.goibhniu ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; diff --git a/nixpkgs/pkgs/applications/audio/audacious/plugins.nix b/nixpkgs/pkgs/applications/audio/audacious/plugins.nix index 6f5d171e2ef1..2d048bc358fe 100644 --- a/nixpkgs/pkgs/applications/audio/audacious/plugins.nix +++ b/nixpkgs/pkgs/applications/audio/audacious/plugins.nix @@ -41,6 +41,7 @@ , qtmultimedia , qtx11extras , soxr +, vgmstream , wavpack }: @@ -109,6 +110,10 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + postInstall = '' + ln -s ${vgmstream.override { buildAudaciousPlugin = true; }}/lib/audacious/Input/* $out/lib/audacious/Input + ''; + meta = audacious.meta // { description = "Plugins for Audacious music player"; }; diff --git a/nixpkgs/pkgs/applications/audio/audacity/default.nix b/nixpkgs/pkgs/applications/audio/audacity/default.nix index 74af177d0e27..c0db59b1d2bb 100644 --- a/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -62,13 +62,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.4.2"; + version = "3.5.1"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${version}"; - hash = "sha256-YlRWCu6kQYdzast7Mf29p4FvpXJHQLG7vqqo/5SNQCQ="; + hash = "sha256-wQ+K31TvDTVwDyVQ5nWgcneZ1cFxztmsbSXrDs33Uoc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index 5ebc2caf0f71..5f955334fef2 100644 --- a/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -8,7 +8,7 @@ , qtbase , qttools , qtwayland -, rtaudio +, rtaudio_6 , rtmidi , wrapQtAppsHook }: @@ -43,16 +43,16 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qtbase + rtaudio_6 rtmidi ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [ qt5compat - ] ++ rtaudio.buildInputs; + ]; qmakeFlags = [ - # we don't have RtAudio 6 yet: https://github.com/NixOS/nixpkgs/pull/245075 - # "CONFIG+=system_rtaudio" + "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" ]; diff --git a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 3ec595e3e8bb..d6bb4edfabd2 100644 --- a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.1.6"; + version = "5.1.8"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-U1Qp7/7kAr1IEcv256I2J/sb5MYxfR20Pi5N8WaVh2U="; + sha256 = "sha256-KxNLae/uTYL1m/X+/7wr7hhKfw31NpB9Mw9RzfrTuus="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/audio/cardinal/default.nix b/nixpkgs/pkgs/applications/audio/cardinal/default.nix index 70d199d43b11..33ad843db529 100644 --- a/nixpkgs/pkgs/applications/audio/cardinal/default.nix +++ b/nixpkgs/pkgs/applications/audio/cardinal/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "23.10"; + version = "24.04"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - hash = "sha256-6Wt2sC7vdrz2Fkl08bNLfnGu+pAV7b5lZUmsx1wtJRE="; + hash = "sha256-vowDdHAXVZ+HSMoQsvJdzghsJzH+OrSpx6MxPRAgtJA="; }; prePatch = '' diff --git a/nixpkgs/pkgs/applications/audio/castopod/default.nix b/nixpkgs/pkgs/applications/audio/castopod/default.nix index 801368a131cf..bd66a6835562 100644 --- a/nixpkgs/pkgs/applications/audio/castopod/default.nix +++ b/nixpkgs/pkgs/applications/audio/castopod/default.nix @@ -3,7 +3,7 @@ , ffmpeg-headless , lib , nixosTests -, stateDirectory ? "/var/lib/castopod" +, dataDir ? "/var/lib/castopod" }: stdenv.mkDerivation { pname = "castopod"; @@ -20,13 +20,16 @@ stdenv.mkDerivation { postPatch = '' # not configurable at runtime unfortunately: substituteInPlace app/Config/Paths.php \ - --replace "__DIR__ . '/../../writable'" "'${stateDirectory}/writable'" + --replace "__DIR__ . '/../../writable'" "'${dataDir}/writable'" - # configuration file must be writable, place it to ${stateDirectory} + substituteInPlace modules/Admin/Controllers/DashboardController.php \ + --replace "disk_total_space('./')" "disk_total_space('${dataDir}')" + + # configuration file must be writable, place it to ${dataDir} substituteInPlace modules/Install/Controllers/InstallController.php \ - --replace "ROOTPATH" "'${stateDirectory}/'" + --replace "ROOTPATH" "'${dataDir}/'" substituteInPlace public/index.php spark \ - --replace "DotEnv(ROOTPATH)" "DotEnv('${stateDirectory}')" + --replace "DotEnv(ROOTPATH)" "DotEnv('${dataDir}')" # ffmpeg is required for Video Clips feature substituteInPlace modules/MediaClipper/VideoClipper.php \ @@ -47,7 +50,7 @@ stdenv.mkDerivation { description = "An open-source hosting platform made for podcasters who want to engage and interact with their audience"; homepage = "https://castopod.org"; license = licenses.agpl3Only; - maintainers = with maintainers; [ alexoundos misuzu ]; + maintainers = with maintainers; [ alexoundos ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/audio/cider/default.nix b/nixpkgs/pkgs/applications/audio/cider/default.nix index 315fa2c9a65b..b9a688370dcd 100644 --- a/nixpkgs/pkgs/applications/audio/cider/default.nix +++ b/nixpkgs/pkgs/applications/audio/cider/default.nix @@ -1,4 +1,4 @@ -{ appimageTools, lib, fetchurl }: +{ appimageTools, lib, fetchurl, makeWrapper}: appimageTools.wrapType2 rec { pname = "cider"; @@ -12,11 +12,13 @@ appimageTools.wrapType2 rec { extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - mv $out/bin/${pname}-${version} $out/bin/${pname} + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace-warn 'Exec=AppRun' 'Exec=${pname}' cp -r ${contents}/usr/share/icons $out/share ''; @@ -24,8 +26,8 @@ appimageTools.wrapType2 rec { description = "A new look into listening and enjoying Apple Music in style and performance."; homepage = "https://github.com/ciderapp/Cider"; license = licenses.agpl3Only; + mainProgram = "cider"; maintainers = [ maintainers.cigrainger ]; platforms = [ "x86_64-linux" ]; - mainProgram = "cider"; }; } diff --git a/nixpkgs/pkgs/applications/audio/cmus/option-debugging.patch b/nixpkgs/pkgs/applications/audio/cmus/option-debugging.patch deleted file mode 100644 index 84115e1480e1..000000000000 --- a/nixpkgs/pkgs/applications/audio/cmus/option-debugging.patch +++ /dev/null @@ -1,42 +0,0 @@ -Shows build and link errors in configure for ease of debugging which -options require what. -diff --git a/scripts/checks.sh b/scripts/checks.sh -index 64cbbf3..fab4d9b 100644 ---- a/scripts/checks.sh -+++ b/scripts/checks.sh -@@ -425,7 +425,7 @@ try_compile() - echo "$1" > $__src || exit 1 - shift - __cmd="$CC -c $CFLAGS $@ $__src -o $__obj" -- $CC -c $CFLAGS "$@" $__src -o $__obj 2>/dev/null -+ $CC -c $CFLAGS "$@" $__src -o $__obj - ;; - cxx) - __src=`tmp_file prog.cc` -@@ -433,7 +433,7 @@ try_compile() - echo "$1" > $__src || exit 1 - shift - __cmd="$CXX -c $CXXFLAGS $@ $__src -o $__obj" -- $CXX -c $CXXFLAGS "$@" $__src -o $__obj 2>/dev/null -+ $CXX -c $CXXFLAGS "$@" $__src -o $__obj - ;; - esac - return $? -@@ -451,7 +451,7 @@ try_compile_link() - echo "$1" > $__src || exit 1 - shift - __cmd="$CC $__src -o $__exe $CFLAGS $LDFLAGS $@" -- $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" 2>/dev/null -+ $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" - ;; - cxx) - __src=`tmp_file prog.cc` -@@ -459,7 +459,7 @@ try_compile_link() - echo "$1" > $__src || exit 1 - shift - __cmd="$CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS $@" -- $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" 2>/dev/null -+ $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" - ;; - esac - return $? diff --git a/nixpkgs/pkgs/applications/audio/cozy/default.nix b/nixpkgs/pkgs/applications/audio/cozy/default.nix index e07217567d34..65cad453f6b7 100644 --- a/nixpkgs/pkgs/applications/audio/cozy/default.nix +++ b/nixpkgs/pkgs/applications/audio/cozy/default.nix @@ -1,52 +1,41 @@ -{ lib, fetchFromGitHub -, ninja +{ lib +, python3Packages +, fetchFromGitHub , meson +, ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , appstream-glib , desktop-file-utils -, gtk3 -, gst_all_1 , gobject-introspection , libadwaita -, libdazzle -, python3Packages -, cairo -, gettext -, gnome -, pantheon +, gst_all_1 }: python3Packages.buildPythonApplication rec { - - format = "other"; # no setup.py - pname = "cozy"; version = "1.3.0"; + pyproject = false; # built with meson src = fetchFromGitHub { owner = "geigi"; - repo = pname; + repo = "cozy"; rev = version; hash = "sha256-oMgdz2dny0u1XV13aHu5s8/pcAz8z/SAOf4hbCDsdjw"; }; nativeBuildInputs = [ - meson ninja pkg-config - wrapGAppsHook + meson + ninja + pkg-config + wrapGAppsHook4 appstream-glib desktop-file-utils gobject-introspection ]; buildInputs = [ - gtk3 - cairo - gettext - gnome.adwaita-icon-theme libadwaita - libdazzle - pantheon.granite ] ++ (with gst_all_1; [ gstreamer gst-plugins-good @@ -56,32 +45,30 @@ python3Packages.buildPythonApplication rec { ]); propagatedBuildInputs = with python3Packages; [ - apsw - cairo - dbus-python distro - gst-python - magic mutagen - packaging peewee pygobject3 pytz requests ]; - postPatch = '' - patchShebangs meson/*.py + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - postInstall = '' + postFixup = '' ln -s $out/bin/com.github.geigi.cozy $out/bin/cozy ''; meta = with lib; { - description = "A modern audio book player for Linux using GTK 3"; + description = "A modern audio book player for Linux"; homepage = "https://cozy.geigi.de/"; - maintainers = [ maintainers.makefu ]; - license = licenses.gpl3; + maintainers = with maintainers; [ makefu aleksana ]; + license = licenses.gpl3Plus; + mainProgram = "com.github.geigi.cozy"; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix b/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix index e48b45aec3e4..c2c9432eaeb0 100644 --- a/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, csound, desktop-file-utils, - fetchFromGitHub, python, python-qt, qmake, + fetchFromGitHub, python3, python-qt, qmake, qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { "CSOUND_INCLUDE_DIR=${csound}/include/csound" "CSOUND_LIBRARY_DIR=${csound}/lib" "RTMIDI_DIR=${rtmidi.src}" - "PYTHONQT_SRC_DIR=${python-qt}/include/PythonQt" + "PYTHONQT_SRC_DIR=${python-qt.src}" "PYTHONQT_LIB_DIR=${python-qt}/lib" "LIBS+=-L${python-qt}/lib" - "INCLUDEPATH+=${python-qt}/include/PythonQt" - "INCLUDEPATH+=${python}/include/python${python.pythonVersion}" "INSTALL_DIR=${placeholder "out"}" "SHARE_DIR=${placeholder "out"}/share" + "PYTHON_DIR=${python3}" + "PYTHON_VERSION=3.${python3.sourceVersion.minor}" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/audio/easyeffects/default.nix b/nixpkgs/pkgs/applications/audio/easyeffects/default.nix index 81fb1efe5083..4bb2926b1b4e 100644 --- a/nixpkgs/pkgs/applications/audio/easyeffects/default.nix +++ b/nixpkgs/pkgs/applications/audio/easyeffects/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.1.5"; + version = "7.1.6"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - hash = "sha256-QoH1dOzBtQHQQKA0+eZFX6yOvjRUmUZVxcdpISIpLLk="; + hash = "sha256-NViRZHNgsweoD1YbyWYrRTZPKTCkKk3fGDLLYDD7JfA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/easytag/default.nix b/nixpkgs/pkgs/applications/audio/easytag/default.nix index 6d3fd8f1d17d..6366721a3565 100644 --- a/nixpkgs/pkgs/applications/audio/easytag/default.nix +++ b/nixpkgs/pkgs/applications/audio/easytag/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "View and edit tags for various audio files"; mainProgram = "easytag"; - homepage = "https://wiki.gnome.org/Apps/EasyTAG"; + homepage = "https://gitlab.gnome.org/GNOME/easytag"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/audio/famistudio/build-native-wrapper.nix b/nixpkgs/pkgs/applications/audio/famistudio/build-native-wrapper.nix new file mode 100644 index 000000000000..ddee5bf5712d --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/famistudio/build-native-wrapper.nix @@ -0,0 +1,69 @@ +{ depname +, version +, src +, sourceRoot +, stdenv +, lib +, patches ? [] +, extraPostPatch ? "" +, buildInputs ? [] +}: + +let + rebuildscriptName = if stdenv.hostPlatform.isLinux then + "build_linux" + else if stdenv.hostPlatform.isDarwin then + "build_macos" + else throw "Don't know how to rebuild FamiStudio's vendored ${depname} for ${stdenv.hostPlatform.system}"; +in +stdenv.mkDerivation { + pname = "famistudio-nativedep-${depname}"; + inherit version src sourceRoot patches buildInputs; + + postPatch = let + libnameBase = lib.optionalString stdenv.hostPlatform.isLinux "lib" + depname; + in '' + # Use one name for build script, eases with patching + mv ${rebuildscriptName}.sh build.sh + + # Scripts use hardcoded compilers and try to copy built libraries into FamiStudio's build tree + # Not all scripts use the same compiler, so don't fail on replacing that + substituteInPlace build.sh \ + --replace-fail '../../FamiStudio/' "$out/lib/" \ + --replace-quiet 'g++' "$CXX" + + # Replacing gcc via sed, would break -static-libgcc otherwise + sed -i -e "s/^gcc/$CC/g" build.sh + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Darwin rebuild scripts try to make a universal2 dylib + # - build dylib for non-hostPlatform + # - copy built library into special directory for later packaging script + # - join two dylibs together into a universal2 dylib + # Remove everything we don't need + sed -ri \ + -e '/-target ${if stdenv.hostPlatform.isx86_64 then "arm64" else "x86_64"}/d' \ + -e '/..\/..\/Setup/d' \ + build.sh + + # Replace joining multi-arch dylibs with copying dylib for target arch + substituteInPlace build.sh \ + --replace-fail 'lipo -create -output ${libnameBase}.dylib' 'cp ${libnameBase}_${if stdenv.hostPlatform.isx86_64 then "x86_64" else "arm64"}.dylib ${libnameBase}.dylib #' + '' + extraPostPatch; + + dontConfigure = true; + dontInstall = true; # rebuild script automatically installs + + buildPhase = '' + runHook preBuild + + mkdir -p $out/lib + + # Delete all prebuilt libraries, make sure everything is rebuilt + find . -name '*.so' -or -name '*.dylib' -or -name '*.a' -delete + + # When calling normally, an error won't cause derivation to fail + source ./build.sh + + runHook postBuild + ''; +} diff --git a/nixpkgs/pkgs/applications/audio/famistudio/default.nix b/nixpkgs/pkgs/applications/audio/famistudio/default.nix index 9951f0ccfb07..7d738065ce3a 100644 --- a/nixpkgs/pkgs/applications/audio/famistudio/default.nix +++ b/nixpkgs/pkgs/applications/audio/famistudio/default.nix @@ -1,59 +1,108 @@ -{ lib -, stdenv -, fetchzip -, autoPatchelfHook -, dotnet-runtime +{ stdenv +, lib +, buildDotnetModule +, callPackage +, fetchFromGitHub , ffmpeg -, libglvnd +, glfw +, libogg +, libvorbis , makeWrapper , openal +, portaudio +, rtmidi }: -stdenv.mkDerivation rec { +let + csprojName = if stdenv.hostPlatform.isLinux then + "FamiStudio.Linux" + else if stdenv.hostPlatform.isDarwin then + "FamiStudio.Mac" + else throw "Don't know how to build FamiStudio for ${stdenv.hostPlatform.system}"; +in +buildDotnetModule rec { pname = "famistudio"; version = "4.1.3"; - src = fetchzip { - url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip"; - stripRoot = false; - hash = "sha256-eAdv0oObczbs8QLGYbxCrdFk/gN5DOCJ1dp/tg8JWIc="; + src = fetchFromGitHub { + owner = "BleuBleu"; + repo = "FamiStudio"; + rev = "refs/tags/${version}"; + hash = "sha256-bryxhminkrTVe5qhGeMStZp3NTHBREXrsUlyQkfPkao="; }; - strictDeps = true; + postPatch = let + libname = library: "${library}${stdenv.hostPlatform.extensions.sharedLibrary}"; + buildNativeWrapper = args: callPackage ./build-native-wrapper.nix (args // { + inherit version src; + sourceRoot = "${src.name}/ThirdParty/${args.depname}"; + }); + nativeWrapperToReplaceFormat = args: let + libPrefix = lib.optionalString stdenv.hostPlatform.isLinux "lib"; + in { + package = buildNativeWrapper args; + expectedName = "${libPrefix}${args.depname}"; + ourName = "${libPrefix}${args.depname}"; + }; + librariesToReplace = [ + # Unmodified native libraries that we can fully substitute + { package = glfw; expectedName = "libglfw"; ourName = "libglfw"; } + { package = rtmidi; expectedName = "librtmidi"; ourName = "librtmidi"; } + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + { package = openal; expectedName = "libopenal32"; ourName = "libopenal"; } + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + { package = portaudio; expectedName = "libportaudio.2"; ourName = "libportaudio.2"; } + ] ++ [ + # Native libraries, with extra code for the C# wrapping + (nativeWrapperToReplaceFormat { depname = "GifDec"; }) + (nativeWrapperToReplaceFormat { depname = "NesSndEmu"; }) + (nativeWrapperToReplaceFormat { depname = "NotSoFatso"; extraPostPatch = '' + # C++17 does not allow register storage class specifier + substituteInPlace build.sh \ + --replace-fail "$CXX" "$CXX -std=c++14" + ''; }) + (nativeWrapperToReplaceFormat { depname = "ShineMp3"; }) + (nativeWrapperToReplaceFormat { depname = "Stb"; }) + (nativeWrapperToReplaceFormat { depname = "Vorbis"; buildInputs = [ libogg libvorbis ]; }) + ]; + libraryReplaceArgs = lib.strings.concatMapStringsSep " " + (library: "--replace-fail '${libname library.expectedName}' '${lib.getLib library.package}/lib/${libname library.ourName}'") + librariesToReplace; + in '' + # Don't use any prebuilt libraries + rm FamiStudio/*.{dll,dylib,so*} - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - ]; + # Replace copying of vendored prebuilt native libraries with copying of our native libraries + substituteInPlace ${projectFile} ${libraryReplaceArgs} - buildInputs = [ - dotnet-runtime - ffmpeg - libglvnd - openal - ]; + # Un-hardcode target platform if set + sed -i -e '/PlatformTarget/d' ${projectFile} - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall + # Don't require a special name to be preserved, our OpenAL isn't 32-bit + substituteInPlace FamiStudio/Source/AudioStreams/OpenALStream.cs \ + --replace-fail 'libopenal32' 'libopenal' + ''; - mkdir -p $out/{bin,lib/famistudio} - mv * $out/lib/famistudio + projectFile = "FamiStudio/${csprojName}.csproj"; + nugetDeps = ./deps.nix; - makeWrapper ${lib.getExe dotnet-runtime} $out/bin/famistudio \ - --add-flags $out/lib/famistudio/FamiStudio.dll \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]} \ - --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} + executables = [ "FamiStudio" ]; - # Bundled openal lib freezes the application - rm $out/lib/famistudio/libopenal32.so - ln -s ${openal}/lib/libopenal.so $out/lib/famistudio/libopenal32.so + postInstall = '' + mkdir -p $out/share/famistudio + for datdir in Setup/Demo\ {Instruments,Songs}; do + cp -R "$datdir" $out/share/famistudio/ + done + ''; - runHook postInstall + postFixup = '' + # FFMpeg looked up from PATH + wrapProgram $out/bin/FamiStudio \ + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} ''; + passthru.updateScript = ./update.sh; + meta = with lib; { homepage = "https://famistudio.org/"; description = "NES Music Editor"; @@ -62,10 +111,8 @@ stdenv.mkDerivation rec { or Famicom. It is targeted at both chiptune artists and NES homebrewers. ''; license = licenses.mit; - # Maybe possible to build from source but I'm not too familiar with C# packaging - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ OPNA2608 ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "famistudio"; + platforms = platforms.unix; + mainProgram = "FamiStudio"; }; } diff --git a/nixpkgs/pkgs/applications/audio/famistudio/deps.nix b/nixpkgs/pkgs/applications/audio/famistudio/deps.nix new file mode 100644 index 000000000000..f3a17967e25c --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/famistudio/deps.nix @@ -0,0 +1,5 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ +] diff --git a/nixpkgs/pkgs/applications/audio/famistudio/update.sh b/nixpkgs/pkgs/applications/audio/famistudio/update.sh new file mode 100755 index 000000000000..15657955c025 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/famistudio/update.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts +set -eo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +new_version="$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -s "https://api.github.com/repos/BleuBleu/FamiStudio/releases?per_page=1" | jq -r '.[0].tag_name')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +if [[ "$new_version" == "$old_version" ]]; then + echo "Up to date" + exit 0 +fi + +cd ../../../.. + +if [[ "$1" != "--deps-only" ]]; then + update-source-version famistudio "$new_version" +fi + +$(nix-build . -A famistudio.fetch-deps --no-out-link) "$deps_file" diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2.nix b/nixpkgs/pkgs/applications/audio/faust/faust2.nix index dc5dc477b03a..7df2dbf6518a 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust2.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust2.nix @@ -23,13 +23,13 @@ with lib.strings; let - version = "2.70.3"; + version = "2.72.14"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-z6fW/T7wJZxugmvABlpvyMXvR4WkmC16INOKyyfKx8k="; + sha256 = "sha256-RdSXiOYwKsfyrfHEughCeSwa9VFM6/3pMg54yCMpzLU="; fetchSubmodules = true; }; @@ -63,14 +63,6 @@ let ncurses_static ]; - patches = [ - (fetchpatch { - name = "fix-CsigFFun-API-declaration.patch"; - url = "https://github.com/grame-cncm/faust/commit/10ce960e91a6237c7bff14a338e770757076ce9e.patch"; - hash = "sha256-WMFLpLGTZpG7ni3lhI5VJHsmJViWZf4pAFuhYmFVRCE="; - }) - ]; - passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; }; preConfigure = '' diff --git a/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix b/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix index 75b3ae06556f..bf9ab68f9e88 100644 --- a/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.70.3"; + version = "2.72.14"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-QkksliLu2TnJ1GoM91e+Qf3SlRv3T06WNU++S3qq3e0="; + sha256 = "sha256-UBMVU2oAfoAaSQXxZxV+LFq8dyb5dvy/0cCG4XywZVc="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/nixpkgs/pkgs/applications/audio/feishin/darwin.nix b/nixpkgs/pkgs/applications/audio/feishin/darwin.nix deleted file mode 100644 index 5da2fa6ee025..000000000000 --- a/nixpkgs/pkgs/applications/audio/feishin/darwin.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv -, lib -, meta -, fetchurl -, unzip -, mpv -, electron_24 -, makeDesktopItem -, makeWrapper -, pname -, appname -, version -}: - -stdenv.mkDerivation { - inherit pname version meta; - - src = fetchurl { - url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip"; - hash = "sha256-sJg3hYOiELm+edw2JTFt6cPFdbDj6mLcLngeqEPaPgs="; - }; - - nativeBuildInputs = [ makeWrapper unzip ]; - - # Installs mpv as a requirement - propagatedBuildInputs = [ mpv ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/{Applications/${appname}.app,bin} - cp -R . $out/Applications/${appname}.app - makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} - runHook postInstall - ''; - - shellHook = '' - set -x - export LD_LIBRARY_PATH=${mpv}/lib - set +x - ''; -} diff --git a/nixpkgs/pkgs/applications/audio/feishin/default.nix b/nixpkgs/pkgs/applications/audio/feishin/default.nix index c89d5163c2a6..e0e35bae6df0 100644 --- a/nixpkgs/pkgs/applications/audio/feishin/default.nix +++ b/nixpkgs/pkgs/applications/audio/feishin/default.nix @@ -1,27 +1,161 @@ -{ lib -, stdenv -, callPackage -, ... -}@args: - +{ + lib, + stdenv, + buildNpmPackage, + fetchFromGitHub, + electron_27, + darwin, + copyDesktopItems, + makeDesktopItem, + ... +}: let - extraArgs = removeAttrs args [ "callPackage" ]; - pname = "feishin"; - version = "0.5.1"; - appname = "Feishin"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "jeffvli"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Nj8GwrH49ph14xvJldj5GQR4mlt9unCPEcgLrsH/sx8="; + }; + + electron = electron_27; +in +buildNpmPackage { + inherit pname version; + + inherit src; + npmDepsHash = "sha256-+pr9fWg/9kxkYMmthtqhjgF6MOomSQxVCO5V8tHHRdE="; + + npmFlags = [ "--legacy-peer-deps" ]; + makeCacheWritable = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + nativeBuildInputs = + lib.optionals (stdenv.isLinux) [ copyDesktopItems ] + ++ lib.optionals stdenv.isDarwin [ darwin.autoSignDarwinBinariesHook ]; + + postPatch = + '' + # release/app dependencies are installed on preConfigure + substituteInPlace package.json \ + --replace-fail "electron-builder install-app-deps &&" "" + + # Don't check for updates. + substituteInPlace src/main/main.ts \ + --replace-fail "autoUpdater.checkForUpdatesAndNotify();" "" + '' + + lib.optionalString stdenv.isLinux '' + # https://github.com/electron/electron/issues/31121 + substituteInPlace src/main/main.ts \ + --replace-fail "process.resourcesPath" "'$out/share/feishin/resources'" + ''; + + preConfigure = + let + releaseAppDeps = buildNpmPackage { + pname = "${pname}-release-app"; + inherit version; + + src = "${src}/release/app"; + npmDepsHash = "sha256-MRwKxe1hoFs5bPXT6K/UspSDs9XBdcRJGvxGlTKExp4="; + + npmFlags = [ "--ignore-scripts" ]; + dontNpmBuild = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + }; + releaseNodeModules = "${releaseAppDeps}/lib/node_modules/feishin/node_modules"; + in + '' + for release_module_path in "${releaseNodeModules}"/*; do + rm -rf node_modules/"$(basename "$release_module_path")" + ln -s "$release_module_path" node_modules/ + done + ''; + + postBuild = + lib.optionalString stdenv.isDarwin '' + # electron-builder appears to build directly on top of Electron.app, by overwriting the files in the bundle. + cp -r ${electron}/Applications/Electron.app ./ + find ./Electron.app -name 'Info.plist' | xargs -d '\n' chmod +rw + + # Disable code signing during build on macOS. + # https://github.com/electron-userland/electron-builder/blob/fa6fc16/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos + export CSC_IDENTITY_AUTO_DISCOVERY=false + sed -i "/afterSign/d" package.json + '' + + '' + npm exec electron-builder -- \ + --dir \ + -c.electronDist=${if stdenv.isDarwin then "./" else "${electron}/libexec/electron"} \ + -c.electronVersion=${electron.version} \ + -c.npmRebuild=false + ''; + + installPhase = + '' + runHook preInstall + '' + + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + cp -r release/build/**/Feishin.app $out/Applications/ + makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin + '' + + lib.optionalString stdenv.isLinux '' + mkdir -p $out/share/feishin + pushd release/build/*/ + cp -r locales resources{,.pak} $out/share/feishin + popd + + # Code relies on checking app.isPackaged, which returns false if the executable is electron. + # Set ELECTRON_FORCE_IS_PACKAGED=1. + # https://github.com/electron/electron/issues/35153#issuecomment-1202718531 + makeWrapper ${lib.getExe electron} $out/bin/feishin \ + --add-flags $out/share/feishin/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set ELECTRON_FORCE_IS_PACKAGED=1 \ + --inherit-argv0 + + for size in 32 64 128 256 512 1024; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + ln -s \ + $out/share/feishin/resources/assets/icons/"$size"x"$size".png \ + $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png + done + '' + + '' + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "feishin"; + desktopName = "Feishin"; + comment = "Full-featured Subsonic/Jellyfin compatible desktop music player"; + icon = pname; + exec = "feishin %u"; + categories = [ + "Audio" + "AudioVideo" + ]; + mimeTypes = [ "x-scheme-handler/feishin" ]; + }) + ]; meta = with lib; { description = "Full-featured Subsonic/Jellyfin compatible desktop music player"; homepage = "https://github.com/jeffvli/feishin"; changelog = "https://github.com/jeffvli/feishin/releases/tag/v${version}"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ onny ]; + sourceProvenance = with sourceTypes; [ fromSource ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + mainProgram = "feishin"; + maintainers = with maintainers; [ + onny + jlbribeiro + ]; }; - -in -if stdenv.isDarwin -then callPackage ./darwin.nix (extraArgs // { inherit pname appname version meta; }) -else callPackage ./linux.nix (extraArgs // { inherit pname appname version meta; }) +} diff --git a/nixpkgs/pkgs/applications/audio/feishin/linux.nix b/nixpkgs/pkgs/applications/audio/feishin/linux.nix deleted file mode 100644 index d503492adfc9..000000000000 --- a/nixpkgs/pkgs/applications/audio/feishin/linux.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv -, meta -, lib -, fetchurl -, mpv -, graphicsmagick -, electron_24 -, makeDesktopItem -, makeWrapper -, pname -, appname -, version -}: - -let - icon = fetchurl { - url = - "https://github.com/jeffvli/feishin/raw/development/assets/icons/1024x1024.png"; - sha256 = "sha256-8Qigt1CNMa3SDVK2cdqWJuMSl19yfy6nPQfME4qA48I="; - }; - - desktopItem = makeDesktopItem { - name = "feishin"; - desktopName = "Feishin"; - comment = "Full-featured Subsonic/Jellyfin compatible desktop music player"; - icon = "feishin"; - exec = "feishin %u"; - categories = [ "Audio" "AudioVideo" ]; - mimeTypes = [ "x-scheme-handler/feishin" ]; - }; -in - -stdenv.mkDerivation { - inherit pname version meta; - - src = fetchurl { - url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz"; - hash = "sha256-uYswGxSXz2YddoFs5F7f+ywqAr7qXqp6WryQ7ENSawQ="; - }; - - - nativeBuildInputs = [ makeWrapper graphicsmagick ]; - - # Installs mpv as a requirement - propagatedBuildInputs = [ mpv ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - mkdir -p $out/share - cp -r resources $out/share/${pname}/ - cp -r locales $out/share/${pname}/ - - makeWrapper ${electron_24}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/app.asar - install -m 444 -D "${desktopItem}/share/applications/"* \ - -t $out/share/applications/ - for size in 16 24 32 48 64 128 256 512; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/${appname}.png - done - runHook postInstall - ''; - - shellHook = '' - set -x - export LD_LIBRARY_PATH=${mpv}/lib - set +x - ''; -} diff --git a/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix b/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix index 56f76f6513c7..9197a21a28e1 100644 --- a/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix +++ b/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - hash = "sha256-3qLmo9Ibl44v6Jj5Ix17ixwqfPt3ITTXUqBETF5pzE4="; + hash = "sha256-CzKfvQzhF4Mz2WZaJM/Nt6XjF6ThlX4jyQSaXfZukG8="; }; outputs = [ "out" "dev" "man" ]; diff --git a/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index 0587fc8d4bbb..1f05808536e1 100644 --- a/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.79.2"; + version = "1.82"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - hash = "sha256-/RZXtSjJ0nRtlMreT4M/IYQpdv/UXjVJaHMld9wwaUw="; + hash = "sha256-qEwPKrgmWYMIwIdgKozG9kghCYp4aoYTX28GqKbuDu4="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/audio/furnace/default.nix b/nixpkgs/pkgs/applications/audio/furnace/default.nix index d39e49f4b7af..cc52c197974d 100644 --- a/nixpkgs/pkgs/applications/audio/furnace/default.nix +++ b/nixpkgs/pkgs/applications/audio/furnace/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "furnace"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-QUOZGUyZp20ls7rtDK+cmg3Smbd+hl1m9aMhHQmMMbY="; + hash = "sha256-Pv9Sx+bdoy8uV5o9i1rUSuokwQVA8EPYFkZXM8Fynmk="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/nixpkgs/pkgs/applications/audio/g4music/default.nix b/nixpkgs/pkgs/applications/audio/g4music/default.nix index bbb31c114659..0cc1987c356d 100644 --- a/nixpkgs/pkgs/applications/audio/g4music/default.nix +++ b/nixpkgs/pkgs/applications/audio/g4music/default.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "g4music"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-4UM1CspevlDHpuyvSekMM73XyxVqpdUDtJ7im7hnxHY="; + hash = "sha256-ljSXTEp+f4HMXhGWDGHdX6whm90Vo5KWOQunU2hHwo8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/galaxy-buds-client/default.nix b/nixpkgs/pkgs/applications/audio/galaxy-buds-client/default.nix index 15125358e464..6dd2256d7c8a 100644 --- a/nixpkgs/pkgs/applications/audio/galaxy-buds-client/default.nix +++ b/nixpkgs/pkgs/applications/audio/galaxy-buds-client/default.nix @@ -2,7 +2,6 @@ , stdenv , buildDotnetModule , fetchFromGitHub -, autoPatchelfHook , fontconfig , xorg , libglvnd @@ -27,7 +26,6 @@ buildDotnetModule rec { dotnetFlags = [ "-p:Runtimeidentifier=linux-x64" ]; nativeBuildInputs = [ - autoPatchelfHook copyDesktopItems graphicsmagick ]; diff --git a/nixpkgs/pkgs/applications/audio/gbsplay/default.nix b/nixpkgs/pkgs/applications/audio/gbsplay/default.nix index b86142ed47b5..5c7d302346e3 100644 --- a/nixpkgs/pkgs/applications/audio/gbsplay/default.nix +++ b/nixpkgs/pkgs/applications/audio/gbsplay/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gbsplay"; - version = "0.0.96"; + version = "0.0.97"; src = fetchFromGitHub { owner = "mmitch"; repo = "gbsplay"; rev = version; - sha256 = "sha256-2sYPP+urcSP67mHzbjRiL9BYgkIpONr7fPPbGQmBOqU="; + sha256 = "sha256-O4t5OzXcrGoxzSXr0nzc01bItjcp1LvFeWnbdSUDwFU="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/applications/audio/geonkick/default.nix b/nixpkgs/pkgs/applications/audio/geonkick/default.nix index 0f8bf17c68e8..9b1b5fb7c685 100644 --- a/nixpkgs/pkgs/applications/audio/geonkick/default.nix +++ b/nixpkgs/pkgs/applications/audio/geonkick/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "3.3.1"; + version = "3.4.0"; src = fetchFromGitLab { owner = "Geonkick-Synthesizer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fsDoqQqZsoeQa66dxb8JC2ywUFmBf6b2J+/ixWZTzfU="; + sha256 = "sha256-zoEC85QYcQMF92KvLBikYw1nDoSHaedpTDDqvoAtte0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix index bba557913297..55ffb370d60a 100644 --- a/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Listen to your favorite podcasts"; mainProgram = "gnome-podcasts"; - homepage = "https://wiki.gnome.org/Apps/Podcasts"; + homepage = "https://apps.gnome.org/Podcasts/"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix b/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix index 3d67cb7d46e9..944b2aa1aef1 100644 --- a/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix +++ b/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "go-musicfox"; - version = "4.3.1"; + version = "4.3.3"; src = fetchFromGitHub { owner = "go-musicfox"; - repo = pname; + repo = "go-musicfox"; rev = "v${version}"; - hash = "sha256-QZHuQAOnthSm7Kb82i3NUWTnKk+9OMHV5vzOU72inX0="; + hash = "sha256-J6R3T92cHFUkKwc+GKm612tVjglP2Tc/kDUmzUMhvio="; }; deleteVendor = true; - vendorHash = "sha256-6DeoxpjVfykBI3fJAJpMZwJ4VTooIbxGpk5+SW198hU="; + vendorHash = "sha256-KSIdBEEvYaYcDIDmzfRO857I8FSN4Ajw6phAPQLYEqg="; subPackages = [ "cmd/musicfox.go" ]; diff --git a/nixpkgs/pkgs/applications/audio/grandorgue/default.nix b/nixpkgs/pkgs/applications/audio/grandorgue/default.nix index 6ca3f39a9dc0..9e519510eb72 100644 --- a/nixpkgs/pkgs/applications/audio/grandorgue/default.nix +++ b/nixpkgs/pkgs/applications/audio/grandorgue/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.14.0"; + version = "3.14.2-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - hash = "sha256-kPz11V2yNmBe80egNLYxh/m2B1nDca3C5sGbEnrkqnw="; + hash = "sha256-FHM8fFUga9poGhojKBTF4gsJ6L4XEksueVxfMbngvks="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/audio/guitarix/default.nix b/nixpkgs/pkgs/applications/audio/guitarix/default.nix index 2134370eac9f..c1d1cf5571c5 100644 --- a/nixpkgs/pkgs/applications/audio/guitarix/default.nix +++ b/nixpkgs/pkgs/applications/audio/guitarix/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, fetchurl -, fetchpatch +, fetchFromGitHub , avahi , bluez , boost @@ -42,29 +41,19 @@ let inherit (lib) optional; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guitarix"; - version = "0.44.1"; + version = "0.46.0"; - src = fetchurl { - url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "d+g9dU9RrDjFQj847rVd5bPiYSjmC1EbAtLe/PNubBg="; + src = fetchFromGitHub { + owner = "brummer10"; + repo = "guitarix"; + rev = "V${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-AftC6fQEDzG/3C/83YbK/++bRgP7vPD0E2X6KEWpowc="; }; - patches = [ - (fetchpatch { - name = "gcc13-fixes.patch"; - url = "https://github.com/brummer10/guitarix/commit/b52736180b6966f24398f8a5ad179a58173473ec.patch"; - hash = "sha256-+jilgLujy/B6ijUb8NHzt3+4IKCt17X8LmuMLdmsvGw="; - relative = "trunk"; - }) - ]; - - # doesnt apply cleanly, so doing with substituteInPlace - # https://github.com/brummer10/guitarix/commit/39d7c21c4173eb0f121b1bbff439d9cf43331a00.patch - postPatch = '' - substituteInPlace wscript --replace "open(src_fname, 'rU')" "open(src_fname, 'r')" - ''; + sourceRoot = "${finalAttrs.src.name}/trunk"; nativeBuildInputs = [ gettext @@ -140,9 +129,9 @@ stdenv.mkDerivation rec { clean-sounds, nice overdrive, fat distortion and a diversity of crazy sounds never heard before. ''; - homepage = "http://guitarix.sourceforge.net/"; + homepage = "https://github.com/brummer10/guitarix"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ astsmtl goibhniu ]; + maintainers = with maintainers; [ astsmtl goibhniu lord-valen ]; platforms = platforms.linux; }; -} +}) diff --git a/nixpkgs/pkgs/applications/audio/jacktrip/default.nix b/nixpkgs/pkgs/applications/audio/jacktrip/default.nix index 150f05c5f53e..f8fb4cedbc9f 100644 --- a/nixpkgs/pkgs/applications/audio/jacktrip/default.nix +++ b/nixpkgs/pkgs/applications/audio/jacktrip/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - version = "2.2.4"; + version = "2.2.5"; pname = "jacktrip"; src = fetchFromGitHub { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { repo = "jacktrip"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-H1zjBNEFPvZRDEaFOiL1ZAlHQsNxeT4WbXEOqg0+eFg="; + sha256 = "sha256-rZ8oaud+ovJ7t+SGnWe7QbqjQns1EkbbwpdE+rLr6nc="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/applications/audio/kid3/default.nix b/nixpkgs/pkgs/applications/audio/kid3/default.nix index 1aa79a69e523..cae02e03e613 100644 --- a/nixpkgs/pkgs/applications/audio/kid3/default.nix +++ b/nixpkgs/pkgs/applications/audio/kid3/default.nix @@ -1,5 +1,4 @@ -{ - chromaprint +{ chromaprint , cmake , docbook_xml_dtd_45 , docbook_xsl @@ -7,25 +6,43 @@ , ffmpeg , flac , id3lib +, kdePackages , lib , libogg , libvorbis , libxslt , mp4v2 -, phonon , pkg-config , python3 , qtbase +, qtdeclarative , qtmultimedia -, qtquickcontrols , qttools , readline , stdenv , taglib , wrapQtAppsHook , zlib +, withCLI ? true +, withKDE ? true +, withQt ? false }: +let + inherit (lib) optionals; + + apps = lib.concatStringsSep ";" ( + optionals withCLI [ "CLI" ] + ++ optionals withKDE [ "KDE" ] + ++ optionals withQt [ "Qt" ] + ); + + mainProgram = + if withQt then "kid3-qt" + else if withKDE then "kid3" + else "kid3-cli"; + +in stdenv.mkDerivation (finalAttrs: { pname = "kid3"; version = "3.9.5"; @@ -41,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { docbook_xsl pkg-config python3 + qttools wrapQtAppsHook ]; @@ -53,25 +71,32 @@ stdenv.mkDerivation (finalAttrs: { libvorbis libxslt mp4v2 - phonon qtbase + qtdeclarative qtmultimedia - qtquickcontrols - qttools readline taglib zlib - ]; + ] ++ lib.optionals withKDE (with kdePackages; [ + kconfig + kconfigwidgets + kcoreaddons + kio + kxmlgui + phonon + ]); - cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ]; - NIX_LDFLAGS = "-lm -lpthread"; + cmakeFlags = [ (lib.cmakeFeature "WITH_APPS" apps) ]; - preConfigure = '' - export DOCBOOKDIR="${docbook_xsl}/xml/xsl/docbook/" - ''; + env = { + DOCBOOKDIR = "${docbook_xsl}/xml/xsl/docbook/"; + LANG = "C.UTF-8"; + NIX_LDFLAGS = "-lm -lpthread"; + }; meta = { description = "A simple and powerful audio tag editor"; + inherit mainProgram; homepage = "https://kid3.kde.org/"; license = lib.licenses.lgpl2Plus; longDescription = '' @@ -103,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { - Edit synchronized lyrics and event timing codes, import and export LRC files. ''; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; }) diff --git a/nixpkgs/pkgs/applications/audio/ledfx/default.nix b/nixpkgs/pkgs/applications/audio/ledfx/default.nix index 62ba0f90ace9..bcbe1bc397d3 100644 --- a/nixpkgs/pkgs/applications/audio/ledfx/default.nix +++ b/nixpkgs/pkgs/applications/audio/ledfx/default.nix @@ -1,16 +1,17 @@ -{ lib -, fetchPypi -, python3 +{ + lib, + fetchPypi, + python3, }: python3.pkgs.buildPythonPackage rec { pname = "ledfx"; - version = "2.0.94"; + version = "2.0.96"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-l498NXt3Ib9QLTWoJcpngAwkbY6JqLbVLKhTWQye7Fs="; + hash = "sha256-nvPHAnoD5j1rneeuMufQkXj8YWXau2zJYug+Avpe87I="; }; pythonRelaxDeps = true; @@ -20,13 +21,14 @@ python3.pkgs.buildPythonPackage rec { "rpi-ws281x" ]; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ cython poetry-core - pythonRelaxDepsHook ]; - propagatedBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; + + dependencies = with python3.pkgs; [ aiohttp aiohttp-cors aubio diff --git a/nixpkgs/pkgs/applications/audio/linuxsampler/default.nix b/nixpkgs/pkgs/applications/audio/linuxsampler/default.nix index 93e16098a84c..f2d512c721a8 100644 --- a/nixpkgs/pkgs/applications/audio/linuxsampler/default.nix +++ b/nixpkgs/pkgs/applications/audio/linuxsampler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "linuxsampler"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ii+dylTUXmazP8NVjAAMdHs7NK+puml0IrF4fc6DEls="; + sha256 = "sha256-T7quk5N5JBiPqIziQd0vaCr8tLDbwS6otz6egY01OTE="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix b/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix index 9bf9c35d4bd7..9f633fc8d079 100644 --- a/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "listenbrainz-mpd"; - version = "2.3.3"; + version = "2.3.5"; src = fetchFromGitea { domain = "codeberg.org"; owner = "elomatreb"; repo = "listenbrainz-mpd"; rev = "v${version}"; - hash = "sha256-4FNFaVi+fxoXo2tl+bynHqh8yRt0Q4z/El/4m0GXZUY="; + hash = "sha256-z3SVpPCWZqCVXPKbPxZAKGtk8Z/Tf5PULn0dWsKlVrE="; }; - cargoHash = "sha256-FS7OYzKx/lQh86QQ8Dk9v1JrWUxPHNz3kITiEJ3sNng="; + cargoHash = "sha256-eCdUrxt9edJm6K3f8V8bjgYWMq3mgj/ZfUZYWE3ZBqw="; nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; diff --git a/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix b/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix index d3cb9fcfab01..b575f717be74 100644 --- a/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix +++ b/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { pname = "littlegptracker"; - version = "unstable-2020-11-26"; + version = "0-unstable-2020-11-26"; src = fetchFromGitHub { owner = "Mdashdotdashn"; diff --git a/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/nixpkgs/pkgs/applications/audio/lollypop/default.nix index 34dbf0318a71..3fb5e7efa798 100644 --- a/nixpkgs/pkgs/applications/audio/lollypop/default.nix +++ b/nixpkgs/pkgs/applications/audio/lollypop/default.nix @@ -102,7 +102,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}"; description = "A modern music player for GNOME"; - homepage = "https://wiki.gnome.org/Apps/Lollypop"; + homepage = "https://gitlab.gnome.org/World/lollypop"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/audio/miniplayer/default.nix b/nixpkgs/pkgs/applications/audio/miniplayer/default.nix index 018fd6c8b78f..e3837baeca04 100644 --- a/nixpkgs/pkgs/applications/audio/miniplayer/default.nix +++ b/nixpkgs/pkgs/applications/audio/miniplayer/default.nix @@ -15,7 +15,11 @@ buildPythonApplication rec { hash = "sha256-iUUsVIDLQAiaMomfA2LvvJZ2ePhgADtC6GCwIpRC1MA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ colorthief ffmpeg-python mpd2 @@ -25,6 +29,8 @@ buildPythonApplication rec { ueberzug ]; + doCheck = false; # no tests + # pythonImportsCheck is disabled because this package doesn't expose any modules. meta = with lib; { diff --git a/nixpkgs/pkgs/applications/audio/mmlgui/default.nix b/nixpkgs/pkgs/applications/audio/mmlgui/default.nix index aab0acb25019..d9197abd04dc 100644 --- a/nixpkgs/pkgs/applications/audio/mmlgui/default.nix +++ b/nixpkgs/pkgs/applications/audio/mmlgui/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "mmlgui"; - version = "unstable-2023-11-16"; + version = "210420-preview-unstable-2024-04-15"; src = fetchFromGitHub { owner = "superctr"; repo = "mmlgui"; - rev = "627bfc7b67d4d87253517ba71df2d699a8acdd10"; + rev = "e49f225ac2b2d46056b2c45a5d31c544227c4968"; fetchSubmodules = true; - hash = "sha256-d/QLRlSfCrrcvzIhwEBKB5chK+XqO/R8xJ5VfagDi4U="; + hash = "sha256-hj2k1BrE8AA2HTBEO03RammlZV2U4KW0gLJmFNiaSvI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix b/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix index c68d14b28f99..0018c99bc1af 100644 --- a/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix +++ b/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.60"; + version = "10.71"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-llOo9G65UDDCzaSahq5qssw6SmOJ5C9qS2bdXB/pKF0="; + hash = "sha256-YHPC+dHfvRSr6GldWSlgCGt/wuO/WXQGRliarnM8/AU="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/mopidy/jellyfin.nix b/nixpkgs/pkgs/applications/audio/mopidy/jellyfin.nix index d7d808cf685d..932983aa4dda 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/jellyfin.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/jellyfin.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-jellyfin"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit version; pname = "Mopidy-Jellyfin"; - sha256 = "ny0u6HdOlZCsmIzZuQ1rql+bvHU3xkh8IdwhJVHNH9c="; + sha256 = "sha256-cZliraTxTAJ2dXaxttWI3x4wCkmEhEo33GTNtAYwgTc="; }; propagatedBuildInputs = [ mopidy python3Packages.unidecode python3Packages.websocket-client ]; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix b/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix index 58b5f852a4c9..4b6fe17e8225 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; - version = "unstable-2024-02-27"; + version = "4.1.1-unstable-2024-02-27"; src = fetchFromGitHub { owner = "mopidy"; @@ -22,7 +22,9 @@ pythonPackages.buildPythonApplication rec { pythonImportsCheck = [ "mopidy_spotify" ]; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { homepage = "https://github.com/mopidy/mopidy-spotify"; diff --git a/nixpkgs/pkgs/applications/audio/mpg123/default.nix b/nixpkgs/pkgs/applications/audio/mpg123/default.nix index 7a666da0d23f..f7480557eb5e 100644 --- a/nixpkgs/pkgs/applications/audio/mpg123/default.nix +++ b/nixpkgs/pkgs/applications/audio/mpg123/default.nix @@ -15,17 +15,18 @@ , jack , withConplay ? !stdenv.hostPlatform.isWindows , perl +, writeScript }: assert withConplay -> !libOnly; stdenv.mkDerivation rec { pname = "${lib.optionalString libOnly "lib"}mpg123"; - version = "1.32.5"; + version = "1.32.6"; src = fetchurl { url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2"; - hash = "sha256-r5CM32zbZUS5e8cGp5n3mJTmlGivWIG/RUoOu5Fx7WM="; + hash = "sha256-zN0dCrwx1z2LQ1/GWMeQSdCpBbMGabakKgOtFp3GCeY="; }; outputs = [ "out" "dev" "man" ] ++ lib.optional withConplay "conplay"; @@ -69,6 +70,20 @@ stdenv.mkDerivation rec { --prefix PATH : $out/bin ''; + passthru = { + updateScript = writeScript "update-mpg123" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of '<a href="download/mpg123-1.32.6.tar.bz2">' + new_version="$(curl -s https://mpg123.org/download.shtml | + pcregrep -o1 '<a href="download/mpg123-([0-9.]+).tar.bz2">')" + update-source-version ${pname} "$new_version" + ''; + }; + meta = with lib; { description = "Fast console MPEG Audio Player and decoder library"; homepage = "https://mpg123.org"; diff --git a/nixpkgs/pkgs/applications/audio/museeks/default.nix b/nixpkgs/pkgs/applications/audio/museeks/default.nix index 206fee9de709..5db7f5bd4084 100644 --- a/nixpkgs/pkgs/applications/audio/museeks/default.nix +++ b/nixpkgs/pkgs/applications/audio/museeks/default.nix @@ -17,8 +17,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - mkdir -p $out/share/${pname} cp -a ${appimageContents}/{locales,resources} $out/share/${pname} cp -a ${appimageContents}/usr/share/icons $out/share/ diff --git a/nixpkgs/pkgs/applications/audio/musescore/default.nix b/nixpkgs/pkgs/applications/audio/musescore/default.nix index d6c90f896dfd..707ec5c8ebfe 100644 --- a/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , wrapQtAppsHook , pkg-config @@ -129,7 +128,7 @@ in stdenv'.mkDerivation (finalAttrs: { mkdir -p "$out/Applications" mv "$out/mscore.app" "$out/Applications/mscore.app" mkdir -p $out/bin - ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore. + ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore ''; # Don't run bundled upstreams tests, as they require a running X window system. @@ -143,5 +142,6 @@ in stdenv'.mkDerivation (finalAttrs: { license = licenses.gpl3Only; maintainers = with maintainers; [ vandenoever doronbehar ]; mainProgram = "mscore"; + platforms = platforms.unix; }; }) diff --git a/nixpkgs/pkgs/applications/audio/music-player/default.nix b/nixpkgs/pkgs/applications/audio/music-player/default.nix index b28785d9368b..0a93443df473 100644 --- a/nixpkgs/pkgs/applications/audio/music-player/default.nix +++ b/nixpkgs/pkgs/applications/audio/music-player/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/tsirysndr/music-player"; changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "music-player"; }; } diff --git a/nixpkgs/pkgs/applications/audio/muzika/default.nix b/nixpkgs/pkgs/applications/audio/muzika/default.nix index 86a3f1961983..d3b4e3d27452 100644 --- a/nixpkgs/pkgs/applications/audio/muzika/default.nix +++ b/nixpkgs/pkgs/applications/audio/muzika/default.nix @@ -2,7 +2,7 @@ , desktop-file-utils , fetchFromGitHub , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , gjs , glib-networking , gobject-introspection @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ninja nodejs pkg-config - prefetch-yarn-deps + fixup-yarn-lock wrapGAppsHook4 yarn ]; diff --git a/nixpkgs/pkgs/applications/audio/mympd/default.nix b/nixpkgs/pkgs/applications/audio/mympd/default.nix index bf60c8a4439d..cae2a3b7f1a9 100644 --- a/nixpkgs/pkgs/applications/audio/mympd/default.nix +++ b/nixpkgs/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "14.1.0"; + version = "14.1.2"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-yNB5WQi3M4cYogtxx/vLi2xJog2keyFrJIMlx663DLo="; + sha256 = "sha256-CMqH9iy9U85bKj7YLcYsKFs5CDePGBEfUWL+sb7WzBw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/nixpkgs/pkgs/applications/audio/ncspot/default.nix index e70a2eb26f17..1bc391b4b55c 100644 --- a/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncspot/default.nix @@ -6,12 +6,13 @@ , ncurses , openssl , Cocoa -, withALSA ? true, alsa-lib +, withALSA ? false, alsa-lib , withClipboard ? true, libxcb, python3 , withCover ? false, ueberzug -, withPulseAudio ? false, libpulseaudio +, withPulseAudio ? true, libpulseaudio , withPortAudio ? false, portaudio , withMPRIS ? true, withNotify ? true, dbus +, withCrossterm ? true , nix-update-script , testers , ncspot @@ -54,6 +55,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optional withPulseAudio "pulseaudio_backend" ++ lib.optional withPortAudio "portaudio_backend" ++ lib.optional withMPRIS "mpris" + ++ lib.optional withCrossterm "crossterm_backend" ++ lib.optional withNotify "notify"; postInstall = '' @@ -71,7 +73,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/hrkfdn/ncspot"; changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}"; license = licenses.bsd2; - maintainers = with maintainers; [ marsam liff ]; + maintainers = with maintainers; [ liff ]; mainProgram = "ncspot"; }; } diff --git a/nixpkgs/pkgs/applications/audio/nuclear/default.nix b/nixpkgs/pkgs/applications/audio/nuclear/default.nix index 605596563e0b..2d6a4384e747 100644 --- a/nixpkgs/pkgs/applications/audio/nuclear/default.nix +++ b/nixpkgs/pkgs/applications/audio/nuclear/default.nix @@ -21,10 +21,6 @@ appimageTools.wrapType2 { substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share - - # unless linked, the binary is placed in $out/bin/nuclear-someVersion - # link it to $out/bin/nuclear - ln -s $out/bin/${pname}-${version} $out/bin/${pname} ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix b/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix index b789dc668a8e..60b9bc23bc36 100644 --- a/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix +++ b/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.26.1"; + version = "1.26.2"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-uw9vj12vs2N4nap6z1L6sGoCuPpRCmvfGoK/b+zHwHA="; + hash = "sha256-hBQyz6VAtiC1XOADZml1MwGKtmdyiJNlRAmHRjt6QsA="; }; # Remove some Electron stuff from package.json diff --git a/nixpkgs/pkgs/applications/audio/parlatype/default.nix b/nixpkgs/pkgs/applications/audio/parlatype/default.nix index d05130de4124..927de1d93856 100644 --- a/nixpkgs/pkgs/applications/audio/parlatype/default.nix +++ b/nixpkgs/pkgs/applications/audio/parlatype/default.nix @@ -10,23 +10,24 @@ , hicolor-icon-theme , isocodes , itstool +, libadwaita , libxml2 , meson , ninja , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "parlatype"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "gkarsay"; repo = pname; rev = "v${version}"; - sha256 = "1iyjxss6sgc9gx6ij30zz97bl31qix8pxklzn4kknh1b0j7hhbwq"; + sha256 = "0546rl5sm7xmgl54cqps3a7bhfs7xdvz98jgdcf4sgiz1k2vh9xq"; }; nativeBuildInputs = [ @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -53,9 +54,12 @@ stdenv.mkDerivation rec { gtk4 hicolor-icon-theme isocodes + libadwaita ]; postPatch = '' + substituteInPlace data/meson_post_install.py \ + --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' patchShebangs data/meson_post_install.py patchShebangs libparlatype/tests/data/generate_config_data ''; @@ -72,7 +76,8 @@ stdenv.mkDerivation rec { useful for journalists, students, scientists and whoever needs to transcribe audio files. ''; - homepage = "https://www.parlatype.org/"; + # maintainer lost control of parlatype.org + homepage = "https://github.com/gkarsay/parlatype"; license = licenses.gpl3Plus; maintainers = with maintainers; [ alexshpilkin melchips ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/nixpkgs/pkgs/applications/audio/plexamp/default.nix index c3d36d3b3836..245760be5f70 100644 --- a/nixpkgs/pkgs/applications/audio/plexamp/default.nix +++ b/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -20,7 +20,6 @@ in appimageTools.wrapType2 { extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; extraInstallCommands = '' - ln -s $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop install -m 444 -D ${appimageContents}/plexamp.png \ $out/share/icons/hicolor/512x512/apps/plexamp.png diff --git a/nixpkgs/pkgs/applications/audio/psst/default.nix b/nixpkgs/pkgs/applications/audio/psst/default.nix index 7abb8e78d161..4d81f3f212bb 100644 --- a/nixpkgs/pkgs/applications/audio/psst/default.nix +++ b/nixpkgs/pkgs/applications/audio/psst/default.nix @@ -16,13 +16,13 @@ let in rustPlatform.buildRustPackage rec { pname = "psst"; - version = "unstable-2024-02-11"; + version = "unstable-2024-04-01"; src = fetchFromGitHub { owner = "jpochyla"; repo = pname; - rev = "0cb4f6964b5ba771182ccfe005260a86a494ef92"; - hash = "sha256-W+MFToyvYDQuC/8DqigvENxzJ6QGQOAeAdmdWG6+qZk="; + rev = "37d8da11774c6eff3d1c2902ac883dace178e832"; + hash = "sha256-BGIbf7jtrspFqURyy2AIYKSSkcirLgj0oUBq0CHl+2s="; }; cargoLock = { diff --git a/nixpkgs/pkgs/applications/audio/psst/make-build-reproducible.patch b/nixpkgs/pkgs/applications/audio/psst/make-build-reproducible.patch index fb74db8ccb99..5598c443b3c6 100644 --- a/nixpkgs/pkgs/applications/audio/psst/make-build-reproducible.patch +++ b/nixpkgs/pkgs/applications/audio/psst/make-build-reproducible.patch @@ -51,7 +51,7 @@ index fcbd491..2d71ee3 100644 -pub const GIT_VERSION: &str = git_version!(); -pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt")); -pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt")); -+pub const GIT_VERSION: &str = "0cb4f6964b5ba771182ccfe005260a86a494ef92"; ++pub const GIT_VERSION: &str = "37d8da11774c6eff3d1c2902ac883dace178e832"; +pub const BUILD_TIME: &str = "1970-01-01 00:00:00"; +pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst"; diff --git a/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index c4213c06f8bc..975b44866e81 100644 --- a/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pt2-clone"; - version = "1.67"; + version = "1.69.2"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-fTUTXwS6A72zhKkANlSljQVvPeN5rOTyuyb8vLxYfdk="; + sha256 = "sha256-Vy8b9rbYM/bK/mCUW4V4rPeAmoBN/wn7iVBANSboL2Q="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/audio/puddletag/default.nix b/nixpkgs/pkgs/applications/audio/puddletag/default.nix index ddeee09d829d..3b6e215d2ffb 100644 --- a/nixpkgs/pkgs/applications/audio/puddletag/default.nix +++ b/nixpkgs/pkgs/applications/audio/puddletag/default.nix @@ -1,24 +1,12 @@ { lib , fetchFromGitHub +, fetchurl , python3 +, qtbase +, qtwayland , wrapQtAppsHook }: -# As of 2.1, puddletag has started pinning versions of all dependencies that it -# was built against which is an issue as the chances of us having the exact same -# versions in nixpkgs are slim to none. -# -# There is a difference between explicit and implicit version requirements and -# we should be able to safely ignore the latter. Therefore use requirements.in -# which contains just the explicit version dependencies instead of -# requirements.txt. -# -# Additionally, we do need to override some of the explicit requirements through -# `overrideVersions`. While we technically run the risk of breaking something by -# ignoring the pinned versions, it's just something we will have to accept -# unless we want to vendor those versions. - - python3.pkgs.buildPythonApplication rec { pname = "puddletag"; version = "2.3.0"; @@ -31,6 +19,14 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-oScT8YcQoDf2qZ+J7xKm22Sbfym3tkVUrWT5D2LU5e8="; }; + patches = [ + (fetchurl { + url = "https://github.com/puddletag/puddletag/commit/54074824adb05da42c03d7adfbba94d8e24982f0.patch"; + hash = "sha256-DkgaFWgp2m2bRuhdXhHW+nxV/2GaCgeRNdwLMYAkcYQ="; + name = "fix_for_pyparsing_3_1_2.patch"; + }) + ]; + pythonRelaxDeps = true; pythonRemoveDeps = [ @@ -43,6 +39,11 @@ python3.pkgs.buildPythonApplication rec { --replace share/pixmaps share/icons ''; + buildInputs = [ + qtbase + qtwayland + ]; + nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook wrapQtAppsHook @@ -63,11 +64,13 @@ python3.pkgs.buildPythonApplication rec { # the file should be executable but it isn't so our wrapper doesn't run preFixup = '' chmod 555 $out/bin/puddletag - wrapQtApp $out/bin/puddletag + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; doCheck = false; # there are no tests + dontWrapQtApps = true; # to avoid double-wrapping + dontStrip = true; # we are not generating any binaries meta = with lib; { diff --git a/nixpkgs/pkgs/applications/audio/pwvucontrol/Cargo.lock b/nixpkgs/pkgs/applications/audio/pwvucontrol/Cargo.lock index 035a6d9af2f8..c894d9222ae7 100644 --- a/nixpkgs/pkgs/applications/audio/pwvucontrol/Cargo.lock +++ b/nixpkgs/pkgs/applications/audio/pwvucontrol/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "autocfg" @@ -25,11 +25,11 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bindgen" -version = "0.64.0" +version = "0.66.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cexpr", "clang-sys", "lazy_static", @@ -40,7 +40,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] @@ -51,9 +51,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bitmaps" @@ -76,7 +76,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "cairo-sys-rs", "glib", "libc", @@ -137,6 +137,7 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", + "libloading", ] [[package]] @@ -226,7 +227,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -287,9 +288,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8965ed5455cbfa1eb45c14a3b971cbacb43481913a3a5b9078b2ef0d9a01bd4b" +checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -302,9 +303,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeffd4a7d68046c28666d817071bf025254aaed4df35099443f0c306ca6177f3" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -375,7 +376,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "futures-channel", "futures-core", "futures-executor", @@ -404,7 +405,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -459,9 +460,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b3b9e8090acb325d08cde84b30fc29b963a75fbac93160e9c5a30d2b335742" +checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" dependencies = [ "cairo-rs", "gdk4", @@ -474,9 +475,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0770d1ede7189092748c4ef5b6921264eb945fd2318a58e8f59dc273000810f8" +checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -490,9 +491,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0973f9b9ade10fc22403810b7283d47b533033715f2aaa36288cd3bf90d63efc" +checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" dependencies = [ "cairo-rs", "field-offset", @@ -511,9 +512,9 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9f2c4530f3168fe506b0be7bc15f7a93ef38d020edb27d81a921a26cbca851" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", "proc-macro-crate", @@ -525,9 +526,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19fde71ef2e78ac8fb18073c345b5f29609048d4045a345613645aa1163243c1" +checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -629,11 +630,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] name = "libspa" -version = "0.6.0" -source = "git+https://gitlab.freedesktop.org/saivert/pipewire-rs?branch=misc_fixes#46bfbd8bdf0ad3ff1d25d02b2e36f97333c78e23" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcdea6b6663acf456641a4dea1b87fa6970a3e881596237713192d8f5423b542" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "cc", "convert_case", "cookie-factory", @@ -646,8 +658,9 @@ dependencies = [ [[package]] name = "libspa-sys" -version = "0.6.0" -source = "git+https://gitlab.freedesktop.org/saivert/pipewire-rs?branch=misc_fixes#46bfbd8bdf0ad3ff1d25d02b2e36f97333c78e23" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63fc701d3375e6e255765d6a6172d9af06583115e78f3dfe2c8ff1dfd0b2dab" dependencies = [ "bindgen", "cc", @@ -669,9 +682,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "malloc_buf" @@ -816,11 +829,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pipewire" -version = "0.6.0" -source = "git+https://gitlab.freedesktop.org/saivert/pipewire-rs?branch=misc_fixes#46bfbd8bdf0ad3ff1d25d02b2e36f97333c78e23" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "062c97c31818918b8bffdc66cfd93f3e4b4141f505c63234f9ff0a658fddedab" dependencies = [ "anyhow", - "bitflags 2.3.3", + "bitflags 2.4.0", "libc", "libspa", "libspa-sys", @@ -832,8 +846,9 @@ dependencies = [ [[package]] name = "pipewire-sys" -version = "0.6.0" -source = "git+https://gitlab.freedesktop.org/saivert/pipewire-rs?branch=misc_fixes#46bfbd8bdf0ad3ff1d25d02b2e36f97333c78e23" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d558e2cffe5f97ac32c7e0b6cb6074b5271b8c2c628ac68633342ee08fdab308" dependencies = [ "bindgen", "libspa-sys", @@ -908,9 +923,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1045,9 +1060,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1081,22 +1096,22 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1187,9 +1202,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winnow" -version = "0.5.4" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" +checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" dependencies = [ "memchr", ] @@ -1197,9 +1212,9 @@ dependencies = [ [[package]] name = "wireplumber" version = "0.1.0" -source = "git+https://github.com/saivert/wireplumber.rs.git?branch=use_pipewire_from_git#8dbf383ce54dee7b8d578b87c13f3507a65291f8" +source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=341b0c4e8d177f5f21c109cf88cca4f2dc1f853a#341b0c4e8d177f5f21c109cf88cca4f2dc1f853a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "gio", "glib", "libc", @@ -1213,7 +1228,7 @@ dependencies = [ [[package]] name = "wireplumber-sys" version = "0.1.0" -source = "git+https://github.com/saivert/wireplumber.rs.git?branch=use_pipewire_from_git#8dbf383ce54dee7b8d578b87c13f3507a65291f8" +source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=341b0c4e8d177f5f21c109cf88cca4f2dc1f853a#341b0c4e8d177f5f21c109cf88cca4f2dc1f853a" dependencies = [ "gio-sys", "glib-sys", diff --git a/nixpkgs/pkgs/applications/audio/pwvucontrol/default.nix b/nixpkgs/pkgs/applications/audio/pwvucontrol/default.nix index 935fadb5f2fb..ae631e1ff516 100644 --- a/nixpkgs/pkgs/applications/audio/pwvucontrol/default.nix +++ b/nixpkgs/pkgs/applications/audio/pwvucontrol/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchFromGitLab , cargo , desktop-file-utils , meson @@ -19,22 +20,33 @@ , wireplumber }: +let + wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec { + version = "0.4.17"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pipewire"; + repo = "wireplumber"; + rev = version; + hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI="; + }; + }); +in stdenv.mkDerivation rec { pname = "pwvucontrol"; - version = "0.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "saivert"; repo = "pwvucontrol"; rev = version; - hash = "sha256-jBvMLewBZi4LyX//YUyJQjqPvxnKqlpuLZAm9zpDMrA="; + hash = "sha256-t4JUpKtuO1JgrdsNbl0M/SwPmoqu7WxsaD74vlJeVhY="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "libspa-0.6.0" = "sha256-CVLQ9JXRMo78/kay1TpRgRuk5v/Z5puPVMzLA30JRk8="; - "wireplumber-0.1.0" = "sha256-wkku9vqIMdV+HTkWCPXKH2KM1Xzf0xApC5zrVmgxhsA="; + "wireplumber-0.1.0" = "sha256-+LZ8xKok2AOegW8WvfrfZGXuQB4xHrLNshcTOHab+xQ="; }; }; @@ -58,7 +70,7 @@ stdenv.mkDerivation rec { libadwaita pango pipewire - wireplumber + wireplumber_0_4 ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/audio/pyradio/default.nix b/nixpkgs/pkgs/applications/audio/pyradio/default.nix index 9748c9f16111..72cbfd443c08 100644 --- a/nixpkgs/pkgs/applications/audio/pyradio/default.nix +++ b/nixpkgs/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.9.2.25"; + version = "0.9.3.4"; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; rev = "refs/tags/${version}"; - hash = "sha256-GkOp0iK84HDvVH8RmtmIKJ5EtQIECgZS5g8pmaIhUcc="; + hash = "sha256-QifBzQsvYU5kP5mnidOgWGBh3h2MvJm8Wo0i1v6j/cU="; }; nativeBuildInputs = [ @@ -42,6 +42,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "pyradio"; changelog = "https://github.com/coderholic/pyradio/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ contrun ]; + maintainers = with maintainers; [ contrun yayayayaka ]; }; } diff --git a/nixpkgs/pkgs/applications/audio/qmmp/default.nix b/nixpkgs/pkgs/applications/audio/qmmp/default.nix index 427d9f48c1fd..943c5ab0b974 100644 --- a/nixpkgs/pkgs/applications/audio/qmmp/default.nix +++ b/nixpkgs/pkgs/applications/audio/qmmp/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "qmmp"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2"; - hash = "sha256-knqo5yCkcO/bFmM++z+SdiWzpDKK9ooV0wqlcIKj7so="; + hash = "sha256-5qdnvGFgFEk+00tjnVhqW29AyyjCfiFQOyYyVmAjHnM="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix b/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix index de419c8fa48c..60ac9cb81b79 100644 --- a/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix +++ b/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.6.2"; + version = "0.7.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-GlXUQz7tj7dfxVikvu0idzhQaq7raFC9jxJ2zFeHBQU="; + sha256 = "sha256-mtW+dbjdp7as0N5+iacMSNrJ4jm8HWYqJP6G+lutucc="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/audio/qsynth/default.nix b/nixpkgs/pkgs/applications/audio/qsynth/default.nix index 714a66f6e2c8..88ec50acc6de 100644 --- a/nixpkgs/pkgs/applications/audio/qsynth/default.nix +++ b/nixpkgs/pkgs/applications/audio/qsynth/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "qsynth"; - version = "0.9.13"; + version = "0.9.90"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - hash = "sha256-SvgZrdS6BwWhNgbovcfhpQKVcu0iwr4dDqeIckuo1fk="; + hash = "sha256-5lqmoUku4/8oKxlQio1nJtMu1kn42iK8mi0K3s9y70M="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/audio/rakarrack/default.nix b/nixpkgs/pkgs/applications/audio/rakarrack/default.nix index e78502eb23f7..4b693da3a622 100644 --- a/nixpkgs/pkgs/applications/audio/rakarrack/default.nix +++ b/nixpkgs/pkgs/applications/audio/rakarrack/default.nix @@ -12,7 +12,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - patches = [ ./fltk-path.patch ]; + patches = [ + ./fltk-path.patch + # https://sourceforge.net/p/rakarrack/git/merge-requests/2/ + ./looper-preset.patch + ]; buildInputs = [ alsa-lib alsa-utils fltk libjack2 libXft libXpm libjpeg libpng libsamplerate libsndfile zlib ]; diff --git a/nixpkgs/pkgs/applications/audio/rakarrack/looper-preset.patch b/nixpkgs/pkgs/applications/audio/rakarrack/looper-preset.patch new file mode 100644 index 000000000000..42e5057dcefe --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/rakarrack/looper-preset.patch @@ -0,0 +1,11 @@ +diff -Naurd rakarrack-0.6.1/src/Looper.C rakarrack-0.6.1-segfault/src/Looper.C +--- rakarrack-0.6.1/src/Looper.C 2010-10-01 01:27:55.000000000 +0000 ++++ rakarrack-0.6.1-segfault/src/Looper.C 2023-12-08 21:12:31.818569726 +0000 +@@ -34,6 +34,7 @@ + efxoutr = efxoutr_; + + //default values ++ Ppreset = 0; + Pclear = 1; + Pplay = 0; + Precord = 0; diff --git a/nixpkgs/pkgs/applications/audio/reaper/default.nix b/nixpkgs/pkgs/applications/audio/reaper/default.nix index ba84f8c2aba4..7adba1d0c156 100644 --- a/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.11"; + version = "7.15"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.isDarwin then "sha256-8GWfrr+kKF3Ei6Fed9Oei461veRXXbTICvyNJNLBbYM=" else { - x86_64-linux = "sha256-lpgGXHWWhhs1jLllq5C3UhOLgLyMTE6qWFiGkBcuWlo="; - aarch64-linux = "sha256-0iTdrZYjKzPyNLMIM4othtAMox/65HBEy1VickOZFnA="; + hash = if stdenv.isDarwin then "sha256-7tWgbHIkARgsPi0buvbQb4qTqndyPwRRqut1Gj4WNZE=" else { + x86_64-linux = "sha256-O1xh+DKwPKTcQrNhWMX5ErKa1hXq0yeyt/XJMQav11c="; + aarch64-linux = "sha256-rQE8Aa+iFWpA18udCXm4JW8BPTEDeEQAupy353Sbcl8="; }.${stdenv.hostPlatform.system}; }; diff --git a/nixpkgs/pkgs/applications/audio/renoise/default.nix b/nixpkgs/pkgs/applications/audio/renoise/default.nix index d3462ecc6ad5..a56d43876fb0 100644 --- a/nixpkgs/pkgs/applications/audio/renoise/default.nix +++ b/nixpkgs/pkgs/applications/audio/renoise/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { releasePath else let - platform = platforms.${stdenv.system}; + platform = platforms.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); urlVersion = lib.replaceStrings [ "." ] [ "_" ] version; in fetchurl { url = diff --git a/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix b/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix index 9929a32aabbf..c14638912af2 100644 --- a/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix +++ b/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Rhythmbox"; + homepage = "https://gitlab.gnome.org/GNOME/rhythmbox"; description = "A music playing application for GNOME"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix b/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix index c54726d058d4..042666d2e1c7 100644 --- a/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix +++ b/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "roomeqwizard"; - version = "5.30.9"; + version = "5.31.1"; src = fetchurl { url = "https://www.roomeqwizard.com/installers/REW_linux_no_jre_${lib.replaceStrings [ "." ] [ "_" ] version}.sh"; - sha256 = "sha256-gyitOq/HTDruP4nY6B7y1E+pL43yRhldyiiXEjKyogU="; + sha256 = "sha256-n1Ohja6Hpg/TNoxQKF1VCDkVj0UDCefr1x5ArIsgs2A="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/applications/audio/schismtracker/default.nix b/nixpkgs/pkgs/applications/audio/schismtracker/default.nix index 94b082fd84a4..bc6a406ba2f5 100644 --- a/nixpkgs/pkgs/applications/audio/schismtracker/default.nix +++ b/nixpkgs/pkgs/applications/audio/schismtracker/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20240308"; + version = "20240328"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-6MzMmeD4HCS/7VTFTAcOhyKjz5NvzvDEzcSpHGUwFvM="; + sha256 = "sha256-hoP/14lbqsuQ37oJDErPoQWWk04UshImmApCFrf5wno="; }; configureFlags = [ "--enable-dependency-tracking" ] diff --git a/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix b/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix index 1fa19adc573b..72e3e380a848 100644 --- a/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix +++ b/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; - version = "2.6.2"; + version = "2.7.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${finalAttrs.version}"; - hash = "sha256-bAd4fq5tlBYfYuIG/02MCbEwjjVBZFJbZJNT13voInw="; + hash = "sha256-bIX9BByUdScbS0NCrUjF5PTHG9T6hrPGjD5XM0eQgfA="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/applications/audio/snapcast/default.nix b/nixpkgs/pkgs/applications/audio/snapcast/default.nix index 782a55864914..d3add0f604f7 100644 --- a/nixpkgs/pkgs/applications/audio/snapcast/default.nix +++ b/nixpkgs/pkgs/applications/audio/snapcast/default.nix @@ -1,32 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , alsa-lib, asio, avahi, boost179, flac, libogg, libvorbis, libopus, soxr , IOKit, AudioToolbox , aixlog, popl , pulseaudioSupport ? false, libpulseaudio , nixosTests }: -assert pulseaudioSupport -> libpulseaudio != null; - stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "sha256-dlK1xQQqst4VQjioC7MZzqXwMC+JfqtvnD5lrOqGhYI="; + sha256 = "sha256-XxpiLojs1TI3qM7yXS+OPcHKo6pLcfJ+Eop7GjQ4HQw="; }; - patches = [ - # Can be removed with next release after 0.27.0 - (fetchpatch { - name = "include-cstdint.patch"; - url = "https://github.com/badaix/snapcast/commit/481f08199ca31c60c9a3475f1064e6b06a503d12.patch"; - hash = "sha256-klpvmBpBAlBMtcgnNfW6X6vDbJFnOuOsPUDXcNf5tGc="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; # snapcast also supports building against tremor but as we have libogg, that's # not needed diff --git a/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix b/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix index 6635cb4784f9..bc1c72cf746e 100644 --- a/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix +++ b/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix @@ -26,6 +26,7 @@ , aubio , jack2 , jack-example-tools +, pipewire , supercollider-with-sc3-plugins , parallel @@ -40,13 +41,13 @@ stdenv.mkDerivation rec { pname = "sonic-pi"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "sonic-pi-net"; repo = pname; rev = "v${version}"; - hash = "sha256-s9B3OBwiUdCJyxbeQXeidv38pzmvC442Byl+llabqp0="; + hash = "sha256-JMextQY0jLShWmqRQoVAbqIzDhA1mOzI7vfsG7+jjX0="; }; mixFodDeps = beamPackages.fetchMixDeps { @@ -188,14 +189,14 @@ stdenv.mkDerivation rec { preFixup = '' # Wrap Qt GUI (distributed binary) wrapQtApp $out/bin/sonic-pi \ - --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools ]} + --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools pipewire.jack ]} # If ImGui was built if [ -e $out/app/build/gui/imgui/sonic-pi-imgui ]; then # Wrap ImGui into bin makeWrapper $out/app/build/gui/imgui/sonic-pi-imgui $out/bin/sonic-pi-imgui \ --inherit-argv0 \ - --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools ]} + --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools pipewire.jack ]} fi # Remove runtime Erlang references diff --git a/nixpkgs/pkgs/applications/audio/sonixd/default.nix b/nixpkgs/pkgs/applications/audio/sonixd/default.nix index 87ceb7b25e0f..e535a574ab9a 100644 --- a/nixpkgs/pkgs/applications/audio/sonixd/default.nix +++ b/nixpkgs/pkgs/applications/audio/sonixd/default.nix @@ -16,8 +16,6 @@ appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' @@ -33,4 +31,3 @@ appimageTools.wrapType2 rec { mainProgram = "sonixd"; }; } - diff --git a/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix b/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix index 261de6e48450..65a12c423b3f 100644 --- a/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix +++ b/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Gnome CD Ripper"; mainProgram = "sound-juicer"; - homepage = "https://wiki.gnome.org/Apps/SoundJuicer"; + homepage = "https://gitlab.gnome.org/GNOME/sound-juicer"; maintainers = [ maintainers.bdimcheff ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/audio/soundtracker/default.nix b/nixpkgs/pkgs/applications/audio/soundtracker/default.nix index eb51b2cd6e4b..bf308fd29d28 100644 --- a/nixpkgs/pkgs/applications/audio/soundtracker/default.nix +++ b/nixpkgs/pkgs/applications/audio/soundtracker/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "soundtracker"; - version = "1.0.4"; + version = "1.0.5"; src = fetchzip { # Past releases get moved to the "old releases" directory. @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { # Nonetheless, only the name of the file seems to affect which file is # downloaded, so this path should be fine both for old and current releases. url = "mirror://sourceforge/soundtracker/soundtracker-${finalAttrs.version}.tar.xz"; - hash = "sha256-kNt0BSRaEQY+oa1xbuZ1l6nCqXhcktVugxzcC3ZDaX0="; + hash = "sha256-g96Z1SdFGMq7WFI6x+UtmAHPZF0C+tHUOjNhmK2ld8I="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -75,5 +75,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + hydraPlatforms = platforms.linux; # sdl-config times out on darwin }; }) diff --git a/nixpkgs/pkgs/applications/audio/spot/default.nix b/nixpkgs/pkgs/applications/audio/spot/default.nix index 7cf683beb918..183aae58d167 100644 --- a/nixpkgs/pkgs/applications/audio/spot/default.nix +++ b/nixpkgs/pkgs/applications/audio/spot/default.nix @@ -5,7 +5,6 @@ , meson , ninja , gettext -, python3 , desktop-file-utils , cargo , rustPlatform @@ -19,23 +18,25 @@ , alsa-lib , libpulseaudio , wrapGAppsHook4 +, blueprint-compiler +, gst_all_1 }: stdenv.mkDerivation rec { pname = "spot"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "xou816"; repo = "spot"; rev = version; - hash = "sha256-K6wGWhAUUGsbE4O+z0TmJcJyGarvHgZteY527jfAa90="; + hash = "sha256-F875e/VZyN8mTfe9lgjtILNxMqn+66XoPCdaEUagHyU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-eM2XLumn4dr2YtyUzBZJADlqdexc1iOaNJUudMlfSUc="; + hash = "sha256-45Rqs2/tSWoyZVjFuygR5SxldjoqpprtOKEnMqJK+p8="; }; nativeBuildInputs = [ @@ -43,7 +44,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 # for meson postinstall script gtk4 # for gtk-update-icon-cache glib # for glib-compile-schemas desktop-file-utils @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustc wrapGAppsHook4 + blueprint-compiler ]; buildInputs = [ @@ -61,18 +62,13 @@ stdenv.mkDerivation rec { openssl alsa-lib libpulseaudio + gst_all_1.gst-plugins-base + gst_all_1.gstreamer ]; # https://github.com/xou816/spot/issues/313 mesonBuildType = "release"; - postPatch = '' - chmod +x build-aux/cargo.sh - patchShebangs build-aux/cargo.sh build-aux/meson/postinstall.py - substituteInPlace build-aux/meson/postinstall.py \ - --replace gtk-update-icon-cache gtk4-update-icon-cache - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/nixpkgs/pkgs/applications/audio/spotify-player/default.nix b/nixpkgs/pkgs/applications/audio/spotify-player/default.nix index f3c675564512..e4e02f03891b 100644 --- a/nixpkgs/pkgs/applications/audio/spotify-player/default.nix +++ b/nixpkgs/pkgs/applications/audio/spotify-player/default.nix @@ -33,16 +33,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaud rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1aq+J1dP+hGJHq3boxZLUFfLLSFDY2uN6BwYXqHjCtk="; + hash = "sha256-TwMQtyg8ygFTI5DgT5rBVkZE31U4puaANIo5S8W0TXU="; }; - cargoHash = "sha256-nULTz1H52L1kiTtViYfvxL+jrJ0uDk68oe8t5Hd7aCU="; + cargoHash = "sha256-RTvMywRWdZiBgNMjlUGa4jlD0HYOL3ESkVppGlsl4So="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix b/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix index 4f6460bd3a2d..d5947d145172 100644 --- a/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix +++ b/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "spotify-qt"; - version = "3.9"; + version = "3.11"; src = fetchFromGitHub { owner = "kraxarn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8rLpasgXiaL2KpGnYMQdNN2ayjcSkmz5hDkNBnKNWHk="; + sha256 = "sha256-Dm+ELHtYZGSzJSrERtvpuuV5cVZ9ah9WQ0iTTJqGqVg="; }; buildInputs = [ libxcb qtbase qtsvg ]; diff --git a/nixpkgs/pkgs/applications/audio/spotifyd/default.nix b/nixpkgs/pkgs/applications/audio/spotifyd/default.nix index 6de9493ab8e8..c80843896425 100644 --- a/nixpkgs/pkgs/applications/audio/spotifyd/default.nix +++ b/nixpkgs/pkgs/applications/audio/spotifyd/default.nix @@ -42,7 +42,7 @@ rustPackages.rustPlatform.buildRustPackage rec { homepage = "https://spotifyd.rs/"; changelog = "https://github.com/Spotifyd/spotifyd/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ anderslundstedt Br1ght0ne marsam ]; + maintainers = with maintainers; [ anderslundstedt Br1ght0ne ]; platforms = platforms.unix; mainProgram = "spotifyd"; }; diff --git a/nixpkgs/pkgs/applications/audio/squeezelite/default.nix b/nixpkgs/pkgs/applications/audio/squeezelite/default.nix index 694dd04d12a9..deaec9e16d7c 100644 --- a/nixpkgs/pkgs/applications/audio/squeezelite/default.nix +++ b/nixpkgs/pkgs/applications/audio/squeezelite/default.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation { pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "2.0.0.1473"; + version = "2.0.0.1486"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "66c9b6a21834019a0230c39fcee74b6bf2891f7d"; - hash = "sha256-MCH7vltF3jLGfxcRspXg9eQMx+e+lHSoxIanf91NrE0="; + rev = "fd4a82e7d0e53124d9618320f3c115d90654509d"; + hash = "sha256-nR2Px7VYjAktUsueEyBAV2392+/dX6JYIy7YSMh05c0="; }; buildInputs = [ flac libmad libvorbis mpg123 ] diff --git a/nixpkgs/pkgs/applications/audio/sublime-music/default.nix b/nixpkgs/pkgs/applications/audio/sublime-music/default.nix index b2cf3a5d842d..2ce12df23dcf 100644 --- a/nixpkgs/pkgs/applications/audio/sublime-music/default.nix +++ b/nixpkgs/pkgs/applications/audio/sublime-music/default.nix @@ -26,6 +26,7 @@ let rev = "refs/tags/${version}"; hash = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w="; }; + doCheck = false; # no tests }); dataclasses-json = super.dataclasses-json.overridePythonAttrs (oldAttrs: rec { diff --git a/nixpkgs/pkgs/applications/audio/synaesthesia/default.nix b/nixpkgs/pkgs/applications/audio/synaesthesia/default.nix index 765e724cd8ec..c8575d77b50f 100644 --- a/nixpkgs/pkgs/applications/audio/synaesthesia/default.nix +++ b/nixpkgs/pkgs/applications/audio/synaesthesia/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Program for representing sounds visually"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.infinisil ]; + maintainers = [ ]; mainProgram = "synaesthesia"; }; } diff --git a/nixpkgs/pkgs/applications/audio/tauon/default.nix b/nixpkgs/pkgs/applications/audio/tauon/default.nix index 09136728a4b9..2d7a3f441e4c 100644 --- a/nixpkgs/pkgs/applications/audio/tauon/default.nix +++ b/nixpkgs/pkgs/applications/audio/tauon/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tauon"; - version = "7.7.1"; + version = "7.7.2"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${finalAttrs.version}"; - hash = "sha256-rRYM8wdvwfetoIpS/lzAV/uV5XVpXyXsHSrClPWcsCo="; + hash = "sha256-IVl7XL6nn42zaY4bDraF9os0dXfquUql4E96djfVdVg="; }; postUnpack = '' diff --git a/nixpkgs/pkgs/applications/audio/touchosc/default.nix b/nixpkgs/pkgs/applications/audio/touchosc/default.nix index 99d0fba6fa95..23d254efc0b5 100644 --- a/nixpkgs/pkgs/applications/audio/touchosc/default.nix +++ b/nixpkgs/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.2.9.200"; + version = "1.3.1.204"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-JrpwD4xD4t9e3qmBCl6hfHv/InnRBRsYIsNNrxwQojo="; - armv7l-linux = "sha256-8e50jznyHUJt9aL5K/emp0T8VSLdXMuBl6KCMot8kIY="; - x86_64-linux = "sha256-lQi1HFW53LdS6Q86s0exp0WmTMTz4g48yZC73DaM2lo="; + aarch64-linux = "sha256-uSXCgwJUEQZDKPAHDT4kKcvkBg9c+T0nrpvYW8jG8Kg="; + armv7l-linux = "sha256-dG5BF8n66YCYCZzc1pLf2qpMLmbv6lfVZYfgry25jQ0="; + x86_64-linux = "sha256-R07kTuwsfe6WhGpHeyZS/HydDUSH6AByx0pJu/i40xE="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix b/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix index c086436de09f..8f107ee2cb9c 100644 --- a/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix +++ b/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix @@ -250,6 +250,7 @@ stdenv.mkDerivation rec { # no-derivatives clause license = with licenses; [ gpl3Plus cc-by-nc-40 unfreeRedistributable ]; maintainers = with maintainers; [ nathyong jpotier ddelabru ]; + mainProgram = "Rack"; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/audio/vgmplay-libvgm/default.nix b/nixpkgs/pkgs/applications/audio/vgmplay-libvgm/default.nix index 75701682e128..ebf227d21074 100644 --- a/nixpkgs/pkgs/applications/audio/vgmplay-libvgm/default.nix +++ b/nixpkgs/pkgs/applications/audio/vgmplay-libvgm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { pname = "vgmplay-libvgm"; - version = "unstable-2024-01-03"; + version = "0.51.1-unstable-2024-01-03"; src = fetchFromGitHub { owner = "ValleyBell"; diff --git a/nixpkgs/pkgs/applications/audio/vgmstream/default.nix b/nixpkgs/pkgs/applications/audio/vgmstream/default.nix index 2dae5a5f0d37..99802872ef03 100644 --- a/nixpkgs/pkgs/applications/audio/vgmstream/default.nix +++ b/nixpkgs/pkgs/applications/audio/vgmstream/default.nix @@ -1,17 +1,18 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config -, mpg123, ffmpeg, libvorbis, libao, jansson, speex +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, gtk3 +, audacious, mpg123, ffmpeg, libvorbis, libao, jansson, speex , nix-update-script +, buildAudaciousPlugin ? false # only build cli by default, pkgs.audacious-plugins sets this to enable plugin support }: stdenv.mkDerivation rec { pname = "vgmstream"; - version = "1896"; + version = "1917"; src = fetchFromGitHub { owner = "vgmstream"; repo = "vgmstream"; rev = "refs/tags/r${version}"; - sha256 = "sha256-1BWJgV631MxxzdUtK8f+XRb9cqfhjlwN2LgWI0VmIHE="; + sha256 = "sha256-9HIa5/whdLouUWNFml7tPfXStIkO76dxUl5S4yiat64="; }; passthru.updateScript = nix-update-script { @@ -19,16 +20,29 @@ stdenv.mkDerivation rec { extraArgs = [ "--version-regex" "r(.*)" ]; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optional buildAudaciousPlugin gtk3; - buildInputs = [ mpg123 ffmpeg libvorbis libao jansson speex ]; + buildInputs = [ + mpg123 + ffmpeg + libvorbis + libao + jansson + speex + ] ++ lib.optional buildAudaciousPlugin (audacious.override { audacious-plugins = null; }); + + preConfigure = '' + substituteInPlace cmake/dependencies/audacious.cmake \ + --replace "pkg_get_variable(AUDACIOUS_PLUGIN_DIR audacious plugin_dir)" "set(AUDACIOUS_PLUGIN_DIR \"$out/lib/audacious\")" + ''; cmakeFlags = [ - # There's no nice way to build the audacious plugin without a circular dependency - "-DBUILD_AUDACIOUS=OFF" # It always tries to download it, no option to use the system one "-DUSE_CELT=OFF" - ]; + ] ++ lib.optional (! buildAudaciousPlugin) "-DBUILD_AUDACIOUS=OFF"; meta = with lib; { description = "A library for playback of various streamed audio formats used in video games"; diff --git a/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix b/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix index a14d5c5a37e2..4bec1952e03e 100644 --- a/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix +++ b/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "virtual-ans"; - version = "3.0.2c"; + version = "3.0.3"; src = fetchzip { url = "https://warmplace.ru/soft/ans/virtual_ans-${version}.zip"; - sha256 = "03r1v3l7rd59dakr7ndvgsqchv00ppkvi6sslgf1ng07r3rsvb1n"; + sha256 = "sha256-tqR7icgURUFOyLJ8+mS17JRf2gK53I2FW/2m8IJPtJE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/waylyrics/Cargo.lock b/nixpkgs/pkgs/applications/audio/waylyrics/Cargo.lock index 601514f02cf9..2a5931a81a0c 100644 --- a/nixpkgs/pkgs/applications/audio/waylyrics/Cargo.lock +++ b/nixpkgs/pkgs/applications/audio/waylyrics/Cargo.lock @@ -18,6 +18,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] name = "ahash" version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -29,10 +40,23 @@ dependencies = [ ] [[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -48,9 +72,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arrayvec" @@ -66,9 +90,9 @@ checksum = "4cea652ffbedecf29e9cd41bb4c066881057a42c0c119040f022802b26853e77" [[package]] name = "async-channel" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", "event-listener", @@ -79,13 +103,36 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", +] + +[[package]] +name = "atk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4" +dependencies = [ + "atk-sys", + "glib 0.18.5", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" +dependencies = [ + "glib-sys 0.18.1", + "gobject-sys 0.18.0", + "libc", + "system-deps", ] [[package]] @@ -101,15 +148,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -122,15 +169,15 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.7" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] -name = "base64" -version = "0.22.0" +name = "base64ct" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bitflags" @@ -140,9 +187,12 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +dependencies = [ + "serde", +] [[package]] name = "bitvec" @@ -163,10 +213,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] name = "borsh" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" +checksum = "0901fc8eb0aca4c83be0106d6f2db17d86a08dfc2c25f0e84464bf381158add6" dependencies = [ "borsh-derive", "cfg_aliases", @@ -174,23 +233,23 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" +checksum = "51670c3aa053938b0ee3bd67c3817e471e626151131b934038e83c5bf8de48f5" dependencies = [ "once_cell", - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", "syn_derive", ] [[package]] name = "bumpalo" -version = "3.15.2" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b1be7772ee4501dba05acbe66bb1e8760f6a6c474a36035631638e4415f130" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecheck" @@ -210,51 +269,91 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] [[package]] -name = "bytes" +name = "byteorder" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cairo-rs" -version = "0.19.2" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" +dependencies = [ + "bitflags 2.5.0", + "cairo-sys-rs 0.18.2", + "glib 0.18.5", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "cairo-rs" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" +checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ - "bitflags 2.4.2", - "cairo-sys-rs", - "glib", + "bitflags 2.5.0", + "cairo-sys-rs 0.19.2", + "glib 0.19.4", "libc", "thiserror", ] [[package]] name = "cairo-sys-rs" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +dependencies = [ + "glib-sys 0.18.1", + "libc", + "system-deps", +] + +[[package]] +name = "cairo-sys-rs" version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" dependencies = [ - "glib-sys", + "glib-sys 0.19.0", "libc", "system-deps", ] [[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] name = "cc" -version = "1.0.86" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9fa1897e4325be0d68d48df6aa1a71ac2ed4d27723887e7754192705350730" +checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" [[package]] name = "cfg-expr" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -273,6 +372,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] name = "clap" version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -288,6 +397,36 @@ dependencies = [ ] [[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] name = "concurrent-queue" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -297,6 +436,12 @@ dependencies = [ ] [[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] name = "cookie" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -309,9 +454,9 @@ dependencies = [ [[package]] name = "cookie" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ "time", "version_check", @@ -351,12 +496,73 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +dependencies = [ + "crossbeam-utils", +] + +[[package]] name = "crossbeam-utils" version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] name = "darling" version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -375,7 +581,7 @@ dependencies = [ "fnv", "ident_case", "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "strsim 0.10.0", "syn 1.0.109", ] @@ -387,7 +593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] @@ -414,12 +620,6 @@ dependencies = [ ] [[package]] -name = "dbus-dummy" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22d24c4c449e488b022f58a19817ffcedc637d67237076068da883e0fc8f7159" - -[[package]] name = "dbus-tree" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -429,6 +629,17 @@ dependencies = [ ] [[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] name = "deranged" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -449,10 +660,62 @@ dependencies = [ ] [[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "const-oid", + "crypto-common", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] name = "documented" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f2016be31b2ee8ca5950d0b985e53d2802bbe646634e41cdf70f668fc66049" +checksum = "21cd1d2800b9a2b71d4311a38fcda9eebc9313bbd86730880147eba1e29599e0" dependencies = [ "documented-derive", "phf", @@ -461,19 +724,48 @@ dependencies = [ [[package]] name = "documented-derive" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83095afc77f3f21d50be46d608d0a1cfa463cc97e4f3aedab871d6e0baf91870" +checksum = "48583206f0a72d5fbfcb5dd8ab56ec878a6594fbcb1219d5b65b502b960c7cdb" dependencies = [ - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", +] + +[[package]] +name = "dpi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + +[[package]] +name = "ecb" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a8bfa975b1aec2145850fcaa1c6fe269a16578c44705a532ae3edc92b8881c7" +dependencies = [ + "cipher", +] + +[[package]] +name = "embed-resource" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml", + "vswhom", + "winreg", ] [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -485,7 +777,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" dependencies = [ "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] @@ -507,9 +799,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.1.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ad6fd685ce13acd6d9541a30f6db6567a7a24c9ffd4ba2955d29e3f22c8b27" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", @@ -518,9 +810,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" dependencies = [ "event-listener", "pin-project-lite", @@ -528,9 +820,18 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] [[package]] name = "field-offset" @@ -543,6 +844,16 @@ dependencies = [ ] [[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -554,7 +865,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -564,6 +896,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] name = "form_urlencoded" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -589,7 +927,7 @@ checksum = "55a5e644a80e6d96b2b4910fa7993301d7b7926c045b475b62202b20a36ce69e" dependencies = [ "darling", "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] @@ -638,8 +976,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -669,15 +1007,56 @@ dependencies = [ ] [[package]] +name = "gdk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646" +dependencies = [ + "cairo-rs 0.18.5", + "gdk-pixbuf 0.18.5", + "gdk-sys", + "gio 0.18.4", + "glib 0.18.5", + "libc", + "pango 0.18.3", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" +dependencies = [ + "gdk-pixbuf-sys 0.18.0", + "gio 0.18.4", + "glib 0.18.5", + "libc", + "once_cell", +] + +[[package]] name = "gdk-pixbuf" version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", + "gdk-pixbuf-sys 0.19.0", + "gio 0.19.4", + "glib 0.19.4", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +dependencies = [ + "gio-sys 0.18.1", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", + "system-deps", ] [[package]] @@ -686,50 +1065,102 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.19.0", + "glib-sys 0.19.0", + "gobject-sys 0.19.0", "libc", "system-deps", ] [[package]] +name = "gdk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" +dependencies = [ + "cairo-sys-rs 0.18.2", + "gdk-pixbuf-sys 0.18.0", + "gio-sys 0.18.1", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", + "libc", + "pango-sys 0.18.0", + "pkg-config", + "system-deps", +] + +[[package]] name = "gdk4" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6771942f85a2beaa220c64739395e4401b9fab4a52aba9b503fa1e6ed4d4d806" +checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" dependencies = [ - "cairo-rs", - "gdk-pixbuf", + "cairo-rs 0.19.4", + "gdk-pixbuf 0.19.2", "gdk4-sys", - "gio", - "glib", + "gio 0.19.4", + "glib 0.19.4", "libc", - "pango", + "pango 0.19.3", ] [[package]] name = "gdk4-sys" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eb95854fab65072023a7814434f003db571d6e45c287c0b0c540c1c78bdf6ae" +checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "cairo-sys-rs 0.19.2", + "gdk-pixbuf-sys 0.19.0", + "gio-sys 0.19.0", + "glib-sys 0.19.0", + "gobject-sys 0.19.0", "libc", - "pango-sys", + "pango-sys 0.19.0", "pkg-config", "system-deps", ] [[package]] +name = "gdk4-win32" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab6181b6e5c91ee292dca0032b00d48dee8e61358253742c9752537a88486b3f" +dependencies = [ + "gdk4", + "gdk4-win32-sys", + "gio 0.19.4", + "glib 0.19.4", + "libc", +] + +[[package]] +name = "gdk4-win32-sys" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efa8530d6619cf43f007f3efd993a356e1ca4e643c4d0bd2a99832a08af2e402" +dependencies = [ + "gdk4-sys", + "glib-sys 0.19.0", + "libc", + "system-deps", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "libc", @@ -764,16 +1195,35 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.19.2" +version = "0.18.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys 0.18.1", + "glib 0.18.5", + "libc", + "once_cell", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gio" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eae10b27b6dd27e22ed0d812c6387deba295e6fc004a8b379e459b663b05a02" +checksum = "3f91a0518c2ec539f099d3f945ab2d6a83ec372a9ef40a21906343b191182845" dependencies = [ "futures-channel", "futures-core", "futures-io", "futures-util", - "gio-sys", - "glib", + "gio-sys 0.19.0", + "glib 0.19.4", "libc", "pin-project-lite", "smallvec", @@ -782,12 +1232,25 @@ dependencies = [ [[package]] name = "gio-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +dependencies = [ + "glib-sys 0.18.1", + "gobject-sys 0.18.0", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "gio-sys" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.19.0", + "gobject-sys 0.19.0", "libc", "system-deps", "windows-sys 0.52.0", @@ -795,20 +1258,43 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.2" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" +dependencies = [ + "bitflags 2.5.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys 0.18.1", + "glib-macros 0.18.5", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" +checksum = "ae1407b2ce171e654720be10d57d4054d3ff2f10a13d5b37e6819b41439832f7" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", "futures-task", "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", + "gio-sys 0.19.0", + "glib-macros 0.19.4", + "glib-sys 0.19.0", + "gobject-sys 0.19.0", "libc", "memchr", "smallvec", @@ -817,15 +1303,39 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.2" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" +checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" dependencies = [ "heck 0.4.1", - "proc-macro-crate", + "proc-macro-crate 2.0.0", + "proc-macro-error", + "proc-macro2", + "quote 1.0.36", + "syn 2.0.58", +] + +[[package]] +name = "glib-macros" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8bba315e8ce8aa59631545358450f4962557e89b5f7db7442e7153b47037f71" +dependencies = [ + "heck 0.5.0", + "proc-macro-crate 3.1.0", "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", +] + +[[package]] +name = "glib-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +dependencies = [ + "libc", + "system-deps", ] [[package]] @@ -840,11 +1350,22 @@ dependencies = [ [[package]] name = "gobject-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +dependencies = [ + "glib-sys 0.18.1", + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" dependencies = [ - "glib-sys", + "glib-sys 0.19.0", "libc", "system-deps", ] @@ -855,7 +1376,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" dependencies = [ - "glib", + "glib 0.19.4", "graphene-sys", "libc", ] @@ -866,7 +1387,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" dependencies = [ - "glib-sys", + "glib-sys 0.19.0", "libc", "pkg-config", "system-deps", @@ -874,94 +1395,146 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e8ce8dee0fd87a11002214b1204ff18c9272fbd530408f0884a0f9b25dc31de" +checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" dependencies = [ - "cairo-rs", + "cairo-rs 0.19.4", "gdk4", - "glib", + "glib 0.19.4", "graphene-rs", "gsk4-sys", "libc", - "pango", + "pango 0.19.3", ] [[package]] name = "gsk4-sys" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2660a652da5b662d43924df19ba40d73f015ed427329ef51d2b1360a4e0dc0e4" +checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" dependencies = [ - "cairo-sys-rs", + "cairo-sys-rs 0.19.2", "gdk4-sys", - "glib-sys", - "gobject-sys", + "glib-sys 0.19.0", + "gobject-sys 0.19.0", "graphene-sys", "libc", - "pango-sys", + "pango-sys 0.19.0", "system-deps", ] [[package]] +name = "gtk" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c" +dependencies = [ + "atk", + "cairo-rs 0.18.5", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf 0.18.5", + "gio 0.18.4", + "glib 0.18.5", + "gtk-sys", + "gtk3-macros", + "libc", + "pango 0.18.3", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" +dependencies = [ + "atk-sys", + "cairo-sys-rs 0.18.2", + "gdk-pixbuf-sys 0.18.0", + "gdk-sys", + "gio-sys 0.18.1", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", + "libc", + "pango-sys 0.18.0", + "system-deps", +] + +[[package]] +name = "gtk3-macros" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote 1.0.36", + "syn 2.0.58", +] + +[[package]] name = "gtk4" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d26ffa3ec6316ccaa1df62d3e7f5bae1637c0acbb43f250fabef38319f73c64" +checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" dependencies = [ - "cairo-rs", + "cairo-rs 0.19.4", "field-offset", "futures-channel", - "gdk-pixbuf", + "gdk-pixbuf 0.19.2", "gdk4", - "gio", - "glib", + "gio 0.19.4", + "glib 0.19.4", "graphene-rs", "gsk4", "gtk4-macros", "gtk4-sys", "libc", - "pango", + "pango 0.19.3", ] [[package]] name = "gtk4-macros" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b86439e9896f6f3f47c3d8077c5c8205174078760afdabd9098a8e9e937d97" +checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro-error", "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "gtk4-sys" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2abc0a6d356d59a3806021829ce6ed3e70bba3509b41a535fedcb09fae13fbc0" +checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", + "cairo-sys-rs 0.19.2", + "gdk-pixbuf-sys 0.19.0", "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.19.0", + "glib-sys 0.19.0", + "gobject-sys 0.19.0", "graphene-sys", "gsk4-sys", "libc", - "pango-sys", + "pango-sys 0.19.0", "system-deps", ] [[package]] name = "h2" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" dependencies = [ "bytes", "fnv", @@ -982,7 +1555,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.8", ] [[package]] @@ -1007,6 +1580,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] name = "hermit-abi" version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1017,9 +1596,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1151,15 +1730,25 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.3" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", ] [[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] name = "ipnet" version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1167,24 +1756,34 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] +name = "keyboard-types" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" +dependencies = [ + "bitflags 2.5.0", + "serde", + "unicode-segmentation", +] + +[[package]] name = "ksni" version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b31b9cf486bcd22bcd09900b44538cf87b00f526fcd087d671a632dc0d271d0c" +source = "git+https://github.com/waylyrics/ksni.git#af6fa6e6e29b7cb3779f98c1ca3aaeb8744ef4c4" dependencies = [ "dbus", "dbus-codegen", @@ -1193,16 +1792,37 @@ dependencies = [ ] [[package]] -name = "ksni-dummy" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705305cfe9604f3081b8c33e03c351da01eedd7dff89a86f7fbc486f025a2f37" - -[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin", +] + +[[package]] +name = "libappindicator" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" +dependencies = [ + "glib 0.18.5", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", +] + +[[package]] +name = "libappindicator-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" +dependencies = [ + "gtk-sys", + "libloading", + "once_cell", +] [[package]] name = "libc" @@ -1221,6 +1841,22 @@ dependencies = [ ] [[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] name = "libmimalloc-sys" version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1231,6 +1867,35 @@ dependencies = [ ] [[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + +[[package]] +name = "libxdo" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00333b8756a3d28e78def82067a377de7fa61b24909000aeaa2b446a948d14db" +dependencies = [ + "libxdo-sys", +] + +[[package]] +name = "libxdo-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db23b9e7e2b7831bbd8aac0bbeeeb7b68cbebc162b227e7052e8e55829a09212" +dependencies = [ + "libc", + "x11", +] + +[[package]] name = "linux-raw-sys" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1261,15 +1926,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lrc-nom" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7b624e31b9613023e400fb5dd998facc31b593e90c8115d67d561d9bd6a671" +checksum = "a0fb729227bcfd7c7cf247c37a932ac168b94759c052f046b9aad4ba5f584f70" dependencies = [ "nom", "rust_decimal", @@ -1303,15 +1968,15 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -1344,6 +2009,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", + "simd-adler32", ] [[package]] @@ -1371,6 +2037,25 @@ dependencies = [ ] [[package]] +name = "muda" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f428b4e9db3d17e2f809dfb1ff9ddfbbf16c71790d1656d10aee320877e1392f" +dependencies = [ + "cocoa", + "crossbeam-channel", + "dpi", + "gtk", + "keyboard-types", + "libxdo", + "objc", + "once_cell", + "png", + "thiserror", + "windows-sys 0.52.0", +] + +[[package]] name = "native-tls" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1389,18 +2074,23 @@ dependencies = [ ] [[package]] -name = "ncmapi" +name = "ncmapi2" version = "0.1.13" -source = "git+https://github.com/waylyrics/ncmapi-rs.git?rev=590f280#590f280458e1826df0af0f0f624c2222448a7dee" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcd3c218f2db46fc0b26ac6263d3005b96c82d5ebec0d349c3c902eef8bd660c" dependencies = [ - "base64 0.22.0", - "cookie 0.18.0", + "aes", + "base64", + "cbc", + "cookie 0.18.1", + "ecb", "hex", - "openssl", + "md5", "phf", "rand", "regex", "reqwest", + "rsa", "serde", "serde_json", "serde_repr", @@ -1429,18 +2119,56 @@ dependencies = [ ] [[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + +[[package]] name = "num-conv" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] name = "num-traits" version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -1449,7 +2177,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.6", + "hermit-abi 0.3.9", "libc", ] @@ -1498,14 +2226,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] +name = "opencc-rust" +version = "1.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93236c9c3fb3e36c0cf4467731aabf338fd4831d4fad072a47cb2d4757e47303" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] name = "openssl" version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", - "foreign-types", + "foreign-types 0.3.2", "libc", "once_cell", "openssl-macros", @@ -1519,8 +2257,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -1530,28 +2268,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] -name = "openssl-src" -version = "300.2.3+3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" -dependencies = [ - "cc", -] - -[[package]] name = "openssl-sys" -version = "0.9.101" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] [[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1559,14 +2293,39 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pango" -version = "0.19.2" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +dependencies = [ + "gio 0.18.4", + "glib 0.18.5", + "libc", + "once_cell", + "pango-sys 0.18.0", +] + +[[package]] +name = "pango" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" +dependencies = [ + "gio 0.19.4", + "glib 0.19.4", + "libc", + "pango-sys 0.19.0", +] + +[[package]] +name = "pango-sys" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7809e8af4df8d024a066106b72ca6bc7253a484ae3867041a96103ef8a13188d" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ - "gio", - "glib", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", - "pango-sys", + "system-deps", ] [[package]] @@ -1575,8 +2334,8 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.19.0", + "gobject-sys 0.19.0", "libc", "system-deps", ] @@ -1611,6 +2370,15 @@ dependencies = [ ] [[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] name = "percent-encoding" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1645,8 +2413,8 @@ dependencies = [ "phf_generator", "phf_shared", "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -1674,15 +2442,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1691,12 +2459,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] name = "pkg-config" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] name = "powerfmt" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1710,6 +2512,25 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", +] + +[[package]] +name = "proc-macro-crate" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" @@ -1725,7 +2546,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", "version_check", ] @@ -1737,15 +2558,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "version_check", ] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -1772,7 +2593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] @@ -1789,7 +2610,8 @@ dependencies = [ [[package]] name = "qqmusic-rs" version = "0.1.0" -source = "git+https://github.com/waylyrics/qqmusic-rs.git?rev=22e66ba#22e66ba62e63d97c6dffb45400655404e6f06b93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7698cb357cfa1a75f5a2071469345ede01a6c4ee83a2ff2a88f9e481893f341" dependencies = [ "serde", "serde_json", @@ -1804,9 +2626,9 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1857,15 +2679,26 @@ dependencies = [ ] [[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.5", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -1879,13 +2712,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -1896,9 +2729,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rend" @@ -1911,11 +2744,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58b48d98d932f4ee75e541614d32a7f44c889b72bd9c2e04d95edd135989df88" +checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" dependencies = [ - "base64 0.21.7", + "base64", "bytes", "cookie 0.17.0", "cookie_store", @@ -1978,15 +2811,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] [[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] name = "rust_decimal" -version = "1.34.3" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39449a79f45e8da28c57c341891b69a183044b29518bb8f86dbac9df60bb7df" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ "arrayvec", "borsh", @@ -2004,7 +2857,7 @@ version = "1.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e418701588729bef95e7a655f2b483ad64bb97c46e8e79fde83efd92aaab6d82" dependencies = [ - "quote 1.0.35", + "quote 1.0.36", "rust_decimal", ] @@ -2025,11 +2878,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -2038,18 +2891,25 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64", + "rustls-pki-types", ] [[package]] +name = "rustls-pki-types" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" + +[[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" @@ -2080,9 +2940,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -2093,9 +2953,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -2123,15 +2983,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -2140,13 +3000,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -2189,6 +3049,22 @@ dependencies = [ ] [[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] name = "simdutf8" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2211,18 +3087,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2236,6 +3112,22 @@ dependencies = [ ] [[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2249,27 +3141,33 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck 0.4.1", "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "rustversion", - "syn 2.0.50", + "syn 2.0.58", ] [[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] name = "syn" version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2287,18 +3185,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.50" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "unicode-ident", ] @@ -2310,8 +3208,8 @@ checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" dependencies = [ "proc-macro-error", "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -2352,12 +3250,12 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck 0.4.1", + "heck 0.5.0", "pkg-config", "toml", "version-compare", @@ -2377,15 +3275,15 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.10.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", @@ -2404,22 +3302,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -2434,9 +3332,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -2455,9 +3353,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -2480,9 +3378,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -2504,8 +3402,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -2534,14 +3432,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.9", ] [[package]] @@ -2555,6 +3453,28 @@ dependencies = [ [[package]] name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" @@ -2566,15 +3486,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.2", + "winnow 0.6.6", ] [[package]] @@ -2624,8 +3544,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -2679,12 +3599,37 @@ dependencies = [ ] [[package]] +name = "tray-icon" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97ec55956c54569e74209ae9d29a7a79193b252d17a6ac28bcffd4c11a384ad" +dependencies = [ + "cocoa", + "core-graphics", + "crossbeam-channel", + "dirs-next", + "libappindicator", + "muda", + "objc", + "once_cell", + "png", + "thiserror", + "windows-sys 0.52.0", +] + +[[package]] name = "try-lock" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] name = "unicode-bidi" version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2736,9 +3681,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "valuable" @@ -2760,9 +3705,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -2771,6 +3716,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + +[[package]] name = "want" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2787,9 +3752,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2797,24 +3762,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -2824,55 +3789,56 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.35", + "quote 1.0.36", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "waylyrics" -version = "0.2.13" +version = "0.3.5" dependencies = [ + "ahash 0.8.11", "anyhow", "async-channel", "async-trait", "dbus", - "dbus-dummy", + "directories", "documented", + "gdk4-win32", "gettext-rs", - "glib-macros", + "glib-macros 0.19.4", "gtk4", "ksni", - "ksni-dummy", "lrc-nom", "md5", "mimalloc", "mpris", - "ncmapi", + "ncmapi2", "once_cell", - "openssl", + "opencc-rust", "qqmusic-rs", "regex", "reqwest", @@ -2885,19 +3851,21 @@ dependencies = [ "thiserror", "tokio", "toml", - "toml_edit 0.22.6", + "toml_edit 0.22.9", "tracing", "tracing-journald", "tracing-subscriber", + "tray-icon", "url", - "xdg", + "windows", + "windows_exe_info", ] [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -2926,6 +3894,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.58", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.58", +] + +[[package]] +name = "windows-result" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2940,7 +3961,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -2960,17 +3981,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -2981,9 +4003,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2993,9 +4015,18 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_exe_info" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "f7e7bfd02caf5cd98a197cec15c852685c8c42605f91d7be3083541a0b40a7ff" +dependencies = [ + "embed-resource", +] [[package]] name = "windows_i686_gnu" @@ -3005,9 +4036,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -3017,9 +4054,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -3029,9 +4066,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -3041,9 +4078,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -3053,9 +4090,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -3068,18 +4105,18 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.2" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a4191c47f15cc3ec71fcb4913cb83d58def65dd3787610213c649283b5ce178" +checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", @@ -3095,13 +4132,43 @@ dependencies = [ ] [[package]] -name = "xdg" -version = "2.5.2" +name = "x11" +version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.58", +] + +[[package]] +name = "zeroize" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/nixpkgs/pkgs/applications/audio/waylyrics/default.nix b/nixpkgs/pkgs/applications/audio/waylyrics/default.nix index d698b4b6f016..8fcfe02acfe9 100644 --- a/nixpkgs/pkgs/applications/audio/waylyrics/default.nix +++ b/nixpkgs/pkgs/applications/audio/waylyrics/default.nix @@ -9,20 +9,19 @@ rustPlatform.buildRustPackage rec { pname = "waylyrics"; - version = "0.2.13"; + version = "0.3.5"; src = fetchFromGitHub { - owner = "poly000"; + owner = "waylyrics"; repo = "waylyrics"; rev = "v${version}"; - hash = "sha256-522NdpGj0oh2SbWa4GFCFpqNFRhqQxfZ1ZRuS9jUj7Y="; + hash = "sha256-44O2+OLsBZhl0/0910RsdCe8cHt6UGhYF7CUfhsFQU8="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ncmapi-0.1.13" = "sha256-qu89qf4IPM14V+oE4QQr/SsXSTx3vQbyfzD+Pihcd3E="; - "qqmusic-rs-0.1.0" = "sha256-woLsO0n+m3EBUI+PRLio7iLp0UPQSliWK0djCSZEaZc="; + "ksni-0.2.1" = "sha256-kjirYZVDP9e7/933L7gwSgVrNInSTbsRCAfnhUqmcLI="; }; }; @@ -44,10 +43,12 @@ rustPlatform.buildRustPackage rec { install -d $WAYLYRICS_THEME_PRESETS_DIR cp -vr themes/* $WAYLYRICS_THEME_PRESETS_DIR # Install desktop entry - install -Dm644 io.poly000.waylyrics.desktop -t $out/share/applications + install -Dm644 metainfo/io.github.waylyrics.Waylyrics.desktop -t $out/share/applications # Install schema - install -Dm644 io.poly000.waylyrics.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas + install -Dm644 metainfo/io.github.waylyrics.Waylyrics.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas/ + # Install metainfo + install -Dm644 metainfo/io.github.waylyrics.Waylyrics.metainfo.xml -t $out/share/metainfo # Install icons install -d $out/share/icons cp -vr res/icons/hicolor $out/share/icons/hicolor @@ -64,7 +65,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Desktop lyrics with QQ and NetEase Music source"; mainProgram = "waylyrics"; - homepage = "https://github.com/poly000/waylyrics"; + homepage = "https://github.com/waylyrics/waylyrics"; license = with licenses; [ mit cc-by-40 ]; maintainers = with maintainers; [ shadowrz aleksana ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/audio/yesplaymusic/default.nix b/nixpkgs/pkgs/applications/audio/yesplaymusic/default.nix deleted file mode 100644 index a7f81dcf4c40..000000000000 --- a/nixpkgs/pkgs/applications/audio/yesplaymusic/default.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib -, stdenv -, fetchurl -, undmg -, dpkg -, autoPatchelfHook -, wrapGAppsHook -, makeWrapper -, alsa-lib -, at-spi2-atk -, cups -, nspr -, nss -, mesa # for libgbm -, xorg -, xdg-utils -, libdrm -, libnotify -, libsecret -, libuuid -, gtk3 -, systemd -}: -let - pname = "yesplaymusic"; - version = "0.4.7"; - - srcs = { - x86_64-linux = fetchurl { - url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_amd64.deb"; - hash = "sha256-nnnHE2OgIqoz3dC+G0219FVBhvnWivLW1BX6+NYo6Ng="; - }; - aarch64-linux = fetchurl { - url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_arm64.deb"; - hash = "sha256-+rrhY5iDDt/nYs0Vz5/Ef0sgpsdBKMtb1aVfCZLgRgg="; - }; - x86_64-darwin = fetchurl { - url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-x64.dmg"; - hash = "sha256-z8CASZRWKlj1g3mhxTMMeR4klTvQ2ReSrL7Rt18qQbM="; - }; - aarch64-darwin = fetchurl { - url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-arm64.dmg"; - hash = "sha256-McYLczudKG4tRNIw/Ws4rht0n4tiKA2M99yKtJbdlY8="; - }; - }; - src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - libraries = [ - alsa-lib - at-spi2-atk - cups - nspr - nss - mesa - xorg.libxshmfence - xorg.libXScrnSaver - xorg.libXtst - xdg-utils - libdrm - libnotify - libsecret - libuuid - gtk3 - ]; - - meta = with lib; { - description = "A good-looking third-party netease cloud music player"; - mainProgram = "yesplaymusic"; - homepage = "https://github.com/qier222/YesPlayMusic/"; - license = licenses.mit; - maintainers = with maintainers; [ ChaosAttractor ]; - platforms = builtins.attrNames srcs; - }; -in -if stdenv.isDarwin -then stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ undmg ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/Applications - cp -r *.app $out/Applications - ''; -} -else stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ - autoPatchelfHook - wrapGAppsHook - makeWrapper - ]; - - buildInputs = libraries; - - runtimeDependencies = [ - (lib.getLib systemd) - ]; - - unpackPhase = '' - ${dpkg}/bin/dpkg-deb -x $src . - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp -r opt $out/opt - cp -r usr/share $out/share - substituteInPlace $out/share/applications/yesplaymusic.desktop \ - --replace "/opt/YesPlayMusic/yesplaymusic" "$out/bin/yesplaymusic" - makeWrapper $out/opt/YesPlayMusic/yesplaymusic $out/bin/yesplaymusic \ - --argv0 "yesplaymusic" \ - --add-flags "$out/opt/YesPlayMusic/resources/app.asar" - - runHook postInstall - ''; -} diff --git a/nixpkgs/pkgs/applications/audio/youtube-music/default.nix b/nixpkgs/pkgs/applications/audio/youtube-music/default.nix index 7f6b7865054f..642ba8e3fc0f 100644 --- a/nixpkgs/pkgs/applications/audio/youtube-music/default.nix +++ b/nixpkgs/pkgs/applications/audio/youtube-music/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "youtube-music"; - version = "3.3.1"; + version = "3.3.6"; src = fetchFromGitHub { owner = "th-ch"; repo = "youtube-music"; rev = "v${finalAttrs.version}"; - hash = "sha256-N6TzDTKvMyasksE0qcEGKeNjGAD08OzxpmpoQ11/ZW4="; + hash = "sha256-nxpctEG4XoxW6jOAxGdgTEYr6YnhFRR8+5HUQLxRJB0="; }; pnpmDeps = stdenvNoCC.mkDerivation { @@ -47,10 +47,10 @@ stdenv.mkDerivation (finalAttrs: { dontFixup = true; outputHashMode = "recursive"; outputHash = { - x86_64-linux = "sha256-V6CSawxBWFbXmAPbck0xCXqRlANpqFAoqSAB4Duf8qM="; - aarch64-linux = "sha256-cqBn35soV14CmobKt0napRELio4HKKA8Iw3QSWTxzP8="; - x86_64-darwin = "sha256-DY9T1N8Hxr57/XisYT+u2+hQvYMIiyQ3UHeTuA6BhSY="; - aarch64-darwin = "sha256-3Zk0SyhVKaz5QdO69/xzWFZj9ueJS6GLWhfW7odWvHc="; + x86_64-linux = "sha256-bujlQxP6Lr3qPUDxYXKyb702ZJY/xbuCsu3wVDhcb+8="; + aarch64-linux = "sha256-0kyjjttpXpFVhdza5NAjGrRn++qc/N5/u2dQl7VufLE="; + x86_64-darwin = "sha256-Q37QJt/mhfpSguOlkJGKFTCrIOrpbG3OBwaD/Bg09Us="; + aarch64-darwin = "sha256-wbfjzoGa/6vIlOOVX3bKNQ2uxzph3WSofo3MGXqA6yQ="; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); }; diff --git a/nixpkgs/pkgs/applications/audio/ytmdesktop/default.nix b/nixpkgs/pkgs/applications/audio/ytmdesktop/default.nix deleted file mode 100644 index 534bee41a983..000000000000 --- a/nixpkgs/pkgs/applications/audio/ytmdesktop/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, fetchurl, appimageTools, }: - -let - pname = "ytmdesktop"; - version = "1.13.0"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://github.com/ytmdesktop/ytmdesktop/releases/download/v${version}/YouTube-Music-Desktop-App-${version}.AppImage"; - sha256 = "0f5l7hra3m3q9zd0ngc9dj4mh1lk0rgicvh9idpd27wr808vy28v"; - }; - - appimageContents = appimageTools.extract { inherit name src; }; -in appimageTools.wrapType2 rec { - inherit name src; - - extraInstallCommands = '' - mv $out/bin/{${name},${pname}} - - install -m 444 \ - -D ${appimageContents}/youtube-music-desktop-app.desktop \ - -t $out/share/applications - substituteInPlace \ - $out/share/applications/youtube-music-desktop-app.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share - ''; - - meta = with lib; { - description = "A Desktop App for YouTube Music"; - homepage = "https://ytmdesktop.app/"; - license = licenses.cc0; - platforms = platforms.linux; - maintainers = [ maintainers.lgcl ]; - mainProgram = "ytmdesktop"; - }; -} diff --git a/nixpkgs/pkgs/applications/audio/zrythm/default.nix b/nixpkgs/pkgs/applications/audio/zrythm/default.nix index 254e0e5b746d..663c159d5d9b 100644 --- a/nixpkgs/pkgs/applications/audio/zrythm/default.nix +++ b/nixpkgs/pkgs/applications/audio/zrythm/default.nix @@ -64,7 +64,7 @@ , sratom , texi2html , vamp-plugin-sdk -, wrapGAppsHook +, wrapGAppsHook4 , xdg-utils , xxHash , zix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { python3.pkgs.sphinx sassc texi2html - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ |