diff options
Diffstat (limited to 'pkgs')
528 files changed, 11128 insertions, 4596 deletions
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 4115dae3aeb34..38cee35313fd6 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "amarok"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-FKh2eDBfrXagodrKVVpndf+mQuXrvMzs2R9JcJOZLBw="; + sha256 = "sha256-S+zyrp3cvoYRA+ZCFDaireIvU4yxw2ANTmZ/cb6ljys="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 6ff0217c59ead..92ee1de47e7c7 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.1.8"; + version = "5.1.9"; src = fetchurl { - url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-KxNLae/uTYL1m/X+/7wr7hhKfw31NpB9Mw9RzfrTuus="; + url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/"; + hash = "sha256-J5kLqXCMnGb0ZMhES6PQIPjN51ptlBGj4Fy8qSzJ6Qg="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ]; diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix index f837ad6603e3e..67ccc367be0e8 100644 --- a/pkgs/applications/audio/crip/default.nix +++ b/pkgs/applications/audio/crip/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { cp $script $out/bin/ substituteInPlace $out/bin/$script \ - --replace '$editor = "vim";' '$editor = "${nano}/bin/nano";' + --replace-fail '$editor = "vim";' '$editor = "${nano}/bin/nano";' wrapProgram $out/bin/$script \ --set PERL5LIB "${perlPackages.makePerlPath [ perlPackages.CDDB_get ]}" \ diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/applications/audio/noson/default.nix index 426a3d9d1bbb3..0184934ff2208 100644 --- a/pkgs/applications/audio/noson/default.nix +++ b/pkgs/applications/audio/noson/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "noson"; - version = "5.6.6"; + version = "5.6.7"; src = fetchFromGitHub { owner = "janbar"; repo = "noson-app"; rev = finalAttrs.version; - hash = "sha256-aBrp+mfY/c6K3dLbDGnEKoUbQC7TlFRQJZCjXPeDZ6s="; + hash = "sha256-lroQYO+Ab7uPQmsrUFK6uWdCoGQp1klyfLw6eAxdzjg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 12487ef3e86e1..8886e851c3c95 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -14,14 +14,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.31.1205.g4d59ad7c"; + version = "1.2.37.701.ge66eb7bc"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "75"; + rev = "76"; deps = [ alsa-lib @@ -86,8 +86,9 @@ stdenv.mkDerivation { # spotify ourselves: # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { + name = "spotify-${version}-${rev}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - hash = "sha512-o4iLcbNqbsxo9YJMy0SXO7Udv4CMhhBcsf53UuqWKFFWY/jKVN+Lb+dB7Jf9+UowpmbrP44w97Oi+dnbfFXYjQ=="; + hash = "sha512-k7aw1QM3NCFkm0tXcHgYyeEBagGFpCL6JdWlFruJszPloiCy5vopOsD4PdqyiSEs0rSUP0rLxX2UBs3XuI5cUA=="; }; nativeBuildInputs = [ wrapGAppsHook3 makeShellWrapper squashfsTools ]; diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index d009522f5c976..e9d6e5795c5a1 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "24.06.1"; + version = "24.06.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - hash = "sha256-H4PCZ1WwNg34WSDXgmH6pUPBglXafLTFfIzvmWiyeCw="; + hash = "sha256-/Rk95fAAquPrKwRchIgU8p9dpwvEV25ku1rknbJNlJc="; }; patches = [ diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix index cb6774fdc3fc1..b4056283c50e3 100644 --- a/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/pkgs/applications/blockchains/lndhub-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "lndhub-go"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "getAlby"; repo = "lndhub.go"; rev = version; - sha256 = "sha256-PHBzM/lYYu6hXa5jiFQR/K5j+vmxaYH7xuoxOhFbhMk="; + sha256 = "sha256-YOLqMIfZSGD+AOng1XWCBlzaHkPnQc+2kmDXF2fh+ps="; }; vendorHash = "sha256-Vo29w04cRW0syD2tjieKVeZ3srFNuEC3T17birVWn6k="; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 9a247d0bc870b..74f7d3c8f7a47 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -257,10 +257,12 @@ let passthru = let withSdk = androidSdk: mkAndroidStudioWrapper { inherit androidStudio androidSdk; }; in { + inherit version; unwrapped = androidStudio; full = withSdk androidenv.androidPkgs.androidsdk; inherit withSdk; sdk = androidSdk; + updateScript = [ ./update.sh "${channel}" ]; }; meta = { description = "Official IDE for Android (${channel} channel)"; diff --git a/pkgs/applications/editors/android-studio/update.sh b/pkgs/applications/editors/android-studio/update.sh new file mode 100755 index 0000000000000..04efbb3667540 --- /dev/null +++ b/pkgs/applications/editors/android-studio/update.sh @@ -0,0 +1,68 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=./. -i bash -p jq nix-prefetch-scripts + +set -euo pipefail + +DEFAULT_NIX="$(realpath "./pkgs/applications/editors/android-studio/default.nix")" +RELEASES_JSON="$(curl --silent -L https://jb.gg/android-studio-releases-list.json)" + +# Available channels: Release/Patch (stable), Beta, Canary +getLatest() { + local attribute="$1" + local channel="$2" + case "$channel" in + "stable") local select='.channel == "Release" or .channel == "Patch"' ;; + "beta") local select='.channel == "Beta" or .channel == "RC"' ;; + *) local select=".channel == \"${channel^}\"" ;; + esac + local result="$(echo "$RELEASES_JSON" \ + | jq -r ".content.item[] | select(${select}) | [.version, .${attribute}] | join(\" \")" \ + | sort --version-sort \ + | cut -d' ' -f 2- \ + | tail -n 1)" + + if [[ -n "$result" ]]; then + echo "$result" + else + echo "could not find the latest $attribute for $channel" + exit 1 + fi +} + +updateChannel() { + local channel="$1" + local latestVersion="$(getLatest "version" "$channel")" + + local localVersion="$(nix --extra-experimental-features nix-command eval --raw --file . androidStudioPackages."${channel}".version)" + if [[ "${latestVersion}" == "${localVersion}" ]]; then + echo "$channel is already up to date at $latestVersion" + return 0 + fi + echo "updating $channel from $localVersion to $latestVersion" + + local latestHash="$(nix-prefetch-url "https://dl.google.com/dl/android/studio/ide-zips/${latestVersion}/android-studio-${latestVersion}-linux.tar.gz")" + local latestSri="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$latestHash")" + local localHash="$(nix --extra-experimental-features nix-command eval --raw --file . androidStudioPackages."${channel}".unwrapped.src.drvAttrs.outputHash)" + sed -i "s~${localHash}~${latestSri}~g" "${DEFAULT_NIX}" + + # Match the formatting of default.nix: `version = "2021.3.1.14"; # "Android Studio Dolphin (2021.3.1) Beta 5"` + local versionString="${latestVersion}\"; # \"$(getLatest "name" "${channel}")\"" + sed -i "s~${localVersion}.*~${versionString}~g" "${DEFAULT_NIX}" + echo "updated ${channel} to ${latestVersion}" +} + +if (( $# == 0 )); then + for channel in "beta" "canary" "stable"; do + updateChannel "$channel" + done +else + while (( "$#" )); do + case "$1" in + beta|canary|stable) + updateChannel "$1" ;; + *) + echo "unknown channel: $1" && exit 1 ;; + esac + shift 1 + done +fi diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index 8d25c1ec2c2f1..1ba0ea1519b06 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -4453,10 +4453,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20240521.135840"; + version = "9.7pre0.20240530.133120"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20240521.135840.tar"; - sha256 = "06j7kjbpd390i0kqvvnlkpdzqkwiicbdgjymif338l0qx2kl4sg5"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20240530.133120.tar"; + sha256 = "sha256-DuuLDBJKI2LwC0PH9PtujcPvaqaKLWYij+KzP1U7o9M="; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 00f50233d50f1..9550969adbbe2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -64,6 +64,26 @@ self: let ''; }); + org = super.org.overrideAttrs (old: { + dontUnpack = false; + patches = old.patches or [ ] ++ [ + # security fix backported from 9.7.5 + (pkgs.fetchpatch { + url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8"; + hash = "sha256-bGgsnTSn6SMu1J8P2BfJjrKx2845FCsUB2okcIrEjDg="; + stripLen = 1; + }) + ]; + postPatch = old.postPatch or "" + "\n" + '' + pushd .. + local content_directory=${old.ename}-${old.version} + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + popd + ''; + dontBuild = true; + }); + pq = super.pq.overrideAttrs (old: { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.postgresql ]; }); diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 18a0a36fc06cb..a3d729b636eee 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -141,6 +141,26 @@ self: let }; }); + org = super.org.overrideAttrs (old: { + dontUnpack = false; + patches = old.patches or [ ] ++ [ + # security fix backported from 9.7.5 + (pkgs.fetchpatch { + url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8"; + hash = "sha256-bGgsnTSn6SMu1J8P2BfJjrKx2845FCsUB2okcIrEjDg="; + stripLen = 1; + }) + ]; + postPatch = old.postPatch or "" + "\n" + '' + pushd .. + local content_directory=${old.ename}-${old.version} + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + popd + ''; + dontBuild = true; + }); + plz = super.plz.overrideAttrs ( old: { dontUnpack = false; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 62048d867619c..b85128816aa61 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -16,7 +16,7 @@ }: let - rev = "152431c0b1d731d0302e1849690e2361f3caf7c1"; + rev = "4bfbbe4e6c44d80b15cb501fa3444ad03dba2824"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -28,13 +28,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20240615.2321"; + version = "20240622.236"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-LIjqr1IntQ6WTFOO3b6cAuB6LslG1HzVa9C+GYUyQOU="; + hash = "sha256-rzaUtUYDEZAuRjSgThHKxrQ7U8ZIO0k750aH08VpA08="; }; commit = rev; diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index aecd0b1fd66dc..487d8a3680a6d 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -93,6 +93,12 @@ in url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/12_all_org-remote-unsafe.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; hash = "sha256-b6WU1o3PfDV/6BTPfPNUFny6oERJCNsDrvflxX3Yvek="; }) + + # security fix from Emacs 29.4 + (fetchpatch { + url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=c645e1d8205f0f0663ec4a2d27575b238c646c7c"; + hash = "sha256-G+gGQx5w3KuWMotR1n/sYYL8WyAABYW3fUPeffMMs38="; + }) ]; }); diff --git a/pkgs/applications/editors/jetbrains/bin/linux.nix b/pkgs/applications/editors/jetbrains/bin/linux.nix index 1effb9def0079..d9f0391ba8daa 100644 --- a/pkgs/applications/editors/jetbrains/bin/linux.nix +++ b/pkgs/applications/editors/jetbrains/bin/linux.nix @@ -16,6 +16,7 @@ , python3 , autoPatchelfHook , vmopts ? null +, glibcLocales }: { pname @@ -112,6 +113,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { --set-default JAVA_HOME "$jdk" \ --set-default JETBRAINS_CLIENT_JDK "$jdk" \ --set-default ${hiName}_JDK "$jdk" \ + --set-default LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \ --set-default ${hiName}_VM_OPTIONS ${vmoptsFile} ln -s "$out/$pname/bin/${loName}.sh" $out/bin/$pname diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index 5078fb22eec9e..fb09af6272dfb 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -3,10 +3,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "96f90b3898ce1393381f4ba4a46356b07993bb44e09680df383898bca3f508a3", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.3.tar.gz", - "build_number": "241.17890.19" + "version": "2024.1.4", + "sha256": "4c7a0de431e93af748d1b695952809d4de43d9185d26c115c29aad683f511b8e", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4.tar.gz", + "build_number": "241.18034.45" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -19,10 +19,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2024.1.2", - "sha256": "5013b652c4bb7c8be3e8b518f3d7acd83c4d1c371c8703e6bcfebec7854d4c28", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.2.tar.gz", - "build_number": "241.17890.10" + "version": "2024.1.3", + "sha256": "aee5e18c44b9ed4e5c3ac13c0f2c8e5765105e7c12a8553e85ea8e64d5bb3d8c", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.3.tar.gz", + "build_number": "241.18034.23" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -35,42 +35,42 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "9937511083ab4bc0fb83463d1e0e7f2b054856c1e2064f43a7b1bd9ad899e3b3", - "url": "https://download.jetbrains.com/go/goland-2024.1.3.tar.gz", - "build_number": "241.17890.21" + "version": "2024.1.4", + "sha256": "f982476c9d870f1f354ab15135094cbde5c25c851ec21f424d0cd24149a12be6", + "url": "https://download.jetbrains.com/go/goland-2024.1.4.tar.gz", + "build_number": "241.18034.61" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "d2ae9701c948f77464415928891446e83e31abd3275a0d331febb7d58e1e1b97", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.3.tar.gz", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "7d5e4cdb5a7cb1c376ca66957481350571561edadc3f45e6fce422e14af0fc16", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4.tar.gz", + "build_number": "241.18034.62" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "358ddba5a187cb900efff7df06b1ffdda5a16d1e12cdf49328db486a066f6352", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.3.tar.gz", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "cda20bbbc052c2b8e87ea8607235ee0f7b5775728e8648c0a603889a3efa685f", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4.tar.gz", + "build_number": "241.18034.62" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", "version": "2023.3.1", "sha256": "52a40fe05dd8d53a3f68faa7a6e40b73f72f80db5976d8ebd781955493a65fe1", - "url": "https://download.jetbrains.com/mps/2023.3/MPS-2023.3.1.tar.gz", + "url": "https://download.jetbrains.com/mps/2023.3.1/MPS-2023.3.1.tar.gz", "build_number": "233.13135.1068" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "d785599f7d6bfdfb746eec68d5e606fe6df370909138243c35c549b574759432", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.3.tar.gz", - "build_number": "241.17890.8", + "version": "2024.1.4", + "sha256": "c6a9b57ecd8f588af512a1cba389738bd461531cab4f984ed9758abfdada822d", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4.tar.gz", + "build_number": "241.18034.69", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -92,34 +92,34 @@ "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "9cb256e2c12c493a5bbb7c84a44aa618732c67a137fa0eddb748a777e25b29d5", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.3.tar.gz", - "build_number": "241.17011.166" + "version": "2024.1.4", + "sha256": "e277c2636383c023f00bd7833be86ffe1f8f67cf98cb719bbb4293aa42ba8ad0", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4.tar.gz", + "build_number": "241.18034.76" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "e732aaf0dc07aaef7b9bff08d8335ed5361ff179f4e50f5cd6433884527fb452", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.3.tar.gz", - "build_number": "241.17890.15" + "version": "2024.1.4", + "sha256": "84b96e1f6cdbb5497fcce1a036044e5c51002006ac8926be72d37ec48b1ceb52", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4.tar.gz", + "build_number": "241.18034.63" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2024.1.1", - "sha256": "a0abd85542dd02d82f6adeabd4fa819731003883f0b6cac8a86f421f2a6f1c39", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.1.tar.gz", - "build_number": "241.15989.206" + "version": "2024.1.2", + "sha256": "68a94f4d57ca937629f825be9c1375328b4fbf50c4bf0561d1b9b8db04102a62", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.2.tar.gz", + "build_number": "241.17011.169" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "d22f38c8c02520deef21a57f3c85800dcf44a2ace8174a6dd0daa0a2789d5657", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.4.tar.gz", - "build_number": "241.17890.13" + "version": "2024.1.5", + "sha256": "339ac8fc3ecc20afdef05b1782cb861d52eb09336d6a20cc4aa487c1bd108522", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5.tar.gz", + "build_number": "241.18034.50" }, "writerside": { "update-channel": "Writerside EAP", @@ -134,10 +134,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "0609fefc65d5bafcb4fff54d9c4b135ec305d058dc3f350f659c6389bf944eb9", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.3-aarch64.tar.gz", - "build_number": "241.17890.19" + "version": "2024.1.4", + "sha256": "1e707c5409fd4a8490893ce23ff427d8e96d2cb6c31f1457a363e3127f0d1319", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.45" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -150,10 +150,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "version": "2024.1.2", - "sha256": "d5060ecc3909f8e21a8b29224c16f874c3c634ae7ca4c649821c467d744a556c", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.2-aarch64.tar.gz", - "build_number": "241.17890.10" + "version": "2024.1.3", + "sha256": "d7d7647e2e6c398148d87690c0224cac2212bb56e1c9d802bd79748df77f1b24", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.3-aarch64.tar.gz", + "build_number": "241.18034.23" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -166,26 +166,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "b8caa2618cd85c4bc3a4d95c6f1ec4207f93e754048fff571f1d667536512e45", - "url": "https://download.jetbrains.com/go/goland-2024.1.3-aarch64.tar.gz", - "build_number": "241.17890.21" + "version": "2024.1.4", + "sha256": "b5b9efc087c71369c85080b9159e268bcf16a493e69e359b67108f71a474dd61", + "url": "https://download.jetbrains.com/go/goland-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.61" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "d484fe1eac4b08109880ce207d208dec19782ee786fd393c19caa2dc31abbc1f", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.3-aarch64.tar.gz", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "d4991c6041bfbe9958b55e876a45672d90ddcaf7aae18ac1c9134747a102eddf", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.62" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "0d913b3d78f254e13ee3edf0f868067eebdb586f25cb3be439b8067e0d5689fb", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.3-aarch64.tar.gz", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "35057b24047c719102f08a22754bba1c66098f0d410b21ab178d7b6b9a8f7882", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.62" }, "mps": { "update-channel": "MPS RELEASE", @@ -198,10 +198,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "4c9637be78764d7f41394a23a1477c42346f3211a9f31683f3beb7dbeef700e7", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.3-aarch64.tar.gz", - "build_number": "241.17890.8", + "version": "2024.1.4", + "sha256": "45a11309799d23b1638a87ee4580bd5e8d4f50ea07d5467e99e416ae45a23b06", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.69", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -223,34 +223,34 @@ "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "8991e31b3edc0a4347a9711e4f7267b91d3176d47abfa4f560d83d214ba70ff0", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.3-aarch64.tar.gz", - "build_number": "241.17011.166" + "version": "2024.1.4", + "sha256": "e0f8ac64b87c093c7f97ea6ee340c7f518d14d4c68c17d0a2b7a9f079d2fcd62", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.76" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "420dfd86a2f6964ab47c38addc65cb71178dc14092a25c0df2c3635e1b6c5896", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.3-aarch64.tar.gz", - "build_number": "241.17890.15" + "version": "2024.1.4", + "sha256": "b4d51afd0cf8ef19e6eae5a401836a89164215cf532a08a33824895229dba321", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.63" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "version": "2024.1.1", - "sha256": "aa19d94bbe8618cdf6e3f18163dc9537cfac454fc2e4ff4f01c11dd98cdd6a89", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.1-aarch64.tar.gz", - "build_number": "241.15989.206" + "version": "2024.1.2", + "sha256": "a6abde77ef84f10d342b57c3f6bff84d0b973d8265c2baeb2490fc36dbcca13f", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.2-aarch64.tar.gz", + "build_number": "241.17011.169" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "a0d8462ecdae484b42f87729fe9d16283a1ff4375e0a7079d06e56a9c6b6ef09", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.4-aarch64.tar.gz", - "build_number": "241.17890.13" + "version": "2024.1.5", + "sha256": "20db531cecada0fdd1947234ac120d0cf2a40037a3af825f1cf2ac066709fb44", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5-aarch64.tar.gz", + "build_number": "241.18034.50" }, "writerside": { "update-channel": "Writerside EAP", @@ -265,10 +265,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2024.1.3", - "sha256": "b08fb203c870c79a7778e44292968656e711416b985d6c60ed46dc1d6d0269a1", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.3.dmg", - "build_number": "241.17890.19" + "version": "2024.1.4", + "sha256": "1d1d03a19aba6f941703ca5724317464e670a1ab63d70882448cf0364bc13c8b", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4.dmg", + "build_number": "241.18034.45" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -281,10 +281,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2024.1.2", - "sha256": "5284682b7446ec3328e73dd16d6c11c331487fd21a20029c8b9ddb38c7d00968", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.2.dmg", - "build_number": "241.17890.10" + "version": "2024.1.3", + "sha256": "132c1e67c18d676844a26ad95fcd68942965157222f7dc931c15117e96d29a84", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.3.dmg", + "build_number": "241.18034.23" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -297,26 +297,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2024.1.3", - "sha256": "086a84677a4d72712673206a35d5d75dc793c8753fb92bc82b3410ca6356d2f7", - "url": "https://download.jetbrains.com/go/goland-2024.1.3.dmg", - "build_number": "241.17890.21" + "version": "2024.1.4", + "sha256": "e2b2ae8d52700335d539b28179410b2567c78f6c8121a742e4df208180b55884", + "url": "https://download.jetbrains.com/go/goland-2024.1.4.dmg", + "build_number": "241.18034.61" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2024.1.3", - "sha256": "8ad56d0c4517bdcfb8e970cce1d8e1b44672454eb658e14d452ee59bb5659a56", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.3.dmg", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "2420493df5796e47836d3dfd579006f25aa88f1252db4fd6999591529022e925", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4.dmg", + "build_number": "241.18034.62" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2024.1.3", - "sha256": "338dc0847fb71d3d83cef52705439f86a37052fae737cf9d36f01a2d27e40ad2", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.3.dmg", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "30396377e163ba7f8d5c4ef112e9c8abb064897dd337f059357feecaa6c53b6e", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4.dmg", + "build_number": "241.18034.62" }, "mps": { "update-channel": "MPS RELEASE", @@ -329,10 +329,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2024.1.3", - "sha256": "68403a8f6afd6d0a13355dd6ea8b333a1fd785fd1422fe902105d3c02359ee04", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.3.dmg", - "build_number": "241.17890.8", + "version": "2024.1.4", + "sha256": "ce844a947a96d819a59b35705fd1007c5193a444c3bb5d237179bfb3ceb2ed8b", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4.dmg", + "build_number": "241.18034.69", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -354,34 +354,34 @@ "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2024.1.3", - "sha256": "54eccb5d26825ae5022ab57207197f4fea68a02a0e6c4dceb3c79ce81750b1e5", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.3.dmg", - "build_number": "241.17011.166" + "version": "2024.1.4", + "sha256": "2fc9e3063278e510b28eea0b2823b0c2309d08728d53261b48cbac093255cbfe", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4.dmg", + "build_number": "241.18034.76" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2024.1.3", - "sha256": "ed9c8bd4fcc4e9756f60f44d4cbb74b47031cee52503f5dc869e98b1be988d9d", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.3.dmg", - "build_number": "241.17890.15" + "version": "2024.1.4", + "sha256": "a4619da76349319b45a7bacbc49c3c53b8bd0769692e30f84f78a5c61ccd552b", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4.dmg", + "build_number": "241.18034.63" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2024.1.1", - "sha256": "e7b23829baa464de3456757a880a8daf364c867c23a7ce1c126b1b210cdea400", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.1.dmg", - "build_number": "241.15989.206" + "version": "2024.1.2", + "sha256": "d937f1f8eb6a7d0ce35218a616d6e7e237b86c7fdb9562b2ff3213ad3c3730de", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.2.dmg", + "build_number": "241.17011.169" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2024.1.4", - "sha256": "d4a8a990f92a183911dd6f7a75c671b9851d77e9e269e9e2bc5e6973a0b9f691", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.4.dmg", - "build_number": "241.17890.13" + "version": "2024.1.5", + "sha256": "45475fda7a66ba5da23091a7d9ec3314c9482b0a31fe9cc40a3a02f243c86e48", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5.dmg", + "build_number": "241.18034.50" }, "writerside": { "update-channel": "Writerside EAP", @@ -396,10 +396,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "0d9e1267ac09a6384eba29088e627219fd00586c1055a1c2f46d1da10f1da467", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.3-aarch64.dmg", - "build_number": "241.17890.19" + "version": "2024.1.4", + "sha256": "9eed7144d482a4fc9d6cc639c04c0b99cc6831aa73c5998ac9d1e1bd23f7ab66", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4-aarch64.dmg", + "build_number": "241.18034.45" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -412,10 +412,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2024.1.2", - "sha256": "ee69b1ed4ebfe1f4f41e6d617d4ccc8ac2d9a484dace45f2a3c0532a4a091ae2", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.2-aarch64.dmg", - "build_number": "241.17890.10" + "version": "2024.1.3", + "sha256": "fa8f9c77b2fab31ea383a492c7a061e4b297e6581df4a5c116de9aec4a52c86d", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.3-aarch64.dmg", + "build_number": "241.18034.23" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -428,26 +428,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "9b4dc9d1374178b2f8f0a30004afc9c1ef2d009441d3e096a76bda7456758522", - "url": "https://download.jetbrains.com/go/goland-2024.1.3-aarch64.dmg", - "build_number": "241.17890.21" + "version": "2024.1.4", + "sha256": "6dd71b3993b005e3557ad6ddb4d9ed87068be5225df19422e4b0e3fdd0fbbd10", + "url": "https://download.jetbrains.com/go/goland-2024.1.4-aarch64.dmg", + "build_number": "241.18034.61" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "0b51284ee1e1e1390f9bce1211ee8b48b03b4d5d2394fb7180b12f80a7817d63", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.3-aarch64.dmg", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "0c2e9a534d8f84acf8a17412d73e3f161864268acefee5130259489e2575d246", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4-aarch64.dmg", + "build_number": "241.18034.62" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "43fccfb343c69529b97a048adfde577d3ad3ee701240a2c9cace6936f4cd356d", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.3-aarch64.dmg", - "build_number": "241.17890.1" + "version": "2024.1.4", + "sha256": "0d6dd0ebc97a61920721fb6c9663a905df1edea976f62b32bdf8ff879c02c7d0", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4-aarch64.dmg", + "build_number": "241.18034.62" }, "mps": { "update-channel": "MPS RELEASE", @@ -460,10 +460,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "e4b767f5348fc3854ffc057baeffcd10c0c293b5aa3cbeeb2d2e7bd14531a4bb", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.3-aarch64.dmg", - "build_number": "241.17890.8", + "version": "2024.1.4", + "sha256": "8e5bffb20b1606195afe6818429e99b31c56f2e8f390c81cd6d92ff3de80de68", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4-aarch64.dmg", + "build_number": "241.18034.69", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -485,34 +485,34 @@ "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "ecde83909aff440727db6641c3f071c06e35b06e2148703ffa4ff270670469e2", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.3-aarch64.dmg", - "build_number": "241.17011.166" + "version": "2024.1.4", + "sha256": "0682ca85bb61534e39426d9f397eeb3c383dfd0a2e9dc4e8052d9e6408741fdb", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4-aarch64.dmg", + "build_number": "241.18034.76" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "a26d85b37141a4daacb0afbc58f269fdb5a5fbb49861a9881779e4b906a85ffe", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.3-aarch64.dmg", - "build_number": "241.17890.15" + "version": "2024.1.4", + "sha256": "ad3ebd40266f40f5aadb152fc5e845bda1eb8de75923cf598072458dc92b8194", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4-aarch64.dmg", + "build_number": "241.18034.63" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2024.1.1", - "sha256": "955a2da9eaa21593e457555653c1945c87a7b629b1a74d9e86f53a025e94c5ba", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.1-aarch64.dmg", - "build_number": "241.15989.206" + "version": "2024.1.2", + "sha256": "af973b73e5ced9982703d7f5d163e3bd8bee8b095aac16b2151ec2c7f1d4d870", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.2-aarch64.dmg", + "build_number": "241.17011.169" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "37eaeeaf614e43215782c5af844e3df993cdc50e1370f5a6ecde562b3052218b", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.4-aarch64.dmg", - "build_number": "241.17890.13" + "version": "2024.1.5", + "sha256": "e55e4671316ad2c2bfc5564516e261b59d139267c18d06d7a62b8f665d86da5e", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5-aarch64.dmg", + "build_number": "241.18034.50" }, "writerside": { "update-channel": "Writerside EAP", diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index 48b9fed7f85ab..00b2794a139f2 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -18,16 +18,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", "241.17890.14": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", "241.17890.24": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip" }, "name": "ideavim" }, @@ -36,10 +36,41 @@ "idea-ultimate" ], "builds": { - "241.17890.1": "https://plugins.jetbrains.com/files/631/552809/python-241.17890.1.zip" + "241.18034.62": "https://plugins.jetbrains.com/files/631/559769/python-241.18034.62.zip" }, "name": "python" }, + "2162": { + "compatible": [ + "clion", + "datagrip", + "goland", + "idea-community", + "idea-ultimate", + "mps", + "phpstorm", + "pycharm-community", + "pycharm-professional", + "rider", + "ruby-mine", + "rust-rover", + "webstorm" + ], + "builds": { + "233.13135.1068": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.17890.14": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.17890.24": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" + }, + "name": "string-manipulation" + }, "6954": { "compatible": [ "clion", @@ -58,16 +89,16 @@ ], "builds": { "233.13135.1068": null, - "241.15989.206": null, - "241.17011.166": null, - "241.17890.1": null, - "241.17890.13": null, + "241.17011.169": null, "241.17890.14": null, - "241.17890.15": null, - "241.17890.19": null, - "241.17890.21": null, "241.17890.24": null, - "241.17890.8": null + "241.18034.45": null, + "241.18034.50": null, + "241.18034.61": null, + "241.18034.62": null, + "241.18034.63": null, + "241.18034.69": null, + "241.18034.76": null }, "name": "kotlin" }, @@ -89,27 +120,58 @@ ], "builds": { "233.13135.1068": null, - "241.15989.206": null, - "241.17011.166": "https://plugins.jetbrains.com/files/6981/547306/ini-241.17011.124.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", + "241.17011.169": null, "241.17890.14": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", "241.17890.24": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip" }, "name": "ini" }, + "7086": { + "compatible": [ + "clion", + "datagrip", + "goland", + "idea-community", + "idea-ultimate", + "mps", + "phpstorm", + "pycharm-community", + "pycharm-professional", + "rider", + "ruby-mine", + "rust-rover", + "webstorm" + ], + "builds": { + "233.13135.1068": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.17890.14": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.17890.24": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" + }, + "name": "acejump" + }, "7219": { "compatible": [ "idea-ultimate", "phpstorm" ], "builds": { - "241.17890.1": "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip" + "241.18034.62": "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip" }, "name": "symfony-support" }, @@ -119,8 +181,8 @@ "phpstorm" ], "builds": { - "241.17890.1": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip" + "241.18034.62": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip" }, "name": "php-annotations" }, @@ -130,21 +192,53 @@ "datagrip", "goland", "idea-community", + "idea-ultimate", "pycharm-community", "rider", "rust-rover" ], "builds": { - "241.15989.206": "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/7322/540027/python-ce-241.17011.48.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/7322/540027/python-ce-241.17011.48.zip", "241.17890.14": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip" + "241.17890.24": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip" }, "name": "python-community-edition" }, + "7391": { + "compatible": [ + "clion", + "datagrip", + "goland", + "idea-community", + "idea-ultimate", + "mps", + "phpstorm", + "pycharm-community", + "pycharm-professional", + "rider", + "ruby-mine", + "rust-rover", + "webstorm" + ], + "builds": { + "233.13135.1068": "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.17890.14": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.17890.24": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip" + }, + "name": "asciidoc" + }, "8182": { "compatible": [ "clion", @@ -162,15 +256,15 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "241.17011.166": null, - "241.17890.1": null, - "241.17890.13": null, "241.17890.14": null, - "241.17890.15": null, - "241.17890.19": null, - "241.17890.21": null, "241.17890.24": null, - "241.17890.8": null + "241.18034.45": null, + "241.18034.50": null, + "241.18034.61": null, + "241.18034.62": null, + "241.18034.63": null, + "241.18034.69": null, + "241.18034.76": null }, "name": "-deprecated-rust" }, @@ -191,15 +285,15 @@ ], "builds": { "233.13135.1068": null, - "241.17011.166": null, - "241.17890.1": null, - "241.17890.13": null, "241.17890.14": null, - "241.17890.15": null, - "241.17890.19": null, - "241.17890.21": null, "241.17890.24": null, - "241.17890.8": null + "241.18034.45": null, + "241.18034.50": null, + "241.18034.61": null, + "241.18034.62": null, + "241.18034.63": null, + "241.18034.69": null, + "241.18034.76": null }, "name": "-deprecated-rust-beta" }, @@ -213,10 +307,10 @@ "ruby-mine" ], "builds": { - "241.17890.1": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", "241.17890.14": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip" + "241.18034.61": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip" }, "name": "ide-features-trainer" }, @@ -238,16 +332,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", "241.17890.14": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", "241.17890.24": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip" }, "name": "nixidea" }, @@ -257,8 +351,8 @@ "idea-ultimate" ], "builds": { - "241.17890.1": "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip" + "241.18034.61": "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip" }, "name": "go" }, @@ -280,19 +374,50 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", "241.17890.14": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", "241.17890.24": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip" }, "name": "csv-editor" }, + "11349": { + "compatible": [ + "clion", + "datagrip", + "goland", + "idea-community", + "idea-ultimate", + "mps", + "phpstorm", + "pycharm-community", + "pycharm-professional", + "rider", + "ruby-mine", + "rust-rover", + "webstorm" + ], + "builds": { + "233.13135.1068": "https://plugins.jetbrains.com/files/11349/561478/aws-toolkit-jetbrains-standalone-3.13-233.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.17890.14": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.17890.24": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip" + }, + "name": "aws-toolkit" + }, "12062": { "compatible": [ "clion", @@ -311,16 +436,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", "241.17890.14": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", "241.17890.24": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip" }, "name": "vscode-keymap" }, @@ -342,16 +467,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", "241.17890.14": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", "241.17890.24": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip" }, "name": "eclipse-keymap" }, @@ -373,16 +498,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", "241.17890.14": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", "241.17890.24": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip" }, "name": "visual-studio-keymap" }, @@ -404,16 +529,16 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.15989.206": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17011.166": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.1": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.13": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.17011.169": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "241.17890.14": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.19": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.21": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "241.17890.24": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.8": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "241.18034.45": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.18034.50": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.18034.61": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.18034.62": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.18034.63": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.18034.69": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.18034.76": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -434,17 +559,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip" + "233.13135.1068": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.17890.14": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.17890.24": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip" }, "name": "github-copilot" }, @@ -466,19 +591,50 @@ ], "builds": { "233.13135.1068": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.15989.206": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17011.166": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.13": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "241.17890.14": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.21": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "241.17890.24": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.8": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "241.18034.45": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, + "20146": { + "compatible": [ + "clion", + "datagrip", + "goland", + "idea-community", + "idea-ultimate", + "mps", + "phpstorm", + "pycharm-community", + "pycharm-professional", + "rider", + "ruby-mine", + "rust-rover", + "webstorm" + ], + "builds": { + "233.13135.1068": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.17011.169": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.17890.14": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.17890.24": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" + }, + "name": "mermaid" + }, "22407": { "compatible": [ "clion", @@ -486,9 +642,9 @@ "rust-rover" ], "builds": { - "241.15989.206": "https://plugins.jetbrains.com/files/22407/542571/intellij-rust-241.25989.199.zip", - "241.17890.1": "https://plugins.jetbrains.com/files/22407/542571/intellij-rust-241.25989.199.zip", - "241.17890.19": "https://plugins.jetbrains.com/files/22407/542571/intellij-rust-241.25989.199.zip" + "241.17011.169": "https://plugins.jetbrains.com/files/22407/555351/intellij-rust-241.27011.169.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/22407/555351/intellij-rust-241.27011.169.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/22407/555351/intellij-rust-241.27011.169.zip" }, "name": "rust" } @@ -496,6 +652,8 @@ "files": { "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip": "sha256-P8AFMVp/rFi7zTh9f/i45q/QalvI37itnK57Dz/W/z4=", "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip": "sha256-C3l3Z9a7maCrMjc2Fk/wf3AoExRbvN+fn2mAtXigt0A=", + "https://plugins.jetbrains.com/files/11349/561478/aws-toolkit-jetbrains-standalone-3.13-233.zip": "sha256-Cc87UUI1dAFqmmydPRAcirlF2kF1v1sMcYMdHVZ5lK8=", + "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip": "sha256-uk9DVZ7K+EwkoNubC5eoVwxlvYCd7KVTl90zJsKc4r0=", "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip": "sha256-9keDJ73bSHkzAEq8nT96I5sp05BgMZ08/4BzarOjO5g=", "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip": "sha256-LeQ5vi9PCJYmWNmT/sutWjSlwZaAYYuEljVJBYG2VpY=", "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip": "sha256-IsmoWuUroAp1LLuphp4F1dun4tQOOitZxoG+Nxs5pYk=", @@ -504,17 +662,22 @@ "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip": "sha256-tNgt0vIkdCB/LcaSj58mT6cNlw4lytRo0cZSt7sIERU=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip": "sha256-6ibo1vdwO4olQTCWpWAefT3QCwgtzTo1ojilDes8Rvg=", - "https://plugins.jetbrains.com/files/17718/551329/github-copilot-intellij-1.5.6.5692.zip": "sha256-p2xY8eN3tOvlXhuZm4R7zl67lnKbaJwKwPZSolDTaX0=", + "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip": "sha256-4bYtBaLvcXZv8eVfG09ywSbcP+7SUb4j+NZ5mb2aluE=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", - "https://plugins.jetbrains.com/files/22407/542571/intellij-rust-241.25989.199.zip": "sha256-ACeMU2llicj8VHBJJSAk2SIQaZrD2ykmY0b3VDiedV4=", - "https://plugins.jetbrains.com/files/631/552809/python-241.17890.1.zip": "sha256-ASnW9SteKd88h2tAuZSHjnK+NMV7lm/3MN1tMqRvtmg=", - "https://plugins.jetbrains.com/files/6981/547306/ini-241.17011.124.zip": "sha256-6EU2ExUMvXG2pJ77ZgZIsPC6gWX8MTZB0rRttYNRfX4=", + "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip": "sha256-DUiIQYIzYoXmgtBakSLtMB+xxJMaR70Jgg9erySa3wQ=", + "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip": "sha256-OqeQCqFe8iW/8NPg+9i+UKh+twIPQ9uLZrItMukCi7k=", + "https://plugins.jetbrains.com/files/22407/555351/intellij-rust-241.27011.169.zip": "sha256-7rbYfO5CUvsW3HXWmEadreKbhJhX6joX15miODb2N+4=", + "https://plugins.jetbrains.com/files/631/559769/python-241.18034.62.zip": "sha256-DnjjUcwRL9dbNrHTnZacQYPE0biRFLmq6lR2ApRGgXI=", "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip": "sha256-7JQpKNttNfTvzfZ2Qj42FZAtSqx6GjWHhT0WRecK3tc=", + "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip": "sha256-85KeM0H3Jw8WP6LjKf1L7mIRXxnTR3YUCT6xUduAN/s=", + "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=", "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip": "sha256-92uUIFz5kEjrbgPnomi0VXc9Du17evzGsO5ApsrtHrA=", "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip": "sha256-JIZ6Iq3sOcAm8fBXnjRrG9dqCZuD/WajyVmn1JjYMBA=", - "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip": "sha256-VJWFzUk/lloFCfHbXX7lQRV6bGseCqEPA8XOLlkqNho=", "https://plugins.jetbrains.com/files/7322/540027/python-ce-241.17011.48.zip": "sha256-UrvhbGhcqxGke5tZTktyaWVYIWO5NhOU/WiswMYr83Y=", "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip": "sha256-njHcuJmpc/5JsfZ6mmjcRK2j78J0E4bu68T1A0DNdVU=", + "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip": "sha256-e+MewymlNWzbut8eADe8jwqco921ULe83eLEGpDf1GY=", + "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip": "sha256-icVvR79Ut6RopPKqvUQf4ZHKg14LV8/KWUZfQh/BYV8=", + "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip": "sha256-oKczkLHAk2bJRNRgToVe0ySEJGF8+P4oWqQ33olwzWw=", "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip": "sha256-+Lc/avYBLpyIV63DlbhAJtieHDv4HdggqdGFDw9iqN0=", "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip": "sha256-p26GW1NyVI8OR1VypeWUFWW8qlwB+LtzrEoKyXBwiCw=", "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip": "sha256-oP/tvAqzMSDLJ0Jah1eLJDZIm9WhOZas7lPWrvjWFMM=", diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix index f93e0c62e3857..4e05fc2b39117 100644 --- a/pkgs/applications/editors/ldtk/default.nix +++ b/pkgs/applications/editors/ldtk/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 'LDtk ${finalAttrs.version} installer.AppImage' $out/share/ldtk.AppImage makeWrapper ${appimage-run}/bin/appimage-run $out/bin/ldtk \ --add-flags $out/share/ldtk.AppImage - install -Dm644 src/ldtk.png $out/share/icons/hicolor/1024x1024/apps/ldtk.png + install -Dm644 src/ldtk.png $out/share/icons/hicolor/512x512/apps/ldtk.png runHook postInstall ''; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 29e087d801fe1..1a5d3f50044e7 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9676,18 +9676,6 @@ final: prev: meta.homepage = "https://github.com/mfukar/robotframework-vim/"; }; - rocks-nvim = buildNeovimPlugin { - pname = "rocks.nvim"; - version = "2024-06-19"; - src = fetchFromGitHub { - owner = "nvim-neorocks"; - repo = "rocks.nvim"; - rev = "6737e01a76eaaae06d11b45c8b5b774fa97c283b"; - sha256 = "0vl6rm3rv1730iw3bwzrwjsgr1hw5h4ksdgpir5spd3vqj7i97lz"; - }; - meta.homepage = "https://github.com/nvim-neorocks/rocks.nvim/"; - }; - ron-vim = buildVimPlugin { pname = "ron.vim"; version = "2022-08-19"; @@ -10894,6 +10882,18 @@ final: prev: meta.homepage = "https://github.com/Marskey/telescope-sg/"; }; + telescope-smart-history-nvim = buildVimPlugin { + pname = "telescope-smart-history.nvim"; + version = "2022-12-15"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-smart-history.nvim"; + rev = "81a4cceaa54d65d5f7c7c26178ee63b634d3e26d"; + sha256 = "sha256-riBl0vSkRtM9Gtw/FNSKodSmqgGUpDnH7d5w+uU4ReQ="; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-smart-history.nvim/"; + }; + telescope-symbols-nvim = buildVimPlugin { pname = "telescope-symbols.nvim"; version = "2023-11-24"; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index 4b70d8555dd2e..8ed3cbffa1d3f 100755 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -94,5 +94,5 @@ def update_grammars(nvim_treesitter_dir: str): if __name__ == "__main__": - generated = update_grammars(sys.args[1]) + generated = update_grammars(sys.argv[1]) open(join(os.path.dirname(__file__), "generated.nix"), "w").write(generated) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index dc7fe9b2303d1..1eb32501131a8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -7,6 +7,7 @@ , fetchFromSourcehut , fetchpatch , fetchurl +, neovimUtils , substituteAll , # Language dependencies fetchYarnDeps @@ -449,6 +450,8 @@ doInstallCheck = true; nvimRequireCheck = "codesnap"; + + meta.homepage = "https://github.com/mistricky/codesnap.nvim/"; }; command-t = super.command-t.overrideAttrs { @@ -1284,6 +1287,10 @@ ]; }; + rocks-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "rocks-nvim"; }; + + rocks-config-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "rocks-config-nvim"; }; + roslyn-nvim = super.roslyn-nvim.overrideAttrs { dependencies = with self; [ nvim-lspconfig ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 2f1c42fe67f2f..c31ea3ee4df14 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -814,7 +814,6 @@ https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim https://github.com/gu-fan/riv.vim/,, https://github.com/kevinhwang91/rnvimr/,, https://github.com/mfukar/robotframework-vim/,, -https://github.com/nvim-neorocks/rocks.nvim/,, https://github.com/ron-rs/ron.vim/,, https://github.com/jmederosalvarado/roslyn.nvim/,HEAD, https://github.com/keith/rspec.vim/,, @@ -915,6 +914,7 @@ https://github.com/MrcJkb/telescope-manix/,HEAD, https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD, https://github.com/nvim-telescope/telescope-project.nvim/,, https://github.com/Marskey/telescope-sg/,HEAD, +https://github.com/nvim-telescope/telescope-smart-history.nvim/,HEAD, https://github.com/nvim-telescope/telescope-symbols.nvim/,, https://github.com/nvim-telescope/telescope-ui-select.nvim/,, https://github.com/fhill2/telescope-ultisnips.nvim/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 94d77cf65efdb..74e8c65102c32 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -754,6 +754,23 @@ let }; }; + bradgashler.htmltagwrap = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "bradgashler"; + name = "htmltagwrap"; + version = "1.0.0"; + hash = "sha256-WOMfwxyeDLoSwF0xz9tbntDVrUWycJ4bW0rZjfLSzgM="; + }; + meta = { + changelog = "https://github.com/bgashler1/vscode-htmltagwrap/blob/master/CHANGELOG.md"; + description = "VSCode extension for wrapping a text selection in HTML tags"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bradgashler.htmltagwrap"; + homepage = "https://github.com/bgashler1/vscode-htmltagwrap"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.superherointj ]; + }; + }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tailwindcss"; @@ -2516,6 +2533,22 @@ let jebbs.plantuml = callPackage ./jebbs.plantuml { }; + jeff-hykin.better-nix-syntax = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "jeff-hykin"; + name = "better-nix-syntax"; + version = "1.1.5"; + hash = "sha256-9V+ziWk9V4LyQiVNSC6DniJDun+EvcK30ykPjyNsvp0="; + }; + meta = { + description = "Visual Studio Code extension providing Nix Syntax highlighting"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jeff-hykin.better-nix-syntax"; + homepage = "https://github.com/jeff-hykin/better-nix-syntax"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.superherointj ]; + }; + }; + jellyedwards.gitsweep = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "jellyedwards"; @@ -2770,6 +2803,21 @@ let }; }; + leonardssh.vscord = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscord"; + publisher = "leonardssh"; + version = "5.2.12"; + hash = "sha256-WGDEizYG6UAqe1jnhvjfFouXDA9Yr5P+BjxPahAIsTE="; + }; + meta = { + description = "Highly customizable Discord Rich Presence extension for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=leonardssh.vscord"; + homepage = "https://github.com/leonardssh/vscord"; + license = lib.licenses.mit; + }; + }; + llvm-org.lldb-vscode = llvmPackages.lldb; llvm-vs-code-extensions.vscode-clangd = buildVscodeMarketplaceExtension { diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 4b941b4d043be..671affec32d53 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -51,24 +51,15 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-33"; + version = "7.1.1-34"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-URGcJDgvRdpYZoECyVeSd0ut1Nkl0Sx2pDhYpi8Yf6o="; + hash = "sha256-rECU/dp8HQKFs1PW6QeTZIMxCIzzh1w7CckapnxdzxU="; }; - patches = [ - # Fixes 7.1.1-32 -> 7.1.1-33 regression that, notably, affects - # perlPackages.ImageMagick tests. Should be in the next release. - (fetchpatch { - url = "https://github.com/ImageMagick/ImageMagick/commit/bdc6c09cec64fd8e1570ee3edf5647acde336272.patch"; - hash = "sha256-cfmti9DXFhvn0UasmW0vwrNp+Lfepyrnp6ijk+1sJo8="; - }) - ]; - outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index a79b112780504..95889ffff4d51 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -41,6 +41,7 @@ , python3 , SDL2 , shaderc +, tracy , udev , vulkan-headers , vulkan-loader @@ -80,6 +81,9 @@ stdenv.mkDerivation { cmakeFlags = [ "-DXRT_FEATURE_SERVICE=${if serviceSupport then "ON" else "OFF"}" "-DXRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH=ON" + "-DXRT_HAVE_TRACY=ON" + "-DXRT_FEATURE_TRACING=ON" + "-DXRT_HAVE_STEAM=ON" ]; buildInputs = [ @@ -117,6 +121,7 @@ stdenv.mkDerivation { pcre2 SDL2 shaderc + tracy udev vulkan-headers vulkan-loader @@ -138,11 +143,6 @@ stdenv.mkDerivation { export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}} ''; - patches = [ - # We don't have $HOME/.steam when building - ./force-enable-steamvr_lh.patch - ]; - passthru.tests = { basic-service = nixosTests.monado; }; diff --git a/pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch b/pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch deleted file mode 100644 index eac92675ebd96..0000000000000 --- a/pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4308d73d..0081d536 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -219,6 +219,7 @@ option(BUILD_TESTING "Enable building of the test suite?" ON) - if(EXISTS "$ENV{HOME}/.steam/root") - set(XRT_HAVE_STEAM YES) - endif() -+set(XRT_HAVE_STEAM YES) - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(XRT_HAVE_INTERNAL_HID ON) diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index 08502ccf06bab..f29e1e06ab251 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -1,18 +1,60 @@ -{ stdenv, lib, requireFile, wrapQtAppsHook, autoPatchelfHook, makeWrapper, unixtools, fakeroot -, mailcap, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig -, dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim -# Qt 5 subpackages -, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qt3d, mlt +{ stdenv +, lib +, requireFile +, wrapQtAppsHook +, autoPatchelfHook +, makeWrapper +, unixtools +, fakeroot +, mailcap +, libGL +, libpulseaudio +, alsa-lib +, nss +, gd +, gst_all_1 +, nspr +, expat +, fontconfig +, dbus +, glib +, zlib +, openssl +, libdrm +, cups +, avahi-compat +, xorg +, wayland +, libudev0-shim +, bubblewrap +, libjpeg8 +, gdk-pixbuf +, gtk3 +, pango + # Qt 6 subpackages +, qtbase +, qtserialport +, qtserialbus +, qtvirtualkeyboard +, qtmultimedia +, qt3d +, mlt +, qtlocation +, qtwebengine +, qtquick3d +, qtwayland +, qtwebview +, qtscxml }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pixinsight"; - version = "1.8.9-2"; + version = "1.8.9-3"; src = requireFile rec { - name = "PI-linux-x64-${version}-20230920-c.tar.xz"; + name = "PI-linux-x64-${finalAttrs.version}-20240619-c.tar.xz"; url = "https://pixinsight.com/"; - hash = "sha256-g7paYTYv52XBg0w3d3YhVNrmt+iS20uobaUsvY6F3jM="; + hash = "sha256-WZrD+X7zE1i29+YsGJ+wbIXmlVon9bczHvvRAkQXz6M="; message = '' PixInsight is available from ${url} and requires a commercial (or trial) license. After a license has been obtained, PixInsight can be downloaded from the software distribution @@ -30,6 +72,7 @@ stdenv.mkDerivation rec { autoPatchelfHook mailcap libudev0-shim + bubblewrap ]; buildInputs = [ @@ -53,15 +96,25 @@ stdenv.mkDerivation rec { wayland cups avahi-compat + libjpeg8 + gdk-pixbuf + gtk3 + pango # Qt stuff qt3d mlt qtbase - qtgamepad + #qtgamepad qtserialport qtserialbus qtvirtualkeyboard qtmultimedia + qtlocation + qtwebengine + qtquick3d + qtwayland + qtwebview + qtscxml ] ++ (with xorg; [ libX11 libXdamage @@ -86,9 +139,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/opt/PixInsight $out/share/{applications,mime/packages,icons/hicolor} - fakeroot script -ec "./installer \ + bwrap --bind /build /build --bind $out/opt /opt --bind /nix /nix --dev /dev fakeroot script -ec "./installer \ --yes \ - --install-dir=$out/opt/PixInsight \ --install-desktop-dir=$out/share/applications \ --install-mime-dir=$out/share/mime \ --install-icons-dir=$out/share/icons/hicolor \ @@ -97,6 +149,11 @@ stdenv.mkDerivation rec { rm -rf $out/opt/PixInsight-old-0 ln -s $out/opt/PixInsight/bin/PixInsight $out/bin/. + ln -s $out/opt/PixInsight/bin/lib $out/lib + + # Remove signatures of plugins, as they are only working if actually installed + # under /opt. In the Nix setup, they are causing trouble. + find $out/opt/PixInsight/ -name "*.xsgn" -exec rm {} \; ''; # Some very exotic Qt libraries are not available in nixpkgs @@ -118,7 +175,7 @@ stdenv.mkDerivation rec { ]; dontWrapQtApps = true; postFixup = '' - wrapProgram $out/opt/PixInsight/bin/PixInsight ${builtins.toString qtWrapperArgs} + wrapProgram $out/opt/PixInsight/bin/PixInsight ${builtins.toString finalAttrs.qtWrapperArgs} ''; meta = with lib; { @@ -128,7 +185,7 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.sheepforce ]; - hydraPlatforms = []; + hydraPlatforms = [ ]; mainProgram = "PixInsight"; }; -} +}) diff --git a/pkgs/applications/logging/sosreport/default.nix b/pkgs/applications/logging/sosreport/default.nix index 2e63737deef59..53c071dcc4cb1 100644 --- a/pkgs/applications/logging/sosreport/default.nix +++ b/pkgs/applications/logging/sosreport/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sosreport"; - version = "4.7.1"; + version = "4.7.2"; src = fetchFromGitHub { owner = "sosreport"; repo = "sos"; rev = "refs/tags/${version}"; - sha256 = "sha256-usa4xSNAv0AaML7qv5kCQDA3VMz4IneLFDVyv7uPUcQ="; + sha256 = "sha256-67YRmD3kaJbRR7g3w57EwFg7duhcI6zov7gQ4H1MkR8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index bb7201de590f6..e6b2fabd24e1f 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "CopyQ"; - version = "8.0.0"; + version = "9.0.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - hash = "sha256-Ewunl4k9f0aDjilhKAsVxwR3S6uSZ1xwtu6ccNsNOgk="; + hash = "sha256-Dxiytspqs4+bcnUM+B3lO8iQp9rrCvMfI+WMFMCtM7g="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/hcl2json/default.nix b/pkgs/applications/misc/hcl2json/default.nix index 39073ee81b0fd..e8d90c9e16974 100644 --- a/pkgs/applications/misc/hcl2json/default.nix +++ b/pkgs/applications/misc/hcl2json/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { description = "Convert hcl2 to json"; homepage = "https://github.com/tmccombs/hcl2json"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; mainProgram = "hcl2json"; }; } diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index b9eea1c602cb7..d03b005d0b468 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -14,15 +14,15 @@ let in stdenv.mkDerivation rec { pname = "koreader"; - version = "2024.03.1"; + version = "2024.04"; src = if stdenv.isAarch64 then fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; - hash = "sha256-9Bu+mWfJuPaH5nV71JMrcGipiZWfcf19KfVauCW92+I="; + hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk="; } else fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - hash = "sha256-EZ3iqp0A2BZwI343nvvp71RGQx6FPesUBy4Lha4Yz4U="; + hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw="; }; src_repo = fetchFromGitHub { @@ -57,12 +57,13 @@ stdenv.mkDerivation rec { find ${src_repo}/resources/fonts -type d -execdir cp -r '{}' $out/lib/koreader/fonts \; find $out -xtype l -print -delete wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ gtk3-x11 SDL2 glib ] + lib.makeLibraryPath [ gtk3-x11 SDL2 glib stdenv.cc.cc.lib ] } ''; meta = with lib; { homepage = "https://github.com/koreader/koreader"; + changelog = "https://github.com/koreader/koreader/releases/tag/v${version}"; description = "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; mainProgram = "koreader"; diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index 104f1baa037d8..2778db3ca8b25 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.17.0"; + version = "0.18.0"; src = fetchCrate { inherit version pname; - hash = "sha256-efkSiwxL7sZIwFXJZunddAb4lTOfhj8oOEOUW3kyRXI="; + hash = "sha256-m9S8fG0c+67/msdWaN8noazEdsdLk1aswUJ+8hkjhxo="; }; - cargoHash = "sha256-1Cyg4WT4xYqc3s5AOXR9GfcS3qKOgscYujGXR9fzuCA="; + cargoHash = "sha256-6d/v89Yqn9FioWQTb5513kPbO9lnzBxaubfcdCzwUP4="; buildFeatures = [ "nu-ansi-term" ]; diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index e0832ff2459c6..ce92193727357 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source RGB lighting control"; homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB"; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; platforms = platforms.linux; mainProgram = "openrgb"; diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/applications/misc/tuba/default.nix index b99b76511be47..a3033bcd07dbb 100644 --- a/pkgs/applications/misc/tuba/default.nix +++ b/pkgs/applications/misc/tuba/default.nix @@ -23,17 +23,22 @@ , libspelling , icu , gst_all_1 +, clapper +# clapper support is still experimental and has bugs. +# See https://github.com/GeopJr/Tuba/pull/931 +, clapperSupport? false , nix-update-script }: stdenv.mkDerivation rec { pname = "tuba"; - version = "0.7.2"; + version = "0.8.1"; + src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; rev = "v${version}"; - hash = "sha256-PRbepitFSvdw/7y5VlnSdsQwnlTQg4ktM4t1/x6SmAY="; + hash = "sha256-dN915sPBttnrcOuhUJjEtdojOQi9VRLmc+t1RvWmx64="; }; nativeBuildInputs = [ @@ -67,7 +72,13 @@ stdenv.mkDerivation rec { gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-bad - ]); + ]) ++ lib.optionals clapperSupport [ + clapper + ]; + + mesonFlags = [ + (lib.mesonBool "clapper" clapperSupport) + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=int-conversion"; @@ -75,12 +86,12 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Browse the Fediverse"; homepage = "https://tuba.geopjr.dev/"; mainProgram = "dev.geopjr.Tuba"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; changelog = "https://github.com/GeopJr/Tuba/releases/tag/v${version}"; - maintainers = with maintainers; [ chuangzhu aleksana ]; + maintainers = with lib.maintainers; [ chuangzhu aleksana ]; }; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 57d16d577dfc6..e82cde01ec20f 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.6.2"; - sha256 = "0qghp8v4lz51yv5j5k8dps4qv58hjdjdc3jzrrq3g239x8b2h6ys"; - vendorHash = "sha256-7Q6V9DKROkSTxU7n511aOpaMDRfhP88p6PJ89Sr6kOQ="; + version = "24.6.3"; + sha256 = "1mlbb8qkx71anwqi027p9lv10kfck811ikfvc5gpnavfaaiwrrd1"; + vendorHash = "sha256-nIDbwUvu1e/1ImVQMj4eOaPeFHM7HCcJMFk/ackdJSE="; } diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index d32445c6455c3..5199400cae9eb 100644 --- a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -94,7 +94,7 @@ let mainProgram = "nomad-autoscaler"; homepage = "https://github.com/hashicorp/nomad-autoscaler"; license = licenses.mpl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; }; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 1a8049b4e2a29..5d0249249478b 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.35"; + version = "2.36"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - hash = "sha256-WbicKP46N8MVjUeerYUdcHJO5Qf7rQFyYCpxexd2wDY="; + hash = "sha256-RnDnyRAZ71aE5st5wUcUKjFFGY288oFpiyDXAno15MQ="; }; - cargoHash = "sha256-B6U+DxIRm9Sn4x+dZCfNKENNDsTUVZFT6i0Yz47gjTs="; + cargoHash = "sha256-0z3G8j0Qk0HEDUKA7fmjFfNW956rRtzKO+0ltNQR4es="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix b/pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix deleted file mode 100644 index d995f81406cbc..0000000000000 --- a/pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv -, lib -, fetchurl -, appimageTools -, makeWrapper -, electron -}: - -stdenv.mkDerivation rec { - pname = "revolt-desktop"; - version = "1.0.6"; - - src = fetchurl { - url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-linux.AppImage"; - sha256 = "sha256-Wsm6ef2Reenq3/aKGaP2yzlOuLKaxKtRHCLLMxvWUUY="; - }; - - appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ - makeWrapper - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/{applications,revolt-desktop} - - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} - cp -a ${appimageContents}/revolt-desktop.desktop $out/share/applications/${pname}.desktop - cp -a ${appimageContents}/usr/share/icons $out/share/icons - - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" - ''; - - meta = with lib; { - description = "Open source user-first chat platform"; - homepage = "https://revolt.chat/"; - changelog = "https://github.com/revoltchat/desktop/releases/tag/v${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ heyimnova ]; - platforms = platforms.linux; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - mainProgram = "revolt-desktop"; - }; -} diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 9a76be5704af9..ebdb19ee5b770 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.1.0"; + version = "1.1.1"; - vendorHash = "sha256-U7zh0MmuDmKQWa4uyoFDctPUfq+52Im6t2TFyWIGXAs="; + vendorHash = "sha256-pCp2ox08wWUdAnqBqoiMLy/qBQg1PsNnMl8nLCNifC8="; src = fetchFromGitHub { owner = "ipfs-cluster"; repo = "ipfs-cluster"; rev = "v${version}"; - hash = "sha256-z08LLJ/SI833wMpZJ25WDrc66Y4R5i2uGlE7Nc30Kk0="; + hash = "sha256-FnofI7IpG0hA9/60cILbQ7xnGKJ2zdYk/pRZPTyOmzA="; }; meta = with lib; { diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix index 88caf1a5f43e3..b9cd8e47d9383 100644 --- a/pkgs/applications/networking/ktailctl/default.nix +++ b/pkgs/applications/networking/ktailctl/default.nix @@ -10,6 +10,7 @@ , qtbase , qtdeclarative , qtsvg +, qtwayland , kconfig , kcoreaddons , kguiaddons @@ -18,23 +19,24 @@ , kirigami-addons , knotifications , nlohmann_json +, qqc2-desktop-style }: let - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "f-koehler"; repo = "KTailctl"; rev = "v${version}"; - hash = "sha256-fIx6XfNGK+jDpeaoCzTKwv3J01yWoHOgWxjbwTGVK1U="; + hash = "sha256-rnuh0+i6W9ipSM61MXd9dTlIkdGUHMjtvElW/4S2YCg="; }; goDeps = (buildGoModule { - pname = "tailwrap"; + pname = "ktailctl-go-wrapper"; inherit src version; - modRoot = "tailwrap"; - vendorHash = "sha256-egTzSdOKrhdEBKarIfROxZUsxbnR9F1JDbdoKzGf9UM="; + modRoot = "src/wrapper"; + vendorHash = "sha256-GD+G+7b8GBwR3OrRPJbGJVom+kLC67VvlGFIA0S7UF8="; }).goModules; in stdenv.mkDerivation { @@ -42,7 +44,7 @@ stdenv.mkDerivation { inherit version src; postPatch = '' - cp -r --reflink=auto ${goDeps} tailwrap/vendor + cp -r --reflink=auto ${goDeps} src/wrapper/vendor ''; # needed for go build to work @@ -67,13 +69,16 @@ stdenv.mkDerivation { qtbase qtdeclarative qtsvg + qtwayland kconfig kcoreaddons kguiaddons ki18n kirigami + kirigami-addons knotifications nlohmann_json + qqc2-desktop-style ]; meta = with lib; { @@ -82,6 +87,6 @@ stdenv.mkDerivation { license = licenses.gpl3Only; maintainers = with maintainers; [ k900 ]; mainProgram = "ktailctl"; - platforms = platforms.all; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 307a805ddf1ee..e4da05046a9a2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.12.0"; + version = "115.12.2"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "d262ec2cea3fd003e66974b0bd8d61fb268ad2a233e54a6aea4803c5520e235ea308267f0484581ce235063c4fb90e621cdc1eea3f62212574b90427ede1c289"; + sha512 = "182f35e8e5ece98d18dfefe106c73bc97fbc619f59772d9b3455b7c8af412021ecc5eae97a12515224e91deb814abb7a6ef7f538c450e9e77fdfd84078678038"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index bc3989f1ee67c..52ef3f7350015 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -13,9 +13,10 @@ , pkg-config , xmlrpc_c , zlib +, nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rakshasa-rtorrent"; version = "0.9.8+date=2022-06-20"; @@ -53,6 +54,10 @@ stdenv.mkDerivation rec { "--with-posix-fallocate" ]; + passthru.tests = { + inherit (nixosTests) rtorrent; + }; + enableParallelBuilding = true; postInstall = '' diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix index 38032509c95dc..8b7aca3524683 100644 --- a/pkgs/applications/networking/soapui/default.nix +++ b/pkgs/applications/networking/soapui/default.nix @@ -1,16 +1,23 @@ -{ fetchurl, lib, stdenv, writeText, jdk, makeWrapper, nixosTests }: - +{ + fetchurl, + lib, + stdenv, + writeText, + jdk, + makeWrapper, + nixosTests, +}: stdenv.mkDerivation rec { pname = "soapui"; - version = "5.7.0"; + version = "5.7.2"; src = fetchurl { - url = "https://s3.amazonaws.com/downloads.eviware/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz"; - sha256 = "sha256-qzhy4yHmOk13dFUd2KEZhXtWY86QwyjJgYxx9GGoN80="; + url = "https://dl.eviware.com/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz"; + sha256 = "sha256-pT0ZANVC7Sv7zxMDPY86aclIUGZeazOZadiVVsmEjtw="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk ]; + nativeBuildInputs = [makeWrapper]; + buildInputs = [jdk]; installPhase = '' runHook preInstall @@ -46,15 +53,15 @@ stdenv.mkDerivation rec { '') ]; - passthru.tests = { inherit (nixosTests) soapui; }; + passthru.tests = {inherit (nixosTests) soapui;}; meta = with lib; { description = "Most Advanced REST & SOAP Testing Tool in the World"; homepage = "https://www.soapui.org/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [binaryBytecode]; license = "SoapUI End User License Agreement"; - maintainers = with maintainers; [ gerschtli ]; - platforms = platforms.all; + maintainers = with maintainers; [gerschtli]; + platforms = platforms.linux; # we don't fetch the dmg yet mainProgram = "soapui"; }; } diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index f3f8f76de017e..3a084c358469a 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.8.2"; + version = "4.8.4"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-IwFA/4QGfkMYbuUxbg3/jkrud0MUlEjtkYtCLy+3emc="; + hash = "sha256-iQo7ETz5j/Uy5a96XFRkZ0U67dTHWEYLsr/qUi79Y4E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index b47ba39f0ae5e..7c44bebcb0f04 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/michaelrsweet/pappl"; license = licenses.asl20; platforms = platforms.linux; # should also work for darwin, but requires additional work - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index 56cfa5168a486..f30a6725bb474 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "kent"; - version = "466"; + version = "467"; src = fetchFromGitHub { owner = "ucscGenomeBrowser"; repo = pname; rev = "v${version}_base"; - hash = "sha256-zoDZ+8G0SHKfWmkXBqp+WSjQXtmkcTIZjrjPhUIJw1c="; + hash = "sha256-Y8iHSo70nsPZwVy8ZiiqjU3mGrPOyPQkW0VpLS+ulGE="; }; buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index b610ce558605d..fb02c6d40b9dc 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -1,10 +1,8 @@ { lib -, stdenv +, llvmPackages , callPackage , fetchFromGitHub , cmake -, clang -, llvm , python3 , z3 , stp @@ -13,6 +11,7 @@ , sqlite , gtest , lit +, nix-update-script # Build KLEE in debug mode. Defaults to false. , debug ? false @@ -30,19 +29,35 @@ # Enable runtime asserts. Default false. , runtimeAsserts ? false -# Extra klee-uclibc config. +# Klee uclibc. Defaults to the bundled version. +, kleeuClibc ? null + +# Extra klee-uclibc config for the default klee-uclibc. , extraKleeuClibcConfig ? {} }: +# Klee supports these LLVM versions. +let + llvmVersion = llvmPackages.llvm.version; + inherit (lib.strings) versionAtLeast versionOlder; +in +assert versionAtLeast llvmVersion "11" && versionOlder llvmVersion "17"; + let + # The chosen version of klee-uclibc. + chosenKleeuClibc = + if kleeuClibc == null then + callPackage ./klee-uclibc.nix { + llvmPackages = llvmPackages; + inherit extraKleeuClibcConfig debugRuntime runtimeAsserts; + } + else + kleeuClibc; + # Python used for KLEE tests. kleePython = python3.withPackages (ps: with ps; [ tabulate ]); - - # The klee-uclibc derivation. - kleeuClibc = callPackage ./klee-uclibc.nix { - inherit stdenv clang llvm extraKleeuClibcConfig debugRuntime runtimeAsserts; - }; -in stdenv.mkDerivation rec { +in +llvmPackages.stdenv.mkDerivation rec { pname = "klee"; version = "3.1"; @@ -54,14 +69,16 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; + buildInputs = [ + llvmPackages.llvm cryptominisat gperftools - llvm sqlite stp z3 ]; + nativeCheckInputs = [ gtest @@ -77,10 +94,10 @@ in stdenv.mkDerivation rec { onOff = val: if val then "ON" else "OFF"; in [ "-DKLEE_RUNTIME_BUILD_TYPE=${if debugRuntime then "Debug" else "Release"}" - "-DLLVMCC=${clang}/bin/clang" - "-DLLVMCXX=${clang}/bin/clang++" + "-DLLVMCC=${llvmPackages.clang}/bin/clang" + "-DLLVMCXX=${llvmPackages.clang}/bin/clang++" "-DKLEE_ENABLE_TIMESTAMP=${onOff false}" - "-DKLEE_UCLIBC_PATH=${kleeuClibc}" + "-DKLEE_UCLIBC_PATH=${chosenKleeuClibc}" "-DENABLE_KLEE_ASSERTS=${onOff asserts}" "-DENABLE_POSIX_RUNTIME=${onOff true}" "-DENABLE_UNIT_TESTS=${onOff true}" @@ -94,20 +111,25 @@ in stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString ["-Wno-macro-redefined"]; prePatch = '' - patchShebangs . + patchShebangs --build . ''; # https://github.com/klee/klee/issues/1690 hardeningDisable = [ "fortify" ]; + enableParallelBuilding = true; doCheck = true; passthru = { - # Let the user depend on `klee.uclibc` for klee-uclibc - uclibc = kleeuClibc; + updateScript = nix-update-script { + extraArgs = [ "--version-regex" "v(\d\.\d)" ]; + }; + # Let the user access the chosen uClibc outside the derivation. + uclibc = chosenKleeuClibc; }; meta = with lib; { + mainProgram = "klee"; description = "Symbolic virtual machine built on top of LLVM"; longDescription = '' KLEE is a symbolic virtual machine built on top of the LLVM compiler @@ -128,7 +150,7 @@ in stdenv.mkDerivation rec { that matches a computed test input, including setting up files, pipes, environment variables, and passing command line arguments. ''; - homepage = "https://klee.github.io/"; + homepage = "https://klee.github.io"; license = licenses.ncsa; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ numinit ]; diff --git a/pkgs/applications/science/logic/klee/klee-uclibc.nix b/pkgs/applications/science/logic/klee/klee-uclibc.nix index 5bbd8e69a46fa..c87a881e75336 100644 --- a/pkgs/applications/science/logic/klee/klee-uclibc.nix +++ b/pkgs/applications/science/logic/klee/klee-uclibc.nix @@ -1,13 +1,12 @@ { lib -, stdenv +, llvmPackages , fetchurl , fetchFromGitHub -, which , linuxHeaders -, clang -, llvm , python3 , curl +, which +, nix-update-script , debugRuntime ? true , runtimeAsserts ? false , extraKleeuClibcConfig ? {} @@ -24,21 +23,22 @@ let "RUNTIME_PREFIX" = "/"; "DEVEL_PREFIX" = "/"; }); -in stdenv.mkDerivation rec { +in +llvmPackages.stdenv.mkDerivation rec { pname = "klee-uclibc"; version = "1.4"; src = fetchFromGitHub { owner = "klee"; repo = "klee-uclibc"; rev = "klee_uclibc_v${version}"; - sha256 = "sha256-sogQK5Ed0k5tf4rrYwCKT4YRKyEovgT25p0BhGvJ1ok="; + hash = "sha256-sogQK5Ed0k5tf4rrYwCKT4YRKyEovgT25p0BhGvJ1ok="; }; nativeBuildInputs = [ - clang - curl - llvm + llvmPackages.clang + llvmPackages.llvm python3 + curl which ]; @@ -47,11 +47,11 @@ in stdenv.mkDerivation rec { # HACK: needed for cross-compile. # See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03141.html - KLEE_CFLAGS = "-idirafter ${clang}/resource-root/include"; + KLEE_CFLAGS = "-idirafter ${llvmPackages.clang}/resource-root/include"; prePatch = '' - patchShebangs ./configure - patchShebangs ./extra + patchShebangs --build ./configure + patchShebangs --build ./extra ''; # klee-uclibc configure does not support --prefix, so we override configurePhase entirely @@ -88,13 +88,19 @@ in stdenv.mkDerivation rec { makeFlags = ["HAVE_DOT_CONFIG=y"]; + enableParallelBuilding = true; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex" "v(\d\.\d)" ]; + }; + meta = with lib; { description = "Modified version of uClibc for KLEE"; longDescription = '' klee-uclibc is a bitcode build of uClibc meant for compatibility with the KLEE symbolic virtual machine. ''; - homepage = "https://klee.github.io/"; + homepage = "https://github.com/klee/klee-uclibc"; license = licenses.lgpl3; maintainers = with maintainers; [ numinit ]; }; diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index bf2fd1dbf3504..6531002ceb31b 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -24,7 +24,7 @@ assert enableCuda -> singlePrec; let - inherit (cudaPackages.cudaFlags) cudaCapabilities dropDot; + inherit (cudaPackages.flags) cmakeCudaArchitecturesString; # Select reasonable defaults for all major platforms # The possible values are defined in CMakeLists.txt: @@ -111,10 +111,10 @@ in stdenv.mkDerivation rec { ] ) ++ lib.optionals enableCuda [ "-DGMX_GPU=CUDA" - (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" (builtins.concatStringsSep ";" (map dropDot cudaCapabilities))) + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cmakeCudaArchitecturesString) # Gromacs seems to ignore and override the normal variables, so we add this ad hoc: - (lib.cmakeFeature "GMX_CUDA_TARGET_COMPUTE" (builtins.concatStringsSep ";" (map dropDot cudaCapabilities))) + (lib.cmakeFeature "GMX_CUDA_TARGET_COMPUTE" cmakeCudaArchitecturesString) ]; postInstall = '' diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 4be42e97344a6..3e387f34a7341 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -78,7 +78,6 @@ buildPythonApplication rec { changelog = "https://github.com/nicolargo/glances/blob/v${version}/NEWS.rst"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ - jonringer primeos koral ]; diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 22a7653c6a647..28f8c94f5700b 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.51.0"; + version = "2.52.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-xd7IZSOgukEyngxHwsOrHW3ifEMpm1OfXoW3/fvVq3I="; + hash = "sha256-vaB0K9LeMcCcJw5sqxe3bFgzDvhikjAej5vHkvhWqqY="; }; - vendorHash = "sha256-0NKfDSDV/hyQfgkhHe0E9xu7A9hz4JAT5uF/Q2ipEwg="; + vendorHash = "sha256-BnjWpxjkzSZKgeMR5iVdTKomsR93nSQVli4BDsPP4gw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/video/kodi/addons/future/default.nix b/pkgs/applications/video/kodi/addons/future/default.nix index 91b7d3996c577..c96f28ab9037d 100644 --- a/pkgs/applications/video/kodi/addons/future/default.nix +++ b/pkgs/applications/video/kodi/addons/future/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "future"; namespace = "script.module.future"; - version = "0.18.3+matrix.1"; + version = "1.0.0+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-jKO2Qxi54z6UiCmMkxU+2pog40K2yb8/KYbNPFYuSsQ="; + sha256 = "sha256-BsDgCAZuJBRBpe6EmfSynhrXS3ktQRZsEwf9CdF0VCg="; }; passthru = { diff --git a/pkgs/applications/video/memento/default.nix b/pkgs/applications/video/memento/default.nix index 40ff061a7fea2..0c993de2fcaba 100644 --- a/pkgs/applications/video/memento/default.nix +++ b/pkgs/applications/video/memento/default.nix @@ -2,8 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, qtbase -, qtx11extras ? null # qt5 only +, qt6 , wrapQtAppsHook # before that => zeal @@ -15,20 +14,15 @@ , yt-dlp # optional , makeWrapper}: - -let - isQt5 = lib.versions.major qtbase.version == "5"; - -in stdenv.mkDerivation (finalAttrs: { pname = "memento"; - version = "1.2.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ripose-jp"; repo = "Memento"; rev = "v${finalAttrs.version}"; - hash = "sha256-55VvT7pHN0/HqxM4vMDQDgUwkVmO/8aOEOye8jcFzgI="; + hash = "sha256-/lgjzR2KwlIUMHSz3afBQEy+8kdKAI37kqTuq3r3qMk="; }; nativeBuildInputs = [ @@ -38,14 +32,16 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - qtbase + qt6.qtbase + qt6.qtsvg + qt6.qtwayland sqlite json_c libzip mecab - ] ++ lib.optionals isQt5 [ qtx11extras ]; + ]; - propagatedBuildInputs = [ mpv ]; + propagatedBuildInputs = [ mpv ]; preFixup = '' wrapProgram "$out/bin/memento" \ diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index bba0377185963..8aaa0cf1448a3 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -8,7 +8,6 @@ , cmark , docbook_xsl , expat -, fetchpatch2 , file , flac , fmt @@ -50,13 +49,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "84.0"; + version = "85.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - hash = "sha256-//I++WWnSHnkpTZ0TzS3lhH5+eDD5mazTQ1HVMQS4Ug="; + hash = "sha256-E8fULDUkEnh/0W/OIh+peO+JXSecgINPJclOTc5KYVo="; }; nativeBuildInputs = [ @@ -95,11 +94,6 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ qtwayland ] ++ optionals stdenv.isDarwin [ libiconv ]; - patches = [ (fetchpatch2 { - url = "https://gitlab.com/mbunkus/mkvtoolnix/-/commit/7e1bea9527616ab6ab38425e7290579f05dd9bb1.patch"; - hash = "sha256-9UZrfwrzfKwF8XDzqYnuaDgZws7l1YAb5O1O1+nxo0g="; - }) ]; - # autoupdate is not needed but it silences a ton of pointless warnings postPatch = '' patchShebangs . > /dev/null diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index 3b2f2139875c0..ec19f26e8a156 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "advanced-scene-switcher"; - version = "1.26.2"; + version = "1.26.4"; src = fetchFromGitHub { owner = "WarmUpTill"; repo = "SceneSwitcher"; rev = version; - hash = "sha256-x9wk4tqCXufHSb/ssUxjm0o6JrZzXnIk+adIn/YI9Qk="; + hash = "sha256-qUKywOfUiGKBmyREns2LnWECGeFhdA4ecpgGJQAIKpU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix index b7d28caadf899..a057b88dbfc55 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "obs-teleport"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "fzwoch"; repo = "obs-teleport"; rev = version; - sha256 = "sha256-vT5GhZQFunQURgnFI3RSGVlwvcWEW588MuJ+Ev7IZ7w="; + sha256 = "sha256-71fvaqjesLhCdK3dHodAtMNYhU6LGX4wkHSPgQJPYqo="; }; - vendorHash = "sha256-Po7Oj+wdBOOFI2Ws9MLZQxk4N6mE58M+3q+qNlUrqOY="; + vendorHash = "sha256-INJvecUwHMauoqqyd6S2JvZ/oqnwonbdbGhV8hdqiH8="; buildInputs = [ libjpeg diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 60ef7c57cdc8a..9fd34a1eed1fc 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -2,20 +2,14 @@ buildNpmPackage { pname = "webtorrent-desktop"; - version = "0.25-pre-1eb612"; + version = "0.25-pre-ac7f16"; src = fetchFromGitHub { owner = "webtorrent"; repo = "webtorrent-desktop"; - rev = "1eb61201d6360698a2cc4ea72bf0fa7ee78b457c"; - sha256 = "sha256-DBEFOamncyidMXypvKNnUmDIPUq1LzYjDgox7fa4+Gg="; + rev = "ac7f16e71c96c5ad670bfcb8728df5af78ae21a1"; + sha256 = "sha256-UEN5NhLVSQEO8rsiTW1hJPjNFL9KobW/Bho98FzKaf4="; }; patches = [ - # electron 27 fix - (fetchpatch { - name = "2388.patch"; # https://github.com/webtorrent/webtorrent-desktop/pull/2388 - url = "https://github.com/webtorrent/webtorrent-desktop/compare/ebaf9cf8487dbd9e14a9a0c5adc3eab23b199e58...0c3e55d1f091bf66a342e2732550ebeccc2e4169.patch"; - hash = "sha256-gam5oAZtsaiCNFwecA5ff0nhraySLx3SOHlb/js+cPM="; - }) # startup fix (fetchpatch { name = "2389.patch"; # https://github.com/webtorrent/webtorrent-desktop/pull/2389 @@ -23,7 +17,7 @@ buildNpmPackage { hash = "sha256-hBJGLNNjcGRhYOFlLm/RL0po+70tEeJtR6Y/CfacPAI="; }) ]; - npmDepsHash = "sha256-tqhp3jDb1xtyV/n9kJtzkiznLQfqeYWeZiTnTVV0ibE="; + npmDepsHash = "sha256-otAes6GkqoAVvfeWhWgyY4IVZIZxw3WtkrVdEWIk1Lk="; makeCacheWritable = true; npmRebuildFlags = [ "--ignore-scripts" ]; installPhase = '' diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 40d940a6904d6..d2fda361660e7 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,6 +1,7 @@ -{ lib, rustPlatform, fetchgit +{ lib, rustPlatform, fetchgit, fetchpatch , pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols +, pkgsCross }: rustPlatform.buildRustPackage rec { @@ -14,6 +15,15 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "musl.patch"; + url = "https://chromium.googlesource.com/chromiumos/platform/crosvm/+/128e591037c0be0362ed814d0b5583aa65ff09e1%5E%21/?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-p5VzHRb0l0vCJNe48cRl/uBYHwTQMEykMcBOMzL3yaY="; + }) + ]; + separateDebugInfo = true; cargoHash = "sha256-1AUfd9dhIZvVVUsVbnGoLKc0lBfccwM4wqWgU4yZWOE="; @@ -35,7 +45,12 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "virgl_renderer" ]; - passthru.updateScript = ./update.py; + passthru = { + updateScript = ./update.py; + tests = { + musl = pkgsCross.musl64.crosvm; + }; + }; meta = with lib; { description = "Secure virtual machine monitor for KVM"; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index c8bedb1e95690..281f451fddbd2 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -33,6 +33,11 @@ python3.pkgs.buildPythonApplication rec { url = "https://github.com/virt-manager/virt-manager/commit/cc4a39ea94f42bc92765eb3bb56e2b7f9198be67.patch"; hash = "sha256-dw6yrMaAOnTh8Z6xJQQKmYelOkOl6EBAOfJQU9vQ8Ws="; }) + # fix xml test output mismatch + (fetchpatch { + url = "https://github.com/virt-manager/virt-manager/commit/8b6db203f726965529567459b302aab1c68c70eb.patch"; + hash = "sha256-FghrSyP4NaTkJhvyqlc2uDNWKaeiylKnaiqkl5Ax6yE="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/e16/default.nix b/pkgs/applications/window-managers/e16/default.nix index d47b63dda4d04..7a2aa724d3534 100644 --- a/pkgs/applications/window-managers/e16/default.nix +++ b/pkgs/applications/window-managers/e16/default.nix @@ -16,6 +16,7 @@ , libsndfile , pango , perl +, python3 , gitUpdater }: @@ -47,10 +48,13 @@ stdenv.mkDerivation rec { libsndfile pango perl + python3 ]; postPatch = '' substituteInPlace scripts/e_gen_menu --replace "/usr/local:" "/run/current-system/sw:/usr/local:" + substituteInPlace scripts/e_gen_menu --replace "'/opt'" "'/opt', '/run/current-system/sw'" + substituteInPlace scripts/e_gen_menu --replace "'/.local'" "'/.nix-profile', '/.local'" ''; passthru.updateScript = gitUpdater { diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index e6ed87ffabd32..ca7eaa587a852 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://wayfire.org/"; description = "3D Wayland compositor"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + maintainers = with lib.maintainers; [ wucke13 rewine ]; platforms = lib.platforms.unix; mainProgram = "wayfire"; }; diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index df1b1cfea9b83..4f1a6769ffbd3 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/WayfireWM/wcm"; description = "Wayfire Config Manager"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + maintainers = with lib.maintainers; [ wucke13 rewine ]; platforms = lib.platforms.unix; mainProgram = "wcm"; }; diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index 0151ad66f4c48..b16934e38a59e 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/WayfireWM/wf-config"; description = "Library for managing configuration files, written for Wayfire"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + maintainers = with lib.maintainers; [ wucke13 rewine ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index 348ef56be5d89..ce803ba2e880b 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/WayfireWM/wf-shell"; description = "GTK3-based panel for Wayfire"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + maintainers = with lib.maintainers; [ wucke13 rewine ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh index f9aba29a43555..a9701f2898b27 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh @@ -1,3 +1,12 @@ +# For compatibility, convert makeWrapperArgs to an array unless we are using +# structured attributes. That is, we ensure that makeWrapperArgs is always an +# array. +# See https://github.com/NixOS/nixpkgs/blob/858f4db3048c5be3527e183470e93c1a72c5727c/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh#L1-L3 +# and https://github.com/NixOS/nixpkgs/pull/313005#issuecomment-2175482920 +if [[ -z $__structuredAttrs ]]; then + makeWrapperArgs=( ${makeWrapperArgs-} ) +fi + # First argument is the executable you want to wrap, # the second is the destination for the wrapper. wrapDotnetProgram() { @@ -17,10 +26,8 @@ dotnetFromEnv' if [[ -n $__structuredAttrs ]]; then local -r dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" ) - local -r makeWrapperArgsArray=( "${makeWrapperArgs[@]}" ) else local -r dotnetRuntimeDepsArray=($dotnetRuntimeDeps) - local -r makeWrapperArgsArray=($makeWrapperArgs) fi local dotnetRuntimeDepsFlags=() @@ -49,7 +56,7 @@ dotnetFromEnv' "${dotnetRuntimeDepsFlags[@]}" \ "${dotnetRootFlagsArray[@]}" \ "${gappsWrapperArgs[@]}" \ - "${makeWrapperArgsArray[@]}" + "${makeWrapperArgs[@]}" echo "installed wrapper to "$2"" } diff --git a/pkgs/by-name/al/alertmanager-webhook-logger/package.nix b/pkgs/by-name/al/alertmanager-webhook-logger/package.nix new file mode 100644 index 0000000000000..e04759dda7d37 --- /dev/null +++ b/pkgs/by-name/al/alertmanager-webhook-logger/package.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, nixosTests +}: + +buildGoModule rec { + pname = "alertmanager-webhook-logger"; + version = "1.0"; + rev = "${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "tomtom-international"; + repo = "alertmanager-webhook-logger"; + hash = "sha256-mJbpDiTwUsFm0lDKz8UE/YF6sBvcSSR6WWLrfKvtri4="; + }; + + vendorHash = "sha256-gKtOoM9TuEIHgvSjZhqWmdexG2zDjlPuM0HjjP52DOI="; + + doCheck = true; + + passthru.tests = { inherit (nixosTests.prometheus) alertmanager; }; + + meta = with lib; { + description = "Generates (structured) log messages from Prometheus AlertManager webhook notifier"; + mainProgram = "alertmanager-webhook-logger"; + homepage = "https://github.com/tomtom-international/alertmanager-webhook-logger"; + license = licenses.asl20; + maintainers = with maintainers; [ jpds ]; + }; +} diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 65a323f684fd4..84683435f4eef 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.47.1-50893"; + version = "1.48.2-51225"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-BiEJDs5cHXkmfT9omxG7uk/6zXdOa/69Zn/Y0HqclQc="; + hash = "sha256-8VukOTt94nstaGRuTQg32HNPEaGBQtJGqRYgKLSD/TY="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 32a22493b1fa0..9142c0dad9d13 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.36.6"; + version = "3.4.36.9"; src = fetchurl { url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar"; - hash = "sha256-uux5m9GI+F5yCLF4nk5tk6FJjF4Wc81Uw8xfvt2TE4c="; + hash = "sha256-2kO7CRkA3RlWcNqv2d5sJIaLPupUU0ox2wc3T16i7e8="; }; env.ICON = fetchurl { diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index 9f6f9ff3d8bee..e8637a0e3a5a1 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -7,7 +7,7 @@ let pname = "beekeeper-studio"; - version = "4.4.0"; + version = "4.6.0"; plat = { aarch64-linux = "-arm64"; @@ -15,8 +15,8 @@ let }.${stdenv.hostPlatform.system}; hash = { - aarch64-linux = "sha256-RzPw+jsHecOYSBn/TrEFew5V0LvYS15dUuscS7+GraM="; - x86_64-linux = "sha256-fWr0ezPU5U8G9M3JEjUdBFZksbJL5CUjdNbAyT5dwI8="; + aarch64-linux = "sha256-ZxqwxCON21S+RPG0/M2TtcI2Ave7ZT05lKQdyysQFUk="; + x86_64-linux = "sha256-y4Muap7X4YyeIftRGC+NrDt3wjqOPi1lt+tsHhKmx4M="; }.${stdenv.hostPlatform.system}; src = fetchurl { @@ -36,16 +36,17 @@ appimageTools.wrapType2 { install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/ install -Dm444 ${appimageContents}/${pname}.png -t $out/share/pixmaps/ substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun --no-sandbox' 'Exec=${pname}' + --replace-fail 'Exec=AppRun --no-sandbox' 'Exec=${pname}' ''; - meta = with lib; { + meta = { description = "Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more. Linux, MacOS, and Windows"; homepage = "https://www.beekeeperstudio.io"; changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v${version}"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; mainProgram = "beekeeper-studio"; - maintainers = with maintainers; [ milogert alexnortung ]; + maintainers = with lib.maintainers; [ milogert alexnortung ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/bi/bilibili/package.nix b/pkgs/by-name/bi/bilibili/package.nix index e410e92f8d9a4..b23a0e4307453 100644 --- a/pkgs/by-name/bi/bilibili/package.nix +++ b/pkgs/by-name/bi/bilibili/package.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { pname = "bilibili"; - version = "1.13.5-2"; + version = "1.13.6-2"; src = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-4p5izaQsax4i2/AnjivDVoY205ITmEx48GhblPOZDjk="; + hash = "sha256-SVN3iw3o3QGLY0XWd48+kpNPYoK5V8oPOA10VyDgDMo="; }; unpackPhase = '' diff --git a/pkgs/by-name/bo/bombsquad/package.nix b/pkgs/by-name/bo/bombsquad/package.nix index b5417bdf74a84..8c3bba62e86ee 100644 --- a/pkgs/by-name/bo/bombsquad/package.nix +++ b/pkgs/by-name/bo/bombsquad/package.nix @@ -23,7 +23,7 @@ let { x86_64-linux = { name = "BombSquad_Linux_x86_64"; - hash = "sha256-YrbDhdVtNtxeE3fIRPIODwVO3lrxz7OAAYc7doBBQj8="; + hash = "sha256-XSt6YvBZba/0fO85aJpg1vJnr5tLQsKVuqxSKOrMXw8="; }; aarch-64-linux = { name = "BombSquad_Linux_Arm64"; @@ -34,7 +34,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "bombsquad"; - version = "1.7.35"; + version = "1.7.36"; sourceRoot = "."; src = fetchurl { url = "https://files.ballistica.net/bombsquad/builds/${archive.name}_${finalAttrs.version}.tar.gz"; diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index 2801b6415243b..683e4f4527ef5 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -9,23 +9,23 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.2.5"; + version = "2.2.8"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-Dy7mSBraMHAno8cIk9f6/Ofsm2ZGSb7VS5Wy1o+ZoC8="; + hash = "sha256-AW2RKtxvF4WxCyb6QEDuTEAOy/DqBxoZrtc2JGeKFtk="; }; - cargoHash = "sha256-NB93bw2mMCVmZWpxCJGusXp2DgotjrlHUlsd0mb+fBA="; + cargoHash = "sha256-J7VJSOY7Cj9Dsq0jj9uVTGJOessyx3WOlDbg7dS+1dg="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here postPatch = '' substituteInPlace src/utils.rs \ --replace-fail '{data_home}/locale' "$out/share/locale" \ - --replace-fail '{data_home}/icons/boxbuddy/{}' "$out/share/icons/boxbuddy/{}" + --replace-fail '{data_home}/icons/boxbuddy/{icon}' "$out/share/icons/boxbuddy/{icon}" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/castero/package.nix b/pkgs/by-name/ca/castero/package.nix index 0b9f727dda921..fad593853a76b 100644 --- a/pkgs/by-name/ca/castero/package.nix +++ b/pkgs/by-name/ca/castero/package.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ "test_datafile_download" ]; - pythonImportCheck = [ + pythonImportsCheck = [ "castero" ]; diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index 15910d36553d3..82601a7fba637 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "centrifugo"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${version}"; - hash = "sha256-sSEainZXgZ26u4J0FXVM8Je1uwDrAOkzLMgrCUtOx74="; + hash = "sha256-rIsc+abyfhHncogxZnx7Dmvc/JRm+L4YKZOOW/Qtddg="; }; - vendorHash = "sha256-kPnkuBOcTDuAWD51JGJvgHLj9jn9kHZOfPw/DF64Mn8="; + vendorHash = "sha256-+fZnoDH5nbzrGWrr8ayBqzJoAji6y+CYI+TvEISxPRs="; ldflags = [ "-s" diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 10c7410b68626..46035e0f5b403 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.49.0"; + version = "2.49.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-9VMNeWJzbfpHL9u6fYF1HzQGlREU6eQmF9mwqxosTGI="; + hash = "sha256-DrilLcV6wyUVPPiDs5KiC8kztNCH4Fug5h35+xerLZU="; }; - vendorHash = "sha256-0gM2C8vXFOFDNJVnjq0Qbm2urhenWcH8F+ExAtjMVc0="; + vendorHash = "sha256-3nufF280WuDNvhKn9xP9dnxNX2VC59nifuJp+ebUSvk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix index 40b1a4d3c4544..96383fdd66672 100644 --- a/pkgs/by-name/ch/chrysalis/package.nix +++ b/pkgs/by-name/ch/chrysalis/package.nix @@ -1,18 +1,20 @@ -{ lib, appimageTools, fetchurl }: +{ + lib, + appimageTools, + fetchurl, +}: let pname = "chrysalis"; version = "0.13.3"; - name = "${pname}-${version}-binary"; src = fetchurl { - url = - "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}-x64.AppImage"; - hash = - "sha512-F6Y87rgIclj1OA3gVX/gqqp9AvXKQlBXrbqk/26F1KHPF9NzHJgVmeszSo3Nhb6xg4CzWmzkqc8IW2H/Bg57kw=="; + url = "https://github.com/keyboardio/chrysalis/releases/download/v${version}/chrysalis-${version}-x64.AppImage"; + hash = "sha512-F6Y87rgIclj1OA3gVX/gqqp9AvXKQlBXrbqk/26F1KHPF9NzHJgVmeszSo3Nhb6xg4CzWmzkqc8IW2H/Bg57kw=="; }; - appimageContents = appimageTools.extract { inherit name src; }; -in appimageTools.wrapType2 rec { - inherit name pname src; + appimageContents = appimageTools.extract { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; extraPkgs = pkgs: [ pkgs.glib ]; @@ -30,7 +32,7 @@ in appimageTools.wrapType2 rec { -t $out/share/applications substituteInPlace \ $out/share/applications/Chrysalis.desktop \ - --replace 'Exec=Chrysalis' 'Exec=${pname}' + --replace-fail 'Exec=Chrysalis' 'Exec=${pname}' install -Dm444 ${appimageContents}/usr/share/icons/hicolor/256x256/chrysalis.png -t $out/share/pixmaps ''; @@ -40,9 +42,15 @@ in appimageTools.wrapType2 rec { meta = with lib; { description = "Graphical configurator for Kaleidoscope-powered keyboards"; homepage = "https://github.com/keyboardio/Chrysalis"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ aw eclairevoyant nshalman ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + aw + eclairevoyant + nshalman + ]; platforms = [ "x86_64-linux" ]; - mainProgram = "chrysalis"; + # buildFHSEnv will create a symlink in $out/bin/${pname} + mainProgram = pname; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/by-name/ch/chrysalis/update.sh b/pkgs/by-name/ch/chrysalis/update.sh index 182d47a9285a5..182d47a9285a5 100644..100755 --- a/pkgs/by-name/ch/chrysalis/update.sh +++ b/pkgs/by-name/ch/chrysalis/update.sh diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index aef566f030ebd..8a39f5715ae14 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -66,6 +66,6 @@ in rustPlatform.buildRustPackage { homepage = "https://github.com/cachix/devenv"; license = lib.licenses.asl20; mainProgram = "devenv"; - maintainers = with lib.maintainers; [ domenkozar drupol ]; + maintainers = with lib.maintainers; [ domenkozar ]; }; } diff --git a/pkgs/by-name/em/emote/package.nix b/pkgs/by-name/em/emote/package.nix new file mode 100644 index 0000000000000..1854bc1b1bcc3 --- /dev/null +++ b/pkgs/by-name/em/emote/package.nix @@ -0,0 +1,85 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + meson, + ninja, + pkg-config, + wrapGAppsHook3, + gobject-introspection, + keybinder3, + xdotool, + wl-clipboard, +}: + +python3Packages.buildPythonApplication rec { + pname = "emote"; + version = "4.1.0"; + pyproject = false; # Built with meson + + src = fetchFromGitHub { + owner = "tom-james-watson"; + repo = "Emote"; + rev = "v${version}"; + hash = "sha256-c5EY1Cc3oD8EG1oTChbl10jJlNeAETQbAFGoA9Lw5PY="; + }; + + postPatch = '' + substituteInPlace emote/picker.py \ + --replace-fail 'os.environ.get("SNAP_VERSION", "dev build")' "'$version'" + substituteInPlace emote/config.py \ + --replace-fail 'is_flatpak = os.environ.get("FLATPAK") is not None' 'is_flatpak = False' \ + --replace-fail 'os.environ.get("SNAP")' "'$out/share/emote'" + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook3 + gobject-introspection + ]; + + buildInputs = [ + # used by gobject-introspection's setup-hook and only detected at runtime + keybinder3 + ]; + + dependencies = with python3Packages; [ + dbus-python.out # don't propagate dev output + manimpango + pygobject3.out # don't propagate dev output + setproctitle + ]; + + postInstall = '' + rm $out/share/emote/emote/{emote.in,meson.build} + rm $out/share/emote/static/{meson.build,com.tomjwatson.Emote.desktop,prepare-launch} + ''; + + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : ${ + lib.makeBinPath [ + xdotool + wl-clipboard + ] + } + ) + ''; + + meta = with lib; { + description = "Modern emoji picker for Linux"; + mainProgram = "emote"; + homepage = "https://github.com/tom-james-watson/emote"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ + emilytrau + SuperSandro2000 + aleksana + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix new file mode 100644 index 0000000000000..133a3645632aa --- /dev/null +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -0,0 +1,91 @@ +{ lib +, fetchFromGitHub +, openssl +, pkg-config +, protobuf +, rustPlatform +, buildPackages +, git +, stdenv +, libiconv +, clang +, libclang +, Security +, SystemConfiguration +}: +rustPlatform.buildRustPackage rec { + pname = "fedimint"; + version = "0.3.2-rc.0"; + + src = fetchFromGitHub { + owner = "fedimint"; + repo = "fedimint"; + rev = "v${version}"; + hash = "sha256-eOGmx/freDQLxZ48nP9Y2kA84F6sdig6qfZwnJfOB3g="; + }; + + cargoHash = "sha256-2ctrZLvovgMpxZPFtmblZ/NGyxievE6FmzC4BBGuw6g="; + + nativeBuildInputs = [ + protobuf + pkg-config + clang + libclang.lib + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + libiconv + Security + SystemConfiguration + ]; + + outputs = [ "out" "fedimintCli" "fedimint" "gateway" "gatewayCli" "devimint" ]; + + postInstall = '' + mkdir -p $fedimint/bin $fedimintCli/bin $gateway/bin $gatewayCli/bin $devimint/bin + + # delete fuzzing targets and other binaries no one cares about + binsToKeep=(fedimint-cli fedimint-dbtool recoverytool fedimintd gatewayd gateway-cli gateway-cln-extension devimint) + keepPattern=$(printf "|%s" "''${binsToKeep[@]}") + keepPattern=''${keepPattern:1} + find "$out/bin" -maxdepth 1 -type f | grep -Ev "(''${keepPattern})" | xargs rm -f + + # fix the upstream name + mv $out/bin/recoverytool $out/bin/fedimint-recoverytool + + + cp -a $releaseDir/fedimint-cli $fedimintCli/bin/ + cp -a $releaseDir/fedimint-dbtool $fedimintCli/bin/ + cp -a $releaseDir/recoverytool $fedimintCli/bin/fedimint-recoverytool + + cp -a $releaseDir/fedimintd $fedimint/bin/ + + cp -a $releaseDir/gateway-cli $gatewayCli/bin/ + + cp -a $releaseDir/gatewayd $gateway/bin/ + cp -a $releaseDir/gateway-cln-extension $gateway/bin/ + + cp -a $releaseDir/devimint $devimint/bin/ + ''; + + PROTOC = "${buildPackages.protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; + OPENSSL_DIR = openssl.dev; + LIBCLANG_PATH = "${libclang.lib}/lib"; + + FEDIMINT_BUILD_FORCE_GIT_HASH = "0000000000000000000000000000000000000000"; + + # currently broken, will require some upstream fixes + doCheck = false; + + meta = { + description = "Federated E-Cash Mint"; + homepage = "https://github.com/fedimint/fedimint"; + license = [ lib.licenses.mit ]; + maintainers = with lib.maintainers; [ dpc ]; + mainProgram = "fedimint-cli"; + }; +} diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix index 4cf312476d801..cb39bc06b9ce8 100644 --- a/pkgs/by-name/fl/flashmq/package.nix +++ b/pkgs/by-name/fl/flashmq/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-6ShMYTynqIVm7EH3b9Jzy5UKE7SH/Lq5uWV3VaDVREQ="; + hash = "sha256-4ZK8aHDhI0yslx1VoO+cgqj4YQ6AgE0Jy5C4WJ4k4OQ="; }; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix index 0e61a64dd94b4..2ce40c3772342 100644 --- a/pkgs/by-name/ge/gerbolyze/package.nix +++ b/pkgs/by-name/ge/gerbolyze/package.nix @@ -43,6 +43,22 @@ let platforms = platforms.linux; }; }; + + # FIXME: check if this downgrade is still required when bumping gerbolyze + # https://github.com/jaseg/gerbolyze/issues/47 + resvg' = resvg.overrideAttrs (old: rec { + version = "0.41.0"; + src = old.src.override { + rev = "v${version}"; + hash = "sha256-plZiyEiBWeV2mwTsNK5Je8Axs/hcHH8aV2VpOix6QCY="; + }; + cargoDeps = old.cargoDeps.overrideAttrs (lib.const { + name = "${old.pname}-${version}-vendor.tar.gz"; + inherit src; + outputHash = "sha256-U7xzb9e9wh9XbLvlYQ0ofIjH8FuSzVcrXnrehQmZgww="; + }); + }); + in python3Packages.buildPythonApplication rec { inherit version src; pname = "gerbolyze"; @@ -61,7 +77,7 @@ in python3Packages.buildPythonApplication rec { python3Packages.python-slugify python3Packages.lxml python3Packages.gerbonara - resvg + resvg' svg-flatten ]; @@ -79,7 +95,7 @@ in python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "gerbolyze" ]; - nativeCheckInputs = [ python3Packages.pytestCheckHook resvg svg-flatten ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook resvg' svg-flatten ]; meta = with lib; { description = "Directly render SVG overlays into Gerber and Excellon files"; diff --git a/pkgs/by-name/gh/gh-gei/deps.nix b/pkgs/by-name/gh/gh-gei/deps.nix new file mode 100644 index 0000000000000..1f9bc071f17a7 --- /dev/null +++ b/pkgs/by-name/gh/gh-gei/deps.nix @@ -0,0 +1,37 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "AWSSDK.Core"; version = "3.7.300.11"; sha256 = "1460yndb9gfy4qx36g4lxaqxzb3p19kfqp7czi28i1p7z7nh38vi"; }) + (fetchNuGet { pname = "AWSSDK.S3"; version = "3.7.304"; sha256 = "0hjls7477rm3g7bvd8m7ch37lmllnsv71x1lhjjn8g2nk7d3lk0q"; }) + (fetchNuGet { pname = "Azure.Core"; version = "1.36.0"; sha256 = "14lsc6zik7s5by3gp86pf77wh58fcqrjy2xhx5p03gmhdn6iz2cn"; }) + (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.19.1"; sha256 = "0rdgvlbqkcyc356xs0wzwbm92lf95621mf2shk30i3ahp0k0gd0k"; }) + (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.18.1"; sha256 = "1hjzggfv24598601jhcdfcaflbd5b97aglhxy7a5ymy1aszhwp9k"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.7.0"; sha256 = "1zj4wwsad2j7y1byigm3c386rv56xr05mwxjlgqh0h0n5w5yjc4w"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.7.0"; sha256 = "1lz3ha3pp58hd4y031z64slcf9rh7g1cgkrlrbhi4vpa67xhynnh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "7.0.0"; sha256 = "196b13zkkq0fhfgigkhwcw1hhaj4dj5pc27z7d5niaizzx6ycwiw"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) + (fetchNuGet { pname = "Polly"; version = "7.2.4"; sha256 = "0lvhi2a18p6ay780lbw18656297s9i45cvpp4dr9k5lhg7fwl2y1"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) + (fetchNuGet { pname = "System.CommandLine.NamingConventionBinder"; version = "2.0.0-beta4.22272.1"; sha256 = "07hcz8jcqla4fs7cd2r0lanqsa13nl9l37spby9bc5p2apkyrz0m"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "6.0.0"; sha256 = "0lga30s3cllg2jkwldgabwrb0jg3dzj859bwj95xhnm3zcklnb41"; }) + (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) + (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; sha256 = "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) +] diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix new file mode 100644 index 0000000000000..bf0ac23a7b0f9 --- /dev/null +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -0,0 +1,27 @@ +{ lib +, fetchFromGitHub +, buildDotnetModule +}: + +buildDotnetModule rec { + pname = "gh-gei"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "github"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cz301JzGZTAu0DcxmFpEmBemEij1+OIw4dB2PpwyYS0="; + }; + + projectFile = "src/gei/gei.csproj"; + nugetDeps = ./deps.nix; # File generated with `nix-build -A gh-gei.passthru.fetch-deps`. + + meta = with lib; { + homepage = "https://github.com/github/gh-gei"; + description = "Migration CLI for GitHub to GitHub migrations"; + license = licenses.mit; + maintainers = with maintainers; [ lafrenierejm ]; + mainProgram = "gei"; + }; +} diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index c5729b5dbe74b..3a7689c925c41 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-2YcQl9aPFPE/t/Pzoo0mWkCjOE6b4BJH0oT8Gbx+vIg="; + hash = "sha256-cbH2gXMBD/D+dqdYLcFZxvhuSZklw2hi2+9mrqu+pjc="; }; - cargoHash = "sha256-RldCa0UITX8zj5tliww1xiL1Y60t9EN6o1ZA5eVEaT4="; + cargoHash = "sha256-UB4z0jh0AQAareRbS7l/402u0yZxEV748xzE/fQcQfY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gp/gpsprune/package.nix b/pkgs/by-name/gp/gpsprune/package.nix index 10975337b66e2..20b5dc15d6ce4 100644 --- a/pkgs/by-name/gp/gpsprune/package.nix +++ b/pkgs/by-name/gp/gpsprune/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "24.1"; + version = "24.2"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-k7aRuz/FOqQe2C0luiUwoFxnIvgM6opwsGZV7+hxJSM="; + sha256 = "sha256-wGg7WPj61yx7zMBIdH9ls18BnD1R713U5Vgc/kL9qYs="; }; dontUnpack = true; diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index 93524bd30340b..fbf652297a25e 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/nomic-ai/gpt4all"; license = lib.licenses.mit; mainProgram = "gpt4all"; - maintainers = with lib.maintainers; [ drupol polygon ]; + maintainers = with lib.maintainers; [ polygon ]; }; }) diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index 1be4d3c5bc8c2..982f6fc91503b 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -29,7 +29,7 @@ appimageTools.wrapType2 { homepage = "https://github.com/janhq/jan"; license = lib.licenses.agpl3Plus; mainProgram = "jan"; - maintainers = with lib.maintainers; [ drupol ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ka/karmor/package.nix b/pkgs/by-name/ka/karmor/package.nix index 17bda415f9860..eb2722b34150e 100644 --- a/pkgs/by-name/ka/karmor/package.nix +++ b/pkgs/by-name/ka/karmor/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "karmor"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-LdUu56y9jRPFOF/Tfo9GZYmOlZIUs7/byWj2yQw7BE4="; + hash = "sha256-XWht+gCR+BHQwLrQqVdCpgKO+VUC6mxvOlpn9hOjrnE="; }; vendorHash = "sha256-r3Fy4nOjlvyHcvztSfOOE6PmOhhNcVdoIq+ie5jqwkw="; diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix index 2890eff5f882e..a2d88c0cfb239 100644 --- a/pkgs/by-name/ki/kitex/package.nix +++ b/pkgs/by-name/ki/kitex/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kitex"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "cloudwego"; repo = "kitex"; rev = "v${version}"; - hash = "sha256-U61n+zaTnABujDSTPcKr4zfMmPVQwxQAotBXZaOVZSo="; + hash = "sha256-eiwOivulPBYEK7Pmztmb2dgUytPT0hZW5BiCpovUZWw="; }; - vendorHash = "sha256-luZH7ynFni5J3CmLRM3jJPshs/u3zahkS1qS2phopLc="; + vendorHash = "sha256-4tOi1BENGNdqo3xG7PnKbIUb/QsUFhm0wDcRYrMGC0M="; subPackages = [ "tool/cmd/kitex" ]; diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index ba4bae3143765..e08fc2416a398 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -10,13 +10,13 @@ buildDotnetModule rec { pname = "knossosnet"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "KnossosNET"; repo = "Knossos.NET"; rev = "v${version}"; - hash = "sha256-5pHBCqAEuZDt5lIkLlFN2zKRZkRybc3mUMqsTN44EwU="; + hash = "sha256-4GVbwBykagSMGF3TxyZeoRb7Km+yLEMFOO8fCkH3U5A="; }; patches = [ ./targetframework.patch ]; diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index bd890528c44b7..b8ae2e0b6ea1a 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -43,13 +43,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.67"; + version = "1.68"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-FqByklvPPwTGPM1r10Ktv3uMnyyiqZ8z/h0m28wVv68="; + sha256 = "sha256-zqRlQ8HgT4fmGHD6uxxa2duZrx9Vhxd+gm1XQ7w9ay0="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/ku/kubectl-validate/package.nix b/pkgs/by-name/ku/kubectl-validate/package.nix index a37ecbdf92160..5d18e567edd93 100644 --- a/pkgs/by-name/ku/kubectl-validate/package.nix +++ b/pkgs/by-name/ku/kubectl-validate/package.nix @@ -4,7 +4,7 @@ , nix-update-script }: let - version = "0.0.3"; + version = "0.0.4"; in buildGoModule { inherit version; @@ -14,7 +14,7 @@ buildGoModule { owner = "kubernetes-sigs"; repo = "kubectl-validate"; rev = "v${version}"; - hash = "sha256-k2+2QIPjNw6C/Do1WhPN39VZhZX4PZ6ZsKDKGJ9E5QA="; + hash = "sha256-0r3ffrZSRtSe5CgvocRhoJz0zqUsx9vtABP2h1o9vCw="; }; vendorHash = null; @@ -24,6 +24,9 @@ buildGoModule { preBuild = '' mv cmd/download-builtin-schemas/main.go cmd/download-builtin-schemas/_main.go mv pkg/openapiclient/github_builtins_test.go pkg/openapiclient/_github_builtins_test.go + + # https://github.com/kubernetes-sigs/kubectl-validate/issues/134 + mv pkg/openapiclient/hardcoded_builtins_test.go pkg/openapiclient/_hardcoded_builtins_test.go ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index 6f78d0994d352..96111365f51cd 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "lazysql"; - version = "0.1.8"; + version = "0.2.1"; src = fetchFromGitHub { owner = "jorgerojas26"; repo = "lazysql"; rev = "v${version}"; - hash = "sha256-yPf9/SM4uET/I8FsDU1le9JgxELu0DR9k7mv8PnBwvQ="; + hash = "sha256-AUu4mKIcwjXlvJSszeuAuPHH3pQs4+LUU6NitVEatnk="; }; vendorHash = "sha256-tgD6qoCVC1ox15VPJWVvhe4yg3R81ktMuW2dsaU69rY="; diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 2931a41cc3efd..160029bae89d2 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.6.16"; + version = "1.6.18"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-5sGhm+ioH9hQLDuk7a0oUB1CqiiTt88UKAmBqUeCfic="; + hash = "sha256-jJKnBQ+49LtwSNTzX2xsL/lFFlaBBvJtIL9ltODPhEk="; }; vendorHash = "sha256-ralnfqrP6R58Wjc/AWRf1motWZICPagZxHCkqVcwYoo="; diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 2e5514dd15f29..254f8c2a51f6f 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -122,12 +122,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (cmakeBool "LLAMA_VULKAN" vulkanSupport) ] ++ optionals cudaSupport [ - ( - with cudaPackages.flags; - cmakeFeature "CMAKE_CUDA_ARCHITECTURES" ( - builtins.concatStringsSep ";" (map dropDot cudaCapabilities) - ) - ) + (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) ] ++ optionals rocmSupport [ (cmakeFeature "CMAKE_C_COMPILER" "hipcc") diff --git a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix index 53ac9fa3bfc11..77b7e00b06186 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix @@ -14,10 +14,6 @@ let effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; - cudaCapabilities = cudaPackages.cudaFlags.cudaCapabilities; - # E.g. [ "80" "86" "90" ] - cudaArchitectures = (builtins.map cudaPackages.cudaFlags.dropDot cudaCapabilities); - cudaArchitecturesString = lib.strings.concatStringsSep ";" cudaArchitectures; in effectiveStdenv.mkDerivation (finalAttrs: { pname = "fastdeploy-ppocr"; @@ -65,7 +61,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_SHARED_LIBS" true) ] ++ lib.optionals cudaSupport [ - (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) ]; postInstall = '' diff --git a/pkgs/by-name/ma/malwoverview/package.nix b/pkgs/by-name/ma/malwoverview/package.nix index 4028ae8fac3ce..853aeab3bb71b 100644 --- a/pkgs/by-name/ma/malwoverview/package.nix +++ b/pkgs/by-name/ma/malwoverview/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "malwoverview"; - version = "5.4.4"; + version = "5.4.5"; pyproject = true; src = fetchFromGitHub { owner = "alexandreborges"; repo = "malwoverview"; rev = "refs/tags/v${version}"; - hash = "sha256-eP2xYd/S/c4Z/cdK8IWghEUyF7pSTb5Cpg5pS/tpzUI="; + hash = "sha256-8miPlWBQSOf153l70C4Ya7gWF6D/gTArzJ5FyR0nVwA="; }; pythonRemoveDeps = [ diff --git a/pkgs/by-name/mi/miru/darwin.nix b/pkgs/by-name/mi/miru/darwin.nix new file mode 100644 index 0000000000000..af841bb43bbd6 --- /dev/null +++ b/pkgs/by-name/mi/miru/darwin.nix @@ -0,0 +1,33 @@ +{ + stdenvNoCC, + fetchurl, + unzip, + makeWrapper, + + pname, + version, + meta, +}: +stdenvNoCC.mkDerivation rec { + inherit pname version meta; + + src = fetchurl { + url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/mac-Miru-${version}-mac.zip"; + hash = "sha256-OakGB5Fz1Tlxa/Uu7xHlKoEF9VRfWFQ9CjsR0eCRyQw="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ + unzip + makeWrapper + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,Applications} + cp -r Miru.app $out/Applications/ + makeWrapper $out/Applications/Miru.app/Contents/MacOS/Miru $out/bin/miru + runHook postInstall + ''; +} diff --git a/pkgs/by-name/mi/miru/linux.nix b/pkgs/by-name/mi/miru/linux.nix new file mode 100644 index 0000000000000..f86aee30bfd1e --- /dev/null +++ b/pkgs/by-name/mi/miru/linux.nix @@ -0,0 +1,31 @@ +{ + fetchurl, + appimageTools, + + pname, + version, + meta, +}: + +appimageTools.wrapType2 rec { + inherit pname version meta; + + src = fetchurl { + url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage"; + name = "${pname}-${version}.AppImage"; + sha256 = "sha256-aPutbJthUhZtBYkYuUB5v88OdhOrcnqw4AhnepfO1B4="; + }; + + extraInstallCommands = + let + contents = appimageTools.extractType2 { inherit pname version src; }; + in + '' + mkdir -p "$out/share/applications" + mkdir -p "$out/share/lib/miru" + cp -r ${contents}/{locales,resources} "$out/share/lib/miru" + cp -r ${contents}/usr/* "$out" + cp "${contents}/${pname}.desktop" "$out/share/applications/" + substituteInPlace $out/share/applications/${pname}.desktop --replace 'Exec=AppRun' 'Exec=${pname}' + ''; +} diff --git a/pkgs/by-name/mi/miru/package.nix b/pkgs/by-name/mi/miru/package.nix index 75eb7b4823c5e..eeb1b0688dbc3 100644 --- a/pkgs/by-name/mi/miru/package.nix +++ b/pkgs/by-name/mi/miru/package.nix @@ -1,39 +1,22 @@ -{ lib -, fetchurl -, appimageTools +{ + stdenv, + lib, + callPackage, }: - -appimageTools.wrapType2 rec { +let pname = "miru"; version = "5.1.4"; - - src = fetchurl { - url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage"; - name = "${pname}-${version}.AppImage"; - sha256 = "sha256-aPutbJthUhZtBYkYuUB5v88OdhOrcnqw4AhnepfO1B4="; - }; - - extraInstallCommands = - let - contents = appimageTools.extractType2 { inherit pname version src; }; - in - '' - mkdir -p "$out/share/applications" - mkdir -p "$out/share/lib/miru" - cp -r ${contents}/{locales,resources} "$out/share/lib/miru" - cp -r ${contents}/usr/* "$out" - cp "${contents}/${pname}.desktop" "$out/share/applications/" - substituteInPlace $out/share/applications/${pname}.desktop --replace 'Exec=AppRun' 'Exec=${pname}' - ''; - meta = with lib; { description = "Stream anime torrents, real-time with no waiting for downloads"; homepage = "https://miru.watch"; license = licenses.gpl3Plus; - maintainers = [ maintainers.d4ilyrun ]; + maintainers = with maintainers; [ + d4ilyrun + matteopacini + ]; mainProgram = "miru"; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ] ++ platforms.darwin; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; longDescription = '' @@ -49,4 +32,8 @@ appimageTools.wrapType2 rec { instead of flat out closing MPV. ''; }; -} +in +if stdenv.isDarwin then + callPackage ./darwin.nix { inherit pname version meta; } +else + callPackage ./linux.nix { inherit pname version meta; } diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index 94b29557dc33e..247e78e802f59 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "nezha-agent"; - version = "0.16.11"; + version = "0.17.0"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; rev = "v${version}"; - hash = "sha256-mcTS+PjFa5niWhe8pmWmuYpx+Y9ZWX0hpcLEodN/SIs="; + hash = "sha256-xCoCmWdliw7zSxLv8IJl2F03TPMS3dRC40JH1XBirTI="; }; - vendorHash = "sha256-L6QdodI8Ur1H6Zc24KSTYAHfzvW2aq9SYwCVgjvSDII="; + vendorHash = "sha256-V5ykn/0vXSrCtCX4EEoThXMKE6EVTjc9zXt89G+34N8="; ldflags = [ "-s" diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/by-name/no/notary/package.nix index be147369ffe29..1f35222ee9600 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/by-name/no/notary/package.nix @@ -1,41 +1,32 @@ -{ lib, fetchFromGitHub, buildGoPackage, libtool }: - -buildGoPackage rec { +{ lib +, fetchFromGitHub +, buildGoModule +}: +buildGoModule rec { pname = "notary"; - version = "0.6.1"; - gitcommit = "d6e1431f"; + version = "0.6.1-unstable-2024-04-16"; src = fetchFromGitHub { - owner = "theupdateframework"; + owner = "notaryproject"; repo = "notary"; - rev = "v${version}"; - sha256 = "1ak9dk6vjny5069hp3w36dbjawcnaq82l3i2qvf7mn7zfglbsnf9"; + rev = "9d2b3b35929392c9945d976b8bdecbe2f53a299e"; + sha256 = "sha256-u19BfTJwRWholK0b3BcgSmcMM9AR7OeXo64AOi87r0A="; }; - patches = [ ./no-git-usage.patch ]; - - buildInputs = [ libtool ]; - buildPhase = '' - runHook preBuild - cd go/src/github.com/theupdateframework/notary - SKIPENVCHECK=1 make client GITCOMMIT=${gitcommit} - runHook postBuild - ''; + vendorHash = null; - goPackagePath = "github.com/theupdateframework/notary"; + tags = [ + "pkcs11" + ]; - installPhase = '' - runHook preInstall - install -D bin/notary $out/bin/notary - runHook postInstall - ''; + ldflags = [ + "-X github.com/theupdateframework/notary/version.NotaryVersion=${version}" + ]; - #doCheck = true; # broken by tzdata: 2018g -> 2019a - checkPhase = '' - make test PKGS=github.com/theupdateframework/notary/cmd/notary - ''; + # Tests try to use network. + doCheck = false; - meta = with lib; { + meta = { description = "Project that allows anyone to have trust over arbitrary collections of data"; mainProgram = "notary"; longDescription = '' @@ -58,9 +49,9 @@ buildGoPackage rec { relying only on the publisher's key to determine the validity and integrity of the received content. ''; - license = licenses.asl20; + license = lib.licenses.asl20; homepage = "https://github.com/theupdateframework/notary"; - maintainers = with maintainers; [ vdemeester ]; - platforms = platforms.unix; + maintainers = [ lib.maintainers.vdemeester ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/np/npm-lockfile-fix/package.nix b/pkgs/by-name/np/npm-lockfile-fix/package.nix index 8e5564172dafa..69c5d40756b7b 100644 --- a/pkgs/by-name/np/npm-lockfile-fix/package.nix +++ b/pkgs/by-name/np/npm-lockfile-fix/package.nix @@ -26,8 +26,9 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Add missing integrity and resolved fields to a package-lock.json file"; + homepage = "https://github.com/jeslie0/npm-lockfile-fix"; mainProgram = "npm-lockfile-fix"; license = lib.licenses.mit; - maintainers = [ maintainers.lucasew ]; + maintainers = with maintainers; [ lucasew felschr ]; }; } diff --git a/pkgs/by-name/oi/oil/package.nix b/pkgs/by-name/oi/oil/package.nix index ef32db45e7977..3cce7d592fee0 100644 --- a/pkgs/by-name/oi/oil/package.nix +++ b/pkgs/by-name/oi/oil/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ alva melkor333 ]; + maintainers = with lib.maintainers; [ melkor333 ]; changelog = "https://www.oilshell.org/release/${version}/changelog.html"; }; diff --git a/pkgs/by-name/oi/oils-for-unix/package.nix b/pkgs/by-name/oi/oils-for-unix/package.nix index bef82befbd07e..67dbc80e8afcd 100644 --- a/pkgs/by-name/oi/oils-for-unix/package.nix +++ b/pkgs/by-name/oi/oils-for-unix/package.nix @@ -2,16 +2,17 @@ let readline-all = symlinkJoin { - name = "readline-all"; paths = [ readline readline.dev ]; + name = "readline-all"; + paths = [ readline readline.dev ]; }; in stdenv.mkDerivation rec { pname = "oils-for-unix"; - version = "0.21.0"; + version = "0.22.0"; src = fetchurl { url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz"; - hash = "sha256-g8uEK68J9BsCHEvJGDgsKUmsuR1MvChEC9A00Y2sZU4="; + hash = "sha256-etZK2VH6qbj9MQ/BffCpMpHgQat1MRrKG8hcu/p61F8="; }; postPatch = '' @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ alva mkg20001 melkor333 ]; + maintainers = with lib.maintainers; [ mkg20001 melkor333 ]; changelog = "https://www.oilshell.org/release/${version}/changelog.html"; }; diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix index 26d4ff979645e..68a53dbc0a07c 100644 --- a/pkgs/by-name/ol/ols/package.nix +++ b/pkgs/by-name/ol/ols/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-06-13"; + version = "0-unstable-2024-06-18"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "09f865e685f8ebddaf994e51baeabed795e7f849"; - hash = "sha256-JdKmXMyRZCf6UYo5sKmiIaeZNgnbUm5ALP39tf6z36w="; + rev = "6209c11593a3ac175d058a1b12a884fa4d288620"; + hash = "sha256-YAeYmX62+5FjHIYt2uWY4aVW6v326vNFl4vQLl585lg="; }; postPatch = '' diff --git a/pkgs/by-name/op/openpgp-ca/package.nix b/pkgs/by-name/op/openpgp-ca/package.nix new file mode 100644 index 0000000000000..0db67f6a22a2a --- /dev/null +++ b/pkgs/by-name/op/openpgp-ca/package.nix @@ -0,0 +1,58 @@ +{ stdenv +, fetchFromGitLab +, lib +, darwin +, nettle +, nix-update-script +, rustPlatform +, pkg-config +, pcsclite +, openssl +, gnupg +, sqlite +}: + +rustPlatform.buildRustPackage rec { + pname = "openpgp-ca"; + version = "0.13.1"; + + src = fetchFromGitLab { + owner = "openpgp-ca"; + repo = "openpgp-ca"; + rev = "openpgp-ca/v${version}"; + hash = "sha256-6K7H/d82Ge+JQykqTXAD43wlGTQl+U9D/vA+CNz4rfM="; + }; + + cargoHash = "sha256-PrbepiaQbfGEqJRIcOMR6ED3BLopZLhospTzWRUoW0A="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + nativeCheckInputs = [ + gnupg + ]; + + buildInputs = [ + openssl + sqlite + pcsclite + nettle + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ PCSC Security SystemConfiguration ]); + + # Most tests rely on gnupg being able to write to /run/user + # gnupg refuses to respect the XDG_RUNTIME_DIR variable, so we skip the tests + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Tool for managing OpenPGP keys within organizations"; + homepage = "https://openpgp-ca.org/"; + changelog = "https://openpgp-ca.org/doc/changelog/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ cherrykitten ]; + mainProgram = "oca"; + }; +} diff --git a/pkgs/by-name/pa/panvimdoc/package.nix b/pkgs/by-name/pa/panvimdoc/package.nix new file mode 100644 index 0000000000000..d31260975a94a --- /dev/null +++ b/pkgs/by-name/pa/panvimdoc/package.nix @@ -0,0 +1,50 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + pandoc, + vim, + neovim-unwrapped, + makeWrapper, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "panvimdoc"; + version = "4.0.1"; + + src = fetchFromGitHub { + owner = "kdheepak"; + repo = "panvimdoc"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-HmEBPkNELHC7Xy0v730sQWZyPPwFdIBUcELzNtrWwzQ="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildPhase = '' + runHook preBuild + install -Dm444 scripts/* -t $out/share/scripts + install -Dm444 lib/* -t $out/share/lib + install -Dm755 panvimdoc.sh -t $out/share + runHook postBuild + ''; + + postFixup = '' + makeWrapper $out/share/panvimdoc.sh $out/bin/panvimdoc --prefix PATH : ${ + lib.makeBinPath [ + pandoc + vim + neovim-unwrapped + ] + } + ''; + + meta = { + description = "Write documentation in pandoc markdown. Generate documentation in vimdoc"; + homepage = "https://github.com/kdheepak/panvimdoc"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ mrcjkb ]; + mainProgram = "panvimdoc"; + }; +}) diff --git a/pkgs/by-name/pa/papers/Cargo.lock b/pkgs/by-name/pa/papers/Cargo.lock index 39f0481e5d64c..a2bd60300e21b 100644 --- a/pkgs/by-name/pa/papers/Cargo.lock +++ b/pkgs/by-name/pa/papers/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ahash" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", @@ -16,36 +16,30 @@ dependencies = [ [[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", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "anyhow" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[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" [[package]] name = "block" @@ -56,7 +50,7 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "cairo-rs" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "bitflags", "cairo-sys-rs", @@ -68,7 +62,7 @@ dependencies = [ [[package]] name = "cairo-sys-rs" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "glib-sys", "libc", @@ -77,15 +71,15 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.88" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" [[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", @@ -118,9 +112,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys", @@ -128,9 +122,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "field-offset" @@ -182,7 +176,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] @@ -208,7 +202,7 @@ dependencies = [ [[package]] name = "gdk-pixbuf" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -219,7 +213,7 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "gio-sys", "glib-sys", @@ -231,7 +225,7 @@ dependencies = [ [[package]] name = "gdk4" version = "0.9.0" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#fd457683afcfff793ad12415425c58dacbdcba36" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -245,7 +239,7 @@ dependencies = [ [[package]] name = "gdk4-sys" version = "0.9.0" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#fd457683afcfff793ad12415425c58dacbdcba36" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -281,7 +275,7 @@ dependencies = [ [[package]] name = "gio" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "futures-channel", "futures-core", @@ -298,7 +292,7 @@ dependencies = [ [[package]] name = "gio-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "glib-sys", "gobject-sys", @@ -310,7 +304,7 @@ dependencies = [ [[package]] name = "glib" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "bitflags", "futures-channel", @@ -331,19 +325,19 @@ dependencies = [ [[package]] name = "glib-macros" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "heck", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] name = "glib-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "libc", "system-deps", @@ -352,7 +346,7 @@ dependencies = [ [[package]] name = "gobject-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "glib-sys", "libc", @@ -362,7 +356,7 @@ dependencies = [ [[package]] name = "graphene-rs" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "glib", "graphene-sys", @@ -372,7 +366,7 @@ dependencies = [ [[package]] name = "graphene-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "glib-sys", "libc", @@ -383,7 +377,7 @@ dependencies = [ [[package]] name = "gsk4" version = "0.9.0" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#fd457683afcfff793ad12415425c58dacbdcba36" dependencies = [ "cairo-rs", "gdk4", @@ -397,7 +391,7 @@ dependencies = [ [[package]] name = "gsk4-sys" version = "0.9.0" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#fd457683afcfff793ad12415425c58dacbdcba36" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -412,7 +406,7 @@ dependencies = [ [[package]] name = "gtk4" version = "0.9.0" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#fd457683afcfff793ad12415425c58dacbdcba36" dependencies = [ "cairo-rs", "field-offset", @@ -432,20 +426,18 @@ dependencies = [ [[package]] name = "gtk4-macros" version = "0.9.0" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#fd457683afcfff793ad12415425c58dacbdcba36" dependencies = [ - "anyhow", "proc-macro-crate", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "gtk4-sys" version = "0.9.0" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#fd457683afcfff793ad12415425c58dacbdcba36" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -462,9 +454,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -472,9 +464,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -490,9 +482,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -546,9 +538,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "linux-raw-sys" @@ -595,15 +587,15 @@ dependencies = [ [[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", ] @@ -646,7 +638,7 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "pango" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "gio", "glib", @@ -657,7 +649,7 @@ dependencies = [ [[package]] name = "pango-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#11a369290199ee76f30b3f045064b35b70ed3a8b" dependencies = [ "glib-sys", "gobject-sys", @@ -790,9 +782,9 @@ dependencies = [ [[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" @@ -816,52 +808,28 @@ dependencies = [ ] [[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] [[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", ] [[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", @@ -871,9 +839,9 @@ 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", @@ -882,9 +850,9 @@ dependencies = [ [[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 = "rustc_version" @@ -897,9 +865,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags", "errno", @@ -910,28 +878,28 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] @@ -960,26 +928,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "syn" -version = "1.0.109" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.52" +version = "2.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "9f660c3bfcefb88c538776b6685a0c472e3128b51e74d48793dc2a488196e8eb" dependencies = [ "proc-macro2", "quote", @@ -988,9 +945,9 @@ 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", @@ -1007,9 +964,9 @@ 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" @@ -1034,34 +991,34 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[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.12", ] [[package]] @@ -1086,15 +1043,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.8", ] [[package]] @@ -1105,9 +1062,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[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" @@ -1133,11 +1090,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys", ] [[package]] @@ -1157,13 +1114,14 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -1172,45 +1130,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -1223,29 +1187,29 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index e599b4a779d15..dcdb5e6b19f7e 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -9,12 +9,12 @@ , gtk4 , glib , pango -, atk , gdk-pixbuf , shared-mime-info , itstool , poppler -, ghostscriptX +, gnome +, darwin , djvulibre , libspectre , libarchive @@ -29,6 +29,7 @@ , libgxps , supportXPS ? true # Open XML Paper Specification via libgxps , withLibsecret ? true +, supportNautilus ? (!stdenv.isDarwin) , libadwaita , exempi , cargo @@ -37,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "papers"; - version = "45.0-unstable-2024-03-27"; + version = "46.2"; outputs = [ "out" "dev" "devdoc" ]; @@ -45,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.gnome.org"; owner = "GNOME/Incubator"; repo = "papers"; - rev = "4374535f4f5e5cea613b2df7b3dc99e97da27d99"; - hash = "sha256-wjLRGENJ+TjXV3JPn/lcqv3DonAsJrC0OiLs1DoNHkc="; + rev = finalAttrs.version; + hash = "sha256-T67d7xHK23CvmT8omEqNZrV5KloK4QXU973dtP9lTDE="; }; cargoRoot = "shell-rs"; @@ -55,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: { lockFile = ./Cargo.lock; outputHashes = { - "cairo-rs-0.20.0" = "sha256-aCG9rh/tXqmcCIijuqJZJEgrGdG/IygcdWlvKYzVPhU="; - "gdk4-0.9.0" = "sha256-KYisC8nm6KVfowiKXtMoimXzB3UjHarH+2ZLhvW8oMU="; + "cairo-rs-0.20.0" = "sha256-us8Q1cqHbs0wSfMcRgZx7wTqSagYkLv/aNI8Fle2nNk="; + "gdk4-0.9.0" = "sha256-a+fkiCilKbq7sBHZ9Uvq9a/qqbsVomxG6K07B5f4eYM="; "libadwaita-0.7.0" = "sha256-gfkaj/BIqvWj1UNVAGNNXww4aoJPlqvBwIRGmDiv48E="; }; }; @@ -77,12 +78,10 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - atk dbus # only needed to find the service directory djvulibre exempi gdk-pixbuf - ghostscriptX glib gtk4 gsettings-desktop-schemas @@ -96,17 +95,33 @@ stdenv.mkDerivation (finalAttrs: { libsecret ] ++ lib.optionals supportXPS [ libgxps + ] ++ lib.optionals supportNautilus [ + gnome.nautilus + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation ]; mesonFlags = [ - "-Dnautilus=false" "-Dps=enabled" ] ++ lib.optionals (!withLibsecret) [ "-Dkeyring=disabled" + ] ++ lib.optionals (!supportNautilus) [ + "-Dnautilus=false" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16" + ) "-Wno-error=incompatible-function-pointer-types"; + preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + # Required to open multiple files. + # https://gitlab.gnome.org/GNOME/Incubator/papers/-/issues/176 + --prefix PATH : "$out/bin" + ) + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath "$out/lib" "$out/bin/papers" ''; postFixup = '' diff --git a/pkgs/by-name/pd/pdftitle/package.nix b/pkgs/by-name/pd/pdftitle/package.nix new file mode 100644 index 0000000000000..e3267a58abae4 --- /dev/null +++ b/pkgs/by-name/pd/pdftitle/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + pdfminer +}: + +python3Packages.buildPythonApplication rec { + pname = "pdftitle"; + version = "0.11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "metebalci"; + repo = "pdftitle"; + rev = "v${version}"; + hash = "sha256-kj1pJpyWRgEaAADF6YqzdD8QnJ6iu0eXFMR4NGM4/+Y="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + pdfminer + ]; + + pythonImportsCheck = [ "pdftitle" ]; + + meta = { + description = "Utility to extract the title from a PDF file"; + homepage = "https://github.com/metebalci/pdftitle"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dansbandit ]; + mainProgram = "pdftitle"; + }; +} diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix index 6de1ebd93f36e..191b405e03c45 100644 --- a/pkgs/by-name/pd/pdns-recursor/package.nix +++ b/pkgs/by-name/pd/pdns-recursor/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns-recursor"; - version = "5.0.4"; + version = "5.0.6"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2"; - hash = "sha256-1SqrEIoK2ei+HeIXmmk7uF6ZXGpNlYpQcC3Pee7I7yg="; + hash = "sha256-2QiF0qu33f6XQc2Pv1ubppAilsd7L1Ekh3kGZZHvPzI="; }; cargoDeps = rustPlatform.fetchCargoTarball { diff --git a/pkgs/by-name/pr/protoc-gen-connect-es/package.nix b/pkgs/by-name/pr/protoc-gen-connect-es/package.nix new file mode 100644 index 0000000000000..a245ee5e4f02f --- /dev/null +++ b/pkgs/by-name/pr/protoc-gen-connect-es/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + npm-lockfile-fix, +}: + +buildNpmPackage rec { + pname = "protoc-gen-connect-es"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "connectrpc"; + repo = "connect-es"; + rev = "refs/tags/v${version}"; + hash = "sha256-qCIwr4Hyc5PARUa7tMntuyWRmO6ognmtjxN0myo8FXc="; + + postFetch = '' + ${lib.getExe npm-lockfile-fix} $out/package-lock.json + ''; + }; + + npmDepsHash = "sha256-OGwEpXZqzMSIES+cmseQlo6/vzkx5ztO0gM/rUB0tGY="; + + npmWorkspace = "packages/protoc-gen-connect-es"; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Protobuf plugin for generating Connect-ecompatiblenabled ECMAScript code"; + homepage = "https://github.com/connectrpc/connect-es"; + changelog = "https://github.com/connectrpc/connect-es/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ + felschr + jtszalay + ]; + }; +} diff --git a/pkgs/by-name/pr/protoc-gen-connect-es/update.sh b/pkgs/by-name/pr/protoc-gen-connect-es/update.sh new file mode 100755 index 0000000000000..6306267da77fd --- /dev/null +++ b/pkgs/by-name/pr/protoc-gen-connect-es/update.sh @@ -0,0 +1,30 @@ +#! /usr/bin/env -S nix shell nixpkgs#gnugrep nixpkgs#gnused nixpkgs#coreutils nixpkgs#curl nixpkgs#wget nixpkgs#jq nixpkgs#nix-update nixpkgs#prefetch-npm-deps nixpkgs#npm-lockfile-fix nixpkgs#nodejs --command bash + +set -euo pipefail + +version="$( + curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/connectrpc/connect-es/releases" | + jq -r 'map(select(.prerelease == false)) | .[0].tag_name' | + grep -oP "^v\K.*" +)" +url="https://raw.githubusercontent.com/connectrpc/connect-es/v$version/" + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +tmp="$(mktemp -d)" +trap 'rm -rf -- "$tmp"' EXIT + +pushd -- "$tmp" +wget "$url/package-lock.json" +npm-lockfile-fix package-lock.json +npm_hash=$(prefetch-npm-deps package-lock.json) +popd + +pushd "$(dirname "${BASH_SOURCE[0]}")" +sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix +popd + +nix-update protoc-gen-connect-es --version "$version" diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix new file mode 100644 index 0000000000000..4b357e4705503 --- /dev/null +++ b/pkgs/by-name/pr/protoc-gen-es/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + npm-lockfile-fix, +}: + +buildNpmPackage rec { + pname = "protoc-gen-es"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "bufbuild"; + repo = "protobuf-es"; + rev = "refs/tags/v${version}"; + hash = "sha256-bHl8gqNrTm1+Cnj43RWmrLDUz+G11C4gprEiNOpyOdQ="; + + postFetch = '' + ${lib.getExe npm-lockfile-fix} $out/package-lock.json + ''; + }; + + npmDepsHash = "sha256-ozkkakfSBycu83gTs8Orhm5Tg8kRSrF/vMJxVnPjhIw="; + + npmWorkspace = "packages/protoc-gen-es"; + + preBuild = '' + npm run --workspace=packages/protobuf build + npm run --workspace=packages/protoplugin build + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Protobuf plugin for generating ECMAScript code"; + homepage = "https://github.com/bufbuild/protobuf-es"; + changelog = "https://github.com/bufbuild/protobuf-es/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ + felschr + jtszalay + ]; + }; +} diff --git a/pkgs/by-name/pr/protoc-gen-es/update.sh b/pkgs/by-name/pr/protoc-gen-es/update.sh new file mode 100755 index 0000000000000..7507fbd1fe338 --- /dev/null +++ b/pkgs/by-name/pr/protoc-gen-es/update.sh @@ -0,0 +1,30 @@ +#! /usr/bin/env -S nix shell nixpkgs#gnugrep nixpkgs#gnused nixpkgs#coreutils nixpkgs#curl nixpkgs#wget nixpkgs#jq nixpkgs#nix-update nixpkgs#prefetch-npm-deps nixpkgs#npm-lockfile-fix nixpkgs#nodejs --command bash + +set -euo pipefail + +version="$( + curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/bufbuild/protobuf-es/releases" | + jq -r 'map(select(.prerelease == false)) | .[0].tag_name' | + grep -oP "^v\K.*" +)" +url="https://raw.githubusercontent.com/bufbuild/protobuf-es/v$version/" + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +tmp="$(mktemp -d)" +trap 'rm -rf -- "$tmp"' EXIT + +pushd -- "$tmp" +wget "$url/package-lock.json" +npm-lockfile-fix package-lock.json +npm_hash=$(prefetch-npm-deps package-lock.json) +popd + +pushd "$(dirname "${BASH_SOURCE[0]}")" +sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix +popd + +nix-update protoc-gen-es --version "$version" diff --git a/pkgs/development/tools/protoc-gen-prost-crate/default.nix b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix index ed278646ee471..97c62110931cf 100644 --- a/pkgs/development/tools/protoc-gen-prost-crate/default.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix @@ -1,19 +1,22 @@ -{ fetchCrate -, lib -, rustPlatform -, protobuf +{ + fetchCrate, + lib, + rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "protoc-gen-prost-crate"; - version = "0.3.1"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-MtGeU2PnVYPXb3nly2UaryjmjMz1lxcvYDjFiwf58FA="; + hash = "sha256-+TSZ2QstAF8DXsHunV/nQyqF++0bFud1ZWJQEI3JEwc="; }; - cargoSha256 = "sha256-dcKJRX/iHIWEmBD2nTMyQozxld8b7dhxxB85quPUysg="; + cargoHash = "sha256-KbErgnXG11ngzLVSktuyUAupYs1ZD64z3plKVtzLx1A="; + + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Protoc plugin that generates Cargo crates and include files for `protoc-gen-prost`"; @@ -21,6 +24,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/neoeinstein/protoc-gen-prost"; changelog = "https://github.com/neoeinstein/protoc-gen-prost/blob/main/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ felschr sitaaax ]; + maintainers = with maintainers; [ + felschr + sitaaax + ]; }; } diff --git a/pkgs/development/tools/protoc-gen-prost-serde/default.nix b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix index e1595e0a2b868..3486fbea0e1e8 100644 --- a/pkgs/development/tools/protoc-gen-prost-serde/default.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix @@ -1,19 +1,22 @@ -{ fetchCrate -, lib -, rustPlatform -, protobuf +{ + fetchCrate, + lib, + rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "protoc-gen-prost-serde"; - version = "0.2.3"; + version = "0.3.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-V2Z6m9y/bBwrr1mgKXKZjVg+LqTe+GalN/AeaICyE64="; + hash = "sha256-O2Mpft31ZQncqETWzwD73I1nX1Wt5XVHcTJUk5qhRLY="; }; - cargoSha256 = "sha256-l27+Rs4TYIJXZVLj7Tjw8M5+7ivWEY0TXbLtbuzwxLw="; + cargoHash = "sha256-aUWmNS3jF1I0NLApBn3GMMv6ID9mM/j7r7sPFCsFIuw="; + + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Protoc plugin that generates serde serialization implementations for `protoc-gen-prost`"; @@ -21,6 +24,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/neoeinstein/protoc-gen-prost"; changelog = "https://github.com/neoeinstein/protoc-gen-prost/blob/main/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ felschr sitaaax ]; + maintainers = with maintainers; [ + felschr + sitaaax + ]; }; } diff --git a/pkgs/development/tools/protoc-gen-prost/default.nix b/pkgs/by-name/pr/protoc-gen-prost/package.nix index 6012af0acf3c2..7c92095fbeee7 100644 --- a/pkgs/development/tools/protoc-gen-prost/default.nix +++ b/pkgs/by-name/pr/protoc-gen-prost/package.nix @@ -1,19 +1,22 @@ -{ fetchCrate -, lib -, rustPlatform -, protobuf +{ + fetchCrate, + lib, + rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "protoc-gen-prost"; - version = "0.2.3"; + version = "0.3.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-QTt5mSUe41r2fxrgWj1l6fHC/utMVIgMi2ySsdGyl/Y="; + hash = "sha256-ma9sdt3/uq06BMELwsNadMkiEfstQhA4DAQEPdizZJM="; }; - cargoSha256 = "sha256-ghXcyxG9zqUOFKGvUza29OgC3XiEtesqsAsfI/lFT08="; + cargoHash = "sha256-pJDrwX5uDIrycxtmbds8l4wadZE0RdgmNpMwVkUGJDs="; + + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Protocol Buffers compiler plugin powered by Prost"; @@ -21,6 +24,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/neoeinstein/protoc-gen-prost"; changelog = "https://github.com/neoeinstein/protoc-gen-prost/blob/main/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ felschr sitaaax ]; + maintainers = with maintainers; [ + felschr + sitaaax + ]; }; } diff --git a/pkgs/development/tools/protoc-gen-tonic/default.nix b/pkgs/by-name/pr/protoc-gen-tonic/package.nix index 6855285341e57..55c1828618e9d 100644 --- a/pkgs/development/tools/protoc-gen-tonic/default.nix +++ b/pkgs/by-name/pr/protoc-gen-tonic/package.nix @@ -1,19 +1,22 @@ -{ fetchCrate -, lib -, rustPlatform -, protobuf +{ + fetchCrate, + lib, + rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "protoc-gen-tonic"; - version = "0.3.0"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-jgU1XvUxIrZ72dLNPqDGHCONMlHsjW4k4vkO626iqxs="; + hash = "sha256-3qz1ea9lEsZjhWNA0lcwqsPkNmjj2ZBljqNRr5/2lKM="; }; - cargoSha256 = "sha256-FrkvL/uJitMkSyOytVSmlwr26yMVM12S2n+EaSw11CE="; + cargoHash = "sha256-nUsRoDaP+omZdOTnaxvHbJT1uNGtyfgXyEFZbp/CeYA="; + + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Protoc plugin that generates Tonic gRPC server and client code using the Prost code generation engine"; @@ -21,6 +24,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/neoeinstein/protoc-gen-prost"; changelog = "https://github.com/neoeinstein/protoc-gen-prost/blob/main/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ felschr sitaaax ]; + maintainers = with maintainers; [ + felschr + sitaaax + ]; }; } diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index 7e79a87056173..5415039d65eeb 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.11.1"; + version = "3.11.2"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-eR3/DDO50KYVI14iX+IvALK4YLx0hmd9Z4rToPQTBGE="; + hash = "sha256-z8mQo9Kl7HvIl+8GDEcuPdRkVmKUX5/V6X4qvRTe6t4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix index b650ef91f88ec..5349581aab119 100644 --- a/pkgs/by-name/qu/quickemu/package.nix +++ b/pkgs/by-name/qu/quickemu/package.nix @@ -56,13 +56,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "quickemu"; - version = "4.9.4"; + version = "4.9.4-unstable-2024-05-28"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; - rev = finalAttrs.version; - hash = "sha256-fjbXgze6klvbRgkJtPIUh9kEkP/As7dAj+cazpzelBY="; + rev = "d78255b097b599e8ab3713cb61c4085cc45f5a95"; # TODO: return to version on next release + hash = "sha256-fF306CdGqKM+779OLm0NNyqPBtm7TuU7UN/NanT12y8="; }; postPatch = '' @@ -74,16 +74,6 @@ stdenv.mkDerivation (finalAttrs: { quickemu ''; - patches = [ - # reduces windows vm ram requirements to 4G, to match microsoft recommendations - # TODO: remove on next release - (fetchpatch2 { - name = "decrease-windows-ram-requirements.patch"; - url = "https://github.com/quickemu-project/quickemu/commit/f51697593a4650c5486661292e2febe1d16f8c71.patch"; - hash = "sha256-J5hIvQGtkufOcjk2FZN65iox/W2zkLlg+Veg9TF11Fs="; - }) - ]; - nativeBuildInputs = [ makeWrapper installShellFiles @@ -106,7 +96,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests = testers.testVersion { package = quickemu; }; + passthru.tests = testers.testVersion { + version = "4.9.5"; # required for passing tests, TODO: remove when release bump + package = quickemu; + }; meta = { description = "Quickly create and run optimised Windows, macOS and Linux virtual machines"; diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix new file mode 100644 index 0000000000000..46a35fda34ca8 --- /dev/null +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -0,0 +1,79 @@ +{ + asciidoctor, + darwin, + fetchgit, + git, + installShellFiles, + lib, + makeWrapper, + man-db, + rustPlatform, + stdenv, + xdg-utils, +}: +rustPlatform.buildRustPackage rec { + pname = "radicle-httpd"; + version = "0.11.0"; + env.RADICLE_VERSION = version; + + src = fetchgit { + url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git"; + rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}"; + hash = "sha256-XMEO+L362uaPUr25YUkMh41a2BcKEy8bgXfwKlvBtnQ="; + sparseCheckout = [ "radicle-httpd" ]; + }; + sourceRoot = "${src.name}/radicle-httpd"; + cargoHash = "sha256-WdgPL6X3FMxHW6OVoTkrbo0azAxp35UzGMcTJ5pNnkI="; + + nativeBuildInputs = [ + asciidoctor + installShellFiles + makeWrapper + ]; + nativeCheckInputs = [ git ]; + buildInputs = lib.optionals stdenv.buildPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + doCheck = stdenv.hostPlatform.isLinux; + + postInstall = '' + for page in $(find -name '*.adoc'); do + asciidoctor -d manpage -b manpage $page + installManPage ''${page::-5} + done + ''; + + postFixup = '' + for program in $out/bin/* ; + do + wrapProgram "$program" \ + --prefix PATH : "${ + lib.makeBinPath [ + git + man-db + xdg-utils + ] + }" + done + ''; + + meta = { + description = "Radicle JSON HTTP API Daemon"; + longDescription = '' + A Radicle HTTP daemon exposing a JSON HTTP API that allows someone to browse local + repositories on a Radicle node via their web browser. + ''; + homepage = "https://radicle.xyz"; + # cargo.toml says MIT and asl20, LICENSE file says GPL3 + license = with lib.licenses; [ + gpl3Only + mit + asl20 + ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + gador + lorenzleutgeb + ]; + mainProgram = "radicle-httpd"; + }; +} diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index 09790b93cbcc6..4be5a5429d1e4 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -4,14 +4,14 @@ }: python3Packages.buildPythonApplication rec { pname = "rclip"; - version = "1.10.0"; + version = "1.10.1"; pyproject = true; src = fetchFromGitHub { owner = "yurijmikhalevich"; repo = "rclip"; rev = "refs/tags/v${version}"; - hash = "sha256-l3KsOX5IkU4/wQyXXHR+09KPSD6nsnBaiGjSi7fMyqA="; + hash = "sha256-02ZbeUw+O7tBQwauklaPPcgNasG+mYrSnw9TGJqtJfk="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/re/revolt-desktop/package.nix b/pkgs/by-name/re/revolt-desktop/package.nix new file mode 100644 index 0000000000000..6a7461f3b13ea --- /dev/null +++ b/pkgs/by-name/re/revolt-desktop/package.nix @@ -0,0 +1,85 @@ +{ stdenvNoCC +, lib +, fetchurl +, fetchzip +, appimageTools +, makeWrapper +, electron +}: +(stdenvNoCC.mkDerivation { + pname = "revolt-desktop"; + version = "1.0.6"; + dontConfigure = true; + dontBuild = true; + meta = with lib; { + description = "Open source user-first chat platform"; + homepage = "https://revolt.chat/"; + changelog = "https://github.com/revoltchat/desktop/releases/tag/v${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ + heyimnova + caralice + ]; + platforms = platforms.linux ++ platforms.darwin; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "revolt-desktop"; + }; + nativeBuildInputs = [ makeWrapper ]; +}).overrideAttrs + ( + final: prev: + let + inherit (prev) pname version; + in + if stdenvNoCC.isLinux then + { + src = fetchurl { + url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-linux.AppImage"; + sha256 = "sha256-Wsm6ef2Reenq3/aKGaP2yzlOuLKaxKtRHCLLMxvWUUY="; + }; + + appimageContents = appimageTools.extractType2 { inherit (final) src pname version; }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/{applications,revolt-desktop} + + cp -a ${final.appimageContents}/{locales,resources} $out/share/${pname} + cp -a ${final.appimageContents}/revolt-desktop.desktop $out/share/applications/${pname}.desktop + cp -a ${final.appimageContents}/usr/share/icons $out/share/icons + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" + ''; + } + else + assert stdenvNoCC.isDarwin; + { + src = fetchzip { + url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-${version}-mac.zip"; + hash = "sha256-XxmKcIfJtHfi6SahrRHMeTAuyVqiN9Yhayjis10vD2w="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications/" "$out/bin/" + mv Revolt.app "$out/Applications/" + makeWrapper "$out/Applications/Revolt.app/Contents/MacOS/Revolt" "$out/bin/${pname}" + + runHook postInstall + ''; + } + ) diff --git a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock index 71a84c474751d..d8f142d2a0900 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock +++ b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if 1.0.0", "cipher", @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.8" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ "getrandom", "once_cell", @@ -41,9 +41,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -53,18 +53,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] name = "allo-isolate" -version = "0.1.24" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f5a5fd28223e6f3cafb7d9cd685f51eafdd71d33ca1229f8316925d5957240" +checksum = "f56b7997817c178b853573e8bdfb6c3afe02810b43f17d766d6703560074b0c3" dependencies = [ "anyhow", "atomic", @@ -116,17 +116,6 @@ dependencies = [ ] [[package]] -name = "amf" -version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" -dependencies = [ - "bindgen 0.65.1", - "cc", - "gpu_common", - "log", -] - -[[package]] name = "android-tzdata" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -155,7 +144,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f" dependencies = [ "android_log-sys", - "env_logger 0.10.2", + "env_logger 0.10.0", "log", "once_cell", ] @@ -180,9 +169,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -194,51 +183,88 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "apple-bindgen" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f109ee76f68b4767848cb5dc93bfcc7c425deca849c4c81fa11cdce525e3d2" +dependencies = [ + "apple-sdk", + "bindgen 0.63.0", + "derive_more", + "regex", + "serde 1.0.190", + "thiserror", + "toml 0.6.0", +] + +[[package]] +name = "apple-sdk" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a04f192a700686ee70008ff4e4eb76fe7d11814ab93b7ee9d48c36b9a9f0bd2a" +dependencies = [ + "plist", + "serde 1.0.190", + "serde_json 1.0.107", +] + +[[package]] +name = "apple-sys" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "12b3a1c3342678cd72676d0c1644fde496c1f65ea41f51465f54a89cad3bdf34" +dependencies = [ + "apple-bindgen", + "apple-sdk", + "objc", +] [[package]] name = "arboard" version = "3.3.1" -source = "git+https://github.com/fufesou/arboard?branch=feat/x11_set_conn_timeout#9e6f5357485afc4a4fd817f815c773beca57e1f3" +source = "git+https://github.com/fufesou/arboard?branch=feat/x11_set_conn_timeout#956b5f8693b4fc7fddd7b8cafbe1111a892b34b1" dependencies = [ "clipboard-win", - "core-graphics 0.23.2", + "core-graphics 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", "image", "log", "objc", @@ -263,22 +289,20 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener 2.5.3", "futures-core", - "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" +checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" dependencies = [ "flate2", "futures-core", @@ -289,15 +313,15 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.9.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10b3e585719c2358d2660232671ca8ca4ddb4be4ce8a1842d6c2dc8685303316" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" dependencies = [ - "async-lock 3.3.0", + "async-lock", "async-task", "concurrent-queue", - "fastrand 2.0.2", - "futures-lite 2.3.0", + "fastrand 2.0.1", + "futures-lite", "slab", ] @@ -307,10 +331,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock 2.8.0", - "autocfg 1.2.0", + "async-lock", + "autocfg 1.1.0", "blocking", - "futures-lite 1.13.0", + "futures-lite", ] [[package]] @@ -319,14 +343,14 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock 2.8.0", - "autocfg 1.2.0", + "async-lock", + "autocfg 1.1.0", "cfg-if 1.0.0", "concurrent-queue", - "futures-lite 1.13.0", + "futures-lite", "log", "parking", - "polling 2.8.0", + "polling", "rustix 0.37.27", "slab", "socket2 0.4.10", @@ -334,25 +358,6 @@ dependencies = [ ] [[package]] -name = "async-io" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" -dependencies = [ - "async-lock 3.3.0", - "cfg-if 1.0.0", - "concurrent-queue", - "futures-io", - "futures-lite 2.3.0", - "parking", - "polling 3.5.0", - "rustix 0.38.32", - "slab", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] name = "async-lock" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -362,57 +367,46 @@ dependencies = [ ] [[package]] -name = "async-lock" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", - "pin-project-lite", -] - -[[package]] name = "async-process" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io", + "async-lock", "async-signal", "blocking", "cfg-if 1.0.0", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.32", + "event-listener 3.0.0", + "futures-lite", + "rustix 0.38.21", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" dependencies = [ - "async-io 2.3.2", - "async-lock 2.8.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.32", + "rustix 0.38.21", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -420,9 +414,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.7.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" @@ -432,7 +426,7 @@ checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -487,14 +481,14 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", ] [[package]] name = "autocfg" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" @@ -519,9 +513,15 @@ checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" [[package]] name = "base64" -version = "0.21.7" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "base64ct" @@ -554,6 +554,28 @@ dependencies = [ [[package]] name = "bindgen" +version = "0.63.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "proc-macro2 1.0.79", + "quote 1.0.35", + "regex", + "rustc-hash", + "shlex", + "syn 1.0.109", + "which", +] + +[[package]] +name = "bindgen" version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" @@ -571,28 +593,28 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.57", + "syn 2.0.55", "which", ] [[package]] name = "bindgen" -version = "0.69.4" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "cexpr", "clang-sys", - "itertools 0.12.1", "lazy_static", "lazycell", + "peeking_take_while", "proc-macro2 1.0.79", "quote 1.0.35", "regex", "rustc-hash", "shlex", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -609,21 +631,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", ] [[package]] name = "bitmask-enum" -version = "2.2.3" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9990737a6d5740ff51cdbbc0f0503015cb30c390f6623968281eb214a520cfc0" +checksum = "49fb8528abca6895a5ada33d62aedd538a5c33e77068256483b44a3230270163" dependencies = [ "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -674,25 +696,25 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", - "async-lock 3.3.0", + "async-lock", "async-task", - "fastrand 2.0.2", + "fastrand 2.0.1", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "piper", "tracing", ] [[package]] name = "brotli" -version = "3.5.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -717,9 +739,9 @@ checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b" [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecount" @@ -729,9 +751,9 @@ checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" @@ -745,7 +767,7 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", ] [[package]] @@ -776,8 +798,8 @@ source = "git+https://github.com/clslaid/cacao?branch=feat/set-file-urls#05e1536 dependencies = [ "bitmask-enum", "block2", - "core-foundation 0.9.3", - "core-graphics 0.23.1", + "core-foundation 0.9.3 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", + "core-graphics 0.23.1 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", "dispatch", "lazy_static", "libc", @@ -793,7 +815,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "cairo-sys-rs", "glib 0.18.5", "libc", @@ -814,9 +836,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", "libc", @@ -861,16 +883,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits 0.2.18", + "num-traits 0.2.17", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.48.5", ] [[package]] @@ -881,7 +903,7 @@ checksum = "2315f7119b7146d6a883de6acd63ddf96071b5f79d9d98d2adaa84d749f6abf1" dependencies = [ "debug-helper", "num-bigint", - "num-traits 0.2.18", + "num-traits 0.2.17", "once_cell", "regex", ] @@ -898,13 +920,13 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading 0.8.3", + "libloading 0.7.4", ] [[package]] @@ -924,30 +946,30 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.0" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.0" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.0", + "strsim 0.10.0", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard" @@ -964,7 +986,7 @@ dependencies = [ "parking_lot", "percent-encoding", "rand 0.8.5", - "serde 1.0.197", + "serde 1.0.190", "serde_derive", "thiserror", "utf16string", @@ -974,9 +996,9 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "5.3.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" +checksum = "3ec832972fefb8cf9313b45a0d1945e29c9c251f1d4c6eafc5fe2124c02d2e81" dependencies = [ "error-code", ] @@ -1008,7 +1030,7 @@ dependencies = [ "bitflags 1.3.2", "block", "cocoa-foundation", - "core-foundation 0.9.4", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.22.3", "foreign-types 0.3.2", "libc", @@ -1024,8 +1046,8 @@ dependencies = [ "bitflags 1.3.2", "block", "cocoa-foundation", - "core-foundation 0.9.4", - "core-graphics 0.23.2", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.5.0", "libc", "objc", @@ -1039,8 +1061,8 @@ checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ "bitflags 1.3.2", "block", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics-types 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc", "objc", ] @@ -1069,9 +1091,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -1079,10 +1101,10 @@ dependencies = [ [[package]] name = "confy" version = "0.4.0-2" -source = "git+https://github.com/open-trade/confy#7855cd3c32b1a60b44e5076ee8f6b4131da10350" +source = "git+https://github.com/rustdesk-org/confy#83db9ec19a2f97e9718aef69e4fc5611bb382479" dependencies = [ "directories-next", - "serde 1.0.197", + "serde 1.0.190", "thiserror", "toml 0.5.11", ] @@ -1136,29 +1158,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" [[package]] -name = "core-foundation" -version = "0.9.3" -source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" -dependencies = [ - "core-foundation-sys 0.8.6 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", - "libc", -] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +version = "0.9.3" +source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" dependencies = [ - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.6", "libc", ] [[package]] name = "core-foundation-sys" version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" +dependencies = [ + "objc2-encode", +] [[package]] name = "core-graphics" @@ -1167,8 +1187,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics-types 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2", "libc", ] @@ -1179,66 +1199,42 @@ version = "0.23.1" source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.3", - "core-graphics-types 0.1.2", + "core-foundation 0.9.3 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", + "core-graphics-types 0.1.2 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", "foreign-types 0.5.0", "libc", "objc2-encode", ] [[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 0.9.4", - "core-graphics-types 0.1.3", - "foreign-types 0.5.0", - "libc", -] - -[[package]] name = "core-graphics-types" version = "0.1.2" source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.3", + "core-foundation 0.9.3 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", "libc", "objc2-encode", ] [[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 0.9.4", - "libc", -] - -[[package]] name = "coreaudio-rs" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ "bitflags 1.3.2", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "coreaudio-sys", ] [[package]] name = "coreaudio-sys" -version = "0.2.15" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" +checksum = "d8478e5bdad14dce236b9898ea002eabfa87cbe14f0aa538dbe3b6a4bec4332d" dependencies = [ - "bindgen 0.69.4", + "bindgen 0.68.1", ] [[package]] @@ -1248,7 +1244,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" dependencies = [ "alsa", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "coreaudio-rs", "dasp_sample", "jni 0.19.0", @@ -1268,64 +1264,74 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ + "cfg-if 1.0.0", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ + "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.18" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ + "autocfg 1.1.0", + "cfg-if 1.0.0", "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.11" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ + "cfg-if 1.0.0", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if 1.0.0", +] [[package]] name = "crunchy" @@ -1355,9 +1361,9 @@ dependencies = [ [[package]] name = "dart-sys" -version = "4.1.5" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57967e4b200d767d091b961d6ab42cc7d0cc14fe9e052e75d0d3cf9eb732d895" +checksum = "8d8b5680b5c2cc52f50acb2457d9b3a3b58adcca785db13a0e3655626f601de6" dependencies = [ "cc", ] @@ -1369,7 +1375,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.3", + "hashbrown 0.14.2", "lock_api", "once_cell", "parking_lot_core", @@ -1539,9 +1545,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ "powerfmt", ] @@ -1569,6 +1575,19 @@ dependencies = [ ] [[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2 1.0.79", + "quote 1.0.35", + "rustc_version", + "syn 1.0.109", +] + +[[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1664,7 +1683,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.3", + "libloading 0.8.1", ] [[package]] @@ -1727,7 +1746,7 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.197", + "serde 1.0.190", "strsim 0.10.0", ] @@ -1738,12 +1757,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] -name = "dpi" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" - -[[package]] name = "dtoa" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1756,7 +1769,7 @@ dependencies = [ "cc", "hbb_common", "lazy_static", - "serde 1.0.197", + "serde 1.0.190", "serde_derive", "thiserror", ] @@ -1772,15 +1785,15 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[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 1.0.0", ] @@ -1795,7 +1808,7 @@ dependencies = [ "objc", "pkg-config", "rdev", - "serde 1.0.197", + "serde 1.0.190", "serde_derive", "tfc", "unicode-segmentation", @@ -1828,28 +1841,28 @@ checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" dependencies = [ "enumflags2_derive", - "serde 1.0.197", + "serde 1.0.190", ] [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -1867,9 +1880,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ "humantime", "is-terminal", @@ -1884,7 +1897,7 @@ version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74351c3392ea1ff6cd2628e0042d268ac2371cb613252ff383b6dfa50d22fa79" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "libc", ] @@ -1896,19 +1909,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "error-code" -version = "3.2.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" +checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc" [[package]] name = "evdev" @@ -1928,31 +1941,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.2.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" dependencies = [ "concurrent-queue", "parking", @@ -1960,26 +1951,6 @@ dependencies = [ ] [[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" -dependencies = [ - "event-listener 5.2.0", - "pin-project-lite", -] - -[[package]] name = "exr" version = "1.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2006,15 +1977,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" dependencies = [ "simd-adler32", ] @@ -2025,20 +1996,20 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.1", + "memoffset 0.9.0", "rustc_version", ] [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", - "windows-sys 0.52.0", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", ] [[package]] @@ -2081,7 +2052,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "spin 0.9.8", + "spin", ] [[package]] @@ -2112,9 +2083,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "1.82.6" +version = "1.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7fe743d921bedf4578b9472346d03a9643a01cd565ca7df7961baebad534ba5" +checksum = "d1ab3d175f0a09c1adb55fd98d7b6460b00af72c4e889b9eec2c5aee88273996" [[package]] name = "fnv" @@ -2158,7 +2129,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -2175,9 +2146,9 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -2224,9 +2195,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -2239,9 +2210,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -2249,15 +2220,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -2266,9 +2237,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -2286,46 +2257,33 @@ dependencies = [ ] [[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand 2.0.2", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -2456,9 +2414,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if 1.0.0", "libc", @@ -2477,9 +2435,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" @@ -2551,7 +2509,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "futures-channel", "futures-core", "futures-executor", @@ -2576,7 +2534,7 @@ checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" dependencies = [ "anyhow", "heck 0.3.3", - "itertools 0.9.0", + "itertools", "proc-macro-crate 0.1.5", "proc-macro-error", "proc-macro2 1.0.79", @@ -2595,7 +2553,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -2647,36 +2605,6 @@ dependencies = [ ] [[package]] -name = "gpu_common" -version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" -dependencies = [ - "bindgen 0.65.1", - "cc", - "log", - "serde 1.0.197", - "serde_derive", - "serde_json 1.0.115", -] - -[[package]] -name = "gpucodec" -version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" -dependencies = [ - "amf", - "bindgen 0.65.1", - "cc", - "gpu_common", - "log", - "nv", - "serde 1.0.197", - "serde_derive", - "serde_json 1.0.115", - "vpl", -] - -[[package]] name = "gstreamer" version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2858,14 +2786,14 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] name = "h2" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2873,7 +2801,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.2.6", + "indexmap 2.0.2", "slab", "tokio", "tokio-util", @@ -2895,16 +2823,16 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.8", + "ahash 0.7.7", ] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.11", + "ahash 0.8.6", "allocator-api2", ] @@ -2914,17 +2842,19 @@ version = "0.1.0" dependencies = [ "anyhow", "backtrace", + "base64 0.22.0", "bytes", "chrono", "confy", "directories-next", "dirs-next", "dlopen", - "env_logger 0.10.2", + "env_logger 0.10.0", "filetime", "flexi_logger", "futures", "futures-util", + "httparse", "lazy_static", "libc", "log", @@ -2933,22 +2863,27 @@ dependencies = [ "osascript", "protobuf", "protobuf-codegen", - "quinn", "rand 0.8.5", "regex", - "serde 1.0.197", + "rustls-pki-types", + "rustls-platform-verifier", + "serde 1.0.190", "serde_derive", - "serde_json 1.0.115", + "serde_json 1.0.107", "socket2 0.3.19", "sodiumoxide", "sysinfo", + "thiserror", "tokio", - "tokio-socks", + "tokio-native-tls", + "tokio-rustls 0.26.0", + "tokio-socks 0.5.2-1", "tokio-util", "toml 0.7.8", + "url", "uuid", "winapi 0.3.9", - "zstd 0.13.1", + "zstd 0.13.0", ] [[package]] @@ -2977,9 +2912,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.6" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -2998,11 +2933,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.9" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -3028,7 +2963,7 @@ checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.11", + "itoa 1.0.9", ] [[package]] @@ -3062,15 +2997,15 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" -version = "0.2.0" -source = "git+https://github.com/21pages/hwcodec?branch=stable#52e1da2aae86acec5f374bc065f5921945b55e7b" +version = "0.4.18" +source = "git+https://github.com/21pages/hwcodec#b84d5bbefa949194d1fc51a5c7e9d7988e315ce6" dependencies = [ "bindgen 0.59.2", "cc", "log", - "serde 1.0.197", + "serde 1.0.190", "serde_derive", - "serde_json 1.0.115", + "serde_json 1.0.107", ] [[package]] @@ -3088,9 +3023,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.11", + "itoa 1.0.9", "pin-project-lite", - "socket2 0.5.6", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -3108,7 +3043,7 @@ dependencies = [ "hyper", "rustls 0.21.10", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", ] [[package]] @@ -3126,16 +3061,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core 0.51.1", ] [[package]] @@ -3149,9 +3084,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.5.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -3170,7 +3105,7 @@ dependencies = [ "gif", "jpeg-decoder", "num-rational 0.4.1", - "num-traits 0.2.18", + "num-traits 0.2.17", "png", "qoi", "tiff", @@ -3209,18 +3144,18 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", "hashbrown 0.12.3", ] [[package]] name = "indexmap" -version = "2.2.6" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.2", ] [[package]] @@ -3267,7 +3202,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.6", + "hermit-abi 0.3.3", "libc", "windows-sys 0.48.0", ] @@ -3280,13 +3215,13 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.6", - "libc", - "windows-sys 0.52.0", + "hermit-abi 0.3.3", + "rustix 0.38.21", + "windows-sys 0.48.0", ] [[package]] @@ -3305,15 +3240,6 @@ dependencies = [ ] [[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] name = "itoa" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3321,9 +3247,9 @@ checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jni" @@ -3377,9 +3303,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -3395,9 +3321,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -3405,11 +3331,12 @@ dependencies = [ [[package]] name = "keepawake" version = "0.4.3" -source = "git+https://github.com/rustdesk-org/keepawake-rs#64d568586dd16551d02120e19668d2b0fec8e3c9" +source = "git+https://github.com/rustdesk-org/keepawake-rs#ad94454a75cf1ff9e95e217dee9dd6a378bf625e" dependencies = [ "anyhow", + "apple-sys", "cfg-if 1.0.0", - "core-foundation 0.9.4", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "shadow-rs", "windows 0.48.0", "winres", @@ -3432,8 +3359,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags 2.5.0", - "serde 1.0.197", + "bitflags 2.4.1", + "serde 1.0.190", "unicode-segmentation", ] @@ -3481,9 +3408,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libdbus-sys" @@ -3518,12 +3445,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -3542,7 +3469,7 @@ dependencies = [ "libc", "libpulse-sys", "num-derive", - "num-traits 0.2.18", + "num-traits 0.2.17", "winapi 0.3.9", ] @@ -3575,22 +3502,12 @@ checksum = "bc19e110fbf42c17260d30f6d3dc545f58491c7830d38ecb9aaca96e26067a9b" dependencies = [ "libc", "num-derive", - "num-traits 0.2.18", + "num-traits 0.2.17", "pkg-config", "winapi 0.3.9", ] [[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 = "libsamplerate-sys" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3632,9 +3549,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -3644,9 +3561,12 @@ dependencies = [ [[package]] name = "line-wrap" -version = "0.2.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] [[package]] name = "linux-raw-sys" @@ -3656,9 +3576,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -3666,15 +3586,15 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", "scopeguard", ] [[package]] name = "log" -version = "0.4.21" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "mac_address" @@ -3688,9 +3608,9 @@ dependencies = [ [[package]] name = "mach2" -version = "0.4.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" dependencies = [ "libc", ] @@ -3738,9 +3658,9 @@ checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" [[package]] name = "memchr" -version = "2.7.2" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -3748,7 +3668,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", ] [[package]] @@ -3757,16 +3677,16 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", ] [[package]] name = "memoffset" -version = "0.9.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", ] [[package]] @@ -3783,9 +3703,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", "simd-adler32", @@ -3804,15 +3724,6 @@ dependencies = [ ] [[package]] -name = "miow" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] name = "mouce" version = "0.2.1" source = "git+https://github.com/fufesou/mouce.git#ed83800d532b95d70e39915314f6052aa433e9b9" @@ -3822,13 +3733,12 @@ dependencies = [ [[package]] name = "muda" -version = "0.13.1" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f428b4e9db3d17e2f809dfb1ff9ddfbbf16c71790d1656d10aee320877e1392f" +checksum = "e406691fa7749604bbc7964bde28a300572d52621bb84540f6907c0f8fe08737" dependencies = [ "cocoa 0.25.0", "crossbeam-channel", - "dpi", "gtk", "keyboard-types", "libxdo", @@ -3932,9 +3842,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.6" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" +checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ "bytes", "libc", @@ -3984,7 +3894,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "cfg-if 1.0.0", "libc", ] @@ -4000,6 +3910,15 @@ dependencies = [ ] [[package]] +name = "nom8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" +dependencies = [ + "memchr", +] + +[[package]] name = "ntapi" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4023,27 +3942,21 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", "num-integer", - "num-traits 0.2.18", + "num-traits 0.2.17", ] [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ - "num-traits 0.2.18", + "num-traits 0.2.17", ] [[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] name = "num-derive" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4056,11 +3969,12 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.46" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ - "num-traits 0.2.18", + "autocfg 1.1.0", + "num-traits 0.2.17", ] [[package]] @@ -4069,9 +3983,9 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", "num-integer", - "num-traits 0.2.18", + "num-traits 0.2.17", ] [[package]] @@ -4080,9 +3994,9 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", "num-integer", - "num-traits 0.2.18", + "num-traits 0.2.17", ] [[package]] @@ -4091,16 +4005,16 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.18", + "num-traits 0.2.17", ] [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", ] [[package]] @@ -4109,7 +4023,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.3", "libc", ] @@ -4136,25 +4050,14 @@ dependencies = [ [[package]] name = "num_threads" -version = "0.1.7" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" dependencies = [ "libc", ] [[package]] -name = "nv" -version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" -dependencies = [ - "bindgen 0.65.1", - "cc", - "gpu_common", - "log", -] - -[[package]] name = "objc" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4221,9 +4124,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -4238,7 +4141,7 @@ dependencies = [ "ndk", "ndk-context", "num-derive", - "num-traits 0.2.18", + "num-traits 0.2.17", "oboe-sys", ] @@ -4253,17 +4156,17 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "cfg-if 1.0.0", "foreign-types 0.3.2", "libc", @@ -4280,7 +4183,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -4291,9 +4194,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" dependencies = [ "cc", "libc", @@ -4341,23 +4244,23 @@ dependencies = [ [[package]] name = "os_info" -version = "3.8.2" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" dependencies = [ "log", - "serde 1.0.197", - "windows-sys 0.52.0", + "serde 1.0.190", + "winapi 0.3.9", ] [[package]] name = "os_pipe" -version = "1.1.5" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -4366,9 +4269,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", "serde_derive", - "serde_json 1.0.115", + "serde_json 1.0.107", ] [[package]] @@ -4384,7 +4287,7 @@ dependencies = [ [[package]] name = "pam" version = "0.7.0" -source = "git+https://github.com/fufesou/pam#10da2cbbabe32cbc9de22a66abe44738e7ec0ea0" +source = "git+https://github.com/fufesou/pam#3a2aaa6e07b176d8e2d66a5eec38d2ddb45f009f" dependencies = [ "libc", "pam-macros", @@ -4405,11 +4308,10 @@ dependencies = [ [[package]] name = "pam-sys" -version = "1.0.0-alpha5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce9484729b3e52c0bacdc5191cb6a6a5f31ef4c09c5e4ab1209d3340ad9e997b" +version = "1.0.0-alpha4" +source = "git+https://github.com/fufesou/pam-sys?branch=fix/v1.0.0-alpha4_gnuc_va_list#3337c9bb9a9c68d7497ec8c93cad2368c26091b7" dependencies = [ - "bindgen 0.69.4", + "bindgen 0.59.2", "libc", ] @@ -4440,13 +4342,12 @@ dependencies = [ [[package]] name = "parity-tokio-ipc" -version = "0.7.3-3" -source = "git+https://github.com/rustdesk-org/parity-tokio-ipc#f2d1fcf8fb002335d9a62bec308559d40698694d" +version = "0.7.3-4" +source = "git+https://github.com/rustdesk-org/parity-tokio-ipc#3623ec9ebef50c9b118e03b03df831008a4d1441" dependencies = [ "futures", "libc", "log", - "miow", "rand 0.8.5", "tokio", "winapi 0.3.9", @@ -4476,7 +4377,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -4518,9 +4419,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" @@ -4529,7 +4430,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap 2.0.2", ] [[package]] @@ -4572,29 +4473,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -4609,35 +4510,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.2", + "fastrand 2.0.1", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.6.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" dependencies = [ - "base64", - "indexmap 2.2.6", + "base64 0.21.5", + "indexmap 1.9.3", "line-wrap", - "quick-xml 0.31.0", - "serde 1.0.197", - "time 0.3.34", + "quick-xml", + "serde 1.0.190", + "time 0.3.30", ] [[package]] name = "png" -version = "0.17.13" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -4652,7 +4553,7 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", "bitflags 1.3.2", "cfg-if 1.0.0", "concurrent-queue", @@ -4663,20 +4564,6 @@ dependencies = [ ] [[package]] -name = "polling" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" -dependencies = [ - "cfg-if 1.0.0", - "concurrent-queue", - "pin-project-lite", - "rustix 0.38.32", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] name = "powerfmt" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4701,7 +4588,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2 1.0.79", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -4785,9 +4672,9 @@ dependencies = [ [[package]] name = "protobuf" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65f4a8ec18723a734e5dc09c173e0abf9690432da5340285d536edcb4dac190" +checksum = "58678a64de2fced2bdec6bca052a6716a0efe692d6e3f53d1bda6a1def64cfc0" dependencies = [ "bytes", "once_cell", @@ -4797,9 +4684,9 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e85514a216b1c73111d9032e26cc7a5ecb1bb3d4d9539e91fb72a4395060f78" +checksum = "32777b0b3f6538d9d2e012b3fad85c7e4b9244b5958d04a6415f4333782b7a77" dependencies = [ "anyhow", "once_cell", @@ -4812,9 +4699,9 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d6fbd6697c9e531873e81cec565a85e226b99a0f10e1acc079be057fe2fcba" +checksum = "96cb37955261126624a25b5e6bda40ae34cf3989d52a783087ca6091b29b5642" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -4828,9 +4715,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6872f4d4f4b98303239a2b5838f5bbbb77b01ffc892d627957f37a22d7cfe69c" +checksum = "e1ed294a835b0f30810e13616b1cd34943c6d1e84a8f3b0dcfe466d256c3e7e7" dependencies = [ "thiserror", ] @@ -4884,65 +4771,6 @@ dependencies = [ ] [[package]] -name = "quick-xml" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -dependencies = [ - "memchr", -] - -[[package]] -name = "quinn" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls 0.20.8", - "thiserror", - "tokio", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-proto" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring 0.16.20", - "rustc-hash", - "rustls 0.20.8", - "rustls-native-certs", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-udp" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" -dependencies = [ - "libc", - "quinn-proto", - "socket2 0.4.10", - "tracing", - "windows-sys 0.42.0", -] - -[[package]] name = "quote" version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5140,8 +4968,8 @@ version = "0.5.0-2" source = "git+https://github.com/fufesou/rdev#b3434caee84c92412b45a2f655a15ac5dad33488" dependencies = [ "cocoa 0.24.1", - "core-foundation 0.9.4", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "core-graphics 0.22.3", "dispatch", "enum-map", @@ -5178,6 +5006,24 @@ dependencies = [ [[package]] name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" @@ -5187,20 +5033,20 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "libredox", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -5210,9 +5056,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -5221,9 +5067,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "repng" @@ -5241,7 +5087,7 @@ version = "0.11.23" source = "git+https://github.com/rustdesk-org/reqwest#9cb758c9fb2f4edc62eb790acfd45a6a3da21ed3" dependencies = [ "async-compression", - "base64", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -5261,54 +5107,39 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.21.10", - "rustls-native-certs", - "rustls-pemfile", - "serde 1.0.197", - "serde_json 1.0.115", + "rustls-native-certs 0.6.3", + "rustls-pemfile 1.0.3", + "serde 1.0.190", + "serde_json 1.0.107", "serde_urlencoded", "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.24.1", + "tokio-socks 0.5.1", "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.25.4", "winreg 0.50.0", ] [[package]] name = "ring" -version = "0.16.20" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi 0.3.9", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if 1.0.0", "getrandom", "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.52.0", + "spin", + "untrusted", + "windows-sys 0.48.0", ] [[package]] @@ -5333,23 +5164,23 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.3.1" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" dependencies = [ "libc", "rtoolbox", - "windows-sys 0.48.0", + "winapi 0.3.9", ] [[package]] name = "rtoolbox" -version = "0.0.2" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" dependencies = [ "libc", - "windows-sys 0.48.0", + "winapi 0.3.9", ] [[package]] @@ -5360,7 +5191,7 @@ checksum = "cd70209c27d5b08f5528bdc779ea3ffb418954e28987f9f9775c6eac41003f9c" dependencies = [ "num-complex", "num-integer", - "num-traits 0.2.18", + "num-traits 0.2.17", "realfft", ] @@ -5417,23 +5248,22 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.2.4" +version = "1.2.6" dependencies = [ "android-wakelock", "android_logger", "arboard", "async-process", "async-trait", - "base64", "bytes", "cc", "cfg-if 1.0.0", "chrono", "cidr-utils", - "clap 4.5.0", + "clap 4.4.7", "clipboard", "cocoa 0.24.1", - "core-foundation 0.9.4", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.22.3", "cpal", "crossbeam-queue", @@ -5458,7 +5288,7 @@ dependencies = [ "jni 0.21.1", "keepawake", "lazy_static", - "libloading 0.8.3", + "libloading 0.8.1", "libpulse-binding", "libpulse-simple-binding", "mac_address", @@ -5477,16 +5307,16 @@ dependencies = [ "repng", "reqwest", "ringbuf", - "rpassword 7.3.1", + "rpassword 7.2.0", "rubato", "runas", "rust-pulsectl", "samplerate", "sciter-rs", "scrap", - "serde 1.0.197", + "serde 1.0.190", "serde_derive", - "serde_json 1.0.115", + "serde_json 1.0.107", "serde_repr", "sha2", "shared_memory", @@ -5515,7 +5345,7 @@ dependencies = [ [[package]] name = "rustdesk-portable-packer" -version = "1.2.4" +version = "1.2.6" dependencies = [ "brotli", "dirs 5.0.1", @@ -5526,13 +5356,13 @@ dependencies = [ [[package]] name = "rustfft" -version = "6.2.0" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86" +checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434" dependencies = [ "num-complex", "num-integer", - "num-traits 0.2.18", + "num-traits 0.2.17", "primal-check", "strength_reduce", "transpose", @@ -5555,38 +5385,42 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.13", - "windows-sys 0.52.0", + "linux-raw-sys 0.4.10", + "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ - "ring 0.16.20", + "log", + "ring", + "rustls-webpki 0.101.7", "sct", - "webpki", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "8c4d6d8ad9f2492485e13453acbb291dd08f64441b6609c491f1c2cd2c6b4fe1" dependencies = [ "log", - "ring 0.17.8", - "rustls-webpki", - "sct", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", ] [[package]] @@ -5596,28 +5430,95 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.3", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.2", + "rustls-pki-types", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64 0.21.5", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64", + "base64 0.22.0", + "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 = "rustls-platform-verifier" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d" +dependencies = [ + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", + "jni 0.19.0", + "log", + "once_cell", + "rustls 0.23.4", + "rustls-native-certs 0.7.0", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.2", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.1", + "winapi 0.3.9", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" + +[[package]] name = "rustls-webpki" version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", ] [[package]] @@ -5628,9 +5529,15 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" [[package]] name = "same-file" @@ -5652,11 +5559,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -5692,7 +5599,6 @@ dependencies = [ "cfg-if 1.0.0", "dbus", "docopt", - "gpucodec", "gstreamer", "gstreamer-app", "gstreamer-video", @@ -5707,8 +5613,8 @@ dependencies = [ "pkg-config", "quest", "repng", - "serde 1.0.197", - "serde_json 1.0.115", + "serde 1.0.190", + "serde_json 1.0.107", "target_build_utils", "tracing", "webm", @@ -5721,38 +5627,39 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[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 0.9.4", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "libc", + "num-bigint", "security-framework-sys", ] [[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 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "libc", ] [[package]] name = "semver" -version = "1.0.22" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" @@ -5762,22 +5669,22 @@ checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -5794,33 +5701,33 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ - "itoa 1.0.11", + "itoa 1.0.9", "ryu", - "serde 1.0.197", + "serde 1.0.190", ] [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", ] [[package]] @@ -5830,9 +5737,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.11", + "itoa 1.0.9", "ryu", - "serde 1.0.197", + "serde 1.0.190", ] [[package]] @@ -5866,7 +5773,7 @@ dependencies = [ "const_format", "git2", "is_debug", - "time 0.3.34", + "time 0.3.30", "tzdb", ] @@ -5928,14 +5835,14 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.2.0", + "autocfg 1.1.0", ] [[package]] name = "smallvec" -version = "1.13.2" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" @@ -5960,12 +5867,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -5977,17 +5884,11 @@ dependencies = [ "ed25519", "libc", "libsodium-sys", - "serde 1.0.197", + "serde 1.0.190", ] [[package]] name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" @@ -6020,12 +5921,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "strsim" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" - -[[package]] name = "strum" version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6092,9 +5987,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.57" +version = "2.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" +checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", @@ -6122,7 +6017,7 @@ version = "0.29.10" source = "git+https://github.com/rustdesk-org/sysinfo#f45dcc6510d48c3a1401c5a33eedccc8899f67b2" dependencies = [ "cfg-if 1.0.0", - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "libc", "ntapi", "once_cell", @@ -6137,7 +6032,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "system-configuration-sys", ] @@ -6147,7 +6042,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ - "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.8.4", "libc", ] @@ -6175,7 +6070,7 @@ dependencies = [ "cfg-expr", "heck 0.4.1", "pkg-config", - "toml 0.8.10", + "toml 0.8.6", "version-compare 0.1.1", ] @@ -6192,13 +6087,13 @@ dependencies = [ [[package]] name = "tao" version = "0.25.0" -source = "git+https://github.com/rustdesk-org/tao?branch=dev#1cad16b200485bbccc67dcee2d339eac6e1c16ad" +source = "git+https://github.com/rustdesk-org/tao?branch=dev#288c219cb0527e509590c2b2d8e7072aa9feb2d3" dependencies = [ "bitflags 1.3.2", "cc", "cocoa 0.25.0", - "core-foundation 0.9.4", - "core-graphics 0.23.2", + "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel", "dispatch", "gdkwayland-sys", @@ -6232,7 +6127,7 @@ dependencies = [ [[package]] name = "tao-macros" version = "0.1.2" -source = "git+https://github.com/rustdesk-org/tao?branch=dev#1cad16b200485bbccc67dcee2d339eac6e1c16ad" +source = "git+https://github.com/rustdesk-org/tao?branch=dev#288c219cb0527e509590c2b2d8e7072aa9feb2d3" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", @@ -6268,27 +6163,28 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" dependencies = [ - "quick-xml 0.30.0", + "quick-xml", "windows 0.51.1", ] [[package]] name = "tempfile" -version = "3.10.1" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.2", - "rustix 0.38.32", - "windows-sys 0.52.0", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.21", + "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.4.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -6325,22 +6221,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -6376,17 +6272,16 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", - "itoa 1.0.11", + "itoa 1.0.9", "libc", - "num-conv", "num_threads", "powerfmt", - "serde 1.0.197", + "serde 1.0.190", "time-core", "time-macros", ] @@ -6399,11 +6294,10 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ - "num-conv", "time-core", ] @@ -6424,9 +6318,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -6436,20 +6330,20 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -6473,9 +6367,32 @@ dependencies = [ ] [[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.4", + "rustls-pki-types", + "tokio", +] + +[[package]] name = "tokio-socks" -version = "0.5.1-2" -source = "git+https://github.com/open-trade/tokio-socks#14a5c2564fa20a2765ea53d03c573ee2b7e20421" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-socks" +version = "0.5.2-1" +source = "git+https://github.com/rustdesk-org/tokio-socks#94e97c6d7c93b0bcbfa54f2dc397c1da0a6e43d3" dependencies = [ "bytes", "either", @@ -6499,7 +6416,7 @@ dependencies = [ "futures-io", "futures-sink", "futures-util", - "hashbrown 0.14.3", + "hashbrown 0.14.2", "pin-project-lite", "slab", "tokio", @@ -6512,7 +6429,19 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", +] + +[[package]] +name = "toml" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217" +dependencies = [ + "serde 1.0.190", + "serde_spanned", + "toml_datetime 0.5.1", + "toml_edit 0.18.1", ] [[package]] @@ -6521,22 +6450,31 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", "serde_spanned", - "toml_datetime", + "toml_datetime 0.6.5", "toml_edit 0.19.15", ] [[package]] name = "toml" -version = "0.8.10" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", "serde_spanned", - "toml_datetime", - "toml_edit 0.22.6", + "toml_datetime 0.6.5", + "toml_edit 0.20.7", +] + +[[package]] +name = "toml_datetime" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" +dependencies = [ + "serde 1.0.190", ] [[package]] @@ -6545,51 +6483,53 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" dependencies = [ - "indexmap 2.2.6", - "serde 1.0.197", + "indexmap 1.9.3", + "nom8", + "serde 1.0.190", "serde_spanned", - "toml_datetime", - "winnow 0.5.40", + "toml_datetime 0.5.1", ] [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", + "indexmap 2.0.2", + "serde 1.0.190", + "serde_spanned", + "toml_datetime 0.6.5", + "winnow", ] [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.2.6", - "serde 1.0.197", + "indexmap 2.0.2", + "serde 1.0.190", "serde_spanned", - "toml_datetime", - "winnow 0.6.1", + "toml_datetime 0.6.5", + "winnow", ] [[package]] name = "totp-rs" -version = "5.5.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c4ae9724c5888c0417d2396037ed3b60665925624766416e3e342b6ba5dbd3f" +checksum = "df3504f96adf86d28e7eb16fa236a7951ec72c15ee100d1b5318e225944bc8cb" dependencies = [ "base32", "constant_time_eq 0.2.6", @@ -6626,7 +6566,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -6650,11 +6590,11 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.13.1" -source = "git+https://github.com/tauri-apps/tray-icon#3c75d9031a915c108cc1886121b9b84cb9c8c312" +version = "0.11.3" +source = "git+https://github.com/tauri-apps/tray-icon#b8dbd42c6f94a29f34b0a0daa619486277185512" dependencies = [ "cocoa 0.25.0", - "core-graphics 0.23.2", + "core-graphics 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel", "dirs-next", "libappindicator", @@ -6713,11 +6653,10 @@ dependencies = [ [[package]] name = "uds_windows" -version = "1.1.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" dependencies = [ - "memoffset 0.9.1", "tempfile", "winapi 0.3.9", ] @@ -6733,9 +6672,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -6745,9 +6684,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] @@ -6778,26 +6717,20 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde 1.0.197", + "serde 1.0.190", ] [[package]] @@ -6849,9 +6782,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.8.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom", ] @@ -6895,17 +6828,6 @@ dependencies = [ ] [[package]] -name = "vpl" -version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" -dependencies = [ - "bindgen 0.65.1", - "cc", - "gpu_common", - "log", -] - -[[package]] name = "waker-fn" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6913,9 +6835,9 @@ checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.5.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -6963,9 +6885,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -6973,24 +6895,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7000,9 +6922,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote 1.0.35", "wasm-bindgen-macro-support", @@ -7010,22 +6932,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wayland-backend" @@ -7047,7 +6969,7 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "nix 0.26.4", "wayland-backend", "wayland-scanner", @@ -7059,7 +6981,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "wayland-backend", "wayland-client", "wayland-scanner", @@ -7071,7 +6993,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.1", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7085,7 +7007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" dependencies = [ "proc-macro2 1.0.79", - "quick-xml 0.30.0", + "quick-xml", "quote 1.0.35", ] @@ -7102,9 +7024,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -7127,20 +7049,19 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.22.2" +name = "webpki-roots" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "weezl" @@ -7157,7 +7078,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.32", + "rustix 0.38.21", ] [[package]] @@ -7166,7 +7087,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fec781d48b41f8163426ed18e8fc2864c12937df9ce54c88ede7bd47270893e" dependencies = [ - "redox_syscall", + "redox_syscall 0.4.1", "wasite", "web-sys", ] @@ -7225,9 +7146,9 @@ dependencies = [ [[package]] name = "winapi-wsapoll" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" dependencies = [ "winapi 0.3.9", ] @@ -7339,7 +7260,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -7350,7 +7271,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -7366,21 +7287,6 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" @@ -7648,18 +7554,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.1" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] @@ -7786,7 +7683,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" dependencies = [ "gethostname 0.4.3", - "rustix 0.38.32", + "rustix 0.38.21", "x11rb-protocol 0.13.0", ] @@ -7807,25 +7704,25 @@ checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" dependencies = [ - "libc", + "nix 0.26.4", "winapi 0.3.9", ] [[package]] name = "zbus" -version = "3.15.2" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io", + "async-lock", "async-process", "async-recursion", "async-task", @@ -7843,7 +7740,7 @@ dependencies = [ "once_cell", "ordered-stream", "rand 0.8.5", - "serde 1.0.197", + "serde 1.0.190", "serde_repr", "sha1", "static_assertions", @@ -7858,9 +7755,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.15.2" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.79", @@ -7872,11 +7769,11 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.6.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" dependencies = [ - "serde 1.0.197", + "serde 1.0.190", "static_assertions", "zvariant", ] @@ -7908,7 +7805,7 @@ checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] @@ -7919,10 +7816,16 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.57", + "syn 2.0.55", ] [[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + +[[package]] name = "zip" version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7938,7 +7841,7 @@ dependencies = [ "hmac", "pbkdf2", "sha1", - "time 0.3.34", + "time 0.3.30", "zstd 0.11.2+zstd.1.5.2", ] @@ -7953,11 +7856,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ - "zstd-safe 7.1.0", + "zstd-safe 7.0.0", ] [[package]] @@ -7972,18 +7875,18 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.1.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", "pkg-config", @@ -8000,23 +7903,23 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.2" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" dependencies = [ "byteorder", "enumflags2", "libc", - "serde 1.0.197", + "serde 1.0.190", "static_assertions", "zvariant_derive", ] [[package]] name = "zvariant_derive" -version = "3.15.2" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.79", diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index a78290e66004a..6dedaf3acf861 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , flutter316 , gst_all_1 +, fuse , libXtst , libaom , libopus @@ -14,6 +15,7 @@ , libvpx , libxkbcommon , libyuv +, pam , makeDesktopItem , rustPlatform , rustc @@ -23,7 +25,7 @@ flutterRustBridge = rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; - version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.2.3-2/.github/workflows/bridge.yml#L10 + version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.2.6/.github/workflows/bridge.yml#L10 src = fetchFromGitHub { owner = "fzyzcjy"; @@ -41,27 +43,27 @@ in flutter316.buildFlutterApplication rec { pname = "rustdesk"; - version = "1.2.3-2"; + version = "1.2.6"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; rev = version; - hash = "sha256-aIGaj338eb8/l1NTgBwrLmx5VCpgGoYpx+p/ViCJgjQ="; + hash = "sha256-dEHWMtNmYeg2FSocNnzYbcW0f07zhC09G2uSC0yMZcY="; }; strictDeps = true; # Configure the Flutter/Dart build sourceRoot = "${src.name}/flutter"; - # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.2.3-2/flutter/pubspec.lock | yq + # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.2.6/flutter/pubspec.lock | yq pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow="; - desktop_multi_window = "sha256-jhhqV4srWd3oJwlKMHPpGvvdzyoH/kJtTg6AB4e9Udk="; + desktop_multi_window = "sha256-YXIvTuMDj1Tx8NGtOD2Tpxy1fiQw0p5fbOMZYfKUkXQ="; dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8="; flutter_gpu_texture_renderer = "sha256-0znIHlZ0ashRTev2kAXU179eq/V1RJC9Hp4jAfiPh5Q="; flutter_improved_scrolling = "sha256-fKs1+JmhDVVfjyhr6Fl17pc6n++mCTjBo1PT3l/DUnc="; - uni_links_desktop = "sha256-h3wlo31XnHELCCPlk7OSLglm9Xn/969yTllp5UkGY98="; + uni_links_desktop = "sha256-h3wlo31XnHELCCPlk7OSLglm9Xn/969yT1lp5UkGY98="; window_manager = "sha256-CUTcSl+W7Wz/Og5k9ujOdAlhKWv/gIYe58wurf9CJH4="; window_size = "sha256-+lqY46ZURT0qcqPvHFXUnd83Uvfq79Xr+rw1AHqrpak="; }; @@ -69,25 +71,25 @@ in flutter316.buildFlutterApplication rec { # Configure the Rust build cargoRoot = ".."; cargoDeps = rustPlatform.importCargoLock { - # Upstream lock file after running `cargo generate-lockfile --offline` and - # removing the git variant of core-foundation-sys + # Upstream lock file after removing the registry variant of core-foundation-sys + # and fixing the resulting errors by removing the other registry deps. lockFile = ./Cargo.lock; outputHashes = { - "amf-0.1.0" = "sha256-4YVHndc6sCuuHhM2dc1zoOFMZt2J5nUg/UuKYsyiC+A="; "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; - "arboard-3.3.1" = "sha256-siFkyWK8VmDIhefCaRjNwVtHxRmAp95JvaTp37M6nCA="; + "arboard-3.3.1" = "sha256-Pj111rxyed4/UPtB2w2yDs4R1oZktgGkbEog4o1g5IQ="; "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; - "confy-0.4.0-2" = "sha256-r5VeggXrIq5Cwxc2WSrxQDI5Gvbw979qIUQfMKHgBUI="; + "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; - "hwcodec-0.2.0" = "sha256-bbAOQui7UY7FFKnwsxFUJYBG/zi9rpmOtcai3faeoeU="; + "hwcodec-0.4.18" = "sha256-RTo83aWx6ZKgWCDic1IFneZZ2TC+ZCfanULeHTfOiec="; "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; - "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; + "keepawake-0.4.3" = "sha256-wDLjjhKWbCeaWbA896a5E5UMB0B/xI/84QRCUYNKX7I="; "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg="; "mouce-0.2.1" = "sha256-3PtNEmVMXgqKV4r3KiKTkk4oyCt4BKynniJREE+RyFk="; - "pam-0.7.0" = "sha256-qe2GH6sfGEUnqLiQucYLB5rD/GyAaVtm9pAxWRb1H3Q="; - "parity-tokio-ipc-0.7.3-3" = "sha256-oHygC811v1fXt4KWhIZU04cs4rD340I8/bczfbxpiok="; + "pam-0.7.0" = "sha256-aF3TkRkYuRpBcgg8RyherSfcspKNotvvxRhlg9yGwjk="; + "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo="; + "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY="; "rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw="; "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; @@ -95,8 +97,8 @@ in flutter316.buildFlutterApplication rec { "sysinfo-0.29.10" = "sha256-O2zJGQdtXNiIwatmyIB6bu5eVyv1JS/IHkv//BDCpcY="; "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk="; "tfc-0.6.1" = "sha256-ukxJl7Z+pUXCjvTsG5Q0RiXocPERWGsnAyh3SIWm0HU="; - "tokio-socks-0.5.1-2" = "sha256-x3aFJKo0XLaCGkZLtG9GYA+A/cGGedVZ8gOztWiYVUY="; - "tray-icon-0.13.1" = "sha256-mgWgd9rafDpRFO/6YpsNDE5ZbRqCE2Y1F8PiNznLMyk="; + "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; + "tray-icon-0.11.3" = "sha256-pzvrqv+R2AD8fOsTyYItLaJLa19w+lWDa8vNVGczZdY="; "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; @@ -107,10 +109,10 @@ in flutter316.buildFlutterApplication rec { cargoBuildFlags = "--lib"; cargoBuildType = "release"; cargoBuildFeatures = [ - "linux-pkg-config" - "hwcodec" "flutter" - "flutter_texture_render" + "hwcodec" + "linux-pkg-config" + "unix-file-copy-paste" ]; nativeBuildInputs = [ @@ -125,6 +127,7 @@ in flutter316.buildFlutterApplication rec { ]; buildInputs = [ + fuse gst_all_1.gst-plugins-base gst_all_1.gstreamer libXtst @@ -136,6 +139,7 @@ in flutter316.buildFlutterApplication rec { libvpx libxkbcommon libyuv + pam xdotool ]; diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json index d8d6379584cc4..bc1713b597194 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json +++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json @@ -416,7 +416,7 @@ "description": { "path": ".", "ref": "HEAD", - "resolved-ref": "ef03db52a20a7899da135d694c071fa3866c8fb1", + "resolved-ref": "60773827434eefe6d01eefa814dca9a032b970b3", "url": "https://github.com/rustdesk-org/rustdesk_desktop_multi_window" }, "source": "git", @@ -984,14 +984,14 @@ "version": "0.2.1+1" }, "intl": { - "dependency": "transitive", + "dependency": "direct overridden", "description": { "name": "intl", - "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.18.1" + "version": "0.19.0" }, "io": { "dependency": "transitive", @@ -1057,21 +1057,21 @@ "dependency": "transitive", "description": { "name": "material_color_utilities", - "sha256": "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41", + "sha256": "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.0" + "version": "0.8.0" }, "meta": { "dependency": "transitive", "description": { "name": "meta", - "sha256": "a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e", + "sha256": "d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.11.0" }, "mime": { "dependency": "transitive", @@ -1147,11 +1147,11 @@ "dependency": "direct main", "description": { "name": "path", - "sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.8.3" + "version": "1.9.0" }, "path_parsing": { "dependency": "transitive", @@ -1903,11 +1903,11 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "sha256": "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "0.4.2" }, "web_socket_channel": { "dependency": "transitive", diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix new file mode 100644 index 0000000000000..15d6b6f7caa67 --- /dev/null +++ b/pkgs/by-name/se/serpl/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + gitUpdater, + makeWrapper, + ripgrep, +}: +let + pname = "serpl"; + version = "0.1.26"; +in +rustPlatform.buildRustPackage { + inherit pname version; + src = fetchFromGitHub { + owner = "yassinebridi"; + repo = "serpl"; + rev = version; + hash = "sha256-ppF74VI0ceB4G/RLTa1phEy+tQ34r4hOMxqlK7YeLo0="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + cargoHash = "sha256-/TnuRRzeCPp8pqa/soGV0b3ZYp0cCbt3un6SjatSGp0="; + + postFixup = '' + # Serpl needs ripgrep to function properly. + wrapProgram $out/bin/serpl \ + --prefix PATH : "${lib.strings.makeBinPath [ ripgrep ]}" + ''; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "Simple terminal UI for search and replace, ala VS Code"; + homepage = "https://github.com/yassinebridi/serpl.git"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ NotAShelf ]; + mainProgram = "serpl"; + }; +} diff --git a/pkgs/by-name/sf/sfwbar/package.nix b/pkgs/by-name/sf/sfwbar/package.nix index 712040333536d..d7b7371b9c19f 100644 --- a/pkgs/by-name/sf/sfwbar/package.nix +++ b/pkgs/by-name/sf/sfwbar/package.nix @@ -13,9 +13,10 @@ libxkbcommon, alsa-lib, makeWrapper, + docutils, }: let - version = "1.0_beta14"; + version = "1.0_beta15"; in stdenv.mkDerivation { pname = "sfwbar"; @@ -25,7 +26,7 @@ stdenv.mkDerivation { owner = "LBCrion"; repo = "sfwbar"; rev = "v${version}"; - hash = "sha256-4brP1SXaWq/L0D87rvlrWhLU1oFPSwNNxBSzRr4jsTM="; + hash = "sha256-nNtnHOM/ArbYx5ZGlnxgMB33YaGAOigxgW4SAywg66Q="; }; buildInputs = [ @@ -36,6 +37,7 @@ stdenv.mkDerivation { libmpdclient libxkbcommon alsa-lib + docutils # for rst2man ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/so/solo5/package.nix b/pkgs/by-name/so/solo5/package.nix index 57ccd1e24b2bf..1ca866c81e5e2 100644 --- a/pkgs/by-name/so/solo5/package.nix +++ b/pkgs/by-name/so/solo5/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dosfstools, libseccomp, makeWrapper, mtools, parted -, pkg-config, qemu, syslinux, util-linux }: +, pkg-config, qemu_test, syslinux, util-linux }: let version = "0.8.1"; @@ -55,10 +55,12 @@ in stdenv.mkDerivation { ''; doCheck = stdenv.hostPlatform.isLinux; - nativeCheckInputs = [ util-linux qemu ]; + nativeCheckInputs = [ util-linux qemu_test ]; checkPhase = '' runHook preCheck patchShebangs tests + substituteInPlace scripts/virtio-run/solo5-virtio-run.sh \ + --replace " -no-acpi" "" ./tests/bats-core/bats ./tests/tests.bats runHook postCheck ''; diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index 36db7162d87f8..7c0d7e27375fd 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -46,7 +46,6 @@ buildGoModule rec { homepage = "https://github.com/spicetify/spicetify-cli/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ - jonringer mdarocha ]; mainProgram = "spicetify"; diff --git a/pkgs/by-name/sp/spip/package.nix b/pkgs/by-name/sp/spip/package.nix new file mode 100644 index 0000000000000..9f99a9e438e09 --- /dev/null +++ b/pkgs/by-name/sp/spip/package.nix @@ -0,0 +1,67 @@ +{ + fetchFromGitHub, + fetchurl, + lib, + makeWrapper, + rPackages, + rWrapper, + stdenv +}: + +let + my-r-packages = rWrapper.override{packages = with rPackages; [ + foreach + doParallel + randomForest + ];}; + transcriptome-url = "https://kumisystems.dl.sourceforge.net/project/splicing-prediction-pipeline/transcriptome/"; + + transcriptome19 = fetchurl { + url = transcriptome-url + "/transcriptome_hg19.RData"; + sha256 = "sha256-E8UmHoNoySSIde+TRE6bxVP0PrccpKDvIHBGCvWnYOw="; + }; + + transcriptome38 = fetchurl { + url = transcriptome-url + "/transcriptome_hg38.RData"; + sha256 = "sha256-mQMMZVN1byXMYjFoRdezmoZtnhUur2CHOP/j/pmw8as="; + }; + +in + +stdenv.mkDerivation { + pname = "spip"; + version = "unstable-2023-04-19"; + + src = fetchFromGitHub { + owner = "raphaelleman"; + repo = "SPiP"; + rev = "cae95fe0ee7a2602630b7a4eacbf7cfa0e1763f0"; + sha256 = "sha256-/CufUaQYnsdo8Rij/24JmixPgMi7o1CApLxeTneWAVc="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInput = [ my-r-packages ]; + + installPhase ='' + runHook preInstall + + mkdir -p $out/bin + cp SPiPv2.1_main.r $out/ + cp -r RefFiles $out/ + ln -s ${transcriptome19} $out/RefFiles/transcriptome_hg19.RData + ln -s ${transcriptome38} $out/RefFiles/transcriptome_hg38.RData + makeWrapper ${my-r-packages}/bin/Rscript $out/bin/spip \ + --add-flags "$out/SPiPv2.1_main.r" + + runHook postInstall +''; + + meta = with lib; { + description = "A random forest model for splice prediction in genomics"; + license = licenses.mit; + homepage = "https://github.com/raphaelleman/SPiP"; + maintainers = with maintainers; [ apraga ]; + platforms = platforms.unix; + mainProgram = "spip"; + }; +} diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index a2594799be071..14df24b62ef85 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -74,6 +74,10 @@ rustPlatform.buildRustPackage { }; postInstall = '' + mkdir -p $out/etc/stalwart + cp resources/config/spamfilter.toml $out/etc/stalwart/spamfilter.toml + cp -r resources/config/spamfilter $out/etc/stalwart/ + mkdir -p $out/lib/systemd/system substitute resources/systemd/stalwart-mail.service $out/lib/systemd/system/stalwart-mail.service \ diff --git a/pkgs/by-name/st/status-im/package.nix b/pkgs/by-name/st/status-im/package.nix new file mode 100644 index 0000000000000..040d43d24c214 --- /dev/null +++ b/pkgs/by-name/st/status-im/package.nix @@ -0,0 +1,49 @@ +{ + lib, + appimageTools, + fetchzip, + fetchurl, + makeDesktopItem, +}: +let + version = "2.29.0"; + commit = "f78ece"; + + src = fetchzip { + name = "StatusIm-Desktop-v${version}-${commit}-x86_64.AppImage"; + url = "https://github.com/status-im/status-desktop/releases/download/${version}/StatusIm-Desktop-v${version}-${commit}-x86_64.tar.gz"; + sha256 = "sha256-i91E1eaN6paM+uZ8EvO1+Wj0Po9KnzQorG0tWKF4hn8="; + stripRoot = false; + postFetch = '' + mv $out/StatusIm-Desktop-v${version}-${commit}-x86_64.AppImage $TMPDIR/tmp + rm -rf $out + mv $TMPDIR/tmp $out + ''; + }; + + desktopEntry = makeDesktopItem { + name = "status"; + desktopName = "Status Desktop"; + exec = "status-desktop"; + icon = "status"; + comment = "Desktop client for the Status Network"; + categories = ["Network"]; + }; + icon = fetchurl { + url = "https://github.com/status-im/status-desktop/raw/afde83651724a555626b5d9a3d582918de6c3d59/status.png"; + sha256 = "sha256-ViGuOr9LskGs/P7pjPO9zYgosWaZlZZYVuPpliOA5dY="; + }; + pname = "status-desktop"; +in appimageTools.wrapType2 { + inherit pname version src; + extraInstallCommands = '' + install -m 444 -D ${desktopEntry}/share/applications/status.desktop $out/share/applications/status.desktop + install -m 444 -D ${icon} $out/share/icons/hicolor/512x512/apps/status.png + ''; + meta = with lib; { + description = "Desktop client for the Status Network"; + license = licenses.mpl20; + maintainers = with maintainers; [ a-kenji ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/su/substudy/Cargo.lock b/pkgs/by-name/su/substudy/Cargo.lock new file mode 100644 index 0000000000000..02902a56a6e92 --- /dev/null +++ b/pkgs/by-name/su/substudy/Cargo.lock @@ -0,0 +1,4781 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "aligned_media" +version = "0.1.0" +dependencies = [ + "isolang", + "peg", + "relative-path", + "serde", + "serde_json", + "thiserror", + "uuid", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "ammonia" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e6d1c7838db705c9b756557ee27c384ce695a1c51a6fe528784cb1c6840170" +dependencies = [ + "html5ever", + "maplit", + "once_cell", + "tendril", + "url", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" + +[[package]] +name = "anymap" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" + +[[package]] +name = "anymap2" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" + +[[package]] +name = "askama_escape" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" + +[[package]] +name = "async-channel" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +dependencies = [ + "concurrent-queue", + "event-listener 5.2.0", + "event-listener-strategy 0.5.1", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-compression" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-convert" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d416feee97712e43152cd42874de162b8f9b77295b1c85e5d92725cc8310bae" +dependencies = [ + "async-trait", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-openai" +version = "0.19.1" +source = "git+https://github.com/emk/async-openai.git?branch=transcription_verbose_json#930778ba2892a92830544a7b4a5611b72cdbfa71" +dependencies = [ + "async-convert", + "backoff", + "base64", + "bytes", + "derive_builder", + "futures", + "rand", + "reqwest 0.11.27", + "reqwest-eventsource", + "secrecy", + "serde", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", +] + +[[package]] +name = "async-task" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + +[[package]] +name = "async-trait" +version = "0.1.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "audiotags" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44e797ce0164cf599c71f2c3849b56301d96a3dc033544588e875686b050ed39" +dependencies = [ + "audiotags-macro", + "id3", + "metaflac", + "mp4ameta", + "readme-rustdocifier", + "thiserror", +] + +[[package]] +name = "audiotags-macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaa9b2312fc01f7291f3b7b0f52ed08b1c0177c96a2e696ab55695cc4d06889" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core", + "axum-macros", + "base64", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "multer", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha1", + "sync_wrapper 1.0.0", + "tokio", + "tokio-tungstenite", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00c055ee2d014ae5981ce1016374e8213682aa14d9bf40e48ab48b5f3ef20eaa" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom", + "instant", + "pin-project-lite", + "rand", + "tokio", +] + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +dependencies = [ + "serde", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "fastrand", + "futures-io", + "futures-lite", + "piper", + "tracing", +] + +[[package]] +name = "bumpalo" +version = "3.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" + +[[package]] +name = "bytemuck" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "camino" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" + +[[package]] +name = "cfg-expr" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chardet" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a48563284b67c003ba0fb7243c87fab68885e1532c605704228a80238512e31" + +[[package]] +name = "chrono" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets 0.52.4", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.0", + "terminal_size", +] + +[[package]] +name = "clap_derive" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "cli_test_dir" +version = "0.1.8" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "const_format" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "constcat" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7e35aee659887cbfb97aaf227ac12cad1a9d7c71e55ff3376839ed4e282d08" + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[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-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[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 = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +dependencies = [ + "darling_core 0.20.8", + "darling_macro 0.20.8", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_core" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core 0.14.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +dependencies = [ + "darling_core 0.20.8", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + +[[package]] +name = "dict_importer" +version = "0.1.0" +dependencies = [ + "flate2", + "isolang", + "lzma-rs", + "reqwest 0.12.2", + "serde", + "serde_json", + "tar", + "tempfile", + "thiserror", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "dict_manager" +version = "0.1.0" +dependencies = [ + "dict_importer", + "dirs", + "isolang", + "rusqlite", + "rust-stemmers", + "semver", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "difference" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dioxus" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804134b0ea229772d5841e8bc19b8e41a5b93cb6f6a7d28fdf24cbd44d373687" +dependencies = [ + "dioxus-config-macro", + "dioxus-core", + "dioxus-core-macro", + "dioxus-fullstack", + "dioxus-hooks", + "dioxus-hot-reload", + "dioxus-html", + "dioxus-liveview", + "dioxus-router", + "dioxus-signals", + "dioxus-ssr", + "dioxus-web", + "serde", +] + +[[package]] +name = "dioxus-cli-config" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d4661064bad2f0b12929faf6c9cea4d94e60217ba6b11ff4146b505a57124b" +dependencies = [ + "once_cell", + "serde", + "serde_json", + "tracing", +] + +[[package]] +name = "dioxus-config-macro" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebe244197b320dec9e9f38742985fe98c058136ada770df73e9429878ed92863" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "dioxus-core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51e22f08fd018c32e6aebd8defd45a8262570881f2d616670bc62a87ef4324c" +dependencies = [ + "futures-channel", + "futures-util", + "generational-box", + "longest-increasing-subsequence", + "rustc-hash", + "serde", + "slab", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "dioxus-core-macro" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b59ee29f0273f78e0d5514b0efbec7d594de2a1c611b57fb507ce479731656ee" +dependencies = [ + "constcat", + "convert_case", + "dioxus-rsx", + "prettyplease", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "dioxus-debug-cell" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ea539174bb236e0e7dc9c12b19b88eae3cb574dedbd0252a2d43ea7e6de13e2" + +[[package]] +name = "dioxus-fullstack" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6fd92201e5cb8e887ab06d1aefaccd74dcb45b899a56c24838b332c31f8c4c" +dependencies = [ + "anymap", + "async-compression", + "async-trait", + "axum", + "base64", + "bytes", + "ciborium", + "dioxus-cli-config", + "dioxus-hot-reload", + "dioxus-lib", + "dioxus-ssr", + "dioxus-web", + "dioxus_server_macro", + "futures-util", + "http 1.1.0", + "hyper 1.2.0", + "once_cell", + "pin-project", + "serde", + "serde_json", + "server_fn", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tower", + "tower-http", + "tower-layer", + "tracing", + "tracing-futures", + "web-sys", +] + +[[package]] +name = "dioxus-hooks" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "198eba79d71119d10b094ce69c5e2f3186359edb54e6b9a3219c9fed3f1990ed" +dependencies = [ + "dioxus-core", + "dioxus-debug-cell", + "dioxus-signals", + "futures-channel", + "futures-util", + "generational-box", + "slab", + "thiserror", + "tracing", +] + +[[package]] +name = "dioxus-hot-reload" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d5a28a2af6655473c6521fb5a428538807b985e8e5f1a8c30e2ab71bd54e637" +dependencies = [ + "dioxus-core", + "dioxus-html", + "dioxus-rsx", + "interprocess-docfix", + "serde", + "serde_json", +] + +[[package]] +name = "dioxus-html" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0db16306a568ec8f160d98420de7b553d572b2883572d321483903d8e252924" +dependencies = [ + "async-trait", + "dioxus-core", + "dioxus-html-internal-macro", + "enumset", + "euclid", + "futures-channel", + "generational-box", + "keyboard-types", + "serde", + "serde-value", + "serde_json", + "serde_repr", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "dioxus-html-internal-macro" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1799f34affdb158f6ebec23b46b11f9e65de0bbadbbb781dc68c3eddfe6fd32b" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "dioxus-interpreter-js" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aaacee7f371c92e3c284a10f59286ef3d328e3222fc39f6a96017dc2825c0fa" +dependencies = [ + "dioxus-core", + "dioxus-html", + "js-sys", + "md5", + "sledgehammer_bindgen", + "sledgehammer_utils", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "dioxus-lib" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8dae8cef1e939a5c7164d1b5c4d5ebe70a88021d78468c4e05d582322d56cbe" +dependencies = [ + "dioxus-core", + "dioxus-core-macro", + "dioxus-hooks", + "dioxus-html", + "dioxus-rsx", + "dioxus-signals", +] + +[[package]] +name = "dioxus-liveview" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb2b58c6ef35b880ea648ff634d8d1c95fbf33e6c96037dd977b2a6a17163d9d" +dependencies = [ + "axum", + "dioxus-cli-config", + "dioxus-core", + "dioxus-hot-reload", + "dioxus-html", + "dioxus-interpreter-js", + "futures-channel", + "futures-util", + "generational-box", + "rustc-hash", + "serde", + "serde_json", + "slab", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", +] + +[[package]] +name = "dioxus-router" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4cbbc1aff811aa3715c94a7ca0375be0be34356aba7f3897328d844323519b" +dependencies = [ + "dioxus-cli-config", + "dioxus-fullstack", + "dioxus-lib", + "dioxus-router-macro", + "dioxus-ssr", + "gloo", + "gloo-utils 0.1.7", + "js-sys", + "tokio", + "tracing", + "url", + "urlencoding", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "dioxus-router-macro" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a1b089ef30c7c31ad888016454d2508209c619bda09f57c877e799866e4df22" +dependencies = [ + "proc-macro2", + "quote", + "slab", + "syn 2.0.52", +] + +[[package]] +name = "dioxus-rsx" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2425ff908a21219b142251f5d2151a5f67a3558889898eef5d83fc83c37fdaa" +dependencies = [ + "dioxus-core", + "internment", + "krates", + "proc-macro2", + "quote", + "syn 2.0.52", + "tracing", +] + +[[package]] +name = "dioxus-signals" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5fa4ec45a13f3c00d30cbbdf967160b43f9a7c774c53fccdec000f9f07e1aaa" +dependencies = [ + "dioxus-core", + "futures-channel", + "futures-util", + "generational-box", + "once_cell", + "parking_lot", + "rustc-hash", + "tracing", +] + +[[package]] +name = "dioxus-ssr" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f18705a5f786f3a3a546836e4befcfe8af4476a9b30ae68286f973ea32d064" +dependencies = [ + "askama_escape", + "async-trait", + "chrono", + "dioxus-core", + "dioxus-html", + "generational-box", + "http 1.1.0", + "lru", + "rustc-hash", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "dioxus-web" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "737b449ac5fce120d95abe2b0e159a5f40dfb7f8b4f8deb942abaf018bc45a16" +dependencies = [ + "async-trait", + "console_error_panic_hook", + "dioxus-core", + "dioxus-html", + "dioxus-interpreter-js", + "futures-channel", + "futures-util", + "generational-box", + "js-sys", + "rustc-hash", + "serde", + "serde-wasm-bindgen", + "serde_json", + "tracing", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "dioxus_server_macro" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "506289d31e9c7a9c51bf4c703d2a60b1edbad567564b0a6fbeaf8d27ee0a3871" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "server_fn_macro", + "syn 2.0.52", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[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 = "dotenv" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding" +version = "0.2.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" +dependencies = [ + "encoding-index-japanese", + "encoding-index-korean", + "encoding-index-simpchinese", + "encoding-index-singlebyte", + "encoding-index-tradchinese", +] + +[[package]] +name = "encoding-index-japanese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-korean" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-simpchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-singlebyte" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-tradchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding_index_tests" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enumset" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" +dependencies = [ + "enumset_derive", +] + +[[package]] +name = "enumset_derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" +dependencies = [ + "darling 0.20.8", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +dependencies = [ + "event-listener 5.2.0", + "pin-project-lite", +] + +[[package]] +name = "eventsource-stream" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74fef4569247a5f429d9156b9d0a2599914385dd189c539334c625d8099d90ab" +dependencies = [ + "futures-core", + "nom", + "pin-project-lite", +] + +[[package]] +name = "ext-trait" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d772df1c1a777963712fb68e014235e80863d6a91a85c4e06ba2d16243a310e5" +dependencies = [ + "ext-trait-proc_macros", +] + +[[package]] +name = "ext-trait-proc_macros" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ab7934152eaf26aa5aa9f7371408ad5af4c31357073c9e84c3b9d7f11ad639a" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "extension-traits" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a296e5a895621edf9fa8329c83aa1cb69a964643e36cf54d8d7a69b789089537" +dependencies = [ + "ext-trait", +] + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.52.0", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[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" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generational-box" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "871f4a6bd7e2a93fbdd5a880776c9cd63df38145f390d43e4c4847af4c300add" +dependencies = [ + "parking_lot", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gloo" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28999cda5ef6916ffd33fb4a7b87e1de633c47c0dc6d97905fee1cdaa142b94d" +dependencies = [ + "gloo-console", + "gloo-dialogs", + "gloo-events", + "gloo-file", + "gloo-history", + "gloo-net 0.3.1", + "gloo-render", + "gloo-storage", + "gloo-timers", + "gloo-utils 0.1.7", + "gloo-worker", +] + +[[package]] +name = "gloo-console" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b7ce3c05debe147233596904981848862b068862e9ec3e34be446077190d3f" +dependencies = [ + "gloo-utils 0.1.7", + "js-sys", + "serde", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-dialogs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67062364ac72d27f08445a46cab428188e2e224ec9e37efdba48ae8c289002e6" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-events" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b107f8abed8105e4182de63845afcc7b69c098b7852a813ea7462a320992fc" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-file" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d5564e570a38b43d78bdc063374a0c3098c4f0d64005b12f9bbe87e869b6d7" +dependencies = [ + "gloo-events", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-history" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85725d90bf0ed47063b3930ef28e863658a7905989e9929a8708aab74a1d5e7f" +dependencies = [ + "gloo-events", + "gloo-utils 0.1.7", + "serde", + "serde-wasm-bindgen", + "serde_urlencoded", + "thiserror", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-net" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66b4e3c7d9ed8d315fd6b97c8b1f74a7c6ecbbc2320e65ae7ed38b7068cc620" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils 0.1.7", + "http 0.2.12", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-net" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils 0.2.0", + "http 0.2.12", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-render" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd9306aef67cfd4449823aadcd14e3958e0800aa2183955a309112a84ec7764" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-storage" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6ab60bf5dbfd6f0ed1f7843da31b41010515c745735c970e821945ca91e480" +dependencies = [ + "gloo-utils 0.1.7", + "js-sys", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "gloo-utils" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-worker" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13471584da78061a28306d1359dd0178d8d6fc1c7c80e5e35d27260346e0516a" +dependencies = [ + "anymap2", + "bincode", + "gloo-console", + "gloo-utils 0.1.7", + "js-sys", + "serde", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "h2" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "handlebars" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab283476b99e66691dee3f1640fea91487a8d81f50fb5ecc75538f8f8879a1e4" +dependencies = [ + "log", + "pest", + "pest_derive", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.8", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash 0.8.11", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692eaaf7f7607518dd3cef090f1474b61edc5301d8012f09579920df68b725ee" +dependencies = [ + "hashbrown 0.14.3", +] + +[[package]] +name = "heck" +version = "0.4.1" +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.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ce4ef31cda248bbdb6e6820603b82dfcd9e833db65a43e997a0ccec777d11fe" + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.12", + "hyper 0.14.28", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "id3" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79f41f7e5ad125c63d55b112a98afb753742fa7f97692bfbbc52544b89e1ff1f" +dependencies = [ + "bitflags 2.4.2", + "byteorder", + "flate2", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "2.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", +] + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "internment" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e976188335292f66a1533fd41d5c2ce24b32dc2c000569b8dccf4e57f489806" +dependencies = [ + "hashbrown 0.12.3", + "parking_lot", +] + +[[package]] +name = "interprocess-docfix" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b84ee245c606aeb0841649a9288e3eae8c61b853a8cd5c0e14450e96d53d28f" +dependencies = [ + "blocking", + "cfg-if", + "futures-core", + "futures-io", + "intmap", + "libc", + "once_cell", + "rustc_version", + "spinning", + "thiserror", + "to_method", + "winapi", +] + +[[package]] +name = "intmap" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" + +[[package]] +name = "inventory" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "isolang" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe50d48c77760c55188549098b9a7f6e37ae980c586a24693d6b01c3b2010c3c" +dependencies = [ + "phf 0.11.2", + "serde", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.4.2", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "krates" +version = "0.16.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b315eaab6cde3e2bcbd21810067a7b8bf4ced8cc63683ab7a96b18360c4e9df9" +dependencies = [ + "cargo_metadata", + "cfg-expr", + "petgraph", + "semver", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lending-iterator" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc07588c853b50689205fb5c00498aa681d89828e0ce8cbd965ebc7a5d8ae260" +dependencies = [ + "extension-traits", + "lending-iterator-proc_macros", + "macro_rules_attribute", + "never-say-never", + "nougat", + "polonius-the-crab", +] + +[[package]] +name = "lending-iterator-proc_macros" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5445dd1c0deb1e97b8a16561d17fc686ca83e8411128fb036e9668a72d51b1d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "longest-increasing-subsequence" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3bd0dd2cd90571056fdb71f6275fada10131182f84899f4b2a916e565d81d86" + +[[package]] +name = "lru" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown 0.14.3", +] + +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "macro_rules_attribute" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf0c9b980bf4f3a37fd7b1c066941dd1b1d0152ce6ee6e8fe8c49b9f6810d862" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58093314a45e00c77d5c508f76e77c3396afbbc0d01506e7fae47b018bac2b1d" + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf 0.10.1", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "metaflac" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1470d3cc1bb0d692af5eb3afb594330b8ba09fd91c32c4e1c6322172a5ba750" +dependencies = [ + "byteorder", + "hex", + "log", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mp4ameta" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb23d62e8eb5299a3f79657c70ea9269eac8f6239a76952689bcd06a74057e81" +dependencies = [ + "lazy_static", + "mp4ameta_proc", +] + +[[package]] +name = "mp4ameta_proc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07dcca13d1740c0a665f77104803360da0bdb3323ecce2e93fa2c959a6d52806" + +[[package]] +name = "multer" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15d522be0a9c3e46fd2632e272d178f56387bdb5c9fbb3a36c649062e9b5219" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http 1.1.0", + "httparse", + "log", + "memchr", + "mime", + "spin", + "version_check", +] + +[[package]] +name = "never-say-never" +version = "6.6.666" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf5a574dadd7941adeaa71823ecba5e28331b8313fb2e1c6a5c7e5981ea53ad6" + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nougat" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b57b9ced431322f054fc673f1d3c7fa52d80efd9df74ad2fc759f044742510" +dependencies = [ + "macro_rules_attribute", + "nougat-proc_macros", +] + +[[package]] +name = "nougat-proc_macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c84f77a45e99a2f9b492695d99e1c23844619caa5f3e57647cffacad773ca257" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +dependencies = [ + "num-traits", +] + +[[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-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "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", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-float" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" +dependencies = [ + "num-traits", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "paragraph-breaker" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3365bc53d974e212e903f93bb377be189c8f9ae3409fbbb60e5f284dfd73d3" + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "peg" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "400bcab7d219c38abf8bd7cc2054eb9bbbd4312d66f6a5557d572a203f646f61" +dependencies = [ + "peg-macros", + "peg-runtime", +] + +[[package]] +name = "peg-macros" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46e61cce859b76d19090f62da50a9fe92bab7c2a5f09e183763559a2ac392c90" +dependencies = [ + "peg-runtime", + "proc-macro2", + "quote", +] + +[[package]] +name = "peg-runtime" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "pest_meta" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator", + "phf_shared 0.10.0", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "polonius-the-crab" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a69ee997a6282f8462abf1e0d8c38c965e968799e912b3bed8c9e8a28c2f9f" + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "prettyplease" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +dependencies = [ + "proc-macro2", + "syn 2.0.52", +] + +[[package]] +name = "proc-macro2" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "readme-rustdocifier" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08ad765b21a08b1a8e5cdce052719188a23772bcbefb3c439f0baaf62c56ceac" + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "relative-path" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" +dependencies = [ + "serde", +] + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "system-configuration", + "tokio", + "tokio-rustls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg", +] + +[[package]] +name = "reqwest" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d66674f2b6fb864665eea7a3c1ac4e3dfacd2fda83cf6f935a612e01b0e3338" +dependencies = [ + "base64", + "bytes", + "futures-core", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "tokio", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "reqwest-eventsource" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f03f570355882dd8d15acc3a313841e6e90eddbc76a93c748fd82cc13ba9f51" +dependencies = [ + "eventsource-stream", + "futures-core", + "futures-timer", + "mime", + "nom", + "pin-project-lite", + "reqwest 0.11.27", + "thiserror", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rusqlite" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +dependencies = [ + "bitflags 2.4.2", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rust-stemmers" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "secrecy" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" +dependencies = [ + "serde", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +dependencies = [ + "serde", +] + +[[package]] +name = "send_wrapper" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" +dependencies = [ + "futures-core", +] + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float 2.10.1", + "serde", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "serde_json" +version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_qs" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c" +dependencies = [ + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] +name = "serde_repr" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "server_fn" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2955da1dc5fcd970c182ebf1089af6c5f19051e1f286a21f7b96490a49b7a531" +dependencies = [ + "axum", + "bytes", + "const_format", + "dashmap", + "futures", + "gloo-net 0.5.0", + "http 1.1.0", + "http-body-util", + "hyper 1.2.0", + "inventory", + "js-sys", + "once_cell", + "send_wrapper", + "serde", + "serde_json", + "serde_qs", + "server_fn_macro_default", + "thiserror", + "tower", + "tower-layer", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "xxhash-rust", +] + +[[package]] +name = "server_fn_macro" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adfdd051ef905fdb3da20942b0c52d536158d7489a724e14cc2fd47323e7ca91" +dependencies = [ + "const_format", + "convert_case", + "proc-macro2", + "quote", + "syn 2.0.52", + "xxhash-rust", +] + +[[package]] +name = "server_fn_macro_default" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "060af1def72353a779fcc184c53e1965d3055a38b9e827f2259b2bff2d9c371e" +dependencies = [ + "server_fn_macro", + "syn 2.0.52", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "sledgehammer_bindgen" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcfaf791ff02f48f3518ce825d32cf419c13a43c1d8b1232f74ac89f339c46d2" +dependencies = [ + "sledgehammer_bindgen_macro", + "wasm-bindgen", +] + +[[package]] +name = "sledgehammer_bindgen_macro" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdd941cc539bd3dc694edaf9d0c4e1221d02baa67c6b45ec04fad1024d9e8139" +dependencies = [ + "quote", + "syn 2.0.52", +] + +[[package]] +name = "sledgehammer_utils" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f20798defa0e9d4eff9ca451c7f84774c7378a9c3b5a40112cfa2b3eadb97ae2" +dependencies = [ + "lru", + "once_cell", + "rustc-hash", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spinning" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b" +dependencies = [ + "lock_api", +] + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + +[[package]] +name = "substudy" +version = "0.6.10" +dependencies = [ + "anyhow", + "async-openai", + "async-trait", + "audiotags", + "bincode", + "bytemuck", + "cast", + "chardet", + "clap", + "cli_test_dir", + "csv", + "diff", + "difference", + "dirs", + "dotenv", + "encoding", + "env_logger", + "futures", + "handlebars", + "indicatif", + "lazy_static", + "lending-iterator", + "log", + "num", + "ordered-float 4.2.0", + "paragraph-breaker", + "peg", + "regex", + "reqwest 0.11.27", + "rusqlite", + "serde", + "serde_json", + "tempfile", + "tokio", + "unicode-width", + "webrtc-vad", + "whatlang", +] + +[[package]] +name = "substudy-ui" +version = "0.1.0" +dependencies = [ + "ammonia", + "anyhow", + "dioxus", + "dotenv", + "serde", + "serde_json", + "tracing-subscriber", + "tracing-wasm", + "uuid", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tar" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "to_method" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" + +[[package]] +name = "tokio" +version = "1.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "futures-util", + "hashbrown 0.14.3", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +dependencies = [ + "bitflags 2.4.2", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "http-range-header", + "httpdate", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-wasm" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07" +dependencies = [ + "tracing", + "tracing-subscriber", + "wasm-bindgen", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.52", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webrtc-vad" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a1e40fd6ca90be95459152a2537f2ba4286ee1b13073f7ebcaa74fc94e3008" +dependencies = [ + "cc", +] + +[[package]] +name = "whatlang" +version = "0.16.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "471d1c1645d361eb782a1650b1786a8fb58dd625e681a04c09f5ff7c8764a7b0" +dependencies = [ + "hashbrown 0.14.3", + "once_cell", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "xxhash-rust" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" + +[[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", + "syn 2.0.52", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/by-name/su/substudy/package.nix b/pkgs/by-name/su/substudy/package.nix new file mode 100644 index 0000000000000..55d368fb37494 --- /dev/null +++ b/pkgs/by-name/su/substudy/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + + ffmpeg, + makeWrapper, +}: + +rustPlatform.buildRustPackage rec { + pname = "substudy"; + version = "0.6.10"; + + src = fetchFromGitHub { + owner = "emk"; + repo = "subtitles-rs"; + rev = "${pname}_v${version}"; + hash = "sha256-ACYbSQKaOJ2hS8NbOAppfKo+Mk3CKg0OAwb56AH42Zs="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "async-openai-0.19.1" = "sha256-UrWSZW3LxMZfinmQAjouhqTrhVhHkjgz9EzrZxR0qG4="; + }; + }; + + nativeBuildInputs = [ makeWrapper ]; + + nativeCheckInputs = [ ffmpeg ]; + + cargoBuildFlags = [ "-p substudy" ]; + + preCheck = '' + # That's to make sure the `test_ai_request_static` + # test has access to the cache at `$HOME/.cache` + export HOME=$(mktemp -d) + ''; + + postFixup = '' + wrapProgram "$out/bin/substudy" \ + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} + ''; + + meta = with lib; { + description = "Learn foreign languages using audio and subtitles extracted from video files"; + homepage = "http://www.randomhacks.net/substudy"; + license = licenses.asl20; + mainProgram = "substudy"; + maintainers = with maintainers; [ paveloom ]; + }; +} diff --git a/pkgs/by-name/su/supermariowar/package.nix b/pkgs/by-name/su/supermariowar/package.nix new file mode 100644 index 0000000000000..2da3cc58dc42c --- /dev/null +++ b/pkgs/by-name/su/supermariowar/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + enet, + yaml-cpp, + SDL2, + SDL2_image, + SDL2_mixer, + zlib, + unstableGitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "supermariowar"; + version = "2.0-unstable-2024-06-22"; + + src = fetchFromGitHub { + owner = "mmatyas"; + repo = "supermariowar"; + rev = "e646679c119a3b6c93c48e505564e8d24441fe4e"; + hash = "sha256-bA/Pu47Rm1MrnJHIrRvOevI3LXj207GFcJloP94/LOA="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + enet + yaml-cpp + SDL2 + SDL2_image + SDL2_mixer + zlib + ]; + + cmakeFlags = [ "-DBUILD_STATIC_LIBS=OFF" ]; + + postInstall = '' + mkdir -p $out/bin + + for app in smw smw-leveledit smw-worldedit; do + chmod +x $out/games/$app + + cat << EOF > $out/bin/$app + $out/games/$app --datadir $out/share/games/smw + EOF + chmod +x $out/bin/$app + done + + ln -s $out/games/smw-server $out/bin/smw-server + ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { + description = "A fan-made multiplayer Super Mario Bros. style deathmatch game"; + homepage = "https://github.com/mmatyas/supermariowar"; + changelog = "https://github.com/mmatyas/supermariowar/blob/${finalAttrs.src.rev}/CHANGELOG"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "smw"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/sv/svix-cli/package.nix b/pkgs/by-name/sv/svix-cli/package.nix new file mode 100644 index 0000000000000..8cefce2bffeb3 --- /dev/null +++ b/pkgs/by-name/sv/svix-cli/package.nix @@ -0,0 +1,39 @@ +{ lib, fetchFromGitHub, fetchpatch, buildGoModule }: + +buildGoModule rec { + version = "0.21.1"; + pname = "svix-cli"; + revision = "v${version}"; + + src = fetchFromGitHub { + owner = "svix"; + repo = pname; + rev = revision; + hash = "sha256-bHcxhJs4Nu/hdiftQFZMx4M5iqFtpOzrsvXOgo9NlDc="; + }; + + vendorHash = "sha256-qSzEpxktdAV+mHa+586mKvpclCpXR6sE7HNcPZywd4s="; + + # Increase minimum go version to 1.17 as the build fails with 1.16 + # due to modules requiring code that was introduced in 1.17 + # PR submitted upstream: https://github.com/svix/svix-cli/pull/103 + patches = [ + (fetchpatch { + name = "increase-minimum-go.patch"; + url = "https://github.com/svix/svix-cli/commit/3c6fc06f72bd7e43165c31019b206ebad175d758.patch"; + hash = "sha256-OwiyBZ3IZGkvo6zEZY1+XYFrqT+RseqTJ5xwCl3LtVg="; + }) + ]; + + subPackages = [ "." ]; + + ldflags = + [ "-s" "-w" "-X github.com/svix/svix-cli/version.Version=v${version}" ]; + + meta = with lib; { + description = "A CLI for interacting with the Svix API"; + homepage = "https://github.com/svix/svix-cli/"; + license = licenses.gpl3; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix index b369a45869514..1844e08ddf8bd 100644 --- a/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/pkgs/by-name/te/technitium-dns-server/package.nix @@ -8,13 +8,13 @@ let technitium-library = buildDotnetModule rec { pname = "TechnitiumLibrary"; - version = "40a7bc7a52cf5d2c371215ea7f5f6fdf71dc1d9c"; + version = "570ec570b57d8591daa3df682ca9e6f37f373db6"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "TechnitiumLibrary"; rev = version; - hash = "sha256-FNCZH8LZXYyrz5SRIV8P7MruN+t6Qvl96Aa73q3InMI="; + hash = "sha256-xPwRoRp/XYrlGX3B9EiHUz2Tueh+hygbBopxFvdASLQ"; name = "${pname}-${version}"; }; @@ -30,13 +30,13 @@ let in buildDotnetModule rec { pname = "technitium-dns-server"; - version = "12.1"; + version = "12.2.1"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "DnsServer"; rev = "refs/tags/v${version}"; - hash = "sha256-TfVWGomvKV7QeJUyFMNDAnHKY3YTEwWPxTlW6RhmsR4="; + hash = "sha256-2RB/pUlA9z7TJ4xd509nsbO1BnxY3mv2jou6OGRd/yM="; name = "${pname}-${version}"; }; diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix index 042c389ac42e3..800bea1565501 100644 --- a/pkgs/by-name/te/tenv/package.nix +++ b/pkgs/by-name/te/tenv/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tenv"; - version = "2.0.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; rev = "v${version}"; - hash = "sha256-654ZaQ7KzAWEXwN9Xwzdmg4KsCCLCm+i2M0730gP/zM="; + hash = "sha256-9wY+9lAbrnwiXpLilMaqtQz0XmMGRMv+m+yR7BxmSsw="; }; - vendorHash = "sha256-OrMCzqqOFQkI8IwcfO/JVPyd/sw+Ud0VySV7UPiucwc="; + vendorHash = "sha256-v1NWlZhfypoS+bZCtr+P2s1t4qYVncbjx9IyRhi2sa4="; # Tests disabled for requiring network access to release.hashicorp.com doCheck = false; diff --git a/pkgs/by-name/th/thc-secure-delete/package.nix b/pkgs/by-name/th/thc-secure-delete/package.nix new file mode 100644 index 0000000000000..03539ffcb488e --- /dev/null +++ b/pkgs/by-name/th/thc-secure-delete/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "thc-secure-delete"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "gordrs"; + repo = "thc-secure-delete"; + rev = "v${finalAttrs.version}"; + hash = "sha256-hvWuxFkzhOSCplPtyjRtn36bIk6KdPBcpr3lAmiAyfE="; + }; + + nativeBuildInputs = [ pkg-config installShellFiles ]; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + installPhase = '' + runHook preInstall + + install -Dt $out/bin/ -m755 srm sdmem sswap sfill + installManPage *.1 + + runHook postInstall + ''; + + meta = with lib; { + description = "THC's Secure Delete tools"; + homepage = "https://github.com/gordrs/thc-secure-delete"; + changelog = "https://github.com/gordrs/thc-secure-delete/blob/v${finalAttrs.version}/CHANGES"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ tochiaha ]; + mainProgram = "srm"; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 247d6180b0d0b..9d776e1632729 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.11.27"; + version = "0.11.28"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "refs/tags/v${version}"; - hash = "sha256-7c2WbAEDdCmh92MXBks0AjYEEKfVFVIgU+U2x5K2jLQ="; + hash = "sha256-U3A3ye45o8q+Kvv2lJqJ72Vn/Q9iPgUkwpA79DAHU2k="; }; - cargoHash = "sha256-EkMa5mudKaiGtMN2jhQ0PWZlpkpnYZUPXLAJng9+Kes="; + cargoHash = "sha256-A13nVLvjhoAPGIXfQX6AE+zMuvT7QT7BWJVS6ASnw10="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 098c8c4f96d5b..0c6f291835a5a 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "1.0-unstable-2024-06-14"; + version = "1.0-unstable-2024-06-15"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "07112d8f264ecb423a9cadf403c224a8a0eac3cb"; - hash = "sha256-AMqMeiJsRsoZKOEZVLojgeaaUiyulacwiNFIKUCwhFk="; + rev = "1c74aa173147b19135f1bf21af5fb30f9b76e02d"; + hash = "sha256-xhMXDAc/laQKZtYBFvFSyVtJv5AkvugV8olHmB6Mt4g="; }; outputs = [ "out" "projects" ]; diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 2f6d03ddea88b..622d042e73026 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -1,36 +1,55 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, + withServer ? true, # the actual metrics server + withVmAgent ? true, # Agent to collect metrics + withVmAlert ? true, # Alert Manager + withVmAuth ? true, # HTTP proxy for authentication + withBackupTools ? true, # vmbackup, vmrestore + withVmctl ? true, # vmctl is used to migrate time series + withVictoriaLogs ? true, # logs server +}: buildGoModule rec { pname = "VictoriaMetrics"; version = "1.101.0"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "VictoriaMetrics"; + repo = "VictoriaMetrics"; rev = "v${version}"; hash = "sha256-Jjz/CbVCvc9NFbvzYTFthG8cov4pYpc6y1A1Kmd3Mjg="; }; vendorHash = null; - subPackages = [ - "app/victoria-logs" - "app/victoria-metrics" - "app/vlinsert" - "app/vlselect" - "app/vlstorage" - "app/vmagent" - "app/vmalert-tool" - "app/vmalert" - "app/vmauth" - "app/vmctl" - "app/vminsert" - "app/vmselect" - "app/vmstorage" - "app/vmbackup" - "app/vmrestore" - "app/vmui" - ]; + subPackages = + lib.optionals withServer [ + "app/victoria-metrics" + "app/vminsert" + "app/vmselect" + "app/vmstorage" + "app/vmui" + ] + ++ lib.optionals withVmAgent [ "app/vmagent" ] + ++ lib.optionals withVmAlert [ + "app/vmalert" + "app/vmalert-tool" + ] + ++ lib.optionals withVmAuth [ "app/vmauth" ] + ++ lib.optionals withVmctl [ "app/vmctl" ] + ++ lib.optionals withBackupTools [ + "app/vmbackup" + "app/vmrestore" + ] + ++ lib.optionals withVictoriaLogs [ + "app/victoria-logs" + "app/vlinsert" + "app/vlselect" + "app/vlstorage" + ]; postPatch = '' # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package @@ -46,7 +65,11 @@ buildGoModule rec { --replace "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \ ''; - ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" + ]; preCheck = '' # `lib/querytracer/tracer_test.go` expects `buildinfo.Version` to be unset @@ -55,13 +78,21 @@ buildGoModule rec { __darwinAllowLocalNetworking = true; - passthru.tests = { inherit (nixosTests) victoriametrics; }; + passthru.tests = { + inherit (nixosTests) victoriametrics; + }; meta = with lib; { homepage = "https://victoriametrics.com/"; description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; license = licenses.asl20; - maintainers = with maintainers; [ yorickvp ivan ]; + maintainers = with maintainers; [ + yorickvp + ivan + nullx76 + leona + shawn8901 + ]; changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}"; mainProgram = "victoria-metrics"; }; diff --git a/pkgs/by-name/vm/vmagent/package.nix b/pkgs/by-name/vm/vmagent/package.nix new file mode 100644 index 0000000000000..de62ddd2d3863 --- /dev/null +++ b/pkgs/by-name/vm/vmagent/package.nix @@ -0,0 +1,12 @@ +{ lib, victoriametrics }: +lib.addMetaAttrs { mainProgram = "vmagent"; } ( + victoriametrics.override { + withServer = false; + withVictoriaLogs = false; + withVmAlert = false; + withVmAuth = false; + withBackupTools = false; + withVmctl = false; + withVmAgent = true; + } +) diff --git a/pkgs/by-name/vm/vmctl/package.nix b/pkgs/by-name/vm/vmctl/package.nix new file mode 100644 index 0000000000000..910ecd5f9d6d6 --- /dev/null +++ b/pkgs/by-name/vm/vmctl/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + openssh, + socat, + gawk, + cloud-utils, + cdrtools, + qemu, + qemu-utils, + coreutils, + getopt, + makeWrapper, +}: + +stdenvNoCC.mkDerivation { + pname = "vmctl"; + version = "v0.99-unstable-2024-05-14"; + + src = fetchFromGitHub { + owner = "SamsungDS"; + repo = "vmctl"; + rev = "5b6b7084b8cba06b474c0e020df965237f2c832c"; + hash = "sha256-yDgaY2RJXBjWkMSQb4JaJzMGLFzowfOGixSRzzv2iIk="; + }; + + dontBuild = true; + + postPatch = '' + substituteInPlace vmctl \ + --replace 'BASEDIR="$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")"' 'BASEDIR="${placeholder "out"}"' + ''; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm555 vmctl -t "$out/bin" + wrapProgram "$out/bin/vmctl" \ + --set PATH "${ + lib.makeBinPath [ + openssh + socat + gawk + cloud-utils + cdrtools + qemu + qemu-utils + coreutils + getopt + ] + }" + cp -r {cmd,common,contrib,lib} $out + + runHook postInstall + ''; + + meta = { + description = "Command line tool focused on NVMe testing in QEMU"; + homepage = "https://github.com/SamsungDS/vmctl"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ panky ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; +} diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix index f68f070465a74..0c147beaa7b18 100644 --- a/pkgs/by-name/we/webcord/package.nix +++ b/pkgs/by-name/we/webcord/package.nix @@ -55,7 +55,7 @@ buildNpmPackage rec { # Add xdg-utils to path via suffix, per PR #181171 makeWrapper '${lib.getExe electron}' $out/bin/webcord \ --suffix PATH : "${binPath}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --add-flags $out/lib/node_modules/webcord/ runHook postInstall diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix index 2c6e389cc87bd..cf794ea444737 100644 --- a/pkgs/by-name/wi/wiremock/package.nix +++ b/pkgs/by-name/wi/wiremock/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wiremock"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar"; - hash = "sha256-tLOiGl5/HuDbhrRyu+xZ6lL408n85MXl63lecGgok9w="; + hash = "sha256-8nP+Qv+QZjyG0VcaBd22UIiEYsfPq/D13c+KT2700Vk="; }; dontUnpack = true; diff --git a/pkgs/by-name/yo/yourkit-java/forbid-desktop-item-creation b/pkgs/by-name/yo/yourkit-java/forbid-desktop-item-creation new file mode 100644 index 0000000000000..df068b97d1944 --- /dev/null +++ b/pkgs/by-name/yo/yourkit-java/forbid-desktop-item-creation @@ -0,0 +1,16 @@ +CONFIG_DIR=$YS/config +if [ ! -d $CONFIG_DIR ]; then + mkdir -p $CONFIG_DIR +fi + +REGISTRY=$CONFIG_DIR/registry8.xml +if [ ! -e $REGISTRY ]; then + cat >$REGISTRY <<EOF +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<registry8> + <desktop-file.created> + <boolean value="true"/> + </desktop-file.created> +</registry8> +EOF +fi diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix new file mode 100644 index 0000000000000..b2d5451a93131 --- /dev/null +++ b/pkgs/by-name/yo/yourkit-java/package.nix @@ -0,0 +1,95 @@ +{ fetchzip +, lib +, stdenvNoCC +, copyDesktopItems +, imagemagick +, makeDesktopItem +, jre +}: +let + vPath = v: lib.elemAt (lib.splitString "-" v) 0; + + version = "2024.3-b157"; + + arches = { + aarch64-linux = "arm64"; + x86_64-linux = "x64"; + }; + + arch = + arches.${stdenvNoCC.targetPlatform.system} or (throw "Unsupported system"); + + hashes = { + arm64 = "sha256-0a9maZhgtXH21Ph0o3Rb+rCPhAmZRxjZCRyDmTvusLk="; + x64 = "sha256-nLaOOkPG2QEHkHd0S2AYLT2IpkMchGw9adyUDLCNQFg="; + }; + + desktopItem = makeDesktopItem { + name = "YourKit Java Profiler"; + desktopName = "YourKit Java Profiler " + version; + type = "Application"; + exec = "yourkit-java-profiler %f"; + icon = "yourkit-java-profiler"; + categories = [ "Development" "Java" "Profiling" ]; + terminal = false; + startupWMClass = "YourKit Java Profiler"; + }; +in +stdenvNoCC.mkDerivation { + inherit version; + + pname = "yourkit-java"; + + src = fetchzip { + url = "https://download.yourkit.com/yjp/${vPath version}/YourKit-JavaProfiler-${version}-${arch}.zip"; + hash = hashes.${arch}; + }; + + nativeBuildInputs = [ copyDesktopItems imagemagick ]; + + buildInputs = [ jre ]; + + desktopItems = [ desktopItem ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -pr bin lib license.html license-redist.txt probes samples $out + cp ${./forbid-desktop-item-creation} $out/bin/forbid-desktop-item-creation + mv $out/bin/profiler.sh $out/bin/yourkit-java-profiler + mkdir -p $out/share/icons + convert $out/bin/profiler.ico\[0] \ + -size 256x256 \ + $out/share/icons/yourkit-java-profiler.png + rm $out/bin/profiler.ico + rm -rf $out/bin/{windows-*,mac,linux-{*-32,musl-*,ppc-*}} + if [[ ${arch} = x64 ]]; then + rm -rf $out/bin/linux-arm-64 + else + rm -rf $out/bin/linux-x86-64 + fi + substituteInPlace $out/bin/yourkit-java-profiler \ + --replace 'JAVA_EXE="$YD/jre64/bin/java"' JAVA_EXE=${jre}/bin/java + # Use our desktop item, which will be purged when this package + # gets removed + sed -i -e "/^YD=/isource $out/bin/forbid-desktop-item-creation\\ + " \ + $out/bin/yourkit-java-profiler + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Award winning, fully featured low overhead profiler for Java EE and Java SE platforms"; + homepage = "https://www.yourkit.com"; + changelog = "https://www.yourkit.com/changes/"; + license = licenses.unfree; + mainProgram = "yourkit-java-profiler"; + platforms = attrNames arches; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + maintainers = with maintainers; [ herberteuler ]; + }; +} diff --git a/pkgs/by-name/yo/yourkit-java/update.sh b/pkgs/by-name/yo/yourkit-java/update.sh new file mode 100755 index 0000000000000..0b95732f6b74a --- /dev/null +++ b/pkgs/by-name/yo/yourkit-java/update.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils curl gawk gnused nix-prefetch + +set -euo pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +DRV_BASE=package.nix +NIX_DRV="$ROOT/$DRV_BASE" +if [[ ! -f "$NIX_DRV" ]]; then + echo "ERROR: cannot find $DRV_BASE in $ROOT" + exit 1 +fi + +function retrieve_latest_version () { + curl https://www.yourkit.com/java/profiler/download/ \ + | grep -Eo '(Version|Build): ([a-z0-9#.-])+' \ + | awk '{ print $2 }' \ + | tr -d '\n' \ + | sed 's/#/-b/' +} + +function calc_hash () { + local version=$1 + local url=$2 + nix-prefetch --option extra-experimental-features flakes \ + "{ stdenv, fetchzip }: +stdenv.mkDerivation { + pname = \"yourkit-java-binary\"; + version = \"$version\"; + src = fetchzip { + url = \"$url\"; + }; +}" +} + +function update_hash () { + local arch=$1 + local version=$2 + local date=$(echo $version | sed 's/-.*//') + local url=https://download.yourkit.com/yjp/$date/YourKit-JavaProfiler-$version-$arch.zip + local hash=$(calc_hash $version $url) + sed -i -e "s|^.*$arch.*=.*\"sha256-.*$| $arch = \"$hash\";|" $NIX_DRV +} + +version=$(retrieve_latest_version) +sed -i -e "s|^.*version.*=.*\".*$| version = \"$version\";|" $NIX_DRV +for arch in arm64 x64; do + update_hash $arch $version +done + +# Local variables: +# mode: shell-script +# eval: (sh-set-shell "bash") +# End: diff --git a/pkgs/common-updater/generic-updater.nix b/pkgs/common-updater/generic-updater.nix index 25008d664b93c..2f8da2f308e60 100644 --- a/pkgs/common-updater/generic-updater.nix +++ b/pkgs/common-updater/generic-updater.nix @@ -1,4 +1,12 @@ -{ stdenv, writeScript, coreutils, gnugrep, gnused, common-updater-scripts, nix }: +{ lib +, stdenv +, common-updater-scripts +, coreutils +, gnugrep +, gnused +, nix +, writeScript +}: { name ? null , pname ? null @@ -15,6 +23,9 @@ let # where to print git commands and debugging messages fileForGitCommands = "update-git-commits.txt"; + grep = lib.getExe gnugrep; + sed = lib.getExe gnused; + # shell script to update package updateScript = writeScript "generic-update-script.sh" '' #! ${stdenv.shell} @@ -41,20 +52,20 @@ let function version_is_ignored() { local tag="$1" - [ -n "$ignored_versions" ] && grep -E "$ignored_versions" <<< "$tag" + [ -n "$ignored_versions" ] && ${grep} -E "$ignored_versions" <<< "$tag" } function version_is_unstable() { local tag="$1" local enforce="$2" if [ -n "$odd_unstable" -o -n "$enforce" ]; then - local minor=$(echo "$tag" | ${gnused}/bin/sed -rne 's,^[0-9]+\.([0-9]+).*,\1,p') + local minor=$(echo "$tag" | ${sed} -rne 's,^[0-9]+\.([0-9]+).*,\1,p') if [ $((minor % 2)) -eq 1 ]; then return 0 fi fi if [ -n "$patchlevel_unstable" -o -n "$enforce" ]; then - local patchlevel=$(echo "$tag" | ${gnused}/bin/sed -rne 's,^[0-9]+\.[0-9]+\.([0-9]+).*$,\1,p') + local patchlevel=$(echo "$tag" | ${sed} -rne 's,^[0-9]+\.[0-9]+\.([0-9]+).*$,\1,p') if ((patchlevel >= 90)); then return 0 fi @@ -71,10 +82,10 @@ let # cut any revision prefix not used in the NixOS package version if [ -n "$rev_prefix" ]; then - tags=$(echo "$tags" | ${gnugrep}/bin/grep "^$rev_prefix") - tags=$(echo "$tags" | ${gnused}/bin/sed -e "s,^$rev_prefix,,") + tags=$(echo "$tags" | ${grep} "^$rev_prefix") + tags=$(echo "$tags" | ${sed} -e "s,^$rev_prefix,,") fi - tags=$(echo "$tags" | ${gnugrep}/bin/grep "^[0-9]") + tags=$(echo "$tags" | ${grep} "^[0-9]") # sort the tags in decreasing order tags=$(echo "$tags" | ${coreutils}/bin/sort --reverse --version-sort) diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix index 96cf66197fe17..ccf899eba630c 100644 --- a/pkgs/data/themes/alacritty-theme/default.nix +++ b/pkgs/data/themes/alacritty-theme/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (self: { pname = "alacritty-theme"; - version = "0-unstable-2024-05-03"; + version = "0-unstable-2024-06-17"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "94e1dc0b9511969a426208fbba24bd7448493785"; - hash = "sha256-bPup3AKFGVuUC8CzVhWJPKphHdx0GAc62GxWsUWQ7Xk="; + rev = "a4041aeea19d425b63f7ace868917da26aa189bd"; + hash = "sha256-A5Xlu6kqB04pbBWMi2eL+pp6dYi4MzgZdNVKztkJhcg="; }; dontConfigure = true; diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 35a7a2247f5a1..a548b8a6503dd 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -160,16 +160,17 @@ stdenv.mkDerivation rec { {} + pushd ./files/usr/share/cinnamon/cinnamon-settings - substituteInPlace ./bin/capi.py --replace '"/usr/lib"' '"${cinnamon-control-center}/lib"' - substituteInPlace ./bin/SettingsWidgets.py --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds" - substituteInPlace ./bin/Spices.py --replace "subprocess.run(['/usr/bin/" "subprocess.run(['" \ - --replace 'subprocess.run(["/usr/bin/' 'subprocess.run(["' \ - --replace "msgfmt" "${gettext}/bin/msgfmt" - substituteInPlace ./modules/cs_info.py --replace "lspci" "${pciutils}/bin/lspci" - substituteInPlace ./modules/cs_themes.py --replace "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d" + substituteInPlace ./bin/capi.py --replace-fail '"/usr/lib"' '"${cinnamon-control-center}/lib"' + substituteInPlace ./bin/SettingsWidgets.py --replace-fail "/usr/share/sounds" "/run/current-system/sw/share/sounds" + substituteInPlace ./bin/Spices.py --replace-fail "subprocess.run(['/usr/bin/" "subprocess.run(['" \ + --replace-fail 'subprocess.run(["/usr/bin/' 'subprocess.run(["' \ + --replace-fail "msgfmt" "${gettext}/bin/msgfmt" + substituteInPlace ./modules/cs_info.py --replace-fail "lspci" "${pciutils}/bin/lspci" + substituteInPlace ./modules/cs_themes.py --replace-fail "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d" popd - sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} + substituteInPlace ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} \ + --replace-fail "exec cinnamon-session" "exec ${cinnamon-session}/bin/cinnamon-session" patchShebangs src/data-to-c.pl ''; diff --git a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix index d0feadedbf338..9870ed046d34b 100644 --- a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix +++ b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix @@ -7,14 +7,14 @@ stdenvNoCC.mkDerivation rec { pname = "folder-color-switcher"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # They don't really do tags, this is just a named commit. - rev = "18102c72ba072cd83ccee69e9051e87e93cab01a"; - sha256 = "sha256-o2+KfHwPvoqDMBa9C/Sm/grDf0GWcjx2OtT4rhnCk5Q="; + rev = "35aa5b9839935fc3415ba6b7c77171459e7325fa"; + sha256 = "sha256-2ItjQ3CO1kG2QdAEqNxlrZ1AOfHmUBCE99kLalU7AUc="; }; nativeBuildInputs = [ @@ -41,12 +41,9 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - preFixup = '' - # For Gdk.cairo_surface_create_from_pixbuf() - # TypeError: Couldn't find foreign struct converter for 'cairo.Surface' - buildPythonPath ${python3.pkgs.pycairo} - patchPythonScript $out/share/nemo-python/extensions/nemo-folder-color-switcher.py - ''; + # For Gdk.cairo_surface_create_from_pixbuf() + # TypeError: Couldn't find foreign struct converter for 'cairo.Surface' + passthru.nemoPythonExtensionDeps = [ python3.pkgs.pycairo ]; meta = with lib; { homepage = "https://github.com/linuxmint/folder-color-switcher"; diff --git a/pkgs/desktops/cinnamon/mint-l-icons/default.nix b/pkgs/desktops/cinnamon/mint-l-icons/default.nix index 1fa0dd74242d9..6a3956e53ca96 100644 --- a/pkgs/desktops/cinnamon/mint-l-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-l-icons/default.nix @@ -9,13 +9,14 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-icons"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - rev = version; - hash = "sha256-nVdx+d+KpTh9EPLhW0+FFzq3OEyacDSxHgllMm51BKk="; + # https://github.com/linuxmint/mint-l-icons/issues/11 + rev = "f5edf5683c7e7e51da2c0e66a9a288d5342edc63"; + hash = "sha256-MKrynS9W5kHRwCKwkXMsUx43KIhtGMaYYWhb/j+vDpk="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-l-theme/default.nix b/pkgs/desktops/cinnamon/mint-l-theme/default.nix index 7d5b84dd8ca07..a9a8a5bd68503 100644 --- a/pkgs/desktops/cinnamon/mint-l-theme/default.nix +++ b/pkgs/desktops/cinnamon/mint-l-theme/default.nix @@ -8,14 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-theme"; - version = "1.9.6"; + version = "1.9.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - # They don't really do tags, this is just a named commit. - rev = "1444bacf3ff470db05b663b9c5c3a3419decba60"; - hash = "sha256-n+5PMfNUNJrVSvCXiFdiRQrq6A6WPINcT110J8OV6FQ="; + rev = version; + hash = "sha256-pgb1lkrBRDYgfrLx0/afEuTz+5gZt/IG1u+dn4V7Spo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index 59d1fb142500e..e1e22781690b4 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -2,25 +2,23 @@ , lib , stdenvNoCC , python3 -, sassc -, sass +, python3Packages }: stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Acf9cwTKDUF1WwIqT3BR8wFpfUNRyZ+8anOIIg3O3CQ="; + hash = "sha256-pakD7qVlivokFlIBNjibOkneS6WV4BBOBePWSOjVVy0="; }; nativeBuildInputs = [ python3 - sassc - sass + python3Packages.libsass ]; preBuild = '' diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix index 8b6f5f07a1c35..f2a872b71e963 100644 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix +++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix @@ -8,7 +8,6 @@ , gtk3 , nemo , python3 -, substituteAll }: let @@ -25,11 +24,8 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/78327 ./load-extensions-from-env.patch - # Required for pygobject_init (). - (substituteAll { - src = ./python-path.patch; - env = "${python3.pkgs.pygobject3}/${python3.sitePackages}"; - }) + # Pick up all passthru.nemoPythonExtensionDeps via nemo-with-extensions wrapper + ./python-path.patch ]; nativeBuildInputs = [ @@ -54,6 +50,8 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; + passthru.nemoPythonExtensionDeps = [ python3.pkgs.pygobject3 ]; + meta = with lib; { homepage = "https://github.com/linuxmint/nemo-extensions/tree/master/nemo-python"; description = "Python bindings for the Nemo extension library"; diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch index bf6db93385c8a..62a6a7043076c 100644 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch +++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch @@ -7,7 +7,7 @@ index 8d2acdb..ee24143 100644 debug("Sanitize the python search path"); - PyRun_SimpleString("import sys; sys.path = [path for path in sys.path if path]"); -+ PyRun_SimpleString("import sys; sys.path = [path for path in sys.path if path]; sys.path.append('@env@')"); ++ PyRun_SimpleString("import sys; import os; sys.path = [path for path in sys.path if path]; sys.path += os.getenv(\"NEMO_PYTHON_SEARCH_PATH\").split(os.pathsep)"); if (PyErr_Occurred()) { PyErr_Print(); diff --git a/pkgs/desktops/cinnamon/nemo/wrapper.nix b/pkgs/desktops/cinnamon/nemo/wrapper.nix index 604247566b84c..0c9cba55370c8 100644 --- a/pkgs/desktops/cinnamon/nemo/wrapper.nix +++ b/pkgs/desktops/cinnamon/nemo/wrapper.nix @@ -3,12 +3,14 @@ , makeWrapper , nemo , nemoExtensions +, python3 , extensions ? [ ] , useDefaultExtensions ? true }: let selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions nemoExtensions); + nemoPythonExtensionsDeps = lib.concatMap (x: x.nemoPythonExtensionDeps or []) selectedExtensions; in symlinkJoin { name = "nemo-with-extensions-${nemo.version}"; @@ -21,7 +23,8 @@ symlinkJoin { for f in $(find $out/bin/ $out/libexec/ -type l -not -path "*/.*"); do wrapProgram "$f" \ --set "NEMO_EXTENSION_DIR" "$out/${nemo.extensiondir}" \ - --set "NEMO_PYTHON_EXTENSION_DIR" "$out/share/nemo-python/extensions" + --set "NEMO_PYTHON_EXTENSION_DIR" "$out/share/nemo-python/extensions" \ + --set "NEMO_PYTHON_SEARCH_PATH" "${python3.pkgs.makePythonPath nemoPythonExtensionsDeps}" done # Don't populate the same nemo actions twice when having this globally installed diff --git a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix index fc0fd4eab8e18..2a1f4cab4aa83 100644 --- a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "deepin-shortcut-viewer"; - version = "5.0.7"; + version = "5.0.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-r/ZhA9yiPnJNTrBkVOvaTqfRvGO/NTod5tiQCquG5Gw="; + sha256 = "sha256-A4LFi0KcqChjgYrO90paMBAivv02TsRjYQ26I0k71x0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix index a8c94910ccfc8..32109c4b6c0af 100644 --- a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "deepin-desktop-theme"; - version = "1.0.9"; + version = "1.0.13"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-rhbxqKT9yrtW4JJ8jCUSpsIh0JeEIttkS414vBhD9vs="; + hash = "sha256-uNeRAsPbgC7IHHBIlczPXhnwZI65Le70D9MsbH+6Fwk="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix index 5260df0ece633..59d82477b1286 100644 --- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "deepin-icon-theme"; - version = "2024.01.31"; + version = "2024.04.16"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-08maujG5Tibsv9N+5olOeD8MrXTRiZh0OQm0bg8t+Cc="; + hash = "sha256-IUiKGHsFGJawWnwfckS8ZeB2WOxDyDlre4oekJuCKcc="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix index b386d0bbeabf5..bb4a2c299ae3f 100644 --- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix @@ -1,45 +1,32 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config -, wrapQtAppsHook -, qtbase +, qt6Packages +, dtk6core }: stdenv.mkDerivation rec { pname = "dde-application-manager"; - version = "1.1.8"; + version = "1.2.13"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-ImyXSyQWMFLvmtx9mBxrr4/IFOgOH1BW650mbiwFh5U="; + hash = "sha256-nyT5bp37gOWKbpPBmLULJmeL9oZyBwIC5vYwPyBLcAc="; }; - patches = [ - (fetchpatch { - name = "set-more-scale-envs-to-application.patch"; - url = "https://github.com/linuxdeepin/dde-application-manager/commit/a1f8ad276d88c81249dd3468779862186a180238.patch"; - hash = "sha256-/iKg6NZZomNEKYsZCZP1IfNr7ZAXiA9RVBnyf+M/f4w="; - }) - (fetchpatch { - name = "support-execSearchPath-to-prevent-systemd-from-finding-binaries.patch"; - url = "https://github.com/linuxdeepin/dde-application-manager/commit/2eaca7c6b8b841d571e9d3510f9f14c321cd976e.patch"; - hash = "sha256-GWUIv4NIBLQpnY4GcjLShMjiXAfPi3zKdol3whchC/Y="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt6Packages.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6Packages.qtbase + dtk6core ]; meta = with lib; { diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix index b244898566e9e..59c09cea1b2f5 100644 --- a/pkgs/desktops/deepin/core/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dde-calendar"; - version = "5.12.1"; + version = "5.13.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-p+KtObh2JT7aPcDCi0jmaNmLqB1aU3IvAiYrGmhErcI="; + hash = "sha256-Hn759Cxtzv+HBllA2vdZcH6P8EWZkjawpgkmLiE2+uA="; }; patches = [ diff --git a/pkgs/desktops/deepin/core/dde-clipboard/default.nix b/pkgs/desktops/deepin/core/dde-clipboard/default.nix index 78f2fd0da6a29..efa6faf080d2a 100644 --- a/pkgs/desktops/deepin/core/dde-clipboard/default.nix +++ b/pkgs/desktops/deepin/core/dde-clipboard/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "dde-clipboard"; - version = "6.0.7"; + version = "6.0.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-6CbCor0vgVMsMt8KY2uWrNqOsBEIaz7s2nViiHz+m1g="; + hash = "sha256-9sBAurO3v/9HOc5k1RrtdNHusImTHLklpxetLMuQuW4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/core/dde-control-center/default.nix b/pkgs/desktops/deepin/core/dde-control-center/default.nix index ffb94b9b52b3f..2f6a8afb9d6a3 100644 --- a/pkgs/desktops/deepin/core/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/core/dde-control-center/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "dde-control-center"; - version = "6.0.44"; + version = "6.0.55"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-NN2CSIYByxeTZraK48lAsQSJYAOTDHzKT1FOa+VWMo0="; + hash = "sha256-dCUtCS7Vmd7LX34JA70P3dgsmSdRefgO//NERhKlRlE="; }; postPatch = '' @@ -61,6 +61,8 @@ stdenv.mkDerivation rec { gtest ]; + env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + cmakeFlags = [ "-DCVERSION=${version}" "-DDISABLE_AUTHENTICATION=YES" diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix index 42d371628b3e0..cfc610420957c 100644 --- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-file-manager/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "dde-file-manager"; - version = "6.0.40"; + version = "6.0.51"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-fvxP6wle4hezt9nEDpTgK+xB4J5XIC0mP5jWCmkjJPA="; + hash = "sha256-MvrOhdejQPK693wFlqkERuwYM88ALtFNnbyu7H3TI4Q="; }; nativeBuildInputs = [ @@ -69,25 +69,25 @@ stdenv.mkDerivation rec { patchShebangs . substituteInPlace src/plugins/filemanager/dfmplugin-vault/utils/vaultdefine.h \ - --replace "/usr/bin/deepin-compressor" "deepin-compressor" + --replace-fail "/usr/bin/deepin-compressor" "deepin-compressor" substituteInPlace src/plugins/filemanager/dfmplugin-avfsbrowser/utils/avfsutils.cpp \ - --replace "/usr/bin/mountavfs" "mountavfs" \ - --replace "/usr/bin/umountavfs" "umountavfs" + --replace-fail "/usr/bin/mountavfs" "mountavfs" \ + --replace-fail "/usr/bin/umountavfs" "umountavfs" substituteInPlace src/plugins/common/core/dfmplugin-menu/{extendmenuscene/extendmenu/dcustomactionparser.cpp,oemmenuscene/oemmenu.cpp} \ - --replace "/usr" "$out" + --replace-fail "/usr" "$out" substituteInPlace src/tools/upgrade/dialog/processdialog.cpp \ - --replace "/usr/bin/dde-file-manager" "dde-file-manager" \ - --replace "/usr/bin/dde-desktop" "dde-desktop" + --replace-fail "/usr/bin/dde-file-manager" "dde-file-manager" \ + --replace-fail "/usr/bin/dde-desktop" "dde-desktop" substituteInPlace src/dfm-base/file/local/localfilehandler.cpp \ - --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" + --replace-fail "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" substituteInPlace src/plugins/desktop/ddplugin-background/backgroundservice.cpp \ src/plugins/desktop/ddplugin-wallpapersetting/wallpapersettings.cpp \ - --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" + --replace-fail "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" find . -type f -regex ".*\\.\\(service\\|policy\\|desktop\\)" -exec sed -i -e "s|/usr/|$out/|g" {} \; ''; diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix new file mode 100644 index 0000000000000..8b653004f27a3 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix @@ -0,0 +1,83 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, qttools +, pkg-config +, wrapQtAppsHook +, dtkwidget +, dde-qt-dbus-factory +, dde-dock +, deepin-pdfium +, qt5integration +, qt5platform-plugins +, taglib +, ffmpeg +, ffmpegthumbnailer +, pcre +, dbus +}: + +stdenv.mkDerivation rec { + pname = "dde-grand-search"; + version = "5.4.9"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + hash = "sha256-WybwV1QIuV7O1SSgQU1ABsMf5QW9KJ95YyIa8Tz8pJ0="; + }; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + dde-dock + dde-qt-dbus-factory + deepin-pdfium + qt5integration + qt5platform-plugins + taglib + ffmpeg + ffmpegthumbnailer + pcre + ]; + + patches = [ + # This patch revert the commit e6735e7 + # FIXME: why StartManager can't work, is dde-api-proxy still required? + ./fix-dbus-path-for-daemon.diff + ./patch-check-v23-interface.diff + ]; + + postPatch = '' + # fix access permit to daemon + substituteInPlace src/libgrand-search-daemon/dbusservice/grandsearchinterface.cpp \ + --replace-fail "/usr/bin/dde-grand-search" "$out/bin/.dde-grand-search-wrapped" + + for file in $(grep -rl "/usr/bin/dde-grand-search"); do + substituteInPlace $file --replace-fail "/usr/bin/dde-grand-search" "$out/bin/dde-grand-search" + done + + substituteAllInPlace src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service + ''; + + cmakeFlags = [ + "-DVERSION=${version}" + "-DNIX_DEEPIN_VERSION=23" + ]; + + meta = { + description = "System-wide desktop search for DDE"; + homepage = "https://github.com/linuxdeepin/dde-grand-search"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff b/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff new file mode 100644 index 0000000000000..dd036bf6ec5e8 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff @@ -0,0 +1,9 @@ +diff --git a/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service b/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service +index 14823cb..33dd51e 100644 +--- a/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service ++++ b/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=com.deepin.dde.daemon.GrandSearch +-Exec=/usr/bin/dbus-send --print-reply --session --dest=com.deepin.SessionManager /com/deepin/StartManager com.deepin.StartManager.Launch string:/usr/share/applications/dde-grand-search-daemon.desktop ++Exec=@out@/bin/dde-grand-search-daemon diff --git a/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff b/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff new file mode 100644 index 0000000000000..bcb9f2b6c0c2f --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 76dac13..f43600e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,7 @@ endif() + + #Indentify the version + find_package(DtkCMake REQUIRED) +-if (${DEEPIN_OS_VERSION} MATCHES "23") ++if (${NIX_DEEPIN_VERSION} MATCHES "23") + add_definitions(-DCOMPILE_ON_V23) + set(COMPLIE_ON_V23 TRUE) + message("COMPILE ON v23") diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index c1a26e100a298..5003129c1ea9e 100644 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -3,7 +3,7 @@ , runCommand , glib , gtk3 -, dde-dock +, dde-grand-search , startdde , dde-session-shell , dde-file-manager @@ -17,7 +17,7 @@ let gsettingsOverridePackages = [ - dde-dock + dde-grand-search startdde dde-session-shell dde-file-manager diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix index f531418750d4b..7544bc5751752 100644 --- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix @@ -2,57 +2,48 @@ , lib , fetchFromGitHub , cmake -, qttools , pkg-config -, wrapQtAppsHook -, dtkwidget -, dtkdeclarative -, qtbase -, appstream-qt -, kitemmodels -, qt5integration +, qt6Packages +, qt6integration +, qt6platform-plugins +, dtk6declarative +, dde-shell }: stdenv.mkDerivation rec { pname = "dde-launchpad"; - version = "0.4.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-az8BC3n44NGpATNu3Exjn3H7Rumx/YqDXztEGqCpAbY="; + hash = "sha256-nT89cUx7Bxf+d+fgqvXZ9U0i/qf1oP2alUB90UXpNcM="; }; - postPatch = '' - substituteInPlace desktopintegration.cpp \ - --replace "AppStreamQt/pool.h" "AppStreamQt5/pool.h" - ''; - nativeBuildInputs = [ cmake - qttools pkg-config - wrapQtAppsHook + qt6Packages.qttools + qt6Packages.wrapQtAppsHook ]; buildInputs = [ - dtkwidget - dtkdeclarative + qt6integration + qt6platform-plugins + dtk6declarative + dde-shell + ] ++ (with qt6Packages; [ qtbase + qtsvg + qtwayland appstream-qt - kitemmodels - ]; + ]); cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; - meta = with lib; { description = "'launcher' or 'start menu' component for DDE"; mainProgram = "dde-launchpad"; diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix index f9d97f735a62c..58c7f30f14e56 100644 --- a/pkgs/desktops/deepin/core/dde-network-core/default.nix +++ b/pkgs/desktops/deepin/core/dde-network-core/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dde-network-core"; - version = "2.0.21"; + version = "2.0.26"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-xuPEh0o62seyxlW+MKGgv/DdheYibSI1K0RJAjxraCw="; + hash = "sha256-eicwutePtKPY5DmNmIFSTQkdrE/i2RKfu766lQWy+iY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix index f3f93be7f30e4..2e6bd31a9395c 100644 --- a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix +++ b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "dde-polkit-agent"; - version = "6.0.5"; + version = "6.0.7"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-NSMwNL4ttCaqo0h0sF11bOJ20FhOB+SG27K4k8F4O/o="; + hash = "sha256-r2WVyy1lqcBJIQnRsPWlBFWQtSeZkq98J1S4dkipCys="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/pkgs/desktops/deepin/core/dde-session-shell/default.nix index cfaa12338eb2b..a9c283c6ff98e 100644 --- a/pkgs/desktops/deepin/core/dde-session-shell/default.nix +++ b/pkgs/desktops/deepin/core/dde-session-shell/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "dde-session-shell"; - version = "6.0.17"; + version = "6.0.20"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-X/aBMxrYeCT3I9ynV8cPzS23H44fHLkpkztewnfTNxA="; + hash = "sha256-RPVGjCg7U0nWxqesoSNDtEzh/+OYDSsX31YU+LLllVM="; }; postPatch = '' diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix index 190ad0bbc7048..478214bc199eb 100644 --- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/core/dde-session-ui/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "dde-session-ui"; - version = "6.0.16"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-hxunGK7DxRuAbmi6PtylHCBajV3b1qbFVA+AiuOCcN0="; + hash = "sha256-elDtY7fZf2I8ngEmMB9sRRhm78nEDf5ag6jny7UDG70="; }; postPatch = '' diff --git a/pkgs/desktops/deepin/core/dde-session/default.nix b/pkgs/desktops/deepin/core/dde-session/default.nix index 0e919c144d46c..9b1b493840936 100644 --- a/pkgs/desktops/deepin/core/dde-session/default.nix +++ b/pkgs/desktops/deepin/core/dde-session/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "dde-session"; - version = "1.2.5"; + version = "1.2.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-YYGRjVbVFyzmRhYu6sDtxzghocgM7Myr3K77AqWQk3E="; + hash = "sha256-nLoSVsPyrNA996H7C8N77aiheaiLs3Sd7ZVuxiuNLE4="; }; postPatch = '' diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix new file mode 100644 index 0000000000000..8a66181c2fc94 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-shell/default.nix @@ -0,0 +1,94 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, extra-cmake-modules +, pkg-config +, wrapQtAppsHook +, wayland-scanner +, dtk6declarative +, dtk6widget +, dde-qt-dbus-factory +, qt6Packages +, qt6integration +, qt6platform-plugins +, kdePackages +, wayland +, wayland-protocols +, yaml-cpp +, xorg +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dde-shell"; + version = "0.0.23-unstable-2024-06-11"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "dde-shell"; + rev = "d68cc64ad2cd6978af2f34deb3ef48f991d54fc3"; + hash = "sha256-hVrdfbtcL3EJitiDghNSuGr5MX/VVT1J3tuY6wjwYcw="; + }; + + patches = [ + ./disable-plugins-use-qt5.diff + ./fix-path-for-nixos.diff + ./only-use-qt6.diff # remove in next release + ]; + + postPatch = '' + for file in $(grep -rl "/usr/lib/dde-dock/tmp"); do + substituteInPlace $file --replace-fail "/usr/lib/dde-dock/tmp" "/run/current-system/sw/lib/dde-dock/tmp" + done + + for file in $(grep -rl "/usr/lib/deepin-daemon"); do + substituteInPlace $file --replace-fail "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" + done + ''; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + qt6Packages.wrapQtAppsHook + qt6Packages.qttools + wayland-scanner + ]; + + buildInputs = [ + dtk6declarative + dtk6widget + dde-qt-dbus-factory + qt6Packages.qtbase + qt6Packages.qtwayland + qt6Packages.qtsvg + qt6platform-plugins + kdePackages.networkmanager-qt + wayland + wayland-protocols + yaml-cpp + xorg.libXcursor + xorg.libXres + ]; + + env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + + cmakeFlags = [ + "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" + ]; + + qtWrapperArgs = [ + # qt6integration must be placed before qtsvg in QT_PLUGIN_PATH + "--prefix QT_PLUGIN_PATH : ${qt6integration}/${qt6Packages.qtbase.qtPluginPrefix}" + "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell" + "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell" + ]; + + meta = { + description = "A plugin system that integrates plugins developed on DDE"; + homepage = "https://github.com/linuxdeepin/dde-shell"; + license = with lib.licenses; [ gpl3Plus ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ rewine ]; + }; +}) diff --git a/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff b/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff new file mode 100644 index 0000000000000..0e1107abc7dc9 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff @@ -0,0 +1,18 @@ +diff --git a/panels/dock/CMakeLists.txt b/panels/dock/CMakeLists.txt +index 1a20179..83c5ff2 100644 +--- a/panels/dock/CMakeLists.txt ++++ b/panels/dock/CMakeLists.txt +@@ -85,11 +85,11 @@ add_subdirectory(searchitem) + add_subdirectory(launcherItem) + add_subdirectory(showdesktop) + add_subdirectory(taskmanager) +-add_subdirectory(tray) ++ add_subdirectory(tray) + add_subdirectory(multitaskview) + + # dock plugin load program +-add_subdirectory(dockplugin) ++#add_subdirectory(dockplugin) + + # dock qml element(include Dock.xx defines and DockCompositor) + file( diff --git a/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff b/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff new file mode 100644 index 0000000000000..cc334a3220a4e --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff @@ -0,0 +1,17 @@ +diff --git a/misc/DDEShellConfig.cmake.in b/misc/DDEShellConfig.cmake.in +index e28cc2f..3875769 100644 +--- a/misc/DDEShellConfig.cmake.in ++++ b/misc/DDEShellConfig.cmake.in +@@ -5,9 +5,9 @@ find_dependency(Dtk@DTK_VERSION_MAJOR@Gui) + find_package(Qt@QT_VERSION_MAJOR@ COMPONENTS Qml Quick REQUIRED) + + include(${CMAKE_CURRENT_LIST_DIR}/DDEShellTargets.cmake) +-set(DDE_SHELL_PACKAGE_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_PACKAGE_INSTALL_DIR@) +-set(DDE_SHELL_PLUGIN_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_PLUGIN_INSTALL_DIR@) +-set(DDE_SHELL_TRANSLATION_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_TRANSLATION_INSTALL_DIR@) ++set(DDE_SHELL_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/dde-shell) ++set(DDE_SHELL_PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/dde-shell) ++set(DDE_SHELL_TRANSLATION_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/dde-shell) + check_required_components(Dtk@DTK_VERSION_MAJOR@Core) + + include("${CMAKE_CURRENT_LIST_DIR}/DDEShellPackageMacros.cmake") diff --git a/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff b/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff new file mode 100644 index 0000000000000..cdfad415403e1 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff @@ -0,0 +1,26 @@ +diff --git a/panels/dock/tray/CMakeLists.txt b/panels/dock/tray/CMakeLists.txt +index ed6da31..1a33d06 100644 +--- a/panels/dock/tray/CMakeLists.txt ++++ b/panels/dock/tray/CMakeLists.txt +@@ -10,7 +10,7 @@ endif() + + # project(dde-dock) + +-find_package(DtkTools REQUIRED) ++find_package(Dtk6Tools REQUIRED) + + set(CMAKE_THREAD_LIBS_INIT "-lpthread") + set(CMAKE_HAVE_THREADS_LIBRARY 1) +diff --git a/panels/dock/tray/frame/CMakeLists.txt b/panels/dock/tray/frame/CMakeLists.txt +index b55aa48..0a397cb 100644 +--- a/panels/dock/tray/frame/CMakeLists.txt ++++ b/panels/dock/tray/frame/CMakeLists.txt +@@ -22,7 +22,7 @@ find_package(Qt6WaylandClient REQUIRED) + find_package(Dtk6Gui REQUIRED) + find_package(Dtk6Core REQUIRED) + find_package(Dtk6Widget REQUIRED) +-find_package(DtkCMake REQUIRED) ++find_package(Dtk6CMake REQUIRED) + # find_package(dbusmenu-qt6 REQUIRED) + find_package(ECM REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) diff --git a/pkgs/desktops/deepin/core/dde-widgets/default.nix b/pkgs/desktops/deepin/core/dde-widgets/default.nix index f7455a92e0b72..786f6dab521ea 100644 --- a/pkgs/desktops/deepin/core/dde-widgets/default.nix +++ b/pkgs/desktops/deepin/core/dde-widgets/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "dde-widgets"; - version = "6.0.19"; + version = "6.0.22"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-oB0lyfmxBSwqjXO+etYdc+DghZVSBU+LXYqK1WS5DaU="; + hash = "sha256-rE/7AoTID9UWxAS+LVYY5WYDNAo8GnSJmUrJFn3l+1M="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix index a46088a63dd65..507b234605877 100644 --- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix +++ b/pkgs/desktops/deepin/core/deepin-kwin/default.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { pname = "deepin-kwin"; - version = "5.25.17"; + version = "5.25.26"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-Zi6SNNiwty16b3cCMK52zrXqglq8TqK2x8smSD504+o="; + hash = "sha256-xBCJu89OV+JMGsd/txAqj2Kce91mnOsRK31WGz7qS40="; }; patches = [ diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 4b2dc27c11003..6c4f7a3b20d79 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, libsForQt5, qt6Packages }: +{ lib, pkgs, config, libsForQt5 }: let packages = self: let @@ -28,12 +28,14 @@ let dtk6widget = callPackage ./library/dtk6widget { }; dtk6declarative = callPackage ./library/dtk6declarative { }; dtk6systemsettings = callPackage ./library/dtk6systemsettings { }; + qt6platform-plugins = callPackage ./library/qt6platform-plugins { }; + qt6integration = callPackage ./library/qt6integration { }; #### CORE deepin-kwin = callPackage ./core/deepin-kwin { }; dde-appearance = callPackage ./core/dde-appearance { }; dde-app-services = callPackage ./core/dde-app-services { }; - dde-application-manager = qt6Packages.callPackage ./core/dde-application-manager { }; + dde-application-manager = callPackage ./core/dde-application-manager { }; dde-control-center = callPackage ./core/dde-control-center { }; dde-calendar = callPackage ./core/dde-calendar { }; dde-clipboard = callPackage ./core/dde-clipboard { }; @@ -49,6 +51,8 @@ let dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { }; dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { }; dde-widgets = callPackage ./core/dde-widgets { }; + dde-shell = callPackage ./core/dde-shell { }; + dde-grand-search = callPackage ./core/dde-grand-search { }; #### Dtk Application deepin-album = callPackage ./apps/deepin-album { }; @@ -71,9 +75,6 @@ let deepin-screensaver = callPackage ./apps/deepin-screensaver { }; #### Go Packages - go-lib = callPackage ./go-package/go-lib { }; - go-gir-generator = callPackage ./go-package/go-gir-generator { }; - go-dbus-factory = callPackage ./go-package/go-dbus-factory { }; dde-api = callPackage ./go-package/dde-api { }; dde-daemon = callPackage ./go-package/dde-daemon { }; deepin-pw-check = callPackage ./go-package/deepin-pw-check { }; @@ -83,6 +84,7 @@ let #### TOOLS dde-device-formatter = callPackage ./tools/dde-device-formatter { }; deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { }; + deepin-anything = callPackage ./tools/deepin-anything { }; #### ARTWORK dde-account-faces = callPackage ./artwork/dde-account-faces { }; @@ -98,6 +100,9 @@ let } // lib.optionalAttrs config.allowAliases { dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27 dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23 + go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31 + go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31 + go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31 }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix index 2c7c6276cff67..890ce1b64f75d 100644 --- a/pkgs/desktops/deepin/go-package/dde-api/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-api/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "dde-api"; - version = "6.0.9"; + version = "6.0.11"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-ht5IaXi4nz0/U1zqp4JTiDkQ3NB69q24MgWfu45SpoY="; + hash = "sha256-VpZwVNXxdi8ODwxbksQpT0nnUuLOTJ9h0JYucEKdGYM="; }; vendorHash = "sha256-zrtUsCF2+301DKwgWectw+UbOehOp8h8u/IMf09XQ8Q="; diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix index 4dab20303d8c2..61d7c18dca2d2 100644 --- a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "deepin-desktop-schemas"; - version = "6.0.5"; + version = "6.0.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-lvAY0CJ+EohMK16fwIkB7Jq7gTpMhDimPYs9b/IklA4="; + hash = "sha256-zheIZ3Z0vm0/0F9hFcdlYwhE3/PRunxUCT8KSe4T3wk="; }; vendorHash = "sha256-q6ugetchJLv2JjZ9+nevUI0ptizh2V+6SByoY/eFJJQ="; diff --git a/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix deleted file mode 100644 index eed8208367b0b..0000000000000 --- a/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "go-dbus-factory"; - version = "2.0.8"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-yzmr61wrBfZi+CuXFhtvOk7EaFtE8y3QyVwwgEDqwKY="; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - description = "Generate go binding of D-Bus interfaces"; - homepage = "https://github.com/linuxdeepin/go-dbus-factory"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix deleted file mode 100644 index 45c486d606d33..0000000000000 --- a/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, go -, pkg-config -, libgudev -, gobject-introspection -}: - -stdenv.mkDerivation rec { - pname = "go-gir-generator"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-lFseui/M3+TyfYoa+rnS0cGhN6gdLrgpzgOwqzYcyPk="; - }; - - nativeBuildInputs = [ - pkg-config - go - gobject-introspection - ]; - - buildInputs = [ - libgudev - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "GOCACHE=$(TMPDIR)/go-cache" - ]; - - meta = with lib; { - description = "Generate static golang bindings for GObject"; - mainProgram = "gir-generator"; - homepage = "https://github.com/linuxdeepin/go-gir-generator"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/go-package/go-lib/default.nix b/pkgs/desktops/deepin/go-package/go-lib/default.nix deleted file mode 100644 index 751cba56ce35c..0000000000000 --- a/pkgs/desktops/deepin/go-package/go-lib/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, runtimeShell -}: - -stdenv.mkDerivation rec { - pname = "go-lib"; - version = "5.8.27"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-ZV5zWu7UvNKVcVo79/iKMhF4H09rGyDCvEL61H05lZc="; - }; - - patches = [ - (fetchpatch { - name = "fix_IsDir_for_symlink.patch"; - url = "https://github.com/linuxdeepin/go-lib/commit/79239904679dc70a11e1ac8e65670afcfdd7c122.patch"; - sha256 = "sha256-RsN9hK26i/W6P/+e1l1spCLdlgIEWTehhIW6POBOvW4="; - }) - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gocode/src/github.com/linuxdeepin/go-lib - cp -a * $out/share/gocode/src/github.com/linuxdeepin/go-lib - rm -r $out/share/gocode/src/github.com/linuxdeepin/go-lib/debian - runHook postInstall - ''; - - meta = with lib; { - description = "Library containing many useful go routines for things such as glib, gettext, archive, graphic, etc"; - homepage = "https://github.com/linuxdeepin/go-lib"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/go-package/startdde/default.nix b/pkgs/desktops/deepin/go-package/startdde/default.nix index 63ebea8f08abe..1f582a43b80ac 100644 --- a/pkgs/desktops/deepin/go-package/startdde/default.nix +++ b/pkgs/desktops/deepin/go-package/startdde/default.nix @@ -19,13 +19,13 @@ buildGoModule rec { pname = "startdde"; - version = "6.0.13"; + version = "6.0.14"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-sftPQq4cSyCTuvVtvjT8YJDLQOpSbmnXEVzFwFFaU4U="; + hash = "sha256-2aPQaH78+J18a/SXA2i+gQ5iypsjNhcYaORGN2qkz7c="; }; vendorHash = "sha256-Y81p3yPQayXbvyUI7N6PvFDO3hSU3SL0AuUKxvZkZNE="; diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix index 8acd1aa986868..ab583e2e45dcc 100644 --- a/pkgs/desktops/deepin/library/dtk6core/default.nix +++ b/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6core"; - version = "6.0.15"; + version = "6.0.16"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6core"; rev = finalAttrs.version; - hash = "sha256-zUJFilafR0hNH/Owmuyh6BLBFPbBuFKcHv40fena0GM="; + hash = "sha256-m2unpWx8FBvZT8AmdFlzc5dp55kgtDsR62SHF8RwHhU="; }; patches = [ @@ -35,6 +35,11 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + postPatch = '' + substituteInPlace misc/DtkCoreConfig.cmake.in \ + --subst-var-by PACKAGE_TOOL_INSTALL_DIR ${placeholder "out"}/libexec/dtk6/DCore/bin + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix index c3ae917a66254..e0c392ff20c47 100644 --- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix +++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6declarative"; - version = "6.0.15"; + version = "6.0.16"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6declarative"; rev = finalAttrs.version; - hash = "sha256-euHEfK2N2jtWMzeajgvTnHSl39zXwp7I0cQIqZRVGZ0="; + hash = "sha256-OvLmK/UAuF9VEnT7DO3/m7S9Xjze5WQuZAYBTcgZbyk="; }; patches = [ diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix index 73638c39e62fe..2b8de231eb514 100644 --- a/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6gui"; - version = "6.0.15"; + version = "6.0.16"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6gui"; rev = finalAttrs.version; - hash = "sha256-B/A3VXPCon+NIUhO+IVGoojACVjut2h0nH5pLdJYufw="; + hash = "sha256-fnbCKqeeQE5WBnNJ0D1ihsZswDSJ/Oj98eUXFrOuk+w="; }; patches = [ diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix index 3c1870581988d..038ab37ab2ffa 100644 --- a/pkgs/desktops/deepin/library/dtk6widget/default.nix +++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix @@ -12,19 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6widget"; - version = "6.0.15"; + version = "6.0.16"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6widget"; rev = finalAttrs.version; - hash = "sha256-QCdRjkD4JTPecLeZK+Y5U/H9pBgKI4DHRuchz/GymWQ="; + hash = "sha256-4WmnO4msQVWAEOzH1zOWfvJl5X+/VKWv4bbZAH//IXg="; }; patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch - ./fix-build-on-qt-6_7.patch ]; postPatch = '' diff --git a/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch b/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch deleted file mode 100644 index 16d2d2ec9b54b..0000000000000 --- a/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/widgets/dkeysequenceedit.cpp b/src/widgets/dkeysequenceedit.cpp -index a99e17ae..0e1c57f6 100644 ---- a/src/widgets/dkeysequenceedit.cpp -+++ b/src/widgets/dkeysequenceedit.cpp -@@ -276,13 +276,13 @@ void DKeySequenceEdit::keyPressEvent(QKeyEvent *e) - } - - if (e->modifiers() & Qt::ShiftModifier) { -- QList<int> possibleKeys = QKeyMapper::possibleKeys(e); -+ auto possibleKeys = QKeyMapper::possibleKeys(e); - int pkTotal = possibleKeys.count(); - if (!pkTotal) - return; - bool found = false; - for (int i = 0; i < possibleKeys.size(); ++i) { -- if (possibleKeys.at(i) - nextKey == int(e->modifiers()) -+ if (static_cast<int>(possibleKeys.at(i)) - nextKey == static_cast<int>(e->modifiers()) - || (possibleKeys.at(i) == nextKey && e->modifiers() == Qt::ShiftModifier)) { - nextKey = possibleKeys.at(i); - found = true; diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix index a2abd17c98274..f0b7da07631be 100644 --- a/pkgs/desktops/deepin/library/dtkcommon/default.nix +++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "dtkcommon"; - version = "5.6.21"; + version = "5.6.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-wRTzgvtmbGJJaIwi1f5m98K2o6g7yZdnKYR1nsDDwk8="; + hash = "sha256-1u+GhPI5F3t2h14VlRKpyPNArGoGgWOk2zA8D6vR6nU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix index ba921fd6eef7c..bf24da37b51f6 100644 --- a/pkgs/desktops/deepin/library/dtkcore/default.nix +++ b/pkgs/desktops/deepin/library/dtkcore/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dtkcore"; - version = "5.6.22"; + version = "5.6.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-W8uLNWC8bYzrKrX/hq9p1h66dWrxp4Vt+/27zDJeAS4="; + hash = "sha256-toqbEobi2R5tGnCYaShLyFdp4toEybMrWU+IORI/vu4="; }; patches = [ @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { ./fix-pri-path.patch ]; + postPatch = '' + substituteInPlace misc/DtkCoreConfig.cmake.in \ + --subst-var-by PACKAGE_TOOL_INSTALL_DIR ${placeholder "out"}/libexec/dtk5/DCore/bin + ''; + nativeBuildInputs = [ cmake pkg-config @@ -60,7 +65,7 @@ stdenv.mkDerivation rec { "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}" "-DDSG_PREFIX_PATH='/run/current-system/sw'" "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "dev"}/libexec" + "-DTOOL_INSTALL_DIR=${placeholder "out"}/libexec/dtk5/DCore/bin" "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata" "-DBUILD_WITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}" ]; @@ -73,6 +78,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; + postFixup = '' + for binary in $out/libexec/dtk5/DCore/bin/*; do + wrapQtApp $binary + done + ''; + meta = with lib; { description = "Deepin tool kit core library"; homepage = "https://github.com/linuxdeepin/dtkcore"; diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix index 00c884e6468b0..de084777d3262 100644 --- a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix +++ b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "dtkdeclarative"; - version = "5.6.24"; + version = "5.6.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-bGy8e+JAyHiAwWvO5Xz1TubHUDP4i4nWUR4h5/appM0="; + hash = "sha256-7pAC7NHsmQudAO2KvEgI5BbnsgjqxaJY5v9GNfKBm1U="; }; patches = [ diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix index 9066a32985743..7d93e7ec997c4 100644 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "dtkgui"; - version = "5.6.22"; + version = "5.6.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-h3DFG6FaJXP9o9u8R31MtX3Z1+P3DrNDT8Xbd8tlI4Y="; + hash = "sha256-TSU6sqdwBa86k7HcyNSJeJ6gj+n6EfIMjE8skSG5o0c="; }; patches = [ @@ -53,7 +53,6 @@ stdenv.mkDerivation rec { "-DBUILD_DOCS=ON" "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "dev"}/libexec" ]; preConfigure = '' @@ -64,6 +63,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; + postFixup = '' + for binary in $out/libexec/dtk5/DGui/bin/*; do + wrapQtApp $binary + done + ''; + meta = with lib; { description = "Deepin Toolkit, gui module for DDE look and feel"; homepage = "https://github.com/linuxdeepin/dtkgui"; diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix index 51130710af466..923833c808cb5 100644 --- a/pkgs/desktops/deepin/library/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "dtkwidget"; - version = "5.6.22"; + version = "5.6.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-szy1gPm+PsiUXGvo5QuXKYMVPCcaqVX47iu48WXOjWU="; + hash = "sha256-eFEigOJGw5gTi0G13/rtnqoaeTdnO0aSLfZlRwHg3yE="; }; patches = [ @@ -65,7 +65,6 @@ stdenv.mkDerivation rec { "-DBUILD_DOCS=ON" "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "dev"}/libexec" ]; preConfigure = '' @@ -76,6 +75,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; + postFixup = '' + for binary in $out/lib/dtk5/DWidget/bin/*; do + wrapQtApp $binary + done + ''; + meta = with lib; { description = "Deepin graphical user interface library"; homepage = "https://github.com/linuxdeepin/dtkwidget"; diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix index c7d219f8de69f..5fa19075cfaad 100644 --- a/pkgs/desktops/deepin/library/qt5integration/default.nix +++ b/pkgs/desktops/deepin/library/qt5integration/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "qt5integration"; - version = "5.6.20"; + version = "5.6.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-cmvscSIu3LOTKuMs/+JUdJAvQ7OB4o1k+LqfRxNefZU="; + hash = "sha256-yFY+bsvmVo92u6eLw9VYGAz5nehVrFob4AkdyG0nvjM="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix index 11a342e217fc8..660c861d95a2c 100644 --- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "qt5platform-plugins"; - version = "5.6.22"; + version = "5.6.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-0XQ4s6xpFHoG6SC8RE8WVnbHH7qNeOYkhrYUkDEH8Dc="; + hash = "sha256-KoX3TkEzGNwqG8XL6op0mpTVvdSQTzqd5OpAuCU2Ok4"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix new file mode 100644 index 0000000000000..3f6f9dff964b4 --- /dev/null +++ b/pkgs/desktops/deepin/library/qt6integration/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, dtk6widget +, qt6Packages +, gtest +}: + +stdenv.mkDerivation rec { + pname = "qt6integration"; + version = "6.0.16"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + hash = "sha256-2QNHJZ4Bz21UyuRhD/9gC7Ls9GggHp4QwtFzoxyyAL4="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + dtk6widget + qt6Packages.qtbase + gtest + ]; + + cmakeFlags = [ + "-DDTK_VERSION=${version}" + "-DPLUGIN_INSTALL_BASE_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtPluginPrefix}" + ]; + + dontWrapQtApps = true; + + meta = { + description = "Qt platform theme integration plugins for DDE"; + homepage = "https://github.com/linuxdeepin/qt6integration"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix new file mode 100644 index 0000000000000..c5c7d7f6e98eb --- /dev/null +++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, mtdev +, cairo +, xorg +, qt6Packages +}: + +stdenv.mkDerivation rec { + pname = "qt6platform-plugins"; + version = "6.0.16"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + hash = "sha256-0/hwsdB0UNzlekxfdKeItW2lXTMTzEtBR2hS153woLo="; + }; + + patches = [ + (fetchpatch { + name = "support-to-qt_6_7_1.patch"; + url = "https://github.com/linuxdeepin/qt6platform-plugins/commit/88ba963d11355391d62501cd5a6da9e3d5e9ddce.patch"; + hash = "sha256-9NiKIdY9PXBYgKQGRf5pFV+tNrHe7BjbVrnwII9lLFI="; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + mtdev + cairo + xorg.libSM + qt6Packages.qtbase + ]; + + cmakeFlags = [ + "-DDTK_VERSION=${version}" + "-DINSTALL_PATH=${placeholder "out"}/${qt6Packages.qtbase.qtPluginPrefix}/platforms" + ]; + + dontWrapQtApps = true; + + meta = { + description = "Qt platform plugins for DDE"; + homepage = "https://github.com/linuxdeepin/qt6platform-plugins"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix index e726b0af73b6d..e3fe31526cf4f 100644 --- a/pkgs/desktops/deepin/library/util-dfm/default.nix +++ b/pkgs/desktops/deepin/library/util-dfm/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "util-dfm"; - version = "1.2.21"; + version = "1.2.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-EqNca3heIUUV5joMskpriCY+7NwjUc/vmQwomDkru80="; + hash = "sha256-7MuQVkb+xRMtcbB5PQBv6Au/i3ONA0c1whnZ9bMrA/8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix index 730d17404f3f6..fd6ae6f425413 100644 --- a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix +++ b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "dde-device-formatter"; - version = "0.0.1.15"; + version = "0.0.1.16"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-M0XKvo/Qph09GIlqXTdYyPWilWyQhvFAF3c9Yf1Z9m0="; + hash = "sha256-l2D+j+u5Q6G45KTM7eg1QNEakEPtEJ0tzlDlQO5/08I="; }; postPatch = '' diff --git a/pkgs/desktops/deepin/tools/deepin-anything/default.nix b/pkgs/desktops/deepin/tools/deepin-anything/default.nix new file mode 100644 index 0000000000000..cfcbb6f1c1f7b --- /dev/null +++ b/pkgs/desktops/deepin/tools/deepin-anything/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, wrapQtAppsHook +, udisks2-qt5 +, util-linux +, libnl +, glib +, pcre +}: + +stdenv.mkDerivation rec { + pname = "deepin-anything"; + version = "6.1.9"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "deepin-anything"; + rev = version; + hash = "sha256-OYPsUXMjuU6gG+EzyYl640+2/59n8D5V906CVGwn6Bo="; + }; + + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace-fail 'add_subdirectory("kernelmod")' " " + substituteInPlace src/server/backend/CMakeLists.txt \ + --replace-fail "/usr" "$out" \ + --replace-fail "/etc" "$out/etc" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + udisks2-qt5 + util-linux + libnl + glib + pcre + ]; + + meta = { + description = "Deepin Anything file search tool"; + homepage = "https://github.com/linuxdeepin/deepin-anything"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +} diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index 8aa7eefe4215e..b11776acebf59 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -1,41 +1,9 @@ { lib, androidenv, buildPackages, pkgs, targetPackages }: -{ - "21" = +let + makeNdkPkgs = ndkVersion: let - ndkVersion = "21.0.6113669"; - - buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages { - includeNDK = true; - inherit ndkVersion; - }; - - androidComposition = androidenv.composeAndroidPackages { - includeNDK = true; - inherit ndkVersion; - }; - in - import ./androidndk-pkgs.nix { - inherit lib; - inherit (buildPackages) - makeWrapper autoPatchelfHook; - inherit (pkgs) - stdenv - runCommand wrapBintoolsWith wrapCCWith; - # buildPackages.foo rather than buildPackages.buildPackages.foo would work, - # but for splicing messing up on infinite recursion for the variants we - # *dont't* use. Using this workaround, but also making a test to ensure - # these two really are the same. - buildAndroidndk = buildAndroidComposition.ndk-bundle; - androidndk = androidComposition.ndk-bundle; - targetAndroidndkPkgs = if targetPackages ? androidndkPkgs_21 then targetPackages.androidndkPkgs_21 else throw "androidndkPkgs_21: no targetPackages, use `buildPackages.androidndkPkgs_21"; - }; - - "23b" = - let - ndkVersion = "23.1.7779620"; - buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages { includeNDK = true; inherit ndkVersion; @@ -45,6 +13,7 @@ includeNDK = true; inherit ndkVersion; }; + majorVersion = lib.versions.major ndkVersion; in import ./androidndk-pkgs.nix { inherit lib; @@ -59,37 +28,14 @@ # these two really are the same. buildAndroidndk = buildAndroidComposition.ndk-bundle; androidndk = androidComposition.ndk-bundle; - targetAndroidndkPkgs = if targetPackages ? androidndkPkgs_23b then targetPackages.androidndkPkgs_23b else throw "androidndkPkgs_23b: no targetPackages, use `buildPackages.androidndkPkgs_23b"; - }; - - "24" = - let - ndkVersion = "24.0.8215888"; - - buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages { - includeNDK = true; - inherit ndkVersion; - }; - - androidComposition = androidenv.composeAndroidPackages { - includeNDK = true; - inherit ndkVersion; - }; - in - import ./androidndk-pkgs.nix { - inherit lib; - inherit (buildPackages) - makeWrapper autoPatchelfHook; - inherit (pkgs) - stdenv - runCommand wrapBintoolsWith wrapCCWith; - # buildPackages.foo rather than buildPackages.buildPackages.foo would work, - # but for splicing messing up on infinite recursion for the variants we - # *dont't* use. Using this workaround, but also making a test to ensure - # these two really are the same. - buildAndroidndk = buildAndroidComposition.ndk-bundle; - androidndk = androidComposition.ndk-bundle; - targetAndroidndkPkgs = if targetPackages ? androidndkPkgs_24 then targetPackages.androidndkPkgs_24 else throw "androidndkPkgs_24: no targetPackages, use `buildPackages.androidndkPkgs_24"; + targetAndroidndkPkgs = if targetPackages ? "androidndkPkgs_${majorVersion}" then targetPackages."androidndkPkgs_${majorVersion}" else throw "androidndkPkgs_${majorVersion}: no targetPackages, use `buildPackages.androidndkPkgs_${majorVersion}"; }; +in +{ + "21" = makeNdkPkgs "21.0.6113669"; + "23b" = makeNdkPkgs "23.1.7779620"; + "24" = makeNdkPkgs "24.0.8215888"; + "25" = makeNdkPkgs "25.2.9519653"; + "26" = makeNdkPkgs "26.3.11579264"; } diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index f02e77753bc52..343363332bf60 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -4,7 +4,6 @@ , fetchurl , ant , jdk -, jre , makeWrapper , stripJavaArchivesHook }: @@ -36,7 +35,9 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - ant + ant \ + -Dabcl.runtime.jar.path="$out/lib/abcl/abcl.jar" \ + -Dadditional.jars="$out/lib/abcl/abcl-contrib.jar" runHook postBuild ''; @@ -47,14 +48,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p "$out"/{share/doc/abcl,lib/abcl} cp -r README COPYING CHANGES examples/ "$out/share/doc/abcl/" cp -r dist/*.jar contrib/ "$out/lib/abcl/" - - makeWrapper ${jre}/bin/java $out/bin/abcl \ - --add-flags "-classpath $out/lib/abcl/\*" \ - ${lib.optionalString (lib.versionAtLeast jre.version "17") - # Fix for https://github.com/armedbear/abcl/issues/484 - "--add-flags --add-opens=java.base/java.util.jar=ALL-UNNAMED \\" - } - --add-flags org.armedbear.lisp.Main + install -Dm555 abcl -t $out/bin runHook postInstall ''; diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 3f2bb2e5cec83..c3ef3ab9db4a0 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -8,6 +8,8 @@ let mkFlutter = { version , engineVersion + , engineSwiftShaderHash + , engineSwiftShaderRev , engineHashes , enginePatches , dartVersion @@ -20,7 +22,7 @@ let }@fargs: let args = { - inherit version engineVersion engineHashes enginePatches patches pubspecLock artifactHashes useNixpkgsEngine channel; + inherit version engineVersion engineSwiftShaderRev engineSwiftShaderHash engineHashes enginePatches patches pubspecLock artifactHashes useNixpkgsEngine channel; dart = dart.override { version = dartVersion; diff --git a/pkgs/development/compilers/flutter/engine/dart.nix b/pkgs/development/compilers/flutter/engine/dart.nix new file mode 100644 index 0000000000000..c872113f4a90e --- /dev/null +++ b/pkgs/development/compilers/flutter/engine/dart.nix @@ -0,0 +1,13 @@ +{ engine, runCommand }: +runCommand "flutter-engine-${engine.version}-dart" { + version = engine.dartSdkVersion; + + inherit engine; + inherit (engine) outName; + + meta = engine.meta // { + description = "Dart SDK compiled from the Flutter Engine"; + }; +} '' + ln -s ${engine}/out/$outName/dart-sdk $out +'' diff --git a/pkgs/development/compilers/flutter/engine/default.nix b/pkgs/development/compilers/flutter/engine/default.nix index cea41933e4343..4aac2301f866c 100644 --- a/pkgs/development/compilers/flutter/engine/default.nix +++ b/pkgs/development/compilers/flutter/engine/default.nix @@ -2,6 +2,8 @@ callPackage, dartSdkVersion, flutterVersion, + swiftshaderHash, + swiftshaderRev, version, hashes, url, @@ -10,10 +12,13 @@ isOptimized ? true, lib, stdenv, -}: + dart, + mainRuntimeMode ? null, + altRuntimeMode ? null, +}@args: let - mainRuntimeMode = builtins.elemAt runtimeModes 0; - altRuntimeMode = builtins.elemAt runtimeModes 1; + mainRuntimeMode = args.mainRuntimeMode or builtins.elemAt runtimeModes 0; + altRuntimeMode = args.altRuntimeMode or builtins.elemAt runtimeModes 1; runtimeModesBuilds = lib.genAttrs runtimeModes ( runtimeMode: @@ -21,6 +26,8 @@ let inherit dartSdkVersion flutterVersion + swiftshaderHash + swiftshaderRev version hashes url @@ -42,6 +49,8 @@ stdenv.mkDerivation ( dartSdkVersion isOptimized runtimeMode + outName + dart ; inherit altRuntimeMode; @@ -51,19 +60,12 @@ stdenv.mkDerivation ( installPhase = '' mkdir -p $out/out - - for dir in $(find $src/src -mindepth 1 -maxdepth 1); do - ln -sf $dir $out/$(basename $dir) - done - '' + lib.concatMapStrings ( runtimeMode: let runtimeModeBuild = runtimeModesBuilds.${runtimeMode}; - runtimeModeOut = "host_${runtimeMode}${ - lib.optionalString (!runtimeModeBuild.isOptimized) "_unopt" - }"; + runtimeModeOut = runtimeModeBuild.outName; in '' ln -sf ${runtimeModeBuild}/out/${runtimeModeOut} $out/out/${runtimeModeOut} diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index 6f87b28f19098..7c2cd5cec2201 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -11,8 +11,12 @@ tools ? callPackage ./tools.nix { inherit hostPlatform; }, stdenv, stdenvNoCC, + dart, + fetchgit, runCommand, + llvmPackages, patchelf, + openbox, xorg, libglvnd, libepoxy, @@ -33,6 +37,8 @@ version, flutterVersion, dartSdkVersion, + swiftshaderHash, + swiftshaderRev, hashes, patches, url, @@ -56,8 +62,24 @@ let url ; }; + + swiftshader = fetchgit { + url = "https://swiftshader.googlesource.com/SwiftShader.git"; + hash = swiftshaderHash; + rev = swiftshaderRev; + }; + + llvm = symlinkJoin { + name = "llvm"; + paths = with llvmPackages; [ + clang + llvmPackages.llvm + ]; + }; + + outName = "host_${runtimeMode}${lib.optionalString (!isOptimized) "_unopt --unoptimized"}"; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "flutter-engine-${runtimeMode}${lib.optionalString (!isOptimized) "-unopt"}"; inherit version @@ -65,7 +87,9 @@ stdenv.mkDerivation { patches isOptimized dartSdkVersion - src; + src + outName + swiftshader; toolchain = symlinkJoin { name = "flutter-engine-toolchain-${version}"; @@ -107,11 +131,18 @@ stdenv.mkDerivation { stdenv.cc.libc_lib ]; + # Needed due to Flutter expecting everything to be relative to $out + # and not true absolute path (ie relative to "/"). postBuild = '' - ln -s /nix $out/nix + mkdir -p $(dirname $(dirname "$out/$out")) + ln -s $(dirname "$out") $out/$(dirname "$out") ''; }; + NIX_CFLAGS_COMPILE = "-I${finalAttrs.toolchain}/include"; + + nativeCheckInputs = lib.optionals stdenv.isLinux [ xorg.xorgserver openbox ]; + nativeBuildInputs = [ python3 @@ -119,6 +150,7 @@ stdenv.mkDerivation { git pkg-config ninja + dart ] ++ lib.optionals (stdenv.isLinux) [ patchelf ] ++ optionals (stdenv.isDarwin) [ @@ -130,54 +162,10 @@ stdenv.mkDerivation { buildInputs = [ gtk3 ]; - patchtools = - let - buildtoolsPath = - if lib.versionAtLeast flutterVersion "3.21" then "flutter/buildtools" else "buildtools"; - in - [ - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clang-apply-replacements" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clang-doc" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clang-format" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clang-include-fixer" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clang-refactor" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clang-scan-deps" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clang-tidy" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clangd" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/dsymutil" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/find-all-symbols" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/lld" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-ar" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-bolt" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-cov" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-cxxfilt" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-debuginfod-find" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-dwarfdump" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-dwp" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-gsymutil" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-ifs" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-libtool-darwin" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-lipo" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-ml" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-mt" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-nm" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-objcopy" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-objdump" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-pdbutil" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-profdata" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-rc" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-readobj" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-size" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-symbolizer" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-undname" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-xray" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm" - "${buildtoolsPath}/${constants.alt-platform}/clang/bin/sancov" - "flutter/prebuilts/${constants.alt-platform}/dart-sdk/bin/dartaotruntime" - "flutter/prebuilts/${constants.alt-platform}/dart-sdk/bin/dart" - "flutter/third_party/gn/gn" - "third_party/dart/tools/sdks/dart-sdk/bin/dart" - ]; + patchtools = [ + "third_party/dart/tools/sdks/dart-sdk/bin/dart" + "flutter/third_party/gn/gn" + ]; dontPatch = true; @@ -189,6 +177,9 @@ stdenv.mkDerivation { postUnpack = '' pushd ${src.name} + + ln -s $swiftshader src/flutter/third_party/swiftshader + ${lib.optionalString (stdenv.isLinux) '' for patchtool in ''${patchtools[@]}; do patchelf src/$patchtool --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) @@ -203,11 +194,14 @@ stdenv.mkDerivation { git add . git config user.name "nobody" git config user.email "nobody@local.host" - git commit -a -m "$rev" + git commit -a -m "$rev" --quiet popd done - src/flutter/prebuilts/${constants.alt-platform}/dart-sdk/bin/dart src/third_party/dart/tools/generate_package_config.dart + mkdir -p src/flutter/buildtools/${constants.alt-platform} + ln -s ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang + + dart src/third_party/dart/tools/generate_package_config.dart cp ${./pkg-config.py} src/build/config/linux/pkg-config.py echo "${dartSdkVersion}" >src/third_party/dart/sdk/version @@ -250,8 +244,9 @@ stdenv.mkDerivation { --runtime-mode $runtimeMode \ --out-dir $out \ --target-sysroot $toolchain \ - --target-dir host_$runtimeMode${lib.optionalString (!isOptimized) "_unopt --unoptimized"} \ - --verbose + --target-dir $outName \ + --target-triple ${targetPlatform.config} \ + --enable-fontconfig runHook postConfigure ''; @@ -261,39 +256,48 @@ stdenv.mkDerivation { export TERM=dumb for tool in flatc scenec gen_snapshot dart impellerc shader_archiver gen_snapshot_product; do - ninja -C $out/out/host_$runtimeMode${ - lib.optionalString (!isOptimized) "_unopt" - } -j$NIX_BUILD_CORES $tool + ninja -C $out/out/$outName -j$NIX_BUILD_CORES $tool ${lib.optionalString (stdenv.isLinux) '' - patchelf $out/out/host_$runtimeMode${ - lib.optionalString (!isOptimized) "_unopt" - }/$tool --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) + patchelf $out/out/$outName/$tool --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) ''} done - ninja -C $out/out/host_$runtimeMode${lib.optionalString (!isOptimized) "_unopt"} -j$NIX_BUILD_CORES + ninja -C $out/out/$outName -j$NIX_BUILD_CORES ${lib.optionalString (stdenv.isLinux) '' - patchelf $out/out/host_$runtimeMode${ - lib.optionalString (!isOptimized) "_unopt" - }/dart-sdk/bin/dartaotruntime \ + patchelf $out/out/$outName/dart-sdk/bin/dartaotruntime \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) + + find $out/out/$outName/exe.unstripped -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; ''} runHook postBuild ''; - # Link sources so we can set $FLUTTER_ENGINE to this derivation + # Tests are broken + doCheck = false; + checkPhase = '' + ln -s $out/out src/out + touch src/out/run_tests.log + sh src/flutter/testing/run_tests.sh $outName + rm src/out/run_tests.log + ''; + installPhase = '' runHook preInstall - for dir in $(find $src/src -mindepth 1 -maxdepth 1); do - ln -sf $dir $out/$(basename $dir) - done + rm -rf $out/out/$outName/{obj,gen,exe.unstripped,lib.unstripped,zip_archives} + rm $out/out/$outName/{args.gn,build.ninja,build.ninja.d,compile_commands.json,display_list_rendertests,flutter_tester,toolchain.ninja} + find $out/out/$outName -name '*_unittests' -delete + find $out/out/$outName -name '*_benchmarks' -delete runHook postInstall ''; + passthru = { + dart = callPackage ./dart.nix { engine = finalAttrs.finalPackage; }; + }; + meta = { # Very broken on Darwin broken = stdenv.isDarwin; @@ -308,4 +312,4 @@ stdenv.mkDerivation { "aarch64-darwin" ]; }; -} +}) diff --git a/pkgs/development/compilers/flutter/engine/source.nix b/pkgs/development/compilers/flutter/engine/source.nix index 4b9b5aaa5adb2..413b1874a9812 100644 --- a/pkgs/development/compilers/flutter/engine/source.nix +++ b/pkgs/development/compilers/flutter/engine/source.nix @@ -2,6 +2,7 @@ callPackage, hostPlatform, targetPlatform, + fetchgit, tools ? callPackage ./tools.nix { inherit hostPlatform; }, curl, pkg-config, @@ -16,6 +17,7 @@ }: let constants = callPackage ./constants.nix { inherit targetPlatform; }; + boolOption = value: if value then "True" else "False"; in runCommand "flutter-engine-source-${version}-${targetPlatform.system}" { @@ -42,6 +44,14 @@ runCommand "flutter-engine-source-${version}-${targetPlatform.system}" "managed": False, "name": "src/flutter", "url": "${url}", + "custom_vars": { + "download_fuchsia_deps": False, + "download_android_deps": False, + "download_linux_deps": ${boolOption targetPlatform.isLinux}, + "setup_githooks": False, + "download_esbuild": False, + "download_dart_sdk": False, + }, }] ''; @@ -66,13 +76,13 @@ runCommand "flutter-engine-source-${version}-${targetPlatform.system}" cd $out export PATH=$PATH:$depot_tools - python3 $depot_tools/gclient.py sync --no-history --shallow --nohooks >/dev/null + python3 $depot_tools/gclient.py sync --no-history --shallow --nohooks 2>&1 >/dev/null find $out -name '.git' -exec dirname {} \; | xargs bash -c 'make_deterministic_repo $@' _ find $out -path '*/.git/*' ! -name 'HEAD' -prune -exec rm -rf {} \; find $out -name '.git' -exec mkdir {}/logs \; find $out -name '.git' -exec cp {}/HEAD {}/logs/HEAD \; - python3 src/build/linux/sysroot_scripts/install-sysroot.py --arch=${constants.arch} >/dev/null + rm -rf $out/src/flutter/{buildtools,prebuilts,third_party/swiftshader} rm -rf $out/.cipd $out/.gclient $out/.gclient_entries $out/.gclient_previous_custom_vars $out/.gclient_previous_sync_commits '' diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 757766d031524..870c63afa8069 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -5,6 +5,8 @@ , engineUrl ? "https://github.com/flutter/engine.git@${engineVersion}" , enginePatches ? [] , engineRuntimeModes ? [ "release" "debug" ] +, engineSwiftShaderHash +, engineSwiftShaderRev , patches , channel , dart @@ -19,20 +21,17 @@ , git , which , jq -, flutterTools ? callPackage ./flutter-tools.nix { - inherit dart version; - flutterSrc = src; - inherit patches; - inherit pubspecLock; - systemPlatform = stdenv.hostPlatform.system; - } +, flutterTools ? null }@args: let engine = if args.useNixpkgsEngine or false then callPackage ./engine/default.nix { - dartSdkVersion = dart.version; + inherit (args) dart; + dartSdkVersion = args.dart.version; flutterVersion = version; + swiftshaderRev = engineSwiftShaderRev; + swiftshaderHash = engineSwiftShaderHash; version = engineVersion; hashes = engineHashes; url = engineUrl; @@ -40,6 +39,17 @@ let runtimeModes = engineRuntimeModes; } else null; + dart = if args.useNixpkgsEngine or false then + engine.dart else args.dart; + + flutterTools = args.flutterTools or (callPackage ./flutter-tools.nix { + inherit dart version; + flutterSrc = src; + inherit patches; + inherit pubspecLock; + systemPlatform = stdenv.hostPlatform.system; + }); + unwrapped = stdenv.mkDerivation { name = "flutter-${version}-unwrapped"; diff --git a/pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in b/pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in new file mode 100644 index 0000000000000..2dffbe950b86f --- /dev/null +++ b/pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in @@ -0,0 +1,5 @@ +{ fetchgit }: +fetchgit { + url = "https://swiftshader.googlesource.com/SwiftShader.git"; + rev = "@engine_swiftshader_rev@"; +} diff --git a/pkgs/development/compilers/flutter/update/update.py b/pkgs/development/compilers/flutter/update/update.py index a782b46514a92..cc6d114e694a7 100755 --- a/pkgs/development/compilers/flutter/update/update.py +++ b/pkgs/development/compilers/flutter/update/update.py @@ -14,6 +14,7 @@ import argparse import yaml import json +FAKE_HASH = 'sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=' NIXPKGS_ROOT = subprocess.Popen(['git', 'rev-parse', @@ -200,6 +201,22 @@ def get_pubspec_lock(flutter_compact_version, flutter_src): return yaml.safe_load(pubspec_lock_yaml) +def get_engine_swiftshader_rev(engine_version): + with urllib.request.urlopen(f"https://github.com/flutter/engine/raw/{engine_version}/DEPS") as f: + deps = f.read().decode('utf-8') + pattern = re.compile(r"Var\('swiftshader_git'\) \+ '\/SwiftShader\.git' \+ '@' \+ \'([0-9a-fA-F]{40})\'\,") + rev = pattern.findall(deps)[0] + return rev + +def get_engine_swiftshader_hash(engine_swiftshader_rev): + code = load_code( + "get-engine-swiftshader.nix", + engine_swiftshader_rev=engine_swiftshader_rev, + hash="") + + stderr = nix_build_to_fail(code) + pattern = re.compile(r"got:\s+(.+?)\n") + return pattern.findall(stderr)[0] def write_data( nixpkgs_flutter_version_directory, @@ -207,6 +224,8 @@ def write_data( channel, engine_hash, engine_hashes, + engine_swiftshader_hash, + engine_swiftshader_rev, dart_version, dart_hash, flutter_hash, @@ -216,6 +235,8 @@ def write_data( f.write(json.dumps({ "version": flutter_version, "engineVersion": engine_hash, + "engineSwiftShaderHash": engine_swiftshader_hash, + "engineSwiftShaderRev": engine_swiftshader_rev, "channel": channel, "engineHashes": engine_hashes, "dartVersion": dart_version, @@ -360,6 +381,8 @@ def main(): pubspec_lock={}, artifact_hashes={}, engine_hashes={}, + engine_swiftshader_hash=FAKE_HASH, + engine_swiftshader_rev='0', **common_data_args) pubspec_lock = get_pubspec_lock(flutter_compact_version, flutter_src) @@ -368,6 +391,8 @@ def main(): pubspec_lock=pubspec_lock, artifact_hashes={}, engine_hashes={}, + engine_swiftshader_hash=FAKE_HASH, + engine_swiftshader_rev='0', **common_data_args) artifact_hashes = get_artifact_hashes(flutter_compact_version) @@ -376,6 +401,8 @@ def main(): pubspec_lock=pubspec_lock, artifact_hashes=artifact_hashes, engine_hashes={}, + engine_swiftshader_hash=FAKE_HASH, + engine_swiftshader_rev='0', **common_data_args) engine_hashes = get_engine_hashes(engine_hash) @@ -384,6 +411,19 @@ def main(): pubspec_lock=pubspec_lock, artifact_hashes=artifact_hashes, engine_hashes=engine_hashes, + engine_swiftshader_hash=FAKE_HASH, + engine_swiftshader_rev='0', + **common_data_args) + + engine_swiftshader_rev = get_engine_swiftshader_rev(engine_hash) + engine_swiftshader_hash = get_engine_swiftshader_hash(engine_swiftshader_rev) + + write_data( + pubspec_lock=pubspec_lock, + artifact_hashes=artifact_hashes, + engine_hashes=engine_hashes, + engine_swiftshader_hash=engine_swiftshader_hash, + engine_swiftshader_rev=engine_swiftshader_rev, **common_data_args) diff --git a/pkgs/development/compilers/flutter/versions/3_13/data.json b/pkgs/development/compilers/flutter/versions/3_13/data.json index eb707f74f7c26..9bd8b818bf469 100644 --- a/pkgs/development/compilers/flutter/versions/3_13/data.json +++ b/pkgs/development/compilers/flutter/versions/3_13/data.json @@ -1,9 +1,12 @@ { "version": "3.13.8", "engineVersion": "767d8c75e898091b925519803830fc2721658d07", + "engineSwiftShaderHash": "sha256-N6f5aeDroqEwZlUBZi7nhDW8leE/7DqmOtRYOY4wzf4=", + "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8", "channel": "stable", "engineHashes": { - "aarch64-linux": "sha256-1s7I+AWb2kNDzJ5k2XYm7rSK8yj1wqTjPUuS0f85Jig=" + "aarch64-linux": "sha256-+MIGPmKHkcn3TlFYu6jXv8KBRqdECgtGSqAKQE33iAM=", + "x86_64-linux": "sha256-+MIGPmKHkcn3TlFYu6jXv8KBRqdECgtGSqAKQE33iAM=" }, "dartVersion": "3.1.4", "dartHash": { @@ -15,52 +18,52 @@ "flutterHash": "sha256-00G030FvZZTsdf9ruFs9jdIHcC5h+xpp4NlmL64qVZA=", "artifactHashes": { "android": { - "x86_64-linux": "sha256-Uc36aBq8wQo2aEvjAPOoixZElWOE/GNRm2GUfhbwT3Y=", + "aarch64-darwin": "sha256-v/6/GTj7732fEOIgSaoM00yaw2qNwOMuvbuoCvii7vQ=", "aarch64-linux": "sha256-Uc36aBq8wQo2aEvjAPOoixZElWOE/GNRm2GUfhbwT3Y=", "x86_64-darwin": "sha256-v/6/GTj7732fEOIgSaoM00yaw2qNwOMuvbuoCvii7vQ=", - "aarch64-darwin": "sha256-v/6/GTj7732fEOIgSaoM00yaw2qNwOMuvbuoCvii7vQ=" + "x86_64-linux": "sha256-Uc36aBq8wQo2aEvjAPOoixZElWOE/GNRm2GUfhbwT3Y=" }, "fuchsia": { - "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" + "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" }, "ios": { - "x86_64-linux": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=", + "aarch64-darwin": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=", "aarch64-linux": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=", "x86_64-darwin": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=", - "aarch64-darwin": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=" + "x86_64-linux": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=" }, "linux": { - "x86_64-linux": "sha256-0gIOwux3YBdmcXgwICr8dpftj1CauaBUX8Rt5GG0WSs=", + "aarch64-darwin": "sha256-drGHsuJoOCLqrhVrXczqJRCOtpeWVlqdWW0OSMS/l5M=", "aarch64-linux": "sha256-drGHsuJoOCLqrhVrXczqJRCOtpeWVlqdWW0OSMS/l5M=", "x86_64-darwin": "sha256-0gIOwux3YBdmcXgwICr8dpftj1CauaBUX8Rt5GG0WSs=", - "aarch64-darwin": "sha256-drGHsuJoOCLqrhVrXczqJRCOtpeWVlqdWW0OSMS/l5M=" + "x86_64-linux": "sha256-0gIOwux3YBdmcXgwICr8dpftj1CauaBUX8Rt5GG0WSs=" }, "macos": { - "x86_64-linux": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=", + "aarch64-darwin": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=", "aarch64-linux": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=", "x86_64-darwin": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=", - "aarch64-darwin": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=" + "x86_64-linux": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=" }, "universal": { - "x86_64-linux": "sha256-wATt1UPjo/fh7RFO1vvcUAdo0dMAaaOUIuzYodsM0v0=", + "aarch64-darwin": "sha256-mSpAPKyP9v0dbkXqYkzGOnD5OEjRZigiRElXXcHZ5TE=", "aarch64-linux": "sha256-Z9bszNaIpCccG7OfvE5WFsw36dITiyCQAZ6p29+Yq68=", "x86_64-darwin": "sha256-qN5bAXRfQ78TWF3FLBIxWzUB5y5OrZVQTEilY5J/+2k=", - "aarch64-darwin": "sha256-mSpAPKyP9v0dbkXqYkzGOnD5OEjRZigiRElXXcHZ5TE=" + "x86_64-linux": "sha256-wATt1UPjo/fh7RFO1vvcUAdo0dMAaaOUIuzYodsM0v0=" }, "web": { - "x86_64-linux": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=", + "aarch64-darwin": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=", "aarch64-linux": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=", "x86_64-darwin": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=", - "aarch64-darwin": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=" + "x86_64-linux": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=" }, "windows": { - "x86_64-linux": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=", + "aarch64-darwin": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=", "aarch64-linux": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=", "x86_64-darwin": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=", - "aarch64-darwin": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=" + "x86_64-linux": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=" } }, "pubspecLock": { diff --git a/pkgs/development/compilers/flutter/versions/3_16/data.json b/pkgs/development/compilers/flutter/versions/3_16/data.json index 477328b4aa6b2..08cbdff5bc77d 100644 --- a/pkgs/development/compilers/flutter/versions/3_16/data.json +++ b/pkgs/development/compilers/flutter/versions/3_16/data.json @@ -1,9 +1,12 @@ { "version": "3.16.7", "engineVersion": "4a585b79294e830fa89c24924d58a27cc8fbf406", + "engineSwiftShaderHash": "sha256-N6f5aeDroqEwZlUBZi7nhDW8leE/7DqmOtRYOY4wzf4=", + "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8", "channel": "stable", "engineHashes": { - "aarch64-linux": "sha256-xqniT1rYrzCuq6542KfqWRigYtLnmaT0z5Es/59iFMw=" + "aarch64-linux": "sha256-irrfyKvTHqaBgcKg3jJzEDs1B4Q91u/e6Ui01MDI+oU=", + "x86_64-linux": "sha256-irrfyKvTHqaBgcKg3jJzEDs1B4Q91u/e6Ui01MDI+oU=" }, "dartVersion": "3.2.4", "dartHash": { @@ -15,51 +18,51 @@ "flutterHash": "sha256-j+tc8hMgZMBhju89n4e9tKRrq+CFBGOyeE0y+Z4FtHE=", "artifactHashes": { "android": { + "aarch64-darwin": "sha256-0FBI0CGMcxyttkzrdyjJlkGAjFd/yMuAQS3pDrNXZZw=", "aarch64-linux": "sha256-j8jstEE1RsTVHJbq6f6We0An+CyJz9JH/YClyNA4mwg=", "x86_64-darwin": "sha256-0FBI0CGMcxyttkzrdyjJlkGAjFd/yMuAQS3pDrNXZZw=", - "aarch64-darwin": "sha256-0FBI0CGMcxyttkzrdyjJlkGAjFd/yMuAQS3pDrNXZZw=", "x86_64-linux": "sha256-j8jstEE1RsTVHJbq6f6We0An+CyJz9JH/YClyNA4mwg=" }, "fuchsia": { + "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" }, "ios": { + "aarch64-darwin": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=", "aarch64-linux": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=", "x86_64-darwin": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=", - "aarch64-darwin": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=", "x86_64-linux": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=" }, "linux": { + "aarch64-darwin": "sha256-LWpou3L7bAWGn8i4nDT/BZez2Uhf/LbqC2C4Z98hCHQ=", "aarch64-linux": "sha256-LWpou3L7bAWGn8i4nDT/BZez2Uhf/LbqC2C4Z98hCHQ=", "x86_64-darwin": "sha256-BzjmO4F8B9GagYPbdvoT55r+YgZcP4BUaKgJPGZDXOU=", - "aarch64-darwin": "sha256-LWpou3L7bAWGn8i4nDT/BZez2Uhf/LbqC2C4Z98hCHQ=", "x86_64-linux": "sha256-BzjmO4F8B9GagYPbdvoT55r+YgZcP4BUaKgJPGZDXOU=" }, "macos": { + "aarch64-darwin": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=", "aarch64-linux": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=", "x86_64-darwin": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=", - "aarch64-darwin": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=", "x86_64-linux": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=" }, "universal": { + "aarch64-darwin": "sha256-Emus5J3mqPv47PD6xqNUD1KpXhVkX4JpURWuYG6KC14=", "aarch64-linux": "sha256-uB2YZRjioP/koMbPvaBHsezjPO0w5a+BpxZaDuiINIY=", "x86_64-darwin": "sha256-Qwf12gMqrW5nDC9Is08oxWTbKMptRQRAIb58JETq3xA=", - "aarch64-darwin": "sha256-Emus5J3mqPv47PD6xqNUD1KpXhVkX4JpURWuYG6KC14=", "x86_64-linux": "sha256-quSFKx7TZRJpK+4YDt5f9jwr7rZsSsaXMxhJ8vIcczQ=" }, "web": { + "aarch64-darwin": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=", "aarch64-linux": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=", "x86_64-darwin": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=", - "aarch64-darwin": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=", "x86_64-linux": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=" }, "windows": { + "aarch64-darwin": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=", "aarch64-linux": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=", "x86_64-darwin": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=", - "aarch64-darwin": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=", "x86_64-linux": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=" } }, diff --git a/pkgs/development/compilers/flutter/versions/3_19/data.json b/pkgs/development/compilers/flutter/versions/3_19/data.json index c09d3e99a3cac..491447493db98 100644 --- a/pkgs/development/compilers/flutter/versions/3_19/data.json +++ b/pkgs/development/compilers/flutter/versions/3_19/data.json @@ -1,11 +1,12 @@ { "version": "3.19.4", "engineVersion": "a5c24f538d05aaf66f7972fb23959d8cafb9f95a", + "engineSwiftShaderHash": "sha256-J8TKwbIQ7hdWCGIu1T//MJlRzT7OTVL0MG/dmMyutPQ=", + "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "stable", "engineHashes": { - "x86_64-linux": "sha256-xhihh4v9bh2ZxAewKEdhpXerLDoXFm8YO72+tGRnkCw=", - "aarch64-linux": "sha256-mUimQRg0UqvTueuDWO8Isy0FKOxJLvVZrehv4SMj0XY=", - "aarch64-darwin": "sha256-5DcD7ebrANznB++QOQOoynr1aOgJqTF8QfSihQnghoY=" + "aarch64-linux": "sha256-YTG46ZYCOu0OJGIILV6NGvIEhQU0yHNFSMR38Xvqa9E=", + "x86_64-linux": "sha256-YTG46ZYCOu0OJGIILV6NGvIEhQU0yHNFSMR38Xvqa9E=" }, "dartVersion": "3.3.2", "dartHash": { diff --git a/pkgs/development/compilers/flutter/versions/3_22/data.json b/pkgs/development/compilers/flutter/versions/3_22/data.json index 968fde9d7b27c..140b22bbcb1c6 100644 --- a/pkgs/development/compilers/flutter/versions/3_22/data.json +++ b/pkgs/development/compilers/flutter/versions/3_22/data.json @@ -1,10 +1,12 @@ { "version": "3.22.2", "engineVersion": "edd8546116457bdf1c5bdfb13ecb9463d2bb5ed4", + "engineSwiftShaderHash": "sha256-J8TKwbIQ7hdWCGIu1T//MJlRzT7OTVL0MG/dmMyutPQ=", + "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "stable", "engineHashes": { - "aarch64-linux": "sha256-xPVhLxO9AgXC2+Hwm1lWRfNZhLwZHdKW92WXgv3ImZk=", - "x86_64-linux": "sha256-klODJpmlWynYx+MqqGGeTzzPtmQTEUV47hnzjIVDCK8=" + "aarch64-linux": "sha256-OPgevqdMwKhXml+PS5Z1DW0wg843NVN57CiLbXve8kE=", + "x86_64-linux": "sha256-OPgevqdMwKhXml+PS5Z1DW0wg843NVN57CiLbXve8kE=" }, "dartVersion": "3.4.3", "dartHash": { diff --git a/pkgs/development/compilers/flutter/versions/3_23/data.json b/pkgs/development/compilers/flutter/versions/3_23/data.json index 3c3fedbdecaeb..a4087fea903ec 100644 --- a/pkgs/development/compilers/flutter/versions/3_23/data.json +++ b/pkgs/development/compilers/flutter/versions/3_23/data.json @@ -1,9 +1,12 @@ { "version": "3.23.0-0.1.pre", "engineVersion": "bb10c5466638e963479ba5e64e601e42d1a43447", + "engineSwiftShaderHash": "sha256-J8TKwbIQ7hdWCGIu1T//MJlRzT7OTVL0MG/dmMyutPQ=", + "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "beta", "engineHashes": { - "aarch64-linux": "sha256-WHWxYOHd3jxE5CQNt0+9qxlsCLK5y9iJsVERtJ4Ylbk=" + "aarch64-linux": "sha256-g169BDV6NtiyriMSgK3GOwhkVi9X23SqB9HOxxtGPK4=", + "x86_64-linux": "sha256-g169BDV6NtiyriMSgK3GOwhkVi9X23SqB9HOxxtGPK4=" }, "dartVersion": "3.5.0-180.3.beta", "dartHash": { diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 4b20cf7f43f06..c988eba2e5aeb 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -7,7 +7,7 @@ "universal" "web" ] - ++ lib.optional stdenv.hostPlatform.isLinux "linux" + ++ lib.optional (stdenv.hostPlatform.isLinux && !(flutter ? engine)) "linux" ++ lib.optional (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isDarwin) "android" ++ lib.optionals stdenv.hostPlatform.isDarwin [ "macos" "ios" ] , artifactHashes ? flutter.artifactHashes @@ -147,7 +147,7 @@ in --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ '' + lib.optionalString (flutter ? engine && flutter.engine.meta.available) '' --set-default FLUTTER_ENGINE "${flutter.engine}" \ - --add-flags "--local-engine-host host_${flutter.engine.runtimeMode}${lib.optionalString (!flutter.engine.isOptimized) "_unopt"}" \ + --add-flags "--local-engine-host ${flutter.engine.outName}" \ '' + '' --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \ --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \ diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix index 1df763e4c4fd4..5b7c4a92a5ffc 100644 --- a/pkgs/development/compilers/idris2/build-idris.nix +++ b/pkgs/development/compilers/idris2/build-idris.nix @@ -18,11 +18,24 @@ , ... }@attrs: let + # loop over idrisLibraries and normalize them by turning any that are + # direct outputs of the buildIdris function into the `.library {}` + # property. + idrisLibraryLibs = map (idrisLib: + if lib.isDerivation idrisLib + then idrisLib + else if builtins.isFunction idrisLib + then idrisLib {} + else if (builtins.isAttrs idrisLib && idrisLib ? "library") + then idrisLib.library {} + else throw "Found an Idris2 library dependency that was not the result of the buildIdris function" + ) idrisLibraries; + propagate = libs: lib.unique (lib.concatMap (nextLib: [nextLib] ++ nextLib.propagatedIdrisLibraries) libs); ipkgFileName = ipkgName + ".ipkg"; idrName = "idris2-${idris2.version}"; libSuffix = "lib/${idrName}"; - propagatedIdrisLibraries = propagate idrisLibraries; + propagatedIdrisLibraries = propagate idrisLibraryLibs; libDirs = (lib.makeSearchPath libSuffix propagatedIdrisLibraries) + ":${idris2}/${idrName}"; diff --git a/pkgs/development/compilers/idris2/idris2-lsp.nix b/pkgs/development/compilers/idris2/idris2-lsp.nix index 095b973cc0cb3..59a718c045ce5 100644 --- a/pkgs/development/compilers/idris2/idris2-lsp.nix +++ b/pkgs/development/compilers/idris2/idris2-lsp.nix @@ -11,8 +11,8 @@ let ]; globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries; - idris2Api = idris2Packages.idris2Api { }; - lspLib = (idris2Packages.buildIdris { + inherit (idris2Packages) idris2Api; + lspLib = idris2Packages.buildIdris { ipkgName = "lsp-lib"; version = "2024-01-21"; src = fetchFromGitHub { @@ -22,7 +22,7 @@ let hash = "sha256-ICW9oOOP70hXneJFYInuPY68SZTDw10dSxSPTW4WwWM="; }; idrisLibraries = [ ]; - }).library { }; + }; lspPkg = idris2Packages.buildIdris { ipkgName = "idris2-lsp"; diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 786bd82fa648c..ff76aad22a718 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -20,9 +20,9 @@ # LLVM release information; specify one of these but not both: , gitRelease ? { version = "19.0.0-git"; - rev = "78ee473784e5ef6f0b19ce4cb111fb6e4d23c6b2"; - rev-version = "19.0.0-unstable-2024-06-12"; - sha256 = "sha256-oLVMwWjo6Nt8ZsTnDTfoiM5U0+1lVIc1NO+4qBNYlzs="; + rev = "a9ac31910db3975d5e92a6265ab29dafd6a4691d"; + rev-version = "19.0.0-unstable-2024-06-23"; + sha256 = "sha256-MTt2FU84rgu6FqB9aCO6M54VZexoogkdx5RKS1NzSkk="; } # i.e.: # { diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 5a172bd360db7..61a8c3a5c5bd8 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,26 +18,29 @@ in stdenv.mkDerivation rec { version = "0.15.15"; # These hashes can be updated automatically by running the ./update.sh script. - src = - if stdenv.isDarwin - then - (if stdenv.isAarch64 - then - fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos-arm64.tar.gz"; - sha256 = "0bi231z1yhb7kjfn228wjkj6rv9lgpagz9f4djr2wy3kqgck4xg0"; - } - else - fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; + src = let + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/"; + sources = { + "x86_64-linux" = fetchurl { + url = url + "linux64.tar.gz"; + sha256 = "1w4jgjpfhaw3gkx9sna64lq9m030x49w4lwk01ik5ci0933imzj3"; + }; + "aarch64-linux" = fetchurl { + url = url + "linux-arm64.tar.gz"; + sha256 = "1ws5h337xq0l06zrs9010h6wj2hq5cqk5ikp9arq7hj7lxf43vn5"; + }; + "x86_64-darwin" = fetchurl { + url = url + "macos.tar.gz"; sha256 = "178ix54k2yragcgn0j8z1cfa78s1qbh1bsx3v9jnngby8igr6yn3"; - }) - else - fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1w4jgjpfhaw3gkx9sna64lq9m030x49w4lwk01ik5ci0933imzj3"; + }; + "aarch64-darwin" = fetchurl { + url = url + "macos-arm64.tar.gz"; + sha256 = "0bi231z1yhb7kjfn228wjkj6rv9lgpagz9f4djr2wy3kqgck4xg0"; + }; }; - + in + sources.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); buildInputs = [ zlib gmp ]; libPath = lib.makeLibraryPath buildInputs; @@ -49,7 +52,7 @@ in stdenv.mkDerivation rec { install -D -m555 -T purs $PURS ${patchelf libPath} - + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' mkdir -p $out/share/bash-completion/completions $PURS --bash-completion-script $PURS > $out/share/bash-completion/completions/purs-completion.bash ''; @@ -67,7 +70,7 @@ in stdenv.mkDerivation rec { license = licenses.bsd3; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "purs"; changelog = "https://github.com/purescript/purescript/releases/tag/v${version}"; }; diff --git a/pkgs/development/compilers/purescript/purescript/update.sh b/pkgs/development/compilers/purescript/purescript/update.sh index 259fb8aa56107..186a51a2bca3a 100755 --- a/pkgs/development/compilers/purescript/purescript/update.sh +++ b/pkgs/development/compilers/purescript/purescript/update.sh @@ -25,6 +25,10 @@ old_linux_version_hash="$(nix-prefetch-url "https://github.com/purescript/puresc echo "v${old_version} linux tarball hash (current version): $old_linux_version_hash" new_linux_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/linux64.tar.gz")" echo "v${new_version} linux tarball hash: $new_linux_version_hash" +old_linux_arm_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/linux-arm64.tar.gz")" +echo "v${old_version} linux tarball hash (current version): $old_linux_arm_version_hash" +new_linux_arm_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/linux-arm64.tar.gz")" +echo "v${new_version} linux tarball hash: $new_linux_arm_version_hash" old_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/macos.tar.gz")" echo "v${old_version} darwin tarball hash (current version): $old_darwin_version_hash" new_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/macos.tar.gz")" @@ -37,6 +41,7 @@ echo echo "Replacing version and hashes in ${purescript_derivation_file}." sed -i -e "s/${old_linux_version_hash}/${new_linux_version_hash}/" "$purescript_derivation_file" +sed -i -e "s/${old_linux_arm_version_hash}/${new_linux_arm_version_hash}/" "$purescript_derivation_file" sed -i -e "s/${old_darwin_version_hash}/${new_darwin_version_hash}/" "$purescript_derivation_file" sed -i -e "s/${old_darwin_arm_version_hash}/${new_darwin_arm_version_hash}/" "$purescript_derivation_file" sed -i -e "s/${old_version}/${new_version}/" "$purescript_derivation_file" diff --git a/pkgs/development/interpreters/babashka/clojure-tools.nix b/pkgs/development/interpreters/babashka/clojure-tools.nix index 082cb99f476d9..fec8a7fd5a5aa 100644 --- a/pkgs/development/interpreters/babashka/clojure-tools.nix +++ b/pkgs/development/interpreters/babashka/clojure-tools.nix @@ -6,10 +6,10 @@ }: clojure.overrideAttrs (previousAttrs: { pname = "babashka-clojure-tools"; - version = "1.11.2.1446"; + version = "1.11.3.1463"; src = fetchurl { url = previousAttrs.src.url; - hash = "sha256-qn7/sPyVDfjZPLeWxlUBBljAW/d8cCw6lEm3/deS73E="; + hash = "sha256-26QZ3j54XztpW2WJ1xg0Gc+OwrsvmfK4iv0GsLV8FIc="; }; }) diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix index 26e16afe69c0f..fc54f3e0311d9 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/development/interpreters/babashka/default.nix @@ -9,11 +9,11 @@ let babashka-unwrapped = buildGraalvmNativeImage rec { pname = "babashka-unwrapped"; - version = "1.3.190"; + version = "1.3.191"; src = fetchurl { url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar"; - sha256 = "sha256-zGWUuFyCOZXrcAOJ2sGvzvfJbFti1IlDS1gx9Oye9fg="; + sha256 = "sha256-xF0u2VO0xdNvRElhUb7atpvy2Y5T9/V1b92ffaOMga8="; }; graalvmDrv = graalvmCEPackages.graalvm-ce; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 1c6cbb96a490c..34388c8c033b1 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "janet"; - version = "1.34.0"; + version = "1.35.2"; src = fetchFromGitHub { owner = "janet-lang"; repo = "janet"; rev = "v${finalAttrs.version}"; - hash = "sha256-DxUEFW9NzAyaE/6vNEFfddIaxsi7qovousxZ28Hveb4="; + hash = "sha256-iqexxlBFM4ffxDsOdKMRJs/ufhKV0jvzqgZ3tH9S/k0="; }; postPatch = '' diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index 0e4f62d42e2db..6f3342d057bd1 100644 --- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -78,7 +78,7 @@ let luarocksDrv = luaLib.toLuaModule ( lua.stdenv.mkDerivation (self: attrs // { - name = namePrefix + pname + "-" + self.version; + name = namePrefix + self.pname + "-" + self.version; inherit rockspecVersion; __structuredAttrs = true; @@ -114,7 +114,7 @@ let rocksSubdir = "${self.pname}-${self.version}-rocks"; configFile = writeTextFile { - name = pname + "-luarocks-config.lua"; + name = self.pname + "-luarocks-config.lua"; text = self.luarocks_content; }; diff --git a/pkgs/development/libraries/abseil-cpp/202206.nix b/pkgs/development/libraries/abseil-cpp/202206.nix deleted file mode 100644 index b8eb30773a067..0000000000000 --- a/pkgs/development/libraries/abseil-cpp/202206.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, static ? stdenv.hostPlatform.isStatic -, cxxStandard ? null -}: - -stdenv.mkDerivation rec { - pname = "abseil-cpp"; - version = "20220623.2"; - - src = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - rev = "refs/tags/${version}"; - hash = "sha256-ma8QJfSySsk2XVLA0rhwYJMQx+6HxMFgub6gi5mDrLI="; - }; - - patches = lib.optionals stdenv.isDarwin [ - # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages - # that require a different SDK other than the default one. - ./cmake-core-foundation.patch - ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - ] ++ lib.optionals (cxxStandard != null) [ - "-DCMAKE_CXX_STANDARD=${cxxStandard}" - ]; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Open-source collection of C++ code designed to augment the C++ standard library"; - homepage = "https://abseil.io/"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = [ maintainers.andersk ]; - }; -} diff --git a/pkgs/development/libraries/abseil-cpp/202308.nix b/pkgs/development/libraries/abseil-cpp/202308.nix deleted file mode 100644 index f03ee08ea58ec..0000000000000 --- a/pkgs/development/libraries/abseil-cpp/202308.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gtest -, static ? stdenv.hostPlatform.isStatic -, cxxStandard ? null -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "abseil-cpp"; - version = "20230802.2"; - - src = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-wW7dCqiiHyBHiizyV0+M6p17itwTpzHv/T0/mcXyYWE="; - }; - - cmakeFlags = [ - "-DABSL_BUILD_TEST_HELPERS=ON" - "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" - "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - ] ++ lib.optionals (cxxStandard != null) [ - "-DCMAKE_CXX_STANDARD=${cxxStandard}" - ]; - - strictDeps = true; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ gtest ]; - - meta = with lib; { - description = "Open-source collection of C++ code designed to augment the C++ standard library"; - homepage = "https://abseil.io/"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = [ maintainers.andersk ]; - }; -}) diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index 8c331a28dcb12..e1a5db9c0f19a 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "coin"; - version = "unstable-2022-07-27"; + version = "4.0.2"; src = fetchFromGitHub { owner = "coin3d"; repo = "coin"; - rev = "4c67945a58d2a6e5adb4d2332ab08007769130ef"; - hash = "sha256-lXS7GxtoPsZe2SJfr0uY99Q0ZtYG0KFlauY1PBuFleo="; + rev = "v${finalAttrs.version}"; + hash = "sha256-tBegPZQme5McC0HGvjjdIBQQl59Ud4aJk2hONWMzEdc="; }; nativeBuildInputs = [ cmake ]; @@ -25,8 +25,7 @@ stdenv.mkDerivation (finalAttrs: { boost libGL libGLU - libX11 - ]; + ] ++ lib.optional stdenv.isLinux libX11; cmakeFlags = [ "-DCOIN_USE_CPACK=OFF" ]; @@ -36,6 +35,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "coin-config"; license = licenses.bsd3; maintainers = with maintainers; [ gebner viric ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; }) diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index 81705374381e7..4d6029d6d8211 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, autoreconfHook, ... } @ args: +{ lib, stdenv, fetchurl, autoreconfHook, targetPlatform, ... } @ args: -import ./generic.nix (args // { +import ./generic.nix (builtins.removeAttrs args ["targetPlatform"] // { version = "4.8.30"; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; extraPatches = [ @@ -9,6 +9,8 @@ import ./generic.nix (args // { ./darwin-mutexes-4.8.patch ]; + drvArgs.configureFlags = lib.optional (targetPlatform.useLLVM or false) "--with-mutex=POSIX/pthreads"; + drvArgs.hardeningDisable = [ "format" ]; drvArgs.doCheck = false; }) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index d715c1ffc8b19..ddb4139e116d1 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -67,7 +67,8 @@ stdenv.mkDerivation (rec { (if compat185 then "--enable-compat185" else "--disable-compat185") ] ++ lib.optional dbmSupport "--enable-dbm" - ++ lib.optional stdenv.isFreeBSD "--with-pic"; + ++ lib.optional stdenv.isFreeBSD "--with-pic" + ++ (drvArgs.configureFlags or []); preConfigure = '' cd build_unix @@ -92,4 +93,4 @@ stdenv.mkDerivation (rec { license = license; platforms = platforms.unix; }; -} // drvArgs) +} // builtins.removeAttrs drvArgs [ "configureFlags" ]) diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 910494e0b473d..6e0c1b5375182 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -101,5 +101,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl3Only; platforms = platforms.linux; maintainers = [ maintainers.markuskowa ]; + broken = true; # At 2024-06-25. 49 unit tests fail. + # https://hydra.nixos.org/build/263906391/nixlog/1 }; } diff --git a/pkgs/development/libraries/fbjni/default.nix b/pkgs/development/libraries/fbjni/default.nix index cb0d766a90da5..eec0756abf4ee 100644 --- a/pkgs/development/libraries/fbjni/default.nix +++ b/pkgs/development/libraries/fbjni/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { description = "Library designed to simplify the usage of the Java Native Interface"; homepage = "https://github.com/facebookincubator/fbjni"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 51e0c685a43d2..7e44794620c03 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -3,6 +3,21 @@ , fetchFromGitHub , cmake , ninja +# Enable C++17 support +# https://github.com/google/googletest/issues/3081 +# Projects that require a higher standard can override this package. +# For an example why that may be necessary, see: +# https://github.com/mhx/dwarfs/issues/188#issuecomment-1907574427 +# Setting this to `null` does not pass any flags to set this. +, cxx_standard ? ( + if ( + (stdenv.cc.isGNU && (lib.versionOlder stdenv.cc.version "11.0")) + || + (stdenv.cc.isClang && (lib.versionOlder stdenv.cc.version "16.0")) + ) + then "17" + else null + ) , static ? stdenv.hostPlatform.isStatic, }: @@ -27,13 +42,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - ] ++ lib.optionals ( - (stdenv.cc.isGNU && (lib.versionOlder stdenv.cc.version "11.0")) - || (stdenv.cc.isClang && (lib.versionOlder stdenv.cc.version "16.0")) - ) [ - # Enable C++17 support - # https://github.com/google/googletest/issues/3081 - "-DCMAKE_CXX_STANDARD=17" + ] ++ lib.optionals (cxx_standard != null) [ + "-DCMAKE_CXX_STANDARD=${cxx_standard}" ]; meta = with lib; { diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index b70e270ba6ffa..dfd09e5dc6c45 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -279,9 +279,13 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${finalAttrs.version}/NEWS"; pkgConfigModules = [ "gtk4" + ] ++ lib.optionals broadwaySupport [ "gtk4-broadway" + ] ++ lib.optionals stdenv.hostPlatform.isUnix [ "gtk4-unix-print" + ] ++ lib.optionals waylandSupport [ "gtk4-wayland" + ] ++ lib.optionals x11Support [ "gtk4-x11" ]; }; diff --git a/pkgs/development/libraries/libe57format/default.nix b/pkgs/development/libraries/libe57format/default.nix index cbbdd4dcc0263..41fda970294da 100644 --- a/pkgs/development/libraries/libe57format/default.nix +++ b/pkgs/development/libraries/libe57format/default.nix @@ -1,51 +1,68 @@ { lib, stdenv, cmake, - fetchpatch, fetchFromGitHub, - boost, + fetchpatch, xercesc, - icu, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libe57format"; - version = "2.2.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "asmaloney"; repo = "libE57Format"; - rev = "v${version}"; - sha256 = "15l23spjvak5h3n7aj3ggy0c3cwcg8mvnc9jlbd9yc2ra43bx7bp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-bOuWh9Nkxva2v0M6+vnAya8EW/G3WQePxHakQt8T9NE="; + fetchSubmodules = true; # for submodule-vendored libraries such as `gtest` + }; + + # Repository of E57 files used for testing. + libE57Format-test-data_src = fetchFromGitHub { + owner = "asmaloney"; + repo = "libE57Format-test-data"; + rev = "4960564a732c6444c50dfae5b2273e68837399cd"; + hash = "sha256-k26yVbYSQJ3EMgcpjm35N1OAxarFmfMvzfTN2Hdyu8c="; }; - patches = [ - # gcc11 header fix - (fetchpatch { - url = "https://github.com/asmaloney/libE57Format/commit/13f6a16394ce3eb50ea4cd21f31f77f53294e8d0.patch"; - sha256 = "sha256-4vVhKrCxnWO106DSAk+xxo4uk6zC89m9VQAPaDJ8Ed4="; - }) - ]; CXXFLAGS = [ # GCC 13: error: 'int16_t' has not been declared in 'std' "-include cstdint" ]; + patches = [ + # TODO: Remove with the next release: https://github.com/asmaloney/libE57Format/pull/299 + (fetchpatch { + name = "libE57Format-Dont-force-warnings-as-errors-when-building-self.patch"; # https://github.com/apache/thrift/pull/2726 + url = "https://github.com/asmaloney/libE57Format/commit/66bb5af15937b4c10a7f412ca4d1673f42bbad28.patch"; + hash = "sha256-2cNURjMLP0TijYY5gbuWLE7H/PlMW936wAeOqJ/w9C0="; + }) + + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - boost - icu + xercesc ]; - propagatedBuildInputs = [ - # Necessary for projects that try to find libE57Format via CMake - # due to the way that libe57format's CMake config is written. - xercesc + cmakeFlags = [ + # See https://github.com/asmaloney/libE57Format/blob/9372bdea8db2cc0c032a08f6d655a53833d484b8/test/README.md + (if finalAttrs.doCheck + then "-DE57_TEST_DATA_PATH=${finalAttrs.libE57Format-test-data_src}" + else "-DE57_BUILD_TEST=OFF" + ) ]; + doCheck = true; + + postCheck = '' + ./testE57 + ''; + # The build system by default builds ONLY static libraries, and with # `-DE57_BUILD_SHARED=ON` builds ONLY shared libraries, see: # https://github.com/asmaloney/libE57Format/issues/48 @@ -70,4 +87,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ chpatrick nh2 ]; platforms = platforms.linux; # because of the .so buiding in `postInstall` above }; -} +}) diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/libva-vdpau-driver/default.nix index 2e3976e3a4d23..2e3976e3a4d23 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/libva-vdpau-driver/default.nix diff --git a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch index 45e54673a0efa..5345dffc04458 100644 --- a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch +++ b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -1,36 +1,37 @@ -From ad42041cfedcf25716429d2aad16641e0e2a012f Mon Sep 17 00:00:00 2001 +From 58c07f1d59ef683faf8b747e40bd75401306acf4 Mon Sep 17 00:00:00 2001 From: Euan Kemp <euank@euank.com> -Date: Thu, 14 Jan 2021 00:32:00 -0800 +Date: Mon, 24 Jun 2024 15:59:48 +0200 Subject: [PATCH] meson: patch in an install prefix for building on nix Used in the nixpkgs version of libvirt so that we can install things in the nix store, but read them from the root filesystem. --- - meson.build | 9 ++++++++ + meson.build | 9 +++++++ meson_options.txt | 2 ++ src/ch/meson.build | 6 ++--- src/interface/meson.build | 2 +- - src/libxl/meson.build | 18 +++++++-------- + src/libxl/meson.build | 18 +++++++------- src/locking/meson.build | 8 +++---- src/lxc/meson.build | 10 ++++---- - src/meson.build | 18 +++++++-------- - src/network/meson.build | 14 ++++++------ + src/meson.build | 18 +++++++------- + src/network/meson.build | 14 +++++------ src/node_device/meson.build | 2 +- src/nwfilter/meson.build | 6 ++--- src/nwfilter/xml/meson.build | 2 +- - src/qemu/meson.build | 38 +++++++++++++++---------------- + src/qemu/meson.build | 40 +++++++++++++++---------------- src/remote/meson.build | 10 ++++---- src/secret/meson.build | 4 ++-- src/security/apparmor/meson.build | 8 +++---- src/storage/meson.build | 6 ++--- tools/meson.build | 2 +- - 18 files changed, 88 insertions(+), 77 deletions(-) + tools/ssh-proxy/meson.build | 2 +- + 19 files changed, 90 insertions(+), 79 deletions(-) diff --git a/meson.build b/meson.build -index 9016c0458a..b26e690194 100644 +index e98ab0d5ac..376f241c07 100644 --- a/meson.build +++ b/meson.build -@@ -39,6 +39,8 @@ if host_machine.system() == 'windows' +@@ -47,6 +47,8 @@ if host_machine.system() == 'windows' conf.set('WINVER', '0x0600') # Win Vista / Server 2008 endif @@ -39,7 +40,7 @@ index 9016c0458a..b26e690194 100644 # set various paths -@@ -57,6 +59,13 @@ else +@@ -65,6 +67,13 @@ else sysconfdir = prefix / get_option('sysconfdir') endif @@ -54,7 +55,7 @@ index 9016c0458a..b26e690194 100644 # sysconfdir as this makes a lot of things break in testing situations if prefix == '/usr' diff --git a/meson_options.txt b/meson_options.txt -index 5b43cdbd6b..e9dff18441 100644 +index cdc8687795..c2b6da140c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ @@ -64,10 +65,10 @@ index 5b43cdbd6b..e9dff18441 100644 option('packager', type: 'string', value: '', description: 'Extra packager name') option('packager_version', type: 'string', value: '', description: 'Extra packager version') diff --git a/src/ch/meson.build b/src/ch/meson.build -index 66b77907b0..6aa9bbc548 100644 +index 633966aac7..c0ce823345 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build -@@ -64,8 +64,8 @@ if conf.has('WITH_CH') +@@ -74,8 +74,8 @@ if conf.has('WITH_CH') } virt_install_dirs += [ @@ -80,10 +81,10 @@ index 66b77907b0..6aa9bbc548 100644 ] endif diff --git a/src/interface/meson.build b/src/interface/meson.build -index 828f274422..2a6b1f8c5e 100644 +index 3d2991315e..20f3266738 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build -@@ -56,6 +56,6 @@ if conf.has('WITH_INTERFACE') +@@ -59,6 +59,6 @@ if conf.has('WITH_INTERFACE') } virt_install_dirs += [ @@ -92,10 +93,10 @@ index 828f274422..2a6b1f8c5e 100644 ] endif diff --git a/src/libxl/meson.build b/src/libxl/meson.build -index 0cc277db82..48d8c5b962 100644 +index e75a8f2fdb..d1800b4ea5 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build -@@ -79,14 +79,14 @@ if conf.has('WITH_LIBXL') +@@ -81,14 +81,14 @@ if conf.has('WITH_LIBXL') } virt_install_dirs += [ @@ -120,10 +121,10 @@ index 0cc277db82..48d8c5b962 100644 ] endif diff --git a/src/locking/meson.build b/src/locking/meson.build -index 72f7780438..abe70d20d5 100644 +index c3dfcf2961..cdc1442775 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build -@@ -238,14 +238,14 @@ if conf.has('WITH_LIBVIRTD') +@@ -249,14 +249,14 @@ if conf.has('WITH_LIBVIRTD') } virt_install_dirs += [ @@ -143,10 +144,10 @@ index 72f7780438..abe70d20d5 100644 endif endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build -index 99d4a34213..aae477c1ee 100644 +index bf9afabc0f..6e9547000a 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build -@@ -176,10 +176,10 @@ if conf.has('WITH_LXC') +@@ -190,10 +190,10 @@ if conf.has('WITH_LXC') } virt_install_dirs += [ @@ -163,10 +164,10 @@ index 99d4a34213..aae477c1ee 100644 ] endif diff --git a/src/meson.build b/src/meson.build -index b2d951d36c..305716010f 100644 +index dd2682ec19..b330d1159e 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -210,7 +210,7 @@ openrc_init_files = [] +@@ -220,7 +220,7 @@ openrc_init_files = [] # virt_install_dirs: # list of directories to create during installation @@ -175,7 +176,7 @@ index b2d951d36c..305716010f 100644 # driver_source_files: # driver source files to check -@@ -663,7 +663,7 @@ endforeach +@@ -697,7 +697,7 @@ endforeach virt_conf_files += 'libvirt.conf' @@ -184,7 +185,7 @@ index b2d951d36c..305716010f 100644 install_data(virt_aug_files, install_dir: virt_aug_dir) # augeas_test_data: -@@ -723,7 +723,7 @@ foreach data : virt_daemon_confs +@@ -760,7 +760,7 @@ foreach data : virt_daemon_confs output: '@0@.conf'.format(data['name']), configuration: daemon_conf, install: true, @@ -193,7 +194,7 @@ index b2d951d36c..305716010f 100644 ) if data.get('with_ip', false) -@@ -847,7 +847,7 @@ if conf.has('WITH_LIBVIRTD') +@@ -910,7 +910,7 @@ if conf.has('WITH_LIBVIRTD') install_data( init_file, @@ -202,7 +203,7 @@ index b2d951d36c..305716010f 100644 install_mode: 'rwxr-xr-x', rename: [ init['name'] ], ) -@@ -855,7 +855,7 @@ if conf.has('WITH_LIBVIRTD') +@@ -918,7 +918,7 @@ if conf.has('WITH_LIBVIRTD') if init.has_key('confd') install_data( init['confd'], @@ -211,7 +212,7 @@ index b2d951d36c..305716010f 100644 rename: [ init['name'] ], ) endif -@@ -882,10 +882,10 @@ endif +@@ -945,10 +945,10 @@ endif # Install empty directories virt_install_dirs += [ @@ -227,10 +228,10 @@ index b2d951d36c..305716010f 100644 meson.add_install_script( diff --git a/src/network/meson.build b/src/network/meson.build -index b5eff0c3ab..a0f26d624e 100644 +index 07cd5cda55..699309bb66 100644 --- a/src/network/meson.build +++ b/src/network/meson.build -@@ -73,11 +73,11 @@ 'in_file': files('virtnetworkd.init.in'), +@@ -115,11 +115,11 @@ if conf.has('WITH_NETWORK') } virt_install_dirs += [ @@ -247,9 +248,9 @@ index b5eff0c3ab..a0f26d624e 100644 ] configure_file( -@@ -85,12 +85,12 @@ input: 'default.xml.in', +@@ -127,12 +127,12 @@ if conf.has('WITH_NETWORK') output: '@BASENAME@', - copy: true, + configuration: configmake_conf, install: true, - install_dir: confdir / 'qemu' / 'networks', + install_dir: install_prefix + confdir / 'qemu' / 'networks', @@ -263,10 +264,10 @@ index b5eff0c3ab..a0f26d624e 100644 ) diff --git a/src/node_device/meson.build b/src/node_device/meson.build -index 1c95975c37..a7831242db 100644 +index d66c02a0e2..f883b65431 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build -@@ -64,6 +64,6 @@ if conf.has('WITH_NODE_DEVICES') +@@ -67,6 +67,6 @@ if conf.has('WITH_NODE_DEVICES') } virt_install_dirs += [ @@ -275,10 +276,10 @@ index 1c95975c37..a7831242db 100644 ] endif diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build -index 55cf8fcce4..d331086f2e 100644 +index de3d202267..346c435ee7 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build -@@ -62,9 +62,9 @@ if conf.has('WITH_NWFILTER') +@@ -65,9 +65,9 @@ if conf.has('WITH_NWFILTER') } virt_install_dirs += [ @@ -302,10 +303,10 @@ index 0d96c54ebe..66c92a1016 100644 -install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') +install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') diff --git a/src/qemu/meson.build b/src/qemu/meson.build -index 39f0f615cc..5f6f30f82b 100644 +index 907893d431..99b62c8955 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build -@@ -200,25 +200,25 @@ if conf.has('WITH_QEMU') +@@ -218,25 +218,25 @@ if conf.has('WITH_QEMU') endif virt_install_dirs += [ @@ -352,10 +353,10 @@ index 39f0f615cc..5f6f30f82b 100644 ] endif diff --git a/src/remote/meson.build b/src/remote/meson.build -index b2aafe6320..6972d254ca 100644 +index 831acaaa01..0ba34d3bad 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build -@@ -235,9 +235,9 @@ if conf.has('WITH_REMOTE') +@@ -261,9 +261,9 @@ if conf.has('WITH_REMOTE') } virt_install_dirs += [ @@ -367,8 +368,8 @@ index b2aafe6320..6972d254ca 100644 + install_prefix + runstatedir / 'libvirt' / 'common', ] - logrotate_conf = configuration_data() -@@ -251,7 +251,7 @@ if conf.has('WITH_REMOTE') + logrotate_conf = configuration_data({ +@@ -278,7 +278,7 @@ if conf.has('WITH_REMOTE') ) install_data( log_file, @@ -377,7 +378,7 @@ index b2aafe6320..6972d254ca 100644 rename: [ name ], ) endforeach -@@ -301,7 +301,7 @@ endif +@@ -328,7 +328,7 @@ endif if conf.has('WITH_SASL') install_data( 'libvirtd.sasl', @@ -387,10 +388,10 @@ index b2aafe6320..6972d254ca 100644 ) endif diff --git a/src/secret/meson.build b/src/secret/meson.build -index 1bda59849b..392bc2cb2e 100644 +index 3b859ea7b4..ccddb3e805 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build -@@ -45,7 +45,7 @@ if conf.has('WITH_SECRETS') +@@ -48,7 +48,7 @@ if conf.has('WITH_SECRETS') } virt_install_dirs += [ @@ -412,7 +413,7 @@ index b9257c816d..98701755d8 100644 + install_dir: install_prefix + apparmor_dir, ) endforeach - + @@ -68,13 +68,13 @@ foreach name : apparmor_gen_abstractions command: apparmor_gen_cmd, capture: true, @@ -421,13 +422,13 @@ index b9257c816d..98701755d8 100644 + install_dir: install_prefix + apparmor_dir / 'abstractions', ) endforeach - + install_data( [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], - install_dir: apparmor_dir / 'libvirt', + install_dir: install_prefix + apparmor_dir / 'libvirt', ) - + if not conf.has('WITH_APPARMOR_3') @@ -83,7 +83,7 @@ if not conf.has('WITH_APPARMOR_3') # files in order to limit the amount of filesystem clutter. @@ -439,10 +440,10 @@ index b9257c816d..98701755d8 100644 ) endif diff --git a/src/storage/meson.build b/src/storage/meson.build -index 26e7ff1a1a..ad5c6eddc3 100644 +index 404d6a6941..fb4e67a0a8 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build -@@ -127,9 +127,9 @@ if conf.has('WITH_STORAGE') +@@ -126,9 +126,9 @@ if conf.has('WITH_STORAGE') } virt_install_dirs += [ @@ -456,10 +457,10 @@ index 26e7ff1a1a..ad5c6eddc3 100644 endif diff --git a/tools/meson.build b/tools/meson.build -index f4b4a16c29..059c73a955 100644 +index 1bb84be0be..e04a4e986d 100644 --- a/tools/meson.build +++ b/tools/meson.build -@@ -120,7 +120,7 @@ if conf.has('WITH_LOGIN_SHELL') +@@ -121,7 +121,7 @@ if conf.has('WITH_LOGIN_SHELL') install_rpath: libvirt_rpath, ) @@ -468,6 +469,18 @@ index f4b4a16c29..059c73a955 100644 endif if host_machine.system() == 'windows' +diff --git a/tools/ssh-proxy/meson.build b/tools/ssh-proxy/meson.build +index e9f312fa25..95d5d8fe0b 100644 +--- a/tools/ssh-proxy/meson.build ++++ b/tools/ssh-proxy/meson.build +@@ -20,6 +20,6 @@ if conf.has('WITH_SSH_PROXY') + output: '@BASENAME@', + configuration: tools_conf, + install: true, +- install_dir : sshconfdir, ++ install_dir : install_prefix + sshconfdir, + ) + endif -- -2.35.1 +2.45.1 diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index ec35e5727c8b5..097f19a29366f 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -115,28 +115,18 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> - version = "10.0.0"; + version = "10.4.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-xFl8AHcbeuydWzhJNnwZ3Bd7TQiTU8hjBxaALXvcLgE="; + hash = "sha256-grQyILVy0IYbbz/Wau8QRfCub7j+5nhnkfs2tprfpO0="; fetchSubmodules = true; }; patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch - (fetchpatch { - name = "CVE-2024-2494.patch"; - url = "https://gitlab.com/libvirt/libvirt/-/commit/8a3f8d957507c1f8223fdcf25a3ff885b15557f2.patch"; - hash = "sha256-kxSIZ4bPOhN6PpJepoSF+EDTgdmazRWh3a3KSVfm1GU="; - }) - (fetchpatch { - name = "CVE-2024-1441.patch"; - url = "https://gitlab.com/libvirt/libvirt/-/commit/c664015fe3a7bf59db26686e9ed69af011c6ebb8.patch"; - hash = "sha256-Qi/gk7+NPz9s9OpWOnF8XW6A75C9BbVxBTE4KVwalo4="; - }) ] ++ lib.optionals enableZfs [ (substituteAll { src = ./0002-substitute-zfs-and-zpool-commands.patch; @@ -150,7 +140,7 @@ stdenv.mkDerivation rec { sed -i '/commandtest/d' tests/meson.build sed -i '/virnetsockettest/d' tests/meson.build # delete only the first occurrence of this - sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build + sed -i '0,/qemuxmlconftest/{/qemuxmlconftest/d;}' tests/meson.build '' + lib.optionalString isLinux '' for binary in mount umount mkfs; do @@ -283,6 +273,7 @@ stdenv.mkDerivation rec { (cfg "install_prefix" (placeholder "out")) (cfg "localstatedir" "/var") (cfg "runstatedir" (if isDarwin then "/var/run" else "/run")) + (cfg "sshconfdir" "/etc/ssh/ssh_config.d") (cfg "init_script" (if isDarwin then "none" else "systemd")) (cfg "qemu_datadir" (lib.optionalString isDarwin "${qemu}/share/qemu")) @@ -313,6 +304,7 @@ stdenv.mkDerivation rec { (feat "polkit" isLinux) (feat "readline" true) (feat "secdriver_apparmor" isLinux) + (feat "ssh_proxy" isLinux) (feat "tests" true) (feat "udev" isLinux) (feat "yajl" true) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 639ff62887a0b..a5eeb4a193084 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -9,13 +9,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.4.3"; + version = "3.5"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ak49oFZkWNVjt98KXKqBGwKh7nz13/FO5riY7MIDR8g="; + hash = "sha256-IOS5w84/Dnwjqgk5Lf6o6P1l9q5KBUUll250B1mh/Gc="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index b3117364984e9..1a62114148f75 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -29,10 +29,7 @@ let stdenv = throw "Use effectiveStdenv instead"; effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; - cudaCapabilities = cudaPackages.cudaFlags.cudaCapabilities; - # E.g. [ "80" "86" "90" ] - cudaArchitectures = (builtins.map cudaPackages.cudaFlags.dropDot cudaCapabilities); - cudaArchitecturesString = lib.strings.concatStringsSep ";" cudaArchitectures; + cudaArchitecturesString = cudaPackages.flags.cmakeCudaArchitecturesString; howard-hinnant-date = fetchFromGitHub { owner = "HowardHinnant"; @@ -249,6 +246,6 @@ effectiveStdenv.mkDerivation rec { # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures platforms = platforms.unix; license = licenses.mit; - maintainers = with maintainers; [ jonringer puffnfresh ck3d cbourjau ]; + maintainers = with maintainers; [ puffnfresh ck3d cbourjau ]; }; } diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix index bfe1cf1139aed..66714ba16c786 100644 --- a/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/pkgs/development/libraries/physics/geant4/datasets.nix @@ -35,8 +35,8 @@ in builtins.listToAttrs (map (a: { name = a.pname; value = mkDataset a; }) [ { pname = "G4NDL"; - version = "4.7"; - sha256 = "sha256-fn09JiEQLcYU91OtkocwopDRlmDu2WMEqdJLRT1nAwk="; + version = "4.7.1"; + sha256 = "sha256-06yuSGIhGNJXneJKVNUz+yQWvw2p3SiPFyTfFIWkbHw="; envvar = "NEUTRONHP"; } diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 3b67b6a3756ed..569a0b3e6923f 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -48,12 +48,12 @@ in lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt" stdenv.mkDerivation rec { - version = "11.2.1"; + version = "11.2.2"; pname = "geant4"; src = fetchurl { url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; - hash = "sha256-g122VD1csugBZ1lYllvpaHf2bWkHu1IZVLWYt4Xerl4="; + hash = "sha256-0k9lc1uKCgOcAPlDSZHpnvEZuGxRDQ8qshFV24KjSR0="; }; # Fix broken paths in a .pc diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index cf00d1d50bebb..e29cbe6d73d36 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; platforms = lib.platforms.all; homepage = "https://protobuf.dev/"; - maintainers = with lib.maintainers; [ jonringer ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "protoc"; }; }) diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 403c903577554..fc0eb1dfa2912 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pugixml"; - version = "1.13"; + version = "1.14"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; rev = "v${version}"; - sha256 = "sha256-MAXm/9ANj6TjO1Skpg20RYt88bf6w1uPwRwOHXiXsWw="; + sha256 = "sha256-xxtJr9VeBPxpxWJaDGO635+Ch7ZS6t6VyuXEio+ogZ8="; }; outputs = [ "out" ] ++ lib.optionals shared [ "dev" ]; diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 59494fadfd900..5af73735fdf60 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -29,8 +29,7 @@ let pname = "faiss"; version = "1.7.4"; - inherit (cudaPackages) cudaFlags backendStdenv; - inherit (cudaFlags) cudaCapabilities dropDot; + inherit (cudaPackages) flags backendStdenv; stdenv = if cudaSupport then backendStdenv else inputs.stdenv; @@ -93,7 +92,7 @@ stdenv.mkDerivation { "-DFAISS_ENABLE_PYTHON=${if pythonSupport then "ON" else "OFF"}" "-DFAISS_OPT_LEVEL=${optLevel}" ] ++ lib.optionals cudaSupport [ - "-DCMAKE_CUDA_ARCHITECTURES=${builtins.concatStringsSep ";" (map dropDot cudaCapabilities)}" + "-DCMAKE_CUDA_ARCHITECTURES=${flags.cmakeCudaArchitecturesString}" "-DCUDAToolkit_INCLUDE_DIR=${cudaJoined}/include" ]; diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index 757a1b77dafc5..a675142f361d4 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -41,8 +41,7 @@ let then cudaPackages_11 else cudaPackages; - inherit (effectiveCudaPackages) cudaAtLeast cudaFlags cudaOlder; - inherit (cudaFlags) cudaCapabilities; + inherit (effectiveCudaPackages) cudaAtLeast flags cudaOlder; # move to newer ROCm version once supported rocmPackages = rocmPackages_5; @@ -52,7 +51,7 @@ let # lists.subtractLists a b = b - a # For ROCm - # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.realArches. + # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like flags.realArches. # For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must # remove it. rocmArches = lists.map (x: strings.removePrefix "gfx" x) rocmPackages.clr.gpuTargets; @@ -83,12 +82,11 @@ let throw "No GPU targets specified" ); - # E.g. [ "80" "86" "90" ] - cudaArchitectures = (builtins.map cudaFlags.dropDot cudaCapabilities); - - cudaArchitecturesString = strings.concatStringsSep ";" cudaArchitectures; + cudaArchitecturesString = flags.cmakeCudaArchitecturesString; minArch = let + # E.g. [ "80" "86" "90" ] + cudaArchitectures = (builtins.map flags.dropDot flags.cudaCapabilities); minArch' = builtins.head (builtins.sort strings.versionOlder cudaArchitectures); in # "75" -> "750" Cf. https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-273 diff --git a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix index 2036c4c86253b..e9367d416e325 100644 --- a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix +++ b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix @@ -11,7 +11,7 @@ which, }: let inherit (lib) lists strings; - inherit (cudaPackages) backendStdenv cudaFlags; + inherit (cudaPackages) backendStdenv flags; cuda-common-redist = with cudaPackages; [ cuda_cudart.dev # cuda_runtime.h @@ -89,9 +89,7 @@ in doCheck = false; preConfigure = '' - export TCNN_CUDA_ARCHITECTURES="${ - strings.concatStringsSep ";" (lists.map cudaFlags.dropDot cudaFlags.cudaCapabilities) - }" + export TCNN_CUDA_ARCHITECTURES="${flags.cmakeCudaArchitecturesString}" export CUDA_HOME="${cuda-native-redist}" export LIBRARY_PATH="${cuda-native-redist}/lib/stubs:$LIBRARY_PATH" export CC="${backendStdenv.cc}/bin/cc" diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index 6f5cac6983c34..8675bab269c08 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-ujfXZfBXr3T4e8+bIfkvdvBnEQfW7oPByaiXg/SBwJY="; + hash = "sha256-1Q00aEWl/mk37NcBJPgg443V1IXmNaJcSlilzvAJ1QQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index 559b4fe62c4c2..6a4ed92cc079a 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage, fetchurl , ppx_sexp_conv , mirage-crypto, mirage-crypto-ec, mirage-crypto-rng, mirage-crypto-pk -, x509, cstruct, cstruct-unix, cstruct-sexp, sexplib, eqaf +, x509, cstruct, cstruct-unix, cstruct-sexp, sexplib, eqaf-cstruct , rresult, mtime, logs, fmt, cmdliner, base64 , zarith }: @@ -17,11 +17,15 @@ buildDunePackage rec { hash = "sha256-VejHFn07B/zoEG4LjLaen24ig9kAXtERl/pRo6UZCQk="; }; + postPatch = '' + substituteInPlace lib/dune --replace-warn eqaf.cstruct eqaf-cstruct + ''; + propagatedBuildInputs = [ mirage-crypto mirage-crypto-ec mirage-crypto-rng mirage-crypto-pk x509 cstruct cstruct-sexp sexplib mtime logs base64 zarith - ppx_sexp_conv eqaf + ppx_sexp_conv eqaf-cstruct ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/eqaf/cstruct.nix b/pkgs/development/ocaml-modules/eqaf/cstruct.nix new file mode 100644 index 0000000000000..b5f2f6e666831 --- /dev/null +++ b/pkgs/development/ocaml-modules/eqaf/cstruct.nix @@ -0,0 +1,9 @@ +{ buildDunePackage, eqaf, cstruct }: + +buildDunePackage { + pname = "eqaf-cstruct"; + + inherit (eqaf) src version meta; + + propagatedBuildInputs = [ cstruct eqaf ]; +} diff --git a/pkgs/development/ocaml-modules/eqaf/default.nix b/pkgs/development/ocaml-modules/eqaf/default.nix index d777755253c27..9b5dadb7b710b 100644 --- a/pkgs/development/ocaml-modules/eqaf/default.nix +++ b/pkgs/development/ocaml-modules/eqaf/default.nix @@ -1,18 +1,15 @@ -{ lib, fetchurl, buildDunePackage, cstruct }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { minimalOCamlVersion = "4.07"; - duneVersion = "3"; pname = "eqaf"; - version = "0.9"; + version = "0.10"; src = fetchurl { url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-${version}.tbz"; - hash = "sha256-7A4oqUasaBf5XVhU8FqZYa46hAi7YQ55z60BubJV3+A="; + hash = "sha256-Z9E2nFfE0tFKENAmMtReNVIkq+uYrsCJecC65YQwku4="; }; - propagatedBuildInputs = [ cstruct ]; - meta = { description = "Constant time equal function to avoid timing attacks in OCaml"; homepage = "https://github.com/mirage/eqaf"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 74e9a455bebe6..7057d89806524 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,11 +1,10 @@ -{ lib, fetchurl, buildDunePackage, ounit2, cstruct, dune-configurator, eqaf, pkg-config +{ lib, fetchurl, buildDunePackage, ounit2, dune-configurator, eqaf-cstruct, pkg-config , withFreestanding ? false , ocaml-freestanding }: buildDunePackage rec { minimalOCamlVersion = "4.08"; - duneVersion = "3"; pname = "mirage-crypto"; version = "0.11.3"; @@ -21,11 +20,16 @@ buildDunePackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ - cstruct eqaf + eqaf-cstruct ] ++ lib.optionals withFreestanding [ ocaml-freestanding ]; + # Compatibility with eqaf 0.10 + postPatch = '' + substituteInPlace src/dune --replace-warn eqaf.cstruct eqaf-cstruct + ''; + meta = with lib; { homepage = "https://github.com/mirage/mirage-crypto"; description = "Simple symmetric cryptography for the modern age"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index e50838e50bbb8..11f09dfd5161e 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -1,16 +1,18 @@ { buildDunePackage, ounit2, randomconv, mirage-crypto, mirage-crypto-rng -, cstruct, sexplib0, zarith, eqaf, gmp }: +, cstruct, sexplib0, zarith, eqaf-cstruct, gmp }: buildDunePackage rec { pname = "mirage-crypto-pk"; inherit (mirage-crypto) version src; - duneVersion = "3"; + postPatch = '' + substituteInPlace pk/dune --replace-warn eqaf.cstruct eqaf-cstruct + ''; buildInputs = [ gmp ]; propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng - zarith eqaf sexplib0 ]; + zarith eqaf-cstruct sexplib0 ]; doCheck = true; checkInputs = [ ounit2 randomconv ]; diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index ec5c86036ad27..ddf8ca5f6d63b 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "yojson"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; - hash = "sha256-v9wzvvMUG7qaj6ZqiFtUsp9r+rRQBAiE3Yz3zex4RRk="; + hash = "sha256-zTwdlPaViZoCbf9yaWmJvbENwWMpNLucvm9FmNSvptQ="; }; propagatedBuildInputs = [ seq ]; diff --git a/pkgs/development/python-modules/aionut/default.nix b/pkgs/development/python-modules/aionut/default.nix index 8c9b8038ce998..cfcefeb330289 100644 --- a/pkgs/development/python-modules/aionut/default.nix +++ b/pkgs/development/python-modules/aionut/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aionut"; - version = "4.3.2"; + version = "4.3.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aionut"; rev = "refs/tags/v${version}"; - hash = "sha256-QehVC/6RbWp8KnOuVtLFkK8/STTgHXkXmFbSmzu9z7w="; + hash = "sha256-DCWfa5YfrB7MTf78AeSHDgiZzLNXoiNLnty9a+Sr9tQ="; }; postPatch = '' @@ -27,7 +27,7 @@ buildPythonPackage rec { --replace-fail " --cov=aionut --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/aioraven/default.nix b/pkgs/development/python-modules/aioraven/default.nix index 44e1530dce766..e4649a8d8eadd 100644 --- a/pkgs/development/python-modules/aioraven/default.nix +++ b/pkgs/development/python-modules/aioraven/default.nix @@ -6,14 +6,14 @@ pythonOlder, iso4217, pyserial, - pyserial-asyncio, + pyserial-asyncio-fast, pytestCheckHook, pytest-asyncio, }: buildPythonPackage rec { pname = "aioraven"; - version = "0.5.3"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "cottsay"; repo = "aioraven"; rev = "refs/tags/${version}"; - hash = "sha256-kGCFwpMaLWxLUp8k5H5AnL21KrwohbUYLswLcLqmc3M="; + hash = "sha256-RU2DRDjxl0EVmnNLADawEB/x6Zc3/IWH015xig5AIJY="; }; build-system = [ setuptools ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { dependencies = [ iso4217 pyserial - pyserial-asyncio + pyserial-asyncio-fast ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/aiosteamist/default.nix b/pkgs/development/python-modules/aiosteamist/default.nix index b6fc08e3c9d11..31e9ff403b7f8 100644 --- a/pkgs/development/python-modules/aiosteamist/default.nix +++ b/pkgs/development/python-modules/aiosteamist/default.nix @@ -4,46 +4,48 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pytestCheckHook, pythonOlder, xmltodict, }: buildPythonPackage rec { pname = "aiosteamist"; - version = "0.3.2"; - format = "pyproject"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bdraco"; - repo = pname; - rev = version; - hash = "sha256-IKrAJ4QDcYJRO4hcomL9FRs8hJ3k7SgRgK4H1b8SxIM="; + repo = "aiosteamist"; + rev = "refs/tags/v${version}"; + hash = "sha256-vqCcQDUMFFhIOoiER5TMOxJPY7HYFS4K1fuu/1IqP44="; }; - nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov=aiosteamist" "" + ''; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ aiohttp xmltodict ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--cov=aiosteamist" "" \ - --replace 'xmltodict = "^0.12.0"' 'xmltodict = "*"' - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "aiosteamist" ]; - # Modules doesn't have test suite - doCheck = false; - meta = with lib; { description = "Module to control Steamist steam systems"; homepage = "https://github.com/bdraco/aiosteamist"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/bdraco/aiosteamist/releases/tag/v${version}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index 5344131279934..fc5b91f13a1bd 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; rev = "refs/tags/v${version}"; - hash = "sha256-sy7/nCthmfI0WdBkwBU83fifcYTe9zUBOpxV7RX9F6w="; + hash = "sha256-ZBy3lo7rb361aysi2ezryd5H47r6sgSqmYNeAI+wXeQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix index 3e9548bfe5b61..a010d3570b7cb 100644 --- a/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/pkgs/development/python-modules/amaranth-boards/default.nix @@ -19,7 +19,9 @@ buildPythonPackage rec { owner = "amaranth-lang"; repo = "amaranth-boards"; rev = "aba2300dc83216523e1c98fdb22471cb4bac5027"; - hash = "sha256-IMhNMkOf6dg4Djyi39TDTpU0S3TQM1+e6TBoyiITaos="; + # these files change depending on git branch status + postFetch = "rm -f $out/.git_archival.txt $out/.gitattributes"; + hash = "sha256-jldXyMJtuSGcZKmtwpZBYrR/UBe4ufblPYRYpBmReM8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/applicationinsights/default.nix b/pkgs/development/python-modules/applicationinsights/default.nix index 9c4021bbad372..b199051111370 100644 --- a/pkgs/development/python-modules/applicationinsights/default.nix +++ b/pkgs/development/python-modules/applicationinsights/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "This project extends the Application Insights API surface to support Python"; homepage = "https://github.com/Microsoft/ApplicationInsights-Python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix index 4e286daa0ed67..c3abfb0c287d2 100644 --- a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix +++ b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Low-level CFFI bindings for Argon2"; homepage = "https://github.com/hynek/argon2-cffi-bindings"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index d44de866d323f..71a8688ed471a 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.12.3"; + version = "3.12.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = "asyncstdlib"; rev = "refs/tags/v${version}"; - hash = "sha256-OLb4+7FFeVDW0ePyVJW8aaosouxlU/4Uq2ktvVLpDFY="; + hash = "sha256-5xbz56/s448PIOZ4DN6NFcYYWXaebaZA3ApGAIMZXH4="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix index 7beb170dd22c4..7fb7cda0d3aea 100644 --- a/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/appconfiguration/azure-appconfiguration"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-appconfiguration_${version}/sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 0de7d344b1df8..3718ee9ae723b 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -99,6 +99,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-core"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-core_${version}/sdk/core/azure-core/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix index 3b593399469e6..71e97c27e8d58 100644 --- a/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/pkgs/development/python-modules/azure-cosmos/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/cosmos/azure-cosmos"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-cosmos_${version}/sdk/cosmos/azure-cosmos/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-data-tables/default.nix b/pkgs/development/python-modules/azure-data-tables/default.nix index c9b61bcb57723..7e030a049f94a 100644 --- a/pkgs/development/python-modules/azure-data-tables/default.nix +++ b/pkgs/development/python-modules/azure-data-tables/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-data-tables_${version}/sdk/tables/azure-data-tables/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-functions-devops-build/default.nix b/pkgs/development/python-modules/azure-functions-devops-build/default.nix index e7e4cf570cb8e..1b1683d5bfe14 100644 --- a/pkgs/development/python-modules/azure-functions-devops-build/default.nix +++ b/pkgs/development/python-modules/azure-functions-devops-build/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Integrate Azure Functions with Azure DevOps. Specifically made for the Azure CLI"; homepage = "https://github.com/Azure/azure-functions-devops-build"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/pkgs/development/python-modules/azure-keyvault-administration/default.nix index e059b2fb6e053..83ac87a09e905 100644 --- a/pkgs/development/python-modules/azure-keyvault-administration/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-administration/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-administration"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-administration_${version}/sdk/keyvault/azure-keyvault-administration/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 77bfa1ea25a03..61d295e1b1529 100644 --- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-certificates"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-certificates_${version}/sdk/keyvault/azure-keyvault-certificates/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 79b13b55ea915..2cf1f5a0235c2 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-keys"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-keys_${version}/sdk/keyvault/azure-keyvault-keys"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index 795ac2e8978a1..b9766e0a93bae 100644 --- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-secrets"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-secrets_${version}/sdk/keyvault/azure-keyvault-secrets"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index e8959dd5f6609..895ba9f289fee 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "This is the Microsoft Azure Key Vault Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-loganalytics/default.nix b/pkgs/development/python-modules/azure-loganalytics/default.nix index 78879294d9e5a..8ec07494103aa 100644 --- a/pkgs/development/python-modules/azure-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-loganalytics/default.nix @@ -33,7 +33,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ maxwilson - jonringer ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index d18dc5b59fb63..81d30a68fd604 100644 --- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/apimanagement/azure-mgmt-apimanagement"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-apimanagement_${version}/sdk/apimanagement/azure-mgmt-apimanagement/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index a662f9ec3310b..4415da9527565 100644 --- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/appconfiguration/azure-mgmt-appconfiguration"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-appconfiguration_${version}/sdk/appconfiguration/azure-mgmt-appconfiguration"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 053211a5ac47d..fb20a442461cb 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ - jonringer maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix b/pkgs/development/python-modules/azure-mgmt-botservice/default.nix index db019c57718d6..f29c1c1ad2c6e 100644 --- a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-botservice/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/botservice/azure-mgmt-botservice"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-botservice_${version}/sdk/botservice/azure-mgmt-botservice"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix index c8a189bb8c398..8668ecb99d52d 100644 --- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix @@ -45,7 +45,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ maxwilson - jonringer ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index 9604f102ec382..98f652cf1f806 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-containerregistry_${version}/sdk/containerregistry/azure-mgmt-containerregistry/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index ef3aedee0dc5c..5dc2f51e7f10b 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Microsoft Azure Management Core Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix b/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix index 11878a1a63e6a..2d486d0156ec5 100644 --- a/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/databox/azure-mgmt-databox"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-databoxedge_${version}/sdk/databox/azure-mgmt-databox/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix index b790482ee7aa0..2d08ad2f43d32 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix @@ -36,7 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ - jonringer maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index f15bcca45128d..40f0d07e00de1 100644 --- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ - jonringer maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix index 5a5ef4d56dd26..de759e933bf76 100644 --- a/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/deploymentmanager/azure-mgmt-deploymentmanager"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-deploymentmanager_${version}/sdk/deploymentmanager/azure-mgmt-deploymentmanager/setup.py"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix index 57717302637b4..dab22d1e065cf 100644 --- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ - jonringer maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix index f1031a1db42fc..3c117d02f6b31 100644 --- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -37,7 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ - jonringer maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix b/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix index 5a97855848ced..ba9c4cacb49ec 100644 --- a/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/extendedlocation/azure-mgmt-extendedlocation"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-extendedlocation_${version}/sdk/extendedlocation/azure-mgmt-extendedlocation"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index a20af6e0133e9..4a80dc7e36de7 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/hdinsight/azure-mgmt-hdinsight"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-hdinsight_${version}/sdk/hdinsight/azure-mgmt-hdinsight/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index 2f254d6f24751..ade13d07d21a3 100644 --- a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/compute/azure-mgmt-imagebuilder"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-imagebuilder_${version}/sdk/compute/azure-mgmt-imagebuilder/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index 36ee7883f1ca6..43f1de3c11bc8 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ - jonringer maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 7bd05198e4ea4..f0b12aed9cb05 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -37,7 +37,6 @@ buildPythonPackage rec { changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-keyvault_${version}/sdk/keyvault/azure-mgmt-keyvault/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ - jonringer maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index 0cb59d74226e3..186258f84ae14 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-kusto_${version}/sdk/kusto/azure-mgmt-kusto/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix b/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix index a9334dd30d000..aa2f41d6f7d30 100644 --- a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/managedservices/azure-mgmt-managedservices"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-managedservices_${version}/sdk/managedservices/azure-mgmt-managedservices/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 1fe67e96717be..8a10fd41f1085 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-netapp_${version}/sdk/netapp/azure-mgmt-netapp/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 9df7aa588c35d..8e0590238007c 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -44,7 +44,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ olcai maxwilson - jonringer ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix b/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix index a1446f95426d3..20bed8458017a 100644 --- a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Microsoft Azure DNS Private Zones Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix index de5fa0d7faf37..6c678d4cad629 100644 --- a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Microsoft Azure Red Hat Openshift Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 37e29ac970f0c..ffb31fbfbbdbc 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -41,7 +41,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ olcai maxwilson - jonringer ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index e6e347513422c..ea1eeecdef0bf 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/security/azure-mgmt-security"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-security_${version}/sdk/security/azure-mgmt-security/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix index 4152514643d67..8ed3ef2a37fc0 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "This is the Microsoft Azure Service Fabric Cluster Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix b/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix index 9e5405336b68f..e38d0f6cc1386 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Microsoft Azure Servicelinker Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix b/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix index 723e389a991b2..34a562f4e49a0 100644 --- a/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/sql/azure-mgmt-sqlvirtualmachine"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-sqlvirtualmachine_${version}/sdk/sql/azure-mgmt-sqlvirtualmachine/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 4cc72e61d4597..1857c3cc6106c 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -42,7 +42,6 @@ buildPythonPackage rec { changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-storage_${version}/sdk/storage/azure-mgmt-storage/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ - jonringer olcai maxwilson ]; diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index d9bf2b13a5e04..dbf43887100ba 100644 --- a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-mgmt-synapse"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-synapse_${version}/sdk/synapse/azure-mgmt-synapse/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index d03aaf12f9caf..7308578dfdee2 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Microsoft Azure Storage Client Library for Python with multi API version support"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix index 55fd07d99e20d..a3b59c446c036 100644 --- a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix +++ b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-accesscontrol"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-accesscontrol_${version}/sdk/synapse/azure-synapse-accesscontrol/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 0cc9e72a984dd..45150bfc8532c 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-artifacts_${version}/sdk/synapse/azure-synapse-artifacts/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix b/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix index 0ad839d459889..829577e636da3 100644 --- a/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix +++ b/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-managedprivateendpoints"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-synapse-managedprivateendpoints_${version}/sdk/synapse/azure-synapse-managedprivateendpoints"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-synapse-spark/default.nix b/pkgs/development/python-modules/azure-synapse-spark/default.nix index 51e07290ef6de..fbb9233538098 100644 --- a/pkgs/development/python-modules/azure-synapse-spark/default.nix +++ b/pkgs/development/python-modules/azure-synapse-spark/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-spark"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-spark_${version}/sdk/synapse/azure-synapse-spark/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/backports-zoneinfo/default.nix b/pkgs/development/python-modules/backports-zoneinfo/default.nix index a27197dea80dc..5c525685d6227 100644 --- a/pkgs/development/python-modules/backports-zoneinfo/default.nix +++ b/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -75,6 +75,6 @@ buildPythonPackage rec { description = "Backport of the standard library module zoneinfo"; homepage = "https://github.com/pganssle/zoneinfo"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/bdffont/default.nix b/pkgs/development/python-modules/bdffont/default.nix index 87e4ef29b81b2..c4ac42a60452f 100644 --- a/pkgs/development/python-modules/bdffont/default.nix +++ b/pkgs/development/python-modules/bdffont/default.nix @@ -2,42 +2,41 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, pythonOlder, + pytestCheckHook, nix-update-script, - hatch-vcs, hatchling, - brotli, - fonttools, }: buildPythonPackage rec { pname = "bdffont"; version = "0.0.26"; + pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.10"; src = fetchPypi { - inherit pname version; + pname = "bdffont"; + inherit version; hash = "sha256-Q8IqwJmAYFicTX7RrVU9UvGZX+oaPb0RKlIFwArktXk="; }; - format = "pyproject"; - - nativeBuildInputs = [ - hatch-vcs - hatchling - ]; + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "bdffont" ]; + passthru.updateScript = nix-update-script { }; meta = { homepage = "https://github.com/TakWolf/bdffont"; - description = "Library for manipulating .bdf format fonts"; + description = "A library for manipulating Glyph Bitmap Distribution Format (BDF) Fonts"; platforms = lib.platforms.all; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ h7x4 ]; + maintainers = with lib.maintainers; [ + TakWolf + h7x4 + ]; }; } diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 3671757c3f184..6e95bec307eee 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/bids-standard/bids-validator"; changelog = "https://github.com/bids-standard/bids-validator/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 28843f9887755..440ac99954f4b 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.36.2"; + version = "1.36.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "casbin"; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-RQYMQ1Zt+MJ3PyVGSTGo/Qi95M+NVGn7oC2gqXJdlEU="; + hash = "sha256-JTAd7Nkreyfczomki05WHuuJCFWspvG8i6DAWaQI6fs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/character-encoding-utils/default.nix b/pkgs/development/python-modules/character-encoding-utils/default.nix index a677d8999e375..83d01916d3c63 100644 --- a/pkgs/development/python-modules/character-encoding-utils/default.nix +++ b/pkgs/development/python-modules/character-encoding-utils/default.nix @@ -2,10 +2,10 @@ lib, buildPythonPackage, fetchPypi, - hatch-vcs, - hatchling, - pytestCheckHook, pythonOlder, + pytestCheckHook, + nix-update-script, + hatchling, }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "0.0.8"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.10"; src = fetchPypi { pname = "character_encoding_utils"; @@ -21,19 +21,22 @@ buildPythonPackage rec { hash = "sha256-UXX4L/x7fP37ZEFDCPc0KRNyx47xvwY0Jz+lfxzUulg="; }; - build-system = [ - hatch-vcs - hatchling - ]; + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "character_encoding_utils" ]; + passthru.updateScript = nix-update-script { }; + meta = { - description = "Some character encoding utils"; homepage = "https://github.com/TakWolf/character-encoding-utils"; + description = "Some character encoding utils"; + platforms = lib.platforms.all; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ h7x4 ]; + maintainers = with lib.maintainers; [ + TakWolf + h7x4 + ]; }; } diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 542de4e844ca5..09ecb4f986b5f 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Utilities for interfacing with Plotly's Chart Studio service"; homepage = "https://github.com/plotly/plotly.py/tree/master/packages/python/chart-studio"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index e531471812840..3b4d3f3f1befb 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -3,8 +3,12 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system hatchling, hatch-vcs, + + # dependencies aiohttp, awkward, cachetools, @@ -28,6 +32,8 @@ toml, tqdm, uproot, + + # checks distributed, pyinstrument, pytestCheckHook, @@ -35,7 +41,7 @@ buildPythonPackage rec { pname = "coffea"; - version = "2024.6.0"; + version = "2024.6.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -44,7 +50,7 @@ buildPythonPackage rec { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-MnAGtoev20Cn1WUmX8imUNQCJftU4jw+hInYI7dhb4M="; + hash = "sha256-Z6c8R8B8IrDkXVDx89XVtg3eRgORuHPfUyAPRGwAlrg="; }; build-system = [ diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 930581b563a61..78577b34d9396 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.3"; + version = "1.1.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-20gVzmOnVWoPGrGcLp8nhAoiHWunaYZIXOxYho7ZhUs="; + hash = "sha256-O0s7jrxjTkIAb6zW+NuG1PPHhRHndcLt11uYNyknO4A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 08ce62f9e701f..c4988b4c8c5b0 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -41,7 +41,7 @@ let self = buildPythonPackage rec { pname = "dask"; - version = "2024.6.0"; + version = "2024.6.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -50,7 +50,7 @@ let owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-HtWxVWMk0G2OeBnZKLF5tuOohPbg20Ufl+VH/MX8vK0="; + hash = "sha256-5jG9hx1tZkqLwjWF73Fm2oJBuejbq4a7GP9fMd8hRJg="; }; build-system = [ @@ -69,7 +69,7 @@ let toolz ]; - passthru.optional-dependencies = lib.fix (self: { + optional-dependencies = lib.fix (self: { array = [ numpy ]; complete = [ pyarrow @@ -97,8 +97,8 @@ let hypothesis pytest-asyncio ] - ++ passthru.optional-dependencies.array - ++ passthru.optional-dependencies.dataframe + ++ self.optional-dependencies.array + ++ self.optional-dependencies.dataframe ++ lib.optionals (!arrow-cpp.meta.broken) [ # support is sparse on aarch64 pyarrow @@ -111,15 +111,15 @@ let echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py substituteInPlace setup.py \ - --replace "import versioneer" "" \ - --replace "version=versioneer.get_version()," "version='${version}'," \ - --replace "cmdclass=versioneer.get_cmdclass()," "" + --replace-fail "import versioneer" "" \ + --replace-fail "version=versioneer.get_version()," "version='${version}'," \ + --replace-fail "cmdclass=versioneer.get_cmdclass()," "" substituteInPlace pyproject.toml \ - --replace ', "versioneer[toml]==0.29"' "" \ - --replace " --durations=10" "" \ - --replace " --cov-config=pyproject.toml" "" \ - --replace "\"-v" "\" " + --replace-fail ', "versioneer[toml]==0.29"' "" \ + --replace-fail " --durations=10" "" \ + --replace-fail " --cov-config=pyproject.toml" "" \ + --replace-fail "\"-v" "\" " ''; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/delegator-py/default.nix b/pkgs/development/python-modules/delegator-py/default.nix index 4cb4ea6f4cf88..b51ff537518cd 100644 --- a/pkgs/development/python-modules/delegator-py/default.nix +++ b/pkgs/development/python-modules/delegator-py/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Subprocesses for Humans 2.0"; homepage = "https://github.com/amitt001/delegator.py"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 0d5da20cccfbe..f282e0bb5504b 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2024.6.0"; + version = "2024.6.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,13 +35,13 @@ buildPythonPackage rec { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-8TShbpH+DB73G7D4pz8MHC/SPd3RaRttML0S4WaCE4k="; + hash = "sha256-GgW9BtTqjac+olAGg+LOO+lTopuUukVUmQ0ZWsMJOc8="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "versioneer[toml]==" "versioneer[toml]>=" \ - --replace 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail "versioneer[toml]==" "versioneer[toml]>=" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; build-system = [ diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index fd4be9238aaf6..1a155875676fb 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.0.8"; + version = "4.0.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = "django-import-export"; rev = "refs/tags/${version}"; - hash = "sha256-FejU0k2/fmR5QdAJy2xxx3MKgu89/pOj4cIWsMGUw0M="; + hash = "sha256-T7XnPxvqnLI3rd0xSZb2iOsgcOqiA/JrRh3rjCm5gG4="; }; pythonRelaxDeps = [ "tablib" ]; diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 93d09f2cfced3..c26f5f656d4d2 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -73,6 +73,6 @@ buildPythonPackage rec { description = "API client for docker written in Python"; homepage = "https://github.com/docker/docker-py"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/drawsvg/default.nix b/pkgs/development/python-modules/drawsvg/default.nix index 84fd89373ffcd..8feb1a1151ea6 100644 --- a/pkgs/development/python-modules/drawsvg/default.nix +++ b/pkgs/development/python-modules/drawsvg/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "drawsvg"; - version = "2.3.0"; + version = "2.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "cduck"; repo = "drawsvg"; rev = "refs/tags/${version}"; - hash = "sha256-LoA5yYeHO4GqS3dk7EMg1ZC42HBgmM6rSfigWMc4yUQ="; + hash = "sha256-JC7u6bEB7RCJVLeYnNqACmddLI5F5PyaaBxaAZ+N/5s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index 8cf0e827a8d3e..f1a67cc0ff750 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + buildPythonPackage, fetchFromGitHub, cmake, doxygen, @@ -11,15 +11,16 @@ scipy, }: -stdenv.mkDerivation (finalAttrs: { +buildPythonPackage rec { pname = "eigenpy"; - version = "3.6.0"; + version = "3.7.0"; + pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; - rev = "v${finalAttrs.version}"; - hash = "sha256-S6kMfpTOMqJPIFgvdcHHFDvIl2b+GE8dhJH0QFDdC1c="; + rev = "v${version}"; + hash = "sha256-D/k/ka500EZch5Ydym2WYtd5vciGkd9rdBUSjTsZ0w4="; }; outputs = [ @@ -55,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Bindings between Numpy and Eigen using Boost.Python"; homepage = "https://github.com/stack-of-tasks/eigenpy"; - changelog = "https://github.com/stack-of-tasks/eigenpy/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/stack-of-tasks/eigenpy/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ nim65s @@ -63,4 +64,4 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = platforms.unix; }; -}) +} diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index e9144961c6d79..b30a3706287a4 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/sissaschool/elementpath"; changelog = "https://github.com/sissaschool/elementpath/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/empty-files/default.nix b/pkgs/development/python-modules/empty-files/default.nix index 249cbf6d83586..da51b198efd96 100644 --- a/pkgs/development/python-modules/empty-files/default.nix +++ b/pkgs/development/python-modules/empty-files/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Null Object pattern for files"; homepage = "https://github.com/approvals/EmptyFiles.Python"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/fasttext-predict/default.nix b/pkgs/development/python-modules/fasttext-predict/default.nix index 1a700111593ab..6bfddc120c6ff 100644 --- a/pkgs/development/python-modules/fasttext-predict/default.nix +++ b/pkgs/development/python-modules/fasttext-predict/default.nix @@ -16,6 +16,11 @@ buildPythonPackage rec { hash = "sha256-rMbf09pCHvVYI9g/aq74+PcsuU2LezpmDz4b/w9vRyc="; }; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py \ + --replace-fail "-flto" "" + ''; + nativeBuildInputs = [ pybind11 ]; # tests are removed from fork @@ -28,7 +33,5 @@ buildPythonPackage rec { homepage = "https://github.com/searxng/fasttext-predict/"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; - # ImportError: dynamic module does not define module export function (PyInit_fasttext_pybind) - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/hatch-regex-commit/default.nix b/pkgs/development/python-modules/hatch-regex-commit/default.nix new file mode 100644 index 0000000000000..9cd936d5798f3 --- /dev/null +++ b/pkgs/development/python-modules/hatch-regex-commit/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatch-regex-commit, + hatchling, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "hatch-regex-commit"; + version = "0.0.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "frankie567"; + repo = "hatch-regex-commit"; + rev = "refs/tags/v${version}"; + hash = "sha256-E0DIBBaDmTCsZQ41NcjcbzgJ16BwhdexlrGWBdf77oA="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' \ + --replace-fail ', "hatch-regex-commit"' "" \ + --replace-fail " --cov-report=term-missing --cov-config=pyproject.toml --cov=hatch_regex_commit --cov=tests" "" + ''; + + build-system = [ hatchling ]; + + dependencies = [ hatchling ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "hatch_regex_commit" ]; + + meta = with lib; { + description = "Hatch plugin to create a commit and tag when bumping version"; + homepage = "https://github.com/frankie567/hatch-regex-commit"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix index 5b538536c9848..05d2214f6a3de 100644 --- a/pkgs/development/python-modules/hikari/default.nix +++ b/pkgs/development/python-modules/hikari/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { mock ]; - pythonImportChecks = [ "hikari" ]; + pythonImportsCheck = [ "hikari" ]; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index 229e8e72b4033..9c05025ddfd9a 100644 --- a/pkgs/development/python-modules/hishel/default.nix +++ b/pkgs/development/python-modules/hishel/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hishel"; - version = "0.0.27"; + version = "0.0.29"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "karpetrosyan"; repo = "hishel"; rev = "refs/tags/${version}"; - hash = "sha256-3iIQNtdd8sBGfNJrugjjWv4PQKhdFH+prw4poevh+O0="; + hash = "sha256-3RUbHVbnfC0L9u6/VMKK2BhTuc2y5kD83Cn8dQ24kQQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/hypothesis-auto/default.nix b/pkgs/development/python-modules/hypothesis-auto/default.nix index 7e60ddaf0b99a..6067efde3ed3b 100644 --- a/pkgs/development/python-modules/hypothesis-auto/default.nix +++ b/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Enables fully automatic tests for type annotated functions"; homepage = "https://github.com/timothycrosley/hypothesis-auto/"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index e2c83a079dcd9..929ca2abefa3d 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.34.1"; + version = "2.34.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "imageio"; repo = "imageio"; rev = "refs/tags/v${version}"; - hash = "sha256-/VZUifiz8iImq+JLvckFDr7YMIqu0Xro2t3GFj0obg0="; + hash = "sha256-1q/LPEdo9rzcIR1ZD+bIP8MIKe7PmxRd8UX6c5C0V5k="; }; patches = lib.optionals (!stdenv.isDarwin) [ @@ -113,11 +113,11 @@ buildPythonPackage rec { "test_reverse_read" ]; - meta = with lib; { + meta = { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; homepage = "https://imageio.readthedocs.io"; changelog = "https://github.com/imageio/imageio/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd2; - maintainers = with maintainers; [ Luflosi ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ Luflosi ]; }; } diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix index c8c59c79b98ac..ada4397a03d49 100644 --- a/pkgs/development/python-modules/iniconfig/default.nix +++ b/pkgs/development/python-modules/iniconfig/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "brain-dead simple parsing of ini files"; homepage = "https://github.com/pytest-dev/iniconfig"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/iteration-utilities/default.nix b/pkgs/development/python-modules/iteration-utilities/default.nix index bdd094983eccb..5dc9382baad19 100644 --- a/pkgs/development/python-modules/iteration-utilities/default.nix +++ b/pkgs/development/python-modules/iteration-utilities/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://github.com/MSeifert04/iteration_utilities"; changelog = "https://github.com/MSeifert04/iteration_utilities/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index 52627e5641254..2c26ec97aea4a 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Microsoft Azure API Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jinja2-ansible-filters/default.nix b/pkgs/development/python-modules/jinja2-ansible-filters/default.nix index ef9afff973b6f..2f0dcad69c3f2 100644 --- a/pkgs/development/python-modules/jinja2-ansible-filters/default.nix +++ b/pkgs/development/python-modules/jinja2-ansible-filters/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Jinja2 Ansible Filters"; homepage = "https://pypi.org/project/jinja2-ansible-filters/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jschema-to-python/default.nix b/pkgs/development/python-modules/jschema-to-python/default.nix index de6d39dfbb19d..998b841e379a3 100644 --- a/pkgs/development/python-modules/jschema-to-python/default.nix +++ b/pkgs/development/python-modules/jschema-to-python/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Generate source code for Python classes from a JSON schema"; homepage = "https://github.com/microsoft/jschema-to-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index ec9dd063805a2..58e1763006fdc 100644 --- a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "MathJax resources as a Jupyter Server Extension"; homepage = "https://github.com/jupyter-server/jupyter_server_mathjax"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jupyterlab-pygments/default.nix b/pkgs/development/python-modules/jupyterlab-pygments/default.nix index beefbfeddbc0a..53c03dbdacdd6 100644 --- a/pkgs/development/python-modules/jupyterlab-pygments/default.nix +++ b/pkgs/development/python-modules/jupyterlab-pygments/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Jupyterlab syntax coloring theme for pygments"; homepage = "https://github.com/jupyterlab/jupyterlab_pygments"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index ea09f1c450657..e57ec6de6798d 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Jupyter Widgets JupyterLab Extension"; homepage = "https://github.com/jupyter-widgets/ipywidgets"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/justnimbus/default.nix b/pkgs/development/python-modules/justnimbus/default.nix index 08a7592b29e28..5bc543a929760 100644 --- a/pkgs/development/python-modules/justnimbus/default.nix +++ b/pkgs/development/python-modules/justnimbus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "justnimbus"; - version = "0.7.3"; + version = "0.7.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "kvanzuijlen"; repo = "justnimbus"; rev = "refs/tags/${version}"; - hash = "sha256-JO8T0JItkkNHxlnDKOO8kM9KSzT7QML4sszPymgXSBA="; + hash = "sha256-FsuvpmMWBYI1LheO3NFfCeaW4m3YQ41Tc81TP3gdNqo="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index 46005c96bee66..6953cd45b8853 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { changelog = "https://github.com/microsoft/knack/blob/v${version}/HISTORY.rst"; platforms = platforms.all; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index f424240f91ea1..9af39f33d3d5e 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "libvirt"; - version = "10.0.0"; + version = "10.4.0"; pyproject = true; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - hash = "sha256-zl1Hfm7flRflNjIpLoLAlPDysYlieC05HEd/mzFW8pU="; + hash = "sha256-Qwn07C8N2ZZzE5+qCo2HtBSm5/zGBqbiLnJePxuEJjs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/pkgs/development/python-modules/llama-index-readers-s3/default.nix index 893ea6338ee77..8beec615d8be8 100644 --- a/pkgs/development/python-modules/llama-index-readers-s3/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-s3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-readers-s3"; - version = "0.1.8"; + version = "0.1.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_s3"; inherit version; - hash = "sha256-O8V9b52gcsWm0bfHlNThIvxPox7d+qK4KzvPWT0fkGc="; + hash = "sha256-ramC3INitu++AHKCWov78ad66/XnZG+Z4bZJHBdN5Uk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/localstack-client/default.nix b/pkgs/development/python-modules/localstack-client/default.nix index 7befaa996a418..10cfa9c8958ad 100644 --- a/pkgs/development/python-modules/localstack-client/default.nix +++ b/pkgs/development/python-modules/localstack-client/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Lightweight Python client for LocalStack"; homepage = "https://github.com/localstack/localstack-python-client"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index 5508507d2067b..2bf7bf447bc9e 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { description = "Extensions for LocalStack"; homepage = "https://github.com/localstack/localstack"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index 0f9e77e86d3c8..d6b26ebe40863 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { description = "Fully functional local Cloud stack"; homepage = "https://github.com/localstack/localstack"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 44078adc507ed..98d1fae1d2b5f 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = "https://lxml.de"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 1b9bce9c41588..163bc05167875 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "marshmallow-dataclass"; - version = "8.6.1"; + version = "8.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lovasoa"; repo = "marshmallow_dataclass"; rev = "refs/tags/v${version}"; - hash = "sha256-IHHYYtQrdSAtZxbd/YV9J+c4B23HLr9gr01OE6Tgj94="; + hash = "sha256-O96Xv732euS0X+1ilhLVMoazpC4kUSJvyVYwdj10e2E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/matplotlib-inline/default.nix b/pkgs/development/python-modules/matplotlib-inline/default.nix index 7960b5cdc2bc5..603809455ffc4 100644 --- a/pkgs/development/python-modules/matplotlib-inline/default.nix +++ b/pkgs/development/python-modules/matplotlib-inline/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Matplotlib Inline Back-end for IPython and Jupyter"; homepage = "https://github.com/ipython/matplotlib-inline"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix index 84a00dde6433e..890bdc7b0a347 100644 --- a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/fralau/mkdocs-mermaid2-plugin"; changelog = "https://github.com/fralau/mkdocs-mermaid2-plugin/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 67ad47544107b..fc72540e9d56b 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.10.3"; + version = "1.10.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-OiG/dPsWO2Z4lGUlgPePRcsrotCu+fwesKhhh6YjmnU="; + hash = "sha256-LRBo404TGxWBQdhN3gTyDHjB389hcHCfZK/oEFdjpOY="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 5b01bf17d328a..937d489f6f5e7 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -79,7 +79,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ bendlas - jonringer maxwilson ]; }; diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/pkgs/development/python-modules/msrestazure/default.nix index 7a5effd2a8758..9a18be120a602 100644 --- a/pkgs/development/python-modules/msrestazure/default.nix +++ b/pkgs/development/python-modules/msrestazure/default.nix @@ -48,7 +48,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ bendlas - jonringer ]; }; } diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix index 0cda8c4cf0835..8e122271c4789 100644 --- a/pkgs/development/python-modules/num2words/default.nix +++ b/pkgs/development/python-modules/num2words/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { mainProgram = "num2words"; homepage = "https://github.com/savoirfairelinux/num2words"; license = licenses.lgpl21; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; longDescription = "num2words is a library that converts numbers like 42 to words like forty-two. It supports multiple languages (see the list below for full list of languages) and can even generate ordinal numbers like forty-second"; }; diff --git a/pkgs/development/python-modules/pcffont/default.nix b/pkgs/development/python-modules/pcffont/default.nix index 30c0c05cae0ef..0f5a49c0692fe 100644 --- a/pkgs/development/python-modules/pcffont/default.nix +++ b/pkgs/development/python-modules/pcffont/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, - fetchFromGitHub, - hatchling, - bdffont, + fetchPypi, + pythonOlder, pytestCheckHook, nix-update-script, + hatchling, + bdffont, }: buildPythonPackage rec { @@ -13,11 +14,12 @@ buildPythonPackage rec { version = "0.0.14"; pyproject = true; - src = fetchFromGitHub { - owner = "TakWolf"; - repo = "pcffont"; - rev = "refs/tags/${version}"; - hash = "sha256-UIRhUlsRd3ICdLAjUasQ1NX5NofSKCEqa8cf1c1voGM="; + disabled = pythonOlder "3.10"; + + src = fetchPypi { + pname = "pcffont"; + inherit version; + hash = "sha256-S3mK4tY7zNGRX8K81QJVvaYpIaTDLx5zn4vKbhrK9VM="; }; build-system = [ hatchling ]; @@ -31,9 +33,13 @@ buildPythonPackage rec { passthru.updateScript = nix-update-script { }; meta = { - description = "Library for manipulating Portable Compiled Format (PCF) fonts"; homepage = "https://github.com/TakWolf/pcffont"; + description = "A library for manipulating Portable Compiled Format (PCF) Fonts"; + platforms = lib.platforms.all; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ + TakWolf + h7x4 + ]; }; } diff --git a/pkgs/development/python-modules/pdfrw2/default.nix b/pkgs/development/python-modules/pdfrw2/default.nix index 34381e4eb8cc1..55373aaca9062 100644 --- a/pkgs/development/python-modules/pdfrw2/default.nix +++ b/pkgs/development/python-modules/pdfrw2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pycryptodome ]; - pythonImportCheck = [ "pdfrw" ]; + pythonImportsCheck = [ "pdfrw" ]; meta = with lib; { description = "Pure Python library that reads and writes PDFs"; diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix index 7033179d7370b..e30f7c93d32e5 100644 --- a/pkgs/development/python-modules/pixel-font-builder/default.nix +++ b/pkgs/development/python-modules/pixel-font-builder/default.nix @@ -2,17 +2,15 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, pythonOlder, + pytestCheckHook, nix-update-script, - hatch-vcs, hatchling, - bdffont, - brotli, fonttools, - pypng, + brotli, + bdffont, pcffont, - pythonRelaxDepsHook, + pypng, }: buildPythonPackage rec { @@ -28,27 +26,20 @@ buildPythonPackage rec { hash = "sha256-66mGZ7q64z+tTJSSveD7UCkTq7YXgsHTM25MqUSLfvM="; }; - pythonRelaxDeps = [ "fonttools" ]; - - nativeBuildInputs = [ pythonRelaxDepsHook ]; - - build-system = [ - hatch-vcs - hatchling - ]; - - nativeCheckInputs = [ - pytestCheckHook - pypng - ]; + build-system = [ hatchling ]; dependencies = [ - bdffont - brotli fonttools + brotli + bdffont pcffont + pypng ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pixel_font_builder" ]; + passthru.updateScript = nix-update-script { }; meta = { @@ -56,6 +47,9 @@ buildPythonPackage rec { description = "Library that helps create pixel style fonts"; platforms = lib.platforms.all; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ h7x4 ]; + maintainers = with lib.maintainers; [ + TakWolf + h7x4 + ]; }; } diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix index c889943748000..69559b4ca25ea 100644 --- a/pkgs/development/python-modules/plux/default.nix +++ b/pkgs/development/python-modules/plux/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Dynamic code loading framework for building pluggable Python distributions"; homepage = "https://github.com/localstack/plux"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index a93473db5ccc9..cf51068bc90c5 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "Core utilities for Poetry"; homepage = "https://github.com/python-poetry/poetry-core/"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 5092394d6af0f..53de4065ff12a 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "Library to provide an easy API to file locking"; homepage = "https://github.com/WoLpH/portalocker"; license = licenses.psfl; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/private-gpt/default.nix b/pkgs/development/python-modules/private-gpt/default.nix index 37747889b9e29..7012ff5cf5fc9 100644 --- a/pkgs/development/python-modules/private-gpt/default.nix +++ b/pkgs/development/python-modules/private-gpt/default.nix @@ -91,6 +91,6 @@ buildPythonPackage rec { homepage = "https://github.com/zylon-ai/private-gpt"; license = lib.licenses.asl20; mainProgram = "private-gpt"; - maintainers = with lib.maintainers; [ drupol ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index d6072ce02b281..f1e852930f6bc 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -72,6 +72,6 @@ buildPythonPackage rec { homepage = "https://github.com/giampaolo/psutil"; changelog = "https://github.com/giampaolo/psutil/blob/release-${version}/HISTORY.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index b3bcbbacec39c..52e6abb8047cb 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.24"; + version = "1.25"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "puremagic"; rev = "refs/tags/${version}"; - hash = "sha256-omVSSxMAQQm+Sy023xIGBYm55qrb1dbds1Jj9WCtNfw="; + hash = "sha256-l97ZK9VT+kU9Hos91C7Q9Zhv3Dge3kyF7N//j4sZ5Kc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix index 874d3459334de..d6e76fcc1ba78 100644 --- a/pkgs/development/python-modules/purl/default.nix +++ b/pkgs/development/python-modules/purl/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Immutable URL class for easy URL-building and manipulation"; homepage = "https://github.com/codeinthehole/purl"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pybalboa/default.nix b/pkgs/development/python-modules/pybalboa/default.nix index 5cfa4813951e9..b013c9b715a17 100644 --- a/pkgs/development/python-modules/pybalboa/default.nix +++ b/pkgs/development/python-modules/pybalboa/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pybalboa"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "garbled1"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7vjdRGnEnMf32pZwoKRxX16hxkyf0CXlncpbBJMQtfI="; + hash = "sha256-rSY6kU7F9ybpPXcmTM2WBazjb9tI2+8dG56pjrRXcKg="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index df3af23c98f76..d8f1352137e28 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { homepage = "https://github.com/bids-standard/pybids"; changelog = "https://github.com/bids-standard/pybids/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; mainProgram = "pybids"; }; } diff --git a/pkgs/development/python-modules/pydocumentdb/default.nix b/pkgs/development/python-modules/pydocumentdb/default.nix index 5c8eb0990fd00..6139d6b897189 100644 --- a/pkgs/development/python-modules/pydocumentdb/default.nix +++ b/pkgs/development/python-modules/pydocumentdb/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Azure Cosmos DB API"; homepage = "https://github.com/Azure/azure-cosmos-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index 1aad1ae6668ca..9648fd9d206fd 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2024.6.4"; + version = "2024.6.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-I1VS9uNKybokbkKh6QVjsf5cLV3vg19EnblOheAyxn8="; + hash = "sha256-ug9gADM6ig6i2mu3GhQ+vsbNf3vEfR4L7OQ5Ixuh5so="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index c86678cbc499f..4a9dd9f6a750a 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.22"; + version = "0.2.23"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-zLGJ8MYfyXrJwy8GywOq9fM9rMMmRTgPrgiByGwQ+gM="; + hash = "sha256-myqv7zNhSUZTdyujg0ogrbzpypA5APGJhTM+FtrgXNA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index e370c36bb4d7e..5906a6f9a9cb1 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pygame-gui"; - version = "0611"; + version = "0612"; pyproject = true; # nixpkgs-update: no auto update @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "MyreMylar"; repo = "pygame_gui"; rev = "refs/tags/v_${version}"; - hash = "sha256-bibw6RUQKsOsaISunVEdQCT39KnXJ2VKVrAqsPS+Lu8="; + hash = "sha256-6Ps3pmQ8tYwQyv0TliOvUNLy3GjSJ2jdDQTTxfYej0o="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index 2310bfb1f77df..ccc9d2726d31f 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -2,8 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, - marshmallow, marshmallow-dataclass, + marshmallow, + pdm-backend, pytestCheckHook, pythonOlder, pythonRelaxDepsHook, @@ -16,29 +17,36 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.14.0"; + version = "1.15.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "GitGuardian"; repo = "py-gitguardian"; rev = "refs/tags/v${version}"; - hash = "sha256-Uw65+YOnln+IOyT+RgqMEWt5cOZsaeS8Nu8U6ooivWA="; + hash = "sha256-jmjlNGyGYsiwQ0qi8KiSUI38J4n1ZTzqxzY9Bn9OdqY="; }; - pythonRelaxDeps = [ "marshmallow-dataclass" ]; + pythonRelaxDeps = [ + "marshmallow-dataclass" + "setuptools" + ]; + + build-system = [ + pdm-backend + ]; nativeBuildInputs = [ pythonRelaxDepsHook - setuptools ]; - propagatedBuildInputs = [ + dependencies = [ marshmallow marshmallow-dataclass requests + setuptools typing-extensions ]; @@ -65,6 +73,7 @@ buildPythonPackage rec { "test_multiscan_parameters" "test_quota_overview" "test_rate_limit" + "test_read_metadata_bad_response" "test_sca_client_scan_diff" "test_sca_scan_all_with_params" "test_sca_scan_directory_invalid_tar" diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index 30dcee778a9b6..c2555281a6b03 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -2,43 +2,37 @@ lib, buildPythonPackage, deprecated, - fetchFromGitHub, - importlib-metadata, + fetchFromGitea, + importlib-resources, jaconv, py-cpuinfo, pytest-benchmark, pytestCheckHook, pythonOlder, - setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "pykakasi"; - version = "2.2.1"; + version = "2.3.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "miurahr"; repo = "pykakasi"; rev = "refs/tags/v${version}"; - hash = "sha256-ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM=="; + hash = "sha256-b2lYYdg1RW1xRD3hym7o1EnxzN/U5txVTWRifwZn3k0="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail ', "klepto"' "" - ''; - build-system = [ setuptools-scm ]; dependencies = [ jaconv deprecated - setuptools - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; nativeCheckInputs = [ py-cpuinfo @@ -51,16 +45,18 @@ buildPythonPackage rec { "test_benchmark" "pytest_benchmark_update_machine_info" "pytest_benchmark_update_json" + # Assertion error + "test_aozora" ]; pythonImportsCheck = [ "pykakasi" ]; meta = with lib; { description = "Python converter for Japanese Kana-kanji sentences into Kana-Roman"; - mainProgram = "kakasi"; - homepage = "https://github.com/miurahr/pykakasi"; - changelog = "https://github.com/miurahr/pykakasi/releases/tag/v${version}"; - license = licenses.mit; + homepage = "https://codeberg.org/miurahr/pykakasi"; + changelog = "https://codeberg.org/miurahr/pykakasi/src/tag/v${version}/CHANGELOG.rst"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; + mainProgram = "kakasi"; }; } diff --git a/pkgs/development/python-modules/pyloadapi/default.nix b/pkgs/development/python-modules/pyloadapi/default.nix new file mode 100644 index 0000000000000..aec92117415c9 --- /dev/null +++ b/pkgs/development/python-modules/pyloadapi/default.nix @@ -0,0 +1,58 @@ +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + hatch-regex-commit, + hatchling, + pytest-asyncio, + pytestCheckHook, + python-dotenv, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "pyloadapi"; + version = "1.2.0"; + pyproject = true; + + disabled = pythonOlder "3.12"; + + src = fetchFromGitHub { + owner = "tr4nt0r"; + repo = "pyloadapi"; + rev = "refs/tags/v${version}"; + hash = "sha256-uOgqc1RqmEk0Lqz/ixlChKTZva7+0v4V8KutLSgPKEE="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov=src/pyloadapi/ --cov-report=term-missing" "" + ''; + + build-system = [ + hatch-regex-commit + hatchling + ]; + + dependencies = [ aiohttp ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + python-dotenv + ]; + + pythonImportsCheck = [ "pyloadapi" ]; + + meta = with lib; { + description = "Simple wrapper for pyLoad's API"; + homepage = "https://github.com/tr4nt0r/pyloadapi"; + changelog = "https://github.com/tr4nt0r/pyloadapi/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix index 32b7cfcc9bbcd..6f0c4291d4d50 100644 --- a/pkgs/development/python-modules/pymilter/default.nix +++ b/pkgs/development/python-modules/pymilter/default.nix @@ -1,42 +1,37 @@ { lib, - python, buildPythonPackage, fetchFromGitHub, - fetchpatch, libmilter, - bsddb3, + berkeleydb, pydns, iana-etc, libredirect, pyasyncore, + setuptools, }: buildPythonPackage rec { pname = "pymilter"; - version = "1.0.5"; - format = "setuptools"; + version = "1.0.6"; + pyproject = true; src = fetchFromGitHub { owner = "sdgathman"; - repo = pname; - rev = "${pname}-${version}"; - hash = "sha256-gZUWEDVZfDRiOOdG3lpiQldHxm/93l8qYVOHOEpHhzQ="; + repo = "pymilter"; + rev = "refs/tags/pymilter-${version}"; + hash = "sha256-plaWXwDAIsVzEtrabZuZj7T4WNfz2ntQHgcMCVf5S70="; }; + build-system = [ + setuptools + ]; buildInputs = [ libmilter ]; nativeCheckInputs = [ pyasyncore ]; - propagatedBuildInputs = [ - bsddb3 + dependencies = [ + berkeleydb pydns ]; - patches = [ - (fetchpatch { # https://github.com/sdgathman/pymilter/pull/57 - name = "Remove-calls-to-the-deprecated-method-assertEquals"; - url = "https://github.com/sdgathman/pymilter/commit/1ead9028fc63ae3ec6ea3b0c438e6ed088a2b20e.patch"; - hash = "sha256-/5LlDR15nMR3l7rkVjT3w4FbDTFAAgNdERWlPNL2TVg="; - }) - ]; preBuild = '' sed -i 's/import thread/import _thread as thread/' Milter/greylist.py diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 0144c91bd3e9e..79c691980ffbf 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -8,18 +8,12 @@ shiboken6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pyside6"; inherit (shiboken6) version src; - patches = [ - # stripped down version of https://github.com/pyside/pyside-setup/commit/a0d68856d67ce6e178e3cfc2fccc236707e02fcd - # FIXME: remove in next release - ./qt-6.7.1.patch - ]; - - sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; + sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/pyside6"; # FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS # reside in the same directory as QtCore.framework, which is not true for Nix. @@ -80,18 +74,19 @@ stdenv.mkDerivation rec { cp -r PySide6.egg-info $out/${python.sitePackages}/ ''; - meta = with lib; { + meta = { description = "Python bindings for Qt"; - license = with licenses; [ + license = with lib.licenses; [ lgpl3Only gpl2Only gpl3Only ]; homepage = "https://wiki.qt.io/Qt_for_Python"; - maintainers = with maintainers; [ + changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ gebner Enzime ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/development/python-modules/pyside6/qt-6.7.1.patch b/pkgs/development/python-modules/pyside6/qt-6.7.1.patch deleted file mode 100644 index 8a5ece82d9cea..0000000000000 --- a/pkgs/development/python-modules/pyside6/qt-6.7.1.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/PySide6/QtMultimedia/CMakeLists.txt -+++ b/PySide6/QtMultimedia/CMakeLists.txt -@@ -12,6 +12,7 @@ ${QtMultimedia_GEN_DIR}/qaudioinput_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qaudiooutput_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qaudiosink_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qaudiosource_wrapper.cpp -+${QtMultimedia_GEN_DIR}/qaudio_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qcameraformat_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qcameradevice_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qcamera_wrapper.cpp -@@ -28,7 +29,6 @@ ${QtMultimedia_GEN_DIR}/qmediatimerange_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qmediatimerange_interval_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qscreencapture_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qsoundeffect_wrapper.cpp --${QtMultimedia_GEN_DIR}/qtaudio_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qtvideo_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qvideoframe_wrapper.cpp - ${QtMultimedia_GEN_DIR}/qvideoframeformat_wrapper.cpp -diff --git a/PySide6/QtMultimedia/typesystem_multimedia.xml b/PySide6/QtMultimedia/typesystem_multimedia.xml -index dd58f41cc..d37eb15fd 100644 ---- a/PySide6/QtMultimedia/typesystem_multimedia.xml -+++ b/PySide6/QtMultimedia/typesystem_multimedia.xml -@@ -9,7 +9,7 @@ - <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> - <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> - -- <namespace-type name="QtAudio"> -+ <namespace-type name="QAudio"> - <enum-type name="Error"/> - <enum-type name="State"/> - <enum-type name="VolumeScale"/> -@@ -65,9 +65,6 @@ - </modify-argument> - </modify-function> - <modify-function signature="stop()" allow-thread="true"/> -- <!-- FIXME PYSIDE 7: Remove this (QT6_DECL_NEW_OVERLOAD_TAIL) --> -- <declare-function signature="state()const" return-type="QtAudio::State"/> -- <declare-function signature="error()const" return-type="QtAudio::Error"/> - </object-type> - - <object-type name="QAudioSink"> -@@ -82,9 +79,6 @@ - </modify-argument> - </modify-function> - <modify-function signature="stop()" allow-thread="true"/> -- <!-- FIXME PYSIDE 7: Remove this (QT6_DECL_NEW_OVERLOAD_TAIL) --> -- <declare-function signature="state()const" return-type="QtAudio::State"/> -- <declare-function signature="error()const" return-type="QtAudio::Error"/> - </object-type> - - <object-type name="QCamera"> -diff --git a/PySide6/glue/qtmultimedia.cpp b/PySide6/glue/qtmultimedia.cpp -index d193b1bd3..ac8434b97 100644 ---- a/PySide6/glue/qtmultimedia.cpp -+++ b/PySide6/glue/qtmultimedia.cpp -@@ -2,6 +2,7 @@ - // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - - // @snippet qvideoframe-bits -+#include "object.h" - %BEGIN_ALLOW_THREADS - %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1); - %END_ALLOW_THREADS -@@ -23,5 +24,5 @@ const auto size = %CPPSELF.byteCount(); - - // @snippet qtaudio-namespace-compatibility-alias - Py_INCREF(pyType); --PyModule_AddObject(module, "QAudio", reinterpret_cast<PyObject *>(pyType)); -+PyModule_AddObject(module, "QtAudio", reinterpret_cast<PyObject *>(pyType)); - // @snippet qtaudio-namespace-compatibility-alias -diff --git a/libpyside/signalmanager.cpp b/libpyside/signalmanager.cpp -index 625e4a405..557f130e0 100644 ---- a/libpyside/signalmanager.cpp -+++ b/libpyside/signalmanager.cpp -@@ -813,11 +813,6 @@ static PyObject *parseArguments(const QMetaMethod &method, void **args) - for (qsizetype i = 0; i < argsSize; ++i) { - void *data = args[i+1]; - auto param = paramTypes.at(i); --#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) -- // Qt 6.7 renamed namespace "QAudio"->"QtAudio" except for signals -- if (param.startsWith("QAudio::"_ba)) -- param.insert(1, 't'); --#endif - Shiboken::Conversions::SpecificConverter converter(param.constData()); - if (!converter) { - PyErr_SetString(PyExc_TypeError, msgCannotConvertParameter(method, i).constData()); - diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix index 920f4c755aea0..5e07b68d989cd 100644 --- a/pkgs/development/python-modules/pytest-black/default.nix +++ b/pkgs/development/python-modules/pytest-black/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Pytest plugin to enable format checking with black"; homepage = "https://github.com/shopkeep/pytest-black"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index 6442d27f35f42..4d784be7c1187 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Pytest external process plugin"; homepage = "https://github.com/pytest-dev"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index d5c7532b47801..f3524637c875d 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.29.1"; + version = "0.29.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-fKeNQifSCxsqR2mhK2w5kG669byYNNLkfxAYTUtfWE0="; + hash = "sha256-Ocs3iwr4AwV6SxjZ4ylJYHy+/Jnt4bYeeMKJ6VVLWJA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyyaml-include/default.nix b/pkgs/development/python-modules/pyyaml-include/default.nix index 317ce298df951..84cec559cc1af 100644 --- a/pkgs/development/python-modules/pyyaml-include/default.nix +++ b/pkgs/development/python-modules/pyyaml-include/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Extending PyYAML with a custom constructor for including YAML files within YAML files"; homepage = "https://github.com/tanbro/pyyaml-include"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 0a6a476979c1a..f90c52359634d 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "qdrant-client"; rev = "refs/tags/v${version}"; - hash = "sha256-1QYL2othFA/xTgdj549MA1aVDH6jjiuL+aN2Q/supp8="; + hash = "sha256-F7H06SGKq6jSasY0TQVBmn1TYONVEZn6ArJXlRR4lCc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/railroad-diagrams/default.nix b/pkgs/development/python-modules/railroad-diagrams/default.nix index 60ba6862af53c..959c5e1d52236 100644 --- a/pkgs/development/python-modules/railroad-diagrams/default.nix +++ b/pkgs/development/python-modules/railroad-diagrams/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Module to generate SVG railroad syntax diagrams"; homepage = "https://github.com/tabatkins/railroad-diagrams"; license = licenses.cc0; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/refery/default.nix b/pkgs/development/python-modules/refery/default.nix index 1d434c4d569c6..cddfa64d361f4 100644 --- a/pkgs/development/python-modules/refery/default.nix +++ b/pkgs/development/python-modules/refery/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { junit-xml ]; - pythonImportCheck = [ "refery" ]; + pythonImportsCheck = [ "refery" ]; disabled = pythonOlder "3.10"; diff --git a/pkgs/development/python-modules/requests-gssapi/default.nix b/pkgs/development/python-modules/requests-gssapi/default.nix index b3d78e8a1250b..de1c0e5fd3888 100644 --- a/pkgs/development/python-modules/requests-gssapi/default.nix +++ b/pkgs/development/python-modules/requests-gssapi/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pythonImportCheck = [ "requests_gssapi" ]; + pythonImportsCheck = [ "requests_gssapi" ]; meta = with lib; { description = "GSSAPI authentication handler for python-requests"; diff --git a/pkgs/development/python-modules/rfc8785/default.nix b/pkgs/development/python-modules/rfc8785/default.nix new file mode 100644 index 0000000000000..c3505ebc460e4 --- /dev/null +++ b/pkgs/development/python-modules/rfc8785/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "rfc8785"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "rfc8785.py"; + rev = "refs/tags/v${version}"; + hash = "sha256-hMH//DpxgNoNLZJ8XL8SikcTfj0w0FvlBMfnPCkqzZ4="; + }; + + build-system = [ + flit-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "rfc8785" ]; + + meta = with lib; { + description = "Module for RFC8785 (JSON Canonicalization Scheme)"; + homepage = "https://github.com/trailofbits/rfc8785.py"; + changelog = "https://github.com/trailofbits/rfc8785.py/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/sarif-om/default.nix b/pkgs/development/python-modules/sarif-om/default.nix index 3d4e0134d5910..780f8560840e2 100644 --- a/pkgs/development/python-modules/sarif-om/default.nix +++ b/pkgs/development/python-modules/sarif-om/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Classes implementing the SARIF 2.1.0 object model"; homepage = "https://github.com/microsoft/sarif-python-om"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index a3ca41383be3f..10d557f774952 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -61,14 +61,14 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "32.1.0"; + version = "32.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WjVtE+3KtFdtBLqNUzFwDrWAUQLblE+DNGjABH+5zWc="; + hash = "sha256-P5Lmosa8PrqDYEbdoDLnby0ET4KsfbLWzXHmWHhy8ss="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/scramp/default.nix b/pkgs/development/python-modules/scramp/default.nix index df14875267d89..db2a741ccd4fb 100644 --- a/pkgs/development/python-modules/scramp/default.nix +++ b/pkgs/development/python-modules/scramp/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Implementation of the SCRAM authentication protocol"; homepage = "https://github.com/tlocke/scramp"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/secure/default.nix b/pkgs/development/python-modules/secure/default.nix index 6bbe9e2b5aa53..0d2a5cf8bb92e 100644 --- a/pkgs/development/python-modules/secure/default.nix +++ b/pkgs/development/python-modules/secure/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Adds optional security headers and cookie attributes for Python web frameworks"; homepage = "https://github.com/TypeError/secure.py"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/sev-snp-measure/default.nix b/pkgs/development/python-modules/sev-snp-measure/default.nix index c6795d1318a1b..b5d7067759872 100644 --- a/pkgs/development/python-modules/sev-snp-measure/default.nix +++ b/pkgs/development/python-modules/sev-snp-measure/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "sev-snp-measure"; - version = "0.0.9"; + version = "0.0.11"; pyproject = true; src = fetchFromGitHub { owner = "virtee"; repo = "sev-snp-measure"; - rev = "v${version}"; - hash = "sha256-efW4DMple26S3Jizc7yAvdPjVivyMJq4fEdkuToamGc="; + rev = "refs/tags/v${version}"; + hash = "sha256-M+d9uIAQvEmEsdhhjlwHbhB2RhlaGjphN4ov2ipzCFY="; }; nativeBuildInputs = [ @@ -29,11 +29,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ]; - postPatch = '' - # See https://github.com/virtee/sev-snp-measure/pull/46 - sed -i '/types-cryptography/d' setup.cfg requirements.txt - ''; - pythonImportsCheck = [ "sevsnpmeasure" ]; meta = { diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index 5bf11c0a14a59..39c61bc8cc3b5 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -1,7 +1,6 @@ { lib, fetchurl, - fetchpatch, llvmPackages, python, cmake, @@ -12,28 +11,19 @@ let stdenv' = if stdenv.cc.isClang then stdenv else llvmPackages.stdenv; in -stdenv'.mkDerivation rec { +stdenv'.mkDerivation (finalAttrs: { pname = "shiboken6"; - version = "6.7.0"; + version = "6.7.2"; src = fetchurl { # https://download.qt.io/official_releases/QtForPython/shiboken6/ - url = "https://download.qt.io/official_releases/QtForPython/shiboken6/PySide6-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz"; - hash = "sha256-gurjcHN99ez1OcFl0J18gdX8YVOlQbjT03sRJ1+ePo8="; + url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-${finalAttrs.version}-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz"; + hash = "sha256-OisNDW54yapd3H8GyktvEaP+FFYLrrFI7qU7XZjjaMc="; }; - sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; + sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6"; - patches = [ - ./fix-include-qt-headers.patch - # Remove this patch when updating to 6.8.0 - (fetchpatch { - name = "backwards-compatibility-with-6.6.x.patch"; - url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=4f9a20e3635f4f0957e0774588b1d9156e88a572"; - hash = "sha256-B2jhLWopgaSF/rUXMZFPZArDUNojlBgn7kdVyQull+I="; - stripLen = 2; - }) - ]; + patches = [ ./fix-include-qt-headers.patch ]; nativeBuildInputs = [ cmake @@ -57,21 +47,6 @@ stdenv'.mkDerivation rec { substituteInPlace cmake/ShibokenHelpers.cmake --replace-fail '#!/bin/bash' '#!''${BASH}' ''; - # Due to Shiboken.abi3.so being linked to libshiboken6.abi3.so.6.6 in the build tree, - # we need to remove the build tree reference from the RPATH and then add the correct - # directory to the RPATH. On Linux, the second part is handled by autoPatchelfHook. - # https://bugreports.qt.io/browse/PYSIDE-2233 - preFixup = - '' - echo "fixing RPATH of Shiboken.abi3.so" - '' - + lib.optionalString stdenv.isDarwin '' - install_name_tool -change {@rpath,$out/lib}/libshiboken6.abi3.6.6.dylib $out/${python.sitePackages}/shiboken6/Shiboken.abi3.so - '' - + lib.optionalString stdenv.isLinux '' - patchelf $out/${python.sitePackages}/shiboken6/Shiboken.abi3.so --shrink-rpath --allowed-rpath-prefixes ${builtins.storeDir} - ''; - postInstall = '' cd ../../.. ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=shiboken6 @@ -80,18 +55,19 @@ stdenv'.mkDerivation rec { dontWrapQtApps = true; - meta = with lib; { + meta = { description = "Generator for the pyside6 Qt bindings"; - license = with licenses; [ + license = with lib.licenses; [ lgpl3Only gpl2Only gpl3Only ]; homepage = "https://wiki.qt.io/Qt_for_Python"; - maintainers = with maintainers; [ + changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ gebner Enzime ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index cce3de84a0e87..6eb35709fabc5 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.29.0"; + version = "3.30.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-49dSRg0nrTXuXfnrC2/3p/zYMxouXO9FLqSBSxg4TcU="; + hash = "sha256-KJC0M5sk1dlCzadQ1/MBEnWuAGva/MP2MygqehH2fTg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index a53a43ce80c57..9f1d3e92c08d6 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "slackclient"; - version = "3.28.0"; + version = "3.29.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-rsJLjqP1XT1JkFz3iQovF58XdkmVcL+jfjiiI9SqonE="; + hash = "sha256-49dSRg0nrTXuXfnrC2/3p/zYMxouXO9FLqSBSxg4TcU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index e683eac23e35d..37d133ef17df5 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { mainProgram = "sshtunnel"; homepage = "https://github.com/pahaz/sshtunnel"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index 174cca93a355b..0abcbcf4bef7e 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { homepage = "https://github.com/dropbox/stone"; changelog = "https://github.com/dropbox/stone/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; mainProgram = "stone"; }; } diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index 96c004b5abd54..793a83c3bc08c 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://hitchdev.com/strictyaml/"; changelog = "https://hitchdev.com/strictyaml/changelog/"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/syncedlyrics/default.nix b/pkgs/development/python-modules/syncedlyrics/default.nix index 9b2fb010b04ad..72ac8b5794d31 100644 --- a/pkgs/development/python-modules/syncedlyrics/default.nix +++ b/pkgs/development/python-modules/syncedlyrics/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "syncedlyrics"; - version = "0.10.1"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "rtcq"; repo = "syncedlyrics"; rev = "refs/tags/v${version}"; - hash = "sha256-jqd68Npt7qq9aMWO3AVR4JRAs9avO4x9u+MC/brU1Cw="; + hash = "sha256-W3cg/+nU0Zp5pDhkoHqUemYImlDKlZDVbB7jZ3dScnk="; }; build-system = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 2fd63f5e1d929..de1221035423e 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1173"; + version = "3.0.1174"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-rCfTgK6ZfddBofxOfA1ilRwUGRkYTj4NpDEFRfpjSEk="; + hash = "sha256-RaeyaiVs+9iZxWxR2hrQ7MrmPfwu0NODC4NJSJ22/kQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index c6a677f4c65a7..ea00817ab76de 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.68.0"; + version = "0.70.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = "textual"; rev = "refs/tags/v${version}"; - hash = "sha256-nxQVxe7lXMcxyqh4SWcQ/A6eQcEzkSshKmpweHpn7JE="; + hash = "sha256-nOgiMT+q2pc94Q6g3MvKQVhGJYSGNnoE+5/foK62zLM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index 4a125dd1775bc..d70ed13e37e8b 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "thriftpy2"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Thriftpy"; repo = "thriftpy2"; rev = "refs/tags/v${version}"; - hash = "sha256-Pjy9OPwFfKaw+XVl7IbbAKPz050TlqI4+yLqSITOkSY="; + hash = "sha256-F/h2XhzLA89CwgorKhrvKrajFbT9maiF3RBkulQQ9bk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix index 63752e22d462a..fc71e13c306b5 100644 --- a/pkgs/development/python-modules/unidata-blocks/default.nix +++ b/pkgs/development/python-modules/unidata-blocks/default.nix @@ -2,10 +2,9 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, pythonOlder, + pytestCheckHook, nix-update-script, - hatch-vcs, hatchling, langcodes, }: @@ -13,8 +12,9 @@ buildPythonPackage rec { pname = "unidata-blocks"; version = "0.0.10"; + pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.10"; src = fetchPypi { pname = "unidata_blocks"; @@ -22,17 +22,16 @@ buildPythonPackage rec { hash = "sha256-wwiOjfIAx6AZtK98uuPQ0jwblq+CdnMQp+JkQWh+RgM="; }; - format = "pyproject"; + build-system = [ hatchling ]; - nativeBuildInputs = [ - hatch-vcs - hatchling + dependencies = [ + langcodes ]; - propagatedBuildInputs = [ langcodes ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "unidata_blocks" ]; + passthru.updateScript = nix-update-script { }; meta = { @@ -40,6 +39,9 @@ buildPythonPackage rec { description = "Library that helps query unicode blocks by Blocks.txt"; platforms = lib.platforms.all; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ h7x4 ]; + maintainers = with lib.maintainers; [ + TakWolf + h7x4 + ]; }; } diff --git a/pkgs/development/python-modules/unittest-data-provider/default.nix b/pkgs/development/python-modules/unittest-data-provider/default.nix index d6f3389540de0..690db790d7005 100644 --- a/pkgs/development/python-modules/unittest-data-provider/default.nix +++ b/pkgs/development/python-modules/unittest-data-provider/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { description = "PHPUnit-like @dataprovider decorator for unittest"; homepage = "https://github.com/yourlabs/unittest-data-provider"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/vsts-cd-manager/default.nix b/pkgs/development/python-modules/vsts-cd-manager/default.nix index bd6b7d782967b..8730f6e0ef2a8 100644 --- a/pkgs/development/python-modules/vsts-cd-manager/default.nix +++ b/pkgs/development/python-modules/vsts-cd-manager/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Microsoft Azure API Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/vsts/default.nix b/pkgs/development/python-modules/vsts/default.nix index f56b9d33191f0..c3a3d38b98b76 100644 --- a/pkgs/development/python-modules/vsts/default.nix +++ b/pkgs/development/python-modules/vsts/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Python APIs for interacting with and managing Azure DevOps"; homepage = "https://github.com/microsoft/azure-devops-python-api"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix index fa0e4ff82aa4e..29a5e670e56ed 100644 --- a/pkgs/development/python-modules/webdataset/default.nix +++ b/pkgs/development/python-modules/webdataset/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { hash = "sha256-selj7XD7NS831lbPnx/4o46bNpsxuFdSEIIb4S2b7S0="; }; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ braceexpand numpy pyyaml @@ -84,12 +84,20 @@ buildPythonPackage rec { "test_webloader_unbatched" ]; - meta = with lib; { + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # AttributeError: <module 'torch.distributed' from /nix/store/... + "tests/test_wids.py" + + # Issue with creating a temp file in the sandbox + "tests/test_wids_mmtar.py" + ]; + + meta = { description = "High-performance Python-based I/O system for large (and small) deep learning problems, with strong support for PyTorch"; mainProgram = "widsindex"; homepage = "https://github.com/webdataset/webdataset"; changelog = "https://github.com/webdataset/webdataset/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ iynaix ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ iynaix ]; }; } diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix index 7524d415c1876..58981027b3e8c 100644 --- a/pkgs/development/python-modules/xapian/default.nix +++ b/pkgs/development/python-modules/xapian/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://xapian.org/"; changelog = "https://xapian.org/docs/xapian-bindings-${version}/NEWS"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix index ddd0c45512428..87eeec7902ea8 100644 --- a/pkgs/development/python-modules/xdg/default.nix +++ b/pkgs/development/python-modules/xdg/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "XDG Base Directory Specification for Python"; homepage = "https://github.com/srstevenson/xdg"; license = licenses.isc; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 61bdd691368fd..3a155055df63f 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/sissaschool/xmlschema"; changelog = "https://github.com/sissaschool/xmlschema/blob/${src.rev}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 39fefd923956b..908b4d4b50b4e 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "6.4.0"; + version = "6.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-b5R80l3+5mnxMFtISUxToufhSDoRmmCRAyoP5hbk08o="; + hash = "sha256-lCRil1SeYXZeXT0SJielJg2Ma8voBXPgij+RK/oT1iU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index 3a93c13a820a2..ff7560587aa47 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -54,7 +54,6 @@ buildPythonPackage rec { changelog = "https://github.com/adrienverge/yamllint/blob/v${version}/CHANGELOG.rst"; license = licenses.gpl3Plus; maintainers = with maintainers; [ - jonringer mikefaille ]; }; diff --git a/pkgs/development/rocm-modules/5/clr/default.nix b/pkgs/development/rocm-modules/5/clr/default.nix index 0c702dace2b81..49857e9d26f5a 100644 --- a/pkgs/development/rocm-modules/5/clr/default.nix +++ b/pkgs/development/rocm-modules/5/clr/default.nix @@ -114,6 +114,10 @@ in stdenv.mkDerivation (finalAttrs: { substituteInPlace hipamd/src/hip_embed_pch.sh \ --replace "\''$LLVM_DIR/bin/clang" "${clang}/bin/clang" + + substituteInPlace opencl/khronos/icd/loader/icd_platform.h \ + --replace-fail '#define ICD_VENDOR_PATH "/etc/OpenCL/vendors/";' \ + '#define ICD_VENDOR_PATH "/run/opengl-driver/etc/OpenCL/vendors/";' ''; postInstall = '' diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/6/clr/default.nix index dedda194c8280..7d80242ccbda0 100644 --- a/pkgs/development/rocm-modules/6/clr/default.nix +++ b/pkgs/development/rocm-modules/6/clr/default.nix @@ -138,6 +138,10 @@ in stdenv.mkDerivation (finalAttrs: { # https://lists.debian.org/debian-ai/2024/02/msg00178.html substituteInPlace rocclr/utils/flags.hpp \ --replace-fail "HIP_USE_RUNTIME_UNBUNDLER, false" "HIP_USE_RUNTIME_UNBUNDLER, true" + + substituteInPlace opencl/khronos/icd/loader/icd_platform.h \ + --replace-fail '#define ICD_VENDOR_PATH "/etc/OpenCL/vendors/";' \ + '#define ICD_VENDOR_PATH "/run/opengl-driver/etc/OpenCL/vendors/";' ''; postInstall = '' diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index ed663df264380..414771b2773ba 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.141"; + version = "3.2.144"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-1EKqqKm0QB9tS5uaS7xMPoK/KDWRkJH1uW7yGiHLbNU="; + hash = "sha256-BF2xeHoVb6uSqRB9kTj6QX4pDUkj49xdBOC2SbZ0qjE="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 349b44730b8a2..c5e3b43eea061 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -1,18 +1,42 @@ - {lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }: +{ + lib, + stdenv, + fetchFromGitHub, + perl, + python3, + perlPackages, + makeWrapper, +}: +let + perlDeps = [ + perlPackages.CaptureTiny + perlPackages.DateTime + perlPackages.DateTimeFormatW3CDTF + perlPackages.DevelCover + perlPackages.GD + perlPackages.JSONXS + perlPackages.MemoryProcess + perlPackages.PathTools + ]; +in stdenv.mkDerivation rec { pname = "lcov"; - version = "1.16"; + version = "2.1"; src = fetchFromGitHub { owner = "linux-test-project"; repo = "lcov"; rev = "v${version}"; - sha256 = "sha256-X1T5OqR6NgTNGedH1on3+XZ7369007By6tRJK8xtmbk="; + hash = "sha256-QfA+mzLfpi2fuhcPvCKO7YnPef1GMhCbgBWdXFTXPzE="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl ]; + + buildInputs = [ + perl + python3 + ]; preBuild = '' patchShebangs bin/ @@ -20,26 +44,27 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/lcov --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.PerlIOgzip perlPackages.JSON ]} - wrapProgram $out/bin/genpng --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.GD ]} + for f in "$out"/bin/{gen*,lcov,perl2lcov}; do + wrapProgram "$f" --set PERL5LIB ${perlPackages.makeFullPerlPath perlDeps} + done ''; - meta = with lib; { + meta = { description = "Code coverage tool that enhances GNU gcov"; - longDescription = - '' LCOV is an extension of GCOV, a GNU tool which provides information - about what parts of a program are actually executed (i.e., - "covered") while running a particular test case. The extension - consists of a set of PERL scripts which build on the textual GCOV - output to implement the following enhanced functionality such as - HTML output. - ''; + longDescription = '' + LCOV is an extension of GCOV, a GNU tool which provides information + about what parts of a program are actually executed (i.e., + "covered") while running a particular test case. The extension + consists of a set of PERL scripts which build on the textual GCOV + output to implement the following enhanced functionality such as + HTML output. + ''; - homepage = "https://ltp.sourceforge.net/coverage/lcov.php"; + homepage = "https://github.com/linux-test-project/lcov"; license = lib.licenses.gpl2Plus; - maintainers = with maintainers; [ dezgeg ]; - platforms = platforms.all; + maintainers = with lib.maintainers; [ dezgeg ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix index aebe38d88b7e8..14336fc91dc38 100644 --- a/pkgs/development/tools/b4/default.nix +++ b/pkgs/development/tools/b4/default.nix @@ -2,16 +2,21 @@ python3Packages.buildPythonApplication rec { pname = "b4"; - version = "0.13.0"; + version = "0.14.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-gsok5aDi5oYJPMXVv3MFAehyKZ5hHBtvwf7z6Ut4dBQ="; + hash = "sha256-KaMo0aZhwv9F4aya5ViTBwPxK6RLPZgfRJ9g6O48SUk="; }; # tests make dns requests and fails doCheck = false; + build-system = with python3Packages; [ + setuptools + ]; + propagatedBuildInputs = with python3Packages; [ requests dnspython diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 5e6ad1c1e16fd..778a8c2f221b2 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.25.6"; + version = "1.26.1"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-DFBQryGbanytawHtD3ygSL9ypzM9hoxVoVB1H9ruPu4="; + hash = "sha256-XgOtPL3gzSRX+VWAsNo6zMCh6tQoeH1HvH6oycS6S70="; }; - cargoHash = "sha256-6Ipfz4649vf7qsavkif/zNbElMiZPEi/2ZXHbRcxRTw="; + cargoHash = "sha256-maqdfN8UXcAU3UGxjE6PJWxyilKWJZPkfXY7tu72LTk="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 8bb971deef84c..9b745264eb9c5 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "xmake"; - version = "2.9.2"; + version = "2.9.3"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-H2F7akVox+s+irDzpnwWmJJFrcVH46fR/YYayzCPtbI="; + hash = "sha256-gqm7aWGjm+qPKAwUE9VIVEI/j5Li/0PuHA/q16O17dg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index b8fc6af5764b7..5c32c6bcd078e 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "changie"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "miniscruff"; repo = "changie"; rev = "v${version}"; - hash = "sha256-3GQ9C9UteJG3LfJmDsBbFJ9hnz7ouQ/6bZkQ/8CZ8PI="; + hash = "sha256-FZR3KWBCulTbE1Rn6T1neJsjbps0HBPSzzZ57lngB/8="; }; vendorHash = "sha256-2SkHId5BDAv525PISLjlrP862Z2fJDN4L839rz8rWaw="; diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index a1cbbf93d07b2..2da9a90e4280b 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -13,21 +13,21 @@ let channels = { stable = { - version = "2.11.2"; + version = "2.11.3"; hash = { - x86_64-linux = "sha256-kvQPrYGDkfzTOb3c9f3VNdg3oltKmm1Z4pXeHJ9LIyo="; - x86_64-darwin = "sha256-AUfbdJNBK2fCJ6Pq4gkH4+y/undu6Nx64wcejVAB7iU="; - aarch64-linux = "sha256-FWgTLE3fW/6j1W1FNDqyVOTMGuFqc4e3Eq2tj8IEcWk="; - aarch64-darwin = "sha256-oM+dEUYNUcYHemDWYBf5mqUo3aHXEu6LUuLOboGfTrQ="; + x86_64-linux = "sha256-TaEl7J/Zo/K+j8EGpIauQYR5UucALviuSk0/jgiK83U="; + x86_64-darwin = "sha256-qM2YTvHGeAi1F4V79YoDdsp1NbHFah8L0bppUhmzZyY="; + aarch64-linux = "sha256-gLaxi3h2JrnVecS/k3YHuWM1R1oLXKg5R1aeh3GVREY="; + aarch64-darwin = "sha256-SochFDBspdKfw1xd2FiyI9bp2Y3SbdgbGtzwUDyMsLE="; }; }; mainline = { - version = "2.12.1"; + version = "2.12.2"; hash = { - x86_64-linux = "sha256-YOm2qpw9c5L0bwcodR0quUO2d0eRqDBeUfGB6bZNC9I="; - x86_64-darwin = "sha256-ePpwnXoVQby0l4Az8OtygPBpXumjIR8MaDVPH4FzrwM="; - aarch64-linux = "sha256-ZPAWzLjtJsgtcMT+w2n8o4cQtQ7HXrL+EejOib/Ab3c="; - aarch64-darwin = "sha256-ZcJiLLcZcge0MXiuQH4slAqxXLuytdHL+LZfUNx25jY="; + x86_64-linux = "sha256-UJnJ64zwuDKzc/yKLQnj//3tXZ/GJpzUUw8KoH3Uf14="; + x86_64-darwin = "sha256-d+BWUEMvta7ZkCOqMTafuR5suIDWPauwTzGOpPDF+ck="; + aarch64-linux = "sha256-ayZZhqL3YLjaUDmHOiY4yXg/+tGR7HpLcwojuagqkKg="; + aarch64-darwin = "sha256-EYB7YLScshBInLBOXVfYs+f+OWC7OF9tEmhhG25pPSo="; }; }; }; diff --git a/pkgs/development/tools/codespell/default.nix b/pkgs/development/tools/codespell/default.nix index e76a980f7427c..84eb2cdfa205c 100644 --- a/pkgs/development/tools/codespell/default.nix +++ b/pkgs/development/tools/codespell/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "codespell"; - version = "2.2.6"; + version = "2.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "codespell-project"; repo = "codespell"; rev = "v${version}"; - sha256 = "sha256-esewCJw4o4SfSst5ALZ90X3XgOuOAsaxytpotvFeHB0="; + sha256 = "sha256-X3Pueu0E7Q57sbKSXqCZki4/PUb1WyWk/Zmj+lhVTM8="; }; postPatch = '' @@ -39,9 +39,7 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # tries to run not fully installed script - "test_command" - # error 'dateset' should not be in aspell dictionaries (en, en_GB, en_US, en_CA, en_AU) for dictionary /build/source/codespell_lib/tests/../data/dictionary.txt - "test_dictionary_formatting" + "test_basic" ]; pythonImportsCheck = [ "codespell_lib" ]; diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 2b7a31d05f2e8..3cb8c66f36532 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.5.14"; + version = "2.5.15"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-y57P6AM0w1AaOxCOHPjdgyhvqP/yasOP46JdErnYEvg="; + hash = "sha256-FKOpHvturPJQOhWJh5I7JwDhp0X0Y0ppFejTW1hG6Fk="; }; vendorHash = "sha256-vwcItklYe6ljFdGTxef19plaI5OMoOtQohY0xZLBUos="; diff --git a/pkgs/development/tools/dazel/default.nix b/pkgs/development/tools/dazel/default.nix new file mode 100644 index 0000000000000..f19d469697835 --- /dev/null +++ b/pkgs/development/tools/dazel/default.nix @@ -0,0 +1,22 @@ +{ lib +, buildPythonApplication +, fetchPypi +}: +buildPythonApplication rec { + version = "0.0.42"; + pname = "dazel"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-JE7+GS7DpuFoC2LK3dvYvjtOdzRxFMHzgZRfvrGBDtQ="; + }; + + meta = { + homepage = "https://github.com/nadirizr/dazel"; + description = "Run Google's bazel inside a docker container via a seamless proxy."; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + malt3 + ]; + }; +} diff --git a/pkgs/development/tools/language-servers/csharp-ls/default.nix b/pkgs/development/tools/language-servers/csharp-ls/default.nix index eb8c6cd2bb31b..0972bac8c8486 100644 --- a/pkgs/development/tools/language-servers/csharp-ls/default.nix +++ b/pkgs/development/tools/language-servers/csharp-ls/default.nix @@ -8,9 +8,9 @@ in buildDotnetGlobalTool rec { pname = "csharp-ls"; - version = "0.13.0"; + version = "0.14.0"; - nugetSha256 = "sha256-hhgMwDk3mT7E07REqZduTuEnS7D1tCgdxqN+MLNo9EI="; + nugetSha256 = "sha256-agcx7VPIqGhl3NzdGLPwXYJsRuvSjL4SdbNg9vFjIh4="; dotnet-sdk = sdk_8_0; dotnet-runtime = sdk_8_0; diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix index bfb8561f6caa8..42ca82fea0bcc 100644 --- a/pkgs/development/tools/language-servers/metals/default.nix +++ b/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.3.1"; + version = "1.3.2"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-ugTYjXgD5SHagRtc1RNsnfcLAXPeWSHcos82ewr3UIs="; + outputHash = "sha256-hRESY7TFxUjEkNf0vhCG30mIHZHXoAyZl3nTQ3OvQ0E="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index 6797c2d432502..a8d0e373a110d 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.7.4"; + version = "0.7.6"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-oYvjMpZcXIpOA/osVCOy2NxkFnEQePGf4le22M1bFPA="; + hash = "sha256-V8bbJg7h/TCv0y8Kwz3h6XMKtxKjJKduCj9e1vcd6AQ="; }; - cargoHash = "sha256-kcqq4xnCxGIGCFlmm4EDc9ZfQHBi6k/xrhIyZ+eKs34="; + cargoHash = "sha256-kR4QJ1QFewI5jKPX9/P1z5J9hnWBIhWExF6JgmDzoJw="; meta = with lib; { description = "Cmake lsp based on tower-lsp and treesitter"; diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index d64e3c91ae7e0..1a0466596fdc3 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -1,11 +1,11 @@ -{ luarocks +{ luarocks_bootstrap , fetchFromGitHub , unstableGitUpdater , nurl , file }: -luarocks.overrideAttrs (old: { +luarocks_bootstrap.overrideAttrs (old: { pname = "luarocks-nix"; version = "0-unstable-2024-04-29"; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 463efbd198dbd..475b280c925a8 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.16.1"; + version = "5.17.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-oXROZdnmkqb0nd2CdLJO/KYkoe+BriYlfMJXe1yKGTA="; + hash = "sha256-4yMZxhq8Y3RFZHOlulG5hqj3bJSIYVycrtnmsbx+4bs="; }; - cargoHash = "sha256-4GWoTHSQD7DnAsiUWEF2TX+2r3XD3t/9+j/PGL7Haq8="; + cargoHash = "sha256-/qT/mxKjVvyA6XAB0Oa6jpKss0YtIL6cvGwBHM8Bt4M="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; diff --git a/pkgs/development/tools/protoc-gen-dart/default.nix b/pkgs/development/tools/protoc-gen-dart/default.nix index b09322e297014..06a96e70cf3e7 100644 --- a/pkgs/development/tools/protoc-gen-dart/default.nix +++ b/pkgs/development/tools/protoc-gen-dart/default.nix @@ -17,6 +17,8 @@ buildDartApplication rec { pubspecLock = lib.importJSON ./pubspec.lock.json; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Protobuf plugin for generating Dart code"; mainProgram = "protoc-gen-dart"; diff --git a/pkgs/development/tools/protoc-gen-dart/update.sh b/pkgs/development/tools/protoc-gen-dart/update.sh new file mode 100755 index 0000000000000..5bea5f3bea84c --- /dev/null +++ b/pkgs/development/tools/protoc-gen-dart/update.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p yq ripgrep common-updater-scripts dart + +set -xeu -o pipefail + +PACKAGE_DIR="$(realpath "$(dirname "$0")")" +cd "$PACKAGE_DIR/.." +while ! test -f flake.nix; do cd .. ; done +NIXPKGS_DIR="$PWD" + +version="$( + list-git-tags --url=https://github.com/google/protobuf.dart \ + | rg '^protobuf-v(.*)' -r '$1' \ + | sort --version-sort \ + | tail -n1 +)" + +cd "$NIXPKGS_DIR" +update-source-version protoc-gen-dart "$version" + +TMPDIR="$(mktemp -d)" +cd "$TMPDIR" + +src="$(nix-build --no-link "$NIXPKGS_DIR" -A protoc-gen-dart.src)/protoc_plugin" +cp $src/pubspec.* . + +if ! test -f pubspec.lock; then + dart pub update +fi + +yq . pubspec.lock > "$PACKAGE_DIR/pubspec.lock.json" + +rm -rf "$TMPDIR" diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index d868c5b16b874..a11f60bf99c4a 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2024.06.10.00"; + version = "2024.06.17.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; rev = "refs/tags/v${version}"; - hash = "sha256-YAWGNF4WN8/RV3GYmxjyARNk4VzTXJEa42/gaK5B4CE="; + hash = "sha256-J3ZrlX83TE63Go4qp+lMhexkuaV0ZgHNYga8qxZF0wI="; }; - cargoHash = "sha256-uNTDLQH6m4Dbk8tGyGnm0W5OK9OGaABZOq7weqtvaeU="; + cargoHash = "sha256-xqDMfGNvlyFo3v9GmESfRG+WyQKbzTojOqtYK/tMPxo="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/development/tools/rye/Cargo.lock index 3a7d4b0e21122..e2d27c9eade64 100644 --- a/pkgs/development/tools/rye/Cargo.lock +++ b/pkgs/development/tools/rye/Cargo.lock @@ -1799,7 +1799,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.34.0" +version = "0.35.0" dependencies = [ "age", "anyhow", diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix index ab191b7547be4..8414cd5f59c02 100644 --- a/pkgs/development/tools/rye/default.nix +++ b/pkgs/development/tools/rye/default.nix @@ -8,17 +8,20 @@ , CoreServices , Libsystem , SystemConfiguration +, nix-update-script +, testers +, rye }: rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-M5TJXyh1fNigHOuBpEpnUeOWboZWxZ9bGrBuMB1oHgE="; + hash = "sha256-mkBp9iFoN1LanJrcm4VdZ9k8cWNaRZIYl10ukT4Rfqc="; }; cargoLock = { @@ -80,12 +83,17 @@ rustPlatform.buildRustPackage rec { "--skip=test_version" ]; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = rye; }; + }; + + meta = { description = "Tool to easily manage python dependencies and environments"; homepage = "https://github.com/mitsuhiko/rye"; changelog = "https://github.com/mitsuhiko/rye/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "rye"; }; } diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index d194b576c3610..f408780d1dea5 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "zed"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XY8vLCflNgxM75cTaUaqJPg8ZIm5dealC6K8es/5F5Q="; + sha256 = "sha256-xjE/9Sl4lpgUg1+giUw/14E3MehhFqJI5cYXaw/qVPE="; }; vendorHash = "sha256-X1rE6/sgpB6jeTjLZJL/a7ghjRJYTXSQDHB4PmEFUmU="; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 4fa21673a61d3..0bbaf69a73158 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.15"; + version = "1.1.17"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-T6V3B54rpdNmF60lX137Pau80+E/21aSl6LCa+6GHq4="; + hash = "sha256-aULgRZ9evcGUhKJ6slLJOg3IEzUeNfIkJF8RDP3YUlo="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-ekWcoZxGsq1AtBLflzzhVQ2lVPwQt61Y86MVHtFJsUQ="; + hash = "sha256-eytY45LcgeI9m9amHd8hfE7Lz7ET7p19h37Bi4yUHBM="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-o1NWjuWTwIQamLG10UU7LawZ9jB8RDuLWJKbCCEIdeU="; + hash = "sha256-bF/yg7C2tsdPjotC4DKISZRWEUUmUha22tWJynearEM="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-PLGR7TEdy3sQ3S9rKWe8z8gjrmb8STyYPzbRPaJYSPI="; + hash = "sha256-pRggu/l0HgCk73kX7W43qKFVE13/7pP4P9bTiqyK2Yk="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 52560a0d52b54..845aae0815e2a 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { mainProgram = "dwarftherapist"; description = "Tool to manage dwarves in a running game of Dwarf Fortress"; - maintainers = with maintainers; [ abbradar bendlas numinit jonringer ]; + maintainers = with maintainers; [ abbradar bendlas numinit ]; license = licenses.mit; platforms = platforms.x86; homepage = "https://github.com/Dwarf-Therapist/Dwarf-Therapist"; diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 1e2a2811769a1..b3f5549c487c8 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -1,6 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, unzip, meson, ninja, pkg-config, qtbase, qttools, wrapQtAppsHook, luajit }: +{ + stdenv, + lib, + fetchFromGitHub, + unzip, + meson, + ninja, + pkg-config, + qtbase, + qttools, + wrapQtAppsHook, + icoutils, + copyDesktopItems, + makeDesktopItem, + luajit, +}: let - data = stdenv.mkDerivation(finalAttrs: { + data = stdenv.mkDerivation (finalAttrs: { pname = "path-of-building-data"; version = "2.42.0"; @@ -42,12 +57,35 @@ stdenv.mkDerivation { hash = "sha256-zhw2PZ6ZNMgZ2hG+a6AcYBkeg7kbBHNc2eSt4if17Wk="; }; - nativeBuildInputs = [ meson ninja pkg-config qttools wrapQtAppsHook ]; - buildInputs = [ qtbase luajit luajit.pkgs.lua-curl ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + qttools + wrapQtAppsHook + icoutils + ] ++ lib.optional stdenv.isLinux copyDesktopItems; + + buildInputs = [ + qtbase + luajit + luajit.pkgs.lua-curl + ]; installPhase = '' runHook preInstall install -Dm555 pobfrontend $out/bin/pobfrontend + + wrestool -x -t 14 ${data.src}/runtime/Path{space}of{space}Building.exe -o pathofbuilding.ico + icotool -x pathofbuilding.ico + + for size in 16 32 48 256; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + install -Dm 644 pathofbuilding*"$size"x"$size"*.png \ + $out/share/icons/hicolor/"$size"x"$size"/apps/pathofbuilding.png + done + rm pathofbuilding.ico + runHook postInstall ''; @@ -59,6 +97,27 @@ stdenv.mkDerivation { ) ''; + desktopItems = [ + (makeDesktopItem { + name = "path-of-building"; + desktopName = "Path of Building"; + comment = "Offline build planner for Path of Exile"; + exec = "pobfrontend %U"; + terminal = false; + type = "Application"; + icon = "pathofbuilding"; + categories = [ "Game" ]; + keywords = [ + "poe" + "pob" + "pobc" + "path" + "exile" + ]; + mimeTypes = [ "x-scheme-handler/pob" ]; + }) + ]; + passthru.data = data; meta = { @@ -67,6 +126,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; maintainers = [ lib.maintainers.k900 ]; mainProgram = "pobfrontend"; - broken = stdenv.isDarwin; # doesn't find uic6 for some reason + broken = stdenv.isDarwin; # doesn't find uic6 for some reason }; } diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 92c45cc7c06fd..151a1ba5be469 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { ''; homepage = "https://store.steampowered.com/"; license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ jagajaga jonringer ]; + maintainers = with maintainers; [ jagajaga ]; mainProgram = "steam"; }; } diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index bfd871a2a1c14..000b07c5433d9 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -11,6 +11,7 @@ , gtk2 , libmad , libogg +, libpng , libpulseaudio , libvorbis , udev @@ -51,6 +52,7 @@ stdenv.mkDerivation { gtk2 libmad libogg + libpng libpulseaudio libvorbis udev @@ -59,6 +61,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DWITH_SYSTEM_FFMPEG=1" + "-DWITH_SYSTEM_PNG=on" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ]; @@ -79,8 +82,6 @@ stdenv.mkDerivation { platforms = platforms.linux; license = licenses.mit; # expat version maintainers = with maintainers; [ h7x4 ]; - # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; mainProgram = "stepmania"; }; } diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index b14807e257eaf..e84cc3b0e3f88 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.10"; + version = "1.2.11"; src = fetchurl { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent # version. - url = "https://download3.ebz.epson.net/dsc/f/03/00/15/87/52/84d8972472981a5337b96610c39c8c7586256b55/epson-inkjet-printer-escpr2-1.2.10-1.src.rpm"; - sha256 = "sha256-vrAVarGBp8eI07WMtQSmuNpX5iS26+B2iP/b7U8mJmo="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/15/93/07/6926ce2857b2e0f563eecfd6a877b7b71898ad46/epson-inkjet-printer-escpr2-1.2.11-1.src.rpm"; + sha256 = "sha256-WMjtYYuMGMPf6222rvrP5Ep6fMRwebPTUXeQ6CbwEt4="; }; unpackPhase = '' diff --git a/pkgs/os-specific/linux/catfs/default.nix b/pkgs/os-specific/linux/catfs/default.nix index af804262f20bc..52d87f4deb1c0 100644 --- a/pkgs/os-specific/linux/catfs/default.nix +++ b/pkgs/os-specific/linux/catfs/default.nix @@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kahing/catfs"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/deepin-anything-module/default.nix b/pkgs/os-specific/linux/deepin-anything-module/default.nix new file mode 100644 index 0000000000000..5ee7c8a35e815 --- /dev/null +++ b/pkgs/os-specific/linux/deepin-anything-module/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, deepin +, kernel +}: + +stdenv.mkDerivation { + pname = "deepin-anything-module"; + inherit (deepin.deepin-anything) version src; + sourceRoot = "${deepin.deepin-anything.src.name}/src/kernelmod"; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + buildPhase = '' + runHook preBuild + make kdir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -D -t $out/lib/modules/${kernel.modDirVersion}/extra *.ko + runHook postInstall + ''; + + meta = deepin.deepin-anything.meta // { + description = "Deepin Anything file search tool (kernel modules)"; + }; +} + diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/os-specific/linux/freeipa/default.nix index 7311261780f15..27c17ea793e6f 100644 --- a/pkgs/os-specific/linux/freeipa/default.nix +++ b/pkgs/os-specific/linux/freeipa/default.nix @@ -64,11 +64,11 @@ let in stdenv.mkDerivation rec { pname = "freeipa"; - version = "4.12.0"; + version = "4.12.1"; src = fetchurl { url = "https://releases.pagure.org/freeipa/freeipa-${version}.tar.gz"; - sha256 = "sha256-FEDGPhgxr5kV8BeeM10C92yLbZPE7KGPmUUwyvZCkQA="; + sha256 = "sha256-SPZ+QgssDKG1Hz1oqtVdg864qtcvncuOlzTWjN4+loM="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 2cbc1846362bb..3f6c5d1caaa30 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -239,7 +239,7 @@ let platforms = [ "x86_64-linux" ] ++ optionals (sha256_32bit != null) [ "i686-linux" ] ++ optionals (sha256_aarch64 != null) [ "aarch64-linux" ]; - maintainers = with maintainers; [ jonringer kiskae edwtjo ]; + maintainers = with maintainers; [ kiskae edwtjo ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" inherit broken; }; diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix index c8c0a093b97e8..121511401151f 100644 --- a/pkgs/os-specific/linux/selinux-python/default.nix +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { description = "SELinux policy core utilities written in Python"; license = licenses.gpl2Plus; homepage = "https://selinuxproject.org"; + maintainers = with lib.maintainers; [ RossComputerGuy ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix index 7b033694ea264..0b4f0a203b81e 100644 --- a/pkgs/os-specific/linux/selinux-sandbox/default.nix +++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; homepage = "https://selinuxproject.org"; platforms = platforms.linux; + maintainers = with lib.maintainers; [ RossComputerGuy ]; }; } diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 9b09a69fa136a..320042f7157ea 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "gotify-server"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - hash = "sha256-TZeQcrJCH9TW039r499fxY4xJ27nZm9GdrilsI33Iqc="; + hash = "sha256-Na/bxETIgVm1mxMOXWTgYIFFuB6XG1jGvbW6q/n5LRw="; }; # With `allowGoReference = true;`, `buildGoModule` adds the `-trimpath` @@ -24,7 +24,7 @@ buildGoModule rec { # server[780]: stat /var/lib/private/ui/build/index.html: no such file or directory allowGoReference = true; - vendorHash = "sha256-TR6YGNhSMQ/1kvX3p3QGlXovuoJdaRH0LOwIPZwQ/xY="; + vendorHash = "sha256-Vnk/c2dzxIXDChobFSP++9uyiFD+SKyxJC9ZwaQ2pVw="; doCheck = false; diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index d0323d2549890..3a1184016f3ef 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -48,6 +48,8 @@ smartthinq-sensors = callPackage ./smartthinq-sensors {}; + spook = callPackage ./spook {}; + tuya_local = callPackage ./tuya_local {}; waste_collection_schedule = callPackage ./waste_collection_schedule {}; diff --git a/pkgs/servers/home-assistant/custom-components/spook/default.nix b/pkgs/servers/home-assistant/custom-components/spook/default.nix new file mode 100644 index 0000000000000..280f7b9491b2a --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/spook/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + pillow, + fnv-hash-fast, + psutil-home-assistant, + sqlalchemy, +}: +buildHomeAssistantComponent rec { + owner = "frenck"; + domain = "spook"; + version = "3.0.1"; + + src = fetchFromGitHub { + inherit owner; + repo = domain; + rev = "refs/tags/v${version}"; + hash = "sha256-ChHsevryWuim8BEFqXVkCOW9fGMrt5vol+B2SreMUws="; + }; + + patches = [./remove-sub-integration-symlink-hack.patch]; + + dependencies = [ + pillow + fnv-hash-fast + psutil-home-assistant + sqlalchemy + ]; + + meta = { + changelog = "https://github.com/frenck/spook/releases/tag/v${version}"; + description = "Toolbox for Home Assistant"; + homepage = "https://spook.boo/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [kkoniuszy]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/spook/remove-sub-integration-symlink-hack.patch b/pkgs/servers/home-assistant/custom-components/spook/remove-sub-integration-symlink-hack.patch new file mode 100644 index 0000000000000..4756e4a2c389a --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/spook/remove-sub-integration-symlink-hack.patch @@ -0,0 +1,109 @@ +diff --git a/custom_components/spook/__init__.py b/custom_components/spook/__init__.py +index 213fb2c..c7dc299 100644 +--- a/custom_components/spook/__init__.py ++++ b/custom_components/spook/__init__.py +@@ -23,8 +23,6 @@ from .templating import SpookTemplateFunctionManager + from .util import ( + async_ensure_template_environments_exists, + async_forward_setup_entry, +- link_sub_integrations, +- unlink_sub_integrations, + ) + + if TYPE_CHECKING: +@@ -34,48 +32,6 @@ if TYPE_CHECKING: + + async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: + """Set up from a config entry.""" +- # Symlink all sub integrations from Spook to the parent integrations folder +- # if one is missing, we have to restart Home Assistant. +- # This is a workaround for the fact that Home Assistant doesn't support +- # sub integrations. +- if await hass.async_add_executor_job(link_sub_integrations, hass): +- LOGGER.debug("Newly symlinked sub integrations, restarting Home Assistant") +- +- @callback +- def _restart(_: Event | None = None) -> None: +- """Restart Home Assistant.""" +- hass.data["homeassistant_stop"] = asyncio.create_task( +- hass.async_stop(RESTART_EXIT_CODE), +- ) +- +- # User asked to restart Home Assistant in the config flow. +- if hass.data.get(DOMAIN) == "Boo!": +- _restart() +- return False +- +- # Should be OK to restart. Better to do it before anything else started. +- if hass.state == CoreState.starting: +- _restart() +- return False +- +- # If all other fails, but we are not running yet... wait for it. +- if hass.state == CoreState.not_running: +- # Listen to both... just in case. +- hass.bus.async_listen_once(EVENT_HOMEASSISTANT_START, _restart) +- hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, _restart) +- return False +- +- LOGGER.info( +- "Home Assistant needs to be restarted in for Spook to complete setting up", +- ) +- ir.async_create_issue( +- hass=hass, +- domain=DOMAIN, +- issue_id="restart_required", +- is_fixable=True, +- severity=ir.IssueSeverity.WARNING, +- translation_key="restart_required", +- ) + + # Ensure template environments exists + async_ensure_template_environments_exists(hass) +@@ -120,4 +76,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: + + async def async_remove_entry(hass: HomeAssistant, _: ConfigEntry) -> None: + """Remove a config entry.""" +- await hass.async_add_executor_job(unlink_sub_integrations, hass) +diff --git a/custom_components/spook/util.py b/custom_components/spook/util.py +index 32e9bd2..845d463 100644 +--- a/custom_components/spook/util.py ++++ b/custom_components/spook/util.py +@@ -104,37 +104,6 @@ async def async_forward_platform_entry_setups_to_ectoplasm( + ) + + +-def link_sub_integrations(hass: HomeAssistant) -> bool: +- """Link Spook sub integrations.""" +- LOGGER.debug("Linking up Spook sub integrations") +- +- changes = False +- for manifest in Path(__file__).parent.rglob("integrations/*/manifest.json"): +- LOGGER.debug("Linking Spook sub integration: %s", manifest.parent.name) +- dest = Path(hass.config.config_dir) / "custom_components" / manifest.parent.name +- if not dest.exists(): +- src = ( +- Path(hass.config.config_dir) +- / "custom_components" +- / DOMAIN +- / "integrations" +- / manifest.parent.name +- ) +- dest.symlink_to(src) +- changes = True +- return changes +- +- +-def unlink_sub_integrations(hass: HomeAssistant) -> None: +- """Unlink Spook sub integrations.""" +- LOGGER.debug("Unlinking Spook sub integrations") +- for manifest in Path(__file__).parent.rglob("integrations/*/manifest.json"): +- LOGGER.debug("Unlinking Spook sub integration: %s", manifest.parent.name) +- dest = Path(hass.config.config_dir) / "custom_components" / manifest.parent.name +- if dest.exists(): +- dest.unlink() +- +- + @callback + def async_ensure_template_environments_exists(hass: HomeAssistant) -> None: + """Ensure default template environments exist. diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index 2fe617dea43b0..8a08962f646bb 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BS6ErS2Wi8pOy8oFmVnbujYPwClxX8e+GL4CcqvOL9E="; + sha256 = "sha256-3o9XxxTlWppq1mFgIUjstUFz6bT44mvBJa4FBgcc4Pc="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index ba1c35ee294d3..1db975f591d98 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -3,6 +3,7 @@ , buildGoModule , fetchFromGitHub , installShellFiles +, nixosTests }: buildGoModule rec { @@ -39,6 +40,8 @@ buildGoModule rec { installShellCompletion amtool.zsh ''; + passthru.tests = { inherit (nixosTests.prometheus) alertmanager; }; + meta = with lib; { description = "Alert dispatcher for the Prometheus monitoring system"; homepage = "https://github.com/prometheus/alertmanager"; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index f7cc47311ef23..9229eb4546a2a 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.52.0"; + version = "2.53.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-/HTNDu/msUFLiqbD5ryVPlDOqfAT+8MEGNusmu3xH1w="; + hash = "sha256-oGhVpr47+blG7udu4Pcd+4Ndn0U+R47i69nheauDDoo="; }; in buildGoModule rec { @@ -47,10 +47,10 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; rev = "v${version}"; - hash = "sha256-7HLSSls1aMZ6Zju2F9dArTFsCSESxDxWQ1a0QgD5Nxo="; + hash = "sha256-clI8/P6Gdl8WSK1DsXUj+M9f/h35GX961QtpyvGNxUY="; }; - vendorHash = "sha256-IzYYfB8cvvQAsOqEREVaCe80V3hhhmOEYsl9E9NJq20="; + vendorHash = "sha256-0TR0jFEY+ls8C9EJEhSl2vX5VVZqZ8jGWDUalOddUPM="; excludedPackages = [ "documentation/prometheus-mixin" ]; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix deleted file mode 100644 index 818a8dbb88796..0000000000000 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }: - -buildGoPackage rec { - pname = "minio-exporter"; - version = "0.2.0"; - rev = "v${version}"; - - goPackagePath = "github.com/joe-pll/minio-exporter"; - - src= fetchFromGitHub { - inherit rev; - owner = "joe-pll"; - repo = "minio-exporter"; - sha256 = "1my3ii5s479appiapw8gjzkq1pk62fl7d7if8ljvdj6qw4man6aa"; - }; - - # Required to make 0.2.0 build against latest dependencies - # TODO: Remove on update to 0.3.0 - patches = [ - (fetchpatch { - url = "https://github.com/joe-pll/minio-exporter/commit/50ab89d42322dc3e2696326a9ae4d3f951f646de.patch"; - sha256 = "0aiixhvb4x8c8abrlf1i4hmca9i6xd6b638a5vfkvawx0q7gxl97"; - }) - ]; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "Prometheus exporter for Minio cloud storage server"; - mainProgram = "minio-exporter"; - homepage = "https://github.com/joe-pll/minio-exporter"; - license = licenses.asl20; - maintainers = with maintainers; [ bachp ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix deleted file mode 100644 index 1993975e2bfaf..0000000000000 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix +++ /dev/null @@ -1,174 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"; - sha256 = "0mhgxw5q6b0pryhikx3k4wby7g32rwjjljzihi47lwn34kw5y1qn"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; - sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/minio/minio-go"; - fetch = { - type = "git"; - url = "https://github.com/minio/minio-go"; - rev = "d218e4cb1bfc13dcef0eb5c3e74507a35be0dd3a"; - sha256 = "0d3am33xaavdffz791qi2s0vnkpjw9vlr5p5g4lw7h5vhmy1sjb4"; - }; - } - { - goPackagePath = "github.com/minio/minio"; - fetch = { - type = "git"; - url = "https://github.com/minio/minio"; - rev = "bb73c84b104bc447eb603d63481cdc54b8ab3c83"; - sha256 = "1gjkgdf59yxfr2a7pl3f7z3iid86zsd85xqxcv1s0d46v7j07iga"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; - sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "06bc6e01f4baf4ee783ffcd23abfcb0b0f9dfada"; - sha256 = "0dvv21214sn702kc25y5l0gd9d11358976d3w31fgwx7456mjx26"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; - sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "89604d197083d4781071d3c65855d24ecfb0a563"; - sha256 = "169rdlaf2mk9z4fydz7ajmngyhmf3q1lk96yhvx46bn986x5xkyn"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "b15cd069a83443be3154b719d0cc9fe8117f09fb"; - sha256 = "1cr45wg2m40bj2za8f32mq09rjlcnk5kfam0h0hr8wcb015k4wxj"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "d682213848ed68c0a260ca37d6dd5ace8423f5ba"; - sha256 = "0nzyqwzx3k7nqfq8q7yv32gaf3ymq3bpwhkmw1hj2zakq5a93d8x"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "a6600008915114d9c087fad9f03d75087b1a74df"; - sha256 = "099vyf8133bjwaqcv377d9akam3j5xwamwqrihmjhvzbvqs649yc"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "5ccada7d0a7ba9aeb5d3aca8d3501b4c2a509fec"; - sha256 = "0bdwdxy2gz48icnh023r5fga3z4x6c8gry8jlfjqr5w12y3s281g"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "2c42eef0765b9837fbdab12011af7830f55f88f0"; - sha256 = "0gj9nwryyzf9rn33gl3zm6rxvg1zhrhwi36akipqj37x4g86h3gz"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "e19ae1496984b1c655b8044a65c0300a3c878dd3"; - sha256 = "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index c47019aeada72..cc8e11ade6355 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, prometheus-pushgateway }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests, testers, prometheus-pushgateway }: buildGoModule rec { pname = "pushgateway"; @@ -23,8 +23,11 @@ buildGoModule rec { "-X github.com/prometheus/common/version.BuildDate=19700101-00:00:00" ]; - passthru.tests.version = testers.testVersion { - package = prometheus-pushgateway; + passthru.tests = { + inherit (nixosTests.prometheus) pushgateway; + version = testers.testVersion { + package = prometheus-pushgateway; + }; }; meta = with lib; { diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index d3e797a1c34c4..ce4a75cea75b7 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { passthru = { updateScript = nix-update-script { }; tests = { - inherit (nixosTests) prometheus; + inherit (nixosTests) thanos; version = testers.testVersion { command = "thanos --version"; package = thanos; diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/servers/monitoring/vmagent/default.nix deleted file mode 100644 index 1dd054de46bcf..0000000000000 --- a/pkgs/servers/monitoring/vmagent/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: -buildGoModule rec { - pname = "vmagent"; - version = "1.101.0"; - - src = fetchFromGitHub { - owner = "VictoriaMetrics"; - repo = "VictoriaMetrics"; - rev = "v${version}"; - sha256 = "sha256-Jjz/CbVCvc9NFbvzYTFthG8cov4pYpc6y1A1Kmd3Mjg="; - }; - - ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; - - vendorHash = null; - - subPackages = [ "app/vmagent" ]; - - meta = with lib; { - homepage = "https://github.com/VictoriaMetrics/VictoriaMetrics/tree/master/app/vmagent"; - description = "VictoriaMetrics metrics scraper"; - mainProgram = "vmagent"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ nullx76 leona ]; - }; -} diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index dbab86fde27c6..cfa3e327034a5 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -3,7 +3,7 @@ "sha256": "06pprhlaaqdha2nmfdcf76mhh48hdr5jlv88snxji8lpflv50wr5", "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.3/bookmarks-13.1.3.tar.gz", "version": "13.1.3", - "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", + "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ "agpl" @@ -110,9 +110,9 @@ ] }, "groupfolders": { - "sha256": "00c387vjz5sxw3gv61m4p3jby50bcadk8dwpz0zsd5wbhwffd63q", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.7/groupfolders-v15.3.7.tar.gz", - "version": "15.3.7", + "sha256": "12rj57d0g5vqm95hy4cf6ynxl3gfcfhh5kbdmvcz55q5a1wxbn81", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.8/groupfolders-v15.3.8.tar.gz", + "version": "15.3.8", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -230,9 +230,9 @@ ] }, "polls": { - "sha256": "0wijb8dkszyzs3108qylcjnvd3kdhlciqndhgc993ybwqxqxfsxn", - "url": "https://github.com/nextcloud/polls/releases/download/v6.4.1/polls.tar.gz", - "version": "6.4.1", + "sha256": "1hcirwsi68n3j3haw31svkxv6qyj3jbj5frfzspp8x8vnfclrask", + "url": "https://github.com/nextcloud/polls/releases/download/v7.1.1/polls.tar.gz", + "version": "7.1.1", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index 0a5c405e36115..311e82214a7fb 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -1,9 +1,9 @@ { "bookmarks": { - "sha256": "01m78jfnqgvqj94v13bi6rj52sgwrp18zs4svgbdrci3lc7xqyp2", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.1.2/bookmarks-14.1.2.tar.gz", - "version": "14.1.2", - "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", + "sha256": "1vpha2lxq199ckssnw7fc23dnk4pn1r0ipdwdqv102adpiqrfiy1", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.2/bookmarks-14.2.2.tar.gz", + "version": "14.2.2", + "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ "agpl" @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "sha256": "06lbv04byc08zqfws2hbxqdg05d25sfps80y21xahzcrv74z4ngl", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.6/groupfolders-v16.0.6.tar.gz", - "version": "16.0.6", + "sha256": "17lhmj4ndxp7h0fxmxk3f3dwhs44mplxpyfb6nb5ia2dm8i858w1", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.7/groupfolders-v16.0.7.tar.gz", + "version": "16.0.7", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -119,6 +119,16 @@ "agpl" ] }, + "integration_paperless": { + "sha256": "08rgdlinxpcwyq0f97ibv022qhj8smk94dvlf927xq46220w9pfx", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.3/integration_paperless-v1.0.3.tar.gz", + "version": "1.0.3", + "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", + "homepage": "", + "licenses": [ + "agpl" + ] + }, "mail": { "sha256": "1q0ihgrb6sk0rizs45clqhjpmai2m2zislw6s1694j1zssz4jpqg", "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.1/mail-v3.7.1.tar.gz", @@ -130,8 +140,8 @@ ] }, "maps": { - "sha256": "1gqms3rrdpjmpb1h5d72b4lwbvsl8p10zwnkhgnsmvfcf93h3r1c", - "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz", + "sha256": "18gln06hgljgnr90ki95nl7b8986ivf3cymr6hajilszlr77hk22", + "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz", "version": "1.4.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -200,9 +210,9 @@ ] }, "polls": { - "sha256": "1crs6fks9ywywyi3pnji49dxnry5vpcmd1x29y8anyp32ji2a35r", - "url": "https://github.com/nextcloud/polls/releases/download/v7.0.3/polls.tar.gz", - "version": "7.0.3", + "sha256": "1hcirwsi68n3j3haw31svkxv6qyj3jbj5frfzspp8x8vnfclrask", + "url": "https://github.com/nextcloud/polls/releases/download/v7.1.1/polls.tar.gz", + "version": "7.1.1", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index 7f7e7d91e9f38..01540b002c3c0 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -1,9 +1,9 @@ { "bookmarks": { - "sha256": "01m78jfnqgvqj94v13bi6rj52sgwrp18zs4svgbdrci3lc7xqyp2", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.1.2/bookmarks-14.1.2.tar.gz", - "version": "14.1.2", - "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", + "sha256": "1vpha2lxq199ckssnw7fc23dnk4pn1r0ipdwdqv102adpiqrfiy1", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.2/bookmarks-14.2.2.tar.gz", + "version": "14.2.2", + "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ "agpl" @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "sha256": "1x765bd5qd88rpa786pvj74psc52zbivk73pxna6nmhn9v0pmpms", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.0/groupfolders-v17.0.0.tar.gz", - "version": "17.0.0", + "sha256": "0s0bsidghrj5k38vbw6xbp7jr57sqb3pn9n2gq24sdklhy81k882", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.1/groupfolders-v17.0.1.tar.gz", + "version": "17.0.1", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -119,6 +119,16 @@ "agpl" ] }, + "integration_paperless": { + "sha256": "08rgdlinxpcwyq0f97ibv022qhj8smk94dvlf927xq46220w9pfx", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.3/integration_paperless-v1.0.3.tar.gz", + "version": "1.0.3", + "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", + "homepage": "", + "licenses": [ + "agpl" + ] + }, "mail": { "sha256": "1q0ihgrb6sk0rizs45clqhjpmai2m2zislw6s1694j1zssz4jpqg", "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.1/mail-v3.7.1.tar.gz", @@ -130,8 +140,8 @@ ] }, "maps": { - "sha256": "1gqms3rrdpjmpb1h5d72b4lwbvsl8p10zwnkhgnsmvfcf93h3r1c", - "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz", + "sha256": "18gln06hgljgnr90ki95nl7b8986ivf3cymr6hajilszlr77hk22", + "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz", "version": "1.4.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -200,9 +210,9 @@ ] }, "polls": { - "sha256": "1crs6fks9ywywyi3pnji49dxnry5vpcmd1x29y8anyp32ji2a35r", - "url": "https://github.com/nextcloud/polls/releases/download/v7.0.3/polls.tar.gz", - "version": "7.0.3", + "sha256": "1hcirwsi68n3j3haw31svkxv6qyj3jbj5frfzspp8x8vnfclrask", + "url": "https://github.com/nextcloud/polls/releases/download/v7.1.1/polls.tar.gz", + "version": "7.1.1", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -250,9 +260,9 @@ ] }, "spreed": { - "sha256": "106y9mbnwga7pfhydrd8rjpcr89ir3fjrdn81xykyzqwrq29fxgs", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.1/spreed-v19.0.1.tar.gz", - "version": "19.0.1", + "sha256": "0hwlfhdqchcv4hsgaywqqlzgpnfwl93s28xvy0n5y00namdl6mp4", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.2/spreed-v19.0.2.tar.gz", + "version": "19.0.2", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index 3affc750f9822..3118d4418cfd8 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -13,6 +13,7 @@ , "groupfolders": "agpl3Plus" , "impersonate": "agpl3Plus" , "integration_openai": "agpl3Only" +, "integration_paperless": "agpl3Plus" , "mail": "agpl3Plus" , "maps": "agpl3Plus" , "memories": "agpl3Plus" diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index a22283452df44..30317fdb3b938 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Highly scalable, robust (fully ACID) native graph database"; homepage = "https://neo4j.com/"; license = licenses.gpl3; - maintainers = with maintainers; [ jonringer offline ]; + maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index c61b65c33d1a7..00e1f8cc38a45 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.22.13"; + version = "0.22.14"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-eps1sLtE/yBLyq1iTzOWu+RqFAjAg4EXWV7QZnr2KjQ="; + hash = "sha256-d2gqw3IJBkU2sfBf5J0E45VzFtuSox4cHpPucsl/o4s="; }; - vendorHash = "sha256-hxI/0ask3iQW0Ox+HuJ6Oi1jiHF/0NZ+L7cLJijqyyQ="; + vendorHash = "sha256-G5VD5Joq/p1rur0SmK1xNQxtNZh7ZqR5I4j8fgswoDo="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/servers/redpanda/base64.nix b/pkgs/servers/redpanda/base64.nix deleted file mode 100644 index 305456c55ccf8..0000000000000 --- a/pkgs/servers/redpanda/base64.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ clangStdenv -, cmake -, fetchFromGitHub -, lib -}: -let - pname = "base64"; - version = "0.5.0"; -in -clangStdenv.mkDerivation { - inherit pname version; - src = fetchFromGitHub { - owner = "aklomp"; - repo = "base64"; - rev = "v${version}"; - sha256 = "sha256-2HNI9ycT9f+NLwLElEuR61qmTguOsI+kNxv01ipxSqQ="; - }; - nativeBuildInputs = [ cmake ]; - meta = with lib; { - description = "Fast Base64 stream encoder/decoder in C99, with SIMD acceleration"; - license = licenses.bsd2; - homepage = "https://github.com/aklomp/base64"; - maintainers = with maintainers; [ avakhrenev ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index b3d2fe1e69731..c85de32d8a839 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -1,5 +1,4 @@ { buildGoModule -, callPackage , doCheck ? !stdenv.isDarwin # Can't start localhost test server in MacOS sandbox. , fetchFromGitHub , installShellFiles @@ -14,7 +13,6 @@ let rev = "v${version}"; sha256 = "sha256-Eemo1NhRa6CX+fgtNT22zoQqN8Vrrl8mkqhy4zmhJHo="; }; - server = callPackage ./server.nix { inherit src version; }; in buildGoModule rec { pname = "redpanda-rpk"; @@ -38,10 +36,6 @@ buildGoModule rec { done ''; - passthru = { - inherit server; - }; - meta = with lib; { description = "Redpanda client"; homepage = "https://redpanda.com/"; diff --git a/pkgs/servers/redpanda/hdr-histogram.nix b/pkgs/servers/redpanda/hdr-histogram.nix deleted file mode 100644 index 91000649e130d..0000000000000 --- a/pkgs/servers/redpanda/hdr-histogram.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ clangStdenv -, cmake -, fetchFromGitHub -, lib -, zlib -}: -let - pname = "HdrHistogram_c"; - version = "0.11.5"; -in -clangStdenv.mkDerivation { - inherit pname version; - src = fetchFromGitHub { - owner = "HdrHistogram"; - repo = "HdrHistogram_c"; - rev = version; - sha256 = "sha256-29if+0H8wdpQBN48lt0ylGgtUCv/tJYZnG5LzcIqXDs="; - }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib ]; - meta = with lib; { - description = "C port of the HdrHistogram"; - license = licenses.bsd2; - homepage = "https://github.com/HdrHistogram/HdrHistogram_c"; - maintainers = with maintainers; [ avakhrenev ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/redpanda/rapidjson.nix b/pkgs/servers/redpanda/rapidjson.nix deleted file mode 100644 index 99ada8c05f88e..0000000000000 --- a/pkgs/servers/redpanda/rapidjson.nix +++ /dev/null @@ -1,32 +0,0 @@ -# rapidjson used in nixpkgs is too old. Although it is technically a latest release, it was made in 2016. -# Redpanda uses its own version -{ clangStdenv -, cmake -, fetchFromGitHub -, lib -, pkg-config -}: - -clangStdenv.mkDerivation rec { - pname = "rapidjson"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "redpanda-data"; - repo = "rapidjson"; - rev = "27c3a8dc0e2c9218fe94986d249a12b5ed838f1d"; - sha256 = "sha256-wggyCL5uEsnJDxkYAUsXOjoO1MNQBGB05E6aSpsNcl0="; - }; - - nativeBuildInputs = [ pkg-config cmake ]; - - doCheck = false; - - meta = with lib; { - description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; - homepage = "http://rapidjson.org/"; - maintainers = with maintainers; [ avakhrenev ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/redpanda/redpanda.patch b/pkgs/servers/redpanda/redpanda.patch deleted file mode 100644 index c3ee76d3c9ae4..0000000000000 --- a/pkgs/servers/redpanda/redpanda.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/cmake/main.cmake b/cmake/main.cmake -index 8c60c4214..194f33a21 100644 ---- a/cmake/main.cmake -+++ b/cmake/main.cmake -@@ -15,15 +15,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_UNITY_BUILD_BATCH_SIZE 10) - set(CMAKE_CXX_EXTENSIONS OFF) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) --list(APPEND BASE_LD_FLAGS_LIST -- -L${REDPANDA_DEPS_INSTALL_DIR}/lib -- -L${REDPANDA_DEPS_INSTALL_DIR}/lib64 -- -fuse-ld=lld) --set(PKG_CONFIG_PATH_LIST -- ${REDPANDA_DEPS_INSTALL_DIR}/lib64/pkgconfig -- ${REDPANDA_DEPS_INSTALL_DIR}/share/pkgconfig -- ${REDPANDA_DEPS_INSTALL_DIR}/lib/pkgconfig -- ) - - list(APPEND BASE_CXX_FLAGS_LIST -fPIC) - list(APPEND BASE_C_FLAGS_LIST -fPIC) -diff --git a/cmake/testing.cmake b/cmake/testing.cmake -index 7f149dc82..7c57aa3dd 100644 ---- a/cmake/testing.cmake -+++ b/cmake/testing.cmake -@@ -24,6 +24,7 @@ message(STATUS "RP_ENABLE_BENCHMARK_TESTS=${RP_ENABLE_BENCHMARK_TESTS}") - message(STATUS "RP_ENABLE_HONEY_BADGER_TESTS=${RP_ENABLE_HONEY_BADGER_TESTS}") - - function (rp_test) -+ return() - set(options - INTEGRATION_TEST UNIT_TEST BENCHMARK_TEST HBADGER_TEST) - set(oneValueArgs BINARY_NAME TIMEOUT PREPARE_COMMAND POST_COMMAND) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index eecd145ed..b9efa89b5 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -5,4 +5,5 @@ find_package(Boost REQUIRED - unit_test_framework) - find_package(absl REQUIRED) - add_subdirectory(v) --add_subdirectory(go/kreq-gen) -+# Don't build kafka-request-generator, it is needed only for tests -+# add_subdirectory(go/kreq-gen) -diff --git a/src/v/CMakeLists.txt b/src/v/CMakeLists.txt -index 075da485e..af7ede2bc 100644 ---- a/src/v/CMakeLists.txt -+++ b/src/v/CMakeLists.txt -@@ -58,7 +58,9 @@ else() - if(${ENABLE_GIT_HASH}) - message(FATAL_ERROR "ENABLE_GIT_HASH cannot be 'on' when ENABLE_GIT_VERSION is 'off'") - endif() -- set(GIT_VER "no_version") -+ if(NOT GIT_VER) -+ set(GIT_VER "no_version") -+ endif() - endif() - - if(${ENABLE_GIT_HASH}) -@@ -71,8 +73,12 @@ if(${ENABLE_GIT_HASH}) - set(GIT_CLEAN_DIRTY "") - endif() - else() -- set(GIT_SHA1 "000") -- set(GIT_CLEAN_DIRTY "-dev") -+ if(NOT GIT_SHA1) -+ set(GIT_SHA1 "000") -+ endif() -+ if(NOT GIT_CLEAN_DIRTY) -+ set(GIT_CLEAN_DIRTY "-dev") -+ endif() - endif() - - configure_file(version.h.in version.h @ONLY) diff --git a/pkgs/servers/redpanda/seastar-fixes.patch b/pkgs/servers/redpanda/seastar-fixes.patch deleted file mode 100644 index c6b12b88c1498..0000000000000 --- a/pkgs/servers/redpanda/seastar-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/seastar/core/std-coroutine.hh b/include/seastar/core/std-coroutine.hh -index ea364bee..57474529 100644 ---- a/include/seastar/core/std-coroutine.hh -+++ b/include/seastar/core/std-coroutine.hh -@@ -87,7 +87,7 @@ class coroutine_handle<void> { - - explicit operator bool() const noexcept { return _pointer; } - -- static coroutine_handle from_address(void* ptr) noexcept { -+ static constexpr coroutine_handle from_address(void* ptr) noexcept { - coroutine_handle hndl; - hndl._pointer = ptr; - return hndl; diff --git a/pkgs/servers/redpanda/seastar.nix b/pkgs/servers/redpanda/seastar.nix deleted file mode 100644 index ac0f7b2d6b48f..0000000000000 --- a/pkgs/servers/redpanda/seastar.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ boost175 -, c-ares -, cmake -, cryptopp -, fetchFromGitHub -, fmt_8 -, gnutls -, hwloc -, lib -, libsystemtap -, libtasn1 -, liburing -, libxfs -, lksctp-tools -, llvmPackages_14 -, lz4 -, ninja -, numactl -, openssl -, pkg-config -, python3 -, ragel -, valgrind -, yaml-cpp -}: -let - pname = "seastar"; - version = "22.11.0"; -in -llvmPackages_14.stdenv.mkDerivation { - inherit pname version; - strictDeps = true; - src = fetchFromGitHub { - owner = "redpanda-data"; - repo = "seastar"; - rev = "30d3a28bde08d2228b4e560c173b89fdd94c3f05"; - sha256 = "sha256-Xzu7AJMkvE++BGEqluod3fwMEIpDnbCczmlEad0/4v4="; - }; - nativeBuildInputs = [ - cmake - ninja - openssl - pkg-config - python3 - ragel - ]; - buildInputs = [ - libsystemtap - libxfs - ]; - propagatedBuildInputs = [ - boost175 - c-ares - gnutls - cryptopp - fmt_8 - hwloc - libtasn1 - liburing - lksctp-tools - lz4 - numactl - valgrind - yaml-cpp - ]; - patches = [ - ./seastar-fixes.patch - ]; - postPatch = '' - patchShebangs ./scripts/seastar-json2code.py - ''; - cmakeFlags = [ - "-DSeastar_EXCLUDE_DEMOS_FROM_ALL=ON" - "-DSeastar_EXCLUDE_TESTS_FROM_ALL=ON" - ]; - doCheck = false; - meta = with lib; { - description = "High performance server-side application framework"; - license = licenses.asl20; - homepage = "https://seastar.io/"; - maintainers = with maintainers; [ avakhrenev ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/redpanda/server.nix b/pkgs/servers/redpanda/server.nix deleted file mode 100644 index 45b005c792c34..0000000000000 --- a/pkgs/servers/redpanda/server.nix +++ /dev/null @@ -1,124 +0,0 @@ -{ abseil-cpp_202206 -, avro-cpp -, callPackage -, ccache -, cmake -, crc32c -, croaring -, ctre -, curl -, dpdk -, git -, lib -, llvmPackages_14 -, llvm_14 -, ninja -, p11-kit -, pkg-config -, procps -, protobuf_21 -, python3 -, snappy -, src -, unzip -, version -, writeShellScriptBin -, xxHash -, zip -, zstd -}: -let - pname = "redpanda"; - pythonPackages = p: with p; [ jinja2 ]; - seastar = callPackage ./seastar.nix { }; - base64 = callPackage ./base64.nix { }; - hdr-histogram = callPackage ./hdr-histogram.nix { }; - kafka-codegen-venv = python3.withPackages (ps: [ - ps.jinja2 - ps.jsonschema - ]); - rapidjson = callPackage ./rapidjson.nix { }; -in -llvmPackages_14.stdenv.mkDerivation rec { - inherit pname version src; - - preConfigure = '' - # setup sccache - export CCACHE_DIR=$TMPDIR/sccache-redpanda - mkdir -p $CCACHE_DIR - ''; - patches = [ - ./redpanda.patch - ]; - postPatch = '' - # Fix 'error: use of undeclared identifier 'roaring'; did you mean 'Roaring - # qualified reference to 'Roaring' is a constructor name rather than a type in this context' - substituteInPlace \ - ./src/v/storage/compacted_offset_list.h \ - ./src/v/storage/compaction_reducers.cc \ - ./src/v/storage/compaction_reducers.h \ - ./src/v/storage/segment_utils.h \ - ./src/v/storage/segment_utils.cc \ - --replace 'roaring::Roaring' 'Roaring' - - patchShebangs ./src/v/rpc/rpc_compiler.py - ''; - - doCheck = false; - - nativeBuildInputs = [ - (python3.withPackages pythonPackages) - (writeShellScriptBin "kafka-codegen-venv" "exec -a $0 ${kafka-codegen-venv}/bin/python3 $@") - ccache - cmake - curl - git - llvm_14 - ninja - pkg-config - procps - seastar - unzip - zip - ]; - - cmakeFlags = [ - "-DREDPANDA_DEPS_SKIP_BUILD=ON" - "-DRP_ENABLE_TESTS=OFF" - "-Wno-dev" - "-DGIT_VER=${version}" - "-DGIT_CLEAN_DIRTY=\"\"" - ]; - - buildInputs = [ - abseil-cpp_202206 - avro-cpp - base64 - crc32c - croaring - ctre - dpdk - hdr-histogram - p11-kit - protobuf_21 - rapidjson - seastar - snappy - xxHash - zstd - ]; - - meta = with lib; { - broken = true; - description = "Kafka-compatible streaming platform"; - license = licenses.bsl11; - longDescription = '' - Redpanda is a Kafka-compatible streaming data platform that is - proven to be 10x faster and 6x lower in total costs. It is also JVM-free, - ZooKeeper-free, Jepsen-tested and source available. - ''; - homepage = "https://redpanda.com/"; - maintainers = with maintainers; [ avakhrenev happysalada ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index 926da9e6c55e7..c99f93625f974 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "24.05.1"; + version = "24.05.2"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "1m20435sp4n3dg7am4lh73yw1wdmnsf15wdl554lrklhg7f21s0w"; + sha256 = "13yln6b5j9plkcrp1mwfvgcv67gm2ayb2l2grhw2h4ncqnvmxhwv"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index a154144fc16d5..b5bed1867065d 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -15,10 +15,10 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-cc79f16e1a1bd3feee421401ba2f21915abfdf91"; + name = "aws-aws-sdk-php-731cd73062909594c5f7443413c4c4c40ed1c25c"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/cc79f16e1a1bd3feee421401ba2f21915abfdf91"; - sha256 = "1dg6g31hwn8b0drsvg077im9bnp5x0zhqsdwck6qq02kzyimjsy2"; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/731cd73062909594c5f7443413c4c4c40ed1c25c"; + sha256 = "1bs6l34j3r1nr7750ssrannbi8x5pdwknlzhmqx84xajm9imiqcp"; }; }; }; @@ -105,10 +105,10 @@ let "doctrine/event-manager" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-event-manager-750671534e0241a7c50ea5b43f67e23eb5c96f32"; + name = "doctrine-event-manager-b680156fa328f1dfd874fd48c7026c41570b9c6e"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32"; - sha256 = "1inhh3k8ai8d6rhx5xsbdx0ifc3yjjfrahi0cy1npz9nx3383cfh"; + url = "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e"; + sha256 = "135zcwnlfijxzv3x5qn1zs3jmybs1n2q64pbs5gbjwmsdgrxhzsi"; }; }; }; @@ -245,10 +245,10 @@ let "intervention/image" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "intervention-image-193324ec88bc5ad4039e57ce9b926ae28dfde813"; + name = "intervention-image-d428433aa74836ab75e8d4a5241628bebb7f4077"; src = fetchurl { - url = "https://api.github.com/repos/Intervention/image/zipball/193324ec88bc5ad4039e57ce9b926ae28dfde813"; - sha256 = "18p2xgbvdzyx9wjid5iviyfx81k7za73b729ar3fyjd646x8niwi"; + url = "https://api.github.com/repos/Intervention/image/zipball/d428433aa74836ab75e8d4a5241628bebb7f4077"; + sha256 = "0qglsydy5672kl1f12pp185zw4vk30jh151bgjvyakggwiabds57"; }; }; }; @@ -265,20 +265,20 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-91e2b9e218afa4e5c377510faa11957042831ba3"; + name = "laravel-framework-590afea38e708022662629fbf5184351fa82cf08"; src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/91e2b9e218afa4e5c377510faa11957042831ba3"; - sha256 = "05rzgsvqlyjbpwx69vq5vlk4fqwi7vxs5qacizyqnrihck9laahs"; + url = "https://api.github.com/repos/laravel/framework/zipball/590afea38e708022662629fbf5184351fa82cf08"; + sha256 = "0gnp0khw8a1rydrv06pi4sssx6fyvdwvcqsgjh8rjcbcs39f1ii5"; }; }; }; "laravel/prompts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-prompts-23ea808e8a145653e0ab29e30d4385e49f40a920"; + name = "laravel-prompts-9bc4df7c699b0452c6b815e64a2d84b6d7f99400"; src = fetchurl { - url = "https://api.github.com/repos/laravel/prompts/zipball/23ea808e8a145653e0ab29e30d4385e49f40a920"; - sha256 = "0ysyqn1xivinv4lrqd1vifk50ccrxfjyv7ndsh433hb2961n3r52"; + url = "https://api.github.com/repos/laravel/prompts/zipball/9bc4df7c699b0452c6b815e64a2d84b6d7f99400"; + sha256 = "05hf1r10l8fbxy4wy4g4sjwqvd28liq5n4gjyhsc54kj2jp5bba0"; }; }; }; @@ -335,30 +335,30 @@ let "league/flysystem" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-4729745b1ab737908c7d055148c9a6b3e959832f"; + name = "league-flysystem-e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem/zipball/4729745b1ab737908c7d055148c9a6b3e959832f"; - sha256 = "13kf4l7mp4mifm09av0w7vfcwnmpvjpsic836xh8a8rlfczgjym2"; + url = "https://api.github.com/repos/thephpleague/flysystem/zipball/e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c"; + sha256 = "18sackbf9pfbpr03dd5z8vfcqsqhz1sajj2pp2wddz3srcf3zxk5"; }; }; }; "league/flysystem-aws-s3-v3" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-aws-s3-v3-3e6ce2f972f1470db779f04d29c289dcd2c32837"; + name = "league-flysystem-aws-s3-v3-22071ef1604bc776f5ff2468ac27a752514665c8"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/3e6ce2f972f1470db779f04d29c289dcd2c32837"; - sha256 = "01l7nbdmrh1vb59m7xhc1kjfz6xrp5871ghrb6c1anwcsh20l9r3"; + url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/22071ef1604bc776f5ff2468ac27a752514665c8"; + sha256 = "1yhrnw4alf5cf3bwyd3nxcrmwcih6hkmc2l3f6nmhksiza89b9cv"; }; }; }; "league/flysystem-local" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-local-61a6a90d6e999e4ddd9ce5adb356de0939060b92"; + name = "league-flysystem-local-13f22ea8be526ea58c2ddff9e158ef7c296e4f40"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-local/zipball/61a6a90d6e999e4ddd9ce5adb356de0939060b92"; - sha256 = "0mkcqhmxgq5pwbfzqc26z06384v7plva5s71pqyqdaayb1hlyg1f"; + url = "https://api.github.com/repos/thephpleague/flysystem-local/zipball/13f22ea8be526ea58c2ddff9e158ef7c296e4f40"; + sha256 = "1cpi818r6nizp965hiba9zhrfjr9gbyqms3f4r4hzd19d73p6l60"; }; }; }; @@ -435,10 +435,10 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-0c6fd108360c562f6e4fd1dedb8233b423e91c83"; + name = "nesbot-carbon-afd46589c216118ecd48ff2b95d77596af1e57ed"; src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83"; - sha256 = "1qwdzf2jgppj2r8jpxxd1q08aycyvj17azy2ixlw4cnmwhcqzgnh"; + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/afd46589c216118ecd48ff2b95d77596af1e57ed"; + sha256 = "17sz76kydaf5n74qgqz36yxbmg4lwcbcv6kpjxrqfqfrb65sz5b6"; }; }; }; @@ -485,10 +485,10 @@ let "onelogin/php-saml" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "onelogin-php-saml-b22a57ebd13e838b90df5d3346090bc37056409d"; + name = "onelogin-php-saml-d3b5172f137db2f412239432d77253ceaaa1e939"; src = fetchurl { - url = "https://api.github.com/repos/onelogin/php-saml/zipball/b22a57ebd13e838b90df5d3346090bc37056409d"; - sha256 = "1bi65bi04a26zmaz7ms0qyg6i86k4cd9g8qs7dp1pphpvflgz461"; + url = "https://api.github.com/repos/SAML-Toolkits/php-saml/zipball/d3b5172f137db2f412239432d77253ceaaa1e939"; + sha256 = "0hhsww74494bh7xk1d0cyr04yr2fggsscfs9z522k6md780pz85m"; }; }; }; @@ -805,20 +805,20 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-a170e64ae10d00ba89e2acbb590dc2e54da8ad8f"; + name = "symfony-console-be5854cee0e8c7b110f00d695d11debdfa1a2a91"; src = fetchurl { - url = "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f"; - sha256 = "16fnydlalcv3ihj2z7b0nyp6cc260k5apxpx7q1vb0hdx8b7wl6a"; + url = "https://api.github.com/repos/symfony/console/zipball/be5854cee0e8c7b110f00d695d11debdfa1a2a91"; + sha256 = "018il5dccpnk2988sgxp26440wrx25j064gns7plnidmx7byxjpw"; }; }; }; "symfony/css-selector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-css-selector-1c5d5c2103c3762aff27a27e1e2409e30a79083b"; + name = "symfony-css-selector-4b61b02fe15db48e3687ce1c45ea385d1780fe08"; src = fetchurl { - url = "https://api.github.com/repos/symfony/css-selector/zipball/1c5d5c2103c3762aff27a27e1e2409e30a79083b"; - sha256 = "0glngr70w1kx1gqliv1w0zk23pblc993i3apdlmb68gp04b8gd3f"; + url = "https://api.github.com/repos/symfony/css-selector/zipball/4b61b02fe15db48e3687ce1c45ea385d1780fe08"; + sha256 = "066gmgxy8228kxfqgirmilil172q61i6fc0vnxxpmcyz6b7xxfai"; }; }; }; @@ -835,20 +835,20 @@ let "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-667a072466c6a53827ed7b119af93806b884cbb3"; + name = "symfony-error-handler-ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/error-handler/zipball/667a072466c6a53827ed7b119af93806b884cbb3"; - sha256 = "077xdy196mbcaqx6kv7p2sx2ygbmnja0xa9mn34d9b1gjmz7kkvj"; + url = "https://api.github.com/repos/symfony/error-handler/zipball/ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc"; + sha256 = "0r29dqwxs2xmv404rfcidf83rycfm9fqv7hsqaz3jwms00y770gg"; }; }; }; "symfony/event-dispatcher" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-d84384f3f67de3cb650db64d685d70395dacfc3f"; + name = "symfony-event-dispatcher-8d7507f02b06e06815e56bb39aa0128e3806208b"; src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/d84384f3f67de3cb650db64d685d70395dacfc3f"; - sha256 = "1d22vxp7fnjd9chl0yd1gnnfdbcgxkcxzl2fynkdf5b1rsx5vly3"; + url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/8d7507f02b06e06815e56bb39aa0128e3806208b"; + sha256 = "162p2x4vxwvljdrqq481sccspzyky2g53pmmnqg4hvg76g5yajj8"; }; }; }; @@ -865,40 +865,40 @@ let "symfony/finder" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-finder-511c48990be17358c23bf45c5d71ab85d40fb764"; + name = "symfony-finder-3ef977a43883215d560a2cecb82ec8e62131471c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/finder/zipball/511c48990be17358c23bf45c5d71ab85d40fb764"; - sha256 = "0m3cm549cnk893dx8dzggbjy49qyx9zln82xi4w4m8rf93pc2ph9"; + url = "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c"; + sha256 = "1ibv2sk2bfg6hymxhs6p6g62h7ycw1w2lg1w1q78pql1nxvrp7ks"; }; }; }; "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-b4db6b833035477cb70e18d0ae33cb7c2b521759"; + name = "symfony-http-foundation-27de8cc95e11db7a50b027e71caaab9024545947"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-foundation/zipball/b4db6b833035477cb70e18d0ae33cb7c2b521759"; - sha256 = "1wwa9ib2imrdq7qrplf2lkbzs2irhjdfrhwdxff5dvcpkvd80qgj"; + url = "https://api.github.com/repos/symfony/http-foundation/zipball/27de8cc95e11db7a50b027e71caaab9024545947"; + sha256 = "11bf0fhb7pf5jp5kpd7nm8sil9mnnvhihj4l23gx514m81anzfi0"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-b7b5e6cdef670a0c82d015a966ffc7e855861a98"; + name = "symfony-http-kernel-6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-kernel/zipball/b7b5e6cdef670a0c82d015a966ffc7e855861a98"; - sha256 = "0ggvbn2qiydv0qcp5rsa5dpjqffj239zcyxiplv5vk4gnc2jy4qr"; + url = "https://api.github.com/repos/symfony/http-kernel/zipball/6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1"; + sha256 = "0y2qsnymkagnds6qwgfv2lbf9i3jf0f4frs1psa35mkb64c58hkg"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-decadcf3865918ecfcbfa90968553994ce935a5e"; + name = "symfony-mime-618597ab8b78ac86d1c75a9d0b35540cda074f33"; src = fetchurl { - url = "https://api.github.com/repos/symfony/mime/zipball/decadcf3865918ecfcbfa90968553994ce935a5e"; - sha256 = "0piaiwigyjvy9mn2464ka3cvzkylw3i1b8by5qr52z0mhm6sv7g5"; + url = "https://api.github.com/repos/symfony/mime/zipball/618597ab8b78ac86d1c75a9d0b35540cda074f33"; + sha256 = "1rklzg8j8s6ls770l8rqz7mb10nrifr228zmqpxdqkpfrs8j0w3z"; }; }; }; @@ -995,20 +995,20 @@ let "symfony/process" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-process-cdb1c81c145fd5aa9b0038bab694035020943381"; + name = "symfony-process-8d92dd79149f29e89ee0f480254db595f6a6a2c5"; src = fetchurl { - url = "https://api.github.com/repos/symfony/process/zipball/cdb1c81c145fd5aa9b0038bab694035020943381"; - sha256 = "1dlqa0fivwr3q7z2k7n657dzdwywh4ilv88fiwh3n8r09iblnc65"; + url = "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5"; + sha256 = "1fvyj71vdnbm56xp167svigax6q562j92i309wqikprdyakdqmyy"; }; }; }; "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-276e06398f71fa2a973264d94f28150f93cfb907"; + name = "symfony-routing-8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58"; src = fetchurl { - url = "https://api.github.com/repos/symfony/routing/zipball/276e06398f71fa2a973264d94f28150f93cfb907"; - sha256 = "1a9g57sdny5sph2w1i7wizssg90k50msalk7nhcy0p9q584r61g6"; + url = "https://api.github.com/repos/symfony/routing/zipball/8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58"; + sha256 = "1ayhdyvc503xjjaaz6vclsxbm568l73zybcbxiz6g1625cg4g8gb"; }; }; }; @@ -1025,20 +1025,20 @@ let "symfony/string" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-string-ffeb9591c61f65a68d47f77d12b83fa530227a69"; + name = "symfony-string-a147c0f826c4a1f3afb763ab8e009e37c877a44d"; src = fetchurl { - url = "https://api.github.com/repos/symfony/string/zipball/ffeb9591c61f65a68d47f77d12b83fa530227a69"; - sha256 = "0mw6issgmncy1xnnszwy0xa8cxqin41k4idk3wv6crdsywzylxkx"; + url = "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d"; + sha256 = "1fkpq4lw9rp3wccdjj8qhpl02asp1izvji53sd0gzq4z3djq0y7p"; }; }; }; "symfony/translation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-7495687c58bfd88b7883823747b0656d90679123"; + name = "symfony-translation-a002933b13989fc4bd0b58e04bf7eec5210e438a"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation/zipball/7495687c58bfd88b7883823747b0656d90679123"; - sha256 = "1s9kxq8nhiwg235jhfg00gzlixnxhcclw3wvmfdn6ijww4s62rqi"; + url = "https://api.github.com/repos/symfony/translation/zipball/a002933b13989fc4bd0b58e04bf7eec5210e438a"; + sha256 = "0a6rw66b6yysafkyhgzpqq147cm38id3v1kksnzgna528d5cac87"; }; }; }; @@ -1055,20 +1055,20 @@ let "symfony/uid" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-uid-a66efcb71d8bc3a207d9d78e0bd67f3321510355"; + name = "symfony-uid-35904eca37a84bb764c560cbfcac9f0ac2bcdbdf"; src = fetchurl { - url = "https://api.github.com/repos/symfony/uid/zipball/a66efcb71d8bc3a207d9d78e0bd67f3321510355"; - sha256 = "0aajisswwd938xkjci1nsz6ypmqidf4dhq2xjy55x1l1jpg4vkji"; + url = "https://api.github.com/repos/symfony/uid/zipball/35904eca37a84bb764c560cbfcac9f0ac2bcdbdf"; + sha256 = "1xwvr4lp9cxr7s065xidqw9k3abdj6npd54flp7smgb4npl67s13"; }; }; }; "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-7a9cd977cd1c5fed3694bee52990866432af07d7"; + name = "symfony-var-dumper-ad23ca4312395f0a8a8633c831ef4c4ee542ed25"; src = fetchurl { - url = "https://api.github.com/repos/symfony/var-dumper/zipball/7a9cd977cd1c5fed3694bee52990866432af07d7"; - sha256 = "1fsiwhrhgzhj8ncv8vz0dsd1s5v4dgphy71j8jqx814s8rb4xd0s"; + url = "https://api.github.com/repos/symfony/var-dumper/zipball/ad23ca4312395f0a8a8633c831ef4c4ee542ed25"; + sha256 = "077ppd7v37qh6rfrv76apa1hm4apaqj5iskbfwlm32cndv0bnxk1"; }; }; }; diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/servers/web-apps/healthchecks/default.nix index cc47813814162..ce1f17dc0a74e 100644 --- a/pkgs/servers/web-apps/healthchecks/default.nix +++ b/pkgs/servers/web-apps/healthchecks/default.nix @@ -13,14 +13,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "healthchecks"; - version = "3.3"; + version = "3.4"; format = "other"; src = fetchFromGitHub { owner = "healthchecks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-XQ8nr9z9Yjwr1irExIgYiGX2knMXX701i6BwvXsVP+E="; + sha256 = "sha256-hiuw7XfCDy+9fzuQMaeN9+XsENeBI1RNXy8IM1HIFhI="; }; propagatedBuildInputs = with py.pkgs; [ diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index 35cd19636269f..89175e5e5a674 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -4,15 +4,15 @@ , enableActiveSync ? false , libwbxml }: gnustep.stdenv.mkDerivation rec { - pname = "SOGo"; - version = "5.9.1"; + pname = "sogo"; + version = "5.10.0"; # always update the sope package as well, when updating sogo src = fetchFromGitHub { - owner = "inverse-inc"; + owner = "Alinto"; repo = pname; rev = "SOGo-${version}"; - hash = "sha256-b6BZZ61wY0Akt1Q6+Bq6JXAx/67MwBNbzHr3sB0NuRg="; + hash = "sha256-ZmpOI1zk/TkRNFmwTXugVb9IvxYSP4LgNrApSytdI7s="; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ]; @@ -45,7 +45,7 @@ gnustep.stdenv.mkDerivation rec { "--enable-mfa" ]; - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=int-conversion -Wno-error=implicit-int"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=int-conversion -Wno-error=implicit-int -Wno-error=return-type"; preFixup = '' # Create gnustep.conf diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index 47d29b44ac23d..8ed6bb21091cf 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2024-06-16"; + version = "0-unstable-2024-06-22"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "92f20ff2827b1afb3d06011bc0609a0212c53993"; - hash = "sha256-ZYrlX8Kg9VD5/eUctesAXQlBcVPiOZ3W9WCpBkByrpA="; + rev = "a992f5b4fa2f7d907cbe32cb8933f05546b598a4"; + hash = "sha256-TVRqwvIwVZQDmrj20bna9oU8jtVp5FAzEp4L2mcyHVU="; }; installPhase = '' diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index d401801a15edf..89bd83d23a1bf 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -375,7 +375,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage rec { sourceProvenance = [ sourceTypes.fromSource ]; license = licenses.mit; mainProgram = "az"; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ katexochen ]; platforms = platforms.all; }; }) diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index d7533f0bf90fb..ae9a129c766f6 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation rec { description = "Extraction utility for archives compressed in .zip format"; license = lib.licenses.info-zip; platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ RossComputerGuy ]; mainProgram = "unzip"; }; } diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index ab1cbb77e97bb..218872ed1e313 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -25,13 +25,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "whisper-cpp"; - version = "1.5.4"; + version = "1.6.2"; src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; rev = "refs/tags/v${finalAttrs.version}" ; - hash = "sha256-9H2Mlua5zx2WNXbz2C5foxIteuBgeCNALdq5bWyhQCk="; + hash = "sha256-hIEIu7feOZWqxRskf6Ej7l653/9KW8B3cnpPLoCRBAc="; }; # The upstream download script tries to download the models to the @@ -80,6 +80,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { env = lib.optionalAttrs stdenv.isDarwin { WHISPER_COREML = "1"; WHISPER_COREML_ALLOW_FALLBACK = "1"; + WHISPER_METAL_EMBED_LIBRARY = "1"; } // lib.optionalAttrs cudaSupport { WHISPER_CUBLAS = "1"; }; @@ -99,15 +100,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/whisper-cpp-download-ggml-model \ --prefix PATH : ${lib.makeBinPath [wget]} - ${lib.optionalString stdenv.isDarwin '' - install -Dt $out/share/whisper-cpp ggml-metal.metal - - for bin in whisper-cpp whisper-cpp-stream whisper-cpp-command; do - wrapProgram $out/bin/$bin \ - --set-default GGML_METAL_PATH_RESOURCES $out/share/whisper-cpp - done - ''} - runHook postInstall ''; diff --git a/pkgs/tools/audio/openai-whisper-cpp/download-models.patch b/pkgs/tools/audio/openai-whisper-cpp/download-models.patch index 7183c38b51669..7589c2ef36f83 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/download-models.patch +++ b/pkgs/tools/audio/openai-whisper-cpp/download-models.patch @@ -1,51 +1,53 @@ +diff --git a/models/download-ggml-model.sh b/models/download-ggml-model.sh +index 1f1075b..7476c8e 100755 --- a/models/download-ggml-model.sh +++ b/models/download-ggml-model.sh -@@ -9,18 +9,6 @@ - src="https://huggingface.co/ggerganov/whisper.cpp" - pfx="resolve/main/ggml" +@@ -12,18 +12,6 @@ pfx="resolve/main/ggml" + BOLD="\033[1m" + RESET='\033[0m' -# get the path of this script --function get_script_path() { +-get_script_path() { - if [ -x "$(command -v realpath)" ]; then -- echo "$(dirname "$(realpath "$0")")" +- dirname "$(realpath "$0")" - else -- local ret="$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)" -- echo "$ret" +- _ret="$(cd -- "$(dirname "$0")" >/dev/null 2>&1 || exit ; pwd -P)" +- echo "$_ret" - fi -} - -models_path="${2:-$(get_script_path)}" - # Whisper models - models=( - "tiny.en" -@@ -56,8 +44,8 @@ function list_models { + models="tiny + tiny.en +@@ -64,8 +52,8 @@ list_models() { printf "\n\n" } -if [ "$#" -lt 1 ] || [ "$#" -gt 2 ]; then -- printf "Usage: $0 <model> [models_path]\n" +- printf "Usage: %s <model> [models_path]\n" "$0" +if [ "$#" -ne 1 ]; then -+ printf "Usage: $0 <model>\n" ++ printf "Usage: %s <model>\n" "$0" list_models + printf "___________________________________________________________\n" + printf "${BOLD}.en${RESET} = english-only ${BOLD}-q5_[01]${RESET} = quantized ${BOLD}-tdrz${RESET} = tinydiarize\n" +@@ -94,8 +82,6 @@ echo "$model" | grep -q '^"tdrz"*$' - exit 1 -@@ -82,8 +70,6 @@ fi - - printf "Downloading ggml model $model from '$src' ...\n" + printf "Downloading ggml model %s from '%s' ...\n" "$model" "$src" --cd "$models_path" +-cd "$models_path" || exit - if [ -f "ggml-$model.bin" ]; then - printf "Model $model already exists. Skipping download.\n" + printf "Model %s already exists. Skipping download.\n" "$model" exit 0 -@@ -105,7 +91,7 @@ if [ $? -ne 0 ]; then +@@ -116,7 +102,7 @@ if [ $? -ne 0 ]; then exit 1 fi --printf "Done! Model '$model' saved in '$models_path/ggml-$model.bin'\n" -+printf "Done! Model '$model' saved in 'ggml-$model.bin'\n" +-printf "Done! Model '%s' saved in '%s/ggml-%s.bin'\n" "$model" "$models_path" "$model" ++printf "Done! Model '%s' saved in 'ggml-%s.bin'\n" "$model" "$model" printf "You can now use it like this:\n\n" --printf " $ ./main -m $models_path/ggml-$model.bin -f samples/jfk.wav\n" -+printf " $ whisper-cpp -m ggml-$model.bin -f samples/jfk.wav\n" +-printf " $ ./main -m %s/ggml-%s.bin -f samples/jfk.wav\n" "$models_path" "$model" ++printf " $ whisper-cpp -m ggml-%s.bin -f samples/jfk.wav\n" "$model" printf "\n" diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 84261b04a91c2..3e252f2313b4b 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -4,9 +4,7 @@ , ffmpeg }: -let - python = python3; -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "spotdl"; version = "4.2.5"; pyproject = true; @@ -18,40 +16,40 @@ in python.pkgs.buildPythonApplication rec { hash = "sha256-vxMhFs2mLbVQndlC2UpeDP+M4pwU9Y4cZHbZ8y3vWbI="; }; - build-system = with python.pkgs; [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = with python3.pkgs; [ poetry-core ]; + + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; pythonRelaxDeps = true; - dependencies = with python.pkgs; [ - spotipy - ytmusicapi - pytube - yt-dlp - mutagen - rich + dependencies = with python3.pkgs; [ + bandcamp-api beautifulsoup4 - requests - rapidfuzz - python-slugify - uvicorn - pydantic fastapi + mutagen platformdirs + pydantic pykakasi - syncedlyrics + python-slugify + pytube + rapidfuzz + requests + rich + setuptools soundcloud-v2 - bandcamp-api + spotipy + syncedlyrics + uvicorn + yt-dlp + ytmusicapi ] ++ python-slugify.optional-dependencies.unidecode; - nativeCheckInputs = with python.pkgs; [ - pytestCheckHook - pytest-mock - pytest-vcr + nativeCheckInputs = with python3.pkgs; [ pyfakefs + pytest-mock pytest-subprocess + pytest-vcr + pytestCheckHook ]; preCheck = '' @@ -59,7 +57,7 @@ in python.pkgs.buildPythonApplication rec { ''; disabledTestPaths = [ - # require networking + # Tests require networking "tests/test_init.py" "tests/test_matching.py" "tests/providers/lyrics" @@ -71,7 +69,7 @@ in python.pkgs.buildPythonApplication rec { ]; disabledTests = [ - # require networking + # Test require networking "test_convert" "test_download_ffmpeg" "test_download_song" @@ -88,10 +86,10 @@ in python.pkgs.buildPythonApplication rec { meta = with lib; { description = "Download your Spotify playlists and songs along with album art and metadata"; - mainProgram = "spotdl"; homepage = "https://github.com/spotDL/spotify-downloader"; changelog = "https://github.com/spotDL/spotify-downloader/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; + mainProgram = "spotdl"; }; } diff --git a/pkgs/tools/filesystems/dwarfs/default.nix b/pkgs/tools/filesystems/dwarfs/default.nix index 0ee916b2d53f8..719ccd1e23d21 100644 --- a/pkgs/tools/filesystems/dwarfs/default.nix +++ b/pkgs/tools/filesystems/dwarfs/default.nix @@ -9,8 +9,10 @@ double-conversion, fmt, fuse3, + flac, glog, gtest, + howard-hinnant-date, jemalloc, libarchive, libevent, @@ -18,60 +20,59 @@ lz4, openssl, pkg-config, + python3, + range-v3, ronn, xxHash, utf8cpp, zstd, }: -let +stdenv.mkDerivation (finalAttrs: { pname = "dwarfs"; - version = "0.9.9"; -in -stdenv.mkDerivation { - inherit pname version; + version = "0.9.10"; src = fetchFromGitHub { owner = "mhx"; repo = "dwarfs"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Zzm2SaFR31TBBMDfgJulVbqsJBh1He2wBFzHRC/c5vg="; + hash = "sha256-uyYNs+fDV5BfQwfX9Wi3BwiKjSDQHAKRJ1+UvS/fHoE="; }; - patches = [ - ( - with lib.versions; - substituteAll { - src = ./version_info.patch; + cmakeFlags = [ + "-DNIXPKGS_DWARFS_VERSION_OVERRIDE=v${finalAttrs.version}" # see https://github.com/mhx/dwarfs/issues/155 - versionFull = version; # displayed as version number (with v prepended) - versionMajor = major version; - versionMinor = minor version; - versionPatch = patch version; - } - ) - ]; + # Needs to be set so `dwarfs` does not try to download `gtest`; it is not + # a submodule, see: https://github.com/mhx/dwarfs/issues/188#issuecomment-1907657083 + "-DPREFER_SYSTEM_GTEST=ON" - cmakeFlags = [ + # These should no longer be necessary with a version > 0.9.10: + # * https://github.com/mhx/dwarfs/commit/593b22a8a90eb66c0898ae06f097f32f4bf3dfd4 + # * https://github.com/mhx/dwarfs/commit/6e9608b2b01be13e41e6b728aae537c14c00ad82 + # * https://github.com/mhx/dwarfs/commit/ce4bee1ad63c666da57d2cdae9fd65214d8dab7f + "-DPREFER_SYSTEM_LIBFMT=ON" "-DPREFER_SYSTEM_ZSTD=ON" "-DPREFER_SYSTEM_XXHASH=ON" - "-DPREFER_SYSTEM_GTEST=ON" - "-DPREFER_SYSTEM_LIBFMT=ON" # may be added under an option in the future # "-DWITH_LEGACY_FUSE=ON" + "-DWITH_TESTS=ON" ]; nativeBuildInputs = [ bison cmake + howard-hinnant-date # uses only the header-only parts pkg-config + range-v3 # header-only library ronn + (python3.withPackages (ps: [ ps.mistletoe ])) # for man pages ]; buildInputs = [ # dwarfs boost + flac # optional; allows automatic audio compression fmt fuse3 jemalloc @@ -90,17 +91,32 @@ stdenv.mkDerivation { ]; doCheck = true; - nativeCheckInputs = [ gtest ]; + nativeCheckInputs = [ + # https://github.com/mhx/dwarfs/issues/188#issuecomment-1907574427 + # `dwarfs` sets C++20 as the minimum, see + # https://github.com/mhx/dwarfs/blob/2cb5542a5d4274225c5933370adcf00035f6c974/CMakeLists.txt#L129 + # Thus the `gtest` headers, when included, + # refer to symbols that only exist in `.so` files compiled with that version. + (gtest.override { cxx_standard = "20"; }) + ]; # these fail inside of the sandbox due to missing access # to the FUSE device - GTEST_FILTER = "-dwarfs/tools_test.end_to_end/*:dwarfs/tools_test.mutating_ops/*"; + GTEST_FILTER = + let + disabledTests = [ + "dwarfs/tools_test.end_to_end/*" + "dwarfs/tools_test.mutating_and_error_ops/*" + "dwarfs/tools_test.categorize/*" + ]; + in + "-${lib.concatStringsSep ":" disabledTests}"; meta = { description = "Fast high compression read-only file system"; homepage = "https://github.com/mhx/dwarfs"; - changelog = "https://github.com/mhx/dwarfs/blob/v${version}/CHANGES.md"; + changelog = "https://github.com/mhx/dwarfs/blob/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.luftmensch-luftmensch ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/tools/filesystems/dwarfs/version_info.patch b/pkgs/tools/filesystems/dwarfs/version_info.patch deleted file mode 100644 index 8d62bd8d22957..0000000000000 --- a/pkgs/tools/filesystems/dwarfs/version_info.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/cmake/package_version.cmake b/cmake/package_version.cmake -new file mode 100644 -index 0000000..d4fdb9c ---- /dev/null -+++ b/cmake/package_version.cmake -@@ -0,0 +1,12 @@ -+# autogenerated code, do not modify -+ -+set(PRJ_GIT_REV "v@versionFull@") -+set(PRJ_GIT_DESC "v@versionFull@") -+set(PRJ_GIT_BRANCH "HEAD") -+set(PRJ_GIT_ID "v@versionFull@") -+set(PRJ_GIT_RELEASE_TAG "v@versionFull@") -+set(PRJ_VERSION_FULL "@versionFull@") -+set(PRJ_VERSION_SHORT "@versionFull@") -+set(PRJ_VERSION_MAJOR "@versionMajor@") -+set(PRJ_VERSION_MINOR "@versionMinor@") -+set(PRJ_VERSION_PATCH "@versionPatch@") -diff --git a/include/dwarfs/version.h b/include/dwarfs/version.h -new file mode 100644 -index 0000000..54cf86a ---- /dev/null -+++ b/include/dwarfs/version.h -@@ -0,0 +1,16 @@ -+// autogenerated code, do not modify -+ -+#pragma once -+ -+#define PRJ_VERSION_MAJOR @versionMajor@ -+#define PRJ_VERSION_MINOR @versionMinor@ -+#define PRJ_VERSION_PATCH @versionPatch@ -+ -+namespace dwarfs { -+ -+extern char const* PRJ_GIT_REV; -+extern char const* PRJ_GIT_DESC; -+extern char const* PRJ_GIT_BRANCH; -+extern char const* PRJ_GIT_ID; -+ -+} // namespace dwarfs -diff --git a/src/dwarfs/version.cpp b/src/dwarfs/version.cpp -new file mode 100644 -index 0000000..5759120 ---- /dev/null -+++ b/src/dwarfs/version.cpp -@@ -0,0 +1,12 @@ -+// autogenerated code, do not modify -+ -+#include "dwarfs/version.h" -+ -+namespace dwarfs { -+ -+char const* PRJ_GIT_REV = "@versionFull@"; -+char const* PRJ_GIT_DESC = "v@versionFull@"; -+char const* PRJ_GIT_BRANCH = "HEAD"; -+char const* PRJ_GIT_ID = "v@versionFull@"; -+ -+} // namespace dwarfs diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 25a9ebeb18dc7..46b8122dd5b65 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.89"; + version = "2.90"; pname = "asymptote"; outputs = [ "out" "man" "info" "doc" "tex" ]; src = fetchurl { url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz"; - hash = "sha256-9k5itO5PhfGnhkDE8eim+Y6R9U7ayrGXJ8fKvpSlf1s="; + hash = "sha256-jGlW+4CL9EqPJJcpW0+muumMQYkrQPPuj8dYqSRwc0A="; }; # override with TeX Live containers to avoid building sty, docs from source diff --git a/pkgs/tools/inputmethods/emote/default.nix b/pkgs/tools/inputmethods/emote/default.nix deleted file mode 100644 index 10e66f1d33b3c..0000000000000 --- a/pkgs/tools/inputmethods/emote/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook3, gobject-introspection, keybinder3, xdotool }: - -python3Packages.buildPythonApplication rec { - pname = "emote"; - version = "4.0.1"; - - src = fetchFromGitHub { - owner = "tom-james-watson"; - repo = "Emote"; - rev = "v${version}"; - sha256 = "sha256-+GpL4Rp0ECsxXGP9dWZbVNkH7H2GF1brDTLsB+TQY5A="; - }; - - postPatch = '' - sed -i setup.py -e '/==.*/d' - substituteInPlace emote/config.py --replace 'os.environ.get("SNAP")' "'$out/share/emote'" - substituteInPlace emote/picker.py --replace 'os.environ.get("SNAP_VERSION", "dev build")' "'$version'" - substituteInPlace snap/gui/emote.desktop --replace "Icon=\''${SNAP}/usr/share/icons/emote.svg" "Icon=emote.svg" - ''; - - nativeBuildInputs = [ - wrapGAppsHook3 - gobject-introspection - ]; - - buildInputs = [ - # used by gobject-introspection's setup-hook and only detected at runtime - keybinder3 - ]; - - propagatedBuildInputs = with python3Packages; [ - dbus-python.out # don't propagate dev output - manimpango - pygobject3.out # not listed in setup.py, don't propagate dev output - setproctitle - ]; - - postInstall = '' - install -D snap/gui/emote.desktop $out/share/applications/emote.desktop - install -D snap/gui/emote.svg $out/share/pixmaps/emote.svg - install -D -t $out/share/emote/static static/{emojis.csv,logo.svg,style.css} - ''; - - dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - --prefix PATH : ${lib.makeBinPath [ xdotool ]} - ) - ''; - - doCheck = false; - - meta = with lib; { - description = "Modern emoji picker for Linux"; - mainProgram = "emote"; - homepage = "https://github.com/tom-james-watson/emote"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ emilytrau SuperSandro2000 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/copier/default.nix b/pkgs/tools/misc/copier/default.nix index 2b1a65cf99ebb..c6238ccb426eb 100644 --- a/pkgs/tools/misc/copier/default.nix +++ b/pkgs/tools/misc/copier/default.nix @@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication rec { description = "Library and command-line utility for rendering projects templates"; homepage = "https://copier.readthedocs.io"; license = licenses.mit; - maintainers = with maintainers; [ jonringer greg ]; + maintainers = with maintainers; [ greg ]; mainProgram = "copier"; }; } diff --git a/pkgs/tools/misc/fedifetcher/default.nix b/pkgs/tools/misc/fedifetcher/default.nix index 579cabc0b0de7..a276c80290843 100644 --- a/pkgs/tools/misc/fedifetcher/default.nix +++ b/pkgs/tools/misc/fedifetcher/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "7.0.4"; + version = "7.0.5"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; rev = "refs/tags/v${version}"; - hash = "sha256-19ZpOpvDj2/qMufH2qPPAj8hRPlViSuC64WqJp6+xSk="; + hash = "sha256-60TYgvAvdNI9vVK9gy4n2aYukWCp3UP+8FTywKb07bI="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://blog.thms.uk/fedifetcher"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = teams.c3d2.members; mainProgram = "fedifetcher"; }; } diff --git a/pkgs/tools/misc/hwatch/default.nix b/pkgs/tools/misc/hwatch/default.nix index afa75fca0cd21..2734f395570c9 100644 --- a/pkgs/tools/misc/hwatch/default.nix +++ b/pkgs/tools/misc/hwatch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hwatch"; - version = "0.3.13"; + version = "0.3.15"; src = fetchFromGitHub { owner = "blacknon"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-3RFiVDXjPFBMK+f/9s9t3cdIH+R/88Fp5uKbo5p2X+g="; + sha256 = "sha256-UmNxdp9acRCKnUsKw7Z9z3knRvVkqQ5atxR/dqpGBYE="; }; - cargoHash = "sha256-MC0Ch9ai4XmhhRz/9nFYEA3A7kgBv2x9q4yc5IJ7CZ8="; + cargoHash = "sha256-pEhogmK2WBj/PxcDtJs/H0XZhPiz3zCQMX2eUcAfnTE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/immich-cli/default.nix b/pkgs/tools/misc/immich-cli/default.nix index 82d8e96ec798a..21d0600d92b13 100644 --- a/pkgs/tools/misc/immich-cli/default.nix +++ b/pkgs/tools/misc/immich-cli/default.nix @@ -1,31 +1,70 @@ { lib , buildNpmPackage , fetchFromGitHub +, testers }: -buildNpmPackage { - pname = "immich-cli"; - version = "2.0.6"; - +let + version = "2.2.4"; src = fetchFromGitHub { owner = "immich-app"; repo = "immich"; # Using a fixed commit until upstream has release tags for cli. - rev = "014adf175ad50a61f92804666940e267ab329064"; - hash = "sha256-MK3Watq5/Zp+rymCIfWxAXSgBPDE13g23uDnW7A5x9g="; + rev = "8c2195c8205156f6e3168cc52fa34db334568ea9"; + hash = "sha256-Tseu6aIrYU4Af/jWDi2wDtP77n/aogp7Qkn9mosMaes="; }; - - npmDepsHash = "sha256-ssxOXKE1t/bSb972w/cBeK61IrqPLmx9ODMn6D+2Ezw="; - - postPatch = '' - cd cli - ''; - - meta = { + meta' = { description = "CLI utilities for Immich to help upload images and videos"; homepage = "https://github.com/immich-app/immich"; license = lib.licenses.mit; - mainProgram = "immich"; maintainers = with lib.maintainers; [ felschr pineapplehunter ]; + mainProgram = "immich"; + }; + + open-api-typescript-sdk = buildNpmPackage { + pname = "immich-cli-openapi-typescript-sdk"; + inherit src version; + + npmDepsHash = "sha256-WhNdFaFBwb6ehEQgbNJGdzPb3FdJk1Nefi8DcJfY9Wc="; + + postPatch = '' + cd open-api/typescript-sdk + ''; + meta = { + # using inherit for `builtin.unsafeGetAttrPos` to work correctly + inherit (meta') + description + homepage + license + maintainers; + }; + }; + + immich-cli = buildNpmPackage { + pname = "immich-cli"; + inherit src version; + + npmDepsHash = "sha256-aSTN+I8B/aLT2ItGoyZTlbdn1VCK0ZmOb1QG7ZQuz+Q="; + + postPatch = '' + ln -sv ${open-api-typescript-sdk}/lib/node_modules/@immich/sdk/{build,node_modules} open-api/typescript-sdk + cd cli + ''; + + passthru = { + inherit open-api-typescript-sdk; + tests.version = testers.testVersion { package = immich-cli; }; + }; + + meta = { + # using inherit for `builtin.unsafeGetAttrPos` to work correctly + inherit (meta') + description + homepage + license + maintainers + mainProgram; + }; }; -} +in +immich-cli diff --git a/pkgs/tools/misc/mloader/default.nix b/pkgs/tools/misc/mloader/default.nix index f8a6366cd3da4..1a39727e9973b 100644 --- a/pkgs/tools/misc/mloader/default.nix +++ b/pkgs/tools/misc/mloader/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "mloader"; - version = "1.1.11"; + version = "1.1.12"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SFFjv4RWh1JZtxkDmaun35gKi5xty1ifIItwaz3lot4="; + sha256 = "sha256-0o4FvhuFudNSEL6fwBVqxldaNePbbidY9utDqXiLRNc="; }; postPatch = '' diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index d2a04e3c38f7e..2aef5a0788a8d 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.4.1"; + version = "5.4.3"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-C/9kFWDpv4bzqpsUcGpZn7P+fqU6teU39HibYhhva3o="; + sha256 = "sha256-xey1Og0TEMgCc9Me/np7BGnUNYTz98gMFzLm2IcQHtw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 467981bb0a294..51448931dcfb3 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchurl , tk , tcllib @@ -6,38 +7,43 @@ , tkremind ? true }: -let - inherit (lib) optionals optionalString; - tclLibraries = optionals tkremind [ tcllib tk ]; - tkremindPatch = optionalString tkremind '' - substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish" - ''; -in tcl.mkTclDerivation rec { pname = "remind"; version = "05.00.01"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-tj36/lLn67/hkNMrRVGXRLqQ9Sx6oDKZHeajiSYn97c="; + hash = "sha256-tj36/lLn67/hkNMrRVGXRLqQ9Sx6oDKZHeajiSYn97c="; }; - propagatedBuildInputs = tclLibraries; + propagatedBuildInputs = lib.optionals tkremind [ tcllib tk ]; - postPatch = '' - substituteInPlace ./configure \ - --replace "sleep 1" "true" - substituteInPlace ./src/init.c \ - --replace "rkrphgvba(0);" "" \ - --replace "rkrphgvba(1);" "" - ${tkremindPatch} + postPatch = lib.optionalString tkremind '' + # NOTA BENE: The path to rem2pdf is replaced in tkremind for future use + # as rem2pdf is currently not build since it requires the JSON::MaybeXS, + # Pango and Cairo Perl modules. + substituteInPlace scripts/tkremind \ + --replace-fail "exec wish" "exec ${lib.getBin tk}/bin/wish" \ + --replace-fail 'set Remind "remind"' "set Remind \"$out/bin/remind\"" \ + --replace-fail 'set Rem2PS "rem2ps"' "set Rem2PS \"$out/bin/rem2ps\"" \ + --replace-fail 'set Rem2PDF "rem2pdf"' "set Rem2PDF \"$out/bin/rem2pdf\"" ''; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + # Disable clang link time optimization until the following issue is resolved: + # https://github.com/NixOS/nixpkgs/issues/19098 + "-fno-lto" + # On Darwin setenv and unsetenv are defined in stdlib.h from libSystem + "-DHAVE_SETENV" + "-DHAVE_UNSETENV" + ]); + meta = with lib; { homepage = "https://dianne.skoll.ca/projects/remind/"; description = "Sophisticated calendar and alarm program for the console"; license = licenses.gpl2Only; maintainers = with maintainers; [ raskin kovirobi ]; + mainProgram = "remind"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index 81c81e6d6f882..4ec34be94f4ea 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "vivid"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - hash = "sha256-zNsNEXj/SaJaYsYvoOGPopLhJDfLIXSs7eeZDdJrHiQ="; + hash = "sha256-mxBBfezaMM2dfiXK/s+Htr+i5GJP1xVSXzkmYxEuwNs="; }; - cargoHash = "sha256-gtqdQuf3Ybt0PDCQw3gGAzIROq39NJKPIat0lyIPGgg="; + cargoHash = "sha256-B1PYLUtBcx35NkU/NR+CmM8bF0hfJWmu11vsovFwR+c="; meta = with lib; { description = "Generator for LS_COLORS with support for multiple color themes"; diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix index 8f5ad8268e693..18647cae1a232 100644 --- a/pkgs/tools/misc/wyrd/default.nix +++ b/pkgs/tools/misc/wyrd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { downloadPage = "http://pessimization.com/software/wyrd/"; license = licenses.gpl2Only; maintainers = [ maintainers.prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; mainProgram = "wyrd"; }; } diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/tools/networking/containerlab/default.nix index aeaa2d044cb60..07cdb09a4955d 100644 --- a/pkgs/tools/networking/containerlab/default.nix +++ b/pkgs/tools/networking/containerlab/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "containerlab"; - version = "0.55.0"; + version = "0.55.1"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-g+42nvNR1sWrkeU/oOajtmqeDVjRiwp7i+hrZU+FE00="; + hash = "sha256-Dk1so6CXAbnfyWfqHne/mMc8LYS3JqXj6XM53fQKANk="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 225c4b1c8cd9e..4cef8e04ea2d3 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -14,7 +14,6 @@ , openssl , lua5_4 , pcre2 -, systemd }: assert lib.assertOneOf "sslLibrary" sslLibrary [ "quictls" "openssl" "libressl" "wolfssl" ]; @@ -29,17 +28,16 @@ let sslPkg = sslPkgs.${sslLibrary}; in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "2.9.7"; + version = "3.0.2"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-0aClbwCKjS8Ae8DDffaylSUg0fTd4zuNOAJxDlFYwTE="; + hash = "sha256-lnLuQ7EJ8ZNWw11yaHsiLc+CuHk2DG6CZ3OXN2z13DY="; }; buildInputs = [ sslPkg zlib libxcrypt ] ++ lib.optional useLua lua5_4 - ++ lib.optional usePcre pcre2 - ++ lib.optional stdenv.isLinux systemd; + ++ lib.optional usePcre pcre2; # TODO: make it work on bsd as well makeFlags = [ diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix index 7d7806f1997e2..8271fe9d27a52 100644 --- a/pkgs/tools/networking/netcat/default.nix +++ b/pkgs/tools/networking/netcat/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { mainProgram = "netcat"; license = licenses.gpl2Plus; platforms = platforms.unix; + maintainers = with lib.maintainers; [ RossComputerGuy ]; }; } diff --git a/pkgs/tools/package-management/nix-eval-jobs/2.19.nix b/pkgs/tools/package-management/nix-eval-jobs/2.19.nix deleted file mode 100644 index bf2d48e4adfb1..0000000000000 --- a/pkgs/tools/package-management/nix-eval-jobs/2.19.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, boost -, cmake -, fetchFromGitHub -, meson -, ninja -, nix -, nlohmann_json -, pkg-config -, stdenv -}: -stdenv.mkDerivation rec { - pname = "nix-eval-jobs"; - version = "2.19.4"; - src = fetchFromGitHub { - owner = "nix-community"; - repo = pname; - rev = "v${version}"; - hash = "sha256-97ZqhTMqnAr1rzEy96faceWzFyWexnYbH1aTfc1y0JE="; - }; - buildInputs = [ - boost - nix - nlohmann_json - ]; - nativeBuildInputs = [ - meson - ninja - pkg-config - # nlohmann_json can be only discovered via cmake files - cmake - ]; - - # Since this package is intimately tied to a specific Nix release, we - # propagate the Nix used for building it to make it easier for users - # downstream to reference it. - passthru = { inherit nix; }; - - meta = { - description = "Hydra's builtin hydra-eval-jobs as a standalone"; - homepage = "https://github.com/nix-community/nix-eval-jobs"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ adisbladis mic92 ]; - platforms = lib.platforms.unix; - mainProgram = "nix-eval-jobs"; - }; -} diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 15a095f6c3b13..0417b5c294dec 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , meson , ninja +, curl , nix , nlohmann_json , pkg-config @@ -11,16 +12,17 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.22.0"; + version = "2.22.1"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-Foi9FUuwKBUVExR3uEJEGsNRCGkkoNDj0yEhASanGCM="; + hash = "sha256-zvi2YfvlOLtui2JFhPs2qybpnJR3/2luMfp8t/eMh54="; }; buildInputs = [ boost nix + curl nlohmann_json ]; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix index e1431532f8577..c98bae7e44d95 100644 --- a/pkgs/tools/package-management/nix-template/default.nix +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/jonringer/nix-template/"; changelog = "https://github.com/jonringer/nix-template/releases/tag/v${version}"; license = licenses.cc0; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; mainProgram = "nix-template"; }; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 677dcf3aa1996..87077b42d96e4 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -147,8 +147,8 @@ in lib.makeExtensible (self: ({ }; nix_2_18 = common { - version = "2.18.2"; - hash = "sha256-8gNJlBlv2bnffRg0CejiBXc6U/S6YeCLAdHrYvTPyoY="; + version = "2.18.3"; + hash = "sha256-430V4oN1Pid0h3J1yucrik6lbDh5D+pHI455bzLPEDY="; self_attribute_name = "nix_2_18"; }; diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/tools/security/amber/default.nix index 2b64480c4a00a..5cb96596564ce 100644 --- a/pkgs/tools/security/amber/default.nix +++ b/pkgs/tools/security/amber/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { # Renaming it to amber-secret because another package named amber exists pname = "amber-secret"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "fpco"; repo = "amber"; rev = "v${version}"; - sha256 = "sha256-11dqfOi/DdfFrFTeboPyFkixXG+fCJ2jpHM55qsQ1jw="; + sha256 = "sha256-FoERgkyFCZ1nU01LXpzrqz9eJ9a16L/t+9g8jsABHK4="; }; - cargoHash = "sha256-u0vceIurenYnKfF3gWNw304hX4vVFoszZD7AMwffOmc="; + cargoHash = "sha256-Joy+SO1zR78Eh5eK2bxyT0l3hCuLX/J3u/UvN+++6vg="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index ba23647c9c2db..2a3bb65f8a79b 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -1,25 +1,27 @@ -{ stdenv -, fetchFromGitHub -, lib -, callPackage -, gradle_7 -, perl -, makeBinaryWrapper -, openjdk17 -, unzip -, makeDesktopItem -, copyDesktopItems -, desktopToDarwinBundle -, icoutils -, xcbuild -, protobuf -, ghidra-extensions +{ + stdenv, + fetchFromGitHub, + lib, + callPackage, + gradle_7, + perl, + makeBinaryWrapper, + openjdk17, + unzip, + makeDesktopItem, + copyDesktopItems, + desktopToDarwinBundle, + xcbuild, + protobuf, + ghidra-extensions, + python3, + python3Packages, }: let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "11.0.3"; + version = "11.1.1"; releaseName = "NIX"; distroPrefix = "ghidra_${version}_${releaseName}"; @@ -27,7 +29,7 @@ let owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-IiLxaJvfJcK275FDZEsUCGp7haJjp8O2fUIoM4F9H30="; + hash = "sha256-t96FcAK3JwO66dOf4OhpOfU8CQfAczfF61Cg7m+B3fA="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -76,26 +78,26 @@ let # Adds a gradle step that downloads all the dependencies to the gradle cache. addResolveStep = '' - cat >>build.gradle <<HERE -task resolveDependencies { - doLast { - project.rootProject.allprojects.each { subProject -> - subProject.buildscript.configurations.each { configuration -> - resolveConfiguration(subProject, configuration, "buildscript config \''${configuration.name}") + cat >>build.gradle <<HERE + task resolveDependencies { + doLast { + project.rootProject.allprojects.each { subProject -> + subProject.buildscript.configurations.each { configuration -> + resolveConfiguration(subProject, configuration, "buildscript config \''${configuration.name}") + } + subProject.configurations.each { configuration -> + resolveConfiguration(subProject, configuration, "config \''${configuration.name}") + } + } } - subProject.configurations.each { configuration -> - resolveConfiguration(subProject, configuration, "config \''${configuration.name}") + } + void resolveConfiguration(subProject, configuration, name) { + if (configuration.canBeResolved) { + logger.info("Resolving project {} {}", subProject.name, name) + configuration.resolve() } } - } -} -void resolveConfiguration(subProject, configuration, name) { - if (configuration.canBeResolved) { - logger.info("Resolving project {} {}", subProject.name, name) - configuration.resolve() - } -} -HERE + HERE ''; # fake build to pre-download deps into fixed-output derivation @@ -106,7 +108,10 @@ HERE postPatch = addResolveStep; - nativeBuildInputs = [ gradle perl ] ++ lib.optional stdenv.isDarwin xcbuild; + nativeBuildInputs = [ + gradle + perl + ] ++ lib.optional stdenv.isDarwin xcbuild; buildPhase = '' runHook preBuild export HOME="$NIX_BUILD_TOP/home" @@ -132,11 +137,23 @@ HERE ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-nKfJiGoZlDEpbCmYVKNZXz2PYIosCd4nPFdy3MfprHc="; + outputHash = "sha256-66gL4UFlBUo2JIEOXoF6tFvXtBdEX4b2MeSrV1b6Vg4="; }; - -in stdenv.mkDerivation (finalAttrs: { - inherit pname version src patches postPatch; +in +stdenv.mkDerivation (finalAttrs: { + inherit + pname + version + src + patches + postPatch + ; + + # Don't create .orig files if the patch isn't an exact match. + patchFlags = [ + "--no-backup-if-mismatch" + "-p1" + ]; desktopItems = [ (makeDesktopItem { @@ -150,16 +167,20 @@ in stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ - gradle - unzip - makeBinaryWrapper - copyDesktopItems - protobuf - ] ++ lib.optionals stdenv.isDarwin [ - xcbuild - desktopToDarwinBundle - ]; + nativeBuildInputs = + [ + gradle + unzip + makeBinaryWrapper + copyDesktopItems + protobuf + python3 + python3Packages.pip + ] + ++ lib.optionals stdenv.isDarwin [ + xcbuild + desktopToDarwinBundle + ]; dontStrip = true; @@ -211,7 +232,10 @@ in stdenv.mkDerivation (finalAttrs: { passthru = { inherit releaseName distroPrefix; - inherit (ghidra-extensions.override { ghidra = finalAttrs.finalPackage; }) buildGhidraExtension buildGhidraScripts; + inherit (ghidra-extensions.override { ghidra = finalAttrs.finalPackage; }) + buildGhidraExtension + buildGhidraScripts + ; withExtensions = callPackage ./with-extensions.nix { ghidra = finalAttrs.finalPackage; }; }; @@ -221,14 +245,21 @@ in stdenv.mkDerivation (finalAttrs: { description = "Software reverse engineering (SRE) suite of tools"; mainProgram = "ghidra"; homepage = "https://ghidra-sre.org/"; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; sourceProvenance = with sourceTypes; [ fromSource - binaryBytecode # deps + binaryBytecode # deps ]; license = licenses.asl20; - maintainers = with maintainers; [ roblabla vringar ]; + maintainers = with maintainers; [ + roblabla + vringar + ]; broken = stdenv.isDarwin && stdenv.isx86_64; }; - }) diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/tools/security/jwx/default.nix index ea8e69fad109b..b1dbc25b0889b 100644 --- a/pkgs/tools/security/jwx/default.nix +++ b/pkgs/tools/security/jwx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jwx"; - version = "2.0.21"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = pname; rev = "v${version}"; - hash = "sha256-Rg3E+7kyyzY8NqfXMH3ENWAuCxx7+3DyyarfGNI9xxE="; + hash = "sha256-In9/RmcqiOFT1QceWls8gzgzgkBoKeUE05j0cHCecTU="; }; - vendorHash = "sha256-HHq4B0MYP2gUtV9ywrXVmWN7OpV6NVb49rVMFblOgPc="; + vendorHash = "sha256-ZS7xliFymXTE8hlc3GEMNonP5sJTZGirw5YQNzPCl3Y="; sourceRoot = "${src.name}/cmd/jwx"; diff --git a/pkgs/tools/security/notary/no-git-usage.patch b/pkgs/tools/security/notary/no-git-usage.patch deleted file mode 100644 index 363eefe36921d..0000000000000 --- a/pkgs/tools/security/notary/no-git-usage.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile b/Makefile -index ab794165..0cbd047f 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,8 +5,8 @@ PREFIX?=$(shell pwd) - # Add to compile time flags - NOTARY_PKG := github.com/theupdateframework/notary - NOTARY_VERSION := $(shell cat NOTARY_VERSION) --GITCOMMIT := $(shell git rev-parse --short HEAD) --GITUNTRACKEDCHANGES := $(shell git status --porcelain --untracked-files=no) -+GITCOMMIT ?= $(shell git rev-parse --short HEAD) -+GITUNTRACKEDCHANGES := - ifneq ($(GITUNTRACKEDCHANGES),) - GITCOMMIT := $(GITCOMMIT)-dirty - endif diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index 861167c15ae82..82e4d3624d1e6 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -32,6 +32,6 @@ buildGoModule rec { homepage = "https://github.com/spiffe/spire"; changelog = "https://github.com/spiffe/spire/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer fkautz ]; + maintainers = with maintainers; [ fkautz ]; }; } diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/tools/security/vals/default.nix index ff7f8246ef060..0d0d1070bbd7f 100644 --- a/pkgs/tools/security/vals/default.nix +++ b/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.37.2"; + version = "0.37.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = pname; - sha256 = "sha256-L0T0Lu5UP/KG2jdJfw5lM6/FagZUpMLGNWyf4tktzmQ="; + sha256 = "sha256-RCvqoikROFpFvza24PGocdxFaOI6hZLSy3Jnag7Oz4s="; }; - vendorHash = "sha256-7ethl7BL6JBzIbyvpUE2TdvvPWs/CUvJQhjH2P5UCTY="; + vendorHash = "sha256-iKfNAQRsVUjhUmDH/HevnDnocQm4k9jEfW40+AncojM="; proxyVendor = true; diff --git a/pkgs/tools/video/gopro/default.nix b/pkgs/tools/video/gopro/default.nix index 7f234ae5247ac..292f571611ded 100644 --- a/pkgs/tools/video/gopro/default.nix +++ b/pkgs/tools/video/gopro/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/KonradIT/gopro-linux"; platforms = platforms.unix; license = licenses.gpl3; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; mainProgram = "gopro"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index db1973e884284..71c93af775413 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1110,6 +1110,7 @@ mapAliases ({ prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10 prometheus-openvpn-exporter = throw "'prometheus-openvpn-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-12-23 + prometheus-minio-exporter = throw "'prometheus-minio-exporter' has been removed from nixpkgs, use Minio's built-in Prometheus integration instead"; # Added 2024-06-10 prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 protobuf3_19 = throw "protobuf3_19 does not receive updates anymore and has been removed"; # Added 2023-10-01 @@ -1169,6 +1170,7 @@ mapAliases ({ readline63 = throw "'readline63' has been replaced with 'readline'"; # Added 2024-02-10 redocly-cli = redocly; # Added 2024-04-14 redpanda = redpanda-client; # Added 2023-10-14 + redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10 restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22 retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05 retroshare06 = retroshare; @@ -1391,6 +1393,7 @@ mapAliases ({ v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2023-09-10 vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 vaapiIntel = intel-vaapi-driver; # Added 2023-05-31 + vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05 vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13 vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 ventoy-bin = ventoy; # Added 2023-04-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b8f0f4d11336..b24e0955a7c56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -740,14 +740,6 @@ with pkgs; protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { }; - protoc-gen-prost = callPackage ../development/tools/protoc-gen-prost { }; - - protoc-gen-prost-crate = callPackage ../development/tools/protoc-gen-prost-crate { }; - - protoc-gen-prost-serde = callPackage ../development/tools/protoc-gen-prost-serde { }; - - protoc-gen-tonic = callPackage ../development/tools/protoc-gen-tonic { }; - protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { }; @@ -3621,6 +3613,8 @@ with pkgs; cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { }; + dazel = python3Packages.callPackage ../development/tools/dazel { }; + dcap = callPackage ../tools/networking/dcap { }; deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { }; @@ -4070,10 +4064,12 @@ with pkgs; androidenv = callPackage ../development/mobile/androidenv { }; - androidndkPkgs = androidndkPkgs_21; + androidndkPkgs = androidndkPkgs_26; androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21"; androidndkPkgs_23b = (callPackage ../development/androidndk-pkgs {})."23b"; androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs {})."24"; + androidndkPkgs_25 = (callPackage ../development/androidndk-pkgs {})."25"; + androidndkPkgs_26 = (callPackage ../development/androidndk-pkgs {})."26"; androidsdk = androidenv.androidPkgs.androidsdk; @@ -5159,6 +5155,10 @@ with pkgs; fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { }; + fedimint = callPackage ../by-name/fe/fedimint/package.nix { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; + fetch-scm = callPackage ../tools/misc/fetch-scm { }; fiano = callPackage ../tools/misc/fiano { }; @@ -7474,8 +7474,6 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - emote = callPackage ../tools/inputmethods/emote { }; - engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { }; epub2txt2 = callPackage ../tools/text/epub2txt2 { }; @@ -11017,8 +11015,6 @@ with pkgs; noisetorch = callPackage ../applications/audio/noisetorch { }; - notary = callPackage ../tools/security/notary { }; - notation = callPackage ../tools/security/notation { }; notify-osd = callPackage ../applications/misc/notify-osd { }; @@ -12061,8 +12057,6 @@ with pkgs; raysession = python3Packages.callPackage ../applications/audio/raysession {}; - revolt-desktop = callPackage ../applications/networking/instant-messengers/revolt-desktop { }; - rbw = callPackage ../tools/security/rbw { }; remarshal = with python3Packages; toPythonApplication remarshal; @@ -12271,8 +12265,6 @@ with pkgs; redpanda-client = callPackage ../servers/redpanda { }; - redpanda-server = redpanda-client.server; - redsocks = callPackage ../tools/networking/redsocks { }; rep = callPackage ../development/tools/rep { }; @@ -16370,11 +16362,14 @@ with pkgs; ocaml-crunch = ocamlPackages.crunch.bin; + inherit (ocaml-ng.ocamlPackages_4_14) + ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 + ocamlformat_0_22_4; + inherit (ocamlPackages) ocamlformat # latest version - ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 - ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 - ocamlformat_0_26_0 ocamlformat_0_26_1 ocamlformat_0_26_2; + ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 ocamlformat_0_26_0 + ocamlformat_0_26_1 ocamlformat_0_26_2; inherit (ocamlPackages) odig; @@ -19793,6 +19788,10 @@ with pkgs; yodl = callPackage ../development/tools/misc/yodl { }; + yourkit-java = callPackage ../by-name/yo/yourkit-java/package.nix { + jre = jdk17; + }; + yq = python3.pkgs.toPythonApplication python3.pkgs.yq; yq-go = callPackage ../development/tools/yq-go { }; @@ -19825,24 +19824,12 @@ with pkgs; then overrideSDK stdenv { darwinMinVersion = "10.13"; } else stdenv; }; - abseil-cpp_202206 = callPackage ../development/libraries/abseil-cpp/202206.nix { - # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. - stdenv = if stdenv.isDarwin && stdenv.isx86_64 - then overrideSDK stdenv { darwinMinVersion = "10.13"; } - else stdenv; - }; abseil-cpp_202301 = callPackage ../development/libraries/abseil-cpp/202301.nix { # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. stdenv = if stdenv.isDarwin && stdenv.isx86_64 then overrideSDK stdenv { darwinMinVersion = "10.13"; } else stdenv; }; - abseil-cpp_202308 = callPackage ../development/libraries/abseil-cpp/202308.nix { - # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. - stdenv = if stdenv.isDarwin && stdenv.isx86_64 - then overrideSDK stdenv { darwinMinVersion = "10.13"; } - else stdenv; - }; abseil-cpp_202401 = callPackage ../development/libraries/abseil-cpp/202401.nix { # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. stdenv = if stdenv.isDarwin && stdenv.isx86_64 @@ -20423,8 +20410,8 @@ with pkgs; intel-media-driver intel-vaapi-driver mesa + libva-vdpau-driver libvdpau-va-gl - vaapiVdpau glxinfo vdpauinfo; }; @@ -24613,7 +24600,7 @@ with pkgs; vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; - vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; + libva-vdpau-driver = callPackage ../development/libraries/libva-vdpau-driver { }; vale = callPackage ../tools/text/vale { }; @@ -25106,7 +25093,11 @@ with pkgs; # Armed Bear Common Lisp abcl = wrapLisp { - pkg = callPackage ../development/compilers/abcl { }; + pkg = callPackage ../development/compilers/abcl { + # https://armedbear.common-lisp.dev/ lists OpenJDK 17 as the highest + # supported JDK. + jdk = openjdk17; + }; faslExt = "abcl"; }; @@ -26241,7 +26232,6 @@ with pkgs; prometheus-lnd-exporter = callPackage ../servers/monitoring/prometheus/lnd-exporter.nix { }; prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { }; - prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { }; prometheus-mongodb-exporter = callPackage ../servers/monitoring/prometheus/mongodb-exporter.nix { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; @@ -26531,8 +26521,6 @@ with pkgs; virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; - vmagent = callPackage ../servers/monitoring/vmagent { }; - vsftpd = callPackage ../servers/ftp/vsftpd { }; wallabag = callPackage ../servers/web-apps/wallabag { }; @@ -31489,7 +31477,7 @@ with pkgs; pixeluvo = callPackage ../applications/graphics/pixeluvo { }; - pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; + pixinsight = qt6Packages.callPackage ../applications/graphics/pixinsight { }; planner = callPackage ../applications/office/planner { }; @@ -31974,11 +31962,9 @@ with pkgs; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; - klee = callPackage ../applications/science/logic/klee (with llvmPackages_13; { - clang = clang; - llvm = llvm; - stdenv = stdenv; - }); + klee = callPackage ../applications/science/logic/klee { + llvmPackages = llvmPackages_13; + }; kmetronome = qt6Packages.callPackage ../applications/audio/kmetronome { }; @@ -32799,7 +32785,7 @@ with pkgs; mailspring = callPackage ../applications/networking/mailreaders/mailspring { }; - memento = libsForQt5.callPackage ../applications/video/memento { }; + memento = qt6Packages.callPackage ../applications/video/memento { }; mm = callPackage ../applications/networking/instant-messengers/mm { }; @@ -35227,9 +35213,7 @@ with pkgs; webssh = with python3Packages; toPythonApplication webssh; - webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { - electron = electron_27; - }; + webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { }; wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { }; @@ -38043,7 +38027,7 @@ with pkgs; protobuf = protobuf_21; # or-tools builds with -std=c++20, so abseil-cpp must # also be built that way - abseil-cpp = abseil-cpp_202206.override { + abseil-cpp = abseil-cpp.override { static = true; cxxStandard = "20"; }; @@ -39461,14 +39445,9 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; - nix-eval-jobs = if stdenv.isDarwin then - callPackage ../tools/package-management/nix-eval-jobs/2.19.nix { - nix = nixVersions.nix_2_19; - } - else - callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_22; - }; + nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { + nix = nixVersions.nix_2_22; + }; nix-doc = callPackage ../tools/package-management/nix-doc { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index cf4d860a82326..104d8821ff6a4 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -337,6 +337,8 @@ in { cpupower = callPackage ../os-specific/linux/cpupower { }; + deepin-anything-module = callPackage ../os-specific/linux/deepin-anything-module { }; + ddcci-driver = callPackage ../os-specific/linux/ddcci { }; dddvb = callPackage ../os-specific/linux/dddvb { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 46866fd883610..259864f22a789 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -466,6 +466,8 @@ let eqaf = callPackage ../development/ocaml-modules/eqaf { }; + eqaf-cstruct = callPackage ../development/ocaml-modules/eqaf/cstruct.nix { }; + erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5071fff62745d..c2f17f4557ee0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6966,6 +6966,22 @@ with self; { }; }; + DevelCover = buildPerlPackage { + pname = "Devel-Cover"; + version = "1.44"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PJ/PJCJ/Devel-Cover-1.44.tar.gz"; + hash = "sha256-9AwVQ5kuXWWm94AD1GLVms15rm0w04BHscadmZ0rH9g="; + }; + propagatedBuildInputs = [ HTMLParser ]; + doCheck = false; + meta = { + description = "Code coverage metrics for Perl"; + homepage = "http://www.pjcj.net/perl.html"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DevelDeprecationsEnvironmental = buildPerlPackage { pname = "Devel-Deprecations-Environmental"; version = "1.101"; @@ -15650,6 +15666,36 @@ with self; { }; }; + MemoryProcess = buildPerlPackage { + pname = "Memory-Process"; + version = "0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SK/SKIM/Memory-Process-0.06.tar.gz"; + hash = "sha256-NYFEiP/SnJdiFiXqOz1wCvv6YO0FW9dZ1OWNnI/UTk4="; + }; + buildInputs = [ CaptureTiny TestNoWarnings ]; + propagatedBuildInputs = [ MemoryUsage Readonly ]; + meta = { + description = "Memory process reporting"; + homepage = "https://github.com/michal-josef-spacek/Memory-Process"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + }; + }; + + MemoryUsage = buildPerlPackage { + pname = "Memory-Usage"; + version = "0.201"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DO/DONEILL/Memory-Usage-0.201.tar.gz"; + hash = "sha256-jyr60h5Ap0joHIwPPkDKcYwU3bn7LYgL+9KK6RPOU0k="; + }; + meta = { + description = "Tools to determine actual memory usage"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Menlo = buildPerlPackage { pname = "Menlo"; version = "1.9019"; @@ -23924,12 +23970,12 @@ with self; { SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "10.0.0"; + version = "10.2.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; rev = "v${version}"; - hash = "sha256-FK2SaerA/GB0ZAg/QXG9Ig1Cvpg6v9lh1sKPjYU52M8="; + hash = "sha256-xpgZeXk9QefqbBMsvcMh/Cg/XFGEiVi3FbU/jBbSIr0="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a798ad23a2a52..839d53a8d48ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3482,7 +3482,7 @@ self: super: with self; { dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; dm-tree = callPackage ../development/python-modules/dm-tree { - abseil-cpp = pkgs.abseil-cpp_202103.override { + abseil-cpp = pkgs.abseil-cpp.override { cxxStandard = "14"; }; }; @@ -3792,7 +3792,7 @@ self: super: with self; { eggdeps = callPackage ../development/python-modules/eggdeps { }; - eigenpy = toPythonModule (callPackage ../development/python-modules/eigenpy { }); + eigenpy = callPackage ../development/python-modules/eigenpy { }; einops = callPackage ../development/python-modules/einops { }; @@ -5372,6 +5372,8 @@ self: super: with self; { hatch-nodejs-version = callPackage ../development/python-modules/hatch-nodejs-version { }; + hatch-regex-commit = callPackage ../development/python-modules/hatch-regex-commit { }; + hatch-requirements-txt = callPackage ../development/python-modules/hatch-requirements-txt { }; haversine = callPackage ../development/python-modules/haversine { }; @@ -9200,9 +9202,7 @@ self: super: with self; { onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; - onnx = callPackage ../development/python-modules/onnx { - abseil-cpp = pkgs.abseil-cpp_202301; - }; + onnx = callPackage ../development/python-modules/onnx { }; onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { inherit (pkgs) protobuf; @@ -10094,6 +10094,8 @@ self: super: with self; { pylddwrap = callPackage ../development/python-modules/pylddwrap { }; + pyloadapi = callPackage ../development/python-modules/pyloadapi { }; + pyngo = callPackage ../development/python-modules/pyngo { }; pyngrok = callPackage ../development/python-modules/pyngrok { }; @@ -13399,6 +13401,8 @@ self: super: with self; { rfc7464 = callPackage ../development/python-modules/rfc7464 { }; + rfc8785 = callPackage ../development/python-modules/rfc8785 { }; + rfcat = callPackage ../development/python-modules/rfcat { }; rflink = callPackage ../development/python-modules/rflink { }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 81ea4d3403a7a..bb4ead25066d0 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -12,12 +12,6 @@ nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; - permittedInsecurePackages = [ - # Keep evaluating home-assistant, which is transitively affected - # by home-assistant-chip-core consuming OpenSSL 1.1. Affects roughly - # 800 jobs. - "openssl-1.1.1w" - ]; }; } }: diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 04f10bb0fac13..8df22c6ced83a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -29,14 +29,6 @@ , nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; - permittedInsecurePackages = [ - # *Exceptionally*, those packages will be cached with their *secure* dependents - # because they will reach EOL in the middle of the 23.05 release - # and it will be too much painful for our users to recompile them - # for no real reason. - # Remove them for 23.11. - "openssl-1.1.1w" - ]; }; } # This flag, if set to true, will inhibit the use of `mapTestOn` |