diff options
Diffstat (limited to 'pkgs/servers')
572 files changed, 10564 insertions, 16245 deletions
diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 1c2a450b92706..44940468dc81f 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ numkem iagoq rhoriguchi ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; + mainProgram = "adguardhome"; }; } diff --git a/pkgs/servers/aeron/default.nix b/pkgs/servers/aeron/default.nix index 5ce49660f4af3..202f2748c4e80 100644 --- a/pkgs/servers/aeron/default.nix +++ b/pkgs/servers/aeron/default.nix @@ -1,138 +1,151 @@ { lib, stdenv, - fetchFromGitHub, + fetchMavenArtifact, jdk11, - gradle, - makeWrapper, - perl, - writeText + makeWrapper }: let pname = "aeron"; - version = "1.40.0"; + version = "1.42.1"; + groupId = "io.aeron"; + + aeronAll_1_40_0 = fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-all"; + hash = "sha512-NyhYaQqOWcSBwzwpje6DMAp36CEgGSNXBSdaRrDyP+Fn2Z0nvh5o2czog6GKKtbjH9inYfyyF/21gehfgLF6qA=="; + }; - src = fetchFromGitHub { - owner = "real-logic"; - repo = pname; - rev = version; - sha256 = "sha256-4C5YofA/wxwa7bfc6IqsDrw8CLQWKoVBCIe8Ec7ifAg="; + aeronAgent_1_40_0 = fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-agent"; + hash = "sha512-3XZ6XxPwlNchMe4p4MuDNTWntGokFPnetN7AUMlhXzIgeXBExXvn+BdxI2crfq/xgVGrF/hjHD2shwu2NBa0Tg=="; }; - deps = stdenv.mkDerivation { - name = "${pname}-deps"; - inherit src; + aeronArchive_1_40_0 = fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-archive"; + hash = "sha512-tmH+/020d1iNkGb8nvenDG9YU+H4PLuO2hSm2dULUIjSXX5AHLDkkrQ3uVQADV9koRNMtC4UXloqtqncay18kQ=="; + }; - nativeBuildInputs = [ - gradle - jdk11 - perl - ]; + aeronClient_1_40_0 = fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-client"; + hash = "sha512-y3/8Lu2EgMICRNPEWe0hrKpVhF35pDjCO6ip/Af9nPZ70ZRqGmlfEG7OzWVok11DuI8pYJ64jv6bEtUfSHTYXQ=="; + }; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d); - gradle \ - --console plain \ - --no-daemon \ - --system-prop org.gradle.java.home="${jdk11.home}" \ - --exclude-task javadoc \ - build - ''; - - # Mavenize dependency paths - # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar - installPhase = '' - find "$GRADLE_USER_HOME/caches/modules-2" -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ln -s "$out/com/squareup/okio/okio/2.10.0/okio-jvm-2.10.0.jar" "$out/com/squareup/okio/okio/2.10.0/okio-2.10.0.jar" - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-1hvQyEiCMfIw6wv9GOEehX0wrtBnAilVuTGUWAGoH6k="; - }; - - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - clear() - maven { url '${deps}' } - } - } - } - gradle.projectsLoaded { - rootProject.allprojects { - repositories { - clear() - maven { url '${deps}' } - } - } - } - ''; + aeronCluster_1_40_0 =fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-cluster"; + hash = "sha512-28m14Etjse3MVKBLvaQONujMfvdRQZG0ArezzVcjPEqVqTGd33mrqjPngALV8CG2nJTtcrJmsieRGLEosaXqTw=="; + }; - # replace buildSrc - buildSrc = writeText "build.gradle" '' - repositories { - clear() - maven { url '${deps}' } - } + aeronDriver_1_40_0 = fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-driver"; + hash = "sha512-SRWHMHR6J1YEtCbSHqSLYm3vo8XgkVXGK3cFQbONT60TZvawP5UlZs7e3eFNpu3qQSA4prqEjjWO9Xc9M/sjKw=="; + }; - dependencies { - implementation 'org.asciidoctor:asciidoctorj:2.5.5' - implementation 'org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r' - } - ''; + aeronSamples_1_40_0 = fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-samples"; + hash = "sha512-vyAq4mfLDDyaVk7wcIpPvPcxSt92Ek8mxfuuZwaX+0Wu9oJCpwbnjvS9+bvzcE4qSGxzY6eJIIX6nMdw0LkACg=="; + }; + + aeronAll_1_42_1 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + inherit version; + hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA=="; + }; + + aeronAgent_1_42_1 = fetchMavenArtifact { + inherit groupId; + version = "1.42.1"; + artifactId = "aeron-agent"; + hash = "sha512-3XZ6XvPwlNdiMe4p4MuDNTWntGokFPnetN7AUMlhXzIgeXBExXvn+BdxI2crfq/xgVGrF/hjHD2shwu2NBa0Tg=="; + }; -in stdenv.mkDerivation rec { + aeronArchive_1_42_1 = fetchMavenArtifact { + inherit groupId; + version = "1.42.1"; + artifactId = "aeron-archive"; + hash = "sha512-1DmeI9flgfzanbP4jSNUSAQAv2SGBvnlb3G4LbO1m+BN/gPn/nahvVHzotvGJjJA5b65DE1Sc5tqPnItRTK0zQ=="; + }; + + aeronClient_1_42_1 = fetchMavenArtifact { + inherit groupId; + version = "1.42.1"; + artifactId = "aeron-client"; + hash = "sha512-td2k2WNpaD3+2PNvlCCJ8cZRr615sFjngiQDKzuY2e9/de1OUwvER3zzVAFOonEIV+s5EhwVeQvWq3Wj5Uhadg=="; + }; + + aeronCluster_1_42_1 =fetchMavenArtifact { + inherit groupId; + version = "1.42.1"; + artifactId = "aeron-cluster"; + hash = "sha512-RiqGeY3pRqN6wWpeJqbeB1SCxrZWnQghrJlCGhew2M/GZAaWHkhhJs5haJqRvR5oOAbaI4RfIWvi5U7TiUo88g=="; + }; + + aeronDriver_1_42_1 = fetchMavenArtifact { + inherit groupId; + version = "1.42.1"; + artifactId = "aeron-driver"; + hash = "sha512-fKEN5oQCxD1h3qPODKkqFwYbKW6L03RFHNylpsYaNlztNODlCJd0CS5dBR6K8rbOdb2dVIXK/dW/IPBvOi5q/g=="; + }; + aeronSamples_1_42_1 = fetchMavenArtifact { + inherit groupId; + version = "1.42.1"; + artifactId = "aeron-samples"; + hash = "sha512-4JnHn22vJf2lmOg6ev5PD+/YiaL3KgfuyWAK92djX3KBVXO7ERMY2kH79dveVCJG1rbekvE1j1pnjaAIxwJcqg=="; + }; + + aeronAll = aeronAll_1_42_1; + aeronArchive = aeronArchive_1_42_1; + aeronClient = aeronClient_1_42_1; + aeronCluster = aeronCluster_1_42_1; + aeronDriver= aeronDriver_1_42_1; + aeronSamples = aeronSamples_1_42_1; - inherit pname src version; +in stdenv.mkDerivation { + + inherit pname version; buildInputs = [ - jdk11 + aeronAll + aeronArchive + aeronClient + aeronCluster + aeronDriver + aeronSamples ]; nativeBuildInputs = [ - gradle makeWrapper ]; - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - cp ${buildSrc} ./buildSrc/build.gradle - - gradle \ - --console plain \ - --exclude-task checkstyleMain \ - --exclude-task checkstyleGenerated \ - --exclude-task checkstyleGeneratedTest \ - --exclude-task checkstyleMain \ - --exclude-task checkstyleTest \ - --exclude-task javadoc \ - --exclude-task test \ - --init-script "${gradleInit}" \ - --no-daemon \ - --offline \ - --project-prop VERSION=${version} \ - --system-prop org.gradle.java.home="${jdk11.home}" \ - assemble - - runHook postBuild - ''; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; installPhase = '' runHook preInstall - install -D --mode=0444 --target-directory="$out/share/java" \ - "./aeron-all/build/libs/aeron-all-${version}.jar" \ - "./aeron-agent/build/libs/aeron-agent-${version}.jar" \ - "./aeron-archive/build/libs/aeron-archive-${version}.jar" \ - "./aeron-client/build/libs/aeron-client-${version}.jar" + mkdir --parents "$out/share/java" + ln --symbolic "${aeronAll.jar}" "$out/share/java/${pname}-all.jar" + ln --symbolic "${aeronArchive.jar}" "$out/share/java/${pname}-archive.jar" + ln --symbolic "${aeronClient.jar}" "$out/share/java/${pname}-client.jar" + ln --symbolic "${aeronCluster.jar}" "$out/share/java/${pname}-cluster.jar" + ln --symbolic "${aeronDriver.jar}" "$out/share/java/${pname}-driver.jar" + ln --symbolic "${aeronSamples.jar}" "$out/share/java/${pname}-samples.jar" runHook postInstall ''; @@ -141,7 +154,7 @@ in stdenv.mkDerivation rec { function wrap { makeWrapper "${jdk11}/bin/java" "$out/bin/$1" \ --add-flags "--add-opens java.base/sun.nio.ch=ALL-UNNAMED" \ - --add-flags "--class-path $out/share/java/aeron-all-${version}.jar" \ + --add-flags "--class-path ${aeronAll.jar}" \ --add-flags "$2" } @@ -150,30 +163,22 @@ in stdenv.mkDerivation rec { wrap "${pname}-archiving-media-driver" io.aeron.archive.ArchivingMediaDriver wrap "${pname}-archive-tool" io.aeron.archive.ArchiveTool wrap "${pname}-logging-agent" io.aeron.agent.DynamicLoggingAgent + wrap "${pname}-clustered-media-driver" io.aeron.cluster.ClusteredMediaDriver wrap "${pname}-cluster-tool" io.aeron.cluster.ClusterTool ''; - doCheck = true; - - checkPhase = '' - runHook preCheck - - gradle \ - --console plain \ - --init-script "${gradleInit}" \ - --no-daemon \ - --offline \ - --project-prop VERSION=${version} \ - --system-prop org.gradle.java.home="${jdk11.home}" \ - test - - runHook postCheck - ''; + passthru = { + jar = aeronAll.jar; + }; meta = with lib; { description = "Low-latency messaging library"; homepage = "https://aeron.io/"; license = licenses.asl20; + mainProgram = "${pname}-media-driver"; maintainers = [ maintainers.vaci ]; + sourceProvenance = [ + sourceTypes.binaryBytecode + ]; }; } diff --git a/pkgs/servers/alice-lg/default.nix b/pkgs/servers/alice-lg/default.nix index 5619928e45924..09412bb2ccf88 100644 --- a/pkgs/servers/alice-lg/default.nix +++ b/pkgs/servers/alice-lg/default.nix @@ -5,8 +5,9 @@ , stdenv , yarn , nodejs +, nixosTests , git -, fixup_yarn_lock +, prefetch-yarn-deps }: buildGoModule rec { @@ -32,7 +33,7 @@ buildGoModule rec { hash = "sha256-NeK9IM8E2IH09SVH9lMlV3taCmqwlroo4xzmv4Q01jI="; }; - nativeBuildInputs = [ nodejs yarn git ]; + nativeBuildInputs = [ nodejs yarn git prefetch-yarn-deps ]; configurePhase = '' runHook preConfigure @@ -43,7 +44,7 @@ buildGoModule rec { yarn config --offline set yarn-offline-mirror $yarnOfflineCache # Fixup "resolved"-entries in yarn.lock to match our offline cache - ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ @@ -74,11 +75,14 @@ buildGoModule rec { subPackages = [ "cmd/alice-lg" ]; doCheck = false; + passthru.tests = nixosTests.alice-lg; + meta = with lib; { homepage = "https://github.com/alice-lg/alice-lg"; description = "A looking-glass for BGP sessions"; changelog = "https://github.com/alice-lg/alice-lg/blob/main/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ janik ]; + mainProgram = "alice-lg"; }; } diff --git a/pkgs/servers/allmark/default.nix b/pkgs/servers/allmark/default.nix index 1e5b58dc6b19e..be87468b3a950 100644 --- a/pkgs/servers/allmark/default.nix +++ b/pkgs/servers/allmark/default.nix @@ -23,5 +23,6 @@ buildGoPackage rec { changelog = "https://github.com/andreaskoch/allmark/-/releases/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ urandom ]; + mainProgram = "allmark"; }; } diff --git a/pkgs/servers/alps/default.nix b/pkgs/servers/alps/default.nix index 5a296f9054519..70659f0c3c5e2 100644 --- a/pkgs/servers/alps/default.nix +++ b/pkgs/servers/alps/default.nix @@ -46,5 +46,6 @@ buildGoModule rec { homepage = "https://git.sr.ht/~migadu/alps"; license = licenses.mit; maintainers = with maintainers; [ booklearner madonius hmenke ]; + mainProgram = "alps"; }; } diff --git a/pkgs/servers/althttpd/default.nix b/pkgs/servers/althttpd/default.nix index 49d552f48dcf4..670a228a1e944 100644 --- a/pkgs/servers/althttpd/default.nix +++ b/pkgs/servers/althttpd/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.publicDomain; maintainers = with maintainers; [ siraben ]; platforms = platforms.all; + mainProgram = "althttpd"; }; } diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index a8bd3ba5a7a1b..eaf32020ef486 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.12.7"; + version = "3.12.12"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-EX7+f6R1dfU2hYt2ftEjpevmaUtAJ1wHcr+X30z5Bb8="; + hash = "sha256-lR/qwEoEH8v6oTTz6oAMlk2Tl2QSCEWV9rnU+gXX2KY="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; diff --git a/pkgs/servers/ankisyncd/default.nix b/pkgs/servers/ankisyncd/default.nix index cc3ae1c6ad72d..4a3c16c4b4ada 100644 --- a/pkgs/servers/ankisyncd/default.nix +++ b/pkgs/servers/ankisyncd/default.nix @@ -48,5 +48,6 @@ in rustPlatform.buildRustPackage { homepage = "https://github.com/ankicommunity/anki-sync-server-rs"; license = with licenses; [ agpl3Only ]; maintainers = with maintainers; [ martinetd ]; + mainProgram = "ankisyncd"; }; } diff --git a/pkgs/servers/antennas/default.nix b/pkgs/servers/antennas/default.nix index c381cde648795..f9db26ab93e44 100644 --- a/pkgs/servers/antennas/default.nix +++ b/pkgs/servers/antennas/default.nix @@ -33,5 +33,6 @@ buildNpmPackage rec { homepage = "https://github.com/jfarseneau/antennas"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bachp ]; + mainProgram = "antennas"; }; } diff --git a/pkgs/servers/apache-airflow/0001-Revert-fix-yarn-warning-from-d3-color-27139.patch b/pkgs/servers/apache-airflow/0001-Revert-fix-yarn-warning-from-d3-color-27139.patch deleted file mode 100644 index 4e6f56a7cf121..0000000000000 --- a/pkgs/servers/apache-airflow/0001-Revert-fix-yarn-warning-from-d3-color-27139.patch +++ /dev/null @@ -1,51 +0,0 @@ -From eca202d2893c9f2f91628ad6244b52cf7880bfcf Mon Sep 17 00:00:00 2001 -From: Graham Bennett <graham@grahambennett.org> -Date: Mon, 21 Nov 2022 15:39:54 +0000 -Subject: [PATCH] Revert "fix yarn warning from d3-color (#27139)" - -This reverts commit b9e133e40c2848b0d555051a99bf8d2816fd28a7. ---- - airflow/www/package.json | 3 --- - airflow/www/yarn.lock | 13 +++++++++---- - 2 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/airflow/www/package.json b/airflow/www/package.json -index f694089ee6..3d37ad4c46 100644 ---- a/airflow/www/package.json -+++ b/airflow/www/package.json -@@ -120,8 +120,5 @@ - "redoc": "^2.0.0-rc.72", - "type-fest": "^2.17.0", - "url-search-params-polyfill": "^8.1.0" -- }, -- "resolutions": { -- "d3-color": "^3.1.0" - } - } -diff --git a/airflow/www/yarn.lock b/airflow/www/yarn.lock -index bafd63a368..dad0ebabab 100644 ---- a/airflow/www/yarn.lock -+++ b/airflow/www/yarn.lock -@@ -4518,10 +4518,15 @@ d3-collection@1, d3-collection@^1.0.4: - resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e" - integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A== - --d3-color@1, "d3-color@1 - 2", d3-color@^3.1.0: -- version "3.1.0" -- resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2" -- integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA== -+d3-color@1: -+ version "1.4.1" -+ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a" -+ integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q== -+ -+"d3-color@1 - 2": -+ version "2.0.0" -+ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz#8d625cab42ed9b8f601a1760a389f7ea9189d62e" -+ integrity sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ== - - d3-contour@1: - version "1.3.2" --- -2.37.3 - diff --git a/pkgs/servers/apache-airflow/default.nix b/pkgs/servers/apache-airflow/default.nix index 7889cf516e7ac..223eabc595caa 100644 --- a/pkgs/servers/apache-airflow/default.nix +++ b/pkgs/servers/apache-airflow/default.nix @@ -7,6 +7,17 @@ let python = python3.override { packageOverrides = pySelf: pySuper: { + flask = pySuper.flask.overridePythonAttrs (o: rec { + version = "2.2.5"; + src = fetchPypi { + pname = "Flask"; + inherit version; + hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; + }; + nativeBuildInputs = (o.nativeBuildInputs or []) ++ [ + pySelf.setuptools + ]; + }); # flask-appbuilder doesn't work with sqlalchemy 2.x, flask-appbuilder 3.x # https://github.com/dpgaspar/Flask-AppBuilder/issues/2038 flask-appbuilder = pySuper.flask-appbuilder.overridePythonAttrs (o: { @@ -21,21 +32,27 @@ let }; format = "setuptools"; }); - # apache-airflow doesn't work with sqlalchemy 2.x - # https://github.com/apache/airflow/issues/28723 - sqlalchemy = pySuper.sqlalchemy.overridePythonAttrs (o: rec { - version = "1.4.48"; + httpcore = pySuper.httpcore.overridePythonAttrs (o: rec { + # nullify upstream's pytest flags which cause + # "TLS/SSL connection has been closed (EOF)" + # with pytest-httpbin 1.x + preCheck = '' + substituteInPlace pyproject.toml \ + --replace '[tool.pytest.ini_options]' '[tool.notpytest.ini_options]' + ''; + }); + pytest-httpbin = pySuper.pytest-httpbin.overridePythonAttrs (o: rec { + version = "1.0.2"; src = fetchFromGitHub { - owner = "sqlalchemy"; - repo = "sqlalchemy"; - rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-qyD3uoxEnD2pdVvwpUlSqHB3drD4Zg/+ov4CzLFIlLs="; + owner = "kevin1024"; + repo = "pytest-httpbin"; + rev = "refs/tags/v${version}"; + hash = "sha256-S4ThQx4H3UlKhunJo35esPClZiEn7gX/Qwo4kE1QMTI="; }; - disabledTestPaths = [ - "test/aaa_profiling" - "test/ext/mypy" - ]; }); + # apache-airflow doesn't work with sqlalchemy 2.x + # https://github.com/apache/airflow/issues/28723 + sqlalchemy = pySuper.sqlalchemy_1_4; apache-airflow = pySelf.callPackage ./python-package.nix { }; }; diff --git a/pkgs/servers/apache-airflow/providers.nix b/pkgs/servers/apache-airflow/providers.nix index 683d1b95a0da8..00b31ca04cbdf 100644 --- a/pkgs/servers/apache-airflow/providers.nix +++ b/pkgs/servers/apache-airflow/providers.nix @@ -9,11 +9,11 @@ imports = [ "airflow.providers.alibaba.cloud.hooks.oss" "airflow.providers.alibaba.cloud.operators.oss" ]; }; amazon = { - deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mypy-boto3-appflow" "mypy-boto3-rds" "mypy-boto3-redshift-data" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.amazon.aws.hooks.appflow" "airflow.providers.amazon.aws.hooks.athena" "airflow.providers.amazon.aws.hooks.base_aws" "airflow.providers.amazon.aws.hooks.batch_client" "airflow.providers.amazon.aws.hooks.batch_waiters" "airflow.providers.amazon.aws.hooks.cloud_formation" "airflow.providers.amazon.aws.hooks.datasync" "airflow.providers.amazon.aws.hooks.dms" "airflow.providers.amazon.aws.hooks.dynamodb" "airflow.providers.amazon.aws.hooks.ec2" "airflow.providers.amazon.aws.hooks.ecs" "airflow.providers.amazon.aws.hooks.eks" "airflow.providers.amazon.aws.hooks.elasticache_replication_group" "airflow.providers.amazon.aws.hooks.emr" "airflow.providers.amazon.aws.hooks.emr" "airflow.providers.amazon.aws.hooks.glacier" "airflow.providers.amazon.aws.hooks.glue" "airflow.providers.amazon.aws.hooks.glue_catalog" "airflow.providers.amazon.aws.hooks.glue_crawler" "airflow.providers.amazon.aws.hooks.kinesis" "airflow.providers.amazon.aws.hooks.lambda_function" "airflow.providers.amazon.aws.hooks.logs" "airflow.providers.amazon.aws.hooks.quicksight" "airflow.providers.amazon.aws.hooks.rds" "airflow.providers.amazon.aws.hooks.redshift_cluster" "airflow.providers.amazon.aws.hooks.redshift_data" "airflow.providers.amazon.aws.hooks.redshift_sql" "airflow.providers.amazon.aws.hooks.s3" "airflow.providers.amazon.aws.hooks.sagemaker" "airflow.providers.amazon.aws.hooks.secrets_manager" "airflow.providers.amazon.aws.hooks.ses" "airflow.providers.amazon.aws.hooks.sns" "airflow.providers.amazon.aws.hooks.sqs" "airflow.providers.amazon.aws.hooks.step_function" "airflow.providers.amazon.aws.hooks.sts" "airflow.providers.amazon.aws.operators.appflow" "airflow.providers.amazon.aws.operators.athena" "airflow.providers.amazon.aws.operators.aws_lambda" "airflow.providers.amazon.aws.operators.batch" "airflow.providers.amazon.aws.operators.cloud_formation" "airflow.providers.amazon.aws.operators.datasync" "airflow.providers.amazon.aws.operators.dms" "airflow.providers.amazon.aws.operators.ec2" "airflow.providers.amazon.aws.operators.ecs" "airflow.providers.amazon.aws.operators.eks" "airflow.providers.amazon.aws.operators.emr" "airflow.providers.amazon.aws.operators.emr" "airflow.providers.amazon.aws.operators.glacier" "airflow.providers.amazon.aws.operators.glue" "airflow.providers.amazon.aws.operators.glue_crawler" "airflow.providers.amazon.aws.operators.lambda_function" "airflow.providers.amazon.aws.operators.quicksight" "airflow.providers.amazon.aws.operators.rds" "airflow.providers.amazon.aws.operators.redshift_cluster" "airflow.providers.amazon.aws.operators.redshift_data" "airflow.providers.amazon.aws.operators.redshift_sql" "airflow.providers.amazon.aws.operators.s3" "airflow.providers.amazon.aws.operators.sagemaker" "airflow.providers.amazon.aws.operators.sns" "airflow.providers.amazon.aws.operators.sqs" "airflow.providers.amazon.aws.operators.step_function" ]; }; apache_beam = { - deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mypy-boto3-appflow" "mypy-boto3-rds" "mypy-boto3-redshift-data" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.apache.beam.hooks.beam" "airflow.providers.apache.beam.operators.beam" ]; }; apache_cassandra = { @@ -25,7 +25,7 @@ imports = [ "airflow.providers.apache.drill.hooks.drill" "airflow.providers.apache.drill.operators.drill" ]; }; apache_druid = { - deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pydruid" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mypy-boto3-appflow" "mypy-boto3-rds" "mypy-boto3-redshift-data" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pydruid" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.apache.druid.hooks.druid" "airflow.providers.apache.druid.operators.druid" "airflow.providers.apache.druid.operators.druid_check" ]; }; apache_hdfs = { @@ -33,7 +33,7 @@ imports = [ "airflow.providers.apache.hdfs.hooks.hdfs" "airflow.providers.apache.hdfs.hooks.webhdfs" ]; }; apache_hive = { - deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mypy-boto3-appflow" "mypy-boto3-rds" "mypy-boto3-redshift-data" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.apache.hive.hooks.hive" "airflow.providers.apache.hive.operators.hive" "airflow.providers.apache.hive.operators.hive_stats" ]; }; apache_kylin = { @@ -133,7 +133,7 @@ imports = [ "airflow.providers.github.hooks.github" "airflow.providers.github.operators.github" ]; }; google = { - deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mypy-boto3-appflow" "mypy-boto3-rds" "mypy-boto3-redshift-data" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.google.ads.hooks.ads" "airflow.providers.google.ads.operators.ads" "airflow.providers.google.cloud.hooks.automl" "airflow.providers.google.cloud.hooks.bigquery" "airflow.providers.google.cloud.hooks.bigquery_dts" "airflow.providers.google.cloud.hooks.bigtable" "airflow.providers.google.cloud.hooks.cloud_build" "airflow.providers.google.cloud.hooks.cloud_composer" "airflow.providers.google.cloud.hooks.cloud_memorystore" "airflow.providers.google.cloud.hooks.cloud_sql" "airflow.providers.google.cloud.hooks.cloud_storage_transfer_service" "airflow.providers.google.cloud.hooks.compute" "airflow.providers.google.cloud.hooks.compute_ssh" "airflow.providers.google.cloud.hooks.datacatalog" "airflow.providers.google.cloud.hooks.dataflow" "airflow.providers.google.cloud.hooks.dataform" "airflow.providers.google.cloud.hooks.datafusion" "airflow.providers.google.cloud.hooks.dataplex" "airflow.providers.google.cloud.hooks.dataprep" "airflow.providers.google.cloud.hooks.dataproc" "airflow.providers.google.cloud.hooks.dataproc_metastore" "airflow.providers.google.cloud.hooks.datastore" "airflow.providers.google.cloud.hooks.dlp" "airflow.providers.google.cloud.hooks.functions" "airflow.providers.google.cloud.hooks.gcs" "airflow.providers.google.cloud.hooks.gdm" "airflow.providers.google.cloud.hooks.kms" "airflow.providers.google.cloud.hooks.kubernetes_engine" "airflow.providers.google.cloud.hooks.life_sciences" "airflow.providers.google.cloud.hooks.looker" "airflow.providers.google.cloud.hooks.mlengine" "airflow.providers.google.cloud.hooks.natural_language" "airflow.providers.google.cloud.hooks.os_login" "airflow.providers.google.cloud.hooks.pubsub" "airflow.providers.google.cloud.hooks.secret_manager" "airflow.providers.google.cloud.hooks.spanner" "airflow.providers.google.cloud.hooks.speech_to_text" "airflow.providers.google.cloud.hooks.stackdriver" "airflow.providers.google.cloud.hooks.tasks" "airflow.providers.google.cloud.hooks.text_to_speech" "airflow.providers.google.cloud.hooks.translate" "airflow.providers.google.cloud.hooks.vertex_ai.auto_ml" "airflow.providers.google.cloud.hooks.vertex_ai.batch_prediction_job" "airflow.providers.google.cloud.hooks.vertex_ai.custom_job" "airflow.providers.google.cloud.hooks.vertex_ai.dataset" "airflow.providers.google.cloud.hooks.vertex_ai.endpoint_service" "airflow.providers.google.cloud.hooks.vertex_ai.hyperparameter_tuning_job" "airflow.providers.google.cloud.hooks.vertex_ai.model_service" "airflow.providers.google.cloud.hooks.video_intelligence" "airflow.providers.google.cloud.hooks.vision" "airflow.providers.google.cloud.hooks.workflows" "airflow.providers.google.cloud.operators.automl" "airflow.providers.google.cloud.operators.bigquery" "airflow.providers.google.cloud.operators.bigquery_dts" "airflow.providers.google.cloud.operators.bigtable" "airflow.providers.google.cloud.operators.cloud_build" "airflow.providers.google.cloud.operators.cloud_composer" "airflow.providers.google.cloud.operators.cloud_memorystore" "airflow.providers.google.cloud.operators.cloud_sql" "airflow.providers.google.cloud.operators.cloud_storage_transfer_service" "airflow.providers.google.cloud.operators.compute" "airflow.providers.google.cloud.operators.datacatalog" "airflow.providers.google.cloud.operators.dataflow" "airflow.providers.google.cloud.operators.dataform" "airflow.providers.google.cloud.operators.datafusion" "airflow.providers.google.cloud.operators.dataplex" "airflow.providers.google.cloud.operators.dataprep" "airflow.providers.google.cloud.operators.dataproc" "airflow.providers.google.cloud.operators.dataproc_metastore" "airflow.providers.google.cloud.operators.datastore" "airflow.providers.google.cloud.operators.dlp" "airflow.providers.google.cloud.operators.functions" "airflow.providers.google.cloud.operators.gcs" "airflow.providers.google.cloud.operators.kubernetes_engine" "airflow.providers.google.cloud.operators.life_sciences" "airflow.providers.google.cloud.operators.looker" "airflow.providers.google.cloud.operators.mlengine" "airflow.providers.google.cloud.operators.natural_language" "airflow.providers.google.cloud.operators.pubsub" "airflow.providers.google.cloud.operators.spanner" "airflow.providers.google.cloud.operators.speech_to_text" "airflow.providers.google.cloud.operators.stackdriver" "airflow.providers.google.cloud.operators.tasks" "airflow.providers.google.cloud.operators.text_to_speech" "airflow.providers.google.cloud.operators.translate" "airflow.providers.google.cloud.operators.translate_speech" "airflow.providers.google.cloud.operators.translate_speech" "airflow.providers.google.cloud.operators.vertex_ai.auto_ml" "airflow.providers.google.cloud.operators.vertex_ai.batch_prediction_job" "airflow.providers.google.cloud.operators.vertex_ai.custom_job" "airflow.providers.google.cloud.operators.vertex_ai.dataset" "airflow.providers.google.cloud.operators.vertex_ai.endpoint_service" "airflow.providers.google.cloud.operators.vertex_ai.hyperparameter_tuning_job" "airflow.providers.google.cloud.operators.vertex_ai.model_service" "airflow.providers.google.cloud.operators.video_intelligence" "airflow.providers.google.cloud.operators.vision" "airflow.providers.google.cloud.operators.workflows" "airflow.providers.google.common.hooks.base_google" "airflow.providers.google.common.hooks.discovery_api" "airflow.providers.google.firebase.hooks.firestore" "airflow.providers.google.firebase.operators.firestore" "airflow.providers.google.leveldb.hooks.leveldb" "airflow.providers.google.leveldb.operators.leveldb" "airflow.providers.google.marketing_platform.hooks.analytics" "airflow.providers.google.marketing_platform.hooks.campaign_manager" "airflow.providers.google.marketing_platform.hooks.display_video" "airflow.providers.google.marketing_platform.hooks.search_ads" "airflow.providers.google.marketing_platform.operators.analytics" "airflow.providers.google.marketing_platform.operators.campaign_manager" "airflow.providers.google.marketing_platform.operators.display_video" "airflow.providers.google.marketing_platform.operators.search_ads" "airflow.providers.google.suite.hooks.calendar" "airflow.providers.google.suite.hooks.drive" "airflow.providers.google.suite.hooks.sheets" "airflow.providers.google.suite.operators.sheets" ]; }; grpc = { @@ -141,7 +141,7 @@ imports = [ "airflow.providers.grpc.hooks.grpc" "airflow.providers.grpc.operators.grpc" ]; }; hashicorp = { - deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "hvac" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "hvac" "json-merge-patch" "jsonpath-ng" "kubernetes" "mypy-boto3-appflow" "mypy-boto3-rds" "mypy-boto3-redshift-data" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.hashicorp.hooks.vault" ]; }; http = { @@ -165,7 +165,7 @@ imports = [ "airflow.providers.jenkins.hooks.jenkins" "airflow.providers.jenkins.operators.jenkins_job_trigger" ]; }; microsoft_azure = { - deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mypy-boto3-appflow" "mypy-boto3-rds" "mypy-boto3-redshift-data" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.microsoft.azure.hooks.adx" "airflow.providers.microsoft.azure.hooks.asb" "airflow.providers.microsoft.azure.hooks.base_azure" "airflow.providers.microsoft.azure.hooks.batch" "airflow.providers.microsoft.azure.hooks.container_instance" "airflow.providers.microsoft.azure.hooks.container_registry" "airflow.providers.microsoft.azure.hooks.container_volume" "airflow.providers.microsoft.azure.hooks.cosmos" "airflow.providers.microsoft.azure.hooks.data_factory" "airflow.providers.microsoft.azure.hooks.data_lake" "airflow.providers.microsoft.azure.hooks.fileshare" "airflow.providers.microsoft.azure.hooks.synapse" "airflow.providers.microsoft.azure.hooks.wasb" "airflow.providers.microsoft.azure.operators.adls" "airflow.providers.microsoft.azure.operators.adx" "airflow.providers.microsoft.azure.operators.asb" "airflow.providers.microsoft.azure.operators.batch" "airflow.providers.microsoft.azure.operators.container_instances" "airflow.providers.microsoft.azure.operators.cosmos" "airflow.providers.microsoft.azure.operators.data_factory" "airflow.providers.microsoft.azure.operators.synapse" "airflow.providers.microsoft.azure.operators.wasb_delete_blob" ]; }; microsoft_mssql = { @@ -185,7 +185,7 @@ imports = [ "airflow.providers.mongo.hooks.mongo" ]; }; mysql = { - deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mypy-boto3-appflow" "mypy-boto3-rds" "mypy-boto3-redshift-data" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.mysql.hooks.mysql" "airflow.providers.mysql.operators.mysql" ]; }; neo4j = { @@ -221,15 +221,15 @@ imports = [ "airflow.providers.plexus.hooks.plexus" "airflow.providers.plexus.operators.job" ]; }; postgres = { - deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mypy-boto3-appflow" "mypy-boto3-rds" "mypy-boto3-redshift-data" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.postgres.hooks.postgres" "airflow.providers.postgres.operators.postgres" ]; }; presto = { - deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mypy-boto3-appflow" "mypy-boto3-rds" "mypy-boto3-redshift-data" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.presto.hooks.presto" ]; }; qubole = { - deps = [ "qds_sdk" ]; + deps = [ "qds-sdk" ]; imports = [ "airflow.providers.qubole.hooks.qubole" "airflow.providers.qubole.hooks.qubole_check" "airflow.providers.qubole.operators.qubole" "airflow.providers.qubole.operators.qubole_check" ]; }; redis = { @@ -289,7 +289,7 @@ imports = [ "airflow.providers.telegram.hooks.telegram" "airflow.providers.telegram.operators.telegram" ]; }; trino = { - deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; + deps = [ "adal" "apache-beam" "asgiref" "azure-batch" "azure-cosmos" "azure-datalake-store" "azure-identity" "azure-keyvault-secrets" "azure-mgmt-containerinstance" "azure-mgmt-datafactory" "azure-mgmt-datalake-store" "azure-mgmt-resource" "azure-servicebus" "azure-storage-blob" "azure-storage-common" "azure-storage-file" "azure-synapse-spark" "boto3" "cassandra-driver" "cryptography" "dnspython" "google-api-core" "google-api-python-client" "google-auth" "google-auth-httplib2" "google-cloud-automl" "google-cloud-bigquery-datatransfer" "google-cloud-bigtable" "google-cloud-compute" "google-cloud-container" "google-cloud-datacatalog" "google-cloud-dataproc" "google-cloud-dlp" "google-cloud-kms" "google-cloud-language" "google-cloud-logging" "google-cloud-monitoring" "google-cloud-pubsub" "google-cloud-redis" "google-cloud-secret-manager" "google-cloud-spanner" "google-cloud-speech" "google-cloud-storage" "google-cloud-tasks" "google-cloud-texttospeech" "google-cloud-translate" "google-cloud-videointelligence" "google-cloud-vision" "grpcio-gcp" "httpx" "json-merge-patch" "jsonpath-ng" "kubernetes" "mypy-boto3-appflow" "mypy-boto3-rds" "mypy-boto3-redshift-data" "mysqlclient" "oracledb" "pandas" "paramiko" "proto-plus" "protobuf" "psycopg2" "pymongo" "pyopenssl" "pysftp" "redshift-connector" "simple-salesforce" "smbprotocol" "sshtunnel" "thrift" "vertica-python" ]; imports = [ "airflow.providers.trino.hooks.trino" "airflow.providers.trino.operators.trino" ]; }; vertica = { diff --git a/pkgs/servers/apache-airflow/python-package.nix b/pkgs/servers/apache-airflow/python-package.nix index 8ebb930188f9c..ac39c99ba7d18 100644 --- a/pkgs/servers/apache-airflow/python-package.nix +++ b/pkgs/servers/apache-airflow/python-package.nix @@ -87,7 +87,7 @@ , enabledProviders ? [] }: let - version = "2.7.1"; + version = "2.7.3"; airflow-src = fetchFromGitHub rec { owner = "apache"; @@ -96,7 +96,7 @@ let # Download using the git protocol rather than using tarballs, because the # GitHub archive tarballs don't appear to include tests forceFetchGit = true; - hash = "sha256-TxlOdazdaEKt9U+t/zjRChUABLhVTqXvH8nUbYrRrQs="; + hash = "sha256-+YbiKFZLigSDbHPaUKIl97kpezW1rIt/j09MMa6lwhQ="; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. @@ -110,7 +110,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-ZUvjSA6BKj27xTNieVBBXm6oCTAWIvxk2menQMt91uE="; + hash = "sha256-WQKuQgNp35fU6z7owequXOSwoUGJDJYcUgkjPDMOops="; }; distPhase = "true"; diff --git a/pkgs/servers/ariang/default.nix b/pkgs/servers/ariang/default.nix index bb0058833e4f7..fc2618ab058ee 100644 --- a/pkgs/servers/ariang/default.nix +++ b/pkgs/servers/ariang/default.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "ariang"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "mayswind"; repo = "AriaNg"; rev = version; - hash = "sha256-+wwtBEZgU83FNQ5f9oQh5G4RQdCODzoqcV1XfwWKUKg="; + hash = "sha256-p9EwlmI/xO3dX5ZpbDVVxajQySGYcJj5G57F84zYAD0="; }; - npmDepsHash = "sha256-KfzD8g6eAWvNjrGaVNt5x4I9o2E273S02o4nkn7BFSs="; + npmDepsHash = "sha256-xX8hD303CWlpsYoCfwHWgOuEFSp1A+M1S53H+4pyAUQ="; makeCacheWritable = true; diff --git a/pkgs/servers/asouldocs/default.nix b/pkgs/servers/asouldocs/default.nix index cf0c5f48e0070..df6a5e3012fdb 100644 --- a/pkgs/servers/asouldocs/default.nix +++ b/pkgs/servers/asouldocs/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://asouldocs.dev/"; license = licenses.mit; maintainers = with maintainers; [ ivar anthonyroussel ]; + mainProgram = "asouldocs"; }; } diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 15dbfc4cba999..4102f60c716f4 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -36,25 +36,6 @@ }: let - # remove when upgrading to pjsip >2.13 - pjsip_2_13_patches = [ - (fetchpatch { - name = "CVE-2022-23537.patch"; - url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch"; - sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA="; - }) - (fetchpatch { - name = "CVE-2022-23547.patch"; - url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch"; - sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k="; - }) - (fetchpatch { - name = "CVE-2023-27585.patch"; - url = "https://github.com/pjsip/pjproject/commit/d1c5e4da5bae7f220bc30719888bb389c905c0c5.patch"; - hash = "sha256-+yyKKTKG2FnfyLWnc4S80vYtDzmiu9yRmuqb5eIulPg="; - }) - ]; - common = { version, sha256, externals, pjsip_patches ? [ ] }: stdenv.mkDerivation { inherit version; pname = "asterisk" @@ -161,12 +142,12 @@ let }; }; - pjproject_2_13 = fetchurl + pjproject_2_13_1 = fetchurl { - url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.13/pjproject-2.13.tar.bz2"; - hash = "sha256-Zj93PUAct13KVR5taOWEbQdKq76wicaBTNHpHC0rICY="; + url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.13.1/pjproject-2.13.1.tar.bz2"; + hash = "sha256-cOBRvO+B9fGt4UVYAHQQwBsc2cUF7Pu1GRsjAF7BE1g="; } // { - pjsip_patches = pjsip_2_13_patches; + pjsip_patches = [ ]; }; mp3-202 = fetchsvn { @@ -187,7 +168,7 @@ let versions = lib.mapAttrs (_: { version, sha256 }: let - pjsip = pjproject_2_13; + pjsip = pjproject_2_13_1; in common { inherit version sha256; diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json index 1e6e4e4417efe..039427d233690 100644 --- a/pkgs/servers/asterisk/versions.json +++ b/pkgs/servers/asterisk/versions.json @@ -1,18 +1,14 @@ { - "asterisk_16": { - "sha256": "f8448e8784df7fac019e459bf7c82529d80afe64ae97d73d40e6aa0e4fb39724", - "version": "16.30.0" - }, "asterisk_18": { - "sha256": "66f0e55d84f9e5bf4e79a56255d35a034448acce00d219c3bf4930b1ebb0e88e", - "version": "18.17.1" - }, - "asterisk_19": { - "sha256": "f0c56d1f8e39e0427455edfe25d24ff088c756bdc32dd1278c9f7a320815cbaa", - "version": "19.8.0" + "sha256": "7ee8499fc704e5fcae57c5f195f806f2ce4da7ae5f62faa43e73b3e6d218747f", + "version": "18.20.2" }, "asterisk_20": { - "sha256": "df12e47000fbac42bb780bb06172aa8bb8ac26faf77cc9f95184695b0cec69c3", - "version": "20.2.1" + "sha256": "8f68e1789dfb8aa04b0eba87ea1d599a62e088ddd20926afc997f36b455e1859", + "version": "20.5.2" + }, + "asterisk_21": { + "sha256": "dd121d0614088567f8434aa241b17229acc6a3462989c9257ffbc171aaecf98f", + "version": "21.0.2" } } diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index b6af64e984e79..b7196709b4223 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -6,13 +6,7 @@ assert withMysql -> (mysql_jdbc != null); -let - optionalWarning = cond: msg: - if cond then lib.warn msg - else lib.id; -in - -optionalWarning (crowdProperties != null) "Using `crowdProperties` is deprecated!" +lib.warnIf (crowdProperties != null) "Using `crowdProperties` is deprecated!" (stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; version = "7.19.14"; diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 4544ea56ff213..6c87e3c071157 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -1,13 +1,7 @@ { lib, stdenv, fetchurl, home ? "/var/lib/crowd" , port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }: -let - optionalWarning = cond: msg: - if cond then lib.warn msg - else lib.id; -in - -optionalWarning (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` is deprecated!" +lib.warnIf (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` is deprecated!" (stdenv.mkDerivation rec { pname = "atlassian-crowd"; version = "5.0.1"; diff --git a/pkgs/servers/audiobookshelf/default.nix b/pkgs/servers/audiobookshelf/default.nix deleted file mode 100644 index 500f0882796e6..0000000000000 --- a/pkgs/servers/audiobookshelf/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - lib, - stdenv, - pkgs, - fetchFromGitHub, - runCommand, - buildNpmPackage, - nodejs_18, - tone, - ffmpeg-full, - util-linux, - python3, - getopt -}: - -let - nodejs = nodejs_18; - - pname = "audiobookshelf"; - version = "2.5.0"; - - src = fetchFromGitHub { - owner = "advplyr"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-yPDByM09rc9zRLh0ONcY5bScY4NOrKDv0Pdwo97Czcs="; - }; - - client = buildNpmPackage { - pname = "${pname}-client"; - inherit version; - - src = runCommand "cp-source" {} '' - cp -r ${src}/client $out - ''; - - NODE_OPTIONS = "--openssl-legacy-provider"; - - npmBuildScript = "generate"; - npmDepsHash = "sha256-ZNkHDNjaQbUt3oWnNIYPYkcvjelieY4RJxNSbzR1+JM="; - }; - - wrapper = import ./wrapper.nix { - inherit stdenv ffmpeg-full tone pname nodejs getopt; - }; - -in buildNpmPackage { - inherit pname version src; - - buildInputs = [ util-linux ]; - nativeBuildInputs = [ python3 ]; - - dontNpmBuild = true; - npmInstallFlags = [ "--only-production" ]; - npmDepsHash = "sha256-PVgK8R8sf16KKQS/mPXtvit9CW9+4Gc9Onpaw+SSgNI="; - - installPhase = '' - mkdir -p $out/opt/client - cp -r index.js server package* node_modules $out/opt/ - cp -r ${client}/lib/node_modules/${pname}-client/dist $out/opt/client/dist - mkdir $out/bin - - echo '${wrapper}' > $out/bin/${pname} - echo " exec ${nodejs}/bin/node $out/opt/index.js" >> $out/bin/${pname} - - chmod +x $out/bin/${pname} - ''; - - meta = with lib; { - homepage = "https://www.audiobookshelf.org/"; - description = "Self-hosted audiobook and podcast server"; - license = licenses.gpl3; - maintainers = [ maintainers.jvanbruegge ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/servers/audiobookshelf/wrapper.nix b/pkgs/servers/audiobookshelf/wrapper.nix deleted file mode 100644 index 787ee5ac49178..0000000000000 --- a/pkgs/servers/audiobookshelf/wrapper.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, ffmpeg-full, tone, pname, nodejs, getopt }: '' - #!${stdenv.shell} - - port=8000 - host=0.0.0.0 - config=$(pwd)/config - metadata=$(pwd)/metadata - - LONGOPTS=host:,port:,config:,metadata:,help - args=$(${getopt}/bin/getopt -l "$LONGOPTS" -o h -- "$@") - - eval set -- "$args" - - while [ $# -ge 1 ]; do - case "$1" in - --) - # No more options left. - shift - break - ;; - --host) - host="$2" - shift - ;; - --port) - port="$2" - shift - ;; - --config) - if [[ "''${2:0:1}" = "/" ]]; then - config="$2" - else - config="$(pwd)/$2" - fi - shift - ;; - --metadata) - if [[ "''${2:0:1}" = "/" ]]; then - metadata="$2" - else - metadata="$(pwd)/$2" - fi - shift - ;; - --help|-h) - echo "Usage: audiobookshelf [--host <host>] [--port <port>] [--metadata <dir>] [--config <dir>]" - exit 0 - ;; - esac - shift - done - - NODE_ENV=production \ - SOURCE=nixpkgs \ - FFMPEG_PATH=${ffmpeg-full}/bin/ffmpeg \ - FFPROBE_PATH=${ffmpeg-full}/bin/ffprobe \ - TONE_PATH=${tone}/bin/tone \ - CONFIG_PATH="$config" \ - METADATA_PATH="$metadata" \ - PORT="$port" \ - HOST="$host" \'' diff --git a/pkgs/servers/authelia/change-web-out-dir.patch b/pkgs/servers/authelia/change-web-out-dir.patch deleted file mode 100644 index 56e73d64fbc41..0000000000000 --- a/pkgs/servers/authelia/change-web-out-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/vite.config.ts b/vite.config.ts -index 659ba3e1..1f0afa5c 100644 ---- a/vite.config.ts -+++ b/vite.config.ts -@@ -37,7 +37,7 @@ export default defineConfig(({ mode }) => { - base: "./", - build: { - sourcemap, -- outDir: "../internal/server/public_html", -+ outDir: "dist", - emptyOutDir: true, - assetsDir: "static", - rollupOptions: { diff --git a/pkgs/servers/authelia/default.nix b/pkgs/servers/authelia/default.nix index 4a2ed9bd57296..2eb1b4f6ac785 100644 --- a/pkgs/servers/authelia/default.nix +++ b/pkgs/servers/authelia/default.nix @@ -73,5 +73,6 @@ buildGoModule rec { ''; license = licenses.asl20; maintainers = with maintainers; [ jk raitobezarius dit7ya ]; + mainProgram = "authelia"; }; } diff --git a/pkgs/servers/authelia/update.sh b/pkgs/servers/authelia/update.sh index c51272ea9193d..17eb997a94c81 100755 --- a/pkgs/servers/authelia/update.sh +++ b/pkgs/servers/authelia/update.sh @@ -10,10 +10,16 @@ NIXPKGS_ROOT=$(realpath "$NIXPKGS_ROOT") instantiateClean() { nix-instantiate --eval --strict -E "with import ./. {}; $1" | cut -d\" -f2 } -fetchNewSha() { +fetchNewHash() { set +eo pipefail - nix-build -A "$1" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g' + HASH="$(nix-build -A "$1" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')" set -eo pipefail + if [ -z "$HASH" ]; then + echo "Could not generate hash" >&2 + exit 1 + else + echo "$HASH" + fi } replace() { sed -i "s@$1@$2@g" "$3" @@ -49,7 +55,7 @@ replace "$OLD_VERSION" "$NEW_VERSION" "$DRV_DIR/sources.nix" OLD_SRC_HASH="$(instantiateClean authelia.src.outputHash)" echo "Old src hash $OLD_SRC_HASH" replace "$OLD_SRC_HASH" "$TMP_HASH" "$DRV_DIR/sources.nix" -NEW_SRC_HASH="$(fetchNewSha authelia.src)" +NEW_SRC_HASH="$(fetchNewHash authelia.src)" echo "New src hash $NEW_SRC_HASH" replace "$TMP_HASH" "$NEW_SRC_HASH" "$DRV_DIR/sources.nix" @@ -61,18 +67,18 @@ clean_up() { } trap clean_up EXIT -# OLD_PWD=$PWD -# cd $WEB_DIR -# OUT=$(nix-build -E "with import $NIXPKGS_ROOT {}; authelia.src" --no-out-link) -# cp -r $OUT/web/package.json . -# npm install --package-lock-only --legacy-peer-deps --ignore-scripts -# mv package-lock.json "$DRV_DIR/" +OLD_PWD=$PWD +cd $WEB_DIR +OUT=$(nix-build -E "with import $NIXPKGS_ROOT {}; authelia.src" --no-out-link) +cp -r $OUT/web/package.json . +npm install --package-lock-only --legacy-peer-deps --ignore-scripts +mv package-lock.json "$DRV_DIR/" +cd $OLD_PWD -# cd $OLD_PWD OLD_NPM_DEPS_HASH="$(instantiateClean authelia.web.npmDepsHash)" echo "Old npm deps hash $OLD_NPM_DEPS_HASH" replace "$OLD_NPM_DEPS_HASH" "$TMP_HASH" "$DRV_DIR/sources.nix" -NEW_NPM_DEPS_HASH="$(fetchNewSha authelia.web)" +NEW_NPM_DEPS_HASH="$(fetchNewHash authelia.web)" echo "New npm deps hash $NEW_NPM_DEPS_HASH" replace "$TMP_HASH" "$NEW_NPM_DEPS_HASH" "$DRV_DIR/sources.nix" clean_up @@ -80,6 +86,6 @@ clean_up OLD_GO_VENDOR_HASH="$(instantiateClean authelia.vendorHash)" echo "Old go vendor hash $OLD_GO_VENDOR_HASH" replace "$OLD_GO_VENDOR_HASH" "$TMP_HASH" "$DRV_DIR/sources.nix" -NEW_GO_VENDOR_HASH="$(fetchNewSha authelia.goModules)" +NEW_GO_VENDOR_HASH="$(fetchNewHash authelia.goModules)" echo "New go vendor hash $NEW_GO_VENDOR_HASH" replace "$TMP_HASH" "$NEW_GO_VENDOR_HASH" "$DRV_DIR/sources.nix" diff --git a/pkgs/servers/authelia/web.nix b/pkgs/servers/authelia/web.nix index 0153358ea07f5..74ba11325f87d 100644 --- a/pkgs/servers/authelia/web.nix +++ b/pkgs/servers/authelia/web.nix @@ -9,11 +9,9 @@ buildNpmPackage { sourceRoot = "${src.name}/web"; - patches = [ - ./change-web-out-dir.patch - ]; - postPatch = '' + substituteInPlace ./vite.config.ts \ + --replace 'outDir: "../internal/server/public_html"' 'outDir: "dist"' cp ${./package-lock.json} ./package-lock.json ''; diff --git a/pkgs/servers/baserow/default.nix b/pkgs/servers/baserow/default.nix index 34fba145c9c4b..ea46b4bfb8f28 100644 --- a/pkgs/servers/baserow/default.nix +++ b/pkgs/servers/baserow/default.nix @@ -122,7 +122,7 @@ with python.pkgs; buildPythonApplication rec { pytest-django pytest-unordered responses - zope_interface + zope-interface ]; fixupPhase = '' @@ -154,5 +154,6 @@ with python.pkgs; buildPythonApplication rec { homepage = "https://baserow.io"; license = licenses.mit; maintainers = with maintainers; [ onny ]; + mainProgram = "baserow"; }; } diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 21904dc615a12..7e6d8f500a101 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.3.1"; + version = "1.4.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-AhUMrvnZoo0XMfJ6F9Bi4mC0hk5T3EkQPX/s4tHWcic="; + sha256 = "sha256-sCP1I57FSXTf5iQlmUIQHMrSGNOxG/R2aahU3D8x5Ww="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix index af372102f76fd..a12f6146fdc01 100644 --- a/pkgs/servers/beanstalkd/default.nix +++ b/pkgs/servers/beanstalkd/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.zimbatm ]; platforms = platforms.all; + mainProgram = "beanstalkd"; }; } diff --git a/pkgs/servers/bililiverecorder/default.nix b/pkgs/servers/bililiverecorder/default.nix index fbd2db4ec3f50..e37c357089f02 100644 --- a/pkgs/servers/bililiverecorder/default.nix +++ b/pkgs/servers/bililiverecorder/default.nix @@ -13,8 +13,8 @@ let aspnetcore_6_0 ]; - version = "2.10.0"; - hash = "sha256-RpcT2zneKbbZieI2Omf+fcfmU7/MnkpYGKhFj9tnKrs="; + version = "2.10.1"; + hash = "sha256-7F/Hgt0p73QY5Sa3MRP//x7EpfcHCbnAPKDf00XzUbw="; in stdenv.mkDerivation { diff --git a/pkgs/servers/binserve/default.nix b/pkgs/servers/binserve/default.nix index 23ebe0c270f83..b8732b51587a2 100644 --- a/pkgs/servers/binserve/default.nix +++ b/pkgs/servers/binserve/default.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ snapdgn ]; platforms = platforms.unix; + mainProgram = "binserve"; }; } diff --git a/pkgs/servers/birdwatcher/default.nix b/pkgs/servers/birdwatcher/default.nix index 38a53e89ffe42..f3b816a7a2c38 100644 --- a/pkgs/servers/birdwatcher/default.nix +++ b/pkgs/servers/birdwatcher/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { changelog = "https://github.com/alice-lg/birdwatcher/blob/master/CHANGELOG"; license = licenses.bsd3; maintainers = with maintainers; [ janik ]; + mainProgram = "birdwatcher"; }; } diff --git a/pkgs/servers/bloat/default.nix b/pkgs/servers/bloat/default.nix index bd4ae38efaa87..3752b167188fc 100644 --- a/pkgs/servers/bloat/default.nix +++ b/pkgs/servers/bloat/default.nix @@ -6,12 +6,12 @@ buildGoModule { pname = "bloat"; - version = "unstable-2023-10-25"; + version = "unstable-2023-12-28"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; - rev = "f4881e72675e87a9eae716436c3ac18a788d596d"; - hash = "sha256-i6HjhGPPXKtQ7hVPECk9gZglFmjb/Fo9pFIq5ikw4Y8="; + rev = "1d61f1aa27376e778b7a517fdd5739a8c1976d2e"; + hash = "sha256-u75COa68sKhWeR3asQGgu2thQmDDGpJPmXLgnesQfNc="; }; vendorHash = null; @@ -38,5 +38,6 @@ buildGoModule { downloadPage = "https://git.freesoftwareextremist.com/bloat/"; license = licenses.cc0; maintainers = with maintainers; [ fgaz ]; + mainProgram = "bloat"; }; } diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 147115b550ef1..1116c5a36d6f1 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -67,5 +67,6 @@ buildGoModule rec { license = licenses.agpl3; maintainers = with maintainers; [ mmahut _1000101 ]; platforms = platforms.unix; + mainProgram = "blockbook"; }; } diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index d3cf54114c3be..590f6f315fe81 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation { maintainers = [ lib.maintainers.qknight ]; license = lib.licenses.gpl2; platforms = lib.platforms.all; + mainProgram = "brickd"; }; } diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 26140404cc55b..399ce426d9dc6 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -7,7 +7,7 @@ , installShellFiles }: let - version = "2.7.5"; + version = "2.7.6"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; @@ -23,10 +23,10 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - hash = "sha256-0IZZ7mkEzZI2Y8ed//m0tbBQZ0YcCXA0/b10ntNIXUk="; + hash = "sha256-th0R3Q1nGT0q5PGOygtD1/CpJmrT5TYagrwQR4t/Fvg="; }; - vendorHash = "sha256-YNcQtjPGQ0XMSog+sWlH4lG/QdbdI0Lyh/fUGqQUFaY="; + vendorHash = "sha256-ebnSehuhbCY58ctM8IRVMfNxxbJBp6ht9cbuLdGFNek="; subPackages = [ "cmd/caddy" ]; diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index 160435802957c..0d0afd185f411 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -2,24 +2,12 @@ , fetchFromGitHub , nixosTests , python3 -, fetchPypi }: let python = python3.override { packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { - version = "1.4.46"; - src = fetchPypi { - pname = "SQLAlchemy"; - inherit version; - hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; - }; - disabledTestPaths = [ - "test/aaa_profiling" - "test/ext/mypy" - ]; - }); + sqlalchemy = super.sqlalchemy_1_4; }; }; in @@ -103,5 +91,6 @@ python.pkgs.buildPythonApplication rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ pborzenkov ]; platforms = platforms.all; + mainProgram = "calibre-web"; }; } diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index df5760fb2b2a6..b5222f41b3b1d 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { homepage = "https://cayley.io/"; license = licenses.asl20; maintainers = with maintainers; [ sigma ]; + mainProgram = "cayley"; }; } diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 19a0b5e923408..629842669388e 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -28,7 +28,7 @@ let else llvmPackages.stdenv).mkDerivation; in mkDerivation rec { pname = "clickhouse"; - version = "23.10.3.5"; + version = "23.11.1.2711"; src = fetchFromGitHub rec { owner = "ClickHouse"; @@ -36,7 +36,7 @@ in mkDerivation rec { rev = "v${version}-stable"; fetchSubmodules = true; name = "clickhouse-${rev}.tar.gz"; - hash = "sha256-H3nIhBydLBxSesGrvqmwHmBoQGCGQlWgVVUudKLLkIY="; + hash = "sha256-xRg9NzUkjTbR2Lp6DgDzcUp2Hrc4sfgkot7KxPw2Uy8="; postFetch = '' # delete files that make the source too big rm -rf $out/contrib/llvm-project/llvm/test @@ -61,6 +61,20 @@ in mkDerivation rec { ''; }; + patches = [ + # They updated the Cargo.toml without updating the Cargo.lock :/ + (fetchpatch { + url = "https://github.com/ClickHouse/ClickHouse/commit/bccd33932b5fe17ced2dc2f27813da0b1c034afa.patch"; + revert = true; + hash = "sha256-4idwr+G8WGuT/VILKtDIJIvbCvi6pZokJFze4dP6ExE="; + }) + (fetchpatch { + url = "https://github.com/ClickHouse/ClickHouse/commit/b6bd5ecb199ef8a10e3008a4ea3d96087db8a8c1.patch"; + revert = true; + hash = "sha256-nbb/GV2qWEZ+BEfT6/9//yZf4VWdhOdJCI3PLeh6o0M="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ cmake diff --git a/pkgs/servers/code-server/build-vscode-nogit.patch b/pkgs/servers/code-server/build-vscode-nogit.patch new file mode 100644 index 0000000000000..ec726c68d438d --- /dev/null +++ b/pkgs/servers/code-server/build-vscode-nogit.patch @@ -0,0 +1,20 @@ +diff --git a/ci/build/build-vscode.sh b/ci/build/build-vscode.sh +index a72549fb..3aed1ad5 100755 +--- a/ci/build/build-vscode.sh ++++ b/ci/build/build-vscode.sh +@@ -58,7 +58,6 @@ main() { + # telemetry available; telemetry can still be disabled by flag or setting). + # This needs to be done before building as Code will read this file and embed + # it into the client-side code. +- git checkout product.json # Reset in case the script exited early. + cp product.json product.original.json # Since jq has no inline edit. + jq --slurp '.[0] * .[1]' product.original.json <( + cat << EOF +@@ -105,7 +104,6 @@ EOF + # Reset so if you develop after building you will not be stuck with the wrong + # commit (the dev client will use `oss-dev` but the dev server will still use + # product.json which will have `stable-$commit`). +- git checkout product.json + + popd + diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix new file mode 100644 index 0000000000000..7c038451b7c7a --- /dev/null +++ b/pkgs/servers/code-server/default.nix @@ -0,0 +1,327 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildGoModule +, makeWrapper +, cacert +, moreutils +, jq +, git +, rsync +, pkg-config +, yarn +, python3 +, esbuild +, nodejs +, node-gyp +, libsecret +, xorg +, ripgrep +, AppKit +, Cocoa +, CoreServices +, Security +, cctools +, xcbuild +, quilt +, nixosTests +}: + +let + system = stdenv.hostPlatform.system; + + python = python3; + yarn' = yarn.override { inherit nodejs; }; + defaultYarnOpts = [ ]; + + esbuild' = esbuild.override { + buildGoModule = args: buildGoModule (args // rec { + version = "0.16.17"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + }; + + # replaces esbuild's download script with a binary from nixpkgs + patchEsbuild = path: version: '' + mkdir -p ${path}/node_modules/esbuild/bin + jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json + sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js + ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild + ''; + + # Comment from @code-asher, the code-server maintainer + # See https://github.com/NixOS/nixpkgs/pull/240001#discussion_r1244303617 + # + # If the commit is missing it will break display languages (Japanese, Spanish, + # etc). For some reason VS Code has a hard dependency on the commit being set + # for that functionality. + # The commit is also used in cache busting. Without the commit you could run + # into issues where the browser is loading old versions of assets from the + # cache. + # Lastly, it can be helpful for the commit to be accurate in bug reports + # especially when they are built outside of our CI as sometimes the version + # numbers can be unreliable (since they are arbitrarily provided). + # + # To compute the commit when upgrading this derivation, do: + # `$ git rev-parse <git-rev>` where <git-rev> is the git revision of the `src` + # Example: `$ git rev-parse v4.16.1` + commit = "0c98611e6b43803a9d5dba222d7023b569abfb49"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "code-server"; + version = "4.19.1"; + + src = fetchFromGitHub { + owner = "coder"; + repo = "code-server"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-J+6zuqVf1YKQjiRiqO4867DEwYzZsgQYgbsRXPo2hwY="; + }; + + yarnCache = stdenv.mkDerivation { + name = "${finalAttrs.pname}-${finalAttrs.version}-${system}-yarn-cache"; + inherit (finalAttrs) src; + + nativeBuildInputs = [ yarn' git cacert ]; + + buildPhase = '' + runHook preBuild + + export HOME=$PWD + export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt" + + yarn --cwd "./vendor" install --modules-folder modules --ignore-scripts --frozen-lockfile + + yarn config set yarn-offline-mirror $out + find "$PWD" -name "yarn.lock" -printf "%h\n" | \ + xargs -I {} yarn --cwd {} \ + --frozen-lockfile --ignore-scripts --ignore-platform \ + --ignore-engines --no-progress --non-interactive + + find ./lib/vscode -name "yarn.lock" -printf "%h\n" | \ + xargs -I {} yarn --cwd {} \ + --ignore-scripts --ignore-engines + + runHook postBuild + ''; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "sha256-g2rwB+PuWuYgrzIuW0ngia7cdPMC8s7ffBEkbmPPzB4="; + }; + + nativeBuildInputs = [ + nodejs + yarn' + python + pkg-config + makeWrapper + git + rsync + jq + moreutils + quilt + ]; + + buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] + ++ (with xorg; [ libX11 libxkbfile ]) + ++ lib.optionals stdenv.isDarwin [ + AppKit + Cocoa + CoreServices + Security + cctools + xcbuild + ]; + + patches = [ + # Remove all git calls from the VS Code build script except `git rev-parse + # HEAD` which is replaced in postPatch with the commit. + ./build-vscode-nogit.patch + ]; + + postPatch = '' + export HOME=$PWD + + patchShebangs ./ci + + # inject git commit + substituteInPlace ./ci/build/build-vscode.sh \ + --replace '$(git rev-parse HEAD)' "${commit}" + substituteInPlace ./ci/build/build-release.sh \ + --replace '$(git rev-parse HEAD)' "${commit}" + ''; + + configurePhase = '' + runHook preConfigure + + # run yarn offline by default + echo '--install.offline true' >> .yarnrc + + # set default yarn opts + ${lib.concatMapStrings (option: '' + yarn --offline config set ${option} + '') defaultYarnOpts} + + # set offline mirror to yarn cache we created in previous steps + yarn --offline config set yarn-offline-mirror "${finalAttrs.yarnCache}" + + # skip unnecessary electron download + export ELECTRON_SKIP_BINARY_DOWNLOAD=1 + + # set nodedir to prevent node-gyp from downloading headers + # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific + mkdir -p $HOME/.node-gyp/${nodejs.version} + echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion + ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} + export npm_config_nodedir=${nodejs} + + # use updated node-gyp. fixes the following error on Darwin: + # PermissionError: [Errno 1] Operation not permitted: '/usr/sbin/pkgutil' + export npm_config_node_gyp=${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + # install code-server dependencies + yarn --offline --ignore-scripts + + # apply patches + quilt push -a + + # patch shebangs of everything to allow binary packages to build + patchShebangs . + + export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 + export SKIP_SUBMODULE_DEPS=1 + export NODE_OPTIONS=--openssl-legacy-provider + + # rebuild binary packages now that scripts have been patched + echo "----- NPM rebuild" + npm rebuild --prefer-offline + + # Replicate ci/dev/postinstall.sh + echo "----- Replicate ci/dev/postinstall.sh" + yarn --cwd "./vendor" install --modules-folder modules --offline --ignore-scripts --frozen-lockfile + + # remove all built-in extensions, as these are 3rd party extensions that + # get downloaded from vscode marketplace + jq --slurp '.[0] * .[1]' "./lib/vscode/product.json" <( + cat << EOF + { + "builtInExtensions": [] + } + EOF + ) | sponge ./lib/vscode/product.json + + # disable automatic updates + sed -i '/update.mode/,/\}/{s/default:.*/default: "none",/g}' \ + lib/vscode/src/vs/platform/update/common/update.config.contribution.ts + + # Patch out remote download of nodejs from build script + patch -p1 -i ${./remove-node-download.patch} + + # Fetch packages for vscode + find ./lib/vscode -name "yarn.lock" -printf "%h\n" | \ + xargs -I {} yarn --cwd {} \ + --frozen-lockfile --ignore-scripts --ignore-engines + + # patch shebangs of everything to allow binary packages to build + patchShebangs . + + ${patchEsbuild "./lib/vscode/build" "0.12.6"} + ${patchEsbuild "./lib/vscode/extensions" "0.11.23"} + '' + lib.optionalString stdenv.isDarwin '' + # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+ + # (see issue #101229) + pushd ./lib/vscode/remote/node_modules/@parcel/watcher + mkdir -p ./build/Release + mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node + jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json + popd + '' + '' + + # put ripgrep binary into bin, so postinstall does not try to download it + find -name ripgrep -type d \ + -execdir mkdir -p {}/bin \; \ + -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; + + # run postinstall scripts after patching + find ./lib/vscode \( -path "*/node_modules/*" -or -path "*/extensions/*" \) \ + -and -type f -name "yarn.lock" -printf "%h\n" | \ + xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true' + + # build code-server + yarn build + + # build vscode + VERSION=${finalAttrs.version} yarn build:vscode + + # inject version into package.json + jq --slurp '.[0] * .[1]' ./package.json <( + cat << EOF + { + "version": "${finalAttrs.version}" + } + EOF + ) | sponge ./package.json + + # create release + yarn release + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/libexec/code-server $out/bin + + # copy release to libexec path + cp -R -T release "$out/libexec/code-server" + + # install only production dependencies + yarn --offline --cwd "$out/libexec/code-server" --production + + # create wrapper + makeWrapper "${nodejs}/bin/node" "$out/bin/code-server" \ + --add-flags "$out/libexec/code-server/out/node/entry.js" + + runHook postInstall + ''; + + passthru = { + prefetchYarnCache = lib.overrideDerivation finalAttrs.yarnCache (d: { + outputHash = lib.fakeSha256; + }); + tests = { + inherit (nixosTests) code-server; + }; + # vscode-with-extensions compatibility + executableName = "code-server"; + longName = "Visual Studio Code Server"; + }; + + meta = { + description = "Run VS Code on a remote server"; + longDescription = '' + code-server is VS Code running on a remote server, accessible through the + browser. + ''; + homepage = "https://github.com/coder/code-server"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ offline henkery code-asher ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + mainProgram = "code-server"; + }; +}) diff --git a/pkgs/servers/code-server/remove-node-download.patch b/pkgs/servers/code-server/remove-node-download.patch new file mode 100644 index 0000000000000..d19d4a2b5bf78 --- /dev/null +++ b/pkgs/servers/code-server/remove-node-download.patch @@ -0,0 +1,28 @@ +--- ./lib/vscode/build/gulpfile.reh.js ++++ ./lib/vscode/build/gulpfile.reh.js +@@ -268,9 +268,6 @@ + .pipe(util.stripSourceMappingURL()) + .pipe(jsFilter.restore); + +- const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`; +- const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true }); +- + let web = []; + if (type === 'reh-web') { + web = [ +@@ -287,7 +284,6 @@ + license, + sources, + deps, +- node, + ...web + ); + +@@ -385,7 +381,6 @@ + const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`; + + const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( +- gulp.task(`node-${platform}-${arch}`), + util.rimraf(path.join(BUILD_ROOT, destinationFolderName)), + packageTask(type, platform, arch, sourceFolderName, destinationFolderName) + )); diff --git a/pkgs/servers/computing/slurm-spank-stunnel/default.nix b/pkgs/servers/computing/slurm-spank-stunnel/default.nix index 9fdd5625f78ff..3534c8981a269 100644 --- a/pkgs/servers/computing/slurm-spank-stunnel/default.nix +++ b/pkgs/servers/computing/slurm-spank-stunnel/default.nix @@ -11,8 +11,10 @@ stdenv.mkDerivation rec { sha256 = "15cpd49ccvzsmmr3gk8svm2nz461rvs4ybczckyf4yla0xzp06gj"; }; + patches = [ ./hostlist.patch ]; + buildPhase = '' - gcc -I${slurm.dev}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c + gcc -I${lib.getDev slurm}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c ''; installPhase = '' diff --git a/pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch b/pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch new file mode 100644 index 0000000000000..0fc1d0626aab0 --- /dev/null +++ b/pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch @@ -0,0 +1,13 @@ +diff --git a/slurm-spank-stunnel.c b/slurm-spank-stunnel.c +index 81fb4fd..dbe69f6 100644 +--- a/slurm-spank-stunnel.c ++++ b/slurm-spank-stunnel.c +@@ -278,7 +278,7 @@ int _stunnel_connect_nodes (char* nodes) + { + + char* host; +- hostlist_t hlist; ++ hostlist_t *hlist; + + // Connect to the first host in the list + hlist = slurm_hostlist_create(nodes); diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/servers/computing/slurm-spank-x11/default.nix index 8a8aa34fdb2d1..4a5e2d52b2f55 100644 --- a/pkgs/servers/computing/slurm-spank-x11/default.nix +++ b/pkgs/servers/computing/slurm-spank-x11/default.nix @@ -10,10 +10,12 @@ stdenv.mkDerivation rec { sha256 = "1dmsr7whxcxwnlvl1x4s3bqr5cr6q5ssb28vqi67w5hj4sshisry"; }; + patches = [ ./hostlist.patch ]; + buildPhase = '' gcc -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" \ -g -o slurm-spank-x11 slurm-spank-x11.c - gcc -I${slurm.dev}/include -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" -shared -fPIC \ + gcc -I${lib.getDev slurm}/include -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" -shared -fPIC \ -g -o x11.so slurm-spank-x11-plug.c ''; diff --git a/pkgs/servers/computing/slurm-spank-x11/hostlist.patch b/pkgs/servers/computing/slurm-spank-x11/hostlist.patch new file mode 100644 index 0000000000000..c60bab236ceac --- /dev/null +++ b/pkgs/servers/computing/slurm-spank-x11/hostlist.patch @@ -0,0 +1,13 @@ +diff --git a/slurm-spank-x11-plug.c b/slurm-spank-x11-plug.c +index bef6c14..7cb77c4 100644 +--- a/slurm-spank-x11-plug.c ++++ b/slurm-spank-x11-plug.c +@@ -608,7 +608,7 @@ int _connect_node (char* node,uint32_t jobid,uint32_t stepid) + int _x11_connect_nodes (char* nodes,uint32_t jobid,uint32_t stepid) + { + char* host; +- hostlist_t hlist; ++ hostlist_t *hlist; + int n=0; + int i; + diff --git a/pkgs/servers/computing/slurm/common-env-echo.patch b/pkgs/servers/computing/slurm/common-env-echo.patch index 4236421a63d22..cff52116d1454 100644 --- a/pkgs/servers/computing/slurm/common-env-echo.patch +++ b/pkgs/servers/computing/slurm/common-env-echo.patch @@ -1,13 +1,13 @@ diff --git a/src/common/env.c b/src/common/env.c -index 987846d..73d3b3b 100644 +index 4dad18fef1..730f28af96 100644 --- a/src/common/env.c +++ b/src/common/env.c -@@ -1941,7 +1941,7 @@ char **env_array_user_default(const char *username, int timeout, int mode, +@@ -2073,7 +2073,7 @@ char **env_array_user_default(const char *username, int timeout, int mode, char **env = NULL; char *starttoken = "XXXXSLURMSTARTPARSINGHEREXXXX"; char *stoptoken = "XXXXSLURMSTOPPARSINGHEREXXXXX"; - char cmdstr[256], *env_loc = NULL; -+ char cmdstr[MAXPATHLEN], *env_loc = NULL; ++ char cmdstr[PATH_MAX], *env_loc = NULL; char *stepd_path = NULL; - int fd1, fd2, fildes[2], found, fval, len, rc, timeleft; + int fildes[2], found, fval, len, rc, timeleft; int buf_read, buf_rem, config_timeout; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index fe8f95ecdf36c..08fdbcebb016f 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "23.02.6.1"; + version = "23.11.1.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-azgGM4qfS0xtUaiGfXtu8MNYdgpZRUfx+zBgAAlmt6g="; + hash = "sha256-dfCQKKw44bD5d7Sv7e40Qm3df9Mzz7WvmWf7SP8R1KQ="; }; outputs = [ "out" "dev" ]; @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace src/common/env.c \ --replace "/bin/echo" "${coreutils}/bin/echo" + + # Autoconf does not support split packages for pmix (libs and headers). + # Fix the path to the pmix libraries, so dlopen can find it. + substituteInPlace src/plugins/mpi/pmix/mpi_pmix.c \ + --replace 'xstrfmtcat(full_path, "%s/", PMIXP_LIBPATH)' \ + 'xstrfmtcat(full_path, "${lib.getLib pmix}/lib/")' + '' + (lib.optionalString enableX11 '' substituteInPlace src/common/x11_util.c \ --replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"' @@ -60,15 +67,15 @@ stdenv.mkDerivation rec { configureFlags = with lib; [ "--with-freeipmi=${freeipmi}" "--with-http-parser=${http-parser}" - "--with-hwloc=${hwloc.dev}" - "--with-json=${json_c.dev}" + "--with-hwloc=${lib.getDev hwloc}" + "--with-json=${lib.getDev json_c}" "--with-jwt=${libjwt}" - "--with-lz4=${lz4.dev}" + "--with-lz4=${lib.getDev lz4}" "--with-munge=${munge}" - "--with-yaml=${libyaml.dev}" + "--with-yaml=${lib.getDev libyaml}" "--with-ofed=${lib.getDev rdma-core}" "--sysconfdir=/etc/slurm" - "--with-pmix=${pmix}" + "--with-pmix=${lib.getDev pmix}" "--with-bpf=${libbpf}" "--without-rpath" # Required for configure to pick up the right dlopen path ] ++ (optional enableGtk2 "--disable-gtktest") diff --git a/pkgs/servers/confluencepot/default.nix b/pkgs/servers/confluencepot/default.nix index 4b807401a2990..d1aa0031f20fd 100644 --- a/pkgs/servers/confluencepot/default.nix +++ b/pkgs/servers/confluencepot/default.nix @@ -40,5 +40,6 @@ buildGoModule rec { ''; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ fab ]; + mainProgram = "confluencepot"; }; } diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 1e94991b5c089..bfc57cc1f10e0 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.16.1"; + version = "1.17.2"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - hash = "sha256-EEreAhxBQm6Wj1JFGfC9Ql3NARPXNOhqZkzIDJ2NMkg="; + hash = "sha256-zfJZUDR6GJlJbnLIXa5duq8VOG0WUN+FP5BLQ4EgPKM="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorHash = "sha256-zERHmtmGrPrUPJ2fFc+J0pWKLKQc9TTSFkN2RUOXOoM="; + vendorHash = "sha256-bKiKfLq/kbZYziUyD2v1o9X2Gs6uiqzPSYWE4cpeU9Q="; doCheck = false; @@ -40,7 +40,7 @@ buildGoModule rec { description = "Tool for service discovery, monitoring and configuration"; homepage = "https://www.consul.io/"; platforms = platforms.linux ++ platforms.darwin; - license = licenses.mpl20; + license = licenses.bsl11; maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 techknowlogick]; mainProgram = "consul"; }; diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 678f97e977430..f1d81aae92faf 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -4,17 +4,18 @@ , enableInfiniBandRdma ? false , enableMonitoring ? false , enableSnmp ? false +, nixosTests }: with lib; stdenv.mkDerivation rec { pname = "corosync"; - version = "3.1.7"; + version = "3.1.8"; src = fetchurl { url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-5lVrOjhZZfITMLk4Pc0XkPKKT3ngk5grQOouwj4KKfo="; + sha256 = "sha256-cCNUT6O7NsALvKvZk1tyabQdiWc4oQjtMuqbnJsn7D0="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/pkgs/servers/db-rest/default.nix b/pkgs/servers/db-rest/default.nix index 7fda8f978f1d4..8eab440e523ba 100644 --- a/pkgs/servers/db-rest/default.nix +++ b/pkgs/servers/db-rest/default.nix @@ -40,5 +40,6 @@ buildNpmPackage rec { homepage = "https://v6.db.transport.rest/"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ marie ]; + mainProgram = "db-rest"; }; } diff --git a/pkgs/servers/dcnnt/default.nix b/pkgs/servers/dcnnt/default.nix index 1140325b05f38..6c55a28ae1783 100644 --- a/pkgs/servers/dcnnt/default.nix +++ b/pkgs/servers/dcnnt/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "dcnnt"; - version = "0.9.0"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YG+NLKI9cz8Uu2y+Ut2q+vn67ExTya00XjHlWRAksz8="; + sha256 = "sha256-mPZlQllIU4fkGtmnhK7ovc8CrAxUcgF0KgO7/fQBrkk="; }; propagatedBuildInputs = [ @@ -22,5 +22,6 @@ buildPythonApplication rec { ''; license = licenses.mit; maintainers = with maintainers; [ arnoutkroeze ]; + mainProgram = "dcnnt"; }; } diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix index 3a587230eef86..253642bbdddd1 100644 --- a/pkgs/servers/demoit/default.nix +++ b/pkgs/servers/demoit/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/dgageot/demoit"; license = licenses.asl20; maintainers = [ maintainers.freezeboy ]; + mainProgram = "demoit"; }; } diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 4dfe4b33318c5..720b41a9350ca 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.13.4"; + version = "0.13.5"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - hash = "sha256-Hy3QuwAHmZSsjy5A/1mrmrxdtle466HsQtDat3tYS8s="; + hash = "sha256-tKywmFSSWc538i7raCrZnFpMDnFMT23hYVoYndnIKJ4="; }; - vendorHash = "sha256-M7ogR1ya+sqlWVQpaXlvJy9YwhdM4XBDw8e2ZBPvEGY="; + vendorHash = "sha256-eFoXUroJgrstNYjSYsP6o0vTEW2k/+6JjyVn6bb4um8="; subPackages = [ # The server diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 4ab3545184866..65bbf51ba9d0b 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -33,5 +33,6 @@ buildGoModule rec { homepage = "https://github.com/dexidp/dex"; license = licenses.asl20; maintainers = with maintainers; [ benley techknowlogick ]; + mainProgram = "dex"; }; } diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index b800b0b77804d..321a37ec521d6 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -44,5 +44,6 @@ buildGoModule rec { maintainers = with maintainers; [ sigma ]; # Apache 2.0 because we use only build "oss" license = licenses.asl20; + mainProgram = "dgraph"; }; } diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index e372ffe9bad8f..658d477a483d5 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { strictDeps = true; - doCheck = true; + # ERROR: All 188 tests were run, 90 failed unexpectedly. + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Flexible dictionary server and client implementing RFC 2229"; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 7c67e87b54460..8edd94fb27ada 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.19"; + version = "9.18.21"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-EV4JwFQ5vrreHScu2gj6iOs7YBKe3vaQWIyHpNJ2Esw="; + hash = "sha256-pVa+IlBdnqT5xnF67pxUlznGhJiv88ppA1eH7MZI/sU="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index ce20cf8f22868..b06dc704520a7 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "dnsdist"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - hash = "sha256-ZojwmyxS+b+TXwdp9O4o3Qdg5WItreez9Ob6N3bwerg="; + hash = "sha256-hYMj8u1RgUiLt1WPv0+E7HGYYAsHCyxTddFdQGlXJ/Q="; }; patches = [ diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index bc18c91ef7fe5..9e73c026b3f10 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.3.2"; + version = "3.3.4"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "0d65d4b59f5df69b78c6295ade0a2ea7931831de7ef5eeee3e00f8a20af679e4"; + sha256 = "2a771b43ce96b6b48d53b29f2086528732e6ac067bc71a3be934f859d1302fc0"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 28fe866dfdcc6..d14c7450c8da2 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -4,6 +4,7 @@ # build+runtime deps. , knot-dns, luajitPackages, libuv, gnutls, lmdb , jemalloc, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle +, fstrm, protobufc # more optionals # test-only deps. , cmocka, which, cacert , extraFeatures ? false /* catch-all if defaults aren't enough */ @@ -62,9 +63,10 @@ unwrapped = stdenv.mkDerivation rec { # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] + ## the rest are optional dependencies ++ optionals stdenv.isLinux [ /*lib*/systemd libcap_ng ] ++ [ jemalloc nghttp2 ] - ## optional dependencies; TODO: dnstap + ++ [ fstrm protobufc ] # dnstap support ; mesonFlags = [ diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index aa995a9f4843e..1f82bde0384c2 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.7.0"; + version = "4.8.0"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-j6ykTima0pFfoACIerFjJjHqaHCcYs418RC/5yHs8hQ="; + sha256 = "sha256-gg2k44RyGRX0vK9/K+2YUZ2lY8bkwTDHQsckdg7AKgo="; }; prePatch = '' diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index e20a7caccaef0..4c379717ebe2a 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns"; - version = "4.8.3"; + version = "4.8.4"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-d7kRmb33GHQzRQHGfiZGnCZno3PYQjgD/mV0Fylcd7o="; + hash = "sha256-f0DIy8RlDQb+Sau6eZAuurs4Q2Pau9XO8nGWSgfDZFw="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/servers/domoticz/default.nix index 6e50b4754438d..65c7debfd4d9d 100644 --- a/pkgs/servers/domoticz/default.nix +++ b/pkgs/servers/domoticz/default.nix @@ -86,5 +86,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.all; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/domoticz.x86_64-darwin + mainProgram = "domoticz"; }; } diff --git a/pkgs/servers/duckling-proxy/default.nix b/pkgs/servers/duckling-proxy/default.nix index b314a6b59bd40..057d4f03f3b5e 100644 --- a/pkgs/servers/duckling-proxy/default.nix +++ b/pkgs/servers/duckling-proxy/default.nix @@ -18,5 +18,6 @@ buildGoModule { homepage = "https://github.com/LukeEmmet/duckling-proxy"; license = licenses.mit; maintainers = with maintainers; [ kaction ]; + mainProgram = "duckling-proxy"; }; } diff --git a/pkgs/servers/ebusd/default.nix b/pkgs/servers/ebusd/default.nix index 318c274cf2700..bc20b930aef06 100644 --- a/pkgs/servers/ebusd/default.nix +++ b/pkgs/servers/ebusd/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, pkgs, fetchFromGitHub, argparse, mosquitto, cmake, autoconf, automake, libtool, pkg-config, openssl }: +{ lib, stdenv, pkgs, fetchFromGitHub, fetchpatch, argparse, mosquitto, cmake, autoconf, automake, libtool, pkg-config, openssl }: stdenv.mkDerivation rec { pname = "ebusd"; - version = "23.2"; + version = "23.3"; src = fetchFromGitHub { owner = "john30"; repo = "ebusd"; rev = version; - sha256 = "2CkcTTxEzVrEPtUVVDxXPPkYqZT6+gsCcfTrt83sFv8="; + sha256 = "sha256-K3gZ5OudNA92S38U1+HndxjA7OVfh2ymYf8OetB646M="; }; nativeBuildInputs = [ @@ -27,6 +27,12 @@ stdenv.mkDerivation rec { patches = [ ./patches/ebusd-cmake.patch + # Upstream patch for gcc-13 copmpatibility: + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/john30/ebusd/commit/3384f3780087bd6b94d46bf18cdad18201ad516c.patch"; + hash = "sha256-+wZDHjGaIhBCqhy2zmIE8Ko3uAiw8kfKx64etCqRQjM="; + }) ]; cmakeFlags = [ diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index b34b6f1c34f5b..ae450ddae833e 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -32,5 +32,6 @@ buildGoModule { homepage = "https://github.com/mpolden/echoip"; license = licenses.bsd3; maintainers = with maintainers; [ rvolosatovs SuperSandro2000 ]; + mainProgram = "echoip"; }; } diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index 7b33435a9dbe6..bc93e644a1781 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.4.5"; + version = "1.5.6"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar"; - sha256 = "sha256-ep/Je83rUE2mcRqIBbgNH+7uFYf0EoHuRo7JOgT2aIs="; + sha256 = "sha256-WdwKIQFWu8R/9CQZFjVLkplRC0pbYoyb/6FjJu80NRU="; }; # don't do anything? @@ -37,5 +37,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ peterromfeldhk ]; + mainProgram = "elasticmq-server"; }; }) diff --git a/pkgs/servers/endlessh-go/default.nix b/pkgs/servers/endlessh-go/default.nix index 4012038a1e057..44c574a316f2b 100644 --- a/pkgs/servers/endlessh-go/default.nix +++ b/pkgs/servers/endlessh-go/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { changelog = "https://github.com/shizunge/endlessh-go/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ azahi ]; + mainProgram = "endlessh-go"; }; } diff --git a/pkgs/servers/endlessh/default.nix b/pkgs/servers/endlessh/default.nix index e408c764939f1..4c99251cfa90f 100644 --- a/pkgs/servers/endlessh/default.nix +++ b/pkgs/servers/endlessh/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.unlicense; maintainers = with maintainers; [ azahi marsam ]; platforms = platforms.unix; + mainProgram = "endlessh"; }; } diff --git a/pkgs/servers/eris-go/default.nix b/pkgs/servers/eris-go/default.nix deleted file mode 100644 index dc6d72bba3422..0000000000000 --- a/pkgs/servers/eris-go/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitea, nixosTests }: - -buildGoModule rec { - pname = "eris-go"; - version = "20230914"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "eris"; - repo = "eris-go"; - rev = version; - hash = "sha256-7aEsCQ+bZ//6Z+XXAEHgsAd61L+QgRl77+UtHr/BM1g="; - }; - - vendorHash = "sha256-Z6rirsiiBzH0herQAkxZp1Xr++489qNoiD4fqoLt9/A="; - - skipNetworkTests = true; - - passthru.tests = { inherit (nixosTests) eris-server; }; - - meta = src.meta // { - description = "Implementation of ERIS for Go"; - homepage = "https://codeberg.org/eris/eris-go"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ehmry ]; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix index 61b3f99d01471..597cad35021b8 100644 --- a/pkgs/servers/etcd/3.4.nix +++ b/pkgs/servers/etcd/3.4.nix @@ -2,25 +2,25 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.27"; - - vendorHash = "sha256-duqOIMIXAuJjvKDM15mDdi+LZUZm0uK0MjTv2Dsl3FA="; - - doCheck = false; + version = "3.4.28"; src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "sha256-iw9rWfloK1h0M0O10AqCFKETSN6Adn71ujn4twVgsnk="; + hash = "sha256-M0iD05Wk3pC56kGKeIb0bfMUpy9idMKin0+DYhBo/cw="; }; + vendorHash = "sha256-DbDIz/cbXqYHaGqNqP+wYpuiaFiZYElRXmQwBXnCbMk="; + buildPhase = '' patchShebangs . ./build ./functional/build ''; + doCheck = false; + installPhase = '' install -Dm755 bin/* bin/functional/cmd/* -t $out/bin ''; diff --git a/pkgs/servers/etcd/3.5.nix b/pkgs/servers/etcd/3.5.nix index a7507f1dd2377..2265470874126 100644 --- a/pkgs/servers/etcd/3.5.nix +++ b/pkgs/servers/etcd/3.5.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests }: let - version = "3.5.9"; + version = "3.5.11"; src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - hash = "sha256-Vp8U49fp0FowIuSSvbrMWjAKG2oDO1o0qO4izSnTR3U="; + hash = "sha256-OjAWi5EXy1d1O6HLBzHcSfeCNmZZLNtrQXpTJ075B0I="; }; CGO_ENABLED = 0; @@ -25,7 +25,7 @@ let inherit CGO_ENABLED meta src version; - vendorHash = "sha256-vu5VKHnDbvxSd8qpIFy0bA88IIXLaQ5S8dVUJEwnKJA="; + vendorHash = "sha256-1/ma737hGdek+263w5OuO5iN5DTA8fpb6m0Fefyww20="; modRoot = "./server"; @@ -45,7 +45,7 @@ let inherit CGO_ENABLED meta src version; - vendorHash = "sha256-i60rKCmbEXkdFOZk2dTbG5EtYKb5eCBSyMcsTtnvATs="; + vendorHash = "sha256-AMN8iWTIFeT0HLqxYrp7sieT0nEKBNwFXV9mZG3xG5I="; modRoot = "./etcdutl"; }; @@ -55,7 +55,7 @@ let inherit CGO_ENABLED meta src version; - vendorHash = "sha256-awl/4kuOjspMVEwfANWK0oi3RId6ERsFkdluiRaaXlA="; + vendorHash = "sha256-zwafVpNBvrRUbL0qkDK9TOyo8KCiGjpZhvdUrgklG5Y="; modRoot = "./etcdctl"; }; diff --git a/pkgs/servers/fastnetmon-advanced/default.nix b/pkgs/servers/fastnetmon-advanced/default.nix index 0a06d7b17c3f1..8f11df7048ad6 100644 --- a/pkgs/servers/fastnetmon-advanced/default.nix +++ b/pkgs/servers/fastnetmon-advanced/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "fastnetmon-advanced"; - version = "2.0.353"; + version = "2.0.358"; src = fetchurl { url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb"; - hash = "sha256-EkZlQL/rb5x+6apV0nZ4Ay6hUEPifPCZF6CQaxKSWuM="; + hash = "sha256-qL+LxePCZnSpbeeNANvI/f8ntNStHe02fSqMA+XKFng="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index c778ed72328e9..0df4bc5a3833e 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ]; platforms = with platforms; linux; license = licenses.mit; + mainProgram = "fcgiwrap"; }; } diff --git a/pkgs/servers/fedigroups/default.nix b/pkgs/servers/fedigroups/default.nix index 0b9fa4c2a0588..b94620e67afd7 100644 --- a/pkgs/servers/fedigroups/default.nix +++ b/pkgs/servers/fedigroups/default.nix @@ -50,5 +50,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + mainProgram = "fedigroups"; }; } diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index a9796f922d3a0..66fec2ce4a483 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ maintainers.sander ]; + mainProgram = "felix.jar"; }; } diff --git a/pkgs/servers/fiche/default.nix b/pkgs/servers/fiche/default.nix index 2875f274dc0df..375733d272ccb 100644 --- a/pkgs/servers/fiche/default.nix +++ b/pkgs/servers/fiche/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.pinpox ]; platforms = platforms.all; + mainProgram = "fiche"; }; } diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/servers/fileshare/default.nix index 7141efef305a4..1572e994e7c89 100644 --- a/pkgs/servers/fileshare/default.nix +++ b/pkgs/servers/fileshare/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.esclear ]; platforms = platforms.linux; + mainProgram = "fileshare"; }; } diff --git a/pkgs/servers/filtron/default.nix b/pkgs/servers/filtron/default.nix index f50e3b19583ca..768f3b204f2ce 100644 --- a/pkgs/servers/filtron/default.nix +++ b/pkgs/servers/filtron/default.nix @@ -34,5 +34,6 @@ buildGoModule rec { license = licenses.agpl3; maintainers = [ maintainers.dasj19 ]; platforms = platforms.linux; + mainProgram = "filtron"; }; } diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index e49f683da8777..7e7387819ab00 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libedit, autoreconfHook, zlib, unzip, libtommath, libtomcrypt, icu, superServer ? false }: +{ lib, stdenv, fetchFromGitHub, libedit, autoreconfHook271, zlib, unzip, libtommath, libtomcrypt, icu, superServer ? false }: let base = { pname = "firebird"; @@ -13,7 +13,7 @@ let base = { maintainers = with maintainers; [ marcweber ]; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook271 ]; buildInputs = [ libedit icu ]; diff --git a/pkgs/servers/fishnet/default.nix b/pkgs/servers/fishnet/default.nix index 6a808080517b4..0d068aa1d8320 100644 --- a/pkgs/servers/fishnet/default.nix +++ b/pkgs/servers/fishnet/default.nix @@ -42,5 +42,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ tu-maurice ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; + mainProgram = "fishnet"; }; } diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index 2186e1fc89e3f..0ca256f1cbdd5 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -85,13 +85,13 @@ lib.warnIf (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) stdenv.mkDerivation rec { pname = "frr"; - version = "9.0.1"; + version = "9.1"; src = fetchFromGitHub { owner = "FRRouting"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-o0AVx7sDRowQz6NpKPQThC8NcGA3QN8xFzfE0k4AIVg="; + hash = "sha256-oDPr51vI+tlT1IiUPufmZh/UE0TNKWrn4RqpnGoGxNo="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index 9bd994dd1ad57..8babfe505deda 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -1,16 +1,25 @@ -{ lib, stdenv, nixosTests, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ lib, stdenv, nixosTests, fetchFromGitHub, fetchpatch, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.3.1"; + version = "3.3.3"; src = fetchFromGitHub { owner = "mbrubeck"; repo = "agate"; rev = "v${version}"; - hash = "sha256-gU4Q45Sb+LOmcv0j9R8yw996NUpCOnxdwT6lyvNp2pg="; + hash = "sha256-qINtAOPrmLUWfEjZNj11W2WoIFw7Ye3KDk+9ZKtZAvo="; }; - cargoHash = "sha256-6jF4ayzBN4sSk81u3iX0CxMPAsL6D+wpXRYGjgntMUE="; + + cargoPatches = [ + # Update version in Cargo.lock + (fetchpatch { + url = "https://github.com/mbrubeck/agate/commit/ac57093d2f73a20d0d4f84b551beef4ac9cb4a24.patch"; + hash = "sha256-OknfBkaBWm3svSp8LSvyfy2g0y0SkR7VtJQUdAjClFs="; + }) + ]; + + cargoHash = "sha256-18V1/d2A3DJmpYX/5Z8M3uAaHrULGIgCT4ntcV4N8l0="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/servers/gemini/stargazer/default.nix b/pkgs/servers/gemini/stargazer/default.nix index 4dc0ba5cc0f58..5d346ec15a0c0 100644 --- a/pkgs/servers/gemini/stargazer/default.nix +++ b/pkgs/servers/gemini/stargazer/default.nix @@ -5,22 +5,27 @@ , installShellFiles , scdoc , Security +, nixosTests }: rustPlatform.buildRustPackage rec { pname = "stargazer"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromSourcehut { owner = "~zethra"; repo = "stargazer"; rev = version; - hash = "sha256-n88X3RJD7PqOcVRK/bp/gMNLVrbwnJ2iwi2rCpsfp+o="; + hash = "sha256-c0gKvVaMiUOGHlPmtaW6it8J9MusQY7BA/5F9I3ysMc="; }; - cargoHash = "sha256-Yqh3AQIOahKz2mLeVNm58Yr6vhjU4aQwN62y3Z5/EJc="; + cargoHash = "sha256-8VrEZZNSFLAjUagsiRApvjiXusBHLLn1O/+QKtQY4wg="; - doCheck = false; # Uses extenal testing framework that requires network + doCheck = false; # Uses external testing framework that requires network + + passthru.tests = { + basic-functionality = nixosTests.stargazer; + }; nativeBuildInputs = [ installShellFiles scdoc ]; diff --git a/pkgs/servers/geospatial/fit-trackee/default.nix b/pkgs/servers/geospatial/fit-trackee/default.nix index c7bc7fbc2e5b6..0e7377f1258c5 100644 --- a/pkgs/servers/geospatial/fit-trackee/default.nix +++ b/pkgs/servers/geospatial/fit-trackee/default.nix @@ -8,18 +8,16 @@ let python = python3.override { packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "1.4.49"; + sqlalchemy = super.sqlalchemy_1_4; + + flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "3.0.5"; + src = fetchPypi { - pname = "SQLAlchemy"; + pname = "flask_sqlalchemy"; inherit version; - hash = "sha256-Bv8ly64ww5bEt3N0ZPKn/Deme32kCZk7GCsCTOyArtk="; + hash = "sha256-xXZeWMoUVAG1IQbA9GF4VpJDxdolVWviwjHsxghnxbE="; }; - # Remove "test/typing" that does not exist - disabledTestPaths = [ - "test/aaa_profiling" - "test/ext/mypy" - ]; }); }; }; @@ -27,21 +25,19 @@ let in python.pkgs.buildPythonApplication rec { pname = "fit-trackee"; - version = "0.7.22"; + version = "0.7.29"; format = "pyproject"; src = fetchFromGitHub { owner = "SamR1"; repo = "FitTrackee"; rev = "v${version}"; - hash = "sha256-aPQ8jLssN9nx0Bpd/44E3sQi2w0cR8ecG76DJjreeHA="; + hash = "sha256-NWWQ+lPUMaeF3UPglllaLGJnNgF54SXo4DcF3VAQbO4="; }; postPatch = '' - substituteInPlace pyproject.toml \ - --replace psycopg2-binary psycopg2 \ - --replace 'poetry>=0.12' 'poetry-core' \ - --replace 'poetry.masonry.api' 'poetry.core.masonry.api' + substituteInPlace pyproject.toml --replace psycopg2-binary psycopg2 \ + --replace 'flask = "^3.0.0"' 'flask = "*"' ''; nativeBuildInputs = [ @@ -57,6 +53,7 @@ python.pkgs.buildPythonApplication rec { flask-dramatiq flask-limiter flask-migrate + flask-sqlalchemy gpxpy gunicorn humanize diff --git a/pkgs/servers/geospatial/geoserver/data-dir.patch b/pkgs/servers/geospatial/geoserver/data-dir.patch new file mode 100644 index 0000000000000..8693216279984 --- /dev/null +++ b/pkgs/servers/geospatial/geoserver/data-dir.patch @@ -0,0 +1,18 @@ +--- a/bin/startup.sh ++++ b/bin/startup.sh +@@ -66,12 +66,9 @@ fi + + #Find the configuration directory: GEOSERVER_DATA_DIR + if [ -z "${GEOSERVER_DATA_DIR:-}" ]; then +- if [ -r "${GEOSERVER_HOME}/data_dir" ]; then +- export GEOSERVER_DATA_DIR="${GEOSERVER_HOME}/data_dir" +- else +- echo "No GEOSERVER_DATA_DIR found, using application defaults" +- GEOSERVER_DATA_DIR="" +- fi ++ echo "GEOSERVER_DATA_DIR is not provided. Using $(pwd)/geoserver/data_dir directory" ++ mkdir -p "$(pwd)"/geoserver/data_dir ++ GEOSERVER_DATA_DIR="$(pwd)/geoserver/data_dir" + fi + + cd "${GEOSERVER_HOME}" || exit 1 diff --git a/pkgs/servers/geospatial/geoserver/default.nix b/pkgs/servers/geospatial/geoserver/default.nix index 4f0b657fda66c..a58a3bb717e1c 100644 --- a/pkgs/servers/geospatial/geoserver/default.nix +++ b/pkgs/servers/geospatial/geoserver/default.nix @@ -1,14 +1,27 @@ -{ lib, stdenv, fetchurl, unzip, jre, makeWrapper }: +{ lib +, fetchurl +, makeWrapper +, nixosTests +, stdenv + +, jre +, unzip +}: stdenv.mkDerivation rec { pname = "geoserver"; - version = "2.24.0"; + version = "2.24.2"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - sha256 = "sha256-xX1rAONMh5XSWGPXkVMemAvG34DDNmu2018HsTvY7G0="; + sha256 = "sha256-1ArG7CneJRY9y6rYaVjNU6L6RsUgVvjpwt07Rd+WGrE="; }; + patches = [ + # set GEOSERVER_DATA_DIR to current working directory if not provided + ./data-dir.patch + ]; + sourceRoot = "."; nativeBuildInputs = [ unzip makeWrapper ]; @@ -27,12 +40,16 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + tests.geoserver = nixosTests.geoserver; + }; + meta = with lib; { description = "Open source server for sharing geospatial data"; homepage = "https://geoserver.org/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Plus; - maintainers = with maintainers; [ sikmir ]; + maintainers = teams.geospatial.members; platforms = platforms.all; }; } diff --git a/pkgs/servers/geospatial/mapcache/default.nix b/pkgs/servers/geospatial/mapcache/default.nix index e4326e920ced9..df679d930fa03 100644 --- a/pkgs/servers/geospatial/mapcache/default.nix +++ b/pkgs/servers/geospatial/mapcache/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { homepage = "https://mapserver.org/mapcache/"; changelog = "https://www.mapserver.org/development/changelog/mapcache/"; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = teams.geospatial.members; platforms = platforms.unix; }; } diff --git a/pkgs/servers/geospatial/mapserver/default.nix b/pkgs/servers/geospatial/mapserver/default.nix index d131d331c763f..922f0864b8414 100644 --- a/pkgs/servers/geospatial/mapserver/default.nix +++ b/pkgs/servers/geospatial/mapserver/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-fAf4kOe/6bQW0i46+EZbD/6iWI2Bjkn2no6XeR/+mg4="; }; + patches = [ + # drop this patch for version 8.0.2 + ./fix-build-w-libxml2-12.patch + ]; + nativeBuildInputs = [ cmake pkg-config @@ -57,7 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://mapserver.org/"; changelog = "https://mapserver.org/development/changelog/"; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = teams.geospatial.members; platforms = platforms.unix; }; } diff --git a/pkgs/servers/geospatial/mapserver/fix-build-w-libxml2-12.patch b/pkgs/servers/geospatial/mapserver/fix-build-w-libxml2-12.patch new file mode 100644 index 0000000000000..e33a7f7bc44cd --- /dev/null +++ b/pkgs/servers/geospatial/mapserver/fix-build-w-libxml2-12.patch @@ -0,0 +1,39 @@ +diff --git a/mapows.c b/mapows.c +index f141a7b..5a94ecb 100644 +--- a/mapows.c ++++ b/mapows.c +@@ -168,7 +168,7 @@ static int msOWSPreParseRequest(cgiRequestObj *request, + #endif + if (ows_request->document == NULL + || (root = xmlDocGetRootElement(ows_request->document)) == NULL) { +- xmlErrorPtr error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + msSetError(MS_OWSERR, "XML parsing error: %s", + "msOWSPreParseRequest()", error->message); + return MS_FAILURE; +diff --git a/mapwcs.cpp b/mapwcs.cpp +index 70e63b8..19afa79 100644 +--- a/mapwcs.cpp ++++ b/mapwcs.cpp +@@ -362,7 +362,7 @@ static int msWCSParseRequest(cgiRequestObj *request, wcsParamsObj *params, mapOb + /* parse to DOM-Structure and get root element */ + if((doc = xmlParseMemory(request->postrequest, strlen(request->postrequest))) + == NULL) { +- xmlErrorPtr error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + msSetError(MS_WCSERR, "XML parsing error: %s", + "msWCSParseRequest()", error->message); + return MS_FAILURE; +diff --git a/mapwcs20.cpp b/mapwcs20.cpp +index b35e803..2431bdc 100644 +--- a/mapwcs20.cpp ++++ b/mapwcs20.cpp +@@ -1446,7 +1446,7 @@ int msWCSParseRequest20(mapObj *map, + + /* parse to DOM-Structure and get root element */ + if(doc == NULL) { +- xmlErrorPtr error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + msSetError(MS_WCSERR, "XML parsing error: %s", + "msWCSParseRequest20()", error->message); + return MS_FAILURE; diff --git a/pkgs/servers/geospatial/mbtileserver/default.nix b/pkgs/servers/geospatial/mbtileserver/default.nix index 7907ba1860790..6b2831f87f1a1 100644 --- a/pkgs/servers/geospatial/mbtileserver/default.nix +++ b/pkgs/servers/geospatial/mbtileserver/default.nix @@ -18,6 +18,6 @@ buildGoModule rec { homepage = "https://github.com/consbio/mbtileserver"; changelog = "https://github.com/consbio/mbtileserver/blob/v${version}/CHANGELOG.md"; license = licenses.isc; - maintainers = with maintainers; [ sikmir ]; + maintainers = teams.geospatial.members; }; } diff --git a/pkgs/servers/geospatial/pg_featureserv/default.nix b/pkgs/servers/geospatial/pg_featureserv/default.nix index da1cdf10939d5..6c9d3a6c10c92 100644 --- a/pkgs/servers/geospatial/pg_featureserv/default.nix +++ b/pkgs/servers/geospatial/pg_featureserv/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { description = "Lightweight RESTful Geospatial Feature Server for PostGIS in Go"; homepage = "https://github.com/CrunchyData/pg_featureserv"; license = licenses.asl20; - maintainers = with maintainers; [ sikmir ]; + maintainers = teams.geospatial.members; }; } diff --git a/pkgs/servers/geospatial/pg_tileserv/default.nix b/pkgs/servers/geospatial/pg_tileserv/default.nix index 93afa6746a5c9..80b8c23bee1a8 100644 --- a/pkgs/servers/geospatial/pg_tileserv/default.nix +++ b/pkgs/servers/geospatial/pg_tileserv/default.nix @@ -31,6 +31,6 @@ buildGoModule rec { description = "A very thin PostGIS-only tile server in Go"; homepage = "https://github.com/CrunchyData/pg_tileserv"; license = licenses.asl20; - maintainers = with maintainers; [ sikmir ]; + maintainers = teams.geospatial.members; }; } diff --git a/pkgs/servers/geospatial/t-rex/default.nix b/pkgs/servers/geospatial/t-rex/default.nix index 755bfb06c0d6c..c96d8a8247f5f 100644 --- a/pkgs/servers/geospatial/t-rex/default.nix +++ b/pkgs/servers/geospatial/t-rex/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://t-rex.tileserver.ch/"; changelog = "https://github.com/t-rex-tileserver/t-rex/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = teams.geospatial.members; mainProgram = "t_rex"; platforms = platforms.unix; broken = true; # https://github.com/t-rex-tileserver/t-rex/issues/302 diff --git a/pkgs/servers/geospatial/tile38/default.nix b/pkgs/servers/geospatial/tile38/default.nix index fd92065c35b06..e918abf03261b 100644 --- a/pkgs/servers/geospatial/tile38/default.nix +++ b/pkgs/servers/geospatial/tile38/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tile38"; - version = "1.32.0"; + version = "1.32.1"; src = fetchFromGitHub { owner = "tidwall"; repo = pname; rev = version; - sha256 = "sha256-NSoi7CsxL+6DoKZZal+xhjlSz+9N9CFyzlMrTYHbiW8="; + sha256 = "sha256-hG+ad68Q4KjtovmTlS/63NQxCQ9ZkcC8lrNGfhE9C6U="; }; - vendorHash = "sha256-Vy5ct5JP2t3085TM4CCWVEAQR4mAqVbGM5JE2KctSlU="; + vendorHash = "sha256-5mkxTumqLP+fEBTwhJrPpteeDPTN9hLEAh6A4l4lQhs="; subPackages = [ "cmd/tile38-cli" "cmd/tile38-server" ]; @@ -25,6 +25,6 @@ buildGoModule rec { ''; homepage = "https://tile38.com/"; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = teams.geospatial.members; }; } diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index 9cd7cadc09eec..d83022930ad04 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -121,5 +121,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ ardumont ]; platforms = platforms.linux; + mainProgram = "gerbera"; }; } diff --git a/pkgs/servers/gnss-share/default.nix b/pkgs/servers/gnss-share/default.nix index 14aa294da503c..8b24964ae824b 100644 --- a/pkgs/servers/gnss-share/default.nix +++ b/pkgs/servers/gnss-share/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { ''; license = licenses.gpl3; maintainers = with maintainers; [ balsoft ]; + mainProgram = "gnss-share"; }; } diff --git a/pkgs/servers/go-autoconfig/default.nix b/pkgs/servers/go-autoconfig/default.nix index 73a809613c9d7..1fe09a03a0dd6 100644 --- a/pkgs/servers/go-autoconfig/default.nix +++ b/pkgs/servers/go-autoconfig/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { homepage = "https://github.com/L11R/go-autoconfig"; license = licenses.mit; maintainers = with maintainers; [ onny ]; + mainProgram = "go-autoconfig"; }; } diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index 706e529879fba..ee5bfef3b9afc 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -51,5 +51,6 @@ buildGoModule rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; + mainProgram = "gonic"; }; } diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 57004b66b03a5..45311b60232e3 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -1,5 +1,4 @@ { lib -, buildGoPackage , fetchFromGitHub , buildGoModule , sqlite diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix index 811fa41540ab3..e22831cfbbdca 100644 --- a/pkgs/servers/gotify/ui.nix +++ b/pkgs/servers/gotify/ui.nix @@ -1,6 +1,6 @@ { stdenv , yarn -, fixup_yarn_lock +, prefetch-yarn-deps , nodejs-slim , fetchFromGitHub , fetchYarnDeps @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { hash = "sha256-ejHzo6NHCMlNiYePWvfMY9Blb58pj3UQ5PFI0V84flI="; }; - nativeBuildInputs = [ yarn fixup_yarn_lock nodejs-slim ]; + nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs-slim ]; postPatch = '' export HOME=$NIX_BUILD_TOP/fake_home yarn config --offline set yarn-offline-mirror $offlineCache - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ ''; diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix index f6c86c06312a3..33927bd1ef0c7 100644 --- a/pkgs/servers/gotosocial/default.nix +++ b/pkgs/servers/gotosocial/default.nix @@ -9,11 +9,11 @@ let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.11.1"; + version = "0.13.0"; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-xPdSwsXjyjodgEHlwl4X32Pb6TniwM9Q+u56xAoY7SQ="; + hash = "sha256-aPxjfe+0f4hUBfwBH67LsR1/Kv/42sPhlHwmVmDfp30="; }; in buildGoModule rec { @@ -23,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { inherit owner repo; rev = "refs/tags/v${version}"; - hash = "sha256-qsgrHPQae1+LKF2y6e256ZfYR+a9ffe7oq1W3GJA1do="; + hash = "sha256-+/x3CAGF/cjK1/7fHgC8EzlGR/Xmq3aFL5Ogc/QZCpA="; }; vendorHash = null; diff --git a/pkgs/servers/guacamole-client/default.nix b/pkgs/servers/guacamole-client/default.nix index d4e94dea0dade..23c56df62a46a 100644 --- a/pkgs/servers/guacamole-client/default.nix +++ b/pkgs/servers/guacamole-client/default.nix @@ -1,16 +1,15 @@ { lib , stdenvNoCC , fetchurl -, nixosTests }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "guacamole-client"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { url = "https://archive.apache.org/dist/guacamole/${finalAttrs.version}/binary/guacamole-${finalAttrs.version}.war"; - hash = "sha256-FaNObtbPbwP+IPkPZ9LWCXE6ic08syT4nt8edpbm7WE="; + hash = "sha256-Vyi1Y5Eb1kvOCguBx06ozLIZDReFv/NAMPxohagnPT4="; }; dontUnpack = true; @@ -25,10 +24,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests = { - inherit (nixosTests) guacamole-client; - }; - meta = { description = "Clientless remote desktop gateway"; homepage = "https://guacamole.apache.org/"; diff --git a/pkgs/servers/guacamole-server/default.nix b/pkgs/servers/guacamole-server/default.nix index 8f14e7d9545c8..58628b48a5b85 100644 --- a/pkgs/servers/guacamole-server/default.nix +++ b/pkgs/servers/guacamole-server/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "guacamole-server"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "apache"; repo = "guacamole-server"; rev = finalAttrs.version; - hash = "sha256-8VPhaZ+XnbDElF5MOpbA8MDDTUkou9O2z4NUdWwW4FM="; + hash = "sha256-Jke9Sp/T/GyamTq7lyu8JakJHqEwSrer0v1DugSg7JY="; }; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index 3ec3c396a7e86..84a8b98b6dfc9 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -1,47 +1,45 @@ -{ lib, stdenv, fetchzip, jre, makeWrapper }: -stdenv.mkDerivation rec { +{ lib, maven, fetchFromGitHub, jre, makeWrapper, nix-update-script }: + +maven.buildMavenPackage rec { pname = "h2"; - version = "2.2.220"; + version = "2.2.224"; + + outputs = [ "out" "doc" ]; - src = fetchzip { - url = "https://github.com/h2database/h2database/releases/download/version-${version}/h2-2023-07-04.zip"; - hash = "sha256-nSOkCZuHcy0GR4SRjx524+MLqxJyO1PRkImPOFR1yts="; + src = fetchFromGitHub { + owner = "h2database"; + repo = "h2database"; + rev = "refs/tags/version-${version}"; + hash = "sha256-pS9jSiuInA0eULPOZK5cjwr9y5KDVY51blhZ9vs4z+g="; }; - outputs = [ "out" "doc" ]; + mvnParameters = "-f h2/pom.xml -DskipTests"; + mvnHash = "sha256-hUzE4F+RNCAfoY836pjrivf04xqN4m9SkiLXhmVzZRA="; nativeBuildInputs = [ makeWrapper ]; - installPhase = - let - h2ToolScript = '' - #!/usr/bin/env bash - dir=$(dirname "$0") - - if [ -n "$1" ]; then - ${jre}/bin/java -cp "$dir/h2-${version}.jar:$H2DRIVERS:$CLASSPATH" $1 "''${@:2}" - else - echo "You have to provide the full java class path for the h2 tool you want to run. E.g. 'org.h2.tools.Server'" - fi - ''; - in '' - mkdir -p $out $doc/share/doc/ - cp -R bin $out/ - cp -R docs $doc/share/doc/h2 + installPhase = '' + mkdir -p $out/share/java + install -Dm644 h2/target/h2-${version}.jar $out/share/java - echo '${h2ToolScript}' > $out/bin/h2tool.sh + makeWrapper ${jre}/bin/java $out/bin/h2 \ + --add-flags "-cp \"$out/share/java/h2-${version}.jar:\$H2DRIVERS:\$CLASSPATH\" org.h2.tools.Console" - substituteInPlace $out/bin/h2.sh --replace "java" "${jre}/bin/java" + mkdir -p $doc/share/doc/h2 + cp -r h2/src/docsrc/* $doc/share/doc/h2 + ''; - chmod +x $out/bin/*.sh - ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex" "^version-([0-9.]+)$" ]; + }; meta = with lib; { description = "The Java SQL database"; - homepage = "http://www.h2database.com/html/main.html"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + homepage = "https://h2database.com/html/main.html"; + changelog = "https://h2database.com/html/changelog.html"; license = licenses.mpl20; - platforms = lib.platforms.linux; - maintainers = with maintainers; [ mahe ]; + platforms = lib.platforms.unix; + maintainers = with maintainers; [ mahe anthonyroussel ]; + mainProgram = "h2"; }; } diff --git a/pkgs/servers/hashi-ui/default.nix b/pkgs/servers/hashi-ui/default.nix index 0fad3eb2648b5..ab3d869be9b9d 100644 --- a/pkgs/servers/hashi-ui/default.nix +++ b/pkgs/servers/hashi-ui/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ numkem ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; + mainProgram = "hashi-ui"; }; } diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index b3a01cd2f6899..704268c24257e 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "headphones"; - version = "0.6.0"; + version = "0.6.1"; format = "other"; src = fetchFromGitHub { owner = "rembo10"; repo = "headphones"; rev = "v${version}"; - sha256 = "0wx0kj9brcd4i9fdc4hmp39cgr27qybya6bp108cfgfv9x7150iw"; + sha256 = "1pj6xrcc6g336lb2knlc9l3qxgj3jaaymnbd7bmfjahgq5cp4d4v"; }; dontBuild = true; @@ -35,5 +35,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl3Plus; homepage = "https://github.com/rembo10/headphones"; maintainers = with lib.maintainers; [ rembo10 ]; + mainProgram = "headphones"; }; } diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index afb2520a6b883..da643564a3fb7 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -31,5 +31,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/hifi/heisenbridge"; license = licenses.mit; maintainers = [ maintainers.sumnerevans ]; + mainProgram = "heisenbridge"; }; } diff --git a/pkgs/servers/hiraeth/default.nix b/pkgs/servers/hiraeth/default.nix index c31b8c4641529..c69ec6ac34faf 100644 --- a/pkgs/servers/hiraeth/default.nix +++ b/pkgs/servers/hiraeth/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { description = "Share files with an expiration date"; license = lib.licenses.agpl3Plus; maintainers = [ lib.maintainers.lukaswrz ]; + mainProgram = "hiraeth"; }; } diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix index b142cd0cd8ac5..bed9f77908a1f 100644 --- a/pkgs/servers/hitch/default.nix +++ b/pkgs/servers/hitch/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = [ maintainers.jflanglois ]; platforms = platforms.linux; + mainProgram = "hitch"; }; } diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index b104bb15997d4..89515fa265d34 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -5,53 +5,47 @@ python3.pkgs.buildPythonApplication rec { pname = "appdaemon"; - version = "4.2.1"; - format = "setuptools"; + version = "4.4.2"; + pyproject = true; - disabled = python3.pythonOlder "3.7"; + disabled = python3.pythonOlder "3.8"; src = fetchFromGitHub { owner = "AppDaemon"; repo = "appdaemon"; rev = "refs/tags/${version}"; - hash = "sha256-4sN0optkMmyWb5Cd3F7AhcXYHh7aidJE/bieYMEKgSY="; + hash = "sha256-T3InE4J4qYeFJTq6nrW8y5BOA7Z0n3t9eVpl641r/xk="; }; postPatch = '' # relax dependencies - sed -i 's/==/>=/' requirements.txt + sed -i 's/~=/>=/' pyproject.toml ''; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ - aiodns aiohttp aiohttp-jinja2 astral - azure-keyvault-secrets - azure-mgmt-compute - azure-mgmt-resource - azure-mgmt-storage - azure-storage-blob bcrypt - faust-cchardet deepdiff feedparser iso8601 - jinja2 paho-mqtt pid - pygments python-dateutil - python-engineio python-socketio pytz pyyaml requests sockjs uvloop - voluptuous websocket-client - yarl + tomli + tomli-w ]; # no tests implemented @@ -62,7 +56,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Sandboxed Python execution environment for writing automation apps for Home Assistant"; homepage = "https://github.com/AppDaemon/appdaemon"; - changelog = "https://github.com/AppDaemon/appdaemon/blob/${version}/docs/HISTORY.rst"; + changelog = "https://github.com/AppDaemon/appdaemon/blob/${version}/docs/HISTORY.md"; license = licenses.mit; maintainers = teams.home-assistant.members; }; diff --git a/pkgs/servers/home-assistant/build-custom-component/check_manifest.py b/pkgs/servers/home-assistant/build-custom-component/check_manifest.py index bbe9535824e72..463a7579763d4 100644 --- a/pkgs/servers/home-assistant/build-custom-component/check_manifest.py +++ b/pkgs/servers/home-assistant/build-custom-component/check_manifest.py @@ -1,28 +1,31 @@ #!/usr/bin/env python3 import json -import importlib_metadata +import os import sys +import importlib_metadata from packaging.requirements import Requirement +def error(msg: str) -> None: + print(f" - {msg}", file=sys.stderr) + return False + + def check_requirement(req: str): # https://packaging.pypa.io/en/stable/requirements.html requirement = Requirement(req) try: version = importlib_metadata.distribution(requirement.name).version except importlib_metadata.PackageNotFoundError: - print(f" - Dependency {requirement.name} is missing", file=sys.stderr) - return False + return error(f"{requirement.name}{requirement.specifier} not present") # https://packaging.pypa.io/en/stable/specifiers.html - if not version in requirement.specifier: - print( - f" - {requirement.name}{requirement.specifier} expected, but got {version}", - file=sys.stderr, + if version not in requirement.specifier: + return error( + f"{requirement.name}{requirement.specifier} expected, but got {version}" ) - return False return True @@ -30,13 +33,24 @@ def check_requirement(req: str): def check_manifest(manifest_file: str): with open(manifest_file) as fd: manifest = json.load(fd) + + ok = True + + derivation_domain = os.environ.get("domain") + manifest_domain = manifest["domain"] + if derivation_domain != manifest_domain: + ok = False + error( + f"Derivation attribute domain ({derivation_domain}) must match manifest domain ({manifest_domain})" + ) + if "requirements" in manifest: - ok = True for requirement in manifest["requirements"]: ok &= check_requirement(requirement) - if not ok: - print("Manifest requirements are not met", file=sys.stderr) - sys.exit(1) + + if not ok: + error("Manifest check failed.") + sys.exit(1) if __name__ == "__main__": diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index 05b7c2d4b0392..2948d15bb8144 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -3,7 +3,8 @@ , makeSetupHook }: -{ pname +{ owner +, domain , version , format ? "other" , ... @@ -17,13 +18,14 @@ let in home-assistant.python.pkgs.buildPythonPackage ( { + pname = "${owner}/${domain}"; inherit format; installPhase = '' runHook preInstall mkdir $out - cp -r $src/custom_components/ $out/ + cp -r ./custom_components/ $out/ runHook postInstall ''; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5c2a067b3f28c..abfb8c7b9417d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.11.2"; + version = "2024.1.5"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -37,6 +37,10 @@ "aemet" = ps: with ps; [ aemet-opendata ]; + "aep_ohio" = ps: with ps; [ + ]; + "aep_texas" = ps: with ps; [ + ]; "aftership" = ps: with ps; [ pyaftership ]; @@ -60,11 +64,13 @@ "airthings_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly airthings-ble - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -72,6 +78,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -110,6 +118,8 @@ ]; "alexa" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "alpha_vantage" = ps: with ps; [ @@ -123,6 +133,8 @@ ]; "ambiclimate" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ambiclimate ]; "ambient_station" = ps: with ps; [ @@ -139,6 +151,8 @@ ]; "analytics" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -161,23 +175,31 @@ anel-pwrctrl-homeassistant ]; "anova" = ps: with ps; [ - ]; # missing inputs: anova-wifi + anova-wifi + ]; "anthemav" = ps: with ps; [ anthemav ]; "anwb_energie" = ps: with ps; [ ]; + "aosmith" = ps: with ps; [ + ]; # missing inputs: py-aosmith "apache_kafka" = ps: with ps; [ aiokafka ]; "apcupsd" = ps: with ps; [ - apcaccess - ]; + ]; # missing inputs: aioapcaccess "api" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + ]; + "appalachianpower" = ps: with ps; [ ]; "apple_tv" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -187,6 +209,8 @@ ]; "application_credentials" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -206,11 +230,13 @@ "aranet" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly aranet4 - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -218,6 +244,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -242,6 +270,8 @@ ]; "arwn" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; @@ -250,6 +280,9 @@ ]; "assist_pipeline" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + ha-ffmpeg hassil home-assistant-intents mutagen @@ -263,6 +296,7 @@ ]; "asuswrt" = ps: with ps; [ aioasuswrt + pyasuswrt ]; "atag" = ps: with ps; [ pyatag @@ -292,9 +326,13 @@ ]; "auth" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "automation" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "avea" = ps: with ps; [ avea @@ -310,6 +348,8 @@ ]; "axis" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng axis janus paho-mqtt @@ -325,6 +365,8 @@ ]; "backup" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant securetar @@ -374,13 +416,17 @@ ]; # missing inputs: python-blockchain-api "bloomsky" = ps: with ps; [ ]; + "blue_current" = ps: with ps; [ + ]; # missing inputs: bluecurrent-api "bluemaestro" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluemaestro-ble bluetooth-adapters @@ -389,6 +435,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -407,6 +455,8 @@ ]; "bluetooth" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bleak bleak-retry-connector bluetooth-adapters @@ -414,6 +464,7 @@ bluetooth-data-tools dbus-fast fnv-hash-fast + habluetooth psutil-home-assistant pyserial pyudev @@ -422,10 +473,12 @@ "bluetooth_adapters" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -433,6 +486,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -447,10 +502,12 @@ "bluetooth_le_tracker" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -458,6 +515,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -475,12 +534,15 @@ ]; "bmw_connected_drive" = ps: with ps; [ bimmer-connected - ]; + ] + ++ bimmer-connected.optional-dependencies.china; "bond" = ps: with ps; [ bond-async ]; "bosch_shc" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng boschshcpy fnv-hash-fast ifaddr @@ -517,15 +579,17 @@ "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist "bt_smarthub" = ps: with ps; [ - btsmarthub_devicelist + btsmarthub-devicelist ]; "bthome" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -534,6 +598,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -559,9 +625,13 @@ ]; "calendar" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "camera" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "canary" = ps: with ps; [ @@ -570,7 +640,10 @@ ]; "cast" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents @@ -581,11 +654,14 @@ plexwebsocket psutil-home-assistant pychromecast + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain zeroconf ]; + "ccm15" = ps: with ps; [ + ]; # missing inputs: py-ccm15 "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ @@ -617,11 +693,18 @@ ]; "cloud" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "cloudflare" = ps: with ps; [ @@ -630,7 +713,7 @@ "cmus" = ps: with ps; [ ]; # missing inputs: pycmus "co2signal" = ps: with ps; [ - co2signal + aioelectricitymaps ]; "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase @@ -658,6 +741,8 @@ ]; "config" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "configurator" = ps: with ps; [ ]; @@ -666,6 +751,8 @@ ]; "conversation" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng hassil home-assistant-intents ]; @@ -687,6 +774,8 @@ ]; "crownstone" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng crownstone-cloud crownstone-sse crownstone-uart @@ -732,15 +821,20 @@ "default_config" = ps: with ps; [ aiodiscover aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client bleak bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools + cached-ipaddress dbus-fast fnv-hash-fast ha-av + ha-ffmpeg + habluetooth hass-nabucasa hassil home-assistant-frontend @@ -753,6 +847,7 @@ psutil-home-assistant pynacl pyserial + python-matter-server pyturbojpeg pyudev scapy @@ -771,6 +866,8 @@ ]; "demo" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng hassil home-assistant-intents ]; @@ -781,16 +878,31 @@ ]; "derivative" = ps: with ps; [ ]; + "devialet" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + devialet + fnv-hash-fast + ifaddr + psutil-home-assistant + sqlalchemy + zeroconf + ]; "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pillow ]; "device_tracker" = ps: with ps; [ ]; "devolo_home_control" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng devolo-home-control-api fnv-hash-fast ifaddr @@ -806,13 +918,18 @@ ]; "dhcp" = ps: with ps; [ aiodiscover + cached-ipaddress scapy ]; "diagnostics" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "dialogflow" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "diaz" = ps: with ps; [ ]; @@ -843,6 +960,8 @@ ]; # missing inputs: pyW215 "dlna_dmr" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast getmac @@ -853,6 +972,8 @@ ]; "dlna_dms" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -865,6 +986,8 @@ ]; "dominos" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; # missing inputs: pizzapi "doods" = ps: with ps; [ pillow @@ -872,6 +995,8 @@ ]; "doorbird" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng doorbirdpy ]; "dooya" = ps: with ps; [ @@ -879,10 +1004,12 @@ "dormakaba_dkey" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -890,6 +1017,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -909,11 +1038,21 @@ "dremel_3d_printer" = ps: with ps; [ dremel3dpy ]; + "drop_connect" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + dropmqttapi + janus + paho-mqtt + ]; "dsmr" = ps: with ps; [ dsmr-parser ]; "dsmr_reader" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; @@ -936,14 +1075,17 @@ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng dynalite-devices + dynalite-panel fnv-hash-fast home-assistant-frontend janus pillow psutil-home-assistant sqlalchemy - ]; # missing inputs: dynalite-panel + ]; "eafm" = ps: with ps; [ aioeafm ]; @@ -973,6 +1115,8 @@ "ecowitt" = ps: with ps; [ aioecowitt aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "eddystone_temperature" = ps: with ps; [ ]; # missing inputs: beacontools @@ -994,6 +1138,8 @@ ]; # missing inputs: pyElectra "electric_kiwi" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1006,6 +1152,8 @@ ]; "elkm1" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng elkm1-lib fnv-hash-fast ifaddr @@ -1030,6 +1178,8 @@ ]; "emulated_hue" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -1040,6 +1190,8 @@ ]; "emulated_roku" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng emulated-roku fnv-hash-fast ifaddr @@ -1050,6 +1202,8 @@ ]; "energy" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1085,32 +1239,6 @@ ]; "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter - "eq3btsmart" = ps: with ps; [ - aioesphomeapi - aiohttp-cors - aioruuvigateway - aioshelly - async-interrupt - bleak - bleak-retry-connector - bluetooth-adapters - bluetooth-auto-recovery - bluetooth-data-tools - construct - dbus-fast - esphome-dashboard-api - fnv-hash-fast - hassil - home-assistant-intents - ifaddr - mutagen - psutil-home-assistant - pyserial - pyudev - sqlalchemy - webrtc-noise-gain - zeroconf - ]; # missing inputs: python-eq3bt "escea" = ps: with ps; [ pescea ]; @@ -1119,8 +1247,10 @@ "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors - async-interrupt + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -1128,6 +1258,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -1147,10 +1279,12 @@ "eufylife_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -1159,6 +1293,8 @@ esphome-dashboard-api eufylife-ble-client fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -1226,6 +1362,8 @@ ]; "file_upload" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus ]; "filesize" = ps: with ps; [ @@ -1248,6 +1386,8 @@ ]; "fitbit" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fitbit fnv-hash-fast psutil-home-assistant @@ -1262,10 +1402,12 @@ "fjaraskupan" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -1274,6 +1416,8 @@ esphome-dashboard-api fjaraskupan fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -1291,6 +1435,8 @@ "flexit" = ps: with ps; [ pymodbus ]; + "flexit_bacnet" = ps: with ps; [ + ]; # missing inputs: flexit_bacnet "flexom" = ps: with ps; [ ]; "flic" = ps: with ps; [ @@ -1314,6 +1460,8 @@ ]; "flux_led" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng flux-led fnv-hash-fast ifaddr @@ -1333,6 +1481,8 @@ ]; "forked_daapd" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant spotipy @@ -1346,6 +1496,8 @@ ]; "foursquare" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms @@ -1360,6 +1512,8 @@ ]; "fritz" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast fritzconnection ifaddr @@ -1380,6 +1534,8 @@ ]; "frontend" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -1390,7 +1546,14 @@ "frontier_silicon" = ps: with ps; [ afsapi ]; + "fujitsu_anywair" = ps: with ps; [ + ]; "fully_kiosk" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + janus + paho-mqtt python-fullykiosk ]; "futurenow" = ps: with ps; [ @@ -1404,10 +1567,12 @@ "gardena_bluetooth" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -1415,6 +1580,9 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + gardena-bluetooth + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -1425,7 +1593,7 @@ sqlalchemy webrtc-noise-gain zeroconf - ]; # missing inputs: gardena-bluetooth + ]; "gaviota" = ps: with ps; [ ]; "gc100" = ps: with ps; [ @@ -1435,6 +1603,8 @@ ]; "generic" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ha-av pillow ]; @@ -1458,6 +1628,8 @@ ]; "geocaching" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast geocachingapi psutil-home-assistant @@ -1465,6 +1637,8 @@ ]; "geofency" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "geonetnz_quakes" = ps: with ps; [ aio-geojson-geonetnz-quakes @@ -1497,6 +1671,8 @@ ]; "google" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast gcal-sync oauth2client @@ -1505,10 +1681,18 @@ ]; "google_assistant" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy ]; "google_assistant_sdk" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast gassist-text psutil-home-assistant @@ -1521,12 +1705,16 @@ ]; "google_generative_ai_conversation" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng google-generativeai hassil home-assistant-intents ]; "google_mail" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast google-api-python-client psutil-home-assistant @@ -1540,6 +1728,8 @@ ]; "google_sheets" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast gspread psutil-home-assistant @@ -1547,6 +1737,8 @@ ]; "google_tasks" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast google-api-python-client psutil-home-assistant @@ -1563,10 +1755,12 @@ "govee_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -1575,6 +1769,8 @@ esphome-dashboard-api fnv-hash-fast govee-ble + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -1591,11 +1787,15 @@ ]; "gpslogger" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "graphite" = ps: with ps; [ ]; "gree" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast greeclimate ifaddr @@ -1625,6 +1825,8 @@ ]; "hardkernel" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng psutil-home-assistant ]; "hardware" = ps: with ps; [ @@ -1638,6 +1840,8 @@ ]; "hassio" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "havana_shade" = ps: with ps; [ ]; @@ -1673,6 +1877,8 @@ ]; "history" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1690,8 +1896,14 @@ "hlk_sw16" = ps: with ps; [ hlk-sw16 ]; + "holiday" = ps: with ps; [ + babel + holidays + ]; "home_connect" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast homeconnect psutil-home-assistant @@ -1699,6 +1911,8 @@ ]; "home_plus_control" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng homepluscontrol ]; "homeassistant" = ps: with ps; [ @@ -1707,6 +1921,8 @@ ]; "homeassistant_green" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -1727,6 +1943,8 @@ ]; "homeassistant_hardware" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -1747,6 +1965,8 @@ ]; "homeassistant_sky_connect" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -1767,6 +1987,8 @@ ]; "homeassistant_yellow" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -1787,6 +2009,8 @@ ]; "homekit" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng base36 fnv-hash-fast ha-ffmpeg @@ -1802,10 +2026,12 @@ aioesphomeapi aiohomekit aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -1813,6 +2039,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -1848,10 +2076,14 @@ ]; "html5" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pywebpush ]; "http" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "huawei_lte" = ps: with ps; [ huawei-lte-api @@ -1893,10 +2125,12 @@ "ibeacon" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -1904,6 +2138,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ibeacon-ble @@ -1922,10 +2158,12 @@ "idasen_desk" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -1933,6 +2171,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -1948,6 +2188,8 @@ ]; # missing inputs: rfk101py "ifttt" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyfttt ]; "iglo" = ps: with ps; [ @@ -1960,26 +2202,36 @@ ]; # missing inputs: ihcsdk "image" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "image_processing" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "image_upload" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pillow ]; "imap" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioimaplib ]; "improv_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -1987,6 +2239,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -2001,6 +2255,8 @@ "incomfort" = ps: with ps; [ incomfort-client ]; + "indianamichiganpower" = ps: with ps; [ + ]; "influxdb" = ps: with ps; [ influxdb influxdb-client @@ -2008,10 +2264,12 @@ "inkbird" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -2019,6 +2277,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -2047,6 +2307,8 @@ ]; "insteon" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend insteon-frontend-home-assistant @@ -2065,6 +2327,8 @@ ]; "intent" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "intent_script" = ps: with ps; [ ]; @@ -2073,6 +2337,8 @@ ]; "ios" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -2148,10 +2414,12 @@ "kegtron" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -2159,6 +2427,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -2171,6 +2441,8 @@ webrtc-noise-gain zeroconf ]; + "kentuckypower" = ps: with ps; [ + ]; "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput "keyboard_remote" = ps: with ps; [ @@ -2180,10 +2452,12 @@ "keymitt_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -2191,6 +2465,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -2219,6 +2495,8 @@ ]; "knx" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -2231,10 +2509,14 @@ ]; "kodi" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pykodi ]; "konnected" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng konnected ]; "kostal_plenticore" = ps: with ps; [ @@ -2257,6 +2539,8 @@ ]; # missing inputs: lacrosse-view "lametric" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng demetriek fnv-hash-fast psutil-home-assistant @@ -2264,6 +2548,8 @@ ]; "landisgyr_heat_meter" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -2290,10 +2576,12 @@ "ld2410_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -2301,6 +2589,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -2316,10 +2606,12 @@ "led_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -2327,6 +2619,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -2355,6 +2649,8 @@ ]; "lifx" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiolifx aiolifx-effects aiolifx-themes @@ -2373,6 +2669,8 @@ "limitlessled" = ps: with ps; [ limitlessled ]; + "linear_garage_door" = ps: with ps; [ + ]; # missing inputs: linear-garage-door "linksys_smart" = ps: with ps; [ ]; "linode" = ps: with ps; [ @@ -2400,6 +2698,8 @@ ]; "local_ip" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -2410,11 +2710,15 @@ ]; "locative" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "lock" = ps: with ps; [ ]; "logbook" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -2428,6 +2732,8 @@ ]; "logi_circle" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ha-ffmpeg logi-circle ]; @@ -2440,12 +2746,19 @@ ]; "loqed" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents loqedapi mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "lovelace" = ps: with ps; [ @@ -2471,6 +2784,8 @@ ]; # missing inputs: lw12 "lyric" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiolyric fnv-hash-fast psutil-home-assistant @@ -2478,20 +2793,28 @@ ]; "mailbox" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "mailgun" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pymailgunner ]; "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "map" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -2514,6 +2837,8 @@ ]; "matter" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant python-matter-server @@ -2530,10 +2855,12 @@ "medcom_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -2541,6 +2868,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -2554,13 +2883,19 @@ ]; # missing inputs: medcom-ble "media_extractor" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng yt-dlp ]; "media_player" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "media_source" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "mediaroom" = ps: with ps; [ pymediaroom @@ -2573,10 +2908,12 @@ "melnor" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -2584,6 +2921,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -2597,6 +2936,8 @@ ]; # missing inputs: melnor-bluetooth "meraki" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "message_bird" = ps: with ps; [ messagebird @@ -2625,14 +2966,20 @@ ]; # missing inputs: pycsspeechtts "microsoft_face" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "microsoft_face_detect" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "microsoft_face_identify" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "mijndomein_energie" = ps: with ps; [ @@ -2657,10 +3004,12 @@ "moat" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -2668,6 +3017,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -2682,7 +3033,10 @@ ]; "mobile_app" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents @@ -2690,6 +3044,7 @@ pillow psutil-home-assistant pynacl + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -2701,6 +3056,8 @@ ]; "modem_callerid" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast phone-modem psutil-home-assistant @@ -2724,10 +3081,12 @@ "mopeka" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -2735,6 +3094,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -2749,6 +3110,8 @@ ]; "motion_blinds" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr motionblinds @@ -2757,33 +3120,47 @@ ]; "motioneye" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng motioneye-client ]; + "motionmount" = ps: with ps; [ + ]; # missing inputs: python-MotionMount "mpd" = ps: with ps; [ mpd2 ]; "mqtt" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "mqtt_eventstream" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "mqtt_json" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "mqtt_room" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; @@ -2801,6 +3178,8 @@ ]; "my" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -2809,16 +3188,19 @@ sqlalchemy ]; "myq" = ps: with ps; [ - python-myq ]; "mysensors" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt pymysensors ]; "mystrom" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng python-mystrom ]; "mythicbeastsdns" = ps: with ps; [ @@ -2838,6 +3220,8 @@ ]; "neato" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pybotvac @@ -2851,6 +3235,8 @@ ]; "nest" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast google-nest-sdm ha-ffmpeg @@ -2859,13 +3245,17 @@ ]; "netatmo" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen psutil-home-assistant pyatmo + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -2881,9 +3271,13 @@ ]; "netio" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; # missing inputs: pynetio "network" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -2928,6 +3322,8 @@ ]; "nmap_tracker" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast getmac ifaddr @@ -2966,6 +3362,8 @@ ]; "nuki" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pynuki ]; "numato" = ps: with ps; [ @@ -3008,6 +3406,8 @@ ]; "onboarding" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast pillow psutil-home-assistant @@ -3018,6 +3418,8 @@ ]; "ondilo_ico" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ondilo ]; "onewire" = ps: with ps; [ @@ -3036,6 +3438,8 @@ ]; "openai_conversation" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng hassil home-assistant-intents openai @@ -3091,10 +3495,12 @@ "oralb" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -3102,6 +3508,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -3121,10 +3529,14 @@ "orvibo" = ps: with ps; [ orvibo ]; + "osoenergy" = ps: with ps; [ + ]; # missing inputs: pyosoenergyapi "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otbr" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast ifaddr @@ -3150,6 +3562,8 @@ "otp" = ps: with ps; [ pyotp ]; + "ourgroceries" = ps: with ps; [ + ]; # missing inputs: ourgroceries "overkiz" = ps: with ps; [ pyoverkiz ]; @@ -3158,14 +3572,21 @@ ]; "owntracks" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents janus mutagen paho-mqtt + psutil-home-assistant pynacl + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "p1_monitor" = ps: with ps; [ @@ -3182,6 +3603,8 @@ ]; "panel_custom" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -3191,6 +3614,8 @@ ]; "panel_iframe" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -3213,10 +3638,14 @@ ]; "pepco" = ps: with ps; [ ]; + "permobil" = ps: with ps; [ + ]; # missing inputs: mypermobil "persistent_notification" = ps: with ps; [ ]; "person" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pillow ]; "pge" = ps: with ps; [ @@ -3245,12 +3674,19 @@ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant pyplaato + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "plant" = ps: with ps; [ @@ -3260,6 +3696,8 @@ ]; "plex" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng plexapi plexauth plexwebsocket @@ -3274,6 +3712,8 @@ ]; "point" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pypoint ]; "poolsense" = ps: with ps; [ @@ -3287,10 +3727,12 @@ "private_ble_device" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -3298,6 +3740,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -3320,6 +3764,8 @@ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng prometheus-client ]; "prosegur" = ps: with ps; [ @@ -3342,6 +3788,8 @@ ]; # missing inputs: pyps4-2ndscreen "pse" = ps: with ps; [ ]; + "psoklahoma" = ps: with ps; [ + ]; "pulseaudio_loopback" = ps: with ps; [ pulsectl ]; @@ -3353,6 +3801,8 @@ ]; "push" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "pushbullet" = ps: with ps; [ pushbullet-py @@ -3372,17 +3822,18 @@ ]; "python_script" = ps: with ps; [ restrictedpython - restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent "qingping" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -3390,6 +3841,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -3428,12 +3881,19 @@ ]; "rachio" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg rachiopy + sqlalchemy webrtc-noise-gain ]; "radarr" = ps: with ps; [ @@ -3463,10 +3923,12 @@ "rapt_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -3474,6 +3936,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -3488,6 +3952,8 @@ ]; "raspberry_pi" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng psutil-home-assistant ]; "raspyrfm" = ps: with ps; [ @@ -3507,7 +3973,10 @@ ]; "recovery_mode" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-frontend @@ -3516,6 +3985,7 @@ mutagen pillow psutil-home-assistant + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -3525,6 +3995,8 @@ "reddit" = ps: with ps; [ praw ]; + "refoss" = ps: with ps; [ + ]; # missing inputs: refoss-ha "rejseplanen" = ps: with ps; [ rjpl ]; @@ -3540,13 +4012,18 @@ renault-api ]; "renson" = ps: with ps; [ - ]; # missing inputs: renson-endura-delta + renson-endura-delta + ]; "reolink" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng reolink-aio ]; "repairs" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetierng @@ -3566,6 +4043,8 @@ ]; "rhasspy" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "ridwell" = ps: with ps; [ aioridwell @@ -3573,7 +4052,8 @@ "ring" = ps: with ps; [ ha-ffmpeg ring-doorbell - ]; + ] + ++ ring-doorbell.optional-dependencies.listen; "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "risco" = ps: with ps; [ @@ -3587,6 +4067,7 @@ ]; "roborock" = ps: with ps; [ python-roborock + vacuum-map-parser-roborock ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API @@ -3612,11 +4093,15 @@ ]; "rss_feed_template" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "rtorrent" = ps: with ps; [ ]; "rtsp_to_webrtc" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg rtsp-to-webrtc ]; @@ -3629,6 +4114,8 @@ ]; # missing inputs: russound "ruuvi_gateway" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway bleak bleak-retry-connector @@ -3637,6 +4124,7 @@ bluetooth-data-tools dbus-fast fnv-hash-fast + habluetooth psutil-home-assistant pyserial pyudev @@ -3645,10 +4133,12 @@ "ruuvitag_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -3656,6 +4146,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -3678,6 +4170,8 @@ ]; "samsungtv" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast getmac @@ -3703,6 +4197,8 @@ ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter + "scl" = ps: with ps; [ + ]; "scrape" = ps: with ps; [ beautifulsoup4 jsonpath @@ -3720,6 +4216,8 @@ ]; # missing inputs: scsgate "search" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -3741,10 +4239,12 @@ "sensirion_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -3752,6 +4252,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -3774,10 +4276,12 @@ "sensorpro" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -3785,6 +4289,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -3800,10 +4306,12 @@ "sensorpush" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -3811,6 +4319,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -3828,6 +4338,8 @@ ]; "senz" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiosenz fnv-hash-fast psutil-home-assistant @@ -3857,6 +4369,8 @@ ]; "shelly" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioshelly bleak bleak-retry-connector @@ -3865,6 +4379,7 @@ bluetooth-data-tools dbus-fast fnv-hash-fast + habluetooth psutil-home-assistant pyserial pyudev @@ -3875,6 +4390,8 @@ ]; "shopping_list" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "sia" = ps: with ps; [ pysiaalarm @@ -3928,6 +4445,8 @@ ]; # missing inputs: goslide-api "slimproto" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioslimproto ]; "sma" = ps: with ps; [ @@ -3935,6 +4454,8 @@ ]; "smappee" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pysmappee ]; "smart_blinds" = ps: with ps; [ @@ -3948,13 +4469,20 @@ ]; "smartthings" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant pysmartapp pysmartthings + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "smarttub" = ps: with ps; [ @@ -3973,19 +4501,23 @@ ]; "snips" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "snmp" = ps: with ps; [ - pysnmplib + pysnmp-lextudio ]; "snooz" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -3993,6 +4525,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -4033,6 +4567,8 @@ ]; "sonos" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -4054,6 +4590,8 @@ ]; "spaceapi" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "spc" = ps: with ps; [ pyspcwebgw @@ -4068,6 +4606,8 @@ ]; # missing inputs: hass-splunk "spotify" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant spotipy @@ -4075,6 +4615,7 @@ ]; "sql" = ps: with ps; [ sqlalchemy + sqlparse ]; "squeezebox" = ps: with ps; [ pysqueezebox @@ -4084,6 +4625,8 @@ ]; "ssdp" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -4114,6 +4657,8 @@ ]; "steamist" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiosteamist discovery30303 fnv-hash-fast @@ -4131,6 +4676,8 @@ ]; # missing inputs: stookwijzer "stream" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ha-av numpy pyturbojpeg @@ -4140,6 +4687,8 @@ ]; "stt" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "subaru" = ps: with ps; [ subarulink @@ -4149,6 +4698,9 @@ ]; "sun" = ps: with ps; [ ]; + "sunweg" = ps: with ps; [ + sunweg + ]; "supervisord" = ps: with ps; [ ]; "supla" = ps: with ps; [ @@ -4156,6 +4708,8 @@ "surepetcare" = ps: with ps; [ surepy ]; + "swepco" = ps: with ps; [ + ]; "swiss_hydrological_data" = ps: with ps; [ swisshydrodata ]; @@ -4174,10 +4728,12 @@ "switchbot" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -4185,6 +4741,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -4198,7 +4756,8 @@ zeroconf ]; "switchbot_cloud" = ps: with ps; [ - ]; # missing inputs: switchbot-api + switchbot-api + ]; "switcher_kis" = ps: with ps; [ aioswitcher ]; @@ -4217,6 +4776,8 @@ ]; "synology_dsm" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng py-synologydsm-api ]; "synology_srm" = ps: with ps; [ @@ -4225,6 +4786,8 @@ ]; "system_bridge" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4233,6 +4796,8 @@ ]; # missing inputs: systembridgeconnector "system_health" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "system_log" = ps: with ps; [ ]; @@ -4247,6 +4812,9 @@ "tailscale" = ps: with ps; [ tailscale ]; + "tailwind" = ps: with ps; [ + gotailwind + ]; "tami4" = ps: with ps; [ ]; # missing inputs: Tami4EdgeAPI "tank_utility" = ps: with ps; [ @@ -4259,6 +4827,8 @@ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng hatasmota janus paho-mqtt @@ -4273,11 +4843,15 @@ ]; "telegram" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pysocks python-telegram-bot ]; "telegram_bot" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pysocks python-telegram-bot ]; @@ -4302,6 +4876,8 @@ "tesla_wall_connector" = ps: with ps; [ tesla-wall-connector ]; + "tessie" = ps: with ps; [ + ]; # missing inputs: tessie-api "text" = ps: with ps; [ ]; "tfiac" = ps: with ps; [ @@ -4309,10 +4885,12 @@ "thermobeacon" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -4320,6 +4898,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -4337,10 +4917,12 @@ "thermopro" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -4348,6 +4930,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -4373,6 +4957,8 @@ ]; "thread" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4397,10 +4983,12 @@ "tilt_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -4408,6 +4996,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -4433,6 +5023,8 @@ ]; "todo" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "todoist" = ps: with ps; [ todoist-api-python @@ -4447,16 +5039,25 @@ ]; "toon" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy toonapi webrtc-noise-gain ]; "torque" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "totalconnect" = ps: with ps; [ total-connect-client @@ -4465,12 +5066,15 @@ ]; # missing inputs: pytouchline "tplink" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant python-kasa sqlalchemy - ]; # missing inputs: python-kasa.optional-dependencies.speedups + ] + ++ python-kasa.optional-dependencies.speedups; "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected "tplink_omada" = ps: with ps; [ @@ -4478,6 +5082,8 @@ ]; "traccar" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pytraccar stringcase ]; @@ -4515,6 +5121,9 @@ ]; "tts" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + ha-ffmpeg mutagen ]; "tuya" = ps: with ps; [ @@ -4526,14 +5135,20 @@ ]; "twilio" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng twilio ]; "twinkly" = ps: with ps; [ @@ -4541,6 +5156,8 @@ ]; "twitch" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4567,13 +5184,14 @@ aiounifi ]; "unifi_direct" = ps: with ps; [ - pexpect - ]; + ]; # missing inputs: unifi_ap "unifiled" = ps: with ps; [ unifiled ]; "unifiprotect" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyunifiprotect unifi-discovery ]; @@ -4592,6 +5210,8 @@ ]; "upnp" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast getmac @@ -4609,6 +5229,8 @@ ]; "usb" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -4624,15 +5246,23 @@ "uvc" = ps: with ps; [ uvcclient ]; + "v2c" = ps: with ps; [ + pytrydan + ]; "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ vallox-websocket-api ]; + "valve" = ps: with ps; [ + ]; "vasttrafik" = ps: with ps; [ - ]; # missing inputs: vtjp + vtjp + ]; "velbus" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -4690,6 +5320,9 @@ ]; "voip" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + ha-ffmpeg hassil home-assistant-intents mutagen @@ -4746,12 +5379,16 @@ ]; "webhook" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "webostv" = ps: with ps; [ aiowebostv ]; "websocket_api" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4777,19 +5414,25 @@ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiowithings fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen psutil-home-assistant + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain ]; "wiz" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4816,12 +5459,22 @@ "wsdot" = ps: with ps; [ ]; "wyoming" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + ha-ffmpeg + hassil + home-assistant-intents + mutagen + webrtc-noise-gain wyoming ]; "x10" = ps: with ps; [ ]; "xbox" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4839,10 +5492,12 @@ "xiaomi_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -4850,6 +5505,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -4871,6 +5528,7 @@ pymitv ]; "xmpp" = ps: with ps; [ + emoji slixmpp ]; "xs1" = ps: with ps; [ @@ -4883,10 +5541,12 @@ "yalexs_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak + bleak-esphome bleak-retry-connector bluetooth-adapters bluetooth-auto-recovery @@ -4894,6 +5554,8 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg + habluetooth hassil home-assistant-intents ifaddr @@ -4911,6 +5573,8 @@ ]; "yamaha_musiccast" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiomusiccast async-upnp-client fnv-hash-fast @@ -4929,6 +5593,8 @@ ]; "yeelight" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -4945,6 +5611,8 @@ ]; "yolink" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4955,6 +5623,8 @@ ]; "youtube" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4970,6 +5640,8 @@ ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4986,6 +5658,8 @@ ]; # missing inputs: zeversolar "zha" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -5017,6 +5691,8 @@ ]; "zwave_js" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -5026,6 +5702,8 @@ ]; "zwave_me" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -5069,9 +5747,9 @@ "android_ip_webcam" "androidtv" "androidtv_remote" + "anova" "anthemav" "apache_kafka" - "apcupsd" "api" "apple_tv" "application_credentials" @@ -5155,6 +5833,7 @@ "demo" "denonavr" "derivative" + "devialet" "device_automation" "device_sun_light_trigger" "device_tracker" @@ -5173,6 +5852,7 @@ "doorbird" "dormakaba_dkey" "dremel_3d_printer" + "drop_connect" "dsmr" "dsmr_reader" "dte_energy_bridge" @@ -5180,6 +5860,7 @@ "dunehd" "duotecno" "dwd_weather_warnings" + "dynalite" "eafm" "easyenergy" "ecobee" @@ -5222,6 +5903,7 @@ "file_upload" "filesize" "filter" + "fints" "fireservicerota" "firmata" "fitbit" @@ -5250,6 +5932,7 @@ "frontier_silicon" "fully_kiosk" "garages_amsterdam" + "gardena_bluetooth" "gdacs" "generic" "generic_hygrostat" @@ -5301,6 +5984,7 @@ "history_stats" "hive" "hlk_sw16" + "holiday" "home_connect" "home_plus_control" "homeassistant" @@ -5463,6 +6147,7 @@ "nest" "netatmo" "netgear" + "netgear_lte" "network" "nexia" "nextbus" @@ -5567,6 +6252,7 @@ "reddit" "remote" "renault" + "renson" "reolink" "repairs" "rest" @@ -5663,23 +6349,30 @@ "steamist" "stookalert" "stream" + "streamlabswater" "stt" "subaru" + "suez_water" "sun" + "sunweg" "surepetcare" + "swiss_public_transport" "switch" "switch_as_x" "switchbee" "switchbot" + "switchbot_cloud" "switcher_kis" "syncthing" "syncthru" "synology_dsm" "system_health" "system_log" + "systemmonitor" "tado" "tag" "tailscale" + "tailwind" "tankerkoenig" "tasmota" "tautulli" @@ -5709,6 +6402,7 @@ "tomorrowio" "toon" "totalconnect" + "tplink" "tplink_omada" "traccar" "trace" @@ -5730,7 +6424,6 @@ "uk_transport" "ukraine_alarm" "unifi" - "unifi_direct" "unifiprotect" "universal" "upb" @@ -5743,8 +6436,10 @@ "usgs_earthquakes_feed" "utility_meter" "uvc" + "v2c" "vacuum" "vallox" + "valve" "velbus" "venstar" "vera" diff --git a/pkgs/servers/home-assistant/custom-components/README.md b/pkgs/servers/home-assistant/custom-components/README.md index a7244b25c173b..888ea97e45535 100644 --- a/pkgs/servers/home-assistant/custom-components/README.md +++ b/pkgs/servers/home-assistant/custom-components/README.md @@ -25,7 +25,7 @@ versions into the Python environment. }: buildHomeAssistantComponent { - # pname, version + # owner, domain, version src = fetchFromGithub { # owner, repo, rev, hash @@ -39,19 +39,36 @@ buildHomeAssistantComponent { # changelog, description, homepage, license, maintainers } } +``` -## Package name normalization +## Package attribute -Apply the same normalization rules as defined for python packages in -[PEP503](https://peps.python.org/pep-0503/#normalized-names). -The name should be lowercased and dots, underlines or multiple -dashes should all be replaced by a single dash. +The attribute name must reflect the domain as seen in the +`manifest.json`, which in turn will match the python module name below +in the `custom_components/` directory. + +**Example:** + +The project [mweinelt/ha-prometheus-sensor](https://github.com/mweinelt/ha-prometheus-sensor/blob/1.0.0/custom_components/prometheus_sensor/manifest.json#L2) +would receive the attribute name `"prometheus_sensor"`, because both +domain in the `manifest.json` as well as the module name are +`prometheus_sensor`. + +## Package name + +The `pname` attribute is a composition of both `owner` and `domain`. + +Don't set `pname`, set `owner and `domain` instead. + +Exposing the `domain` attribute separately allows checking for +conflicting components at eval time. ## Manifest check The `buildHomeAssistantComponent` builder uses a hook to check whether the dependencies specified in the `manifest.json` are present and -inside the specified version range. +inside the specified version range. It also makes sure derivation +and manifest agree about the domain name. There shouldn't be a need to disable this hook, but you can set `dontCheckManifest` to `true` in the derivation to achieve that. diff --git a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix new file mode 100644 index 0000000000000..1d2ae2228a5b2 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitHub +, buildHomeAssistantComponent +, ulid-transform +}: + +buildHomeAssistantComponent rec { + owner = "basnijholt"; + domain = "adaptive_lighting"; + version = "1.19.1"; + + src = fetchFromGitHub { + owner = "basnijholt"; + repo = "adaptive-lighting"; + rev = "refs/tags/${version}"; + hash = "sha256-AZsloE1vNQ9o2pg878J6I5qYXyI4fqYEvr18SrTocWo="; + }; + + propagatedBuildInputs = [ + ulid-transform + ]; + + meta = with lib; { + changelog = "https://github.com/basnijholt/adaptive-lighting/releases/tag/${version}"; + description = "Home Assistant Adaptive Lighting Plugin - Sun Synchronized Lighting"; + homepage = "https://github.com/basnijholt/adaptive-lighting"; + maintainers = with maintainers; [ mindstorms6 ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 4a96b305964ae..c5c6ae60362ea 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -2,5 +2,15 @@ }: { - prometheus-sensor = callPackage ./prometheus-sensor {}; + adaptive_lighting = callPackage ./adaptive_lighting {}; + + govee-lan = callPackage ./govee-lan {}; + + gpio = callPackage ./gpio {}; + + miele = callPackage ./miele {}; + + prometheus_sensor = callPackage ./prometheus_sensor {}; + + waste_collection_schedule = callPackage ./waste_collection_schedule {}; } diff --git a/pkgs/servers/home-assistant/custom-components/govee-lan/default.nix b/pkgs/servers/home-assistant/custom-components/govee-lan/default.nix new file mode 100644 index 0000000000000..60c58bb85850d --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/govee-lan/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildHomeAssistantComponent +, fetchFromGitHub +, govee-led-wez +}: + +buildHomeAssistantComponent { + owner = "wez"; + domain = "govee_lan"; + version = "unstable-2023-06-10"; + + src = fetchFromGitHub { + owner = "wez"; + repo = "govee-lan-hass"; + rev = "18d8455510d158496f7e5d4f0286f58bd61042bb"; + hash = "sha256-ZhrxEPBEi+Z+2ZOAQ1amhO0tqvhM6tyFQgoRIVNDtXY="; + }; + + dontBuild = true; + + propagatedBuildInputs = [ + govee-led-wez + ]; + + # enable when pytest-homeassistant-custom-component is packaged + doCheck = false; + + # nativeCheckInputs = [ + # pytest-homeassistant-custom-component + # pytestCheckHook + # ]; + + meta = with lib; { + description = "Control Govee lights via the LAN API from Home Assistant"; + homepage = "https://github.com/wez/govee-lan-hass"; + maintainers = with maintainers; [ SuperSandro2000 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/gpio/default.nix b/pkgs/servers/home-assistant/custom-components/gpio/default.nix new file mode 100644 index 0000000000000..98cf56a3b52a0 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/gpio/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildHomeAssistantComponent +, fetchFromGitea +, libgpiod +}: + +buildHomeAssistantComponent rec { + owner = "raboof"; + domain = "gpio"; + version = "0.0.2"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "raboof"; + repo = "ha-gpio"; + rev = "v${version}"; + hash = "sha256-oito5W7uQYgxUQFIynW9G7jbIpmFONWC8FslRdX3gsE="; + }; + + propagatedBuildInputs = [ libgpiod ]; + + meta = with lib; { + description = "Home Assistant GPIO custom integration"; + homepage = "https://codeberg.org/raboof/ha-gpio"; + maintainers = with maintainers; [ raboof ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/miele/default.nix b/pkgs/servers/home-assistant/custom-components/miele/default.nix new file mode 100644 index 0000000000000..71624f674b4d7 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/miele/default.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, + flatdict, + pymiele, +}: +buildHomeAssistantComponent rec { + owner = "astrandb"; + domain = "miele"; + version = "0.1.19"; + + src = fetchFromGitHub { + inherit owner; + repo = domain; + rev = "refs/tags/v${version}"; + hash = "sha256-od7DV10/rkIw9eFMsTRw4bMmhQo9BAmw2rCbKKySeIk="; + }; + + propagatedBuildInputs = [ + flatdict + pymiele + ]; + + # Makefile only used for bumping the version + dontBuild = true; + + meta = with lib; { + changelog = "https://github.com/astrandb/miele/releases/tag/v${version}"; + description = "A modern integration for Miele devices in Home Assistant"; + homepage = "https://github.com/astrandb/miele"; + maintainers = with maintainers; [jamiemagee]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/prometheus-sensor/default.nix b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/default.nix index 07bcd9abec1ca..2368d85552b25 100644 --- a/pkgs/servers/home-assistant/custom-components/prometheus-sensor/default.nix +++ b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/default.nix @@ -4,7 +4,8 @@ }: buildHomeAssistantComponent rec { - pname = "prometheus-sensor"; + owner = "mweinelt"; + domain = "prometheus_sensor"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix new file mode 100644 index 0000000000000..513d593ce51d3 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildHomeAssistantComponent +, fetchFromGitHub +, fetchpatch +, beautifulsoup4 +, icalendar +, icalevents +, lxml +, recurring-ical-events +}: + +buildHomeAssistantComponent rec { + owner = "mampfes"; + domain = "waste_collection_schedule"; + version = "1.44.0"; + + src = fetchFromGitHub { + inherit owner; + repo = "hacs_${domain}"; + rev = "refs/tags/${version}"; + hash = "sha256-G1x7HtgdtK+IaPAfxT+7xsDJi5FnXN4Pg3q7T5Xr8lA="; + }; + + patches = [ + # Corrects a dependency on beautifulsoup4 + (fetchpatch { + url = "https://github.com/mampfes/hacs_waste_collection_schedule/pull/1515.patch"; + hash = "sha256-dvmicKTjolEcCrKRtZfpN0M/9RQCEQkFk+M6E+qCqfQ="; + }) + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + icalendar + icalevents + lxml + recurring-ical-events + ]; + + meta = with lib; { + changelog = "https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/${version}"; + description = "Home Assistant integration framework for (garbage collection) schedules"; + homepage = "https://github.com/mampfes/hacs_waste_collection_schedule"; + maintainers = with maintainers; [jamiemagee]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix index 4bb1e63b5f7f1..49bdb62ad85e0 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix @@ -2,7 +2,13 @@ }: { + light-entity-card = callPackage ./light-entity-card { }; + mini-graph-card = callPackage ./mini-graph-card {}; mini-media-player = callPackage ./mini-media-player {}; + + mushroom = callPackage ./mushroom { }; + + zigbee2mqtt-networkmap = callPackage ./zigbee2mqtt-networkmap { }; } diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/default.nix new file mode 100644 index 0000000000000..38b071f165648 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "light-entity-card"; + version = "6.1.1"; + + src = fetchFromGitHub { + owner = "ljmerza"; + repo = "light-entity-card"; + rev = "refs/tags/${version}"; + hash = "sha256-LoZt65oAw52NxVFgV9kVDr65CX5G6Xek2zDafDIxXmw="; + }; + + npmDepsHash = "sha256-EZDTWtn3joikwiC5Kfn94+tXRDpBhMDHqHozfIkfbJ0="; + + env.NODE_OPTIONS = "--openssl-legacy-provider"; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -v dist/light-entity-card.js* $out/ + + runHook postInstall + ''; + + passthru.entrypoint = "light-entity-card.js"; + + meta = with lib; { + description = "Control any light or switch entity"; + homepage = "https://github.com/ljmerza/light-entity-card"; + changelog = "https://github.com/ljmerza/light-entity-card/releases/tag/${version}"; + maintainers = with maintainers; [ SuperSandro2000 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix index 6945b18bde20b..96decc53eeb42 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mini-media-player"; - version = "1.16.5"; + version = "1.16.8"; src = fetchFromGitHub { owner = "kalkih"; repo = "mini-media-player"; rev = "v${version}"; - hash = "sha256-ydkY7Qx2GMh4CpvvBAQubJ7PlxSscDZRJayn82bOczM="; + hash = "sha256-mBxK/Y+gesaJwPYHB4P8FCkyfoV9lwC8jAzPZJV+B+M="; }; - npmDepsHash = "sha256-v9NvZOrQPMOoG3LKACnu79jKgZtcnGiopWad+dFbplw="; + npmDepsHash = "sha256-kuEgX5PX7RKhaJPzx+GW37TiSISvz+51tKGacvAMlfg="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix new file mode 100644 index 0000000000000..6e8eab20b3595 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "mushroom"; + version = "3.2.4"; + + src = fetchFromGitHub { + owner = "piitaya"; + repo = "lovelace-mushroom"; + rev = "v${version}"; + hash = "sha256-UV/kqeVslB1lc1a9uvj8ocQKeAVINwo3aH8oHC9GLBQ="; + }; + + npmDepsHash = "sha256-p43ks6HM23LK3LOBOZA0uV+DTOj89/boBpjcXpbcw24="; + + installPhase = '' + runHook preInstall + + mkdir $out + install -m0644 dist/mushroom.js $out + + runHook postInstall + ''; + + meta = with lib; { + changelog = "https://github.com/piitaya/lovelace-mushroom/releases/tag/v${version}"; + description = "Mushroom Cards - Build a beautiful dashboard easily"; + homepage = "https://github.com/piitaya/lovelace-mushroom"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix new file mode 100644 index 0000000000000..f8e75ede01568 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix @@ -0,0 +1,59 @@ +{ lib +, fetchFromGitHub +, fetchYarnDeps +, mkYarnPackage +}: + +mkYarnPackage rec { + pname = "zigbee2mqtt-networkmap"; + version = "unstable-2023-12-16"; + + src = fetchFromGitHub { + owner = "azuwis"; + repo = "zigbee2mqtt-networkmap"; + rev = "7851357d78ebc0d1cc3cb5c661267a1e8b4c09e3"; + hash = "sha256-x7RVy0stWT6+8f0/0VORVBgGpBbsbyJBC38xIxXhzos="; + }; + + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-s+vnyUeJKkkA5G0AmsfIG0Zh4bYdDc2B5MSNvdwhjgs="; + }; + + configurePhase = '' + cp -r $node_modules node_modules + chmod +w node_modules + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -v dist/zigbee2mqtt-networkmap.js $out/ + + runHook postInstall + ''; + + dontFixup = true; + + doDist = false; + + passthru.entrypoint = "zigbee2mqtt-networkmap.js"; + + meta = with lib; { + description = "Home Assistant Custom Card to show Zigbee2mqtt network map"; + homepage = "https://github.com/azuwis/zigbee2mqtt-networkmap"; + maintainers = with maintainers; [ azuwis ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json new file mode 100644 index 0000000000000..3ab2dbb933ae7 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json @@ -0,0 +1,25 @@ +{ + "name": "zigbee2mqtt-networkmap", + "version": "0.1.0", + "private": true, + "scripts": { + "serve": "vue-cli-service serve", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint" + }, + "dependencies": { + "vue": "^2.7.15" + }, + "devDependencies": { + "@material/mwc-button": "^0.27.0", + "@vue/cli-plugin-eslint": "^5.0.8", + "@vue/cli-service": "^5.0.8", + "@vue/eslint-config-standard": "^8.0.1", + "@babel/core": "^7.0.0", + "@babel/eslint-parser": "^7.0.0", + "eslint": "^8.42.0", + "eslint-plugin-vue": "^9.14.1", + "lodash.isequal": "^4.5.0", + "vue-d3-network": "^0.1.28" + } +} diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1c0de10079625..17e142b6ab438 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -3,6 +3,7 @@ , callPackage , fetchFromGitHub , fetchPypi +, fetchpatch , python311 , substituteAll , ffmpeg-headless @@ -30,23 +31,70 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (self: super: { - aioairq = super.aioairq.overridePythonAttrs (oldAttrs: rec { - version = "0.2.4"; + aiogithubapi = super.aiogithubapi.overridePythonAttrs (oldAttrs: rec { + version = "22.10.1"; src = fetchFromGitHub { - owner = "CorantGmbH"; - repo = "aioairq"; + owner = "ludeeus"; + repo = "aiogithubapi"; + rev = "refs/tags/${version}"; + hash = "sha256-ceBuqaMqqL6qwN52765MG4sLt+08hx2G9rUVNC7x6ik="; + }; + propagatedBuildInputs = with self; [ + aiohttp + async-timeout + backoff + ]; + }); + + aionotion = super.aionotion.overridePythonAttrs (oldAttrs: rec { + version = "2023.05.5"; + src = fetchFromGitHub { + owner = "bachya"; + repo = "aionotion"; + rev = "refs/tags/${version}"; + hash = "sha256-/2sF8m5R8YXkP89bi5zR3h13r5LrFOl1OsixAcX0D4o="; + }; + patches = [ + (fetchpatch { + # clean up build dependencies; https://github.com/bachya/aionotion/commit/53c7285110d12810f9b43284295f71d052a81b83 + url = "https://github.com/bachya/aionotion/commit/53c7285110d12810f9b43284295f71d052a81b83.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + }); + + aiopurpleair = super.aiopurpleair.overridePythonAttrs (oldAttrs: rec { + version = "2022.12.1"; + src = fetchFromGitHub { + owner = "bachya"; + repo = "aiopurpleair"; + rev = "refs/tags/${version}"; + hash = "sha256-YmJH4brWkTpgzyHwu9UnIWrY5qlDCmMtvF+KxQFXwfk="; + }; + postPatch = '' + substituteInPlace pyproject.toml --replace \ + '"setuptools >= 35.0.2", "wheel >= 0.29.0", "poetry>=0.12"' \ + '"poetry-core"' + ''; + }); + + aiopvapi = super.aiopvapi.overridePythonAttrs (oldAttrs: rec { + version = "2.0.4"; + src = fetchFromGitHub { + owner = "sander76"; + repo = "aio-powerview-api"; rev = "refs/tags/v${version}"; - hash = "sha256-+5FyBfsB3kjyX/V9CdZ072mZ3THyvALyym+uk7/kZLo="; + hash = "sha256-cghfNi5T343/7GxNLDrE0iAewMlRMycQTP7SvDVpU2M="; }; }); - # https://github.com/home-assistant/core/pull/101913 - aiohttp = super.aiohttp.overridePythonAttrs (old: rec { - version = "3.8.5"; - src = fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-uVUuxSzBR9vxlErHrJivdgLlHqLc0HbtGUyjwNHH0Lw="; + aioskybell = super.aioskybell.overridePythonAttrs (oldAttrs: rec { + version = "22.7.0"; + src = fetchFromGitHub { + owner = "tkdrob"; + repo = "aioskybell"; + rev = "refs/tags/${version}"; + hash = "sha256-aBT1fDFtq1vasTvCnAXKV2vmZ6LBLZqRCiepv1HDJ+Q="; }; }); @@ -58,6 +106,20 @@ let rev = "refs/tags/${version}"; hash = "sha256-tWnxGLJT+CRFvkhxFamHxnLXBvoR8tfOvzH1o1i5JJg="; }; + postPatch = '' + substituteInPlace pyproject.toml --replace \ + '"setuptools >= 35.0.2", "wheel >= 0.29.0", "poetry>=0.12"' \ + '"poetry-core"' + ''; + }); + + amberelectric = super.amberelectric.overridePythonAttrs (oldAttrs: rec { + version = "1.0.4"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-5SWJnTxRm6mzP0RxrgA+jnV+Gp23WjqQA57wbT2V9Dk="; + }; }); astral = super.astral.overridePythonAttrs (oldAttrs: rec { @@ -105,13 +167,14 @@ let rev = "refs/tags/${version}"; hash = "sha256-iqlKfpnETLqQwy5sNcK2x/TgmuN2hCfYoHEFK2WWVXI="; }; - nativeBuildInputs = with super; [ + nativeBuildInputs = with self; [ setuptools ]; - propagatedBuildInputs = with super; [ + propagatedBuildInputs = with self; [ aenum aiohttp pydantic + requests ]; doCheck = false; # requires asynctest, which does not work on python 3.11 }); @@ -135,11 +198,6 @@ let }; }); - # moto tests are a nuissance - moto = super.moto.overridePythonAttrs (_: { - doCheck = false; - }); - notifications-android-tv = super.notifications-android-tv.overridePythonAttrs (oldAttrs: rec { version = "0.1.5"; format = "setuptools"; @@ -151,11 +209,11 @@ let hash = "sha256-adkcUuPl0jdJjkBINCTW4Kmc16C/HzL+jaRZB/Qr09A="; }; - nativeBuildInputs = with super; [ + nativeBuildInputs = with self; [ setuptools ]; - propagatedBuildInputs = with super; [ + propagatedBuildInputs = with self; [ requests ]; @@ -183,24 +241,6 @@ let }; }); - p1monitor = super.p1monitor.overridePythonAttrs (oldAttrs: rec { - version = "2.1.1"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; - hash = "sha256-VHY5AWxt5BZd1NQKzsgubEZBLKAlDNm8toyEazPUnDU="; - }; - }); - - psutil = super.psutil.overridePythonAttrs (oldAttrs: rec { - version = "5.9.6"; - src = fetchPypi { - pname = "psutil"; - inherit version; - hash = "sha256-5Lkt3NfdTN0/kAGA6h4QSTLHvOI0+4iXbio7KWRBIlo="; - }; - }); - py-synologydsm-api = super.py-synologydsm-api.overridePythonAttrs (oldAttrs: rec { version = "2.1.4"; src = fetchFromGitHub { @@ -231,6 +271,18 @@ let }; }); + pyaussiebb = super.pyaussiebb.overridePythonAttrs (oldAttrs: rec { + version = "0.0.18"; + src = fetchFromGitHub { + owner = "yaleman"; + repo = "aussiebb"; + rev = "refs/tags/v${version}"; + hash = "sha256-tEdddVsLFCHRvyLCctDakioiop2xWaJlfGE16P1ukHc="; + }; + }); + + pydantic = super.pydantic_1; + pydexcom = super.pydexcom.overridePythonAttrs (oldAttrs: rec { version = "0.2.3"; src = fetchFromGitHub { @@ -241,6 +293,16 @@ let }; }); + pydrawise = super.pydrawise.overridePythonAttrs (oldAttrs: rec { + version = "2023.11.0"; + src = fetchFromGitHub { + owner = "dknowles2"; + repo = "pydrawise"; + rev = "refs/tags/${version}"; + hash = "sha256-gKOyTvdETGzKlpU67UKaHYTIvnAX9znHIynP3BiVbt4="; + }; + }); + pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { version = "1.0.1"; src = fetchFromGitHub { @@ -260,6 +322,26 @@ let }; }); + python-kasa = super.python-kasa.overridePythonAttrs (oldAttrs: rec { + version = "0.5.4"; + src = fetchFromGitHub { + owner = "python-kasa"; + repo = "python-kasa"; + rev = "refs/tags/${version}"; + hash = "sha256-wGPMrYaTtKkkNW88eyiiciFcBSTRqqChYi6e15WUCHo="; + }; + }); + + python-roborock = super.python-roborock.overridePythonAttrs (oldAttrs: rec { + version = "0.38.0"; + src = fetchFromGitHub { + owner = "humbertogontijo"; + repo = "python-roborock"; + rev = "refs/tags/v${version}"; + hash = "sha256-jYESUMhLb5oiM3PWIIIU4dn/waGUnCAaXe0URnIq0C8="; + }; + }); + python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -269,16 +351,6 @@ let }; }); - python-tado = super.python-tado.overridePythonAttrs (oldAttrs: rec { - version = "0.15.0"; - src = fetchFromGitHub { - owner = "wmalgadey"; - repo = "PyTado"; - rev = "refs/tags/${version}"; - hash = "sha256-gduqQVw/a64aDzTHFmgZu7OVB53jZb7L5vofzL3Ho6s="; - }; - }); - pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { version = "9.0.1"; src = fetchFromGitHub { @@ -289,6 +361,35 @@ let }; }); + tesla-powerwall = super.tesla-powerwall.overridePythonAttrs (oldAttrs: rec { + version = "0.3.19"; + src = fetchFromGitHub { + owner = "jrester"; + repo = "tesla_powerwall"; + rev = "refs/tags/v${version}"; + hash = "sha256-ClrMgPAMBtDMfD6hCJIN1u4mp75QW+c3re28v3FreQg="; + }; + }); + + versioningit = super.versioningit.overridePythonAttrs (oldAttrs: rec { + version = "2.2.0"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-6xjnunJoqIC/HM/pLlNOlqs04Dl/KNy8s/wNpPaltr0="; + }; + }); + + voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec { + version = "0.13.1"; + src = fetchFromGitHub { + owner = "alecthomas"; + repo = "voluptuous"; + rev = "refs/tags/${version}"; + hash = "sha256-cz3Bd+/yPh+VOHxzi/W+gbDh/H5Nl/n4jvxDOirmAVk="; + }; + }); + # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; @@ -300,6 +401,29 @@ let }; }); + xbox-webapi = super.xbox-webapi.overridePythonAttrs (oldAttrs: rec { + version = "2.0.11"; + src = fetchFromGitHub { + owner = "OpenXbox"; + repo = "xbox-webapi-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-fzMB+I8+ZTJUiZovcuj+d5GdHY9BJyJd6j92EhJeIFI="; + }; + postPatch = '' + sed -i '/pytest-runner/d' setup.py + ''; + propagatedBuildInputs = with self; [ + aiohttp + appdirs + ms-cv + pydantic + ecdsa + ]; + nativeCheckInputs = with self; [ + aresponses + ]; + }); + # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; @@ -324,7 +448,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.11.2"; + hassVersion = "2024.1.5"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -332,34 +456,49 @@ in python.pkgs.buildPythonApplication rec { format = "pyproject"; # check REQUIRED_PYTHON_VER in homeassistant/const.py - disabled = python.pythonOlder "3.10"; + disabled = python.pythonOlder "3.11"; # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; - # Primary source is the pypi sdist, because it contains translations - src = fetchPypi { - inherit pname version; - hash = "sha256-cnneRq0hIyvgKo0du/52ze0IVs8TgTPNQM3T1kyy03s="; - }; - - # Secondary source is git for tests - gitSrc = fetchFromGitHub { + # Primary source is the git, which has the tests and allows bisecting the core + src = fetchFromGitHub { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-OljfYmlXSJVoWWsd4jcSF4nI/FXHqRA8e4LN5AaPVv8="; + hash = "sha256-6HPHoUpS2WXbYx7Tbqp9LLo25DyNzNd/THpSo7Y43Jw="; + }; + + # Secondary source is pypi sdist for translations + sdist = fetchPypi { + inherit pname version; + hash = "sha256-cptN6NgB/1qnvz+/EqDBQiH2vSQsOeSljSVFZBFXR5Y="; }; nativeBuildInputs = with python.pkgs; [ + pythonRelaxDepsHook setuptools - wheel ]; - # copy tests early, so patches apply as they would to the git repo + pythonRelaxDeps = [ + "awesomeversion" + "ciso8601" + "cryptography" + "home-assistant-bluetooth" + "httpx" + "jinja2" + "lru-dict" + "orjson" + "pyopenssl" + "typing-extensions" + "urllib3" + "voluptuous" + "yarl" + ]; + + # extract translations from pypi sdist prePatch = '' - cp --no-preserve=mode --recursive ${gitSrc}/tests ./ - chmod u+x tests/auth/providers/test_command_line_cmd.sh + tar --extract --gzip --file $sdist --strip-components 1 --wildcards "**/translations" ''; # leave this in, so users don't have to constantly update their downstream patch handling @@ -374,33 +513,7 @@ in python.pkgs.buildPythonApplication rec { }) ]; - postPatch = let - relaxedConstraints = [ - "aiohttp" - "attrs" - "awesomeversion" - "bcrypt" - "ciso8601" - "cryptography" - "home-assistant-bluetooth" - "httpx" - "ifaddr" - "orjson" - "pip" - "PyJWT" - "pyOpenSSL" - "PyYAML" - "requests" - "typing-extensions" - "voluptuous-serialize" - "yarl" - ]; - in '' - sed -r -i \ - ${lib.concatStringsSep "\n" (map (package: - ''-e 's/${package}[<>=]+.*/${package}",/g' \'' - ) relaxedConstraints)} - pyproject.toml + postPatch = '' substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' sed -i 's/setuptools[~=]/setuptools>/' pyproject.toml @@ -410,6 +523,9 @@ in python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ # Only packages required in pyproject.toml aiohttp + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng astral async-timeout atomicwrites-homeassistant @@ -436,6 +552,9 @@ in python.pkgs.buildPythonApplication rec { voluptuous voluptuous-serialize yarl + # REQUIREMENTS in homeassistant/auth/mfa_modules/totp.py and homeassistant/auth/mfa_modules/notify.py + pyotp + pyqrcode # Implicit dependency via homeassistant/requirements.py setuptools ]; @@ -460,19 +579,14 @@ in python.pkgs.buildPythonApplication rec { pytestCheckHook requests-mock respx - stdlib-list syrupy tomli - # required through tests/auth/mfa_modules/test_otp.py - pyotp # Sneakily imported in tests/conftest.py paho-mqtt ] ++ lib.concatMap (component: getPackages component python.pkgs) [ # some components are needed even if tests in tests/components are disabled "default_config" "hue" - # for tests/test_config.py::test_merge_id_schema - "qwikswitch" ]; pytestFlagsArray = [ @@ -485,14 +599,10 @@ in python.pkgs.buildPythonApplication rec { "--showlocals" # AssertionError: assert 1 == 0 "--deselect tests/test_config.py::test_merge" - # AssertionError: assert 2 == 1 - "--deselect=tests/helpers/test_translation.py::test_caching" - # AssertionError: assert None == RegistryEntry - "--deselect=tests/helpers/test_entity_registry.py::test_get_or_create_updates_data" - # AssertionError: assert 2 == 1 - "--deselect=tests/helpers/test_entity_values.py::test_override_single_value" # AssertionError: assert 'WARNING' not in '2023-11-10 ...nt abc[L]>\n'" "--deselect=tests/helpers/test_script.py::test_multiple_runs_repeat_choose" + # SystemError: PyThreadState_SetAsyncExc failed + "--deselect=tests/helpers/test_template.py::test_template_timeout" # tests are located in tests/ "tests" ]; @@ -542,5 +652,6 @@ in python.pkgs.buildPythonApplication rec { license = licenses.asl20; maintainers = teams.home-assistant.members; platforms = platforms.linux; + mainProgram = "hass"; }; } diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 1c7bc02172b28..c3584697ea01a 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20231030.2"; + version = "20240104.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-qzodzqWpAXZjwBJkiCyBi5zzfpEqqtauJn2PKZ5UtJ0="; + hash = "sha256-AQkrnU5UKsrl02CXDNf/aMTPII39poWJoZ4nBpySTZE="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 26fe812366d3a..8e5921ceb2ff6 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.10.16"; + version = "2024.1.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents-package"; rev = "refs/tags/${version}"; - hash = "sha256-qW5KzABEEBw2tu5+fAoWd8nCxuvTzEU14M8iaSo2WzE="; + hash = "sha256-uOrSvkzymG31nRmAgrn6z1IDJWahxqXHcPDflLPRVT4="; fetchSubmodules = true; }; diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index bb5e70994320b..436d1105b10de 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -41,6 +41,7 @@ PKG_SET = "home-assistant.python.pkgs" PKG_PREFERENCES = { "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 "HAP-python": "hap-python", + "SQLAlchemy": "sqlalchemy", "tensorflow": "tensorflow", "yt-dlp": "yt-dlp", } diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index b3652e734f192..8d49399e36f31 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.11.2"; + version = "2024.1.5"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-stVfFXb5QfC+wZUSk53+jt/hb8kO1gCcgeOnHHpNlWE="; + hash = "sha256-mS9GsJwscLQu+vApoxIWE1tZUcu3B3CTMFrcu96POEY="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 63cd9558a69dc..3cce799ec19a4 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -5,45 +5,53 @@ let # some components' tests have additional dependencies extraCheckInputs = with home-assistant.python.pkgs; { - airzone_cloud = [ aioairzone ]; - alexa = [ av ]; - bluetooth = [ pyswitchbot ]; - bthome = [ xiaomi-ble ]; - camera = [ av ]; - cloud = [ mutagen ]; - config = [ pydispatcher ]; - generic = [ av ]; - google_translate = [ mutagen ]; - google_sheets = [ oauth2client ]; - govee_ble = [ ibeacon-ble ]; - hassio = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; - homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zwave-js-server-python ]; - homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; - lovelace = [ pychromecast ]; - matrix = [ pydantic ]; - mopeka = [ pyswitchbot ]; - nest = [ av ]; - onboarding = [ pymetno radios rpi-bad-power ]; - otbr = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; - raspberry_pi = [ rpi-bad-power ]; - shelly = [ pyswitchbot ]; - tilt_ble = [ govee-ble ibeacon-ble ]; - tomorrowio = [ pyclimacell ]; - version = [ aioaseko ]; - xiaomi_miio = [ arrow ]; - voicerss = [ mutagen ]; - yandextts = [ mutagen ]; - zha = [ pydeconz ]; - zwave_js = [ homeassistant-pyozw ]; + airzone_cloud = [ + aioairzone + ]; + bluetooth = [ + pyswitchbot + ]; + govee_ble = [ + ibeacon-ble + ]; + lovelace = [ + pychromecast + ]; + matrix = [ + pydantic + ]; + mopeka = [ + pyswitchbot + ]; + onboarding = [ + pymetno + radios + rpi-bad-power + ]; + raspberry_pi = [ + rpi-bad-power + ]; + shelly = [ + pyswitchbot + ]; + tilt_ble = [ + ibeacon-ble + ]; + xiaomi_miio = [ + arrow + ]; + zha = [ + pydeconz + ]; }; extraDisabledTestPaths = { }; extraDisabledTests = { - mqtt = [ - # Assert None is not None - "test_handle_logging_on_writing_the_entity_state" + private_ble_device = [ + # AssertionError: assert '90' == '90.0' + "test_estimated_broadcast_interval" ]; shell_command = [ # tries to retrieve file from github @@ -53,56 +61,27 @@ let # missing operating_status attribute in entity "test_sensor_entities" ]; - vesync = [ - # homeassistant.components.vesync:config_validation.py:863 The 'vesync' option has been removed, please remove it from your configuration - "test_async_get_config_entry_diagnostics__single_humidifier" - "test_async_get_device_diagnostics__single_fan" - ]; }; extraPytestFlagsArray = { - conversation = [ - "--deselect tests/components/conversation/test_init.py::test_get_agent_list" + cloud = [ + # Tries to connect to alexa-api.nabucasa.com:443 + "--deselect tests/components/cloud/test_http_api.py::test_websocket_update_preferences_alexa_report_state" ]; dnsip = [ # Tries to resolve DNS entries "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" ]; - history_stats = [ - # Flaky: AssertionError: assert '0.0' == '12.0' - "--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed" - ]; jellyfin = [ # AssertionError: assert 'audio/x-flac' == 'audio/flac' "--deselect tests/components/jellyfin/test_media_source.py::test_resolve" # AssertionError: assert [+ received] == [- snapshot] "--deselect tests/components/jellyfin/test_media_source.py::test_music_library" ]; - modbus = [ - # homeassistant.components.modbus.modbus:modbus.py:317 Pymodbus: modbusTest: Modbus Error: test connect exception - "--deselect tests/components/modbus/test_init.py::test_pymodbus_connect_fail" - ]; modem_callerid = [ # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" ]; - sonos = [ - # KeyError: 'sonos_media_player' - "--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_warnings" - "--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_3" - ]; - unifiprotect = [ - # "TypeError: object Mock can't be used in 'await' expression - "--deselect tests/components/unifiprotect/test_repairs.py::test_ea_warning_fix" - ]; - xiaomi_ble = [ - # assert 0 == 1" - "--deselect tests/components/xiaomi_ble/test_sensor.py::test_xiaomi_consumable" - ]; - zha = [ - "--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_manual_backup_non_ezsp" - "--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_automatic_backup_non_ezsp" - ]; }; in lib.listToAttrs (map (component: lib.nameValuePair component ( home-assistant.overridePythonAttrs (old: { @@ -134,6 +113,8 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( broken = lib.elem component [ # pinned version incompatible with urllib3>=2.0 "telegram_bot" + # depends on telegram_bot + "telegram" ]; # upstream only tests on Linux, so do we. platforms = lib.platforms.linux; diff --git a/pkgs/servers/home-assistant/update.py b/pkgs/servers/home-assistant/update.py index c914979e28bd3..30b371e0686dd 100755 --- a/pkgs/servers/home-assistant/update.py +++ b/pkgs/servers/home-assistant/update.py @@ -192,11 +192,11 @@ class HomeAssistant: async def update_core(self, old_version: str, new_version: str) -> None: - old_sdist_hash = str(await Nix.eval("home-assistant.src.outputHash")) + old_sdist_hash = str(await Nix.eval("home-assistant.sdist.outputHash")) new_sdist_hash = await Nurl.prefetch("https://pypi.org/project/homeassistant/", new_version) print(f"sdist: {old_sdist_hash} -> {new_sdist_hash}") - old_git_hash = str(await Nix.eval("home-assistant.gitSrc.outputHash")) + old_git_hash = str(await Nix.eval("home-assistant.src.outputHash")) new_git_hash = await Nurl.prefetch("https://github.com/home-assistant/core/", new_version) print(f"git: {old_git_hash} -> {new_git_hash}") diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 650b0c0c6c535..66594ee3dd7c2 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,20 +16,20 @@ buildGoModule rec { pname = "evcc"; - version = "0.122.1"; + version = "0.123.8"; src = fetchFromGitHub { owner = "evcc-io"; - repo = pname; + repo = "evcc"; rev = version; - hash = "sha256-mD4D2DVai9KV7/RYFmcY7iOGVQGRpwg+rTfNsP8OpCY="; + hash = "sha256-AsLprF4Szv91mShE1Ch6qOIkAIwHTw5lWm38DjQGOZM="; }; - vendorHash = "sha256-B4gR9sXpGuVv3x6sktFSPlbhq5n5aD5d7ksz67X5nY8="; + vendorHash = "sha256-FKF6+64mjrKgzFAb+O0QCURieOoRB//QNbpMFMcNG8s="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-KTMUZOW56vPGoJviKRJWM9UL28gXL0L3j4ZmUzSeavU="; + hash = "sha256-a3AyqQ8GYP3g9KGbjtLHjHBrJGHg2sNjAQlMUa26pOY="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index 4024f3cc4ee6d..973208affa0a6 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.7.4"; + version = "0.8.6"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-ANQbbKXA1G6O/qEK6frTp9J26nNM+NgVya6d6DsPrv4="; + hash = "sha256-ws4zPt6N4gPRLgJAeozPlbSJm0mOQKmkOZpKeB1y+J0="; }; - npmDepsHash = "sha256-sk1RqMX4aGJcjysN7udBSPnUvD1vLHdyZ88JQbReOqw="; + npmDepsHash = "sha256-RC2Y4XZqO+mLEKQxq+j2ukZYi/uu9XIjYadxek9P+SM="; preBuild = '' mkdir -p config @@ -79,5 +79,6 @@ buildNpmPackage rec { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ jnsgruk ]; platforms = lib.platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/honk/default.nix b/pkgs/servers/honk/default.nix index 63b2fb5b09840..cbe1d6d240e14 100644 --- a/pkgs/servers/honk/default.nix +++ b/pkgs/servers/honk/default.nix @@ -8,11 +8,11 @@ buildGoModule rec { pname = "honk"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { url = "https://humungus.tedunangst.com/r/honk/d/honk-${version}.tgz"; - hash = "sha256-kfoSVGm1QKVjDiWvjK4QzAoA/iiU9j6DS3SYFSM+AaA="; + hash = "sha256-kcrEg0KBdCaA4g8ivIgOWIGJVDCtY5rI4P7cp/ZyXe4="; }; vendorHash = null; diff --git a/pkgs/servers/http/angie/console-light.nix b/pkgs/servers/http/angie/console-light.nix new file mode 100644 index 0000000000000..c39a2001c16c8 --- /dev/null +++ b/pkgs/servers/http/angie/console-light.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchurl +, gzip +, brotli +}: + +stdenv.mkDerivation rec { + version = "1.1.1"; + pname = "angie-console-light"; + + src = fetchurl { + url = "https://download.angie.software/files/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-Teg+EPl4IvmScTTX3F3rdM6qZ3ztFkMks9oo2B1xHTs="; + }; + + outputs = [ "out" "doc" ]; + + nativeBuildInputs = [ brotli ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/angie-console-light + mv ./html $out/share/angie-console-light + + mkdir -p $doc/share/doc/angie-console-light + mv ./LICENSE $doc/share/doc/angie-console-light + + # Create static gzip and brotli files + find -L $out -type f -regextype posix-extended -iregex '.*\.(html|js|txt)' \ + -exec gzip --best --keep --force {} ';' \ + -exec brotli --best --keep --no-copy-stat {} ';' + + runHook postInstall + ''; + + meta = { + description = "Console Light is a lightweight, real-time activity monitoring interface."; + homepage = "https://angie.software/en/console/"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix new file mode 100644 index 0000000000000..5c8f2ad7c699d --- /dev/null +++ b/pkgs/servers/http/angie/default.nix @@ -0,0 +1,47 @@ +{ callPackage +, runCommand +, lib +, fetchurl +, nixosTests +, withQuic ? false +, fetchpatch +, ... +}@args: + +callPackage ../nginx/generic.nix args rec { + version = "1.4.0"; + pname = if withQuic then "angieQuic" else "angie"; + + src = fetchurl { + url = "https://download.angie.software/files/angie-${version}.tar.gz"; + hash = "sha256-gaQsPwoxtt6oVSDX1JCWvyUwDQaNprya79CCwu4z8b4="; + }; + + configureFlags = lib.optional withQuic [ + "--with-http_v3_module" + ]; + + preInstall = '' + if [[ -e man/angie.8 ]]; then + installManPage man/angie.8 + fi + ''; + + postInstall = '' + ln -s $out/bin/nginx $out/bin/angie + ''; + + passthru.tests = { + angie = nixosTests.nginx-variants.angie; + angie-api = nixosTests.angie-api; + angie-http3 = nixosTests.nginx-http3.angieQuic; + }; + + meta = { + description = "Angie is an efficient, powerful, and scalable web server that was forked from nginx"; + homepage = "https://angie.software/en/"; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index c6e7ad1f56616..27cfd755bcdd2 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -42,6 +42,12 @@ stdenv.mkDerivation rec { url = "https://github.com/apache/httpd/commit/918620a183d843fb393ed939423a25d42c1044ec.patch"; hash = "sha256-YZi3t++hjM0skisax2xuh9DifZVZjCjVn6XQr6QKGEs="; }) + ] ++ lib.optionals libxml2Support [ + (fetchpatch { + name = "compat-with-libxml2-2.12.patch"; + url = "https://github.com/apache/httpd/commit/27a68e54b7c6d2ae80dca396fd2727852897dab1.patch"; + hash = "sha256-k2EqCaDkckrXLsHnjP4h+b1brTnde4pUyrbOiPFB6qk="; + }) ]; postPatch = '' diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index 7a414096b98a1..bc7d0d667b63b 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "mod_auth_mellon"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "latchset"; repo = "mod_auth_mellon"; rev = "v${version}"; - sha256 = "sha256-LIzJP+OAcrgNIo9KU2kMfZ8kjHC5qUg96kJw3qhqbvc="; + sha256 = "sha256-frSfhddLfEZ2xSI7/HPZkr5AiTJ9nnYmnJZY8aC3zwI="; }; nativeBuildInputs = [ autoreconfHook pkg-config autoconf automake ]; diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix index f346008937ba8..85ff5a97e636e 100644 --- a/pkgs/servers/http/apache-modules/mod_tile/default.nix +++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix @@ -10,7 +10,6 @@ , cairo , curl , glib -, gtk2 , harfbuzz , icu , iniparser @@ -20,13 +19,13 @@ stdenv.mkDerivation rec { pname = "mod_tile"; - version = "0.6.1+unstable=2023-03-09"; + version = "0.7.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "mod_tile"; - rev = "f521540df1003bb000d7367a59ad612161eab0f0"; - sha256 = "sha256-jIqeplAQt4W97PNKm6ZDGPDUc/PEiLM5yEdPeI+H03A="; + rev = "v${version}"; + hash = "sha256-jDuOcmKzZGU6L0aOfPKRGpDLbX0O9ueTufBy7Bd6KMU="; }; nativeBuildInputs = [ @@ -49,16 +48,20 @@ stdenv.mkDerivation rec { mapnik ]; - # the install script wants to install mod_tile.so into apache's modules dir - # also mapnik pkg-config config is missing this patch: https://github.com/mapnik/mapnik/commit/692c2faa0ef168a8c908d262c2bbfe51a74a8336.patch - postPatch = '' - sed -i "s|\''${HTTPD_MODULES_DIR}|$out/modules|" CMakeLists.txt - sed -i -e "s|@MAPNIK_FONTS_DIR@|$(mapnik-config --fonts)|" -e "s|@MAPNIK_PLUGINS_DIR@|$(mapnik-config --input-plugins)|" tests/renderd.conf.in - ''; - enableParallelBuilding = true; - cmakeFlags = [ "-DENABLE_TESTS=1" ]; + # Explicitly specify directory paths + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_MANDIR" "share/man") + (lib.cmakeFeature "CMAKE_INSTALL_MODULESDIR" "modules") + (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "") + (lib.cmakeBool "ENABLE_TESTS" doCheck) + ]; + + # And use DESTDIR to define the install destination + installFlags = [ "DESTDIR=$(out)" ]; + doCheck = true; meta = with lib; { diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 497cc5b1ea0ae..01f953f7c80cf 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mod_wsgi"; - version = "4.9.4"; + version = "5.0.0"; src = fetchFromGitHub { owner = "GrahamDumpleton"; repo = "mod_wsgi"; rev = version; - hash = "sha256-6rRHdgdTb94kqIpWJOJOwoIsaXb/c4XY3q331GwQyf0="; + hash = "sha256-/4swm4AYCN3xyz2+OH7XqH/dFC53wqGPZgEAdxZQvbs="; }; buildInputs = [ apacheHttpd python3 ncurses ]; diff --git a/pkgs/servers/http/bozohttpd/0001-include-stdint.h.patch b/pkgs/servers/http/bozohttpd/0001-include-stdint.h.patch deleted file mode 100644 index 1d0d716290dd6..0000000000000 --- a/pkgs/servers/http/bozohttpd/0001-include-stdint.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libexec/httpd/bozohttpd.c b/libexec/httpd/bozohttpd.c -index 67083b2c6782..273cb5f5a42b 100644 ---- a/libexec/httpd/bozohttpd.c -+++ b/libexec/httpd/bozohttpd.c -@@ -138,6 +138,7 @@ - #include <grp.h> - #include <stdarg.h> - #include <stdlib.h> -+#include <stdint.h> - #include <strings.h> - #include <string.h> - #include <syslog.h> diff --git a/pkgs/servers/http/bozohttpd/0002-dont-use-host-BUFSIZ.patch b/pkgs/servers/http/bozohttpd/0002-dont-use-host-BUFSIZ.patch deleted file mode 100644 index 9a01a4adce7fc..0000000000000 --- a/pkgs/servers/http/bozohttpd/0002-dont-use-host-BUFSIZ.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/libexec/httpd/auth-bozo.c b/libexec/httpd/auth-bozo.c -index a2f2ee4304c1..c9eefe3313dd 100644 ---- a/libexec/httpd/auth-bozo.c -+++ b/libexec/httpd/auth-bozo.c -@@ -54,7 +54,7 @@ bozo_auth_check(bozo_httpreq_t *request, const char *file) - bozohttpd_t *httpd = request->hr_httpd; - struct stat sb; - char dir[MAXPATHLEN], authfile[MAXPATHLEN], *basename; -- char user[BUFSIZ], *pass; -+ char user[BOZO_MINBUFSIZE], *pass; - FILE *fp; - int len; - -@@ -144,7 +144,7 @@ bozo_auth_check_headers(bozo_httpreq_t *request, char *val, char *str, - - if (strcasecmp(val, "authorization") == 0 && - strncasecmp(str, "Basic ", 6) == 0) { -- char authbuf[BUFSIZ]; -+ char authbuf[BOZO_MINBUFSIZE]; - char *pass = NULL; - ssize_t alen; - -diff --git a/libexec/httpd/bozohttpd.c b/libexec/httpd/bozohttpd.c -index 273cb5f5a42b..f619567ba822 100644 ---- a/libexec/httpd/bozohttpd.c -+++ b/libexec/httpd/bozohttpd.c -@@ -2275,7 +2275,7 @@ bozo_http_error(bozohttpd_t *httpd, int code, bozo_httpreq_t *request, - } - #endif /* !NO_USER_SUPPORT */ - -- size = snprintf(httpd->errorbuf, BUFSIZ, -+ size = snprintf(httpd->errorbuf, BOZO_MINBUFSIZE, - "<html><head><title>%s</title></head>\n" - "<body><h1>%s</h1>\n" - "%s%s: <pre>%s</pre>\n" -@@ -2285,10 +2285,10 @@ bozo_http_error(bozohttpd_t *httpd, int code, bozo_httpreq_t *request, - user ? user : "", file, - reason, hostname, portbuf, hostname, portbuf); - free(user); -- if (size >= (int)BUFSIZ) { -+ if (size >= (int)BOZO_MINBUFSIZE) { - bozowarn(httpd, - "bozo_http_error buffer too small, truncated"); -- size = (int)BUFSIZ; -+ size = (int)BOZO_MINBUFSIZE; - } - - if (file_alloc) -@@ -2515,7 +2515,7 @@ bozo_init_httpd(bozohttpd_t *httpd) - httpd->mmapsz = BOZO_MMAPSZ; - - /* error buffer for bozo_http_error() */ -- if ((httpd->errorbuf = malloc(BUFSIZ)) == NULL) { -+ if ((httpd->errorbuf = malloc(BOZO_MINBUFSIZE)) == NULL) { - fprintf(stderr, - "bozohttpd: memory_allocation failure\n"); - return 0; -diff --git a/libexec/httpd/bozohttpd.h b/libexec/httpd/bozohttpd.h -index c83bd112d9d7..7b19494cf5ad 100644 ---- a/libexec/httpd/bozohttpd.h -+++ b/libexec/httpd/bozohttpd.h -@@ -227,6 +227,8 @@ typedef struct bozoprefs_t { - /* only allow this many total headers bytes */ - #define BOZO_HEADERS_MAX_SIZE (16 * 1024) - -+#define BOZO_MINBUFSIZE (4 * 1024) -+ - /* debug flags */ - #define DEBUG_NORMAL 1 - #define DEBUG_FAT 2 -diff --git a/libexec/httpd/testsuite/t10.out b/libexec/httpd/testsuite/t10.out -index cf410110627c..b3ab88f94fb9 100644 ---- a/libexec/httpd/testsuite/t10.out -+++ b/libexec/httpd/testsuite/t10.out -@@ -1,8 +1,8 @@ - HTTP/1.0 404 Not Found - Content-Type: text/html --Content-Length: 1024 --Server: bozohttpd/20140708 -+Content-Length: 4096 -+Server: bozohttpd/20210403 - - <html><head><title>404 Not Found</title></head> - <body><h1>404 Not Found</h1> --/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -\ No newline at end of file -+/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -\ No newline at end of file diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix index 5fd9f350b1176..038548bb16fa0 100644 --- a/pkgs/servers/http/bozohttpd/default.nix +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # bozohttpd is developed in-tree in pkgsrc, canonical hashes can be found at: # http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/bozohttpd/distinfo src = fetchurl { - url = "http://www.eterna.com.au/${pname}/${pname}-${version}.tar.bz2"; + url = "http://eterna23.net/${pname}/${pname}-${version}.tar.bz2"; hash = "sha512-J1uPqzzy5sWXIWgsrpUtuV2lvTsfIGgCQMbPEClGNpP2/soEf77146PnUotAt7LoeypW/YALYS5nmhbySJDltg=="; }; diff --git a/pkgs/servers/http/cgiserver/default.nix b/pkgs/servers/http/cgiserver/default.nix index 59092d51ad370..f68216eb93485 100644 --- a/pkgs/servers/http/cgiserver/default.nix +++ b/pkgs/servers/http/cgiserver/default.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://src.anomalous.eu/cgiserver/about/"; description = "Lightweight web server for sandboxing CGI applications"; + mainProgram = "cgiserver"; maintainers = with maintainers; [ qyliss ]; license = licenses.osl3; }; diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix index 8913dae50be43..6e625dbdb7203 100644 --- a/pkgs/servers/http/couchdb/3.nix +++ b/pkgs/servers/http/couchdb/3.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "couchdb"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; - hash = "sha256-PWgj1C0Qzw1PhsnE/lnJkyyJ1oV4/LbEtCeNx2kwjao="; + hash = "sha256-eiAHtfZz1L4iolyaER2QZpGdhy3bkTWn3OwBIimb054="; }; postPatch = '' diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index 81e963c5607b0..57e1f8f1635cb 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "darkhttpd"; - version = "1.14"; + version = "1.15"; src = fetchFromGitHub { owner = "emikulic"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J/tjT3Rfhk5++jbmLBrZu9O4GgTBqeycuz82NliCBxw="; + sha256 = "sha256-G1lh3nHo2iU/dkiBykl5+DSIC2c6SCqqv42Bw0Frz3A="; }; enableParallelBuilding = true; diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix index 8713ee3539951..3a88f72ae03dd 100644 --- a/pkgs/servers/http/dufs/default.nix +++ b/pkgs/servers/http/dufs/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "dufs"; - version = "0.37.1"; + version = "0.38.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "dufs"; rev = "v${version}"; - hash = "sha256-Q5t3FUT/ukGME+ZJXpLWnii2XCPrBVDAlbjW8FrpOZs="; + hash = "sha256-YPEJP+RdGxEMVRoDohxGiOkOMmWLhlBrkr+T+zcST5g="; }; - cargoHash = "sha256-6ybYfeufHr3ulTbKe27CDS5m1mCluPwS/5GYemYXat8="; + cargoHash = "sha256-Dia0/yV2rsUx0Mfd2rQkNh7QB+dZubudcoyfMmeaxx8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 0b1d88e43e0d9..87379c4d7df19 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -3,6 +3,7 @@ , bazel-gazelle , buildBazelPackage , fetchFromGitHub +, fetchpatch , stdenv , cmake , gn @@ -24,19 +25,25 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.27.1"; - rev = "6b9db09c69965d5bfb37bdd29693f8b7f9e9e9ec"; + version = "1.27.2"; + rev = "ae07f9a11715245f7d25d2a13699c260c2ae8ebb"; + hash = "sha256-VgP3st26Wkx51tTM++tKAZX7+BmPGgy1MIJFGLDu4JU="; }; + + # these need to be updated for any changes to fetchAttrs + depsHash = { + x86_64-linux = "sha256-389CaxJ3F66eMID7+KgwzCdlT2QPOTkKPLnqpmM49ig="; + aarch64-linux = "sha256-ui7AUzWouAn2DZ7kUpp1huNxPGBqzKXqtwcuRZUhmqo="; + }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); in -buildBazelPackage rec { +buildBazelPackage { pname = "envoy"; inherit (srcVer) version; bazel = bazel_6; src = fetchFromGitHub { owner = "envoyproxy"; repo = "envoy"; - inherit (srcVer) rev; - hash = "sha256-eZ3UCVqQbtK2GbawUVef5+BMSQbqe+owtwH+b887mQE="; + inherit (srcVer) hash rev; postFetch = '' chmod -R +w $out @@ -62,6 +69,12 @@ buildBazelPackage rec { # use system C/C++ tools ./0003-nixpkgs-use-system-C-C-toolchains.patch + + # bump proxy-wasm-cpp-host until > 1.27.2/1.28.0 + (fetchpatch { + url = "https://github.com/envoyproxy/envoy/pull/31451.patch"; + hash = "sha256-n8k7bho3B8Gm0dJbgf43kU7ymvo15aGJ2Twi2xR450g="; + }) ]; nativeBuildInputs = [ @@ -82,10 +95,7 @@ buildBazelPackage rec { hardeningDisable = [ "format" ]; fetchAttrs = { - sha256 = { - x86_64-linux = "sha256-OQ4vg4S3DpM+Zo+igncx3AXJnL8FkJbwh7KnBhbnCUM="; - aarch64-linux = "sha256-/X8i1vzQ4QvFxi1+5rc1/CGHmRhhu5F3X5A3PgbW+Mc="; - }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); + sha256 = depsHash; dontUseCmakeConfigure = true; dontUseGnConfigure = true; preInstall = '' @@ -111,6 +121,9 @@ buildBazelPackage rec { # Remove Unix timestamps from go cache. rm -rf $bazelOut/external/bazel_gazelle_go_repository_cache/{gocache,pkg/mod/cache,pkg/sumdb} + + # fix tcmalloc failure https://github.com/envoyproxy/envoy/issues/30838 + sed -i '/TCMALLOC_GCC_FLAGS = \[/a"-Wno-changes-meaning",' $bazelOut/external/com_github_google_tcmalloc/tcmalloc/copts.bzl ''; }; buildAttrs = { diff --git a/pkgs/servers/http/jetty/11.x.nix b/pkgs/servers/http/jetty/11.x.nix index 3196b24d74856..b6a1d4599c1e7 100644 --- a/pkgs/servers/http/jetty/11.x.nix +++ b/pkgs/servers/http/jetty/11.x.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "11.0.18"; - hash = "sha256-HxtO2r6YWo6+MAYUgk7dNSPDqQZoyO9t/8NdI5pPkL4="; + version = "11.0.19"; + hash = "sha256-CJpJSeIuFNiduCpiSoa52vYIncWn5/tMEgMVslJCcy0="; } diff --git a/pkgs/servers/http/jetty/12.x.nix b/pkgs/servers/http/jetty/12.x.nix index 4dba445b6b90e..2115879b8a292 100644 --- a/pkgs/servers/http/jetty/12.x.nix +++ b/pkgs/servers/http/jetty/12.x.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "12.0.3"; - hash = "sha256-Z/jJKKzoqTPZnoFOMwbpSd/Kd1w+rXloKH+aw6aNrKs="; + version = "12.0.5"; + hash = "sha256-TnKoDgn59t0m5dBuMISQPpQrIFcTsv77V/KXJabpsyA="; } diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 7a5d6f5e556d1..7f457108f8e6a 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -77,5 +77,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor brecht ]; + mainProgram = "lighttpd"; }; } diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 6194548a6a99d..81e785e4ec739 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -4,7 +4,7 @@ outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt , nixosTests , installShellFiles, substituteAll, removeReferencesTo, gd, geoip, perl , withDebug ? false -, withKTLS ? false +, withKTLS ? true , withStream ? true , withMail ? false , withPerl ? true @@ -25,6 +25,7 @@ outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt , fixPatch ? p: p , postPatch ? "" , preConfigure ? "" +, preInstall ? "" , postInstall ? "" , meta ? null , nginx-doc ? outer.nginx-doc @@ -68,6 +69,7 @@ stdenv.mkDerivation { ++ mapModules "inputs"; configureFlags = [ + "--sbin-path=bin/nginx" "--with-http_ssl_module" "--with-http_v2_module" "--with-http_realip_module" @@ -124,7 +126,11 @@ stdenv.mkDerivation { ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ # fix build vts module on gcc11 "-Wno-error=stringop-overread" - ] ++ lib.optional stdenv.isDarwin "-Wno-error=deprecated-declarations"); + ] ++ lib.optionals stdenv.isDarwin [ + "-Wno-error=deprecated-declarations" + "-Wno-error=gnu-folding-constant" + "-Wno-error=unused-but-set-variable" + ]); configurePlatforms = []; @@ -174,19 +180,19 @@ stdenv.mkDerivation { if [[ -e man/nginx.8 ]]; then installManPage man/nginx.8 fi - ''; + '' + preInstall; disallowedReferences = map (m: m.src) modules; postInstall = let - noSourceRefs = lib.concatMapStrings (m: "remove-references-to -t ${m.src} $out/sbin/nginx\n") modules; + noSourceRefs = lib.concatMapStrings (m: "remove-references-to -t ${m.src} $out/bin/nginx\n") modules; in noSourceRefs + postInstall; passthru = { inherit modules; tests = { - inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-proxyprotocol nginx-pubhtml nginx-sso nginx-status-page nginx-unix-socket; + inherit (nixosTests) nginx nginx-auth nginx-etag nginx-etag-compression nginx-globalredirect nginx-http3 nginx-proxyprotocol nginx-pubhtml nginx-sso nginx-status-page nginx-unix-socket; variants = lib.recurseIntoAttrs nixosTests.nginx-variants; acme-integration = nixosTests.acme; } // passthru.tests; @@ -198,6 +204,6 @@ stdenv.mkDerivation { license = [ licenses.bsd2 ] ++ concatMap (m: m.meta.license) modules; platforms = platforms.all; - maintainers = with maintainers; [ fpletz ajs124 raitobezarius ]; + maintainers = with maintainers; [ fpletz raitobezarius ] ++ teams.helsinki-systems.members; }; } diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index e1ef395f9d926..9d2dfb6952cc9 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -22,7 +22,7 @@ , libuuid , libxml2 , lmdb -, luajit +, luajit_openresty , msgpuck , openssl , opentracing-cpp @@ -379,7 +379,7 @@ let self = { sha256 = "sha256-TyeTL7/0dI2wS2eACS4sI+9tu7UpDq09aemMaklkUss="; }; - inputs = [ luajit ]; + inputs = [ luajit_openresty ]; preConfigure = let # fix compilation against nginx 1.23.0 @@ -388,8 +388,8 @@ let self = { sha256 = "sha256-l7GHFNZXg+RG2SIBjYJO1JHdGUtthWnzLIqEORJUNr4="; }; in '' - export LUAJIT_LIB="${luajit}/lib" - export LUAJIT_INC="$(realpath ${luajit}/include/luajit-*)" + export LUAJIT_LIB="${luajit_openresty}/lib" + export LUAJIT_INC="$(realpath ${luajit_openresty}/include/luajit-*)" # make source directory writable to allow generating src/ngx_http_lua_autoconf.h lua_src=$TMPDIR/lua-src @@ -420,7 +420,7 @@ let self = { sha256 = "1gqccg8airli3i9103zv1zfwbjm27h235qjabfbfqk503rjamkpk"; }; - inputs = [ luajit ]; + inputs = [ luajit_openresty ]; allowMemoryWriteExecute = true; meta = with lib; { @@ -458,15 +458,15 @@ let self = { name = "moreheaders"; owner = "openresty"; repo = "headers-more-nginx-module"; - rev = "v0.34"; - sha256 = "sha256-LsrN/rF/p17x/80Jw9CgbmK69to6LycCM1OwTBojz8M="; + rev = "v0.36"; + sha256 = "sha256-X+ygIesQ9PGm5yM+u1BOLYVpm1172P8jWwXNr3ixFY4="; }; meta = with lib; { description = "Set, add, and clear arbitrary output headers"; homepage = "https://github.com/openresty/headers-more-nginx-module"; license = with licenses; [ bsd2 ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; }; @@ -1029,8 +1029,8 @@ let self = { name = "zstd"; owner = "tokers"; repo = "zstd-nginx-module"; - rev = "0.1.0"; - hash = "sha256-8SBU9hJnKtNrwbpioy+Z/mfiVuqAx+U1t64m5tfEy6o="; + rev = "0.1.1"; + hash = "sha256-1gCV7uUsuYnZfb9e8VfjWkUloVINOUH5qzeJ03kIHgs="; }; inputs = [ zstd ]; diff --git a/pkgs/servers/http/nginx/nix-etag-1.15.4.patch b/pkgs/servers/http/nginx/nix-etag-1.15.4.patch index d001b842f335f..8c8c8ce74b21a 100644 --- a/pkgs/servers/http/nginx/nix-etag-1.15.4.patch +++ b/pkgs/servers/http/nginx/nix-etag-1.15.4.patch @@ -2,10 +2,10 @@ This patch makes it possible to serve static content from Nix store paths, by using the hash of the store path for the ETag header. diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c -index cb49ef74..7b456993 100644 +index 97a91aee2..2d07d71e6 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c -@@ -1583,6 +1583,8 @@ ngx_http_set_etag(ngx_http_request_t *r) +@@ -1676,6 +1676,8 @@ ngx_http_set_etag(ngx_http_request_t *r) { ngx_table_elt_t *etag; ngx_http_core_loc_conf_t *clcf; @@ -14,14 +14,25 @@ index cb49ef74..7b456993 100644 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); -@@ -1598,16 +1600,60 @@ ngx_http_set_etag(ngx_http_request_t *r) - etag->hash = 1; +@@ -1692,16 +1694,82 @@ ngx_http_set_etag(ngx_http_request_t *r) + etag->next = NULL; ngx_str_set(&etag->key, "ETag"); - etag->value.data = ngx_pnalloc(r->pool, NGX_OFF_T_LEN + NGX_TIME_T_LEN + 3); - if (etag->value.data == NULL) { - etag->hash = 0; - return NGX_ERROR; ++ // Upstream nginx uses file mod timestamp and content-length for Etag, but ++ // files in the Nix store have their timestamps reset, so that doesn't work. ++ // Instead, when serving from the Nix store, we use the hash from the store ++ // path and content-length. ++ // ++ // Every file in under the given store path will share the same store path ++ // hash. It is fine to serve different resources with the same Etag, but ++ // different representations of the same resource (eg the same file, but ++ // gzip-compressed) should have different Etags. Thus, we also append ++ // content-length, which should be different when the response is compressed ++ + err = ngx_errno; + real = ngx_realpath(clcf->root.data, NULL); + ngx_set_errno(err); @@ -35,8 +46,10 @@ index cb49ef74..7b456993 100644 + && real[NIX_STORE_LEN] == '/' + && real[NIX_STORE_LEN + 1] != '\0') + { -+ ptr1 = real + NIX_STORE_LEN; -+ *ptr1 = '"'; ++ // extract the hash from a path formatted like ++ // /nix/store/hashhere1234-pname-1.0.0 ++ // +1 to skip the leading / ++ ptr1 = real + NIX_STORE_LEN + 1; + + ptr2 = (u_char *) ngx_strchr(ptr1, '-'); + @@ -46,11 +59,11 @@ index cb49ef74..7b456993 100644 + return NGX_ERROR; + } + -+ *ptr2++ = '"'; + *ptr2 = '\0'; + -+ etag->value.len = ngx_strlen(ptr1); -+ etag->value.data = ngx_pnalloc(r->pool, etag->value.len); ++ // hash + content-length + quotes and hyphen. Note that the ++ // content-length part of the string can vary in length. ++ etag->value.data = ngx_pnalloc(r->pool, ngx_strlen(ptr1) + NGX_OFF_T_LEN + 3); + + if (etag->value.data == NULL) { + ngx_free(real); @@ -58,9 +71,18 @@ index cb49ef74..7b456993 100644 + return NGX_ERROR; + } + -+ ngx_memcpy(etag->value.data, ptr1, etag->value.len); ++ ++ // set value.data content to "{hash}-{content-length}" (including quote ++ // marks), and set value.len to the length of the resulting string ++ etag->value.len = ngx_sprintf(etag->value.data, "\"\%s-%xO\"", ++ ptr1, ++ r->headers_out.content_length_n) ++ - etag->value.data; ++ + ngx_http_clear_last_modified(r); + } else { ++ // outside of Nix store, use the upstream Nginx logic for etags ++ + etag->value.data = ngx_pnalloc(r->pool, NGX_OFF_T_LEN + NGX_TIME_T_LEN + 3); + + if (etag->value.data == NULL) { @@ -82,4 +104,3 @@ index cb49ef74..7b456993 100644 + ngx_free(real); r->headers_out.etag = etag; - diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 433d8fd3969b8..87cd8e4c53e3f 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -11,11 +11,11 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; nginxVersion = "1.21.4"; - version = "${nginxVersion}.1"; + version = "${nginxVersion}.3"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "sha256-DFCTtk94IehQZcmeXU5swxggz9fze5oN7IQgnYeir5k="; + sha256 = "sha256-M6hMY8/Z5GsOXGLrLdx7gGi9ouFoYxQ0O4n8P/0kzdM="; }; # generic.nix applies fixPatch on top of every patch defined there. @@ -41,7 +41,7 @@ callPackage ../nginx/generic.nix args rec { postInstall = '' ln -s $out/luajit/bin/luajit-2.1.0-beta3 $out/bin/luajit-openresty - ln -s $out/nginx/sbin/nginx $out/bin/nginx + ln -s $out/nginx/bin/nginx $out/bin/nginx ln -s $out/nginx/conf $out/conf ln -s $out/nginx/html $out/html ''; diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index 29167c79f847c..e4443d93be207 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -14,15 +14,15 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.23.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256-3q/dizGTuwg0GsyBklx9jPIfarDhAxIzXz7x8zFK0Ic="; + hash = "sha256-mRAxqazTlNNPp54Q94TjhbCY+4Ul1Cw4VTCa1iuGOoY="; }; - vendorHash = "sha256-fJg1fcnLQII5sybuamZBE5CHSOEg+zlee4Pvzt8yyA0="; + vendorHash = "sha256-GdeZkKkENacc11FmEAFUfX9efInfhpv2Lz0/3CtixFQ="; ui = mkYarnPackage { inherit version; @@ -122,7 +122,7 @@ buildGoModule rec { homepage = "https://pomerium.io"; description = "Authenticating reverse proxy"; license = licenses.asl20; - maintainers = with maintainers; [ lukegb ]; + maintainers = with maintainers; [ lukegb devusb ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/servers/http/pomerium/package.json b/pkgs/servers/http/pomerium/package.json index c19dd62fc5ffd..4f81e118d85a5 100644 --- a/pkgs/servers/http/pomerium/package.json +++ b/pkgs/servers/http/pomerium/package.json @@ -25,9 +25,9 @@ "@babel/core": "^7.0.0", "@emotion/react": "^11.7.1", "@emotion/styled": "^11.11.0", - "@fontsource/dm-mono": "^4.5.2", - "@fontsource/dm-sans": "^5.0.3", - "@mui/icons-material": "^5.3.1", + "@fontsource/dm-mono": "^5.0.14", + "@fontsource/dm-sans": "^5.0.13", + "@mui/icons-material": "^5.14.9", "@mui/material": "^5.4.0", "luxon": "^2.5.2", "markdown-to-jsx": "^7.2.1", @@ -48,7 +48,7 @@ "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.28.0", "prettier": "^2.4.1", - "ts-node": "^10.4.0", + "ts-node": "^10.9.1", "typescript": "^5.1.3" }, "prettier": { diff --git a/pkgs/servers/http/pomerium/yarn-hash b/pkgs/servers/http/pomerium/yarn-hash index 77b9664cec92a..71760c6384c7f 100644 --- a/pkgs/servers/http/pomerium/yarn-hash +++ b/pkgs/servers/http/pomerium/yarn-hash @@ -1 +1 @@ -0l9byvq09wjz66020nnzanfg2fhhg7bsvpi9rmip0zymgc1dc2z8 +1cjwkdvg9rfp55674gns44xwi32ws8z57sa4ffb0zzgdgy2yx2zm diff --git a/pkgs/servers/http/router/default.nix b/pkgs/servers/http/router/default.nix index b7b33c1d176c1..f4903b2f31f7c 100644 --- a/pkgs/servers/http/router/default.nix +++ b/pkgs/servers/http/router/default.nix @@ -2,6 +2,7 @@ , callPackage , fetchFromGitHub , rustPlatform +, cmake , pkg-config , protobuf , elfutils @@ -9,18 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "router"; - version = "1.19.0"; + version = "1.30.1"; src = fetchFromGitHub { owner = "apollographql"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IuS7NmlTNmHHnnSZ+YIbV6BnxJW2xprOQ5mkz5FuJEQ="; + sha256 = "sha256-mQtIjfXDcEy5HfZbWauL0NQLPneGq9EJt/yB8zMuhSU="; }; - cargoHash = "sha256-yeb+4lgRDssjkEx6bYfGIbn4DJGpZZ/JDmuwFjQ+U+8="; + cargoHash = "sha256-XCDU6cXw+Wf5MR6m+HCI8/VFRRylMywktZbd5k7Lcwo="; nativeBuildInputs = [ + cmake pkg-config protobuf ]; @@ -42,5 +44,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.apollographql.com/docs/router/"; license = licenses.elastic20; maintainers = [ maintainers.bbigras ]; + knownVulnerabilities = [ "CVE-2023-45812" ]; }; } diff --git a/pkgs/servers/http/router/librusty_v8.nix b/pkgs/servers/http/router/librusty_v8.nix index 3e3bf55c757e4..1d5e334f2d07b 100644 --- a/pkgs/servers/http/router/librusty_v8.nix +++ b/pkgs/servers/http/router/librusty_v8.nix @@ -9,11 +9,11 @@ let }; in fetch_librusty_v8 { - version = "0.60.1"; + version = "0.74.3"; shas = { - x86_64-linux = "sha256-P8H+XJqrt9jdKM885L1epMldp+stwmEw+0Gtd2x3r4g="; - aarch64-linux = "sha256-frHpBP2pL3o4efFLHP2r3zsWJrNT93yYu2Qkxv+7m8Y="; - x86_64-darwin = "sha256-taewoYBkyikqWueLSD9dW1EDjzkV68Xplid1UaLZgRM="; - aarch64-darwin = "sha256-s2YEVbuYpiT/qrmE37aXk13MetrnJo6l+s1Q2y6b5kU="; + x86_64-linux = "sha256-8pa8nqA6rbOSBVnp2Q8/IQqh/rfYQU57hMgwU9+iz4A="; + aarch64-linux = "sha256-3kXOV8rlCNbNBdXgOtd3S94qO+JIKyOByA4WGX+XVP0="; + x86_64-darwin = "sha256-iBBVKZiSoo08YEQ8J/Rt1/5b7a+2xjtuS6QL/Wod5nQ="; + aarch64-darwin = "sha256-Djnuc3l/jQKvBf1aej8LG5Ot2wPT0m5Zo1B24l1UHsM="; }; } diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 4bca9a37a9ce2..5cee9020b8aa9 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "axis2"; - version = "1.7.9"; + version = "1.8.2"; src = fetchurl { - url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip"; - sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac"; + url = "mirror://apache/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip"; + hash = "sha256-oilPVFFpl3F61nVDxcYx/bc81FopS5fzoIdXzeP8brk="; }; nativeBuildInputs = [ unzip ]; @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { meta = { description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack"; + homepage = "https://axis.apache.org/axis2/java/core/"; + changelog = "https://axis.apache.org/axis2/java/core/release-notes/${version}.html"; + maintainers = [ lib.maintainers.anthonyroussel ]; platforms = lib.platforms.unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index ede01d350d4b1..fdbafa313dc76 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -1,14 +1,13 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, nixosTests, testers, jre }: let - - common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec { + common = { version, hash }: stdenv.mkDerivation (finalAttrs: { pname = "apache-tomcat"; - version = "${versionMajor}.${versionMinor}"; + inherit version; src = fetchurl { - url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${pname}-${version}.tar.gz"; - inherit sha256; + url = "mirror://apache/tomcat/tomcat-${lib.versions.major version}/v${version}/bin/apache-tomcat-${version}.tar.gz"; + inherit hash; }; outputs = [ "out" "webapps" ]; @@ -20,11 +19,19 @@ let mv $out/webapps $webapps/ ''; + passthru.tests = { + inherit (nixosTests) tomcat; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "JAVA_HOME=${jre} ${finalAttrs.finalPackage}/bin/version.sh"; + }; + }; + meta = with lib; { homepage = "https://tomcat.apache.org/"; description = "An implementation of the Java Servlet and JavaServer Pages technologies"; - platforms = platforms.all; - maintainers = [ ]; + platforms = jre.meta.platforms; + maintainers = with maintainers; [ anthonyroussel ]; license = [ licenses.asl20 ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; @@ -32,14 +39,12 @@ let in { tomcat9 = common { - versionMajor = "9"; - versionMinor = "0.75"; - sha256 = "sha256-VWfKg789z+ns1g3hDsCZFYQ+PsdqUEBeBHCihkGZelk="; + version = "9.0.85"; + hash = "sha256-oYdNXi5yADqBJ25alSAASsoRPxNfyEEzQim2j20luh4="; }; tomcat10 = common { - versionMajor = "10"; - versionMinor = "0.27"; - sha256 = "sha256-N2atmOdhVrGx88eXOc9Wziq8kn7IWzTeFyFpir/5HLc="; + version = "10.1.18"; + hash = "sha256-baC0y9MUDmSocZot4ZwgvzkC0mShQqgWrFUq4hat4xE="; }; } diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix index b9623f47c91f4..021876fa1d293 100644 --- a/pkgs/servers/icingaweb2/ipl.nix +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-ipl"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-library"; rev = "v${version}"; - hash = "sha256-U3SzjjYoalejPs5hqZP2QyvlKdgdpWk9o0DkFGtWC2w="; + hash = "sha256-4f0Xx4mnc+M2i97/TFQeg2rZaJUpKkx1SvpbLWmSYNo="; }; installPhase = '' diff --git a/pkgs/servers/icingaweb2/thirdparty.nix b/pkgs/servers/icingaweb2/thirdparty.nix index 72726d4d75816..552842967fde8 100644 --- a/pkgs/servers/icingaweb2/thirdparty.nix +++ b/pkgs/servers/icingaweb2/thirdparty.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-thirdparty"; - version = "0.11.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-thirdparty"; rev = "v${version}"; - sha256 = "sha256-TQq80raZO4SjrQTT6IKHXxbiprSV1vtR/FzNmh4bIt8="; + sha256 = "sha256-T67DcsHVf3yDQveNtSPqLoOOPuT4ThkUSCJ9aCSVaIc="; }; installPhase = '' diff --git a/pkgs/servers/imaginary/default.nix b/pkgs/servers/imaginary/default.nix index 8ab50dc957a68..4632647ed93e2 100644 --- a/pkgs/servers/imaginary/default.nix +++ b/pkgs/servers/imaginary/default.nix @@ -47,5 +47,6 @@ buildGoModule rec { description = "Fast, simple, scalable, Docker-ready HTTP microservice for high-level image processing"; license = licenses.mit; maintainers = with maintainers; [ dotlambda urandom ]; + mainProgram = "imaginary"; }; } diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 2168d604c191d..24177680d770e 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "c5b87e3b5e5cc7f7f5c8baa7732bd6d81d8f910a", - "sha256": "sha256-aYxVgktwUBVfvUxgQUDUmDAKp1sr0+ZJcyGqcmBB4e0=", - "version": "unstable-2023-11-08" + "rev": "9e8baa35397671aabfc77f6b912c9f1829be52b6", + "sha256": "sha256-Mbdh/YMTOamYLZcQ8afKREMC/wTutVnkx8Q0ON8wovQ=", + "version": "unstable-2023-12-06" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/pkgs/servers/irc/ergochat/default.nix b/pkgs/servers/irc/ergochat/default.nix index d7613c9a8a06e..5fa160dabeb1b 100644 --- a/pkgs/servers/irc/ergochat/default.nix +++ b/pkgs/servers/irc/ergochat/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ergo"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "ergochat"; repo = "ergo"; rev = "v${version}"; - sha256 = "sha256-n7GJpR/zUsHxTeVmHfBTjMcMAN7ri3FDvJSkKMzPe2I="; + sha256 = "sha256-EoYyLmz6MfLkLY0WbHfFvKwrcWApty6/+UCslm8P0Q0="; }; vendorHash = null; diff --git a/pkgs/servers/irc/inspircd/default.nix b/pkgs/servers/irc/inspircd/default.nix index d554b17542e93..68dbbeacb07f3 100644 --- a/pkgs/servers/irc/inspircd/default.nix +++ b/pkgs/servers/irc/inspircd/default.nix @@ -145,13 +145,13 @@ in stdenv.mkDerivation rec { pname = "inspircd"; - version = "3.16.1"; + version = "3.17.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-UpDjxF4zRrtiY4Z1tRML1uWQdklfgCeLsJtxCKfHOdw="; + sha256 = "sha256-isLZKYf32+va66FGYMq4mWIEHNpqUWCcVhYWLA5lRwk="; }; outputs = [ "bin" "lib" "man" "doc" "out" ]; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index e7df0fb7190f6..0d41017ee2d61 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.1096"; + version = "0.21.1588"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-j9PQa54Gv6kdCHZ9/WPnKYkxD4N0eu0KtMPpATSYVDo0mP9pXdQxSoCrKdmW2gOveuo5Z/wPW4BB4r3gvFxcOg=="; + hash = "sha512-HJSim0I7hLZqJIKU4GoGFQEPY8w9SWp6MxfAxDHuklWKn1dvoQBWh83s8aEz3VOGHXj+SvqciA0o5rWL23camA=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/jackett/deps.nix b/pkgs/servers/jackett/deps.nix index e72b87ff4bac4..e1a701a1ad28d 100644 --- a/pkgs/servers/jackett/deps.nix +++ b/pkgs/servers/jackett/deps.nix @@ -87,6 +87,7 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "2.2.0"; sha256 = "0cs1g4ing4alfbwyngxzgvkrv7z964isv1j9dzflafda4p0wxmsi"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "Microsoft.Bcl.TimeProvider"; version = "8.0.0"; sha256 = "11bzf84kg54g5vq5w4zshdfl9a1agkph6gmg9lrq68fjf14w66vw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "1.1.0"; sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "2.8.0"; sha256 = "0g4h41fs0r8lqh9pk9s4mc1090kdpa6sbxq4rc866s8hnq9s1h4j"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "2.8.0"; sha256 = "0p1xvw1h2fmnxywv1j4x6p3rgarpc8mfwfgn0vflk5xfnc961f6w"; }) @@ -186,7 +187,8 @@ (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) (fetchNuGet { pname = "NUnit.ConsoleRunner"; version = "3.16.1"; sha256 = "0bqs72fhqlmmqsvjarsx4hz8d2dj0wgbsx1gr681fcl1pqpm1cgz"; }) (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.3.1"; sha256 = "1j80cfrg0fflgw7wxi76mxj1wllwzcg4ck957knmjpghw5cw7lvv"; }) - (fetchNuGet { pname = "Polly"; version = "7.2.3"; sha256 = "1iws4jd5iqj5nlfp16fg9p5vfqqas1si0cgh8xcj64y433a933cv"; }) + (fetchNuGet { pname = "Polly"; version = "8.2.0"; sha256 = "0gxdi4sf60vpxsb258v592ykkq9a3dq2awayp99yy9djys8bglks"; }) + (fetchNuGet { pname = "Polly.Core"; version = "8.2.0"; sha256 = "00b4jbyiyslqvswy4j2lfw0rl0gq8m4v5fj2asb96i6l224bs7d3"; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index d62be801a4ca1..a8af63754277a 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.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YbY7wcd8YHcPo5w4n54gjOtepYLbboLsrLij7oYzhco="; + sha256 = "sha256-Bqb4UO4R5CnV8+2OthGrEVORzH+k+zgzI4UsvwRHgk8="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 9d846ba8a8df8..b627ef4d0325e 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.8.11"; # ensure that jellyfin-web has matching version + version = "10.8.13"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - sha256 = "deJv2lWo0kXGixCBJzfdIBZcNjg45y2ITGQfWcM2smU="; + sha256 = "sha256-UtcrJRqDIPyewCNfI89E/IYrgLUhWx1me6MtPX+aeFU="; }; patches = [ diff --git a/pkgs/servers/jellyfin/web.nix b/pkgs/servers/jellyfin/web.nix index 6f9d278091bb4..b2a40c0690832 100644 --- a/pkgs/servers/jellyfin/web.nix +++ b/pkgs/servers/jellyfin/web.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "jellyfin-web"; - version = "10.8.11"; + version = "10.8.13"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-Gl8eaC/AXBD956tAepwWVG3lSvL4rBCcgmkHeT/mrzM="; + hash = "sha256-2W9s8TQV9BtxNYIrCbGRh5EUw0brwxSHohnb7269pQE="; }; - npmDepsHash = "sha256-HoRteA6KFCFxDdwGtDKrvwWCMYNfYQWlit52RAN1eAU="; + npmDepsHash = "sha256-i077UAxY2K12VXkHYbGYZRV1uhgdGUnoDbokSk2ZDIA="; npmBuildScript = [ "build:production" ]; diff --git a/pkgs/servers/jellyseerr/default.nix b/pkgs/servers/jellyseerr/default.nix index 7c361f580d894..ca8e93753e69f 100644 --- a/pkgs/servers/jellyseerr/default.nix +++ b/pkgs/servers/jellyseerr/default.nix @@ -85,5 +85,6 @@ mkYarnPackage rec { license = licenses.mit; maintainers = with maintainers; [ camillemndn ]; platforms = platforms.linux; + mainProgram = "jellyseerr"; }; } diff --git a/pkgs/servers/jibri/default.nix b/pkgs/servers/jibri/default.nix index 8ac17d930ffc8..1c97d18d98c39 100644 --- a/pkgs/servers/jibri/default.nix +++ b/pkgs/servers/jibri/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { pname = "jibri"; - version = "8.0-145-g1a4bb8e"; + version = "8.0-160-g5af7dd7"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "Qemr2108R/Lg1C5UvWQbK7PSbrKvBkfATNpvFDqJ3bI="; + sha256 = "UuRGGbga7Yo/rp5PobOxhyUQ8FaZWnMsLL89vt9hKcA="; }; dontBuild = true; diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix index bdae8d3f32e39..d8d85b8f65992 100644 --- a/pkgs/servers/jicofo/default.nix +++ b/pkgs/servers/jicofo/default.nix @@ -2,10 +2,10 @@ let pname = "jicofo"; - version = "1.0-1050"; + version = "1.0-1059"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "fenxq6syLoKV9jgj8qN7JrkWFeFWSk1QmK7o2hLhwyA="; + sha256 = "NlBRUI4j/5njFS/TtBTsaV/5ILFtqWd6SF+FqpGp1Uk="; }; in stdenv.mkDerivation { diff --git a/pkgs/servers/jigasi/default.nix b/pkgs/servers/jigasi/default.nix new file mode 100644 index 0000000000000..d9f8ed60c09be --- /dev/null +++ b/pkgs/servers/jigasi/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, fetchurl, dpkg, jdk11, nixosTests }: + +let + pname = "jigasi"; + version = "1.1-311-g3de47d0"; + src = fetchurl { + url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; + hash = "sha256-pwUgkId7AHFjbqYo02fBgm0gsiMqEz+wvwkdy6sgTD0="; + }; +in +stdenv.mkDerivation { + inherit pname version src; + + nativeBuildInputs = [ dpkg ]; + + dontBuild = true; + + unpackCmd = "dpkg-deb -x $src debcontents"; + + installPhase = '' + runHook preInstall + substituteInPlace usr/share/${pname}/${pname}.sh \ + --replace "exec java" "exec ${jdk11}/bin/java" + + mkdir -p $out/{share,bin} + mv usr/share/${pname} $out/share/ + mv etc $out/ + ln -s $out/share/${pname}/${pname}.sh $out/bin/${pname} + runHook postInstall + ''; + + passthru.tests = { + single-node-smoke-test = nixosTests.jitsi-meet; + }; + + meta = with lib; { + description = "A server-side application that allows regular SIP clients to join Jitsi Meet conferences"; + longDescription = '' + Jitsi Gateway to SIP: a server-side application that allows regular SIP clients to join Jitsi Meet conferences hosted by Jitsi Videobridge. + ''; + homepage = "https://github.com/jitsi/jigasi"; + license = licenses.asl20; + maintainers = teams.jitsi.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/jitsi-excalidraw/default.nix b/pkgs/servers/jitsi-excalidraw/default.nix index bb8bb6c2dfa7e..4fa9a55e20821 100644 --- a/pkgs/servers/jitsi-excalidraw/default.nix +++ b/pkgs/servers/jitsi-excalidraw/default.nix @@ -36,5 +36,6 @@ buildNpmPackage rec { homepage = "https://github.com/jitsi/excalidraw-backend"; license = licenses.mit; maintainers = with maintainers; [ camillemndn ]; + mainProgram = "jitsi-excalidraw-backend"; }; } diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 3b14ac17c1c4f..96f5190e18f12 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.3-44-g8983b11f"; + version = "2.3-64-g719465d1"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "TUWACKQz4wEGv2VKqKsuQLjtJZr24gtVZ4l7LCXe7VE="; + sha256 = "zZYBSHaMhGzJfONyEUkPUCalxLyB/EjqLqIgJPg2Z8o="; }; in stdenv.mkDerivation { @@ -55,5 +55,6 @@ stdenv.mkDerivation { license = licenses.asl20; maintainers = teams.jitsi.members; platforms = platforms.linux; + mainProgram = "jitsi-videobridge"; }; } diff --git a/pkgs/servers/kanidm/0001-fix-warnings-for-rust-v1.75.patch b/pkgs/servers/kanidm/0001-fix-warnings-for-rust-v1.75.patch new file mode 100644 index 0000000000000..a258484e714ab --- /dev/null +++ b/pkgs/servers/kanidm/0001-fix-warnings-for-rust-v1.75.patch @@ -0,0 +1,80 @@ +From de330efaf02ed66d6641ab3bb55eed4bcfad430b Mon Sep 17 00:00:00 2001 +From: Ilan Joselevich <personal@ilanjoselevich.com> +Date: Sun, 14 Jan 2024 23:53:12 +0200 +Subject: [PATCH] fix warnings for rust v1.75 + +--- + server/lib/src/idm/authsession.rs | 4 ++-- + server/testkit/tests/integration.rs | 5 ++--- + server/web_ui/login_flows/src/oauth2.rs | 3 +-- + unix_integration/nss_kanidm/src/lib.rs | 3 +-- + 4 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/server/lib/src/idm/authsession.rs b/server/lib/src/idm/authsession.rs +index 734864f0d..c65b88494 100644 +--- a/server/lib/src/idm/authsession.rs ++++ b/server/lib/src/idm/authsession.rs +@@ -3,7 +3,7 @@ + //! factor to assert that the user is legitimate. This also contains some + //! support code for asynchronous task execution. + use std::collections::BTreeMap; +-pub use std::collections::BTreeSet as Set; ++ + use std::convert::TryFrom; + use std::fmt; + use std::time::Duration; +@@ -1237,7 +1237,7 @@ impl AuthSession { + + #[cfg(test)] + mod tests { +- pub use std::collections::BTreeSet as Set; ++ + use std::str::FromStr; + use std::time::Duration; + +diff --git a/server/testkit/tests/integration.rs b/server/testkit/tests/integration.rs +index e6879b44b..472022892 100644 +--- a/server/testkit/tests/integration.rs ++++ b/server/testkit/tests/integration.rs +@@ -2,12 +2,11 @@ + + use std::process::Output; + +-use tempfile::tempdir; ++ + + use kanidm_client::KanidmClient; + use kanidmd_testkit::{ +- login_put_admin_idm_admins, ADMIN_TEST_PASSWORD, IDM_ADMIN_TEST_PASSWORD, IDM_ADMIN_TEST_USER, +- NOT_ADMIN_TEST_USERNAME, ++ login_put_admin_idm_admins, ADMIN_TEST_PASSWORD, IDM_ADMIN_TEST_PASSWORD, + }; + use testkit_macros::cli_kanidm; + +diff --git a/server/web_ui/login_flows/src/oauth2.rs b/server/web_ui/login_flows/src/oauth2.rs +index a41e3083f..d735a7b4d 100644 +--- a/server/web_ui/login_flows/src/oauth2.rs ++++ b/server/web_ui/login_flows/src/oauth2.rs +@@ -2,8 +2,7 @@ use gloo::console; + use kanidm_proto::constants::uri::{OAUTH2_AUTHORISE, OAUTH2_AUTHORISE_PERMIT}; + use kanidm_proto::constants::{APPLICATION_JSON, KOPID}; + pub use kanidm_proto::oauth2::{ +- AccessTokenRequest, AccessTokenResponse, AuthorisationRequest, AuthorisationResponse, +- CodeChallengeMethod, ErrorResponse, ++ AuthorisationRequest, AuthorisationResponse, + }; + use kanidmd_web_ui_shared::constants::{CONTENT_TYPE, CSS_ALERT_DANGER, URL_OAUTH2}; + use kanidmd_web_ui_shared::utils::{do_alert_error, do_footer, window}; +diff --git a/unix_integration/nss_kanidm/src/lib.rs b/unix_integration/nss_kanidm/src/lib.rs +index ef13192b9..27e3321a8 100644 +--- a/unix_integration/nss_kanidm/src/lib.rs ++++ b/unix_integration/nss_kanidm/src/lib.rs +@@ -20,5 +20,4 @@ extern crate lazy_static; + #[cfg(target_family = "unix")] + mod implementation; + +-#[cfg(target_family = "unix")] +-pub use implementation::*; ++ +-- +2.42.0 diff --git a/pkgs/servers/kanidm/Cargo.lock b/pkgs/servers/kanidm/Cargo.lock index b1c30812244d6..7f6b69bca0d60 100644 --- a/pkgs/servers/kanidm/Cargo.lock +++ b/pkgs/servers/kanidm/Cargo.lock @@ -452,7 +452,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "base64urlsafedata" version = "0.1.3" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3#ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3" dependencies = [ "base64 0.21.5", "paste 1.0.14", @@ -1106,7 +1106,7 @@ dependencies = [ [[package]] name = "daemon" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "clap", "clap_complete", @@ -2889,7 +2889,7 @@ dependencies = [ [[package]] name = "kanidm-ipa-sync" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "base64urlsafedata", "chrono", @@ -2914,7 +2914,7 @@ dependencies = [ [[package]] name = "kanidm-ldap-sync" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "base64urlsafedata", "chrono", @@ -2940,7 +2940,7 @@ dependencies = [ [[package]] name = "kanidm_build_profiles" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "base64 0.21.5", "gix", @@ -2950,7 +2950,7 @@ dependencies = [ [[package]] name = "kanidm_client" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "hyper", "kanidm_lib_file_permissions", @@ -2988,7 +2988,7 @@ dependencies = [ [[package]] name = "kanidm_lib_file_permissions" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "kanidm_utils_users", "whoami", @@ -2996,7 +2996,7 @@ dependencies = [ [[package]] name = "kanidm_proto" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "base32", "base64urlsafedata", @@ -3016,7 +3016,7 @@ dependencies = [ [[package]] name = "kanidm_tools" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "async-recursion", "clap", @@ -3049,7 +3049,7 @@ dependencies = [ [[package]] name = "kanidm_unix_int" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "async-trait", "base64urlsafedata", @@ -3088,14 +3088,14 @@ dependencies = [ [[package]] name = "kanidm_utils_users" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "libc", ] [[package]] name = "kanidmd_core" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "async-trait", "axum", @@ -3148,7 +3148,7 @@ dependencies = [ [[package]] name = "kanidmd_lib" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "base64 0.21.5", "base64urlsafedata", @@ -3215,7 +3215,7 @@ dependencies = [ [[package]] name = "kanidmd_testkit" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "assert_cmd", "compact_jwt", @@ -3252,7 +3252,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui_admin" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "gloo", "gloo-utils 0.2.0", @@ -3275,7 +3275,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui_login_flows" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "gloo", "gloo-utils 0.2.0", @@ -3298,7 +3298,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui_shared" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "gloo", "js-sys", @@ -3318,7 +3318,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui_user" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "gloo", "gloo-timers 0.3.0", @@ -3739,7 +3739,7 @@ dependencies = [ [[package]] name = "nss_kanidm" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "kanidm_unix_int", "lazy_static", @@ -4015,7 +4015,7 @@ dependencies = [ [[package]] name = "orca" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "clap", "crossbeam", @@ -4059,7 +4059,7 @@ dependencies = [ [[package]] name = "pam_kanidm" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "kanidm_unix_int", "libc", @@ -5191,7 +5191,7 @@ dependencies = [ [[package]] name = "sketching" -version = "1.1.0-rc.15-dev" +version = "1.1.0-rc.15" dependencies = [ "num_enum", "tracing", @@ -5273,7 +5273,7 @@ checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" [[package]] name = "sshkey-attest" version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3#ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3" dependencies = [ "base64urlsafedata", "nom", @@ -6128,7 +6128,7 @@ dependencies = [ [[package]] name = "webauthn-attestation-ca" version = "0.1.0" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3#ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3" dependencies = [ "base64urlsafedata", "openssl", @@ -6140,7 +6140,7 @@ dependencies = [ [[package]] name = "webauthn-authenticator-rs" version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3#ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3" dependencies = [ "async-stream", "async-trait", @@ -6172,7 +6172,7 @@ dependencies = [ [[package]] name = "webauthn-rs" version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3#ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3" dependencies = [ "base64urlsafedata", "serde", @@ -6185,7 +6185,7 @@ dependencies = [ [[package]] name = "webauthn-rs-core" version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3#ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3" dependencies = [ "base64 0.21.5", "base64urlsafedata", @@ -6209,7 +6209,7 @@ dependencies = [ [[package]] name = "webauthn-rs-proto" version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3#ebd6ff03532fdc72c553bcd8d10b5dad334dcfc3" dependencies = [ "base64urlsafedata", "js-sys", diff --git a/pkgs/servers/kanidm/default.nix b/pkgs/servers/kanidm/default.nix index 72260dd4155bb..d21c64992cf2b 100644 --- a/pkgs/servers/kanidm/default.nix +++ b/pkgs/servers/kanidm/default.nix @@ -25,14 +25,21 @@ rustPlatform.buildRustPackage rec { owner = pname; repo = pname; # Latest 1.1.0-rc.15 tip - rev = "a5ca8018e3a636dbb0a79b3fd869db059d92979d"; - hash = "sha256-PFGoeGn7a/lVR6rOmOKA3ydAoo3/+9RlkwBAKS22Psg="; + rev = "4d250f817dbd24d77f72427bb93ef3a367a553c6"; + hash = "sha256-cXPqTIDHMWcsRFi1/u8lIpwk2m6rh4C70IwVky7B2qs="; }; + patches = [ + # TODO: Remove in the next update + # or when https://github.com/kanidm/kanidm/commit/dbf476fe5ea2c120dff9a85e552be9f898c69ce7 is backported + ./0001-fix-warnings-for-rust-v1.75.patch + ]; + + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "base64urlsafedata-0.1.3" = "sha256-D+u4CIhx8BNyx+EH1efS4mrinjeSJopWCteSaMY1kh8="; + "base64urlsafedata-0.1.3" = "sha256-JLUxLQCwZgxCmXt636baZYo8nQW/ZfHZOqnOIrIks2s="; "sshkeys-0.3.2" = "sha256-CNG9HW8kSwezAdIYW+CR5rqFfmuso4R0+m4OpIyXbSM="; }; }; diff --git a/pkgs/servers/keycloak/all-plugins.nix b/pkgs/servers/keycloak/all-plugins.nix index f1e08dd46df9a..f2f1117f2d84b 100644 --- a/pkgs/servers/keycloak/all-plugins.nix +++ b/pkgs/servers/keycloak/all-plugins.nix @@ -5,4 +5,5 @@ scim-keycloak-user-storage-spi = callPackage ./scim-keycloak-user-storage-spi {}; keycloak-discord = callPackage ./keycloak-discord {}; keycloak-metrics-spi = callPackage ./keycloak-metrics-spi {}; + keycloak-restrict-client-auth = callPackage ./keycloak-restrict-client-auth {}; } diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 4ed62d93a040e..646d2d83ed1cc 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "22.0.5"; + version = "23.0.4"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-D08WPJUOIIDD9JTTq4C4+wzj/fTZvFbxVXWbVzx0MKY="; + hash = "sha256-qvgYH/e+V++Tk39sgELTiUqyoEbBuUoCRNaCiM8ZuoA="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix index 7a7442d8946a7..4752e5fe08c9f 100644 --- a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix +++ b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -11,7 +11,7 @@ maven.buildMavenPackage rec { hash = "sha256-pacmx5w1VVWz3HmHO6sc2friNUpzo4zyJI1/TQgCXlc="; }; - mvnHash = "sha256-rwAc2KtKo4vJ0JWwPquMyt+FHVNTmMpzBPbo8lWDN/A="; + mvnHash = "sha256-RjERY434UL9z/gNZFV+wMTITCmTPGanwu61L8sEGaKY="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix b/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix new file mode 100644 index 0000000000000..bf5d38bca0135 --- /dev/null +++ b/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix @@ -0,0 +1,28 @@ +{ maven, lib, fetchFromGitHub }: + +maven.buildMavenPackage rec { + pname = "keycloak-restrict-client-auth"; + version = "23.0.0"; + + src = fetchFromGitHub { + owner = "sventorben"; + repo = "keycloak-restrict-client-auth"; + rev = "v${version}"; + hash = "sha256-JA3DvLdBKyn2VE1pYSCcRV9Cl7ZAWsRG5MAp548Rl+g="; + }; + + mvnHash = "sha256-W1YvX1P/mshGYoTUO5XMlOcpu2KiujwLludaC3miak4="; + + installPhase = '' + runHook preInstall + install -Dm444 -t "$out" target/keycloak-restrict-client-auth.jar + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/sventorben/keycloak-restrict-client-auth"; + description = "A Keycloak authenticator to restrict authorization on clients"; + license = licenses.mit; + maintainers = with maintainers; [ leona ]; + }; +} diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 0a6f0f1391e27..341fc484451ff 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-10-21"; + version = "unstable-2024-01-06"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "f7567a0db954eabe4c6b8da3f73ce68693698646"; - sha256 = "sha256-zOXoHTySTtq2fR7ujU6aiKAgvw11ogM8K+HJF1RoWEQ="; + rev = "b50d6669a8b491edf07602c0528d26abe8985536"; + sha256 = "sha256-qI+0bia5ROzXcuz0JVLdGyRa45NWTU/MH8dBUXGaHgA="; }; sourceRoot = "${src.name}/klippy"; diff --git a/pkgs/servers/klipper/simulator.cfg b/pkgs/servers/klipper/simulator.cfg index 4dc19b1e40ffb..6a4122ce3aa5f 100644 --- a/pkgs/servers/klipper/simulator.cfg +++ b/pkgs/servers/klipper/simulator.cfg @@ -4,8 +4,10 @@ # CONFIG_MACH_ATSAMD is not set # CONFIG_MACH_LPC176X is not set # CONFIG_MACH_STM32 is not set +# CONFIG_MACH_HC32F460 is not set # CONFIG_MACH_RP2040 is not set # CONFIG_MACH_PRU is not set +# CONFIG_MACH_AR100 is not set # CONFIG_MACH_LINUX is not set CONFIG_MACH_SIMU=y CONFIG_BOARD_DIRECTORY="simulator" @@ -16,6 +18,12 @@ CONFIG_SERIAL_BAUD=250000 CONFIG_USB_VENDOR_ID=0x1d50 CONFIG_USB_DEVICE_ID=0x614e CONFIG_USB_SERIAL_NUMBER="12345" +CONFIG_WANT_GPIO_BITBANGING=y +CONFIG_WANT_DISPLAYS=y +CONFIG_WANT_SENSORS=y +CONFIG_WANT_LIS2DW=y +CONFIG_WANT_SOFTWARE_SPI=y +CONFIG_CANBUS_FREQUENCY=1000000 CONFIG_HAVE_GPIO=y CONFIG_HAVE_GPIO_ADC=y CONFIG_HAVE_GPIO_SPI=y diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index fbb8b38d5ee0b..ef4dbec2e3f9b 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.6.4"; + version = "1.10.1"; src = fetchurl { - url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-tqrC3l2njYGRVIdvt86JVKTCVaAK7GPoYacx3hFRggg="; + url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; + sha256 = "sha256-fgboHXS5lBvhnAfKUbCmKVjvRp+WF7kuU/VTEgky3VI="; }; nativeBuildInputs = [ @@ -27,12 +27,13 @@ stdenvNoCC.mkDerivation rec { komga = nixosTests.komga; }; - meta = with lib; { + meta = { description = "Free and open source comics/mangas server"; homepage = "https://komga.org/"; - license = licenses.mit; + license = lib.licenses.mit; platforms = jdk17_headless.meta.platforms; - maintainers = with maintainers; [ govanify ]; + maintainers = with lib.maintainers; [ govanify ]; + mainProgram = "komga"; }; } diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix index 46619bc960fd3..0f27b36be5227 100644 --- a/pkgs/servers/krill/default.nix +++ b/pkgs/servers/krill/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "krill"; - version = "0.13.1"; + version = "0.14.4"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-UwvSwV1EHcEsF+IScdDiuuU56sXojEWGObzPKrLvlEQ="; + hash = "sha256-J/QChAFjcUdtrfs5KUIRwfJdfCB/gRnIUNyinf66Slo="; }; - cargoHash = "sha256-ts0yr1BY/StEmklUB29blR4K6RfHbH5WzIP2Zs2sVR4="; + cargoHash = "sha256-Cwrgdo+mirH3kGXwBgCzeO1xiEhSrt/Fx8LxhaBJJLE="; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; @@ -26,6 +26,9 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; + # disable failing tests on darwin + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "RPKI Certificate Authority and Publication Server written in Rust"; longDescription = '' diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix index ac55ac025d135..892fa3a10c365 100644 --- a/pkgs/servers/ldap/lldap/default.nix +++ b/pkgs/servers/ldap/lldap/default.nix @@ -7,7 +7,6 @@ , nixosTests , rustPlatform , rustc -, rustc-wasm32 , stdenv , wasm-bindgen-cli , wasm-pack @@ -48,7 +47,7 @@ let pname = commonDerivationAttrs.pname + "-frontend"; nativeBuildInputs = [ - wasm-pack wasm-bindgen-84 binaryen which rustc-wasm32 rustc-wasm32.llvmPackages.lld + wasm-pack wasm-bindgen-84 binaryen which rustc rustc.llvmPackages.lld ]; buildPhase = '' diff --git a/pkgs/servers/lenpaste/default.nix b/pkgs/servers/lenpaste/default.nix index 50e950e98a032..d9e4aa9b5ed9a 100644 --- a/pkgs/servers/lenpaste/default.nix +++ b/pkgs/servers/lenpaste/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://git.lcomrade.su/root/lenpaste"; license = licenses.agpl3Plus; maintainers = with maintainers; [ vector1dev ]; + mainProgram = "lenpaste"; }; } diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index daad39ee1cfb6..aba1c766ce501 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-qiI6+uiDBwY+UkqWyYqySfdOilJ87GyAojY6a5NrHNY="; - arm64-linux_hash = "sha256-CXbZjVIF8JL+bOzUvnaDzpDn+DK9D1g6HnmdvEDR/S8="; - x64-osx_hash = "sha256-t58xYrootKjavdyZp37KByyQa0CwSkl+DLxZuGYV9qs="; + x64-linux_hash = "sha256-TqwVWV3kfBTqGYf6PT9H0E9YiG/AfLWEViKocVrhZuU="; + arm64-linux_hash = "sha256-aCaUZgnk4rnhEV3hDVZx1Bfz+PteefGeGvEdoKXGxxg="; + x64-osx_hash = "sha256-4O3H2gsH2Q3V9xY1fIMzkaU0qSEg3CF89chnrMdCmdk="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "lidarr"; - version = "1.4.5.3639"; + version = "2.0.7.3849"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/lidarr/update.sh b/pkgs/servers/lidarr/update.sh index cff608e7ebf0f..0da098f89bed3 100755 --- a/pkgs/servers/lidarr/update.sh +++ b/pkgs/servers/lidarr/update.sh @@ -25,7 +25,7 @@ updateVersion() sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" } -currentVersion=$(cd $dirname && nix eval --raw -f ../../.. radarr.version) +currentVersion=$(cd $dirname && nix eval --raw -f ../../.. lidarr.version) latestTag=$(curl https://api.github.com/repos/Lidarr/Lidarr/releases/latest | jq -r ".tag_name") latestVersion="$(expr $latestTag : 'v\(.*\)')" diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix index 40488aff18a63..791106ca3b0ff 100644 --- a/pkgs/servers/limesurvey/default.nix +++ b/pkgs/servers/limesurvey/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "limesurvey"; - version = "6.1.2+230606"; + version = "6.4.1+240108"; src = fetchFromGitHub { owner = "LimeSurvey"; repo = "LimeSurvey"; rev = version; - hash = "sha256-a89Kdr9XV1TSCoWxYrU0j8ec7rAcIlU/bgLtRjdzqbg="; + hash = "sha256-Cpf8X6igF7LdRbFihGudFmx/8aY0Kf0BE7jHnEF1DYA="; }; phpConfig = writeText "config.php" '' diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index b68705e34e160..695ceeb2b9a0b 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -28,5 +28,6 @@ buildGoModule rec { homepage = "https://livepeer.org"; license = licenses.mit; maintainers = with maintainers; [ elitak ]; + mainProgram = "livepeer"; }; } diff --git a/pkgs/servers/ma1sd/default.nix b/pkgs/servers/ma1sd/default.nix index 1725b1ab88e6c..1e16cc516e0a8 100644 --- a/pkgs/servers/ma1sd/default.nix +++ b/pkgs/servers/ma1sd/default.nix @@ -95,6 +95,7 @@ stdenv.mkDerivation { license = licenses.agpl3Only; maintainers = with maintainers; [ mguentner ]; platforms = platforms.all; + mainProgram = "ma1sd"; }; } diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index b85fcdf274fc3..b8f3000904c23 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -1,17 +1,26 @@ -{ lib, buildGoModule, fetchFromGitHub, pam, coreutils, installShellFiles, scdoc, nixosTests }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, pam +, coreutils +, installShellFiles +, scdoc +, nixosTests +}: buildGoModule rec { pname = "maddy"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "foxcpp"; repo = "maddy"; rev = "v${version}"; - sha256 = "sha256-EMw07yTFP0aBSuGDWivB8amuxWLFHhYV6J9faTEW5z4="; + sha256 = "sha256-jVlIjeBvxc82GQn8vW2RqcAErxZqftGj32d+IbBxQxY="; }; - vendorHash = "sha256-LyfkETZPkhJKN8CEivNp7Se4IBpzyAtmCM1xil4n2po="; + vendorHash = "sha256-bSBk68w6T/Wy5klj5oC/ZW5TqDESG3mW9cIQ3auNmCk="; tags = [ "libpam" ]; @@ -43,6 +52,8 @@ buildGoModule rec { --replace "/bin/kill" "${coreutils}/bin/kill" ''; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=strict-prototypes"; + passthru.tests.nixos = nixosTests.maddy; meta = with lib; { diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/servers/mail/dkimproxy/default.nix index 128a9ae8ff115..b34d3a1ed5665 100644 --- a/pkgs/servers/mail/dkimproxy/default.nix +++ b/pkgs/servers/mail/dkimproxy/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ perlPackages.perl ]; - propagatedBuildInputs = with perlPackages; [ Error MailDKIM MIMETools NetServer ]; + propagatedBuildInputs = with perlPackages; [ CryptX Error MailDKIM MIMETools NetServer ]; meta = with lib; { description = "SMTP-proxy that signs and/or verifies emails"; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 133411ffc7376..185f38d2e0be8 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -66,6 +66,9 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/dovecot/-/raw/debian/1%252.3.19.1+dfsg1-2/debian/patches/Support-openssl-3.0.patch"; hash = "sha256-PbBB1jIY3jIC8Js1NY93zkV0gISGUq7Nc67Ul5tN7sw="; }) + ] ++ lib.optionals stdenv.isDarwin [ + # fix timespec calls + ./timespec.patch ]; configureFlags = [ @@ -111,7 +114,7 @@ stdenv.mkDerivation rec { description = "Open source IMAP and POP3 email server written with security primarily in mind"; license = with licenses; [ mit publicDomain lgpl21Only bsd3 bsdOriginal ]; mainProgram = "dovecot"; - maintainers = with maintainers; [ fpletz globin ajs124 ]; + maintainers = with maintainers; [ fpletz globin ] ++ teams.helsinki-systems.members; platforms = platforms.unix; }; passthru.tests = { diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 2f3a4d807d2fa..c82e919e7dc23 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, sqlite, pkg-config, dovecot, libtool, xapian, icu64 }: stdenv.mkDerivation rec { pname = "dovecot-fts-xapian"; - version = "1.5.5"; + version = "1.5.7"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; rev = version; - sha256 = "sha256-KAZno4N/4dFH3QHFTs0wkY4PtGF+j4ZEjZzn9ljCjrM="; + sha256 = "sha256-Kxc5mmnp4HBuaPeQUwDLYj3ga7PeF0WJFJFRwhNBZA4="; }; buildInputs = [ dovecot xapian icu64 sqlite ]; diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index a8cfeb9eb7490..25be75b2b9604 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { homepage = "https://pigeonhole.dovecot.org/"; description = "A sieve plugin for the Dovecot IMAP server"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ globin ajs124 ]; + maintainers = with maintainers; [ globin ] ++ teams.helsinki-systems.members; platforms = platforms.unix; }; } diff --git a/pkgs/servers/mail/dovecot/timespec.patch b/pkgs/servers/mail/dovecot/timespec.patch new file mode 100644 index 0000000000000..50290a5a57de1 --- /dev/null +++ b/pkgs/servers/mail/dovecot/timespec.patch @@ -0,0 +1,15 @@ +diff --git a/src/lib-storage/index/dbox-common/dbox-storage.h b/src/lib-storage/index/dbox-common/dbox-storage.h +index 8e8aaa1..a3018a4 100644 +--- a/src/lib-storage/index/dbox-common/dbox-storage.h ++++ b/src/lib-storage/index/dbox-common/dbox-storage.h +@@ -86,4 +86,10 @@ int dbox_verify_alt_storage(struct mailbox_list *list); + bool dbox_header_have_flag(struct mailbox *box, uint32_t ext_id, + unsigned int flags_offset, uint8_t flag); + ++#if defined(__APPLE__) || defined(__NetBSD__) ++#define st_atim st_atimespec ++#define st_ctim st_ctimespec ++#define st_mtim st_mtimespec ++#endif ++ + #endif diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index dc8d0dd648a10..a7f0a1986b994 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,4 +1,5 @@ { coreutils, db, fetchurl, openssl, pcre2, perl, pkg-config, lib, stdenv +, libxcrypt , procps, killall , enableLDAP ? false, openldap , enableMySQL ? false, libmysqlclient, zlib @@ -8,20 +9,21 @@ , enableDMARC ? true, opendmarc , enableRedis ? false, hiredis }: - -stdenv.mkDerivation rec { +let + perl' = perl.withPackages (p: with p; [ FileFcntlLock ]); +in stdenv.mkDerivation rec { pname = "exim"; - version = "4.96.2"; + version = "4.97.1"; src = fetchurl { url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz"; - hash = "sha256-A44yfo0ek9AFusm7Bv0irsRNUCiTDW2+iBetRLv8HeY="; + hash = "sha256-vXggV1CaeTWTUIUoWQYm0YXqFgzjLLNL7aJi6Zzv36k="; }; enableParallelBuilding = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ coreutils db openssl perl pcre2 ] + buildInputs = [ coreutils db openssl perl' pcre2 libxcrypt ] ++ lib.optional enableLDAP openldap ++ lib.optionals enableMySQL [ libmysqlclient zlib ] ++ lib.optional enableAuthDovecot dovecot @@ -54,7 +56,7 @@ stdenv.mkDerivation rec { s:^# \(MV_COMMAND\)=.*:\1=${coreutils}/bin/mv: s:^# \(RM_COMMAND\)=.*:\1=${coreutils}/bin/rm: s:^# \(TOUCH_COMMAND\)=.*:\1=${coreutils}/bin/touch: - s:^# \(PERL_COMMAND\)=.*:\1=${perl}/bin/perl: + s:^# \(PERL_COMMAND\)=.*:\1=${perl'}/bin/perl: s:^# \(LOOKUP_DSEARCH=yes\)$:\1: ${lib.optionalString enableLDAP '' s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1: @@ -130,7 +132,7 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2Plus bsd3 ]; mainProgram = "exim"; platforms = platforms.linux; - maintainers = with maintainers; [ tv ajs124 das_j ]; + maintainers = with maintainers; [ tv ] ++ teams.helsinki-systems.members; changelog = "https://github.com/Exim/exim/blob/exim-${version}/doc/doc-txt/ChangeLog"; }; } diff --git a/pkgs/servers/mail/mailman/0001-Disable-broken-test_help_output-testcase.patch b/pkgs/servers/mail/mailman/0001-Disable-broken-test_help_output-testcase.patch deleted file mode 100644 index 3b6094bd02f0b..0000000000000 --- a/pkgs/servers/mail/mailman/0001-Disable-broken-test_help_output-testcase.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1a914beafe2b00770213fa4d146ffad9d897dc0c Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Sat, 12 Aug 2023 12:27:25 +0200 -Subject: [PATCH] Disable broken `test_help_output` testcase - -The assertion fails, but checking for the exact whereabouts of helptext -doesn't bring too much value anyways, so it seems OK to just skip the -test. ---- - .../tests/commands/test_attachments_to_file.py | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/hyperkitty/tests/commands/test_attachments_to_file.py b/hyperkitty/tests/commands/test_attachments_to_file.py -index b3e61f3a..8db7c4b2 100644 ---- a/hyperkitty/tests/commands/test_attachments_to_file.py -+++ b/hyperkitty/tests/commands/test_attachments_to_file.py -@@ -83,16 +83,3 @@ class CommandTestCase(TestCase): - self.assertEqual(fp.getvalue(), """\ - 2 attachments moved. - """) -- -- def test_help_output(self): -- with io.StringIO() as fp, redirect_stdout(fp): -- with suppress(SystemExit): -- call_command('attachments_to_file', '--help') -- -- output_value = fp.getvalue() -- assert ( -- "HYPERKITTY_ATTACHMENT_FOLDER" in output_value -- and "-c CHUNK_SIZE" in output_value -- and "-c CHUNK_SIZE, --chunk-size CHUNK_SIZE" in output_value -- and "-v {0,1}, --verbosity {0,1}" in output_value -- ) --- -2.40.1 - diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 9c335f11820dc..89195e5937376 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,35 +1,24 @@ { lib , python3 , fetchPypi -, fetchpatch +, nixosTests }: with python3.pkgs; buildPythonPackage rec { pname = "HyperKitty"; - version = "1.3.7"; - disabled = pythonOlder "3.8"; + version = "1.3.8"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TXSso+wwVGdBymIzns5yOS4pj1EdConmm87b/NyBAss="; + hash = "sha256-j//Mrbos/g1BGenHRmOe5GvAza5nu/mchAgdLQu9h7g="; }; - patches = [ - ./0001-Disable-broken-test_help_output-testcase.patch - (fetchpatch { - url = "https://gitlab.com/mailman/hyperkitty/-/commit/5bb394662882bfc73c3e877458da44343aa06922.patch"; - hash = "sha256-9vcY6nu3txDftH6aYpdh9qSrLzZceGjVFxuD1Ux18gw="; - }) - ]; - postPatch = '' # isort is a development dependency sed -i '/isort/d' setup.py - # Fix mistune imports for mistune >= 2.0.0 - # https://gitlab.com/mailman/hyperkitty/-/merge_requests/379 - sed -i 's/mistune.scanner/mistune.util/' hyperkitty/lib/renderer.py ''; propagatedBuildInputs = [ @@ -55,6 +44,7 @@ buildPythonPackage rec { # HyperKitty so they're not included for people who don't need them. nativeCheckInputs = [ beautifulsoup4 + elastic-transport elasticsearch mock whoosh @@ -66,7 +56,10 @@ buildPythonPackage rec { --settings=hyperkitty.tests.settings_test hyperkitty ''; + passthru.tests = { inherit (nixosTests) mailman; }; + meta = { + changelog = "https://docs.mailman3.org/projects/hyperkitty/en/latest/news.html"; homepage = "https://www.gnu.org/software/mailman/"; description = "Archiver for GNU Mailman v3"; license = lib.licenses.gpl3; diff --git a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix index ba3fdbacdb72e..dfec900b0214b 100644 --- a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix +++ b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix @@ -2,6 +2,7 @@ , python3 , fetchPypi , mailman +, nixosTests }: with python3.pkgs; @@ -20,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mailman requests - zope_interface + zope-interface ]; nativeCheckInputs = [ @@ -39,6 +40,8 @@ buildPythonPackage rec { "mailman_hyperkitty" ]; + passthru.tests = { inherit (nixosTests) mailman; }; + meta = with lib; { description = "Mailman archiver plugin for HyperKitty"; homepage = "https://gitlab.com/mailman/mailman-hyperkitty"; diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index 955c553d8a74e..f38a182461acc 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -4,18 +4,19 @@ , fetchPypi , postfix , lynx +, nixosTests }: with python3.pkgs; buildPythonPackage rec { pname = "mailman"; - version = "3.3.8"; + version = "3.3.9"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-g6wH7lXqK0yJ8AxO1HFxMvBicBJ9NGWlPePFyxl9Qc4="; + hash = "sha256-GblXI6IwkLl+V1gEbMAe1baVyZOHMaYaYITXcTkp2Mo="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -31,10 +32,11 @@ buildPythonPackage rec { gunicorn lazr-config passlib + python-dateutil requests sqlalchemy zope-component - zope_configuration + zope-configuration ]; checkInputs = [ @@ -50,18 +52,10 @@ buildPythonPackage rec { url = "https://gitlab.com/mailman/mailman/-/commit/9613154f3c04fa2383fbf017031ef263c291418d.patch"; sha256 = "0vyw87s857vfxbf7kihwb6w094xyxmxbi1bpdqi3ybjamjycp55r"; }) - (fetchpatch { - url = "https://gitlab.com/mailman/mailman/-/commit/5e4431af6bb7d672a7ed7e3329f8fac7812d47f8.patch"; - excludes = [ ".gitlab-ci.yml" ]; - hash = "sha256-y2AE9hU4Z1BpBlJywxMWiuRvltWkk+R9YgMkpemvlIo="; - }) ./log-stderr.patch ]; postPatch = '' - substituteInPlace setup.py \ - --replace "alembic>=1.6.2,<1.7" "alembic>=1.6.2" - substituteInPlace src/mailman/config/postfix.cfg \ --replace /usr/sbin/postmap ${postfix}/bin/postmap substituteInPlace src/mailman/config/schema.cfg \ @@ -77,6 +71,8 @@ buildPythonPackage rec { # 'runner' scripts. dontWrapPythonPrograms = true; + passthru.tests = { inherit (nixosTests) mailman; }; + meta = { homepage = "https://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and newsletter lists"; diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index 14a31b59da4cd..1f3171f18a7f4 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -1,22 +1,24 @@ -{ lib, python3, fetchPypi }: +{ lib, python3, fetchPypi, nixosTests }: with python3.pkgs; buildPythonPackage rec { pname = "postorius"; - version = "1.3.8"; + version = "1.3.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1mSt+PVx3xUJDc5JwrCmKiRNIDwbsjjbM2Fi5Sgz6h8="; + hash = "sha256-GmbIqO+03LgbUxJ1nTStXrYN3t2MfvzbeYRAipfTW1o="; }; - propagatedBuildInputs = [ django-mailman3 readme_renderer ]; + propagatedBuildInputs = [ django-mailman3 readme-renderer ]; nativeCheckInputs = [ beautifulsoup4 vcrpy mock ]; # Tries to connect to database. doCheck = false; + passthru.tests = { inherit (nixosTests) mailman; }; + meta = with lib; { homepage = "https://docs.mailman3.org/projects/postorius"; description = "Web-based user interface for managing GNU Mailman"; diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index e5eb2251b5e1d..ebac15e443bf1 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -18,14 +18,6 @@ python3.override { [1] 72a14ea563a3f5bf85db659349a533fe75a8b0ce [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291 */ - elasticsearch = super.elasticsearch.overridePythonAttrs ({ pname, ... }: rec { - version = "7.17.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ZsTs4q3+fMEg4rameYof1cd3rs+C7sObuVzvfPx+orM="; - }; - }); - # https://gitlab.com/mailman/hyperkitty/-/merge_requests/541 mistune = super.mistune.overridePythonAttrs (old: rec { version = "2.0.5"; @@ -37,11 +29,12 @@ python3.override { }); # django-q tests fail with redis 5.0.0. + # https://gitlab.com/mailman/hyperkitty/-/issues/493 redis = super.redis.overridePythonAttrs ({ pname, ... }: rec { - version = "4.5.4"; + version = "4.6.0"; src = fetchPypi { inherit pname version; - hash = "sha256-c+w12k2iZ9aEfkf2hzD91fYuLKaePvWIXGp4qTdMOJM="; + hash = "sha256-WF3FFrnrBCphnvCjnD19Vf6BvbTfCaUsnN3g0Hvxqn0="; }; }); }) diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index 21fa64085d57a..d347f434ab50e 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -1,26 +1,20 @@ -{ lib, python3, fetchPypi, fetchpatch +{ lib, python3, fetchPypi , sassc, hyperkitty, postorius +, nixosTests }: with python3.pkgs; buildPythonPackage rec { pname = "mailman-web"; - version = "0.0.6"; + version = "0.0.8"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UWdqrcx529r6kwgf0YEHiDrpZlGoUBR6OdYtHMTPMGY="; + hash = "sha256-nN/L+X2Rvm6rqkscns4Tn2TAr59O5lCJObvcJp6M0+Q="; }; - patches = [ - (fetchpatch { - url = "https://gitlab.com/mailman/mailman-web/-/commit/448bba249d39c09c0cef5e059415cc07a3ce569c.patch"; - hash = "sha256-rs1vaV4YyLyJ0+EGY70CirvjArpGQr29DOTvgj68wgs="; - }) - ]; - postPatch = '' # Django is depended on transitively by hyperkitty and postorius, # and mailman_web has overly restrictive version bounds on it, so @@ -45,6 +39,8 @@ buildPythonPackage rec { "--suffix PATH : ${lib.makeBinPath [ sassc ]}" ]; + passthru.tests = { inherit (nixosTests) mailman; }; + meta = with lib; { homepage = "https://gitlab.com/mailman/mailman-web"; description = "Django project for Mailman 3 web interface"; diff --git a/pkgs/servers/mail/mailpit/default.nix b/pkgs/servers/mail/mailpit/default.nix index cfc71d0c24a4f..5f88dd97528d6 100644 --- a/pkgs/servers/mail/mailpit/default.nix +++ b/pkgs/servers/mail/mailpit/default.nix @@ -12,14 +12,13 @@ }: let - - version = "1.10.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "axllent"; repo = "mailpit"; rev = "v${version}"; - hash = "sha256-MrhTgyY89rU2EQILRSFJk8U7QWaoUf2p83ksFjA7xOM="; + hash = "sha256-Ez34JC8QhOCVS7itZAOtYcspbM9MjtZa+1BP2FEIt8U="; }; # Separate derivation, because if we mix this in buildGoModule, the separate @@ -31,7 +30,7 @@ let npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-r4yv2qImIlNMPJagz5i1sxqBDnFAucc2kDUmjGktM6A="; + hash = "sha256-TjlkWozbZlDOsCOdZnOM6axkBYi5G2BCOlvSY4dZg4c="; }; env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { @@ -57,7 +56,7 @@ buildGoModule { pname = "mailpit"; inherit src version; - vendorHash = "sha256-TXa97oOul9cf07uNGdIoxIM++da5HBFeoh05LaJzQTA="; + vendorHash = "sha256-mJWSCqgIPChMR1iFS2rXXOCG+lF1HekmmAjwPPa140g="; CGO_ENABLED = 0; @@ -68,7 +67,6 @@ buildGoModule { ''; passthru.tests.version = testers.testVersion { - inherit version; package = mailpit; command = "mailpit version"; }; diff --git a/pkgs/servers/mail/mox/default.nix b/pkgs/servers/mail/mox/default.nix index 17d34d368f6dc..8ee46f7faeba0 100644 --- a/pkgs/servers/mail/mox/default.nix +++ b/pkgs/servers/mail/mox/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "mox"; - version = "0.0.7"; + version = "0.0.9"; src = fetchFromGitHub { owner = "mjl-"; repo = "mox"; rev = "v${version}"; - hash = "sha256-zFPgMVQQUnEKIgt35KxcRUxuBNSmTM8ZfAZvP22iKgg="; + hash = "sha256-QDDNWGuDWxUBdoYEHQC7Ug0i8NyaqqGVsmFtTWfiM0M="; }; # set the version during buildtime diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index ca8d54d6006d6..61b69359d3c87 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.8.3"; + version = "3.8.5"; src = fetchurl { - url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz"; - hash = "sha256-FpRsmHSnhqCfU7F9HIPcH6rjXL+AurNKsBeYtwQglos="; + url = "https://de.postfix.org/ftpmirror/official/${pname}-${version}.tar.gz"; + hash = "sha256-8+gnorLkEDWa0l0xNBlwQ0qwfjYTn5ou+TmBsOxWTIU="; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index d57aaa4ef29d0..0775df7e092ee 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace postlicyd/policy_tokens.sh \ --replace /bin/bash ${bash}/bin/bash; + + substituteInPlace postlicyd/*_tokens.sh \ + --replace "unsigned int" "size_t" ''; env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=nonnull-compare -Wno-error=format-truncation"; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 180554acd7281..6cf520a1a54c3 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch2 , cmake , perl , glib @@ -28,13 +27,13 @@ assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "3.7.3"; + version = "3.8.1"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - hash = "sha256-TqsY0AUDEpFOGIAH6jDdofIJAYQYtj8Uk4djk5hYemo="; + hash = "sha256-XbsebaplhLWPXpdwZyMbxsRyuvaBHtO2WtMoFzN7yXA="; }; hardeningEnable = [ "pie" ]; diff --git a/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch b/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch deleted file mode 100644 index bac048892fe83..0000000000000 --- a/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 60abf3ee8864980a95b32e2d6cf60e26b49654c0 Mon Sep 17 00:00:00 2001 -From: joachim schiele <js@lastlog.de> -Date: Wed, 7 Jun 2017 22:15:39 +0200 -Subject: [PATCH 2/2] Adding --siteconfigpath to not be forced to use global /etc/spamasassin configuration directory but to provide an alternative location. - ---- - sa-update.raw | 5 +++++ - lib/Mail/SpamAssassin/PerMsgStatus.pm | 2 + - 2 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/sa-update.raw b/sa-update.raw -index bb7396d..39f681f 100755 ---- a/sa-update.raw -+++ b/sa-update.raw -@@ -196,6 +196,7 @@ GetOptions( - 'gpgkeyfile=s' => \$opt{'gpgkeyfile'}, - 'channelfile=s' => \$opt{'channelfile'}, - 'updatedir=s' => \$opt{'updatedir'}, -+ 'siteconfigpath=s' => \$opt{'siteconfigpath'}, - 'gpg!' => \$GPG_ENABLED, - - '4' => sub { $opt{'force_pf'} = 'inet' }, -@@ -267,6 +268,9 @@ else { - $opt{'updatedir'} = $SA->sed_path('__local_state_dir__/__version__'); - } - -+if (defined $opt{'siteconfigpath'}) { -+ $LOCAL_RULES_DIR = untaint_file_path($opt{'siteconfigpath'}); -+} - - # check only disabled gpg - # https://issues.apache.org/SpamAssassin/show_bug.cgi?id=5854 -@@ -1808,7 +1812,7 @@ Options: - --updatedir path Directory to place updates, defaults to the - SpamAssassin site rules directory - (default: @@LOCAL_STATE_DIR@@/@@VERSION@@) -+ --siteconfigpath=path Path for site configs - --refreshmirrors Force the MIRRORED.BY file to be updated - -D, --debug [area=n,...] Print debugging messages - -v, --verbose Be verbose, like print updated channel names; --- - -2.12.2 - diff --git a/pkgs/servers/mail/stalwart/Cargo.lock b/pkgs/servers/mail/stalwart/Cargo.lock index 80e61090a905b..9871da994f7b6 100644 --- a/pkgs/servers/mail/stalwart/Cargo.lock +++ b/pkgs/servers/mail/stalwart/Cargo.lock @@ -36,6 +36,7 @@ dependencies = [ "cfg-if", "cipher 0.4.4", "cpufeatures", + "zeroize", ] [[package]] @@ -69,26 +70,27 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.10", + "getrandom", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", - "getrandom 0.2.10", + "getrandom", "once_cell", "serde", "version_check", + "zerocopy", ] [[package]] @@ -123,9 +125,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" dependencies = [ "anstyle", "anstyle-parse", @@ -143,37 +145,43 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "argon2" @@ -248,6 +256,19 @@ dependencies = [ ] [[package]] +name = "async-compression" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] name = "async-recursion" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -255,7 +276,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] @@ -277,27 +298,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", -] - -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", + "syn 2.0.47", ] [[package]] @@ -306,7 +318,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7" dependencies = [ - "http", + "http 0.2.11", "log", "rustls 0.20.9", "serde", @@ -359,9 +371,9 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body 0.4.5", - "hyper 0.14.27", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "itoa", "matchit", "memchr", @@ -385,8 +397,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body 0.4.5", + "http 0.2.11", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", @@ -416,21 +428,21 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" -version = "0.13.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" [[package]] name = "base64" -version = "0.20.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -439,16 +451,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] -name = "bb8" -version = "0.8.1" +name = "bigdecimal" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b4b0f25f18bcdc3ac72bdb486ed0acf7e185221fd4dc985bc15db5800b0ba2" +checksum = "c06619be423ea5bb86c95f087d5707942791a08a85530df0db2209a3ecfb8bc9" dependencies = [ - "async-trait", - "futures-channel", - "futures-util", - "parking_lot", - "tokio", + "autocfg", + "libm", + "num-bigint", + "num-integer", + "num-traits", ] [[package]] @@ -462,45 +474,45 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.64.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" dependencies = [ "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", "lazycell", + "log", "peeking_take_while", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.47", + "which", ] [[package]] name = "bindgen" -version = "0.65.1" +version = "0.69.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cexpr", "clang-sys", "lazy_static", "lazycell", - "log", "peeking_take_while", - "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.38", - "which", + "syn 2.0.47", ] [[package]] @@ -529,18 +541,6 @@ name = "bitflags" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -dependencies = [ - "serde", -] - -[[package]] -name = "bitpacking" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c7d2ac73c167c06af4a5f37e6e59d84148d57ccbe4480b76f0273eefea82d7" -dependencies = [ - "crunchy", -] [[package]] name = "bitvec" @@ -635,10 +635,43 @@ dependencies = [ ] [[package]] +name = "borsh" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d4d6dafc1a3bb54687538972158f07b2c948bc57d5890df22c0739098b3028" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0" +dependencies = [ + "once_cell", + "proc-macro-crate 2.0.0", + "proc-macro2", + "quote", + "syn 2.0.47", + "syn_derive", +] + +[[package]] +name = "btoi" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" +dependencies = [ + "num-traits", +] + +[[package]] name = "buffered-reader" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d3bea5bcc3ecc38fe5388e6bc35e6fe7bd665eb3ae9a44283e15b91ad3867d" +checksum = "2b9b0a25eb06e83579bc985d836e1e3b957a7201301b48538764d2b2e78090d4" dependencies = [ "lazy_static", "libc", @@ -651,6 +684,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] +name = "bytecheck" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "bytemuck" version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -690,6 +745,16 @@ dependencies = [ ] [[package]] +name = "camellia" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3264e2574e9ef2b53ce6f536dea83a69ac0bc600b762d1523ff83fe07230ce30" +dependencies = [ + "byteorder", + "cipher 0.4.4", +] + +[[package]] name = "cast5" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -762,6 +827,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] name = "chrono" version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -793,13 +864,14 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", + "zeroize", ] [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", @@ -808,9 +880,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" dependencies = [ "clap_builder", "clap_derive", @@ -818,9 +890,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" dependencies = [ "anstream", "anstyle", @@ -830,21 +902,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cmac" @@ -858,12 +930,35 @@ dependencies = [ ] [[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[package]] name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", + "tokio-util", +] + +[[package]] name = "console" version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -878,9 +973,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_panic" @@ -902,9 +997,9 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -912,33 +1007,24 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" 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.2.0" +name = "crc16" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" +checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff" [[package]] name = "crc32fast" @@ -950,10 +1036,24 @@ dependencies = [ ] [[package]] +name = "crossbeam" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eb9105919ca8e40d437fc9cbb8f1975d916f1bd28afe795a48aae32a2cc8920" +dependencies = [ + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" dependencies = [ "cfg-if", "crossbeam-utils", @@ -961,9 +1061,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -972,22 +1072,20 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "adc6598521bb5a83d491e8c1fe51db7296019d2ca3cb93cc6c2a20369a4d78a2" dependencies = [ "cfg-if", "crossbeam-utils", @@ -995,9 +1093,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] @@ -1010,12 +1108,12 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "subtle", "zeroize", ] @@ -1027,15 +1125,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "typenum", ] [[package]] name = "crypto-mac" -version = "0.10.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" dependencies = [ "generic-array", "subtle", @@ -1073,28 +1171,100 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "platforms", + "rustc_version 0.4.0", "subtle", "zeroize", ] [[package]] -name = "curve25519-dalek-ng" -version = "4.1.1" +name = "curve25519-dalek-derive" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.6.4", - "subtle-ng", - "zeroize", + "proc-macro2", + "quote", + "syn 2.0.47", +] + +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core 0.13.4", + "darling_macro 0.13.4", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core 0.20.3", + "darling_macro 0.20.3", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 1.0.109", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.47", +] + +[[package]] +name = "darling_macro" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core 0.13.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core 0.20.3", + "quote", + "syn 2.0.47", ] [[package]] @@ -1104,7 +1274,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", @@ -1112,9 +1282,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "dbl" @@ -1126,6 +1296,39 @@ dependencies = [ ] [[package]] +name = "deadpool" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" +dependencies = [ + "async-trait", + "deadpool-runtime", + "num_cpus", + "tokio", +] + +[[package]] +name = "deadpool-postgres" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda39fa1cfff190d8924d447ad04fd22772c250438ca5ce1dfb3c80621c05aaa" +dependencies = [ + "deadpool", + "tokio", + "tokio-postgres", + "tracing", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" +dependencies = [ + "tokio", +] + +[[package]] name = "decancer" version = "1.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1158,9 +1361,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", @@ -1219,12 +1422,12 @@ dependencies = [ name = "directory" version = "0.1.0" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "argon2", "async-trait", - "bb8", - "flate2", + "deadpool", "futures", + "jmap_proto", "ldap3", "lru-cache", "mail-builder", @@ -1236,16 +1439,16 @@ dependencies = [ "pbkdf2 0.12.2", "pwhash", "regex", - "reqwest", - "rustls 0.21.7", + "rustls 0.22.1", + "rustls-pki-types", "scrypt", + "serde", "sha1", "sha2 0.10.8", - "sieve-rs", "smtp-proto", - "sqlx", + "store", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tracing", "utils", ] @@ -1299,7 +1502,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] @@ -1315,16 +1518,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] -name = "dotenvy" -version = "0.15.7" +name = "dsa" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" +checksum = "d88afbb2443ba68ef8593de497e830b2e276434e1408f85cd760b1107b44ead0" +dependencies = [ + "digest 0.10.7", + "num-bigint-dig", + "num-traits", + "pkcs8", + "rfc6979", + "sha2 0.10.8", + "signature", + "zeroize", +] [[package]] name = "dyn-clone" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "eax" @@ -1350,15 +1563,15 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", "digest 0.10.7", "elliptic-curve", "rfc6979", - "signature 2.1.0", + "signature", "spki", ] @@ -1382,23 +1595,26 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.3" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "signature 1.6.4", + "pkcs8", + "signature", ] [[package]] name = "ed25519-dalek" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek", "ed25519", - "rand 0.7.3", - "sha2 0.9.9", + "rand_core", + "serde", + "sha2 0.10.8", + "subtle", "zeroize", ] @@ -1407,15 +1623,32 @@ name = "either" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "elasticsearch" +version = "8.5.0-alpha.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40d9bd57d914cc66ce878f098f63ed7b5d5b64c30644a5adb950b008f874a6c6" dependencies = [ + "base64 0.11.0", + "bytes", + "dyn-clone", + "lazy_static", + "percent-encoding", + "reqwest", + "rustc_version 0.2.3", "serde", + "serde_json", + "serde_with", + "url", + "void", ] [[package]] name = "elliptic-curve" -version = "0.13.6" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", @@ -1426,7 +1659,7 @@ dependencies = [ "hkdf", "pem-rfc7468", "pkcs8", - "rand_core 0.6.4", + "rand_core", "sec1", "subtle", "zeroize", @@ -1471,7 +1704,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] @@ -1482,36 +1715,25 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if", - "home", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] -name = "event-listener" -version = "2.5.3" +name = "fallible-iterator" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fallible-streaming-iterator" @@ -1521,12 +1743,13 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fancy-regex" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" dependencies = [ "bit-set", - "regex", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -1553,20 +1776,26 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "rand_core 0.6.4", + "rand_core", "subtle", ] [[package]] +name = "fiat-crypto" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" + +[[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] @@ -1593,17 +1822,6 @@ dependencies = [ ] [[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "spin 0.9.8", -] - -[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1626,12 +1844,12 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form-data" -version = "0.4.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0322eefcd026820bbb430b427f0e9b22fc3952f163df23b74a3c5639bae32f0f" +checksum = "cfaaa4f36921bef661ea6e0ee5453db203a86263c6984be5616eee4e72be68e7" dependencies = [ "bytes", - "http", + "http 1.0.0", "httparse", "memchr", "mime", @@ -1642,9 +1860,9 @@ dependencies = [ [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1662,7 +1880,7 @@ dependencies = [ "foundationdb-sys", "futures", "memchr", - "rand 0.8.5", + "rand", "serde", "serde_bytes", "serde_json", @@ -1687,7 +1905,7 @@ checksum = "83c8d52fe8b46ab822b4decdcc0d6d85aeedfc98f0d52ba2bd4aec4a97807516" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", "try_map", ] @@ -1701,6 +1919,58 @@ dependencies = [ ] [[package]] +name = "frunk" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11a351b59e12f97b4176ee78497dff72e4276fb1ceb13e19056aca7fa0206287" +dependencies = [ + "frunk_core", + "frunk_derives", + "frunk_proc_macros", +] + +[[package]] +name = "frunk_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af2469fab0bd07e64ccf0ad57a1438f63160c69b2e57f04a439653d68eb558d6" + +[[package]] +name = "frunk_derives" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" +dependencies = [ + "frunk_proc_macro_helpers", + "quote", + "syn 2.0.47", +] + +[[package]] +name = "frunk_proc_macro_helpers" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b54add839292b743aeda6ebedbd8b11e93404f902c56223e51b9ec18a13d2c" +dependencies = [ + "frunk_core", + "proc-macro2", + "quote", + "syn 2.0.47", +] + +[[package]] +name = "frunk_proc_macros" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71b85a1d4a9a6b300b41c05e8e13ef2feca03e0334127f29eca9506a7fe13a93" +dependencies = [ + "frunk_core", + "frunk_proc_macro_helpers", + "quote", + "syn 2.0.47", +] + +[[package]] name = "funty" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1708,9 +1978,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1723,9 +1993,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1733,15 +2003,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1749,50 +2019,39 @@ dependencies = [ ] [[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", -] - -[[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1838,27 +2097,14 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -1874,9 +2120,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -1891,23 +2137,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core 0.6.4", + "rand_core", "subtle", ] [[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 1.9.3", + "http 0.2.11", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", + "indexmap 2.1.0", "slab", "tokio", "tokio-util", @@ -1920,16 +2185,16 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "allocator-api2", ] @@ -1939,7 +2204,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -1947,9 +2212,6 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] [[package]] name = "hermit-abi" @@ -1979,14 +2241,14 @@ dependencies = [ "idna 0.4.0", "ipnet", "once_cell", - "rand 0.8.5", + "rand", "ring 0.16.20", - "rustls 0.21.7", - "rustls-pemfile", + "rustls 0.21.10", + "rustls-pemfile 1.0.4", "thiserror", "tinyvec", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tracing", "url", ] @@ -2004,21 +2266,21 @@ dependencies = [ "lru-cache", "once_cell", "parking_lot", - "rand 0.8.5", + "rand", "resolv-conf", - "rustls 0.21.7", + "rustls 0.21.10", "smallvec", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tracing", ] [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac 0.12.1", ] @@ -2044,11 +2306,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2064,9 +2326,20 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" dependencies = [ "bytes", "fnv", @@ -2075,35 +2348,35 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.11", "pin-project-lite", ] [[package]] name = "http-body" -version = "1.0.0-rc.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951dfc2e32ac02d67c90c0d65bd27009a635dc9b381a2cc7d284ab01e3a0150d" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http", + "http 1.0.0", ] [[package]] name = "http-body-util" -version = "0.1.0-rc.3" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ef12f041acdd397010e5fb6433270c147d3b8b2d0a840cd7fff8e531dca5c8" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" dependencies = [ "bytes", "futures-util", - "http", - "http-body 1.0.0-rc.2", + "http 1.0.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -2127,22 +2400,22 @@ checksum = "9994b79e8c1a39b3166c63ae7823bb2b00831e2a96a31399c50fe69df408eaeb" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body 0.4.5", + "h2 0.3.22", + "http 0.2.11", + "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -2151,37 +2424,35 @@ dependencies = [ [[package]] name = "hyper" -version = "1.0.0-rc.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d280a71f348bcc670fc55b02b63c53a04ac0bf2daff2980795aeaf53edae10e6" +checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2", - "http", - "http-body 1.0.0-rc.2", + "h2 0.4.0", + "http 1.0.0", + "http-body 1.0.0", "httparse", "httpdate", "itoa", "pin-project-lite", "tokio", - "tracing", - "want", ] [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper 0.14.27", - "rustls 0.21.7", + "http 0.2.11", + "hyper 0.14.28", + "rustls 0.21.10", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", ] [[package]] @@ -2190,7 +2461,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.27", + "hyper 0.14.28", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -2198,29 +2469,27 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.0.0" -source = "git+https://github.com/hyperium/hyper-util#1ed4c2ccdb23f576eb7024555f08b376b9d5c9eb" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" dependencies = [ "bytes", "futures-channel", "futures-util", - "http", - "http-body 1.0.0-rc.2", - "hyper 1.0.0-rc.4", - "once_cell", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.1.0", "pin-project-lite", "socket2 0.5.5", "tokio", - "tower", - "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2249,10 +2518,16 @@ dependencies = [ ] [[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.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2260,9 +2535,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2276,9 +2551,9 @@ checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] name = "imap" -version = "0.4.2" +version = "0.5.2" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "dashmap", "directory", "imap_proto", @@ -2289,11 +2564,12 @@ dependencies = [ "md5", "nlp", "parking_lot", - "rustls 0.21.7", - "rustls-pemfile", + "rand", + "rustls 0.22.1", + "rustls-pemfile 2.0.0", "store", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tracing", "utils", ] @@ -2302,10 +2578,11 @@ dependencies = [ name = "imap_proto" version = "0.1.0" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "chrono", "jmap_proto", "mail-parser", + "store", "tokio", ] @@ -2321,12 +2598,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -2384,19 +2661,19 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ "hermit-abi", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2409,19 +2686,10 @@ dependencies = [ ] [[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jemalloc-sys" @@ -2451,7 +2719,7 @@ checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e" dependencies = [ "cedarwood", "fxhash", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "lazy_static", "phf", "phf_codegen", @@ -2460,14 +2728,14 @@ dependencies = [ [[package]] name = "jmap" -version = "0.4.2" +version = "0.5.2" dependencies = [ "aes", "aes-gcm", "aes-gcm-siv", "async-stream", "async-trait", - "base64 0.21.4", + "base64 0.21.5", "bincode", "cbc", "chrono", @@ -2479,16 +2747,17 @@ dependencies = [ "futures-util", "hkdf", "http-body-util", - "hyper 1.0.0-rc.4", + "hyper 1.1.0", "hyper-util", "jmap_proto", + "lz4_flex", "mail-builder", "mail-parser", "mail-send", "mime", "nlp", "p256", - "rand 0.8.5", + "rand", "rasn", "rasn-cms", "rasn-pkix", @@ -2502,40 +2771,41 @@ dependencies = [ "sieve-rs", "smtp", "smtp-proto", - "sqlx", "store", "tokio", - "tokio-tungstenite 0.20.1", + "tokio-tungstenite", "tracing", - "tungstenite 0.20.1", + "tungstenite", "utils", ] [[package]] name = "jmap-client" -version = "0.3.0" -source = "git+https://github.com/stalwartlabs/jmap-client#5b6595e770c75c3a5b2ae2e90ee18e35d6c6b5cf" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12c697483ad894a8184d0fd61848e057f86b16642049993b3e6a80c959dbc90a" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "async-stream", "base64 0.13.1", "chrono", "futures-util", - "maybe-async 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "maybe-async", "parking_lot", "reqwest", - "rustls 0.21.7", + "rustls 0.22.1", + "rustls-pki-types", "serde", "serde_json", "tokio", - "tokio-tungstenite 0.19.0", + "tokio-tungstenite", ] [[package]] name = "jmap_proto" version = "0.1.0" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "fast-float", "mail-parser", "serde", @@ -2557,18 +2827,27 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] [[package]] +name = "keyed_priority_queue" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d" +dependencies = [ + "indexmap 2.1.0", +] + +[[package]] name = "konst" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030400e39b2dff8beaa55986a17e0014ad657f569ca92426aafcb5e8e71faee7" +checksum = "8d712a8c49d4274f8d8a5cf61368cb5f3c143d149882b1a2918129e53395fdb0" dependencies = [ "const_panic", "konst_kernel", @@ -2577,29 +2856,29 @@ dependencies = [ [[package]] name = "konst_kernel" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3376133edc39f027d551eb77b077c2865a0ef252b2e7d0dd6b6dc303db95d8b5" +checksum = "dac6ea8c376b6e208a81cf39b8e82bebf49652454d98a4829e907dac16ef1790" dependencies = [ "typewit", ] [[package]] name = "lalrpop" -version = "0.19.12" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" +checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8" dependencies = [ "ascii-canvas", "bit-set", "diff", "ena", "is-terminal", - "itertools 0.10.5", + "itertools", "lalrpop-util", "petgraph", "regex", - "regex-syntax 0.6.29", + "regex-syntax 0.7.5", "string_cache", "term", "tiny-keccak", @@ -2608,9 +2887,9 @@ dependencies = [ [[package]] name = "lalrpop-util" -version = "0.19.12" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" +checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" [[package]] name = "lazy_static" @@ -2653,11 +2932,11 @@ dependencies = [ "nom", "percent-encoding", "ring 0.16.20", - "rustls 0.21.7", + "rustls 0.21.10", "rustls-native-certs", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-stream", "tokio-util", "url", @@ -2666,18 +2945,18 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.149" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -2687,12 +2966,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] + +[[package]] name = "librocksdb-sys" -version = "0.10.0+7.9.2" +version = "0.11.0+8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe4d5874f5ff2bc616e55e8c6086d478fcda13faf9495768a4aa1c22042d30b" +checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" dependencies = [ - "bindgen 0.64.0", + "bindgen 0.65.1", "bzip2-sys", "cc", "glob", @@ -2704,9 +2994,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", "pkg-config", @@ -2732,9 +3022,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" @@ -2753,6 +3043,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] +name = "lru" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +dependencies = [ + "hashbrown 0.14.3", +] + +[[package]] name = "lru-cache" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2772,20 +3071,30 @@ dependencies = [ ] [[package]] +name = "lz4_flex" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" +dependencies = [ + "twox-hash", +] + +[[package]] name = "mail-auth" -version = "0.3.6" -source = "git+https://github.com/stalwartlabs/mail-auth#8a1b216adc60b95192645033aed6d20fa89821cd" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224aa436a40caeef3bd3fa1b5b619b28b26d83fcc088c008536886f74ad27951" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "flate2", "hickory-resolver", "lru-cache", "mail-builder", "mail-parser", "parking_lot", - "quick-xml 0.30.0", - "ring 0.17.5", - "rustls-pemfile", + "quick-xml 0.31.0", + "ring 0.17.7", + "rustls-pemfile 2.0.0", "serde", "serde_json", "zip", @@ -2794,15 +3103,17 @@ dependencies = [ [[package]] name = "mail-builder" version = "0.3.1" -source = "git+https://github.com/stalwartlabs/mail-builder#665f46db8542a97f5b86fd1ff9ea8d74d5ab7e4f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef70f53409852d2612f2249810cbbe0c9931ca25b739b734bafc7f61d88051d4" dependencies = [ "gethostname", ] [[package]] name = "mail-parser" -version = "0.9.1" -source = "git+https://github.com/stalwartlabs/mail-parser#b6c080ff45c0de95703a4fadb6a41dab49cd1566" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7af1b812c3c16317ccadacb0db823f04c2872dfc5a1125f171f4a22d1705e9a7" dependencies = [ "encoding_rs", "serde", @@ -2810,22 +3121,24 @@ dependencies = [ [[package]] name = "mail-send" -version = "0.4.1" -source = "git+https://github.com/stalwartlabs/mail-send#53904ce6cf4fcb9a42a92a541f5d64d4d972d6cb" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5982137dccf24ca038daa022eb0ea97a31e9739477445a787a8ef77e015ebb" dependencies = [ - "base64 0.20.0", + "base64 0.21.5", "gethostname", "md5", - "rustls 0.21.7", + "rustls 0.22.1", + "rustls-pki-types", "smtp-proto", "tokio", - "tokio-rustls", - "webpki-roots 0.25.2", + "tokio-rustls 0.25.0", + "webpki-roots 0.26.0", ] [[package]] name = "mail-server" -version = "0.4.2" +version = "0.5.2" dependencies = [ "directory", "imap", @@ -2842,9 +3155,9 @@ dependencies = [ [[package]] name = "managesieve" -version = "0.4.2" +version = "0.5.2" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "bincode", "directory", "imap", @@ -2855,12 +3168,12 @@ dependencies = [ "mail-send", "md5", "parking_lot", - "rustls 0.21.7", - "rustls-pemfile", + "rustls 0.22.1", + "rustls-pemfile 2.0.0", "sieve-rs", "store", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tracing", "utils", ] @@ -2895,15 +3208,6 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "maybe-async" version = "0.2.7" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "maybe-async" -version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f1b8c13cb1f814b634a96b2c725449fe7ed464a7b8781de8688be5ffbd3f305" dependencies = [ @@ -2941,9 +3245,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" @@ -2955,15 +3259,6 @@ dependencies = [ ] [[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] name = "memsec" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3002,16 +3297,111 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "log", + "wasi", "windows-sys 0.48.0", ] [[package]] +name = "mysql-common-derive" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56b0d8a0db9bf6d2213e11f2c701cb91387b0614361625ab7b9743b41aa4938f" +dependencies = [ + "darling 0.20.3", + "heck", + "num-bigint", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.47", + "termcolor", + "thiserror", +] + +[[package]] +name = "mysql_async" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6750b17ce50f8f112ef1a8394121090d47c596b56a6a17569ca680a9626e2ef2" +dependencies = [ + "bytes", + "crossbeam", + "flate2", + "futures-core", + "futures-sink", + "futures-util", + "keyed_priority_queue", + "lazy_static", + "lru", + "mio", + "mysql_common", + "once_cell", + "pem", + "percent-encoding", + "pin-project", + "rand", + "rustls 0.21.10", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "socket2 0.5.5", + "thiserror", + "tokio", + "tokio-rustls 0.24.1", + "tokio-util", + "twox-hash", + "url", + "webpki", + "webpki-roots 0.25.3", +] + +[[package]] +name = "mysql_common" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06f19e4cfa0ab5a76b627cec2d81331c49b034988eaf302c3bafeada684eadef" +dependencies = [ + "base64 0.21.5", + "bigdecimal", + "bindgen 0.69.1", + "bitflags 2.4.1", + "bitvec", + "btoi", + "byteorder", + "bytes", + "cc", + "cmake", + "crc32fast", + "flate2", + "frunk", + "lazy_static", + "mysql-common-derive", + "num-bigint", + "num-traits", + "rand", + "regex", + "rust_decimal", + "saturating", + "serde", + "serde_json", + "sha1", + "sha2 0.10.8", + "smallvec", + "subprocess", + "thiserror", + "time", + "uuid", + "zstd 0.12.4", +] + +[[package]] name = "new_debug_unreachable" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3026,15 +3416,15 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.7.1", + "memoffset", "pin-utils", ] [[package]] name = "nlp" -version = "0.4.2" +version = "0.5.2" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "bincode", "farmhash", "jieba-rs", @@ -3102,7 +3492,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand 0.8.5", + "rand", "smallvec", "zeroize", ] @@ -3156,9 +3546,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -3174,9 +3564,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" @@ -3186,9 +3576,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -3207,7 +3597,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] @@ -3218,18 +3608,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.1.5+3.1.3" +version = "300.2.1+3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491" +checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" dependencies = [ "cc", "libc", @@ -3240,40 +3630,46 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" +checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk", + "futures-core", + "futures-sink", + "indexmap 2.1.0", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", ] [[package]] name = "opentelemetry-http" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b" +checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" dependencies = [ "async-trait", "bytes", - "http", - "opentelemetry_api", + "http 0.2.11", + "opentelemetry", "reqwest", ] [[package]] name = "opentelemetry-otlp" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275" +checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" dependencies = [ "async-trait", "futures-core", - "http", + "http 0.2.11", + "opentelemetry", "opentelemetry-http", "opentelemetry-proto", "opentelemetry-semantic-conventions", - "opentelemetry_api", "opentelemetry_sdk", "prost", "reqwest", @@ -3284,11 +3680,11 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb" +checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" dependencies = [ - "opentelemetry_api", + "opentelemetry", "opentelemetry_sdk", "prost", "tonic", @@ -3296,47 +3692,30 @@ dependencies = [ [[package]] name = "opentelemetry-semantic-conventions" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269" +checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" dependencies = [ "opentelemetry", ] [[package]] -name = "opentelemetry_api" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" -dependencies = [ - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - -[[package]] name = "opentelemetry_sdk" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" +checksum = "968ba3f2ca03e90e5187f5e4f46c791ef7f2c163ae87789c8ce5f5ca3b7b7de5" dependencies = [ "async-trait", "crossbeam-channel", "futures-channel", "futures-executor", "futures-util", + "glob", "once_cell", - "opentelemetry_api", + "opentelemetry", "ordered-float", "percent-encoding", - "rand 0.8.5", - "regex", - "serde_json", + "rand", "thiserror", "tokio", "tokio-stream", @@ -3344,9 +3723,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.9.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" dependencies = [ "num-traits", ] @@ -3397,7 +3776,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] @@ -3409,7 +3788,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -3420,17 +3799,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle", ] [[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] name = "pbkdf2" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3461,6 +3834,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] +name = "pem" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +dependencies = [ + "base64 0.21.5", + "serde", +] + +[[package]] name = "pem-rfc7468" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3471,9 +3854,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" @@ -3482,7 +3865,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.2", + "indexmap 2.1.0", ] [[package]] @@ -3512,7 +3895,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared 0.11.2", - "rand 0.8.5", + "rand", ] [[package]] @@ -3525,7 +3908,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] @@ -3563,7 +3946,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] @@ -3601,9 +3984,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" + +[[package]] +name = "platforms" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "polyval" @@ -3619,9 +4008,38 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.4.3" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "postgres-protocol" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" +dependencies = [ + "base64 0.21.5", + "byteorder", + "bytes", + "fallible-iterator 0.2.0", + "hmac 0.12.1", + "md-5 0.10.6", + "memchr", + "rand", + "sha2 0.10.8", + "stringprep", +] + +[[package]] +name = "postgres-types" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" +checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" +dependencies = [ + "bytes", + "fallible-iterator 0.2.0", + "postgres-protocol", +] [[package]] name = "powerfmt" @@ -3643,12 +4061,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "prettyplease" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ "proc-macro2", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] @@ -3667,9 +4085,9 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.13.2" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" dependencies = [ "elliptic-curve", ] @@ -3685,10 +4103,53 @@ dependencies = [ ] [[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", +] + +[[package]] +name = "proc-macro-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.69" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708" dependencies = [ "unicode-ident", ] @@ -3710,7 +4171,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "proxy-header" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e220ac9305411757d06712209b7c2d1d35c3a1a577301e87855f6219585ecb" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ "proc-macro2", "quote", "syn 1.0.109", @@ -3726,8 +4217,8 @@ dependencies = [ "byteorder", "hmac 0.10.1", "md-5 0.9.1", - "rand 0.8.5", - "sha-1 0.9.8", + "rand", + "sha-1", "sha2 0.9.9", ] @@ -3749,18 +4240,18 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -3784,36 +4275,13 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -3823,16 +4291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -3841,23 +4300,14 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] name = "rasn" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef6075807dc2ea24ddbfaf1546bf4b956ac1f8338eae4dffa35d69846c8b691" +checksum = "76def3a472085e40dae01e4eeb106f2ed70f8c7dabe041faed1668a00ee143ef" dependencies = [ "arrayvec", "bitvec", @@ -3877,9 +4327,9 @@ dependencies = [ [[package]] name = "rasn-cms" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d8d8656a9e88bca3a726fc7c365e4c8a4455d1f95ecd58f7817cfc642674cbc" +checksum = "09d45b1b6c0bfb41d1023246a3853a82d158d7e6690698ad4acac009f2f09380" dependencies = [ "rasn", "rasn-pkix", @@ -3887,12 +4337,12 @@ dependencies = [ [[package]] name = "rasn-derive" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda946c91626f958f853e47616cdfdd1fcd9c36a65a2388eb9a5d80dd644efd3" +checksum = "48d1fd02e16232e942b5e7ce305b447c550d09a9146255a3e8a2cf62a0e2ac2d" dependencies = [ "either", - "itertools 0.10.5", + "itertools", "proc-macro2", "quote", "rayon", @@ -3902,9 +4352,9 @@ dependencies = [ [[package]] name = "rasn-pkix" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c91ef69d71656ca94e119989fd2056679823852d2544f94cd96bd6912a49a06" +checksum = "6c825c4183e8f4db9bd772206d7d0fa10f3df35b6ed5bcb8f6cb50fd1166f8e9" dependencies = [ "rasn", ] @@ -3930,21 +4380,46 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.2.16" +name = "rcgen" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "5d918c80c5a4c7560db726763020bd16db179e4d5b828078842274a443addb5d" dependencies = [ - "bitflags 1.3.2", + "pem", + "ring 0.17.7", + "time", + "yasna", ] [[package]] -name = "redox_syscall" -version = "0.3.5" +name = "redis" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd" dependencies = [ - "bitflags 1.3.2", + "async-trait", + "bytes", + "combine", + "crc16", + "futures", + "futures-util", + "itoa", + "log", + "percent-encoding", + "pin-project-lite", + "rand", + "rustls 0.21.10", + "rustls-native-certs", + "rustls-pemfile 1.0.4", + "rustls-webpki 0.101.7", + "ryu", + "sha1_smol", + "socket2 0.4.10", + "tokio", + "tokio-rustls 0.24.1", + "tokio-util", + "url", + "webpki-roots 0.23.1", ] [[package]] @@ -3958,12 +4433,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom", + "libredox", "thiserror", ] @@ -4007,25 +4482,41 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "regex-syntax" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] +name = "rend" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +dependencies = [ + "bytecheck", +] + +[[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ - "base64 0.21.4", + "async-compression", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body 0.4.5", - "hyper 0.14.27", + "h2 0.3.22", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-rustls", "ipnet", "js-sys", @@ -4035,14 +4526,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.7", - "rustls-pemfile", + "rustls 0.21.10", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", "system-configuration", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", @@ -4050,7 +4541,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots 0.25.3", "winreg", ] @@ -4097,12 +4588,12 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.10", + "getrandom", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -4119,6 +4610,35 @@ dependencies = [ ] [[package]] +name = "rkyv" +version = "0.7.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "roaring" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4131,9 +4651,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015439787fce1e75d55f279078d33ff14b4af5d93d995e8838ee4631301c8a99" +checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" dependencies = [ "libc", "librocksdb-sys", @@ -4141,32 +4661,30 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.2.0" +version = "7.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" dependencies = [ "libc", "rtoolbox", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "rsa" -version = "0.9.2" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" dependencies = [ - "byteorder", "const-oid", "digest 0.10.7", "num-bigint-dig", "num-integer", - "num-iter", "num-traits", "pkcs1", "pkcs8", - "rand_core 0.6.4", - "signature 2.1.0", + "rand_core", + "signature", "spki", "subtle", "zeroize", @@ -4174,22 +4692,22 @@ dependencies = [ [[package]] name = "rtoolbox" -version = "0.0.1" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" dependencies = [ "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "rusqlite" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ "bitflags 2.4.1", - "fallible-iterator", + "fallible-iterator 0.3.0", "fallible-streaming-iterator", "hashlink", "libsqlite3-sys", @@ -4221,9 +4739,9 @@ dependencies = [ "futures", "hex", "hmac 0.12.1", - "http", + "http 0.2.11", "log", - "maybe-async 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "maybe-async", "md5", "percent-encoding", "quick-xml 0.26.0", @@ -4249,6 +4767,22 @@ dependencies = [ ] [[package]] +name = "rust_decimal" +version = "1.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand", + "rkyv", + "serde", + "serde_json", +] + +[[package]] name = "rustc-demangle" version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4261,6 +4795,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.21", +] + +[[package]] name = "rusticata-macros" version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4271,15 +4823,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.20" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4296,38 +4848,68 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.16.20", - "rustls-webpki 0.101.6", + "ring 0.17.7", + "rustls-webpki 0.101.7", "sct", ] [[package]] +name = "rustls" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe6b63262c9fcac8659abfaa96cac103d28166d3ff3eaf8f412e19f3ae9e5a48" +dependencies = [ + "log", + "ring 0.17.7", + "rustls-pki-types", + "rustls-webpki 0.102.1", + "subtle", + "zeroize", +] + +[[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", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.5", +] + +[[package]] +name = "rustls-pemfile" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", + "rustls-pki-types", ] [[package]] +name = "rustls-pki-types" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" + +[[package]] name = "rustls-webpki" version = "0.100.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4339,12 +4921,23 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.6" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.7", + "untrusted 0.9.0", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +dependencies = [ + "ring 0.17.7", + "rustls-pki-types", + "untrusted 0.9.0", ] [[package]] @@ -4355,9 +4948,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "salsa20" @@ -4369,12 +4962,18 @@ dependencies = [ ] [[package]] +name = "saturating" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71" + +[[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4406,15 +5005,21 @@ dependencies = [ [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] name = "sec1" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4452,33 +5057,56 @@ dependencies = [ ] [[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] name = "sequoia-openpgp" -version = "1.16.1" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a16854c0f6297de6db4df195e28324dfbc2429802f0e48cd04007db8e3049709" +checksum = "2ea026cf8a70d331c742e3ad7e68fd405d0743ff86630fb4334a1bf8d0e194c7" dependencies = [ "aes", + "aes-gcm", "anyhow", - "base64 0.21.4", + "base64 0.21.5", "block-padding", "blowfish 0.9.1", "buffered-reader", + "camellia", "cast5", "cfb-mode", "chrono", "cipher 0.4.4", "des", "digest 0.10.7", + "dsa", "dyn-clone", "eax", "ecb", "ecdsa", "ed25519", "ed25519-dalek", - "generic-array", - "getrandom 0.2.10", + "getrandom", "idea", - "idna 0.3.0", + "idna 0.4.0", "lalrpop", "lalrpop-util", "lazy_static", @@ -4488,57 +5116,55 @@ dependencies = [ "num-bigint-dig", "once_cell", "p256", - "rand 0.7.3", - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", "regex", - "regex-syntax 0.6.29", + "regex-syntax 0.8.2", "ripemd", "rsa", - "sha-1 0.10.1", "sha1collisiondetection", "sha2 0.10.8", "thiserror", "twofish", "typenum", - "x25519-dalek-ng", + "x25519-dalek", "xxhash-rust", ] [[package]] name = "serde" -version = "1.0.189" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "6fbd975230bada99c8bb618e0c365c2eefa219158d5c6c29610fd09ff1833257" dependencies = [ "itoa", "ryu", @@ -4558,6 +5184,28 @@ dependencies = [ ] [[package]] +name = "serde_with" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +dependencies = [ + "serde", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +dependencies = [ + "darling 0.13.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "serial_test" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4579,7 +5227,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] @@ -4596,17 +5244,6 @@ dependencies = [ ] [[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] name = "sha1" version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4618,12 +5255,19 @@ dependencies = [ ] [[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] name = "sha1collisiondetection" -version = "0.2.7" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b20793cf8330b2c7da4c438116660fed24e380bcb8a1bcfff2581b5593a0b38e" +checksum = "31c0b86a052106b16741199985c9ec2bf501f619f70c48fa479b44b093ad9a68" dependencies = [ - "digest 0.9.0", + "const-oid", + "digest 0.10.7", "generic-array", ] @@ -4674,10 +5318,11 @@ checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "sieve-rs" -version = "0.3.1" -source = "git+https://github.com/stalwartlabs/sieve#b7b62b3b33d05b7c1e50ea5123a35ef461c66b8d" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25494c13da6c336430906aa783e4bb2ae251c84158d6e5a4fdf0449a779c2521" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "bincode", "fancy-regex", "mail-builder", @@ -4697,21 +5342,21 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - -[[package]] -name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", - "rand_core 0.6.4", + "rand_core", ] [[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] name = "siphasher" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4734,24 +5379,25 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "smtp" -version = "0.4.2" +version = "0.5.2" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", + "bincode", "blake3", "dashmap", "decancer", "directory", "form_urlencoded", "http-body-util", - "hyper 1.0.0-rc.4", + "hyper 1.1.0", "hyper-util", - "idna 0.4.0", + "idna 0.5.0", "imagesize", "infer", "lazy_static", @@ -4764,33 +5410,35 @@ dependencies = [ "nlp", "num_cpus", "parking_lot", - "rand 0.8.5", + "rand", "rayon", "regex", "reqwest", - "rustls 0.21.7", - "rustls-pemfile", + "rustls 0.22.1", + "rustls-pemfile 2.0.0", + "rustls-pki-types", "serde", "serde_json", "sha1", "sha2 0.10.8", "sieve-rs", "smtp-proto", - "sqlx", + "store", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tracing", "unicode-security", "utils", - "webpki-roots 0.25.2", + "webpki-roots 0.26.0", "whatlang", "x509-parser", ] [[package]] name = "smtp-proto" -version = "0.1.1" -source = "git+https://github.com/stalwartlabs/smtp-proto#d5949da111db6d9299c6a8928bf77f3dce337a1d" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20b37ae016fedcac2174dd0e3029870154830a4d3fb10f533317f2604e72b343" [[package]] name = "snafu" @@ -4846,232 +5494,20 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", ] [[package]] -name = "sqlformat" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" -dependencies = [ - "itertools 0.11.0", - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" -dependencies = [ - "ahash 0.8.3", - "atoi", - "byteorder", - "bytes", - "crc", - "crossbeam-queue", - "dotenvy", - "either", - "event-listener", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashlink", - "hex", - "indexmap 2.0.2", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "rustls 0.21.7", - "rustls-pemfile", - "serde", - "serde_json", - "sha2 0.10.8", - "smallvec", - "sqlformat", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "url", - "webpki-roots 0.24.0", -] - -[[package]] -name = "sqlx-macros" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn 1.0.109", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" -dependencies = [ - "dotenvy", - "either", - "heck", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2 0.10.8", - "sqlx-core", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", - "syn 1.0.109", - "tempfile", - "tokio", - "url", -] - -[[package]] -name = "sqlx-mysql" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" -dependencies = [ - "atoi", - "base64 0.21.4", - "bitflags 2.4.1", - "byteorder", - "bytes", - "crc", - "digest 0.10.7", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac 0.12.1", - "itoa", - "log", - "md-5 0.10.6", - "memchr", - "once_cell", - "percent-encoding", - "rand 0.8.5", - "rsa", - "serde", - "sha1", - "sha2 0.10.8", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-postgres" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" -dependencies = [ - "atoi", - "base64 0.21.4", - "bitflags 2.4.1", - "byteorder", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "hex", - "hkdf", - "hmac 0.12.1", - "home", - "itoa", - "log", - "md-5 0.10.6", - "memchr", - "once_cell", - "rand 0.8.5", - "serde", - "serde_json", - "sha1", - "sha2 0.10.8", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" -dependencies = [ - "atoi", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "sqlx-core", - "tracing", - "url", -] - -[[package]] name = "stalwart-cli" -version = "0.4.2" +version = "0.5.2" dependencies = [ "clap", "console", @@ -5084,6 +5520,8 @@ dependencies = [ "mail-parser", "num_cpus", "prettytable-rs", + "pwhash", + "rand", "reqwest", "rpassword", "serde", @@ -5093,9 +5531,9 @@ dependencies = [ [[package]] name = "stalwart-install" -version = "0.4.2" +version = "0.5.2" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "clap", "dialoguer", "flate2", @@ -5103,10 +5541,10 @@ dependencies = [ "libc", "openssl", "pwhash", - "rand 0.8.5", + "rand", + "rcgen", "reqwest", "rpassword", - "rusqlite", "tar", "zip-extract", ] @@ -5121,28 +5559,42 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" name = "store" version = "0.1.0" dependencies = [ - "ahash 0.8.3", - "bitpacking", + "ahash 0.8.7", + "async-trait", "blake3", + "bytes", + "deadpool", + "deadpool-postgres", + "elasticsearch", "farmhash", + "flate2", "foundationdb", "futures", "lazy_static", "lru-cache", - "maybe-async 0.2.7", + "lz4_flex", + "mysql_async", "nlp", "num_cpus", "parking_lot", "r2d2", - "rand 0.8.5", + "rand", "rayon", + "redis", + "regex", + "reqwest", + "ring 0.17.7", "roaring", "rocksdb", "rusqlite", "rust-s3", + "rustls 0.22.1", + "rustls-pki-types", "serde", - "siphasher 1.0.0", + "serde_json", "tokio", + "tokio-postgres", + "tokio-rustls 0.25.0", "tracing", "utils", "xxhash-rust", @@ -5179,16 +5631,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "subtle" -version = "2.4.1" +name = "subprocess" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" +dependencies = [ + "libc", + "winapi", +] [[package]] -name = "subtle-ng" +name = "subtle" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -5203,9 +5659,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "1726efe18f42ae774cc644f330953a5e7b3c3003d3edcecf18850fe9d4dd9afb" dependencies = [ "proc-macro2", "quote", @@ -5213,6 +5669,18 @@ dependencies = [ ] [[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.47", +] + +[[package]] name = "sync_wrapper" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5270,15 +5738,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", + "redox_syscall", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5293,12 +5761,21 @@ dependencies = [ ] [[package]] +name = "termcolor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +dependencies = [ + "winapi-util", +] + +[[package]] name = "tests" version = "0.1.0" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "async-trait", - "base64 0.21.4", + "base64 0.21.5", "bytes", "chrono", "csv", @@ -5308,7 +5785,7 @@ dependencies = [ "flate2", "futures", "http-body-util", - "hyper 1.0.0-rc.4", + "hyper 1.1.0", "hyper-util", "imap", "imap_proto", @@ -5324,18 +5801,18 @@ dependencies = [ "num_cpus", "rayon", "reqwest", - "rustls 0.21.7", - "rustls-pemfile", + "rustls 0.22.1", + "rustls-pemfile 2.0.0", + "rustls-pki-types", "serde", "serde_json", "serial_test", "sieve-rs", "smtp", "smtp-proto", - "sqlx", "store", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tracing", "tracing-subscriber", "utils", @@ -5343,22 +5820,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] @@ -5373,9 +5850,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", @@ -5393,9 +5870,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -5436,9 +5913,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -5465,13 +5942,39 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", +] + +[[package]] +name = "tokio-postgres" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" +dependencies = [ + "async-trait", + "byteorder", + "bytes", + "fallible-iterator 0.2.0", + "futures-channel", + "futures-util", + "log", + "parking_lot", + "percent-encoding", + "phf", + "pin-project-lite", + "postgres-protocol", + "postgres-types", + "rand", + "socket2 0.5.5", + "tokio", + "tokio-util", + "whoami", ] [[package]] @@ -5480,53 +5983,53 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.7", + "rustls 0.21.10", "tokio", ] [[package]] -name = "tokio-stream" -version = "0.1.14" +name = "tokio-rustls" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "futures-core", - "pin-project-lite", + "rustls 0.22.1", + "rustls-pki-types", "tokio", ] [[package]] -name = "tokio-tungstenite" -version = "0.19.0" +name = "tokio-stream" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ - "futures-util", - "log", - "rustls 0.21.7", + "futures-core", + "pin-project-lite", "tokio", - "tokio-rustls", - "tungstenite 0.19.0", - "webpki-roots 0.23.1", ] [[package]] name = "tokio-tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" dependencies = [ "futures-util", "log", + "rustls 0.22.1", + "rustls-pki-types", "tokio", - "tungstenite 0.20.1", + "tokio-rustls 0.25.0", + "tungstenite", + "webpki-roots 0.26.0", ] [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -5537,6 +6040,34 @@ dependencies = [ ] [[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] name = "tonic" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5544,14 +6075,14 @@ checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", "axum", - "base64 0.21.4", + "base64 0.21.5", "bytes", "futures-core", "futures-util", - "h2", - "http", - "http-body 0.4.5", - "hyper 0.14.27", + "h2 0.3.22", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-timeout", "percent-encoding", "pin-project", @@ -5575,7 +6106,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand 0.8.5", + "rand", "slab", "tokio", "tokio-util", @@ -5602,7 +6133,6 @@ 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", @@ -5610,11 +6140,12 @@ dependencies = [ [[package]] name = "tracing-appender" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", + "thiserror", "time", "tracing-subscriber", ] @@ -5627,7 +6158,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] @@ -5653,21 +6184,22 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] [[package]] name = "tracing-opentelemetry" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8" +checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" dependencies = [ + "js-sys", "once_cell", "opentelemetry", "opentelemetry_sdk", @@ -5676,13 +6208,14 @@ dependencies = [ "tracing-core", "tracing-log", "tracing-subscriber", + "web-time", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -5698,9 +6231,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "try_map" @@ -5710,51 +6243,43 @@ checksum = "fb1626d07cb5c1bb2cf17d94c0be4852e8a7c02b041acec9a8c5bdda99f9d580" [[package]] name = "tungstenite" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 1.0.0", "httparse", "log", - "rand 0.8.5", - "rustls 0.21.7", + "rand", + "rustls 0.22.1", + "rustls-pki-types", "sha1", "thiserror", "url", "utf-8", - "webpki", ] [[package]] -name = "tungstenite" -version = "0.20.1" +name = "twofish" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "a78e83a30223c757c3947cd144a31014ff04298d8719ae10d03c31c0448c8013" dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand 0.8.5", - "sha1", - "thiserror", - "url", - "utf-8", + "cipher 0.4.4", ] [[package]] -name = "twofish" -version = "0.7.1" +name = "twox-hash" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78e83a30223c757c3947cd144a31014ff04298d8719ae10d03c31c0448c8013" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cipher 0.4.4", + "cfg-if", + "rand", + "static_assertions", ] [[package]] @@ -5789,9 +6314,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-ident" @@ -5825,12 +6350,6 @@ dependencies = [ ] [[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] name = "unicode-width" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5843,12 +6362,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] name = "universal-hash" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5872,12 +6385,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", ] @@ -5901,37 +6414,52 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utils" -version = "0.4.2" +version = "0.5.2" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", + "arc-swap", + "base64 0.21.5", "chrono", "dashmap", + "futures", "mail-auth", "mail-send", "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", + "opentelemetry_sdk", + "parking_lot", + "pem", "privdrop", - "rustls 0.21.7", - "rustls-pemfile", + "proxy-header", + "rand", + "rcgen", + "reqwest", + "ring 0.17.7", + "rustls 0.22.1", + "rustls-pemfile 2.0.0", + "rustls-pki-types", "serde", + "serde_json", "smtp-proto", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tracing", "tracing-appender", "tracing-journald", "tracing-opentelemetry", "tracing-subscriber", + "webpki-roots 0.26.0", + "x509-parser", ] [[package]] name = "uuid" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ - "getrandom 0.2.10", + "getrandom", ] [[package]] @@ -5953,6 +6481,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] name = "want" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5963,21 +6497,15 @@ dependencies = [ [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[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.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5985,24 +6513,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -6012,9 +6540,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6022,22 +6550,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasm-streams" @@ -6054,9 +6582,19 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" dependencies = [ "js-sys", "wasm-bindgen", @@ -6068,7 +6606,7 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -6092,18 +6630,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.24.0" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" -dependencies = [ - "rustls-webpki 0.101.6", -] +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "0de2cfda980f21be5a7ed2eadb3e6fe074d56022bea2cdeb1a62eb220fc04188" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "whatlang" @@ -6132,6 +6670,10 @@ name = "whoami" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +dependencies = [ + "wasm-bindgen", + "web-sys", +] [[package]] name = "widestring" @@ -6156,6 +6698,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6163,11 +6714,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -6189,6 +6740,15 @@ dependencies = [ ] [[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.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6219,6 +6779,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6231,6 +6806,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6243,6 +6824,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6255,6 +6842,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6267,6 +6860,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6279,6 +6878,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6291,6 +6896,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6303,6 +6914,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8434aeec7b290e8da5c3f0d628cb0eac6cabcb31d14bb74f779a08109a5914d6" +dependencies = [ + "memchr", +] + +[[package]] name = "winreg" version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6322,14 +6948,13 @@ dependencies = [ ] [[package]] -name = "x25519-dalek-ng" -version = "1.1.1" +name = "x25519-dalek" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7074de8999662970c3c4c8f7f30925028dd8f4ca31ad4c055efa9cdf2ec326" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "curve25519-dalek-ng", - "rand 0.8.5", - "rand_core 0.6.4", + "curve25519-dalek", + "rand_core", "zeroize", ] @@ -6352,11 +6977,13 @@ dependencies = [ [[package]] name = "xattr" -version = "1.0.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "914566e6413e7fa959cc394fb30e563ba80f3541fbd40816d4c05a0fc3f2a0f1" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] @@ -6367,15 +6994,44 @@ checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "xxhash-rust" -version = "0.8.7" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53be06678ed9e83edb1745eb72efc0bbcd7b5c3c35711a860906aed827a13d61" + +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +dependencies = [ + "time", +] + +[[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 = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.47", +] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -6388,7 +7044,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.47", ] [[package]] @@ -6408,7 +7064,7 @@ dependencies = [ "pbkdf2 0.11.0", "sha1", "time", - "zstd", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] @@ -6428,7 +7084,16 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +dependencies = [ + "zstd-safe 6.0.6", ] [[package]] @@ -6442,6 +7107,16 @@ dependencies = [ ] [[package]] +name = "zstd-safe" +version = "6.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] name = "zstd-sys" version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/servers/mail/stalwart/default.nix b/pkgs/servers/mail/stalwart/default.nix index 2be1e000f88a9..7c680a53e50f7 100644 --- a/pkgs/servers/mail/stalwart/default.nix +++ b/pkgs/servers/mail/stalwart/default.nix @@ -10,10 +10,11 @@ , stdenv , darwin , nix-update-script +, rocksdb }: let - version = "0.4.2"; + version = "0.5.2"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -23,27 +24,18 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "v${version}"; - hash = "sha256-Ah53htK38Bm2yGN44IiC6iRWgxkMVRtrNvXXvPh+SJc="; + hash = "sha256-U53v123mLD9mGmsNKgHlad8+2vr9lzMXizT4KeOChJY="; fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; - outputHashes = { - "hyper-util-0.0.0" = "sha256-9vp8eWjK/pjkJCMjVSI9J2b4amhXK5sat1VAq5Jd6mI="; - "jmap-client-0.3.0" = "sha256-TJQEi2qH/92QA3YJrPBWgpO0nE5o7Atv6btq2gPNTmw="; - "mail-auth-0.3.6" = "sha256-FTC0ZHyZ5H2yBlmNrOijm50xQ3qd2Q+52z8THCW5A5Q="; - "mail-builder-0.3.1" = "sha256-JPV3vp/5+9yFoNNZzxuQ9sbnF8HgDbfHhtb6zQfLFqQ="; - "mail-parser-0.9.1" = "sha256-PJh6s7SvspakhuziEy+dZccIN0hJpjkcIUGTYQRvKGc="; - "mail-send-0.4.1" = "sha256-WK6pC8ZtSoIScanNatDbb3Y7Ch43Dj3463VHDwmEyG0="; - "sieve-rs-0.3.1" = "sha256-PJ24mwlpA6EpB3l749HfSFQhYAmpPxKmYJh/nBmDKDs="; - "smtp-proto-0.1.1" = "sha256-C73wm+dfq+LKteHH9wATw2L23YMw3dhzTIyFJMoqvBA="; - }; }; nativeBuildInputs = [ pkg-config protobuf + rustPlatform.bindgenHook ]; buildInputs = [ @@ -60,6 +52,8 @@ rustPlatform.buildRustPackage { env = { OPENSSL_NO_VENDOR = true; ZSTD_SYS_USE_PKG_CONFIG = true; + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; }; # Tests require reading to /etc/resolv.conf diff --git a/pkgs/servers/mail/vsmtp/default.nix b/pkgs/servers/mail/vsmtp/default.nix deleted file mode 100644 index a6fc770cf5e05..0000000000000 --- a/pkgs/servers/mail/vsmtp/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -, testers -, vsmtp -}: - -rustPlatform.buildRustPackage rec { - pname = "vsmtp"; - version = "2.2.1"; - - src = fetchFromGitHub { - owner = "viridIT"; - repo = "vsmtp"; - rev = "v${version}"; - hash = "sha256-dRw5Q6bejaAJCnoR9j2wBU+L+p1pk1Tnxtm0WcRyOaY="; - }; - - cargoHash = "sha256-RYHn9kZZApgXWTExAHl9ZnCsuvqnnb67unmvd4Pnwz0="; - - nativeBuildInputs = [ installShellFiles ]; - - buildFeatures = [ - "telemetry" - "journald" - "syslog" - ]; - - # tests do not run well in the nix sandbox - doCheck = false; - - postInstall = '' - installManPage tools/install/man/*.1 - ''; - - passthru = { - tests.version = testers.testVersion { package = vsmtp; version = "v${version}"; }; - }; - - meta = with lib; { - description = "A next-gen mail transfer agent (MTA) written in Rust"; - homepage = "https://viridit.com"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ nickcao ]; - }; -} diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 7b20fe7038f94..25b6fc41a07b9 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, nodejs-slim, bundlerEnv, nixosTests -, yarn, callPackage, imagemagick, ffmpeg, file, ruby, writeShellScript -, fetchYarnDeps, fixup_yarn_lock +, yarn, callPackage, ruby, writeShellScript +, fetchYarnDeps, prefetch-yarn-deps , brotli # Allow building a fork or custom version of Mastodon: , pname ? "mastodon" , version ? srcOverride.version +, patches ? [] # src is a package -, srcOverride ? callPackage ./source.nix {} +, srcOverride ? callPackage ./source.nix { inherit patches; } , gemset ? ./. + "/gemset.nix" , yarnHash ? srcOverride.yarnHash }: @@ -44,7 +45,7 @@ stdenv.mkDerivation rec { hash = yarnHash; }; - nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; + nativeBuildInputs = [ prefetch-yarn-deps nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; RAILS_ENV = "production"; NODE_ENV = "production"; @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { # This option is needed for openssl-3 compatibility # Otherwise we encounter this upstream issue: https://github.com/mastodon/mastodon/issues/17924 export NODE_OPTIONS=--openssl-legacy-provider - fixup_yarn_lock ~/yarn.lock + fixup-yarn-lock ~/yarn.lock yarn config --offline set yarn-offline-mirror $yarnOfflineCache yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress @@ -95,7 +96,8 @@ stdenv.mkDerivation rec { ''; }; - propagatedBuildInputs = [ imagemagick ffmpeg file mastodonGems.wrappedRuby ]; + propagatedBuildInputs = [ mastodonGems.wrappedRuby ]; + nativeBuildInputs = [ brotli ]; buildInputs = [ mastodonGems nodejs-slim ]; buildPhase = '' diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 384302458470c..537b865fc6495 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -321,6 +321,16 @@ }; version = "0.1.1"; }; + bcp47_spec = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "043qld01c163yc7fxlar3046dac2833rlcg44jbbs9n1jvgjxmiz"; + type = "gem"; + }; + version = "0.2.1"; + }; bcrypt = { groups = ["default" "pam_authentication"]; platforms = []; @@ -1395,10 +1405,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rvsalsrs8njk2gqxgq0ydg5cd02jqdawskbq2ccz663qxz8wwq5"; + sha256 = "0illsmkly0hhi24lm1l6jjjdr6jykvydkwi1cxf4ad3mra68m16l"; type = "gem"; }; - version = "0.3.2"; + version = "1.0.0"; }; json-jwt = { dependencies = ["activesupport" "aes_key_wrap" "bindata" "httpclient"]; @@ -1417,10 +1427,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z3kqacjmqs02vwwqm9di7sw7f7nchxx99v84myrrzmh64c6zfcq"; + sha256 = "1carfj87p6cpd0xnysg5sj653rqmmwnnacsmjk42xdy40j15gp88"; type = "gem"; }; - version = "3.2.5"; + version = "3.3.1"; }; json-ld-preloaded = { dependencies = ["json-ld" "rdf"]; @@ -1860,10 +1870,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; + sha256 = "0xkjz56qc7hl7zy7i7bhiyw5pl85wwjsa4p70rj6s958xj2sd1lm"; type = "gem"; }; - version = "2.5.9"; + version = "2.7.0"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -2129,10 +2139,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c"; + sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y"; type = "gem"; }; - version = "6.3.1"; + version = "6.4.2"; }; pundit = { dependencies = ["activesupport"]; @@ -2341,15 +2351,15 @@ version = "13.0.6"; }; rdf = { - dependencies = ["link_header"]; + dependencies = ["bcp47_spec" "link_header"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jx4xyip4inrhr099zac8ah5232g70rv39mm19p85sgpwg80a6ip"; + sha256 = "0l515w395kbyz4n7lx102x1nv9yl6l72gvk67p35z4cqa74s59nx"; type = "gem"; }; - version = "3.2.11"; + version = "3.3.1"; }; rdf-normalize = { dependencies = ["rdf"]; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index fd1101238a319..6ccec387514c0 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,7 +1,7 @@ # This file was generated by pkgs.mastodon.updateScript. -{ fetchFromGitHub, applyPatches }: +{ fetchFromGitHub, applyPatches, patches ? [] }: let - version = "4.2.1"; + version = "4.2.4"; in ( applyPatches { @@ -9,9 +9,9 @@ in owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-SM9WdD+xpxo+gfBft9DARV6QjwNbF2Y9McVrrdDT3fw="; + hash = "sha256-YPGOe9wywRls26PqEbqFeQRg7rcnRBO2NyiNW1fssts="; }; - patches = []; + patches = patches ++ []; }) // { inherit version; yarnHash = "sha256-qoLesubmSvRsXhKwMEWHHXcpcqRszqcdZgHQqnTpNPE="; diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh index ab430315858e3..8e8350431e211 100755 --- a/pkgs/servers/mastodon/update.sh +++ b/pkgs/servers/mastodon/update.sh @@ -82,7 +82,7 @@ HASH=$(echo "$JSON" | jq -r .hash) cat > source.nix << EOF # This file was generated by pkgs.mastodon.updateScript. -{ fetchFromGitHub, applyPatches }: +{ fetchFromGitHub, applyPatches, patches ? [] }: let version = "$VERSION"; in @@ -94,7 +94,7 @@ in rev = "v\${version}"; hash = "$HASH"; }; - patches = [$PATCHES]; + patches = patches ++ [$PATCHES]; }) // { inherit version; yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; diff --git a/pkgs/servers/matrix-appservice-discord/default.nix b/pkgs/servers/matrix-appservice-discord/default.nix index b1d14319638d9..605df82b5771d 100644 --- a/pkgs/servers/matrix-appservice-discord/default.nix +++ b/pkgs/servers/matrix-appservice-discord/default.nix @@ -103,5 +103,6 @@ in mkYarnPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pacien ]; platforms = lib.platforms.linux; + mainProgram = "matrix-appservice-discord"; }; } diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index ef8ff520c072b..9f542ac98e769 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -17,25 +17,25 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.95.1"; + version = "1.99.0"; format = "pyproject"; src = fetchFromGitHub { - owner = "matrix-org"; + owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-5RyJCMYsf6p9rd1ATEHa+FMV6vv3ULbcx7PXxMSUGSU="; + hash = "sha256-NS0in7zUkIS+fI5gQEua9y1UXspEHWNCntyZHZCtfPg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-gNjpML+j9ABv24WrAiJI5hoEoIqcVPL2I4V/W+sWFSg="; + hash = "sha256-FQhHpbp8Rkkqp6Ngly/HP8iWGlWh5CDaztgAwKB/afI="; }; postPatch = '' # Remove setuptools_rust from runtime dependencies - # https://github.com/matrix-org/synapse/blob/v1.69.0/pyproject.toml#L177-L185 + # https://github.com/element-hq/synapse/blob/v1.69.0/pyproject.toml#L177-L185 sed -i '/^setuptools_rust =/d' pyproject.toml # Remove version pin on build dependencies. Upstream does this on purpose to @@ -149,7 +149,7 @@ python3.pkgs.buildPythonApplication rec { # high parallelisem makes test suite unstable # upstream uses 2 cores but 4 seems to be also stable - # https://github.com/matrix-org/synapse/blob/develop/.github/workflows/latest_deps.yml#L103 + # https://github.com/element-hq/synapse/blob/develop/.github/workflows/latest_deps.yml#L103 if (( $NIX_BUILD_CORES > 4)); then NIX_BUILD_CORES=4 fi @@ -167,9 +167,9 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://matrix.org"; - changelog = "https://github.com/matrix-org/synapse/releases/tag/v${version}"; + changelog = "https://github.com/element-hq/synapse/releases/tag/v${version}"; description = "Matrix reference homeserver"; - license = licenses.asl20; + license = licenses.agpl3Plus; maintainers = teams.matrix.members; }; } diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index 1fc99bb203369..bbfc36ad42688 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -11,6 +11,8 @@ let data = lib.importJSON ./pin.json; in mkYarnPackage rec { + inherit nodejs; + pname = "matrix-appservice-slack"; version = data.version; diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json index 5f4e0c309f09f..8d3204fa2b4f8 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json @@ -1,6 +1,6 @@ { "name": "matrix-hookshot", - "version": "4.5.1", + "version": "5.1.2", "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.", "main": "lib/app.js", "repository": "https://github.com/matrix-org/matrix-hookshot", @@ -10,7 +10,7 @@ "name": "matrix-hookshot-rs" }, "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "build:web": "vite build", @@ -32,6 +32,7 @@ "start:matrixsender": "node --require source-map-support/register lib/App/MatrixSenderApp.js", "start:resetcrypto": "node --require source-map-support/register lib/App/ResetCryptoStore.js", "test": "mocha -r ts-node/register tests/init.ts tests/*.ts tests/**/*.ts", + "test:e2e": "yarn node --experimental-vm-modules $(yarn bin jest)", "test:cover": "nyc --reporter=lcov --reporter=text yarn test", "lint": "yarn run lint:js && yarn run lint:rs", "lint:js": "eslint -c .eslintrc.js 'src/**/*.ts' 'tests/**/*.ts' 'web/**/*.ts' 'web/**/*.tsx'", @@ -42,71 +43,77 @@ }, "dependencies": { "@alloc/quick-lru": "^5.2.0", - "@octokit/auth-app": "^3.3.0", - "@octokit/auth-token": "^2.4.5", - "@octokit/rest": "^18.10.0", - "@octokit/webhooks": "^9.1.2", + "@octokit/auth-app": "^6.0.2", + "@octokit/auth-token": "^4.0.0", + "@octokit/rest": "^20.0.2", + "@octokit/webhooks": "^12.0.10", "@sentry/node": "^7.52.1", + "@vector-im/compound-design-tokens": "^0.1.0", + "@vector-im/compound-web": "^0.9.4", "ajv": "^8.11.0", - "axios": "^0.24.0", + "axios": "^1.6.3", "cors": "^2.8.5", - "express": "^4.17.3", + "express": "^4.18.2", "figma-js": "^1.14.0", "http-status-codes": "^2.2.0", "ioredis": "^5.2.3", - "jira-client": "^8.0.0", - "markdown-it": "^12.3.2", + "jira-client": "^8.2.2", + "markdown-it": "^14.0.0", "matrix-appservice-bridge": "^9.0.1", - "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.7-element.1", - "matrix-widget-api": "^1.0.0", - "micromatch": "^4.0.4", - "mime": "^3.0.0", - "node-emoji": "^1.11.0", - "nyc": "^15.1.0", + "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.0-specific-device-2", + "matrix-widget-api": "^1.6.0", + "micromatch": "^4.0.5", + "mime": "^4.0.1", + "node-emoji": "^2.1.3", "p-queue": "^6.6.2", - "prom-client": "^14.2.0", - "quickjs-emscripten": "^0.23.0", - "reflect-metadata": "^0.1.13", + "preact-render-to-string": "^6.3.1", + "prom-client": "^15.1.0", + "quickjs-emscripten": "^0.26.0", + "reflect-metadata": "^0.2.1", "source-map-support": "^0.5.21", "string-argv": "^0.3.1", "tiny-typed-emitter": "^2.1.0", - "winston": "^3.3.3", - "xml2js": "^0.5.0", - "yaml": "^2.2.2" + "vite-plugin-magical-svg": "^1.1.1", + "winston": "^3.11.0", + "xml2js": "^0.6.2", + "yaml": "^2.3.4" }, "devDependencies": { "@codemirror/lang-javascript": "^6.0.2", "@napi-rs/cli": "^2.13.2", "@preact/preset-vite": "^2.2.0", - "@tsconfig/node18": "^2.0.0", + "@rollup/plugin-alias": "^5.1.0", + "@tsconfig/node18": "^18.2.2", "@types/ajv": "^1.0.0", "@types/chai": "^4.2.22", "@types/cors": "^2.8.12", "@types/express": "^4.17.14", + "@types/jest": "^29.5.11", "@types/jira-client": "^7.1.0", - "@types/markdown-it": "^12.2.3", + "@types/markdown-it": "^13.0.7", "@types/micromatch": "^4.0.1", - "@types/mime": "^2.0.3", - "@types/mocha": "^9.0.0", - "@types/node": "18", - "@types/node-emoji": "^1.8.1", - "@types/uuid": "^8.3.3", + "@types/mime": "^3.0.4", + "@types/mocha": "^10.0.6", + "@types/node": "20.10.6", "@types/xml2js": "^0.4.11", - "@typescript-eslint/eslint-plugin": "^6.6.0", - "@typescript-eslint/parser": "^6.6.0", + "@typescript-eslint/eslint-plugin": "^6.17.0", + "@typescript-eslint/parser": "^6.17.0", "@uiw/react-codemirror": "^4.12.3", "chai": "^4.3.4", "eslint": "^8.49.0", "eslint-config-preact": "^1.3.0", "eslint-plugin-mocha": "^10.1.0", + "homerunner-client": "^1.0.0", + "jest": "^29.7.0", "mini.css": "^3.0.1", - "mocha": "^8.2.1", + "mocha": "^10.2.0", + "nyc": "^15.1.0", "preact": "^10.5.15", - "rimraf": "^3.0.2", - "sass": "^1.51.0", + "rimraf": "^5.0.5", + "sass": "^1.69.6", + "ts-jest": "^29.1.1", "ts-node": "^10.9.1", - "typescript": "^5.1.3", - "vite": "^4.1.5", - "vite-svg-loader": "^4.0.0" + "typescript": "^5.3.3", + "vite": "^5.0.10" } } diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json index e27f39681c78e..51dab75959ade 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json @@ -1,6 +1,6 @@ { - "version": "4.5.1", - "srcHash": "sha256-uqLpwgVEfwcMTeGMDn3lDUD91GHPNyWHmCSPxuV/VC0=", - "yarnHash": "08dw9vbhlmqwj2nah6fv1b2sf15ibl5kg38ghkxkbccs4j7adans", - "cargoHash": "sha256-bIpsQni3kaoYCGLz01YdauYM8ybpx+BvVTiB6N72rIA=" + "version": "5.1.2", + "srcHash": "sha256-dBuk/kpU5/GnwoTDh8FdnetK2hEBBTwrUA3fP/L9mWU=", + "yarnHash": "100lfm0pr0l33j1bl9zmw1s7fm4ihrwppyvq6x8ahx1sjrr1m0lp", + "cargoHash": "sha256-4cFhV5y7tqUZ4pQWQKIbOZ0qXo0ya5gnMizCNcxYZS0=" } diff --git a/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/pkgs/servers/matrix-synapse/sliding-sync/default.nix index aca863ed2da99..107f2c1abb8ba 100644 --- a/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ b/pkgs/servers/matrix-synapse/sliding-sync/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "matrix-sliding-sync"; - version = "0.99.12"; + version = "0.99.15"; src = fetchFromGitHub { owner = "matrix-org"; repo = "sliding-sync"; rev = "refs/tags/v${version}"; - hash = "sha256-7M+Ti1SfurRngXg2oCdLveG6QyjM2BjKnoovJxz7ZOY="; + hash = "sha256-9JYR9fBxtv+3E+l+l26jryqEstnOUm657VsKsDRzD9g="; }; - vendorHash = "sha256-li5kEF7U7KyyMLMhVBqvnLuLXI6QrJl1KeusKrQXo8w="; + vendorHash = "sha256-THjvc0TepIBFOTte7t63Dmadf3HMuZ9m0YzQMI5e5Pw="; subPackages = [ "cmd/syncv3" ]; diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/servers/matrix-synapse/tools/synadm.nix index 5ae3077060caa..e693194774939 100644 --- a/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "synadm"; - version = "0.44"; + version = "0.45"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-BNmdyEITSZJb+wwyLU+zZi70kmfuYOqVDhKi8xFCf2E="; + hash = "sha256-KstWVSU0IE1ncfIkIH1QsaQc/Yfs2lF+6+5x9zw9cA8="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { longDescription = '' A CLI tool to help admins of Matrix Synapse homeservers conveniently issue commands available via its admin API's - (matrix-org/synapse@master/docs/admin_api) + (element-hq/synapse@master/docs/admin_api) ''; changelog = "https://github.com/JOJ0/synadm/releases/tag/v${version}"; homepage = "https://github.com/JOJ0/synadm"; diff --git a/pkgs/servers/matrix-synapse/wrapper.nix b/pkgs/servers/matrix-synapse/wrapper.nix index 930142c5f55e2..5b7ce47b367c6 100644 --- a/pkgs/servers/matrix-synapse/wrapper.nix +++ b/pkgs/servers/matrix-synapse/wrapper.nix @@ -14,11 +14,11 @@ let extraPackages = lib.concatMap (extra: matrix-synapse-unwrapped.optional-dependencies.${extra}) (lib.unique extras); - pluginsEnv = matrix-synapse-unwrapped.python.buildEnv.override { - extraLibs = plugins; + pythonEnv = matrix-synapse-unwrapped.python.buildEnv.override { + extraLibs = extraPackages ++ plugins; }; - searchPath = lib.makeSearchPathOutput "lib" matrix-synapse-unwrapped.python.sitePackages (extraPackages ++ [ pluginsEnv ]); + searchPath = "${pythonEnv}/${matrix-synapse-unwrapped.python.sitePackages}"; in stdenv.mkDerivation { name = (lib.appendToName "wrapped" matrix-synapse-unwrapped).name; diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 0d175f026c298..023bbe9ddc1e6 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/42wim/matterbridge"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ ryantm ]; + mainProgram = "matterbridge"; }; } diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index c1dfec34f766e..0b9a7a51da69a 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -8,24 +8,26 @@ buildGoModule rec { pname = "mattermost"; - version = "8.1.4"; + version = "8.1.7"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost"; rev = "v${version}"; - hash = "sha256-mubKY1nzTmysg015368z/ORqIIOAGPUEthhXNrW1sPk="; + hash = "sha256-ZpjdJ1Uck0kM+togUKpxRij8V0jQX+12Meks+L1Tc90="; } + "/server"; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - hash = "sha256-st900RxTLwIXg0lyUZZnYom99fbiafF7ignaqF1YwME="; + hash = "sha256-eORIoZLoxWdvuRlirJ7djBTgueIzlzIhRAoURy58zCA="; }; - vendorHash = "sha256-UFZlBZJf/AtJiY+EtekSrnwUmrYnH151XnRyRQFTft0="; + vendorHash = "sha256-RPnCAxksKppsjVtZYhwcoJuAmMJ85AstuoBFChKwAOk="; subPackages = [ "cmd/mattermost" ]; + tags = [ "production" ]; + ldflags = [ "-s" "-w" @@ -33,7 +35,7 @@ buildGoModule rec { "-X github.com/mattermost/mattermost/server/public/model.BuildNumber=${version}-nixpkgs" "-X github.com/mattermost/mattermost/server/public/model.BuildDate=1970-01-01" "-X github.com/mattermost/mattermost/server/public/model.BuildHash=v${version}" - "-X github.com/mattermost/mattermost/server/public/model.BuildHashEnterprise=v${version}" + "-X github.com/mattermost/mattermost/server/public/model.BuildHashEnterprise=none" "-X github.com/mattermost/mattermost/server/public/model.BuildEnterpriseReady=false" ]; @@ -51,6 +53,7 @@ buildGoModule rec { description = "Mattermost is an open source platform for secure collaboration across the entire software development lifecycle"; homepage = "https://www.mattermost.org"; license = with licenses; [ agpl3 asl20 ]; - maintainers = with maintainers; [ ryantm numinit kranzes ]; + maintainers = with maintainers; [ ryantm numinit kranzes mgdelacroix ]; + mainProgram = "mattermost"; }; } diff --git a/pkgs/servers/mautrix-discord/default.nix b/pkgs/servers/mautrix-discord/default.nix index d7be9a051d31f..6ede276ec2b01 100644 --- a/pkgs/servers/mautrix-discord/default.nix +++ b/pkgs/servers/mautrix-discord/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "mautrix-discord"; - version = "0.6.3"; + version = "0.6.5"; src = fetchFromGitHub { owner = "mautrix"; repo = "discord"; rev = "v${version}"; - hash = "sha256-hksnD1RWK83JjVIZsKeK8bQobNmzIbm9drgU0VjiqLs="; + hash = "sha256-kjIBjkRI0BrbMNkb1Tdv7d+ZFOKRkUL9KxtQMtvxpIM="; }; - vendorHash = "sha256-+dmlJZPc2Tw9G64MeLPY5Rgml3UKEqAtgGI1ImRvMBU="; + vendorHash = "sha256-qRIgdkDp1pd/bA/AIU4PvoXcvrQam0kmr0hu4yAl+IY="; ldflags = [ "-s" "-w" ]; @@ -40,5 +40,6 @@ buildGoModule rec { changelog = "https://github.com/mautrix/discord/blob/${src.rev}/CHANGELOG.md"; license = licenses.agpl3Only; maintainers = with maintainers; [ MoritzBoehme ]; + mainProgram = "mautrix-discord"; }; } diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index f667d61511e44..b66ebaa47b539 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -59,5 +59,6 @@ python3.pkgs.buildPythonPackage rec { description = "A Matrix-Facebook Messenger puppeting bridge"; license = licenses.agpl3Plus; maintainers = with maintainers; [ kevincox ]; + mainProgram = "mautrix-facebook"; }; } diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/servers/mautrix-googlechat/default.nix index 41a72eec05956..3c5861f16647b 100644 --- a/pkgs/servers/mautrix-googlechat/default.nix +++ b/pkgs/servers/mautrix-googlechat/default.nix @@ -68,5 +68,6 @@ license = licenses.agpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ arcnmx ]; + mainProgram = "mautrix-googlechat"; }; } diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index fb18bfff3585d..3b913a2bd4627 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -1,71 +1,36 @@ -{ lib, python3, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, olm, libsignal-ffi }: -python3.pkgs.buildPythonPackage rec { +buildGoModule { pname = "mautrix-signal"; - version = "0.4.3"; + # mautrix-signal's latest released version v0.4.3 still uses the Python codebase + # which is broken for new devices, see https://github.com/mautrix/signal/issues/388. + # The new Go version fixes this by using the official libsignal as a library and + # can be upgraded to directly from the Python version. + version = "unstable-2023-12-30"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-QShyuwHiWRcP1hGkvCQfixvoUQ/FXr2DYC5VrcMKX48="; + rev = "6abe80e6c79b31b5dc37a484b65d346a1ffd4f05"; + hash = "sha256-EDSP+kU0EmIaYbAB/hxAUTEay+H5aqn9ovBQFZg6wJk="; }; - postPatch = '' - # the version mangling in mautrix_signal/get_version.py interacts badly with pythonRelaxDepsHook - substituteInPlace setup.py \ - --replace 'version=version' 'version="${version}"' - ''; - - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - "mautrix" + buildInputs = [ + olm + # must match the version used in https://github.com/mautrix/signal/tree/main/pkg/libsignalgo + # see https://github.com/mautrix/signal/issues/401 + libsignal-ffi ]; - propagatedBuildInputs = with python3.pkgs; [ - commonmark - aiohttp - aiosqlite - asyncpg - attrs - commonmark - mautrix - phonenumbers - pillow - prometheus-client - pycryptodome - python-olm - python-magic - qrcode - ruamel-yaml - unpaddedbase64 - yarl - ]; + vendorHash = "sha256-f3sWX+mBouuxVKu+fZIYTWLXT64fllUWpcUYAxjzQpI="; doCheck = false; - postInstall = '' - mkdir -p $out/bin - - # Make a little wrapper for running mautrix-signal with its dependencies - echo "$mautrixSignalScript" > $out/bin/mautrix-signal - echo "#!/bin/sh - exec python -m mautrix_signal \"\$@\" - " > $out/bin/mautrix-signal - chmod +x $out/bin/mautrix-signal - wrapProgram $out/bin/mautrix-signal \ - --prefix PATH : "${python3}/bin" \ - --prefix PYTHONPATH : "$PYTHONPATH" - ''; - meta = with lib; { homepage = "https://github.com/mautrix/signal"; description = "A Matrix-Signal puppeting bridge"; license = licenses.agpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = with maintainers; [ expipiplus1 niklaskorz ma27 ]; + mainProgram = "mautrix-signal"; }; } diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 4ce5ce1c1c458..349c4e371ffc6 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -9,11 +9,11 @@ let python = python3.override { packageOverrides = self: super: { tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.30.0a2"; + version = "1.34.0a2"; pname = "tulir-telethon"; src = fetchPypi { inherit pname version; - hash = "sha256-PkdxOdl1HM9SEC/CMOetahDzVJDg+zPP7s9NCsVdQsA="; + hash = "sha256-+3mk+H0sQD3ssEPihE/PvWpYVZzkGQMXhFS64m7joJ8="; }; doCheck = false; }); @@ -22,14 +22,14 @@ let in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.14.2"; + version = "0.15.1"; disabled = python.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mautrix"; repo = "telegram"; rev = "refs/tags/v${version}"; - hash = "sha256-8wLLm2L6R4sfIHyqGvwFESTqS7FZhpkExqaQsdFRMa0="; + hash = "sha256-9ZXyjfbDRwO0wRPMGstlLIKvztp2xAjoqpTwBYJji/4="; }; format = "setuptools"; @@ -78,5 +78,6 @@ python.pkgs.buildPythonPackage rec { license = licenses.agpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ nyanloutre ma27 nickcao ]; + mainProgram = "mautrix-telegram"; }; } diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 566f7d1cabfab..3423985f65840 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-uouxOXvVbUNRHM83JearPhMTZQtMPEBfWvsVb7QJSO8="; + hash = "sha256-bn9nUTtpaEkzF2SEdCcKG27WQDL7xsgfgA/72wElQqA="; }; buildInputs = [ olm ]; - vendorHash = "sha256-dgaI/gpngCcVRVK8SK6ac1hmc7/aYLJCnW2CCYRDXy0="; + vendorHash = "sha256-PDUSjza+0SDanQwKYQRuLzsiA/sHjRnG0xpzlzhkm+U="; doCheck = false; @@ -22,5 +22,6 @@ buildGoModule rec { description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; license = licenses.agpl3Plus; maintainers = with maintainers; [ vskilet ma27 chvp ]; + mainProgram = "mautrix-whatsapp"; }; } diff --git a/pkgs/servers/mbusd/default.nix b/pkgs/servers/mbusd/default.nix index 7db22dab8e34b..51441f6514cdb 100644 --- a/pkgs/servers/mbusd/default.nix +++ b/pkgs/servers/mbusd/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; + mainProgram = "mbusd"; }; } diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index 29397ad3c8555..5cf96c768a2b7 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mediamtx"; - version = "1.3.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-Upm/fiW3hXzBS+IpwzE3C6h6Z7ZpA2k+j2UqAWT8hF0="; + hash = "sha256-g4z6UMTdg5Vjrn6h/t42GpHiAgZtTEi3AdS3X8Ho3fI="; }; - vendorHash = "sha256-uaOfULtZ+BdbX1TmDyZtYnoXV8579RSW6eocmPsXyP8="; + vendorHash = "sha256-/TvKx0xUI6XktkvPoZFWINQXf2hckfOn4QxYpGfEPl4="; # Tests need docker doCheck = false; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 95f95cda68e70..6ad1343645e88 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.22"; + version = "1.6.23"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-NHg6kKTM90xBBwhf2Stoh0nSOyds/a2fBOT3JaBdHKc="; + sha256 = "sha256-hbAzSQT0QClqaFzP2nXw9FF7+JIquO+m0MSzySw1TUw="; }; configureFlags = [ @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = [ maintainers.coconnor ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "memcached"; }; passthru.tests = { smoke-tests = nixosTests.memcached; diff --git a/pkgs/servers/memos/default.nix b/pkgs/servers/memos/default.nix index 191db93583299..1e8b53fe96dcc 100644 --- a/pkgs/servers/memos/default.nix +++ b/pkgs/servers/memos/default.nix @@ -49,5 +49,6 @@ buildGoModule rec { description = "A lightweight, self-hosted memo hub"; maintainers = with maintainers; [ indexyz ]; license = licenses.mit; + mainProgram = "memos"; }; } diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 2fb8c1f5cbb89..ed6677b2565bc 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.47.6"; + version = "0.48.2"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-LWF8O6v1x1iX5eJCugQ1noLeUJsVthZ7cGuyW3w6XGg="; + hash = "sha256-KY+/PNpmGgLyk3O55KkYL6Ev1v4G329Wp4GajKSn9zo="; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { license = licenses.agpl3Only; platforms = platforms.all; maintainers = with maintainers; [ schneefux thoughtpolice mmahut ]; + mainProgram = "metabase"; }; passthru.tests = { inherit (nixosTests) metabase; diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 868c420d49ae2..0ce2189568cb6 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -98,5 +98,6 @@ stdenv.mkDerivation { license = licenses.mit; platforms = builtins.attrNames srcs; maintainers = with maintainers; [ ]; + mainProgram = "meteor"; }; } diff --git a/pkgs/servers/microbin/default.nix b/pkgs/servers/microbin/default.nix index 163b4ba7d800f..d829f14bb5c4d 100644 --- a/pkgs/servers/microbin/default.nix +++ b/pkgs/servers/microbin/default.nix @@ -82,5 +82,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/szabodanika/microbin/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ dit7ya figsoda ]; + mainProgram = "microbin"; }; } diff --git a/pkgs/servers/microserver/default.nix b/pkgs/servers/microserver/default.nix index 21f1fe43d27c7..c6ca5edd70c78 100644 --- a/pkgs/servers/microserver/default.nix +++ b/pkgs/servers/microserver/default.nix @@ -20,5 +20,6 @@ rustPlatform.buildRustPackage rec { description = "Simple ad-hoc server with SPA support"; maintainers = with maintainers; [ flosse ]; license = licenses.mit; + mainProgram = "microserver"; }; } diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 88244b78e220b..21c754ed90a9a 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,20 +1,17 @@ -{ lib, buildGo121Module, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: -let +buildGoModule rec { pname = "miniflux"; - version = "2.0.50"; - -in buildGo121Module { - inherit pname version; + version = "2.0.51"; src = fetchFromGitHub { - owner = pname; + owner = "miniflux"; repo = "v2"; - rev = version; - sha256 = "sha256-+oNF/Zwc1Z/cu3SQC/ZTekAW5Qef9RKrdszunLomGII="; + rev = "refs/tags/${version}"; + hash = "sha256-gffiZOsHUYTDEjIdKUPyKbsdRKX890aG6GY72LYESkA="; }; - vendorHash = "sha256-jLyjQ+w/QS9uA0pGWF2X6dEfOifcI2gC2sgi1STEzpU="; + vendorHash = "sha256-yO4sNOkEDnM9eETE68C++dPnAfcoSMXznf5Nq4/iQmA="; nativeBuildInputs = [ installShellFiles ]; @@ -35,6 +32,7 @@ in buildGo121Module { description = "Minimalist and opinionated feed reader"; homepage = "https://miniflux.app/"; license = licenses.asl20; - maintainers = with maintainers; [ rvolosatovs benpye ]; + maintainers = with maintainers; [ rvolosatovs benpye emilylange ]; + mainProgram = "miniflux"; }; } diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 5d572c18e253a..ce71d96a3924e 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2023-09-20T22-49-55Z"; + version = "2024-01-18T22-51-28Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-JX+bxFAxTmOjpY6HAVVhdZftFx9HlniX+3zKY7Qui9w="; + sha256 = "sha256-O0MvwX8fD6QKaFTSfat9eVV+gY9ZaWIvxOpevwZaODw="; }; - vendorHash = "sha256-fcaMYm7Tw5zqtHhPzmUS/5E7AYI8P2fuxT2sDQwNttc="; + vendorHash = "sha256-zB5yaWY0MhksqhrJfmfkpwlZio0p291t9ETESgADBjg="; doCheck = false; @@ -57,5 +57,6 @@ buildGoModule rec { changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}"; maintainers = with maintainers; [ eelco bachp ]; license = licenses.agpl3Plus; + mainProgram = "minio"; }; } diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 078125016bf0e..e4555bf517f69 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config (python3.withPackages (ps: with ps; [ pillow - ] ++ lib.optionals finalAttrs.doCheck [ + ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ pygobject3 python-dbusmock ])) @@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DBUILD_DOXYGEN=OFF" "-DMIR_PLATFORM='gbm-kms;x11;eglstream-kms;wayland'" - "-DMIR_ENABLE_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DMIR_ENABLE_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" # BadBufferTest.test_truncated_shm_file *doesn't* throw an error as the test expected, mark as such # https://github.com/MirServer/mir/pull/1947#issuecomment-811810872 "-DMIR_SIGBUS_HANDLER_ENVIRONMENT_BROKEN=ON" @@ -150,6 +150,9 @@ stdenv.mkDerivation (finalAttrs: { # These get built but don't get executed by default, yet they get installed when tests are enabled "-DMIR_BUILD_PERFORMANCE_TESTS=OFF" "-DMIR_BUILD_PLATFORM_TEST_HARNESS=OFF" + # https://github.com/MirServer/mir/issues/2987 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106799 + "-DMIR_USE_PRECOMPILED_HEADERS=OFF" ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index c7b29036a4168..3bd72b0e7dad8 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -48,5 +48,6 @@ buildGoModule rec { ''; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; + mainProgram = "mirrorbits"; }; } diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 0098317d06215..60360d26667aa 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.20.0"; + version = "3.22.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-kdeDV8IWbfeC6KDgJtOl1NX6jwvxiaIdGAYtrDuYFdI="; + hash = "sha256-ItzoknejTtVjm0FD+UdpCa+cL0i2uvcffTNIWCjBdVU="; }; vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; diff --git a/pkgs/servers/misc/irrd/default.nix b/pkgs/servers/misc/irrd/default.nix index aef559d4e227e..e6cc723ab4dc0 100644 --- a/pkgs/servers/misc/irrd/default.nix +++ b/pkgs/servers/misc/irrd/default.nix @@ -1,6 +1,8 @@ { lib , python3 , fetchPypi +, fetchFromGitHub +, fetchpatch , git , postgresql , postgresqlTestHook @@ -10,6 +12,7 @@ let py = python3.override { packageOverrides = final: prev: { + # sqlalchemy 1.4.x or 2.x are not supported sqlalchemy = prev.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.3.24"; src = fetchPypi { @@ -19,31 +22,10 @@ let }; doCheck = false; }); - starlette = prev.starlette.overridePythonAttrs (oldAttrs: rec { - version = "0.20.4"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-QvzzEi+Zj+/OPixa1+Xtvw8Cz2hdZGqDoI1ARyavUIQ="; - }; - nativeBuildInputs = with final; [ - setuptools - ]; - doCheck = false; - }); - ariadne = prev.ariadne.overridePythonAttrs (oldAttrs: rec { - version = "0.17.1"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-B98wl/NkNOyq99AKsVQem9TZ0meOnvg7IdWIEAI2vy8="; - }; - nativeBuildInputs = with final; [ - setuptools - ]; + alembic = prev.alembic.overridePythonAttrs (lib.const { doCheck = false; }); - alembic = prev.alembic.overridePythonAttrs (lib.const { + factory-boy = prev.factory-boy.overridePythonAttrs (lib.const { doCheck = false; }); beautifultable = prev.beautifultable.overridePythonAttrs (oldAttrs: rec { @@ -61,25 +43,27 @@ in py.pkgs.buildPythonPackage rec { pname = "irrd"; - version = "4.3.0.post1"; - format = "setuptools"; + version = "4.4.2"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-hayfdcYAgIopfUiAR/AUWMuTzwpXvXuq6iPp9uhWN1M="; + src = fetchFromGitHub { + owner = "irrdnet"; + repo = "irrd"; + rev = "v${version}"; + hash = "sha256-vZSuBP44ZvN0mu2frcaQNZN/ilvKWIY9ETnrStzSnG0="; }; - patches = [ - ./irrd-asgiref-3.8.0.diff + # replace poetry dependency with poetry-core + # https://github.com/irrdnet/irrd/pull/884 + (fetchpatch { + url = "https://github.com/irrdnet/irrd/commit/4fb6e9b50d65729aff2d0a94c2e9b4e2daadea85.patch"; + hash = "sha256-DcE6VZfJkbHnPiEdYDpXea7S/8P0SmdvvJ42hywnpf0="; + }) ]; - pythonRelaxDeps = true; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook + poetry-core ]; - postPatch = '' - substituteInPlace setup.py --replace psycopg2-binary psycopg2 - ''; nativeCheckInputs = [ git @@ -90,6 +74,7 @@ py.pkgs.buildPythonPackage rec { pytest-asyncio pytest-freezegun pytestCheckHook + smtpdfix ]); propagatedBuildInputs = with py.pkgs; [ @@ -123,6 +108,17 @@ py.pkgs.buildPythonPackage rec { ujson wheel websockets + limits + factory-boy + webauthn + wtforms + imia + starlette-wtf + zxcvbn + pyotp + asgi-logger + wtforms-bootstrap5 + email-validator ] ++ py.pkgs.uvicorn.optional-dependencies.standard; preCheck = '' @@ -134,10 +130,17 @@ py.pkgs.buildPythonPackage rec { sleep 1 done + export SMTPD_HOST=127.0.0.1 export IRRD_DATABASE_URL="postgres:///$PGDATABASE" export IRRD_REDIS_URL="redis://localhost/1" ''; + # required for test_object_writing_and_status_checking + postgresqlTestSetupPost = '' + echo "track_commit_timestamp=on" >> $PGDATA/postgresql.conf + pg_ctl restart + ''; + postCheck = '' kill $REDIS_PID ''; diff --git a/pkgs/servers/misc/irrd/irrd-asgiref-3.8.0.diff b/pkgs/servers/misc/irrd/irrd-asgiref-3.8.0.diff deleted file mode 100644 index 0b81cbc6613dc..0000000000000 --- a/pkgs/servers/misc/irrd/irrd-asgiref-3.8.0.diff +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/irrd/server/graphql/schema_builder.py b/irrd/server/graphql/schema_builder.py -index 65ddf5d..b3b385a 100644 ---- a/irrd/server/graphql/schema_builder.py -+++ b/irrd/server/graphql/schema_builder.py -@@ -31,32 +31,32 @@ def build_executable_schema(): - """ - schema = SchemaGenerator() - -- schema.rpsl_object_type.set_type_resolver(sta(resolve_rpsl_object_type, False)) -- schema.rpsl_contact_union_type.set_type_resolver(sta(resolve_rpsl_object_type, False)) -+ schema.rpsl_object_type.set_type_resolver(sta(resolve_rpsl_object_type, thread_sensitive=False)) -+ schema.rpsl_contact_union_type.set_type_resolver(sta(resolve_rpsl_object_type, thread_sensitive=False)) - -- schema.query_type.set_field("rpslObjects", sta(resolve_rpsl_objects, False)) -- schema.query_type.set_field("databaseStatus", sta(resolve_database_status, False)) -- schema.query_type.set_field("asnPrefixes", sta(resolve_asn_prefixes, False)) -- schema.query_type.set_field("asSetPrefixes", sta(resolve_as_set_prefixes, False)) -- schema.query_type.set_field("recursiveSetMembers", sta(resolve_recursive_set_members, False)) -+ schema.query_type.set_field("rpslObjects", sta(resolve_rpsl_objects, thread_sensitive=False)) -+ schema.query_type.set_field("databaseStatus", sta(resolve_database_status, thread_sensitive=False)) -+ schema.query_type.set_field("asnPrefixes", sta(resolve_asn_prefixes, thread_sensitive=False)) -+ schema.query_type.set_field("asSetPrefixes", sta(resolve_as_set_prefixes, thread_sensitive=False)) -+ schema.query_type.set_field("recursiveSetMembers", sta(resolve_recursive_set_members, thread_sensitive=False)) - -- schema.rpsl_object_type.set_field("mntByObjs", sta(resolve_rpsl_object_mnt_by_objs, False)) -- schema.rpsl_object_type.set_field("journal", sta(resolve_rpsl_object_journal, False)) -+ schema.rpsl_object_type.set_field("mntByObjs", sta(resolve_rpsl_object_mnt_by_objs, thread_sensitive=False)) -+ schema.rpsl_object_type.set_field("journal", sta(resolve_rpsl_object_journal, thread_sensitive=False)) - for object_type in schema.object_types: - if "adminCObjs" in schema.graphql_types[object_type.name]: -- object_type.set_field("adminCObjs", sta(resolve_rpsl_object_adminc_objs, False)) -+ object_type.set_field("adminCObjs", sta(resolve_rpsl_object_adminc_objs, thread_sensitive=False)) - for object_type in schema.object_types: - if "techCObjs" in schema.graphql_types[object_type.name]: -- object_type.set_field("techCObjs", sta(resolve_rpsl_object_techc_objs, False)) -+ object_type.set_field("techCObjs", sta(resolve_rpsl_object_techc_objs, thread_sensitive=False)) - for object_type in schema.object_types: - if "mbrsByRefObjs" in schema.graphql_types[object_type.name]: -- object_type.set_field("mbrsByRefObjs", sta(resolve_rpsl_object_members_by_ref_objs, False)) -+ object_type.set_field("mbrsByRefObjs", sta(resolve_rpsl_object_members_by_ref_objs, thread_sensitive=False)) - for object_type in schema.object_types: - if "memberOfObjs" in schema.graphql_types[object_type.name]: -- object_type.set_field("memberOfObjs", sta(resolve_rpsl_object_member_of_objs, False)) -+ object_type.set_field("memberOfObjs", sta(resolve_rpsl_object_member_of_objs, thread_sensitive=False)) - for object_type in schema.object_types: - if "membersObjs" in schema.graphql_types[object_type.name]: -- object_type.set_field("membersObjs", sta(resolve_rpsl_object_members_objs, False)) -+ object_type.set_field("membersObjs", sta(resolve_rpsl_object_members_objs, thread_sensitive=False)) - - @schema.asn_scalar_type.value_parser - def parse_asn_scalar(value): diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 732f145cc5a0d..8c18b6769a13a 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -1,4 +1,5 @@ { buildGoModule +, buildPackages , fetchFromGitHub , fetchNpmDeps , lib @@ -17,27 +18,27 @@ buildGoModule rec { pname = "navidrome"; - version = "0.49.3"; + version = "0.50.2"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${version}"; - hash = "sha256-JBvY+0QAouEc0im62aVSJ27GAB7jt0qVnYtc6VN2qTA="; + hash = "sha256-SZ9wVOHtmkrWfYGA0hNCXag2Yp17glOQpBsEQRK6Npg="; }; - vendorHash = "sha256-C8w/qCts8VqNDTQVXtykjmSbo5uDrvS9NOu3SHpAlDE="; + vendorHash = "sha256-PKj2zJhGR1yETLZ4as35cuwil3vfyFKfkKF/32YdAt8="; npmRoot = "ui"; npmDeps = fetchNpmDeps { inherit src; sourceRoot = "${src.name}/ui"; - hash = "sha256-qxwTiXLmZnTnmTSBmWPjeFCP7qzvTFN0xXp5lFkWFog="; + hash = "sha256-7wMMBJE3zSm+eCIaLBjt+Q0OWh3u0XpS0XHnaH17Xsc="; }; nativeBuildInputs = [ - makeWrapper + buildPackages.makeWrapper nodejs npmHooks.npmConfigHook pkg-config diff --git a/pkgs/servers/misc/starcharts/default.nix b/pkgs/servers/misc/starcharts/default.nix index d248100f4817f..05245213b5b5d 100644 --- a/pkgs/servers/misc/starcharts/default.nix +++ b/pkgs/servers/misc/starcharts/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "starcharts"; - version = "1.8.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "caarlos0"; repo = "starcharts"; rev = "v${version}"; - hash = "sha256-B5w6S3qNLdUayYpF03cnxpLzyRBaC9jhaYnNqDZ2AsU="; + hash = "sha256-RLGKf5+HqJlZUhA5C3cwDumIhlbXcOr5iitI+7GZPBc="; }; - vendorHash = "sha256-sZS3OA1dTLLrL5csXV6nWbY/TLiqJUH1UQnJUEva7Jk="; + vendorHash = "sha256-BlVjGG6dhh7VO9driT0rnpbW6lORojiV+YhrV1Zlj4M="; ldflags = [ "-s" diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index 8a1a1aca85a9d..027235986c5e0 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.8.0"; + version = "1.10.1"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "sha256-tbM2JWoub789s3YanT/lqCKl6JkY+FahSYb+lHvF7W8="; + sha256 = "sha256-qHrgNuPDEtFzucE6ACPemUcjEqOvbo4xV0ru4bP3ATE="; }; separateDebugInfo = true; - cargoHash = "sha256-l2rWR9HAXTuNEarj2hWaZxpTdUNGoCnNfsZs8Y+of+s="; + cargoHash = "sha256-BVl4Inr7ZLnilkPVTD2cjJx9RuqB0Mg230o2c2TLw3I="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = @@ -21,10 +21,19 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libcap_ng libseccomp ]; + postConfigure = '' + sed -i "s|/usr/libexec|$out/bin|g" 50-virtiofsd.json + ''; + + postInstall = '' + install -Dm644 50-virtiofsd.json "$out/share/qemu/vhost-user/50-virtiofsd.json" + ''; + meta = with lib; { homepage = "https://gitlab.com/virtio-fs/virtiofsd"; description = "vhost-user virtio-fs device backend written in Rust"; maintainers = with maintainers; [ qyliss astro ]; + mainProgram = "virtiofsd"; platforms = platforms.linux; license = with licenses; [ asl20 /* and */ bsd3 ]; }; diff --git a/pkgs/servers/mjolnir/default.nix b/pkgs/servers/mjolnir/default.nix index 562a6c83ae3f1..4b450a8450f4a 100644 --- a/pkgs/servers/mjolnir/default.nix +++ b/pkgs/servers/mjolnir/default.nix @@ -72,5 +72,6 @@ mkYarnPackage rec { ''; license = licenses.asl20; maintainers = with maintainers; [ jojosch ]; + mainProgram = "mjolnir"; }; } diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix index 7a4707322b653..4a97ae7bfa1d1 100644 --- a/pkgs/servers/mobilizon/common.nix +++ b/pkgs/servers/mobilizon/common.nix @@ -1,26 +1,13 @@ -{ fetchFromGitLab, applyPatches, fetchpatch }: rec { +{ fetchFromGitLab }: rec { pname = "mobilizon"; - version = "3.2.0"; + version = "4.0.2"; - src = applyPatches { - src = fetchFromGitLab { - domain = "framagit.org"; - owner = "framasoft"; - repo = pname; - rev = version; - sha256 = "sha256-zgHR0taMMMwAoJEJr5s1rmSwJh31+qAfPQW9DSDuC8A="; - }; - patches = [ - # See https://framagit.org/framasoft/mobilizon/-/merge_requests/1452 - (fetchpatch { - url = "https://framagit.org/framasoft/mobilizon/-/commit/856d236b141c96705e1211e780e3f0e8950bb48e.patch"; - sha256 = "sha256-uEPvoTPVWHdg/KPWMG/Ck2qUjC+EUO3hyZnzpFxuoL0="; - }) - (fetchpatch { - url = "https://framagit.org/framasoft/mobilizon/-/commit/3936eb4cc5125b838b73adc7e49ca6ce3b2f73ce.patch"; - sha256 = "sha256-Srq691J1DbG3d26AKYZxkiMg0DfM33o3AllZpCjG2PQ="; - }) - ]; + src = fetchFromGitLab { + domain = "framagit.org"; + owner = "framasoft"; + repo = pname; + rev = version; + sha256 = "sha256-Ri1qCiQaKlSTSSGWHzFqYBCoTEMtOtwe0Kli466dv4M="; }; } diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index a4dca53c0802d..191952f646813 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -18,10 +18,6 @@ in mixRelease rec { inherit (common) pname version src; - # See https://github.com/whitfin/cachex/issues/205 - # This circumvents a startup error for now - stripDebug = false; - nativeBuildInputs = [ git cmake ]; mixNixDeps = import ./mix.nix { @@ -35,15 +31,15 @@ mixRelease rec { fast_html = prev.fast_html.override { nativeBuildInputs = [ cmake ]; }; - ex_cldr = prev.ex_cldr.overrideAttrs (old: rec { - version = "2.37.2"; + ex_cldr = prev.ex_cldr.overrideAttrs (old: { # We have to use the GitHub sources, as it otherwise tries to download # the locales at build time. src = fetchFromGitHub { owner = "elixir-cldr"; repo = "cldr"; - rev = "v${version}"; - sha256 = "sha256-dDOQzLIi3zjb9xPyR7Baul96i9Mb3CFHUA+AWSexrk4="; + rev = "v${old.version}"; + sha256 = assert old.version == "2.37.5"; + "sha256-T5Qvuo+xPwpgBsqHNZYnTCA4loToeBn1LKTMsDcCdYs="; }; postInstall = '' cp $src/priv/cldr/locales/* $out/lib/erlang/lib/ex_cldr-${old.version}/priv/cldr/locales/ @@ -55,7 +51,7 @@ mixRelease rec { }); # The remainder are Git dependencies (and their deps) that are not supported by mix2nix currently. - web_push_encryption = buildMix { + web_push_encryption = buildMix rec { name = "web_push_encryption"; version = "0.3.1"; src = fetchFromGitHub { @@ -77,40 +73,36 @@ mixRelease rec { }; beamDeps = with final; [ mix_test_watch ex_doc timex ]; }; - exkismet = buildMix rec { - name = "exkismet"; - version = "0.0.1"; + rajska = buildMix rec { + name = "rajska"; + version = "1.3.3"; src = fetchFromGitHub { owner = "tcitworld"; repo = name; - rev = "8b5485fde00fafbde20f315bec387a77f7358334"; - sha256 = "sha256-ttgCWoBKU7VTjZJBhZNtqVF4kN7psBr/qOeR65MbTqw="; + rev = "0c036448e261e8be6a512581c592fadf48982d84"; + sha256 = "sha256-4pfply1vTAIT2Xvm3kONmrCK05xKfXFvcb8EKoSCXBE="; }; - beamDeps = with final; [ httpoison ]; + beamDeps = with final; [ ex_doc credo absinthe excoveralls hammer mock ]; }; - rajska = buildMix rec { - name = "rajska"; - version = "0.0.1"; + exkismet = buildMix rec { + name = "exkismet"; + version = "0.0.3"; src = fetchFromGitHub { owner = "tcitworld"; repo = name; - rev = "0c036448e261e8be6a512581c592fadf48982d84"; - sha256 = "sha256-4pfply1vTAIT2Xvm3kONmrCK05xKfXFvcb8EKoSCXBE="; + rev = "8b5485fde00fafbde20f315bec387a77f7358334"; + sha256 = "sha256-ttgCWoBKU7VTjZJBhZNtqVF4kN7psBr/qOeR65MbTqw="; }; - beamDeps = with final; [ httpoison absinthe ]; + beamDeps = with final; [ httpoison ex_doc credo doctor dialyxir ]; }; }); }; - preConfigure = '' - export LANG=C.UTF-8 # fix elixir locale warning - ''; - # Install the compiled js part preBuild = '' - cp -a "${mobilizon-frontend}/libexec/mobilizon/deps/priv/static" ./priv + cp -a "${mobilizon-frontend}/static" ./priv chmod 770 -R ./priv ''; @@ -123,9 +115,7 @@ mixRelease rec { updateScript = writeShellScriptBin "update.sh" '' set -eou pipefail - SRC=$(nix path-info .#mobilizon.src) - ${mix2nix}/bin/mix2nix $SRC/mix.lock > pkgs/servers/mobilizon/mix.nix - cat $SRC/js/package.json > pkgs/servers/mobilizon/package.json + ${mix2nix}/bin/mix2nix '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix ''; elixirPackage = beamPackages.elixir; }; diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix index 220138c33406a..5ea6242c5bdcf 100644 --- a/pkgs/servers/mobilizon/frontend.nix +++ b/pkgs/servers/mobilizon/frontend.nix @@ -1,38 +1,19 @@ -{ lib, callPackage, mkYarnPackage, fetchYarnDeps, imagemagick }: +{ lib, callPackage, buildNpmPackage, imagemagick }: let common = callPackage ./common.nix { }; in -mkYarnPackage rec { - src = "${common.src}/js"; +buildNpmPackage { + inherit (common) pname version src; - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = "sha256-VkJ6vBt9EFoQVMWMV8FhPJBHcLJDDfOxd+NLb+DZy3U="; - }; - - packageJSON = ./package.json; - - # Somehow $out/deps/mobilizon/node_modules ends up only containing nothing - # more than a .bin directory otherwise. - yarnPostBuild = '' - rm -rf $out/deps/mobilizon/node_modules - ln -s $out/node_modules $out/deps/mobilizon/node_modules - ''; - - buildPhase = '' - runHook preBuild + npmDepsHash = "sha256-z/xWumL1wri63cGGMHMBq6WVDe81bp8tILsZa53a7FM="; - yarn run build + nativeBuildInputs = [ imagemagick ]; - runHook postBuild + postInstall = '' + cp -r priv/static $out/static ''; - doCheck = true; - checkPhase = "yarn run test"; - - nativeBuildInputs = [ imagemagick ]; - meta = with lib; { description = "Frontend for the Mobilizon server"; homepage = "https://joinmobilizon.org/"; diff --git a/pkgs/servers/mobilizon/mix.nix b/pkgs/servers/mobilizon/mix.nix index c6707e62494b1..60d212d7fa072 100644 --- a/pkgs/servers/mobilizon/mix.nix +++ b/pkgs/servers/mobilizon/mix.nix @@ -10,12 +10,12 @@ let packages = with beamPackages; with self; { absinthe = buildMix rec { name = "absinthe"; - version = "1.7.5"; + version = "1.7.6"; src = fetchHex { pkg = "absinthe"; version = "${version}"; - sha256 = "22a9a38adca26294ad0ee91226168f5d215b401efd770b8a1b8fd9c9b21ec316"; + sha256 = "e7626951ca5eec627da960615b51009f3a774765406ff02722b1d818f17e5778"; }; beamDeps = [ dataloader decimal nimble_parsec telemetry ]; @@ -49,12 +49,12 @@ let argon2_elixir = buildMix rec { name = "argon2_elixir"; - version = "3.2.1"; + version = "4.0.0"; src = fetchHex { pkg = "argon2_elixir"; version = "${version}"; - sha256 = "a813b78217394530b5fcf4c8070feee43df03ffef938d044019169c766315690"; + sha256 = "f9da27cf060c9ea61b1bd47837a28d7e48a8f6fa13a745e252556c14f9132c7f"; }; beamDeps = [ comeonin elixir_make ]; @@ -101,12 +101,12 @@ let castore = buildMix rec { name = "castore"; - version = "1.0.3"; + version = "1.0.4"; src = fetchHex { pkg = "castore"; version = "${version}"; - sha256 = "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"; + sha256 = "9418c1b8144e11656f0be99943db4caf04612e3eaecefb5dae9a2a87565584f8"; }; beamDeps = []; @@ -127,12 +127,12 @@ let cldr_utils = buildMix rec { name = "cldr_utils"; - version = "2.24.1"; + version = "2.24.2"; src = fetchHex { pkg = "cldr_utils"; version = "${version}"; - sha256 = "1820300531b5b849d0bc468e5a87cd64f8f2c5191916f548cbe69b2efc203780"; + sha256 = "3362b838836a9f0fa309de09a7127e36e67310e797d556db92f71b548832c7cf"; }; beamDeps = [ castore certifi decimal ]; @@ -244,12 +244,12 @@ let credo = buildMix rec { name = "credo"; - version = "1.7.0"; + version = "1.7.1"; src = fetchHex { pkg = "credo"; version = "${version}"; - sha256 = "6839fcf63d1f0d1c0f450abc8564a57c43d644077ab96f2934563e68b8a769d7"; + sha256 = "e9871c6095a4c0381c89b6aa98bc6260a8ba6addccf7f6a53da8849c748a58a2"; }; beamDeps = [ bunt file_system jason ]; @@ -309,12 +309,12 @@ let dialyxir = buildMix rec { name = "dialyxir"; - version = "1.4.1"; + version = "1.4.2"; src = fetchHex { pkg = "dialyxir"; version = "${version}"; - sha256 = "84b795d6d7796297cca5a3118444b80c7d94f7ce247d49886e7c291e1ae49801"; + sha256 = "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"; }; beamDeps = [ erlex ]; @@ -348,12 +348,12 @@ let earmark_parser = buildMix rec { name = "earmark_parser"; - version = "1.4.33"; + version = "1.4.38"; src = fetchHex { pkg = "earmark_parser"; version = "${version}"; - sha256 = "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"; + sha256 = "2cd0907795aaef0c7e8442e376633c5b3bd6edc8dbbdc539b22f095501c1cdb6"; }; beamDeps = []; @@ -374,12 +374,12 @@ let ecto = buildMix rec { name = "ecto"; - version = "3.10.3"; + version = "3.11.0"; src = fetchHex { pkg = "ecto"; version = "${version}"; - sha256 = "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"; + sha256 = "7769dad267ef967310d6e988e92d772659b11b09a0c015f101ce0fff81ce1f81"; }; beamDeps = [ decimal jason telemetry ]; @@ -439,12 +439,12 @@ let ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.10.2"; + version = "3.11.0"; src = fetchHex { pkg = "ecto_sql"; version = "${version}"; - sha256 = "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"; + sha256 = "77aa3677169f55c2714dda7352d563002d180eb33c0dc29cd36d39c0a1a971f5"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -517,12 +517,12 @@ let ex_cldr = buildMix rec { name = "ex_cldr"; - version = "2.37.2"; + version = "2.37.5"; src = fetchHex { pkg = "ex_cldr"; version = "${version}"; - sha256 = "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"; + sha256 = "74ad5ddff791112ce4156382e171a5f5d3766af9d5c4675e0571f081fe136479"; }; beamDeps = [ cldr_utils decimal gettext jason nimble_parsec ]; @@ -543,12 +543,12 @@ let ex_cldr_currencies = buildMix rec { name = "ex_cldr_currencies"; - version = "2.15.0"; + version = "2.15.1"; src = fetchHex { pkg = "ex_cldr_currencies"; version = "${version}"; - sha256 = "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"; + sha256 = "31df8bd37688340f8819bdd770eb17d659652078d34db632b85d4a32864d6a25"; }; beamDeps = [ ex_cldr jason ]; @@ -556,12 +556,12 @@ let ex_cldr_dates_times = buildMix rec { name = "ex_cldr_dates_times"; - version = "2.14.0"; + version = "2.16.0"; src = fetchHex { pkg = "ex_cldr_dates_times"; version = "${version}"; - sha256 = "f85a8b00546f6aecc2df7a97f15b9de66662d81578653128699c839f7a40bf94"; + sha256 = "0f2f250d479cadda4e0ef3a5e3d936ae7ba1a3f1199db6791e284e86203495b1"; }; beamDeps = [ ex_cldr_calendars ex_cldr_numbers jason ]; @@ -582,12 +582,12 @@ let ex_cldr_numbers = buildMix rec { name = "ex_cldr_numbers"; - version = "2.32.0"; + version = "2.32.3"; src = fetchHex { pkg = "ex_cldr_numbers"; version = "${version}"; - sha256 = "08c43c26b8605b56b5856bb9277d2a0282f2e29b43c57dfbfd7bf9c28b4a504a"; + sha256 = "7b626ff1e59a0ec9c3c5db5ce9ca91a6995e2ab56426b71f3cbf67181ea225f5"; }; beamDeps = [ decimal digital_token ex_cldr ex_cldr_currencies jason ]; @@ -595,12 +595,12 @@ let ex_cldr_plugs = buildMix rec { name = "ex_cldr_plugs"; - version = "1.3.0"; + version = "1.3.1"; src = fetchHex { pkg = "ex_cldr_plugs"; version = "${version}"; - sha256 = "699a98543ea14a7c849fae768041c40f49aa611aa55866025d227796e4858bff"; + sha256 = "4f7b4a5fe061734cef7b62ff29118ed6ac72698cdd7bcfc97495db73611fe0fe"; }; beamDeps = [ ex_cldr gettext jason plug ]; @@ -608,12 +608,12 @@ let ex_doc = buildMix rec { name = "ex_doc"; - version = "0.30.6"; + version = "0.30.9"; src = fetchHex { pkg = "ex_doc"; version = "${version}"; - sha256 = "bd48f2ddacf4e482c727f9293d9498e0881597eae6ddc3d9562bd7923375109f"; + sha256 = "d7aaaf21e95dc5cddabf89063327e96867d00013963eadf2c6ad135506a8bc10"; }; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; @@ -673,12 +673,12 @@ let excoveralls = buildMix rec { name = "excoveralls"; - version = "0.17.1"; + version = "0.18.0"; src = fetchHex { pkg = "excoveralls"; version = "${version}"; - sha256 = "95bc6fda953e84c60f14da4a198880336205464e75383ec0f570180567985ae0"; + sha256 = "1109bb911f3cb583401760be49c02cbbd16aed66ea9509fc5479335d284da60b"; }; beamDeps = [ castore jason ]; @@ -699,12 +699,12 @@ let expo = buildMix rec { name = "expo"; - version = "0.1.0"; + version = "0.4.1"; src = fetchHex { pkg = "expo"; version = "${version}"; - sha256 = "c22c536021c56de058aaeedeabb4744eb5d48137bacf8c29f04d25b6c6bbbf45"; + sha256 = "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"; }; beamDeps = []; @@ -777,12 +777,12 @@ let floki = buildMix rec { name = "floki"; - version = "0.34.3"; + version = "0.35.2"; src = fetchHex { pkg = "floki"; version = "${version}"; - sha256 = "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"; + sha256 = "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9"; }; beamDeps = []; @@ -868,25 +868,25 @@ let gettext = buildMix rec { name = "gettext"; - version = "0.20.0"; + version = "0.23.1"; src = fetchHex { pkg = "gettext"; version = "${version}"; - sha256 = "1c03b177435e93a47441d7f681a7040bd2a816ece9e2666d1c9001035121eb3d"; + sha256 = "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db"; }; - beamDeps = []; + beamDeps = [ expo ]; }; guardian = buildMix rec { name = "guardian"; - version = "2.3.1"; + version = "2.3.2"; src = fetchHex { pkg = "guardian"; version = "${version}"; - sha256 = "bbe241f9ca1b09fad916ad42d6049d2600bbc688aba5b3c4a6c82592a54274c3"; + sha256 = "b189ff38cd46a22a8a824866a6867ca8722942347f13c33f7d23126af8821b52"; }; beamDeps = [ jose plug ]; @@ -894,12 +894,12 @@ let guardian_db = buildMix rec { name = "guardian_db"; - version = "2.1.0"; + version = "3.0.0"; src = fetchHex { pkg = "guardian_db"; version = "${version}"; - sha256 = "f8e7d543ac92c395f3a7fd5acbe6829faeade57d688f7562e2f0fca8f94a0d70"; + sha256 = "9c2ec4278efa34f9f1cc6ba795e552d41fdc7ffba5319d67eeb533b89392d183"; }; beamDeps = [ ecto ecto_sql guardian postgrex ]; @@ -920,12 +920,12 @@ let hackney = buildRebar3 rec { name = "hackney"; - version = "1.18.2"; + version = "1.20.1"; src = fetchHex { pkg = "hackney"; version = "${version}"; - sha256 = "af94d5c9f97857db257090a4a10e5426ecb6f4918aa5cc666798566ae14b65fd"; + sha256 = "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"; }; beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; @@ -1102,12 +1102,12 @@ let makeup = buildMix rec { name = "makeup"; - version = "1.1.0"; + version = "1.1.1"; src = fetchHex { pkg = "makeup"; version = "${version}"; - sha256 = "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"; + sha256 = "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48"; }; beamDeps = [ nimble_parsec ]; @@ -1258,12 +1258,12 @@ let mox = buildMix rec { name = "mox"; - version = "1.0.2"; + version = "1.1.0"; src = fetchHex { pkg = "mox"; version = "${version}"; - sha256 = "f9864921b3aaf763c8741b5b8e6f908f44566f1e427b2630e89e9a73b981fef2"; + sha256 = "d44474c50be02d5b72131070281a5d3895c0e7a95c780e90bc0cfe712f633a13"; }; beamDeps = []; @@ -1284,12 +1284,12 @@ let nimble_parsec = buildMix rec { name = "nimble_parsec"; - version = "1.3.1"; + version = "1.4.0"; src = fetchHex { pkg = "nimble_parsec"; version = "${version}"; - sha256 = "2682e3c0b2eb58d90c6375fc0cc30bc7be06f365bf72608804fb9cffa5e1b167"; + sha256 = "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"; }; beamDeps = []; @@ -1336,12 +1336,12 @@ let oban = buildMix rec { name = "oban"; - version = "2.15.4"; + version = "2.16.3"; src = fetchHex { pkg = "oban"; version = "${version}"; - sha256 = "5fce611fdfffb13e9148df883116e5201adf1e731eb302cc88cde0588510079c"; + sha256 = "4d8a7fb62f63cf2f2080c78954425f5fd8916ef57196b7f79b5bc657abb2ac5f"; }; beamDeps = [ ecto_sql jason postgrex telemetry ]; @@ -1375,12 +1375,12 @@ let phoenix = buildMix rec { name = "phoenix"; - version = "1.7.7"; + version = "1.7.10"; src = fetchHex { pkg = "phoenix"; version = "${version}"; - sha256 = "8966e15c395e5e37591b6ed0bd2ae7f48e961f0f60ac4c733f9566b519453085"; + sha256 = "cf784932e010fd736d656d7fead6a584a4498efefe5b8227e9f383bf15bb79d0"; }; beamDeps = [ castore jason phoenix_pubsub phoenix_template phoenix_view plug plug_cowboy plug_crypto telemetry websock_adapter ]; @@ -1388,12 +1388,12 @@ let phoenix_ecto = buildMix rec { name = "phoenix_ecto"; - version = "4.4.2"; + version = "4.4.3"; src = fetchHex { pkg = "phoenix_ecto"; version = "${version}"; - sha256 = "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"; + sha256 = "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"; }; beamDeps = [ ecto phoenix_html plug ]; @@ -1401,12 +1401,12 @@ let phoenix_html = buildMix rec { name = "phoenix_html"; - version = "3.3.2"; + version = "3.3.3"; src = fetchHex { pkg = "phoenix_html"; version = "${version}"; - sha256 = "44adaf8e667c1c20fb9d284b6b0fa8dc7946ce29e81ce621860aa7e96de9a11d"; + sha256 = "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"; }; beamDeps = [ plug ]; @@ -1427,15 +1427,15 @@ let phoenix_live_view = buildMix rec { name = "phoenix_live_view"; - version = "0.19.5"; + version = "0.20.1"; src = fetchHex { pkg = "phoenix_live_view"; version = "${version}"; - sha256 = "b2eaa0dd3cfb9bd7fb949b88217df9f25aed915e986a28ad5c8a0d054e7ca9d3"; + sha256 = "be494fd1215052729298b0e97d5c2ce8e719c00854b82cd8cf15c1cd7fcf6294"; }; - beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view telemetry ]; + beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view plug telemetry ]; }; phoenix_pubsub = buildMix rec { @@ -1479,12 +1479,12 @@ let phoenix_view = buildMix rec { name = "phoenix_view"; - version = "2.0.2"; + version = "2.0.3"; src = fetchHex { pkg = "phoenix_view"; version = "${version}"; - sha256 = "a929e7230ea5c7ee0e149ffcf44ce7cf7f4b6d2bfe1752dd7c084cdff152d36f"; + sha256 = "cd34049af41be2c627df99cd4eaa71fc52a328c0c3d8e7d4aa28f880c30e7f64"; }; beamDeps = [ phoenix_html phoenix_template ]; @@ -1492,12 +1492,12 @@ let plug = buildMix rec { name = "plug"; - version = "1.14.2"; + version = "1.15.2"; src = fetchHex { pkg = "plug"; version = "${version}"; - sha256 = "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"; + sha256 = "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1518,12 +1518,12 @@ let plug_crypto = buildMix rec { name = "plug_crypto"; - version = "1.2.5"; + version = "2.0.0"; src = fetchHex { pkg = "plug_crypto"; version = "${version}"; - sha256 = "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"; + sha256 = "53695bae57cc4e54566d993eb01074e4d894b65a3766f1c43e2c61a1b0f45ea9"; }; beamDeps = []; @@ -1739,15 +1739,15 @@ let swoosh = buildMix rec { name = "swoosh"; - version = "1.11.5"; + version = "1.14.1"; src = fetchHex { pkg = "swoosh"; version = "${version}"; - sha256 = "21ee57dcd68d2f56d3bbe11e76d56d142b221bb12b6018c551cc68442b800040"; + sha256 = "87da72260b4351678f96aec61db5c2acc8a88cda2cf2c4f534eb4c9c461350c7"; }; - beamDeps = [ cowboy gen_smtp hackney jason mime plug_cowboy telemetry ]; + beamDeps = [ cowboy gen_smtp hackney jason mime plug plug_cowboy telemetry ]; }; telemetry = buildRebar3 rec { @@ -1765,12 +1765,12 @@ let tesla = buildMix rec { name = "tesla"; - version = "1.7.0"; + version = "1.8.0"; src = fetchHex { pkg = "tesla"; version = "${version}"; - sha256 = "2e64f01ebfdb026209b47bc651a0e65203fcff4ae79c11efb73c4852b00dc313"; + sha256 = "10501f360cd926a309501287470372af1a6e1cbed0f43949203a4c13300bc79f"; }; beamDeps = [ castore hackney jason mime telemetry ]; @@ -1789,14 +1789,27 @@ let beamDeps = [ combine gettext tzdata ]; }; + tls_certificate_check = buildRebar3 rec { + name = "tls_certificate_check"; + version = "1.20.0"; + + src = fetchHex { + pkg = "tls_certificate_check"; + version = "${version}"; + sha256 = "ab57b74b1a63dc5775650699a3ec032ec0065005eff1f020818742b7312a8426"; + }; + + beamDeps = [ ssl_verify_fun ]; + }; + tz_world = buildMix rec { name = "tz_world"; - version = "1.3.0"; + version = "1.3.1"; src = fetchHex { pkg = "tz_world"; version = "${version}"; - sha256 = "78b565aa0899b48ce34686319119dfdadff07a255ec43fd9ed6e7d60cc8d1390"; + sha256 = "901ed2b4a4430ecab3765244da4a19e6f19141867c2ab3753924919b87ed2224"; }; beamDeps = [ castore certifi geo jason ]; @@ -1895,12 +1908,12 @@ let ueberauth_google = buildMix rec { name = "ueberauth_google"; - version = "0.10.3"; + version = "0.12.1"; src = fetchHex { pkg = "ueberauth_google"; version = "${version}"; - sha256 = "2462ca9652acc936e0738691869d024e3e262f83ba9f6b4e874b961812290038"; + sha256 = "7f7deacd679b2b66e3bffb68ecc77aa1b5396a0cbac2941815f253128e458c38"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1999,12 +2012,12 @@ let websock_adapter = buildMix rec { name = "websock_adapter"; - version = "0.5.4"; + version = "0.5.5"; src = fetchHex { pkg = "websock_adapter"; version = "${version}"; - sha256 = "d2c238c79c52cbe223fcdae22ca0bb5007a735b9e933870e241fce66afb4f4ab"; + sha256 = "4b977ba4a01918acbf77045ff88de7f6972c2a009213c515a445c48f224ffce9"; }; beamDeps = [ plug plug_cowboy websock ]; diff --git a/pkgs/servers/mobilizon/package.json b/pkgs/servers/mobilizon/package.json deleted file mode 100644 index 662bcfa0daf25..0000000000000 --- a/pkgs/servers/mobilizon/package.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "name": "mobilizon", - "version": "3.2.0", - "private": true, - "scripts": { - "dev": "vite", - "preview": "vite preview", - "build": "yarn run build:assets && yarn run build:pictures", - "lint": "eslint --ext .ts,.vue --ignore-path .gitignore --fix src", - "format": "prettier . --write", - "build:assets": "vite build", - "build:pictures": "bash ./scripts/build/pictures.sh", - "story:dev": "histoire dev", - "story:build": "histoire build", - "story:preview": "histoire preview", - "test": "vitest", - "coverage": "vitest run --coverage", - "prepare": "cd ../ && husky install" - }, - "lint-staged": { - "**/*.{js,ts,vue}": [ - "eslint --fix", - "prettier --write" - ] - }, - "dependencies": { - "@absinthe/socket": "^0.2.1", - "@absinthe/socket-apollo-link": "^0.2.1", - "@apollo/client": "^3.3.16", - "@oruga-ui/oruga-next": "^0.6.0", - "@sentry/tracing": "^7.1", - "@sentry/vue": "^7.1", - "@tiptap/core": "^2.0.0-beta.41", - "@tiptap/extension-blockquote": "^2.0.0-beta.25", - "@tiptap/extension-bold": "^2.0.0-beta.24", - "@tiptap/extension-bubble-menu": "^2.0.0-beta.9", - "@tiptap/extension-bullet-list": "^2.0.0-beta.23", - "@tiptap/extension-document": "^2.0.0-beta.15", - "@tiptap/extension-dropcursor": "^2.0.0-beta.25", - "@tiptap/extension-gapcursor": "^2.0.0-beta.33", - "@tiptap/extension-heading": "^2.0.0-beta.23", - "@tiptap/extension-history": "^2.0.0-beta.21", - "@tiptap/extension-image": "^2.0.0-beta.6", - "@tiptap/extension-italic": "^2.0.0-beta.24", - "@tiptap/extension-link": "^2.0.0-beta.8", - "@tiptap/extension-list-item": "^2.0.0-beta.19", - "@tiptap/extension-mention": "^2.0.0-beta.42", - "@tiptap/extension-ordered-list": "^2.0.0-beta.24", - "@tiptap/extension-paragraph": "^2.0.0-beta.22", - "@tiptap/extension-placeholder": "^2.0.0-beta.199", - "@tiptap/extension-strike": "^2.0.0-beta.26", - "@tiptap/extension-text": "^2.0.0-beta.15", - "@tiptap/extension-underline": "^2.0.0-beta.7", - "@tiptap/pm": "^2.0.0-beta.220", - "@tiptap/suggestion": "^2.0.0-beta.195", - "@tiptap/vue-3": "^2.0.0-beta.96", - "@vue-a11y/announcer": "^2.1.0", - "@vue-a11y/skip-to": "^2.1.2", - "@vue-leaflet/vue-leaflet": "^0.10.1", - "@vue/apollo-composable": "^4.0.0-beta.9", - "@vue/compiler-sfc": "^3.2.37", - "@vueuse/core": "^10.0.2", - "@vueuse/head": "^1.0", - "@vueuse/router": "^10.0.2", - "apollo-absinthe-upload-link": "^1.5.0", - "autoprefixer": "^10", - "blurhash": "^2.0.0", - "date-fns": "^2.16.0", - "date-fns-tz": "^2.0.0", - "floating-vue": "^2.0.0-beta.24", - "graphql": "^15.8.0", - "graphql-tag": "^2.10.3", - "hammerjs": "^2.0.8", - "intersection-observer": "^0.12.0", - "jwt-decode": "^3.1.2", - "leaflet": "^1.4.0", - "leaflet.locatecontrol": "^0.79", - "leaflet.markercluster": "^1.5.3", - "lodash": "^4.17.11", - "ngeohash": "^0.6.3", - "p-debounce": "^4.0.0", - "phoenix": "^1.6", - "postcss": "^8", - "register-service-worker": "^1.7.2", - "sanitize-html": "^2.5.3", - "tailwindcss": "^3", - "tippy.js": "^6.2.3", - "unfetch": "^5.0.0", - "vue": "^3.2.37", - "vue-i18n": "9", - "vue-material-design-icons": "^5.1.2", - "vue-matomo": "^4.1.0", - "vue-plausible": "^1.3.1", - "vue-router": "4", - "vue-scrollto": "^2.17.1", - "vue-use-route-query": "^1.1.0", - "zhyswan-vuedraggable": "^4.1.3" - }, - "devDependencies": { - "@histoire/plugin-vue": "^0.17.1", - "@playwright/test": "^1.25.1", - "@rushstack/eslint-patch": "^1.1.4", - "@tailwindcss/forms": "^0.5.2", - "@tailwindcss/typography": "^0.5.4", - "@types/hammerjs": "^2.0.41", - "@types/leaflet": "^1.5.2", - "@types/leaflet.locatecontrol": "^0.74", - "@types/leaflet.markercluster": "^1.5.1", - "@types/lodash": "^4.14.141", - "@types/ngeohash": "^0.6.2", - "@types/phoenix": "^1.5.2", - "@types/sanitize-html": "^2.5.0", - "@vitejs/plugin-vue": "^4.0.0", - "@vitest/coverage-v8": "^0.34.1", - "@vitest/ui": "^0.34.1", - "@vue/eslint-config-prettier": "^8.0.0", - "@vue/eslint-config-typescript": "^11.0.0", - "@vue/test-utils": "^2.0.2", - "eslint": "^8.21.0", - "eslint-config-prettier": "^9.0.0", - "eslint-plugin-import": "^2.20.2", - "eslint-plugin-prettier": "^5.0.0", - "eslint-plugin-vue": "^9.3.0", - "flush-promises": "^1.0.2", - "histoire": "^0.17.0", - "husky": "^8.0.3", - "jsdom": "^22.0.0", - "lint-staged": "^14.0.1", - "mock-apollo-client": "^1.1.0", - "prettier": "^3.0.0", - "prettier-eslint": "^15.0.1", - "rollup-plugin-visualizer": "^5.7.1", - "sass": "^1.34.1", - "typescript": "~5.1.3", - "vite": "^4.0.4", - "vite-plugin-pwa": "^0.16.4", - "vitest": "^0.34.1", - "vue-i18n-extract": "^2.0.4" - } -} diff --git a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix index 10bf273497dd9..bf1af9e944d7a 100644 --- a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix +++ b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix @@ -4,7 +4,7 @@ }: buildGoModule rec { pname = "buildkite-agent-metrics"; - version = "5.8.0"; + version = "5.9.3"; outputs = [ "out" "lambda" ]; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "buildkite"; repo = "buildkite-agent-metrics"; rev = "v${version}"; - hash = "sha256-QPtjKjUGKlqgklZ0wUOJ1lXuXHhWVC83cEJ4QVtgdl4="; + hash = "sha256-DepIptvR4i0+/45stCMErJtDeAFIDiNbhioitQ8gYBs="; }; - vendorHash = "sha256-KgTzaF8dFD4VwcuSqmOy2CSfLuA0rjFwtCqGNYHFFlc="; + vendorHash = "sha256-YEvVGtfhe/RBeuD87C2BNOFEeK40JDidX4loSLdBwhs="; postInstall = '' mkdir -p $lambda/bin diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index a970b998065a2..571142c886bda 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,7 +2,7 @@ , buildGoModule , fetchFromGitHub , fetchYarnDeps -, fixup_yarn_lock +, prefetch-yarn-deps , grafana-agent , nixosTests , nodejs @@ -14,21 +14,21 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.37.4"; + version = "0.39.1"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-wR5Xexebe6LB15hKQwFtVjyTZPFmvuyozji9BmxuZ/g="; + hash = "sha256-GUsLscLbDnHBO+BWiuo/qCxrV+mW5XUlLpqj8iWUxzo="; }; - vendorHash = "sha256-emtSRn/xT9RSEdGrkfaa+IuP5yF+tVLP1j+bzOoNHXg="; + vendorHash = "sha256-lC6ESGT0dheATVDjJZxDP8YU4RtJMEfTJSyETDtGzTc="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { yarnLock = src + "/web/ui/yarn.lock"; - hash = "sha256-sUFxuliLupGEJY1xFA2V4W2gwHxtUgst3Vrywh1owAo="; + hash = "sha256-rT0UCInISo/p60xzQC7wAJFuKFByIzhNf0RxFFJx+3k="; }; ldflags = let @@ -43,7 +43,7 @@ buildGoModule rec { "-X ${prefix}.BuildDate=1980-01-01T00:00:00Z" ]; - nativeBuildInputs = [ fixup_yarn_lock nodejs yarn ]; + nativeBuildInputs = [ prefetch-yarn-deps nodejs yarn ]; tags = [ "builtinassets" @@ -62,7 +62,7 @@ buildGoModule rec { export HOME="$TMPDIR" pushd web/ui - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror $frontendYarnOfflineCache yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix index ab3082a0de1b7..52309195a4193 100644 --- a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix +++ b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grafana-dash-n-grab"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "esnet"; repo = "gdg"; - sha256 = "sha256-GQJBAjlxjEeNZrYzb/XP83+xma8LLzemKFqxlrDOP64="; + sha256 = "sha256-OLMa5s3QoK+ZeU3v/mPW9tPXqKTS/f+90pPpT+nlWFU="; }; - vendorHash = "sha256-7KP/j5WQowxUM+6jeC2GEycrC12sSbQYxcuXmD9j7M8="; + vendorHash = "sha256-y5eqG0kB3kGZ2X/VR6aVT+qCVZQd2MbFDqReoPwNtO4="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index e988bc7f0ba77..639e4a0b0bc34 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -7,18 +7,18 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.8.4"; + version = "3.9.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-YfqIWPciFyPIpQypSDNEK2yXV1Ah9TiLiEzEFA/KcMw="; + hash = "sha256-MFMAfjvP7FQRG71xbgwhreDIBdQ4Qho/msdmDLiRetg="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-HgUHxfFchqarVMmxbEg1gRN9vSkEx48aSy1yreux9fs="; + hash = "sha256-hrDsgZlfLJTO3ROJ/Zb3OyF2QQTjsSJIt+2TesyXYUA="; }; packageJSON = ./package.json; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index 8e32a849b69b3..ca8fec206830b 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -52,7 +52,7 @@ "@types/node": "^18.7.18", "@typescript-eslint/eslint-plugin": "5.37.0", "@typescript-eslint/parser": "5.37.0", - "axios": "0.27.2", + "axios": "1.6.0", "cross-env": "7.0.3", "eslint": "8.23.1", "eslint-config-prettier": "8.5.0", diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c4c9c75903a2c..3b4d930d4537e 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,28 +1,86 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, removeReferencesTo +, tzdata, wire +, yarn, nodejs, cacert +, jq, moreutils +, nix-update-script, nixosTests +}: + +let + # We need dev dependencies to run webpack, but patch away + # `cypress` (and @grafana/e2e which has a direct dependency on cypress). + # This attempts to download random blobs from the Internet in + # postInstall. Also, it's just a testing framework, so not worth the hassle. + patchAwayGrafanaE2E = '' + find . -name package.json | while IFS=$'\n' read -r pkg_json; do + <"$pkg_json" jq '. + { + "devDependencies": .devDependencies | del(."@grafana/e2e") | del(.cypress) + }' | sponge "$pkg_json" + done + rm -r packages/grafana-e2e + ''; + # Injects a `t.Skip()` into a given test since + # there's apparently no other way to skip tests here. + skipTest = lineOffset: testCase: file: + let + jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]); + in '' + sed -i -e '/${testCase}/{ + ${jumpAndAppend} t.Skip(); + }' ${file} + ''; +in buildGoModule rec { pname = "grafana"; - version = "10.2.0"; + version = "10.3.1"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" "modowners" ]; src = fetchFromGitHub { - rev = "v${version}"; owner = "grafana"; repo = "grafana"; - hash = "sha256-PNKvu7DfVHzBaRGM/Zej0oI5pbi6gPta+ZzVEXXmTsI="; + rev = "v${version}"; + hash = "sha256-UPIq7BWTlT0omt/SM5+vkfOHvsdcx/ikkjcW9X8pcw0="; }; - srcStatic = fetchurl { - url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - hash = "sha256-KE026VWxlJYzRqTqry4h8vm1NIXB7sJUucz+W/s1eoE="; + offlineCache = stdenv.mkDerivation { + name = "${pname}-${version}-yarn-offline-cache"; + inherit src; + nativeBuildInputs = [ + yarn nodejs cacert + jq moreutils + ]; + postPatch = '' + ${patchAwayGrafanaE2E} + ''; + buildPhase = '' + runHook preBuild + export HOME="$(mktemp -d)" + yarn config set enableTelemetry 0 + yarn config set cacheFolder $out + yarn config set --json supportedArchitectures.os '[ "linux" ]' + yarn config set --json supportedArchitectures.cpu '["arm", "arm64", "ia32", "x64"]' + yarn + runHook postBuild + ''; + dontConfigure = true; + dontInstall = true; + dontFixup = true; + outputHashMode = "recursive"; + outputHash = "sha256-70eMa8E483f/Bz7iy+4Seap1EfIdjD5krnt6W9CUows="; }; - vendorHash = "sha256-Mybo7ZVP7fwmBwloC3jHJnqPmhbj1DQSwz8T2onkL3Y="; + disallowedRequisites = [ offlineCache ]; + + vendorHash = "sha256-Gf2A22d7/8xU/ld7kveqGonVKGFCArGNansPRGhfyXM="; + + nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo ]; - nativeBuildInputs = [ wire ]; + postPatch = '' + ${patchAwayGrafanaE2E} + ''; - preBuild = '' + postConfigure = '' # Generate DI code that's required to compile the package. # From https://github.com/grafana/grafana/blob/v8.2.3/Makefile#L33-L35 wire gen -tags oss ./pkg/server @@ -42,12 +100,14 @@ buildGoModule rec { # [...] # grafana> t=2021-12-02T14:24:58+0000 lvl=dbug msg="Failed to get latest.json repo from github.com" logger=update.checker error="Get \"https://raw.githubusercontent.com/grafana/grafana/main/latest.json\": dial tcp: lookup raw.githubusercontent.com on [::1]:53: read udp [::1]:36391->[::1]:53: read: connection refused" # grafana> t=2021-12-02T14:24:58+0000 lvl=dbug msg="Failed to get plugins repo from grafana.com" logger=plugin.manager error="Get \"https://grafana.com/api/plugins/versioncheck?slugIn=&grafanaVersion=\": dial tcp: lookup grafana.com on [::1]:53: read udp [::1]:41796->[::1]:53: read: connection refused" - sed -i -e '/Request is not forbidden if from an admin/a t.Skip();' pkg/tests/api/plugins/api_plugins_test.go + ${skipTest 1 "Request is not forbidden if from an admin" "pkg/tests/api/plugins/api_plugins_test.go"} # Skip a flaky test (https://github.com/NixOS/nixpkgs/pull/126928#issuecomment-861424128) - sed -i -e '/it should change folder successfully and return correct result/{N;s/$/\nt.Skip();/}'\ - pkg/services/libraryelements/libraryelements_patch_test.go + ${skipTest 2 "it should change folder successfully and return correct result" "pkg/services/libraryelements/libraryelements_patch_test.go"} + # Skip flaky tests (https://logs.ofborg.org/?key=nixos/nixpkgs.263185&attempt_id=5b056a17-67a7-4b74-9dc7-888eb1d6c2dd) + ${skipTest 1 "TestIntegrationRulerAccess" "pkg/tests/api/alerting/api_alertmanager_test.go"} + ${skipTest 1 "TestIntegrationRulePause" "pkg/tests/api/alerting/api_ruler_test.go"} # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go rm -r scripts/go @@ -58,6 +118,18 @@ buildGoModule rec { # grafana> 2023/08/24 08:30:23 failed to copy objects, err: Post "https://storage.googleapis.com/upload/storage/v1/b/grafana-testing-repo/o?alt=json&name=test-path%2Fbuild%2FTestCopyLocalDir2194093976%2F001%2Ffile2.txt&prettyPrint=false&projection=full&uploadType=multipart": dial tcp: lookup storage.googleapis.com on [::1]:53: read udp [::1]:36436->[::1]:53: read: connection refused # grafana> panic: test timed out after 10m0s rm pkg/build/gcloud/storage/gsutil_test.go + + # Setup node_modules + export HOME="$(mktemp -d)" + yarn config set enableTelemetry 0 + yarn config set cacheFolder $offlineCache + yarn --immutable-cache + ''; + + postBuild = '' + # After having built all the Go code, run the JS builders now. + yarn run build + yarn run plugins:build-bundled ''; ldflags = [ @@ -75,16 +147,19 @@ buildGoModule rec { ''; postInstall = '' - tar -xvf $srcStatic mkdir -p $out/share/grafana - mv grafana-*/{public,conf,tools} $out/share/grafana/ + cp -r public conf $out/share/grafana/ + ''; - cp ./conf/defaults.ini $out/share/grafana/conf/ + postFixup = '' + while read line; do + remove-references-to -t $offlineCache "$line" + done < <(find $out -type f -name '*.js.map' -or -name '*.js') ''; passthru = { tests = { inherit (nixosTests) grafana; }; - updateScript = ./update.sh; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/servers/monitoring/grafana/update.sh b/pkgs/servers/monitoring/grafana/update.sh deleted file mode 100755 index 3fd4fd56be7c4..0000000000000 --- a/pkgs/servers/monitoring/grafana/update.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts jq nix nix-prefetch-scripts moreutils - -set -euxo pipefail - -FILE="$(nix-instantiate --eval -E 'with import ./. {}; (builtins.unsafeGetAttrPos "version" grafana).file' | tr -d '"')" -replaceHash() { - old="${1?old hash missing}" - new="${2?new hash missing}" - awk -v OLD="$old" -v NEW="$new" '{ - if (i=index($0, OLD)) { - $0 = substr($0, 1, i-1) NEW substr($0, i+length(OLD)); - } - print $0; - }' "$FILE" | sponge "$FILE" -} -extractVendorHash() { - original="${1?original hash missing}" - result="$(nix-build -A grafana.goModules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" - [ -z "$result" ] && { echo "$original"; } || { echo "$result"; } -} - -oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion grafana" | tr -d '"')" -latest="$(curl https://api.github.com/repos/grafana/grafana/releases/latest | jq '.tag_name' -r | tr -d 'v')" - -targetVersion="${1:-$latest}" -if [ ! "${oldVersion}" = "${targetVersion}" ]; then - update-source-version grafana "${targetVersion#v}" - oldStaticHash="$(nix-instantiate --eval -A grafana.srcStatic.outputHash | tr -d '"')" - newStaticHash="$(nix-prefetch-url "https://dl.grafana.com/oss/release/grafana-${targetVersion#v}.linux-amd64.tar.gz")" - newStaticHash="$(nix hash to-sri --type sha256 $newStaticHash)" - replaceHash "$oldStaticHash" "$newStaticHash" - goHash="$(nix-instantiate --eval -A grafana.vendorHash | tr -d '"')" - emptyHash="$(nix-instantiate --eval -A lib.fakeHash | tr -d '"')" - replaceHash "$goHash" "$emptyHash" - replaceHash "$emptyHash" "$(extractVendorHash "$goHash")" - nix-build -A grafana -else - echo "grafana is already up-to-date" -fi diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index f1381f954c2e4..165e6e186808b 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.14.0"; + version = "2.14.2"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-MrNfkbbmID27Ht2sDSklrPvRvCmewOuOOBIFnHJz1zE="; + sha256 = "sha256-vUtLGkTLGObx3zbfRTboNVsl9AmpAkHc+IhWhnKupSM="; }; patches = [ @@ -92,6 +92,6 @@ stdenv.mkDerivation rec { homepage = "https://www.icinga.com"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ das_j ]; + maintainers = lib.teams.helsinki-systems.members; }; } diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 4adaefa053cb9..fe1cf89fd2b44 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -20,6 +20,16 @@ let hash = "sha256-v9MUR+PcxAus91FiHYrMN9MbNOTWewh7MT6/t/QWQcM="; }; patches = [ + # This fixes a linting error due to an unneeded call to `.clone()` + # that gets enforced by a strict `deny(warnings)` build config. + # This is already fixed with newer versions of `libflux`, but it + # has been changed in a giant commit with a lot of autmated changes: + # https://github.com/influxdata/flux/commit/e7f7023848929e16ad5bd3b41d217847bd4fd72b#diff-96572e971d9e19b54290a434debbf7db054b21c9ce19035159542756ffb8ab87 + # + # Can be removed as soon as kapacitor depends on a newer version of `libflux`, cf: + # https://github.com/influxdata/kapacitor/blob/v1.7.0/go.mod#L26 + ./fix-linting-error-on-unneeded-clone.patch + # https://github.com/influxdata/flux/pull/5273 # fix compile error with Rust 1.64 (fetchpatch { @@ -82,6 +92,12 @@ buildGoModule rec { rm server/server_test.go ''; + # Tests start http servers which need to bind to local addresses, + # but that fails in the Darwin sandbox by default unless this option is turned on + # Error is: panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted + # See also https://github.com/NixOS/nix/pull/1646 + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Open source framework for processing, monitoring, and alerting on time series data"; homepage = "https://influxdata.com/time-series-platform/kapacitor/"; diff --git a/pkgs/servers/monitoring/kapacitor/fix-linting-error-on-unneeded-clone.patch b/pkgs/servers/monitoring/kapacitor/fix-linting-error-on-unneeded-clone.patch new file mode 100644 index 0000000000000..23391f0f4f384 --- /dev/null +++ b/pkgs/servers/monitoring/kapacitor/fix-linting-error-on-unneeded-clone.patch @@ -0,0 +1,13 @@ +diff --git a/flux-core/src/semantic/flatbuffers/types.rs b/flux-core/src/semantic/flatbuffers/types.rs +index c3eecf06..9baf4070 100644 +--- a/flux-core/src/semantic/flatbuffers/types.rs ++++ b/flux-core/src/semantic/flatbuffers/types.rs +@@ -715,7 +715,7 @@ mod tests { + + fn test_serde(expr: &'static str) { + // let want = parser::parse(expr).unwrap(); +- let mut p = parser::Parser::new(expr.clone()); ++ let mut p = parser::Parser::new(expr); + + let typ_expr = p.parse_type_expression(); + if let Err(err) = ast::check::check(ast::walk::Node::TypeExpression(&typ_expr)) { diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index c6761f41383e1..8b26a04f2a053 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "laurel"; - version = "0.5.3"; + version = "0.5.6"; src = fetchFromGitHub { owner = "threathunters-io"; repo = pname; - rev = "v${version}"; - hash = "sha256-4SOnBIi45g2hYo+nFLI5soS+qRPzjkSYwmyMfVZCyVo="; + rev = "refs/tags/v${version}"; + hash = "sha256-IGmpNSHGlQGJn4cvcXXWbIOWqsXizzp1azfT41B4rm4="; }; - cargoHash = "sha256-yrk3frsR8AQGDVFgP2fCIWmhw+dTZwvga1hF0IAwzjQ="; + cargoHash = "sha256-jm1AWybDnpc1E4SWieQcsVwn8mxkJ5damMsXqg54LI8="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 72ffed83f37c6..65f8c348b13c5 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.9.2"; + version = "2.9.4"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-CYF0cse8NyHEnSZPRI9LNI09vr7kWPXHNibiEbW484E="; + hash = "sha256-uT3rMvSW1eTBhXboA71QeIvuYvc017TxoGG3z3G4K4Y="; }; vendorHash = null; @@ -55,6 +55,6 @@ buildGoModule rec { license = with licenses; [ agpl3Only asl20 ]; homepage = "https://grafana.com/oss/loki/"; changelog = "https://github.com/grafana/loki/releases/tag/v${version}"; - maintainers = with maintainers; [ willibutz globin mmahut emilylange ajs124 ]; + maintainers = with maintainers; [ willibutz globin mmahut emilylange ] ++ teams.helsinki-systems.members; }; } diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index 47237a3eeb161..8d65f992432fa 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.78.0"; + version = "0.78.3"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L8kYbJ9RmCoec9keBHv61K94rjnH+Q4dRkn6PCtjgJI="; + sha256 = "sha256-9PahaZlHtD4p3C8CvXF2ceNuSOqyApJaZWhFNffNlVA="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorHash = "sha256-A3e6qd6yjKsNUaXiltbS9G4WEMd3F1FxaxqMMVuBCUI="; + vendorHash = "sha256-lcK1rofTKPpEu/tK8XpS9EhOA30R/8J3o57YlU1/+0k="; subPackages = [ "." ]; diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index b54888cad96bd..c939c145c46e6 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: buildGoModule rec { pname = "mimir"; - version = "2.10.3"; + version = "2.11.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - hash = "sha256-tVJcvxKcxhSeYyqBsBeG+OrWoD+hTDAoPuIXB72MMkY="; + hash = "sha256-avmVNuUBvKBF7Wm05/AsK5Ld3ykmXCkOw0QQhGy8CKc="; }; vendorHash = null; diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 3aa5aa3415501..7e6cbd2e6ca48 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -1,33 +1,36 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "mtail"; - version = "3.0.0-rc52"; + version = "3.0.0-rc53"; src = fetchFromGitHub { owner = "google"; repo = "mtail"; rev = "v${version}"; - hash = "sha256-F3UNvt7OicZJVcUgn5dQb7KjH0k3QOYOYDLrVpI5D64="; + hash = "sha256-bKNSUXBnKDYaF0VyFn1ke6UkdZWHu5JbUkPPRfIdkh8="; }; - vendorHash = "sha256-KD75KHXrXXm5FMXeFInNTDsVsclyqTfsfQiB3Br+F1A="; - - doCheck = false; - - subPackages = [ "cmd/mtail" ]; - - preBuild = '' - go generate -x ./internal/vm/ - ''; + vendorHash = "sha256-z71Q1I4PG7a1PqBLQV1yHlXImORp8cEtKik9itfvvNs="; ldflags = [ - "-X main.Version=${version}" + "-X=main.Branch=main" + "-X=main.Version=${version}" + "-X=main.Revision=${src.rev}" ]; + # fails on darwin with: write unixgram -> <tmpdir>/rsyncd.log: write: message too long + doCheck = !stdenv.isDarwin; + meta = with lib; { - license = licenses.asl20; - homepage = "https://github.com/google/mtail"; description = "Tool for extracting metrics from application logs"; + homepage = "https://github.com/google/mtail"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + mainProgram = "mtail"; }; } diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index bc99ae1f8f695..ad5c6e36a62e3 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { perlPackages.Socket6 perlPackages.URI perlPackages.DBFile - perlPackages.DateManip + perlPackages.TimeDate perlPackages.FileCopyRecursive perlPackages.FCGI perlPackages.NetSNMP @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { esac wrapProgram "$file" \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${with perlPackages; makePerlPath [ - LogLog4perl IOSocketINET6 Socket6 URI DBFile DateManip + LogLog4perl IOSocketINET6 Socket6 URI DBFile TimeDate HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer ListMoreUtils DBDPg LWP rrdtool ]}" diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 6f357ccb08c85..442eed82478e1 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nagios"; - version = "4.4.14"; + version = "4.5.0"; src = fetchFromGitHub { owner = "NagiosEnterprises"; repo = "nagioscore"; rev = "refs/tags/nagios-${version}"; - hash = "sha256-EJKMgU3Nzfefq2VXxBrfDDrQZWZvj7HqKnWR9j75fGI="; + hash = "sha256-km0vB/bopysS7eejDFDKaonXzTzBonIqiw1T+C2lKiQ="; }; patches = [ ./nagios.patch ]; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 26f7cc890df99..a5ccc82ccda57 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.76.0"; + version = "2.79.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-nk+uYO8tJPUezu/nqfwNhK4q/ds9C96re/fWebrTa1Y="; + hash = "sha256-2NraUEUGyvmEdWCQdzZ5kf+sx/CnSZ54N3zRcCSYhBA="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 638d7fad330ca..8961bc5495359 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, removeReferencesTo +{ lib, stdenv, fetchurl, fetchpatch , file, openssl, perl, perlPackages, nettools , withPerlTools ? false }: let @@ -45,7 +45,14 @@ in stdenv.mkDerivation rec { substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat" ''; - nativeBuildInputs = [ nettools removeReferencesTo file ]; + postConfigure = '' + # libraries contain configure options. Mangle store paths out from + # ./configure-generated file. + sed -i include/net-snmp/net-snmp-config.h \ + -e "/NETSNMP_CONFIGURE_OPTIONS/ s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" + ''; + + nativeBuildInputs = [ nettools file ]; buildInputs = [ openssl ] ++ lib.optional withPerlTools perlWithPkgs; @@ -61,9 +68,6 @@ in stdenv.mkDerivation rec { done mkdir $dev/bin mv $bin/bin/net-snmp-config $dev/bin - # libraries contain configure options - find $lib/lib -type f -exec remove-references-to -t $bin '{}' + - find $lib/lib -type f -exec remove-references-to -t $dev '{}' + ''; meta = with lib; { diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 2f6122caa69e8..ae0db59d0b32f 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeShellScript +, fetchpatch , autoreconfHook , pkg-config , runCommand @@ -34,32 +34,39 @@ let lm_sensors net-snmp procps - unixtools.ping ]; mailq = runCommand "mailq-wrapper" { preferLocalBuild = true; } '' mkdir -p $out/bin ln -s /run/wrappers/bin/sendmail $out/bin/mailq ''; - - # For unknown reasons the installer tries executing $out/share and fails so - # we create it and remove it again later. - share = writeShellScript "share" '' - exit 0 - ''; - in stdenv.mkDerivation rec { pname = "monitoring-plugins"; - version = "2.3.0"; + version = "2.3.5"; src = fetchFromGitHub { owner = "monitoring-plugins"; repo = "monitoring-plugins"; - rev = "v" + lib.versions.majorMinor version; - sha256 = "sha256-yLhHOSrPFRjW701aOL8LPe4OnuJxL6f+dTxNqm0evIg="; + rev = "v${version}"; + sha256 = "sha256-J9fzlxIpujoG7diSRscFhmEV9HpBOxFTJSmGGFjAzcM="; }; + patches = [ + # fix build (makefile cannot produce -lcrypto) + # remove on next release + (fetchpatch { + url = "https://github.com/monitoring-plugins/monitoring-plugins/commit/bad156676894a2755c8b76519a11cdd2037e5cd6.patch"; + hash = "sha256-aI/sX04KXe968SwdS8ZamNtgdNbHtho5cDsDaA+cjZY="; + }) + # fix check_smtp with --starttls https://github.com/monitoring-plugins/monitoring-plugins/pull/1952 + # remove on next release + (fetchpatch { + url = "https://github.com/monitoring-plugins/monitoring-plugins/commit/2eea6bb2a04bbfb169bac5f0f7c319f998e8ab87.patch"; + hash = "sha256-CyVD340+zOxuxRRPmtowD3DFFRB1Q7+AANzul9HqwBI="; + }) + ]; + # TODO: Awful hack. Grrr... # Anyway the check that configure performs to figure out the ping # syntax is totally impure, because it runs an actual ping to @@ -76,11 +83,9 @@ stdenv.mkDerivation rec { -e 's|^DEFAULT_PATH=.*|DEFAULT_PATH=\"${binPath}\"|' configureFlagsArray+=( - --with-ping-command='ping -4 -n -U -w %d -c %d %s' - --with-ping6-command='ping -6 -n -U -w %d -c %d %s' + --with-ping-command='${lib.getBin unixtools.ping}/bin/ping -4 -n -U -w %d -c %d %s' + --with-ping6-command='${lib.getBin unixtools.ping}/bin/ping -6 -n -U -w %d -c %d %s' ) - - install -Dm555 ${share} $out/share ''; configureFlags = [ @@ -108,10 +113,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = '' - rm $out/share - ''; - meta = with lib; { description = "Official monitoring plugins for Nagios/Icinga/Sensu and others"; homepage = "https://www.monitoring-plugins.org"; diff --git a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix new file mode 100644 index 0000000000000..ce40a93e66f84 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "atlas-exporter"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "czerwonk"; + repo = "atlas_exporter"; + rev = version; + sha256 = "sha256-vhUhWO7fQpUHT5nyxbT8AylgUqDNZRSb+EGRNGZJ14E="; + }; + + vendorHash = "sha256-tR+OHxj/97AixuAp0Kx9xQsKPAxpvF6hDha5BgMBha0="; + + meta = with lib; { + description = "Prometheus exporter for RIPE Atlas measurement results "; + homepage = "https://github.com/czerwonk/atlas_exporter"; + license = licenses.lgpl3; + maintainers = with maintainers; [ clerie ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 8b842b7ce3dac..1ff0ad38f47a1 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "collectd-exporter"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "collectd_exporter"; rev = "v${version}"; - sha256 = "0vb6vnd2j87iqxdl86j30dk65vrv4scprv200xb83203aprngqgh"; + sha256 = "sha256-8oibunEHPtNdbhVgF3CL6D/xE7bR8hee6+D2IJMzaqY="; }; - vendorHash = null; + vendorHash = "sha256-fQO2fiotqv18xewXVyh6sA4zx5ZNUR6mCebYenryrKI="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index ef6cd07e9f0e3..a365bda5202a1 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "consul_exporter"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "consul_exporter"; rev = "refs/tags/v${version}"; - hash = "sha256-Y3H4lFRoOLs8BBWUqfQOl9ny7HoRGqKIiq/ONcnzMW0="; + hash = "sha256-3aPLpTV+xuotpBYmRDfU3ewRRlmf7VUdh/u9/SLQDeE="; }; - vendorHash = "sha256-V3IWhVm47Uwgk3Mcu4JcYYGAdCrHDhkXYXCTXQr1BDE="; + vendorHash = "sha256-fsST29HGwJVLVSoAr8tNukW81iJtpb/oypwp5cH7oLQ="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index d50fac3c71124..01945f08ccdf4 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.47.2"; + version = "2.49.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-QLJXY6WzmKcOoLmBTVvCRhTRCAt3IXiHmd9KeLrfz+I="; + hash = "sha256-VchnXJ+WBHDywjwXtsT4q8CZLnGHkMbcU7MpShe5d78="; }; in buildGoModule rec { @@ -47,10 +47,10 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; rev = "v${version}"; - hash = "sha256-mV5sfv4+2a9R34wWcqMu/h/VqBSutmnSWnx0Q3K9L6M="; + hash = "sha256-l8gjOrDCQbglXc3wVvN4BriW9qw9sPVXmlYr6VVRXas="; }; - vendorHash = "sha256-qFp+tMHhXmJGY9MSukVRjBVzaIBgfxB0BorWiuInMwk="; + vendorHash = "sha256-fDT7YrnUfS93yseo+1mLrSGPBewm7CpcHPCz1kxM6Uo="; excludedPackages = [ "documentation/prometheus-mixin" ]; diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index d2d37c04a8190..d4d2d48a0bbc1 100644 --- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -5,17 +5,17 @@ python3.pkgs.buildPythonApplication rec { pname = "dmarc-metrics-exporter"; - version = "0.9.4"; + version = "0.10.1"; disabled = python3.pythonOlder "3.8"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "jgosmann"; repo = "dmarc-metrics-exporter"; rev = "refs/tags/v${version}"; - hash = "sha256-doKG191rQvUpjOb3HvkzZP9XbtQXYGFtDJIdDSFRLSU="; + hash = "sha256-gur0+2yHqxySXECMboW7dAyyf0ckSdS0FEy7HvA5Y5w="; }; pythonRelaxDeps = true; @@ -29,7 +29,6 @@ python3.pkgs.buildPythonApplication rec { bite-parser dataclasses-serialization prometheus-client - typing-extensions uvicorn xsdata ] diff --git a/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/pkgs/servers/monitoring/prometheus/domain-exporter.nix index 8cd81146010c5..e1b3200e4f0d1 100644 --- a/pkgs/servers/monitoring/prometheus/domain-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/domain-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "domain-exporter"; - version = "1.21.1"; + version = "1.22.0"; src = fetchFromGitHub { owner = "caarlos0"; repo = "domain_exporter"; rev = "v${version}"; - hash = "sha256-qZle54BxKdPuVFNEGmXBNU93yF/MESUnW1a24BRxlZ8="; + hash = "sha256-tdAU4BY2jT3l/VMIthrJOPhPYi9UMYD7ZUVhwbO1oUA="; }; - vendorHash = "sha256-UO4fCJD3PldU2wQ9264OLKHP10c0pKPsOc/8gP5ddW4="; + vendorHash = "sha256-6C1LfWF4tjCGW3iiEhD+qBJ+CjAv4A9KYKH/owTAYJ8="; doCheck = false; # needs internet connection diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index df3bb356cd3f9..ddcc080983df3 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-ci-pipelines-exporter"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "mvisonneau"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TeXEfcmDHKgy5mGdixrIecxKO1rrg7+EWRIqzMYh3sU="; + sha256 = "sha256-SbFaB808Xa7XvHR8ruu9wADVPUVwe5ogA+L+PSYb7kQ="; }; subPackages = [ "cmd/${pname}" ]; @@ -17,7 +17,7 @@ buildGoModule rec { "-X main.version=v${version}" ]; - vendorHash = "sha256-TXFwfqyvCAEn24vtUBcFABzIg0KaYlstiFwS7y6WbKo="; + vendorHash = "sha256-qZ9Ph8YZBBGS3dFlk3zTynU9WuRUHl2fVSPtd7hUB8E="; doCheck = true; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix index fa0998b31772b..3c27d018d781e 100644 --- a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "graphite-exporter"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "graphite_exporter"; rev = "v${version}"; - hash = "sha256-UaflfU27GR8VK6AduPDBcQyO3u1uX6YlGP9O4LFwn9A="; + hash = "sha256-2u8grG5n0XkBS6zNxYrPyL+HP5/jEe/bXLt/1l759o4="; }; - vendorHash = "sha256-cIl35wbdPCQJLudXphMbjO2Ztd/H1clI43xaMU6T0D4="; + vendorHash = "sha256-wt2eDCNZAss3zSqvXeKTlsrPfj8pMXKWa3Yb33uuW0M="; preCheck = let skippedTests = [ diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix index 2951530d22596..07ef8febf3de4 100644 --- a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "influxdb_exporter"; - version = "0.11.4"; + version = "0.11.5"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "influxdb_exporter"; - hash = "sha256-q6Pe7rw5BP1IUdokwlTqjiz2nB8+pC6u9al164EgAbM="; + hash = "sha256-5jKwUuM3JL0zzXFesXTUBNMkA7bhd37BhqxZ/RzG20Q="; }; - vendorHash = "sha256-sU2jxmXuSN5D+btjzUU51WXWxmj+2Qqp28NQvEyIUbM="; + vendorHash = "sha256-VQ8MkzT8caPR1gpLXvNzWD5/pO0IKw8d+bT8gohAiJo="; ldflags = [ "-s" @@ -35,6 +35,6 @@ buildGoModule rec { homepage = "https://github.com/prometheus/influxdb_exporter"; changelog = "https://github.com/prometheus/influxdb_exporter/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix index 11264a637983d..1b1ac3c62420d 100644 --- a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipmi_exporter"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "ipmi_exporter"; rev = "v${version}"; - hash = "sha256-yVFpYedWELqDNzmHQfMJa95iKQsn1N/wa82sQEQh1Uw="; + hash = "sha256-ZF5mBjq+IhSQrQ1dUfHlfyUMK2dkpZ5gu9djPkUYvRQ="; }; - vendorHash = "sha256-1ntFcOmVN4I1aa/5gWnzkYNYxxFT9ZM1usNnE23KfR0="; + vendorHash = "sha256-q5MFAvFCrr24b1VO0Z03C08CGd+0pUerXZEKiu4r7cE="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index 8b2573db4f774..9e6dafb029dc6 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.3.2"; + version = "3.3.3"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-/TBzq9MhYb664TsSD46Ep7gOkLBmmPSK9d89xlgvbSw="; + hash = "sha256-A7WRwWwcfgrkR5ixEaDCcCdJ1J8/zeG5aFCBnFbD3Qo="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix new file mode 100644 index 0000000000000..23db7d8e6f3f3 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix @@ -0,0 +1,39 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "mongodb_exporter"; + version = "0.40.0"; + + src = fetchFromGitHub { + owner = "percona"; + repo = "mongodb_exporter"; + rev = "v${version}"; + hash = "sha256-cWXfMi48aF06Prua3n4geG2yP1JzLlHq/xh1HmiJkT4="; + }; + + vendorHash = "sha256-69YBrDAEruWXaAqLfRVtqmZ0pop3r5cusePSV2Q1MXw="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=${src.rev}" + "-X main.Branch=unknown" + "-X main.buildDate=unknown" + ]; + + subPackages = [ "." ]; + + # those check depends on docker; + # nixpkgs doesn't have mongodb application available; + doCheck = false; + + meta = with lib; + { + description = "A Prometheus exporter for MongoDB including sharding, replication and storage engines"; + homepage = "https://github.com/percona/mongodb_exporter"; + license = licenses.asl20; + maintainers = with maintainers; [ undefined-moe ]; + mainProgram = "mongodb_exporter"; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index f0d2ac078274f..2e2bead90b358 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mysqld_exporter"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "mysqld_exporter"; rev = "v${version}"; - sha256 = "sha256-LW9vH//TjnKbZGMF3owDSUx/Mu0TUuWxMtmdeKM/q7k="; + sha256 = "sha256-P7EoWa0BWuAr3sjtrUxzofwlklhRLpzwpGVe31hFo7Q="; }; - vendorHash = "sha256-8zoiYSW8/z1Ch5W1WJHbWAPKFUOhUT8YcjrvyhwI+8w="; + vendorHash = "sha256-GEL9sMwwdGqpklm4yKNqzSOM6I/JzZjg3+ZB2ix2M8w="; ldflags = let t = "github.com/prometheus/common/version"; in [ "-s" "-w" diff --git a/pkgs/servers/monitoring/prometheus/nats-exporter.nix b/pkgs/servers/monitoring/prometheus/nats-exporter.nix index 3ba045745f0a5..b9b4fcc71f43a 100644 --- a/pkgs/servers/monitoring/prometheus/nats-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nats-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus-nats-exporter"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TsFj/iUG/PkGvVVn5RSWwEnHsEIGWMY8iapBHVpzt1c="; + sha256 = "sha256-Zg4zmb0tvu7JPv9XS5Qd5o/ClnODSPz36isjUbFM1ec="; }; - vendorHash = "sha256-IoguUXHxEeyHb2io41ROgam8+7vD5WKzEWwNh4Dlk1o="; + vendorHash = "sha256-VygRE6YviSSIYpMbTEPndR6WUmLAZDwgvuJcwBuizck="; preCheck = '' # Fix `insecure algorithm SHA1-RSA` problem diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 0104811349410..11862b58e0042 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nginx_exporter"; - version = "0.11.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "nginxinc"; repo = "nginx-prometheus-exporter"; rev = "v${version}"; - sha256 = "sha256-glKjScJoJnFEm7Z9LAVF51haeyHB3wQ946U8RzJXs3k="; + sha256 = "sha256-wLLHhbIA4jPgXtVIP6ycxgXfULODngPSpV3rZpJFSjI="; }; - vendorHash = "sha256-YyMySHnrjBHm3hRNJDwWBs86Ih4S5DONYuwlQ3FBjkA="; + vendorHash = "sha256-pMof9Wr6GrH5N97C4VNG2ELtZ6C6ruq5ylMwByotrP0="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/servers/monitoring/prometheus/nut-exporter.nix index fee6bd1f4dbb0..7b1ea2087bedf 100644 --- a/pkgs/servers/monitoring/prometheus/nut-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nut-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nut-exporter"; - version = "3.0.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "DRuggeri"; repo = "nut_exporter"; rev = "v${version}"; - sha256 = "sha256-Y8G8nFhZ9Onxx40DJSTi0rnef8ulNTkj4bsPfqylOjQ="; + sha256 = "sha256-izD2Ks29/4/FBsZoH0raFzqb0DgPR8hXRYBZQEvET+s="; }; vendorHash = "sha256-DGCNYklINPPzC7kCdEUS7TqVvg2SnKFqe0qHs5RSmzY="; diff --git a/pkgs/servers/monitoring/prometheus/ping-exporter.nix b/pkgs/servers/monitoring/prometheus/ping-exporter.nix new file mode 100644 index 0000000000000..becbde065af38 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/ping-exporter.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ping-exporter"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "czerwonk"; + repo = "ping_exporter"; + rev = version; + hash = "sha256-ttlsz0yS4vIfQLTKQ/aiIm/vg6bwnbUlM1aku9RMXXU="; + }; + + vendorHash = "sha256-ZTrQNtpXTf+3oPv8zoVm6ZKWzAvRsAj96csoKJKxu3k="; + + meta = with lib; { + description = "Prometheus exporter for ICMP echo requests"; + homepage = "https://github.com/czerwonk/ping_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ nudelsalat ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 1b3818510076a..ea194bccffb31 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pushgateway"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "pushgateway"; rev = "v${version}"; - sha256 = "sha256-IwSzxpIBXIsOllAd0faP+uzpYZ8HcWJQBOgYZj9SZHM="; + sha256 = "sha256-yiLVLt1+Klr34rF+rj+T9SWNCiYi//g/e/kfJJokkYk="; }; - vendorHash = "sha256-xpbGavt0gzOVZMHVdPtZ+rRVbovJ4xaqaAmYVipLzSs="; + vendorHash = "sha256-cbwTjjh4g5ISMuump6By0xmF3wKrdA3kToG7j8ZgHNs="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix index f3598304b89c4..1b12f29bb9423 100644 --- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -6,11 +6,11 @@ python3.pkgs.buildPythonApplication rec { pname = "prometheus-pve-exporter"; - version = "2.3.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hL1+vP+/Xi3od+17906YARgg4APlFhRkdOCnRxDHJmM="; + sha256 = "sha256-ruJGp/juRxFJwnd0A7/qWgeJHFg9oIKekjWIe3kiUa4="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 90207be3343a9..213b2285c5e7d 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -13,6 +13,13 @@ buildGoModule rec { vendorHash = "sha256-ER0vK0xYUbQT3bqUosQMFT7HBycb3U8oI4Eak72myzs="; + ldflags = [ "-s" "-w" ]; + + checkFlags = [ + # Disable flaky tests on Darwin + "-skip=TestWholeApp|TestExporter" + ]; + meta = with lib; { description = "Prometheus exporter for RabbitMQ"; homepage = "https://github.com/kbudde/rabbitmq_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 3450ea73c68af..177537588d63d 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.55.0"; + version = "1.57.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-KF3tbMgcmZHn8u2wPVidH35vi/Aj7xXUvXPXUci6qrM="; + sha256 = "sha256-M5Mv2gAQMR0j2zIX6OwePA9w7OtjJ0i2mR9I4BvUcXI="; }; - vendorHash = "sha256-zwWiUXexGI9noHSRC+h9/IT0qdNwPMDZyP3AIKtnRn0="; + vendorHash = "sha256-32EjLEPeFsihdG83ru4SSf03F2XJGD8+tbO9ANaI1hs="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/servers/monitoring/prometheus/smartctl-exporter/0001-Return-the-cached-value-if-it-s-not-time-to-scan-aga.patch b/pkgs/servers/monitoring/prometheus/smartctl-exporter/0001-Return-the-cached-value-if-it-s-not-time-to-scan-aga.patch deleted file mode 100644 index 28616251f37ef..0000000000000 --- a/pkgs/servers/monitoring/prometheus/smartctl-exporter/0001-Return-the-cached-value-if-it-s-not-time-to-scan-aga.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e81b06df67b1d42ef915615fafa0b56ef956673b Mon Sep 17 00:00:00 2001 -From: Andreas Fuchs <asf@boinkor.net> -Date: Thu, 11 Feb 2021 17:30:44 -0500 -Subject: [PATCH] Return the cached value if it's not time to scan again yet - -This should ensure that if we have a valid value cached (which ought -to be every time after the first scan), we return it as metrics. - -This fixes the crashes that would happen if queries happened earlier -than the re-scan interval allowed. - -Address review feedback: Shorten the time-to-scan logic - -We can express this in a single if statement, so it takes fewer lines -to do the "should we check again" check. ---- - readjson.go | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) - -diff --git a/readjson.go b/readjson.go -index da35448..c9996fd 100644 ---- a/readjson.go -+++ b/readjson.go -@@ -78,14 +78,7 @@ func readData(device string) (gjson.Result, error) { - - if _, err := os.Stat(device); err == nil { - cacheValue, cacheOk := jsonCache[device] -- timeToScan := false -- if cacheOk { -- timeToScan = time.Now().After(cacheValue.LastCollect.Add(options.SMARTctl.CollectPeriodDuration)) -- } else { -- timeToScan = true -- } -- -- if timeToScan { -+ if !cacheOk || time.Now().After(cacheValue.LastCollect.Add(options.SMARTctl.CollectPeriodDuration)) { - json, ok := readSMARTctl(device) - if ok { - jsonCache[device] = JSONCache{JSON: json, LastCollect: time.Now()} -@@ -93,7 +86,7 @@ func readData(device string) (gjson.Result, error) { - } - return gjson.Parse(DEFAULT_EMPTY_JSON), fmt.Errorf("smartctl returned bad data for device %s", device) - } -- return gjson.Parse(DEFAULT_EMPTY_JSON), fmt.Errorf("Too early collect called for device %s", device) -+ return cacheValue.JSON, nil - } - return gjson.Parse(DEFAULT_EMPTY_JSON), fmt.Errorf("Device %s unavialable", device) - } --- -2.33.1 - diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index bad0f09d40e5f..812484fdf615c 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "snmp_exporter"; - version = "0.22.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "snmp_exporter"; rev = "v${version}"; - sha256 = "sha256-HncffOX0/z8XIEXTOkt6bcnAfY7xwgNBGhUwC3FIJjo="; + sha256 = "sha256-6Y2zJwY5gToJlY6iLug2jNXXtNLNz98WoTKGcWgYzaA="; }; - vendorHash = "sha256-n0LPKmGPxLZgvzdpyuE67WOJv7MKN28m7PtQpWYdtMk="; + vendorHash = "sha256-8soLDI/hBzSZB6Lfj1jVkIWfIkMPJmp84bu7TKg7jeo="; buildInputs = [ net-snmp ]; @@ -23,6 +23,6 @@ buildGoModule rec { description = "SNMP Exporter for Prometheus"; homepage = "https://github.com/prometheus/snmp_exporter"; license = licenses.asl20; - maintainers = with maintainers; [ oida willibutz Frostman ]; + maintainers = with maintainers; [ oida Frostman ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 666b8ed9bdc7d..ca650c53475db 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "statsd_exporter"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "statsd_exporter"; rev = "v${version}"; - hash = "sha256-H5ckrDAs9gwQCkVe4TKF4yuqLh2S/+dPaaRH+5aoj+o="; + hash = "sha256-C7+4v40T667KJHEQ3ebLDg2wJNrxD/nossfT6rMlER8="; }; - vendorHash = "sha256-LhPfOc83/IWkTk3C1DZggWngPJWobZFeCl4cum/aIQo="; + vendorHash = "sha256-scBpRZeECgAtpu9lnkIk1I2c8UmAkEL8LYNPUeUNYto="; meta = with lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index f9d9ce499b5f2..da6013b9b5ec4 100644 --- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -9,27 +9,18 @@ python3Packages.buildPythonApplication rec { pname = "prometheus-xmpp-alerts"; - version = "0.5.6"; + version = "0.5.8"; + format = "pyproject"; src = fetchFromGitHub { owner = "jelmer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PwShGS1rbfZCK5OS6Cnn+mduOpWAD4fC69mcGB5GB1c="; + sha256 = "sha256-iwqcowwJktZQfdxykpsw/MweAPY0KF7ojVwvk1LP8a4="; }; - patches = [ - # Required until https://github.com/jelmer/prometheus-xmpp-alerts/pull/33 is merged - # and contained in a release - (fetchpatch { - name = "Fix-outdated-entrypoint-definiton.patch"; - url = "https://github.com/jelmer/prometheus-xmpp-alerts/commit/c41dd41dbd3c781b874bcf0708f6976e6252b621.patch"; - hash = "sha256-G7fRLSXbkI5EDgGf4n9xSVs54IPD0ev8rTEFffRvLY0="; - }) - ]; - postPatch = '' - substituteInPlace setup.cfg \ + substituteInPlace pyproject.toml \ --replace "bs4" "beautifulsoup4" ''; @@ -46,6 +37,7 @@ python3Packages.buildPythonApplication rec { ]); nativeCheckInputs = with python3Packages; [ + setuptools unittestCheckHook pytz ]; diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix index 3e5ec75a29221..d229daa14b81a 100644 --- a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix @@ -16,6 +16,16 @@ buildGoModule rec { vendorHash = "sha256-uIilESEmAxANxFOy7qvYxlF/bId/Kqh4jUspNknlhlc="; + ldflags = [ + "-s" + "-w" + "-X github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/common/version.Revision=unknown" + "-X github.com/prometheus/common/version.Branch=unknown" + "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs" + "-X github.com/prometheus/common/version.BuildDate=unknown" + ]; + postInstall = '' install -Dm444 -t $out/share/doc/${pname} *.md ''; diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 1b3a206dd6dc1..e55630a36335a 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "riemann"; - version = "0.3.9"; + version = "0.3.11"; src = fetchurl { url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-w3Uv+RMHhw1/G0wkygfLbazeinZqrbxVL4NFmy1/RgQ="; + sha256 = "sha256-B09QBOVRHxwPR7oBZaurXMglx5cR/oN7eEKVhs3ZUyc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 8dcee384d6da8..2a288e71ec87b 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.28.5"; + version = "1.29.2"; subPackages = [ "cmd/telegraf" ]; @@ -16,10 +16,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-dmePzJ10VgzN6CxFAz7QloIsPULuTZH+Pjkd/kIQUmU="; + hash = "sha256-Z2+G4H1O4e77V9jfW+REK4PGdJgoPz+JgLxX/WqBoaY="; }; - vendorHash = "sha256-3buC6N/tHTf6FMEXU3+XlJVGntLe86Hx3eNpn7w0yMs="; + vendorHash = "sha256-mPw3KfQy9DRqv8E6zzYAbeUaLaNfiNPU77ic+JqqBuM="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 37814a4174918..5e69845ae654b 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,24 +1,25 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib +, buildGoModule +, fetchFromGitHub +, go +, nix-update-script +, nixosTests +, testers +, thanos +}: + buildGoModule rec { pname = "thanos"; - version = "0.31.0"; + version = "0.33.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "sha256-EJZGc4thu0WhVSSRolIRYg39S81Cgm+JHwpW5eE7mDc="; + rev = "refs/tags/v${version}"; + hash = "sha256-AM4gJmUea8/Rfg7i4yTIK1ie+8MHz0M+ZG2F//wYHNA="; }; - patches = [ - # https://github.com/thanos-io/thanos/pull/6126 - (fetchpatch { - url = "https://github.com/thanos-io/thanos/commit/a4c218bd690259fc0c78fe67e0739bd33d38541e.patch"; - hash = "sha256-Hxc1s5IXAyw01/o4JvOXuyYuOFy0+cBUv3OkRv4DCXs="; - }) - ]; - - vendorHash = "sha256-8+MUMux6v/O2syVyTx758yUBfJkertzibz6yFB05nWk="; + vendorHash = "sha256-JLj0HhcT4Hlc/FpYNGasqbfNz4cV12UueCYuXjamxks="; doCheck = true; @@ -30,12 +31,26 @@ buildGoModule rec { "-X ${t}.Branch=unknown" "-X ${t}.BuildUser=nix@nixpkgs" "-X ${t}.BuildDate=unknown" + "-X ${t}.GoVersion=${lib.getVersion go}" ]; + passthru = { + updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) prometheus; + version = testers.testVersion { + command = "thanos --version"; + package = thanos; + }; + }; + }; + meta = with lib; { description = "Highly available Prometheus setup with long term storage capabilities"; homepage = "https://github.com/thanos-io/thanos"; + changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ basvandijk ]; + mainProgram = "thanos"; + maintainers = with maintainers; [ basvandijk anthonyroussel ]; }; } diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index e3105e4b24fd3..952f3190546db 100644 --- a/pkgs/servers/monitoring/unpoller/default.nix +++ b/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.9.2"; + version = "2.9.5"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-8O5lu0AGLMrWtAd+Unv97CPhxSuhB/wiJXPZnoBjy2A="; + hash = "sha256-hNDRzQGTS3sAdt/0ZdJV5zRpSdrBHGLDZJ62X+kFg7M="; }; - vendorHash = "sha256-eLHtSEINxrqjlPyJZJwfSGA0gVaxcIolhWnqJxLXkew="; + vendorHash = "sha256-+fXNfDGzZy43WjQrvK2enOWtSv2qN3Zo+O+9Bn+KO1s="; ldflags = [ "-w" "-s" diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index 572b83ba9cef1..7b82a205b264e 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "uptime-kuma"; - version = "1.23.6"; + version = "1.23.11"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; rev = version; - hash = "sha256-E/iyusAZnEnfXQ63LZA+9dgE0MvhFOKmrIXCEZ+LGi8="; + hash = "sha256-PhIe2aDz6hr8001LL8N5L8jcUyzuamU0yYIVKcwmTlw="; }; - npmDepsHash = "sha256-AeN6+0DKd+Q2g3I960PeL3IBla5S7X0od9J244HiwLU="; + npmDepsHash = "sha256-Jyp/xY9K3sfqVnR7NQhgly8B54FmvnrStFO2GO2Kszs="; patches = [ # Fixes the permissions of the database being not set correctly diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/servers/monitoring/vmagent/default.nix index 7ccd36981a46f..875a28e0217bb 100644 --- a/pkgs/servers/monitoring/vmagent/default.nix +++ b/pkgs/servers/monitoring/vmagent/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "vmagent"; - version = "1.93.6"; + version = "1.96.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - sha256 = "sha256-5z8o6I2AoX43t4UeOjxha9fkEDxVDRhdGNgVZGlHrRE="; + sha256 = "sha256-/YS0IDUdGIT3QuRbD+5c3VOqrzYvbcZefLSd+tYJ6dY="; }; ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index 8d33402d7d347..a706477247784 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -23,13 +23,13 @@ let ); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2023-08-03"; + version = "unstable-2023-12-16"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "fe120952ee06607d039af8f461028e9f5b817395"; - sha256 = "sha256-TyhpMHu06YoaV5tZGBcYulUrABW6OFYZLyCoZLRmaUU="; + rev = "42357891a3716cd332ef60b28af09f8732dbf67a"; + sha256 = "sha256-5w336GaHUkbmhAPvhOO3kNW5q7qTFVw3p0Q+Rv+YdYM="; }; nativeBuildInputs = [ makeWrapper ]; @@ -52,5 +52,6 @@ in stdenvNoCC.mkDerivation rec { homepage = "https://github.com/Arksine/moonraker"; license = licenses.gpl3Only; maintainers = with maintainers; [ zhaofengli ]; + mainProgram = "moonraker"; }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index df166ad0ff04b..285f2b83578c5 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -117,13 +117,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.14"; + version = "0.23.15"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-S71PXj+XTGsp5aJXH+82D7tdemfA6cnLBWT/fDmb8oA="; + sha256 = "sha256-QURq7ysSsxmBOtoBlPTPWiloXQpjEdxnM0L1fLwXfpw="; }; buildInputs = [ @@ -190,6 +190,7 @@ let license = licenses.gpl2Only; maintainers = with maintainers; [ astsmtl ehmry tobim ]; platforms = platforms.unix; + mainProgram = "mpd"; longDescription = '' Music Player Daemon (MPD) is a flexible, powerful daemon for playing diff --git a/pkgs/servers/mpd/libmpdclient.nix b/pkgs/servers/mpd/libmpdclient.nix deleted file mode 100644 index 72c3a37d97d66..0000000000000 --- a/pkgs/servers/mpd/libmpdclient.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, fixDarwinDylibNames -}: - -stdenv.mkDerivation rec { - pname = "libmpdclient"; - version = "2.20"; - - src = fetchFromGitHub { - owner = "MusicPlayerDaemon"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-qEgdwG7ygVblIa3uRf1tddxHg7T1yvY17nbhZ7NRNvg="; - }; - - nativeBuildInputs = [ meson ninja ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - - meta = with lib; { - description = "Client library for MPD (music player daemon)"; - homepage = "https://www.musicpd.org/libs/libmpdclient/"; - license = licenses.bsd2; - maintainers = with maintainers; [ ehmry AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/mqtt/flashmq/default.nix b/pkgs/servers/mqtt/flashmq/default.nix index 7ecad55000abf..eb4c607b7804d 100644 --- a/pkgs/servers/mqtt/flashmq/default.nix +++ b/pkgs/servers/mqtt/flashmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.4.5"; + version = "1.8.4"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-DcxwwUNpnMeK8A3LuyfrWAMCng0yIcX9bKxNGY0uDSo="; + hash = "sha256-CMZim7FSTzjUaViVFq5OABOAUX3Aee+I3/HQhNIdIVM="; }; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index f586b606f1d2a..824dcdf62f885 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -12,6 +12,7 @@ , openssl , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd +, uthash , fetchpatch , nixosTests }: @@ -52,11 +53,6 @@ stdenv.mkDerivation rec { substituteInPlace man/$f.xsl \ --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl done - - # the manpages are not generated when using cmake - pushd man - make - popd ''; outputs = [ "out" "dev" "lib" ]; @@ -70,12 +66,18 @@ stdenv.mkDerivation rec { libuv libwebsockets' openssl + uthash ] ++ lib.optional withSystemd systemd; cmakeFlags = [ - "-DWITH_THREADING=ON" - "-DWITH_WEBSOCKETS=ON" - ] ++ lib.optional withSystemd "-DWITH_SYSTEMD=ON"; + (lib.cmakeBool "WITH_BUNDLED_DEPS" false) + (lib.cmakeBool "WITH_WEBSOCKETS" true) + (lib.cmakeBool "WITH_SYSTEMD" withSystemd) + ]; + + postFixup = '' + sed -i "s|^prefix=.*|prefix=$lib|g" $dev/lib/pkgconfig/*.pc + ''; passthru.tests = { inherit (nixosTests) mosquitto; diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/servers/mqtt/nanomq/default.nix index 902b5369df07c..eb4bdf325e913 100644 --- a/pkgs/servers/mqtt/nanomq/default.nix +++ b/pkgs/servers/mqtt/nanomq/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nanomq"; - version = "0.18.2"; + version = "0.20.8"; src = fetchFromGitHub { owner = "emqx"; repo = "nanomq"; rev = finalAttrs.version; - hash = "sha256-XGJBBuRSL3InXUMGxOttdbt0zmI1APFlc4IvwC2up8g="; + hash = "sha256-VCKlXQ7qvBab+wRDnJ6EUA5qaQ36gTFfuerN1GU6sW0="; fetchSubmodules = true; }; @@ -71,7 +71,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DNNG_ENABLE_TLS=ON" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type -Wno-implicit-function-declaration -Wno-error=implicit-int"; # disabled by default - not 100% reliable and making nanomq depend on # mosquitto would annoy people diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix index 04ea4d10fe8aa..44ecc6481ecd8 100644 --- a/pkgs/servers/mtprotoproxy/default.nix +++ b/pkgs/servers/mtprotoproxy/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/alexbers/mtprotoproxy"; platforms = python.meta.platforms; maintainers = with maintainers; [ abbradar ]; + mainProgram = "mtprotoproxy"; }; } diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index b0ccb03a8f9cb..7100a5bd271b3 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -48,5 +48,6 @@ in myNodePackages.package.override { platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin && stdenv.isAarch64; + mainProgram = "mx-puppet-discord"; }; } diff --git a/pkgs/servers/mxisd/0001-gradle.patch b/pkgs/servers/mxisd/0001-gradle.patch deleted file mode 100644 index 8a9f5a81180bb..0000000000000 --- a/pkgs/servers/mxisd/0001-gradle.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/build.gradle 2019-05-16 21:09:08.373112953 +0200 -+++ b/build.gradle 2019-05-16 21:09:37.093114427 +0200 -@@ -72,7 +72,7 @@ - - buildscript { - repositories { -- jcenter() -+REPLACE - } - - dependencies { -@@ -81,9 +81,7 @@ - } - - repositories { -- jcenter() -- maven { url "https://kamax.io/maven/releases/" } -- maven { url "https://kamax.io/maven/snapshots/" } -+REPLACE - } - - dependencies { diff --git a/pkgs/servers/mycorrhiza/default.nix b/pkgs/servers/mycorrhiza/default.nix index bb930ab2756d3..3eb3c731aad33 100644 --- a/pkgs/servers/mycorrhiza/default.nix +++ b/pkgs/servers/mycorrhiza/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { license = licenses.agpl3Only; maintainers = with maintainers; [ chekoopa ]; platforms = platforms.linux; + mainProgram = "mycorrhiza"; }; } diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index b65d97a156f62..a173224a1b40c 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.4"; + version = "2.10.9"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-jcN/ycRj8DksBj/Qy0IhoVwQsKuMF+sBkaKM1rZYJPc="; + hash = "sha256-ncNiU5n7LvVXEgDiZAu+OzbtAkGHyrbOsGLTSMMIVps="; }; - vendorHash = "sha256-5p23qIWN7+nL+NKbKpBqov7+isNXKmJQRzzojTqKIU4="; + vendorHash = "sha256-akkDKIRp2uG+6z/YVB2M6BxLQGNt1qPhvW/BwnjsBHA="; doCheck = false; diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index bb86f5f48c4a9..d43bbc2fdc54c 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -4,16 +4,16 @@ with lib; buildGoModule rec { pname = "nats-streaming-server"; - version = "0.25.5"; + version = "0.25.6"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-rx6H3YXyg53th81w1SsKg5h9wj2vswnArDO0TNUlvpE="; + sha256 = "sha256-i5fNxeJQXiyy+9NOGT1X68u9Pztxvnnba64rxIgjbZc="; }; - vendorHash = "sha256-erTxz3YpE64muc9OgP38BrPNH5o3tStSYsCbBd++kFU="; + vendorHash = "sha256-r6RDHGAt83sKyMHvG3927rZroWdnTQFb8zTrmlc0W5U="; # tests fail and ask to `go install` doCheck = false; @@ -23,5 +23,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.swdunlop ]; homepage = "https://nats.io/"; + mainProgram = "nats-streaming-server"; }; } diff --git a/pkgs/servers/networkaudiod/default.nix b/pkgs/servers/networkaudiod/default.nix index dacd315aba343..a6a858637fe36 100644 --- a/pkgs/servers/networkaudiod/default.nix +++ b/pkgs/servers/networkaudiod/default.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; + mainProgram = "networkaudiod"; }; } diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 6cfecd47a92c0..b0c211b3039da 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -1,5 +1,6 @@ { lib, stdenvNoCC, fetchurl, nixosTests , nextcloud27Packages +, nextcloud28Packages , nextcloud26Packages }: @@ -35,36 +36,30 @@ let homepage = "https://nextcloud.com"; maintainers = with maintainers; [ schneefux bachp globin ma27 ]; license = licenses.agpl3Plus; - platforms = with platforms; unix; + platforms = platforms.linux; knownVulnerabilities = extraVulnerabilities ++ (optional eol "Nextcloud version ${version} is EOL"); }; }; in { - nextcloud25 = throw '' - Nextcloud v25 has been removed from `nixpkgs` as the support for is dropped - by upstream in 2023-10. Please upgrade to at least Nextcloud v26 by declaring - - services.nextcloud.package = pkgs.nextcloud26; - - in your NixOS config. - - WARNING: if you were on Nextcloud 24 you have to upgrade to Nextcloud 25 - first on 23.05 because Nextcloud doesn't support upgrades across multiple major versions! - ''; - nextcloud26 = generic { - version = "26.0.8"; - hash = "sha256-ydCay0RuM2AZYIKRM/jzdutvJ5pN73CCF/xxWBiSiH8="; + version = "26.0.11"; + hash = "sha256-Vc0QCCy495oYeRnpWaYwc4Nf4D/ko4VsODoKcS7YADA="; packages = nextcloud26Packages; }; nextcloud27 = generic { - version = "27.1.3"; - hash = "sha256-HWFJNSReSjdbSsmRwC8yNZK3U5cvhviHY/2A7X0nV5M="; + version = "27.1.6"; + hash = "sha256-rntyt/xSWsSXmMLeaml6TP8ls0ly1p1GmVmIXTNRvvo="; packages = nextcloud27Packages; }; + nextcloud28 = generic { + version = "28.0.1"; + hash = "sha256-L4BzW0Qwgicv5qO14yE3lX8fxEjHU0K5S1IAspcl86Q="; + packages = nextcloud28Packages; + }; + # tip: get the sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' } diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index 78a121a2e1559..c72cca0f4c238 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "notify_push"; - version = "0.6.3"; + version = "0.6.7"; src = fetchFromGitHub { owner = "nextcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-5Vd8fD0nB2POtxDFNVtkJfVEe+O8tjnwlwYosDJjIDA="; + hash = "sha256-kcdrKrad5kHYOg/1+L72c9Y3GwFA4wS2C9xQ0JOqcOQ="; }; - cargoHash = "sha256-TF4rL7KXsbfYiEOfkKRyr3PCvyocq6tg90OZURZh8f8="; + cargoHash = "sha256-jMSPBoLVUe4I+CI8nKOjgTxUUarUa4/KLl+LmehKOzg="; passthru = rec { test_client = rustPlatform.buildRustPackage { @@ -24,18 +24,23 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "test_client"; - cargoHash = "sha256-ES0LBKirOUqXOtA9O2KouA+NWisIMoe8XhmnTC8w1cg="; + cargoHash = "sha256-0Vs05DToSeKWQJlTwtETedJV2GQ3LYJYIsxM/xZ6dt4="; }; tests = { - inherit (nixosTests.nextcloud) with-postgresql-and-redis26; + inherit (nixosTests.nextcloud) + with-postgresql-and-redis26 + with-postgresql-and-redis27 + with-postgresql-and-redis28; inherit test_client; }; }; meta = with lib; { + changelog = "https://github.com/nextcloud/notify_push/releases/tag/v${version}"; description = "Update notifications for nextcloud clients"; homepage = "https://github.com/nextcloud/notify_push"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ ajs124 ]; + platforms = platforms.linux; + maintainers = teams.helsinki-systems.members; }; } diff --git a/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json index 82d03843ad9a8..d6c55c6288ba8 100644 --- a/pkgs/servers/nextcloud/packages/26.json +++ b/pkgs/servers/nextcloud/packages/26.json @@ -1,8 +1,8 @@ { "bookmarks": { - "sha256": "14dkyqm04d4ix114jbcgbx10zvkv4qlx4n56chpqz0w1y7x8idpd", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz", - "version": "13.1.1", + "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", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "1iq8np72pjw2bn4zmbp2rmrh12n4z62rwrz2bb94xjza1fws7b2v", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.3/calendar-v4.5.3.tar.gz", - "version": "4.5.3", + "sha256": "0lz1sly8p2lhr425ggj3dacz0i28xg32041zdg3nl916yayvqj2p", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.3/calendar-v4.6.3.tar.gz", + "version": "4.6.3", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "1pz2px5amk3byn4pq86cyyjv4hrqhsjz61xfm7cl7z8qfckqfhi2", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.2/contacts-v5.4.2.tar.gz", - "version": "5.4.2", + "sha256": "1wq6xj9r1f2raqhpj222269y8dkn5zx9mnw7zrbxwpz8c67s3h6n", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.1/contacts-v5.5.1.tar.gz", + "version": "5.5.1", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -30,19 +30,19 @@ ] }, "cookbook": { - "sha256": "18rzvdqd99nlkk3p0y9y8b17ihw5c4c9wsx8psq6xadspm97002y", - "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz", - "version": "0.10.2", + "sha256": "06d1rhvcwxzi8hl99nz3hg32fznv0q5m06cwjy3gc81j53qz0ksc", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.10.5/cookbook-0.10.5.tar.gz", + "version": "0.10.5", "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", - "homepage": "", + "homepage": "https://github.com/nextcloud/cookbook/", "licenses": [ "agpl" ] }, "cospend": { - "sha256": "1rg9k33yapbl8chpxx3bjyzc9h4krjavksbxsvw14kpm01rss3j9", - "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.10/cospend-1.5.10.tar.gz", - "version": "1.5.10", + "sha256": "0ygisjx3abxc2nsrwqrw9dbpvm38qxa0bk280962yh1bb54i04vs", + "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.14/cospend-1.5.14.tar.gz", + "version": "1.5.14", "description": "# Nextcloud Cospend 💰\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share money with others.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be accessed and modified by people without a Nextcloud account. Each project has an ID and a password for guest access.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently being developped!\n\n## Features\n\n* ✎ create/edit/delete projects, members, bills, bill categories, currencies\n* ⚖ check member balances\n* 🗠 display project statistics\n* ♻ display settlement plan\n* 🎇 automatically create reimbursement bills from settlement plan\n* 🗓 create recurring bills (daily/weekly/monthly/yearly)\n* 📊 optionally provide custom amount for each member in new bills\n* 🔗 link bills with personal files (picture of physical bill for example)\n* 👩 guest access for people outside Nextcloud\n* 👫 share projects with Nextcloud users/groups/circles\n* 🖫 import/export projects as csv (compatible with csv files from IHateMoney)\n* 🔗 generate link/QRCode to easily import projects in MoneyBuster\n* 🗲 implement Nextcloud notifications and activity stream\n\nThis app is tested on Nextcloud 20+ with Firefox 57+ and Chromium.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/eneiluj/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/eneiluj/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* it does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ](https://liberapay.com/eneiluj/donate)", "homepage": "https://github.com/julien-nc/cospend-nc", "licenses": [ @@ -50,15 +50,25 @@ ] }, "deck": { - "sha256": "15hir3fssvzyysazbaad8qiz0bv00x73c2wfdj5aviz9h0gp4x4v", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.4/deck-v1.9.4.tar.gz", - "version": "1.9.4", + "sha256": "1vf4vmwzfyj5ylb571h1wgh8f3aiivzla11y14ggikg5fj9lgyqi", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.6/deck-v1.9.6.tar.gz", + "version": "1.9.6", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ "agpl" ] }, + "end_to_end_encryption": { + "sha256": "19vp0ggllplm84hwaqwn95122hsgfglmlk2lbwlgsjv8d36fv1wr", + "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.12.5/end_to_end_encryption-v1.12.5.tar.gz", + "version": "1.12.5", + "description": "Provides the necessary endpoint to enable end-to-end encryption.\n\n**Notice:** E2EE is currently not compatible to be used together with server-side encryption", + "homepage": "https://github.com/nextcloud/end_to_end_encryption", + "licenses": [ + "agpl" + ] + }, "files_markdown": { "sha256": "0p97ha6x3czzbflavmjn4jmz3z706h5f84spg4j7dwq3nc9bqrf7", "url": "https://github.com/icewind1991/files_markdown/releases/download/v2.4.1/files_markdown-v2.4.1.tar.gz", @@ -80,19 +90,29 @@ ] }, "forms": { - "sha256": "155z87wyv2p06c3kpy9zaw6qf5s7s0ah4wfw022s4cc21i3rcwxv", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.3.1/forms-v3.3.1.tar.gz", - "version": "3.3.1", + "sha256": "0rx3kcbachs3pk56cmzrc2iy5wg5cwvs8n6myxbgz86qm0pbxmzk", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.4/forms-v3.4.4.tar.gz", + "version": "3.4.4", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ "agpl" ] }, + "gpoddersync": { + "sha256": "1lm8lqvs1mvb3i2a8b5j9g7b26f747jfp696b9ima0hgpw8ycbfs", + "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.8.3/gpoddersync.tar.gz", + "version": "3.8.3", + "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod", + "homepage": "https://github.com/thrillfall/nextcloud-gpodder", + "licenses": [ + "agpl" + ] + }, "groupfolders": { - "sha256": "03zljgzhyvvc7jfabphxvkgp8rhbypz17zmlvmr46cwh1djnx5m9", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.5/groupfolders-v14.0.5.tar.gz", - "version": "14.0.5", + "sha256": "00z9n3l3pd212x02zfnmf15fk67whf0a3j395pg68lg4b8w4lyly", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.6/groupfolders-v14.0.6.tar.gz", + "version": "14.0.6", "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": [ @@ -113,16 +133,16 @@ "sha256": "11q15ajg1357y5y5a640dvsy6hhvvar7wp34zfsb07n7hqlmyci0", "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.13/keeweb-0.6.13.tar.gz", "version": "0.6.13", - "description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your Nextcloud.", + "description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your\n Nextcloud.", "homepage": "https://github.com/jhass/nextcloud-keeweb", "licenses": [ "agpl" ] }, "mail": { - "sha256": "0ascail3vfkv3mm5s4s3ma74d6qxai76kdqxknmljnw56xb19qfv", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.4/mail-v3.4.4.tar.gz", - "version": "3.4.4", + "sha256": "0brhaqw1sdh3fj5vdj4h8rkgg92ghwy0gyz51n120rppd8fhsch6", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.4/mail-v3.5.4.tar.gz", + "version": "3.5.4", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -130,8 +150,8 @@ ] }, "maps": { - "sha256": "049hrp79fj1bp9nk9isjrk427k238974x7gsj68jplxfrgq3sdkz", - "url": "https://github.com/nextcloud/maps/releases/download/v1.2.0-2-nightly/maps-1.2.0-2-nightly.tar.gz", + "sha256": "1gyxg5xp4mpdrw8630nqcf5yk8cs7a0kvfik2q01p05d533phc4d", + "url": "https://github.com/nextcloud/maps/releases/download/v1.2.0/maps-1.2.0.tar.gz", "version": "1.2.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", @@ -140,9 +160,9 @@ ] }, "memories": { - "sha256": "1yn1wkv4jxpc8faf4rl46yfddyplnryrkws3jz0x1wcr9zlxdkng", - "url": "https://github.com/pulsejet/memories/releases/download/v6.1.0/memories.tar.gz", - "version": "6.1.0", + "sha256": "1j3296d3arkr9344zzv6ynhg842ym36a1bp1r3y6m8wp552m5gay", + "url": "https://github.com/pulsejet/memories/releases/download/v6.2.2/memories.tar.gz", + "version": "6.2.2", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", "homepage": "https://memories.gallery", "licenses": [ @@ -170,9 +190,9 @@ ] }, "notes": { - "sha256": "1g4ibrymsfd2bcvmyfyrl23z2kh4bgkwrgyacvdx1glk44di6sgc", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.1/notes.tar.gz", - "version": "4.8.1", + "sha256": "02893azzq507frb3x7h13ypx09yn9rx740hgfw7q1a2il2ixww5f", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.2/notes.tar.gz", + "version": "4.9.2", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -180,9 +200,9 @@ ] }, "notify_push": { - "sha256": "0lwyy1pnyfw464vab1v5k8q0rgarrj5w12cf1nsywjaafb8y1ym0", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.5/notify_push-v0.6.5.tar.gz", - "version": "0.6.5", + "sha256": "1h2qa5j31jq2wzpsj69h8knm4jzg9i72p77l92l855n98r4iiws8", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.7/notify_push-v0.6.7.tar.gz", + "version": "0.6.7", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -199,6 +219,16 @@ "apache" ] }, + "phonetrack": { + "sha256": "1p15vw7c5c1h08czyxi1r6svjd5hjmnc0i6is4vl3xq2kfjmcyyx", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.7.6/phonetrack-0.7.6.tar.gz", + "version": "0.7.6", + "description": "# PhoneTrack Nextcloud application\n\n📱 PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\n🗺 It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n* Create a tracking session.\n* Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n* Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name. Setting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n* 📍 Display location history\n* ⛛ Filter points\n* ✎ Manually edit/add/delete points\n* ✎ Edit devices (rename, change colour/shape, move to another session)\n* ⛶ Define geofencing zones for devices\n* ⚇ Define proximity alerts for device pairs\n* 🖧 Share a session to other Nextcloud users or with a public link (read-only)\n* 🔗 Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n* 🖫 Import/export a session in GPX format (one file with one track per device or one file per device)\n* 🗠 Display sessions statistics\n* 🔒 [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n* 🗓 Toggle session auto export and auto purge (daily/weekly/monthly)\n* ◔ Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n* PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ](https://liberapay.com/eneiluj/donate)", + "homepage": "https://github.com/julien-nc/phonetrack-oc", + "licenses": [ + "agpl" + ] + }, "polls": { "sha256": "1dmws4ybv3pzxz5g9c7ghblx0nfal2ssmsg7hjcs1n4xcjc6585p", "url": "https://github.com/nextcloud/polls/releases/download/v5.4.2/polls.tar.gz", @@ -210,9 +240,9 @@ ] }, "previewgenerator": { - "sha256": "0ziyl7kqgivk9xvkd12byps6bb3fvcvdgprfa9ffy1zrgpl9syhk", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.3.0/previewgenerator-v5.3.0.tar.gz", - "version": "5.3.0", + "sha256": "08f0ivxqa2b54w2q4lycb3p5ngqyk92n2qll54pmpj54pfn1sj3m", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.4.0/previewgenerator-v5.4.0.tar.gz", + "version": "5.4.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -220,9 +250,9 @@ ] }, "qownnotesapi": { - "sha256": "1hkcqcc6y7x0zrc88qqmsf7mz0dl1kk06gsl6la3kr33fxr0cp0k", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.6.0/qownnotesapi-nc.tar.gz", - "version": "23.6.0", + "sha256": "1pyr4b3w6gsy83ci6cy0wfv870qm2v957nl4w6xk989iyknk4ana", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.12.0/qownnotesapi-nc.tar.gz", + "version": "23.12.0", "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", "homepage": "https://github.com/pbek/qownnotesapi", "licenses": [ @@ -240,9 +270,9 @@ ] }, "spreed": { - "sha256": "06cixw0bbmz20fybdqq192bk11xraaaplqybbxa0xjs3x6pcw1na", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.7/spreed-v16.0.7.tar.gz", - "version": "16.0.7", + "sha256": "0s31s0qwwzrdqwmnwcykv5vpvc953nmpviy69qn0d7gmd5qknrdx", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.9/spreed-v16.0.9.tar.gz", + "version": "16.0.9", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -270,9 +300,9 @@ ] }, "twofactor_webauthn": { - "sha256": "0z6m2chq5kxc8f10g6n1lh51yi10svy2qp5gp0v8xs71apqcc2wx", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.0/twofactor_webauthn-v1.3.0.tar.gz", - "version": "1.3.0", + "sha256": "1p4ng7nprlcgw7sdfd7wqx5az86a856f1v470lahg2nfbx3fg296", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.2/twofactor_webauthn-v1.3.2.tar.gz", + "version": "1.3.2", "description": "A two-factor provider for WebAuthn devices", "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", "licenses": [ @@ -289,10 +319,20 @@ "agpl" ] }, + "user_oidc": { + "sha256": "0a9hkp69xpw5nzb533nfh56zs7rf2cvhi4yc6d1yjqv9jdak7vi4", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v1.3.5/user_oidc-v1.3.5.tar.gz", + "version": "1.3.5", + "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", + "homepage": "https://github.com/nextcloud/user_oidc", + "licenses": [ + "agpl" + ] + }, "user_saml": { - "sha256": "04ivgqdls72p6x5yrh5p5ycbbfmxhzd0dqin1grblm6cbl7b4s2k", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.4/user_saml-v5.2.4.tar.gz", - "version": "5.2.4", + "sha256": "0rsrbbdvf8kb9l6afz86af33ri0ng9yj7d4xw28j50mfcx3kifg3", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.6/user_saml-v5.2.6.tar.gz", + "version": "5.2.6", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index 6ecb1f3f522bc..73a4881fd423a 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -1,8 +1,8 @@ { "bookmarks": { - "sha256": "14dkyqm04d4ix114jbcgbx10zvkv4qlx4n56chpqz0w1y7x8idpd", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz", - "version": "13.1.1", + "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", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "1iq8np72pjw2bn4zmbp2rmrh12n4z62rwrz2bb94xjza1fws7b2v", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.3/calendar-v4.5.3.tar.gz", - "version": "4.5.3", + "sha256": "0lz1sly8p2lhr425ggj3dacz0i28xg32041zdg3nl916yayvqj2p", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.3/calendar-v4.6.3.tar.gz", + "version": "4.6.3", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "1pz2px5amk3byn4pq86cyyjv4hrqhsjz61xfm7cl7z8qfckqfhi2", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.2/contacts-v5.4.2.tar.gz", - "version": "5.4.2", + "sha256": "1wq6xj9r1f2raqhpj222269y8dkn5zx9mnw7zrbxwpz8c67s3h6n", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.1/contacts-v5.5.1.tar.gz", + "version": "5.5.1", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -30,19 +30,19 @@ ] }, "cookbook": { - "sha256": "18rzvdqd99nlkk3p0y9y8b17ihw5c4c9wsx8psq6xadspm97002y", - "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz", - "version": "0.10.2", + "sha256": "06d1rhvcwxzi8hl99nz3hg32fznv0q5m06cwjy3gc81j53qz0ksc", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.10.5/cookbook-0.10.5.tar.gz", + "version": "0.10.5", "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", - "homepage": "", + "homepage": "https://github.com/nextcloud/cookbook/", "licenses": [ "agpl" ] }, "cospend": { - "sha256": "1rg9k33yapbl8chpxx3bjyzc9h4krjavksbxsvw14kpm01rss3j9", - "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.10/cospend-1.5.10.tar.gz", - "version": "1.5.10", + "sha256": "0ygisjx3abxc2nsrwqrw9dbpvm38qxa0bk280962yh1bb54i04vs", + "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.14/cospend-1.5.14.tar.gz", + "version": "1.5.14", "description": "# Nextcloud Cospend 💰\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share money with others.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be accessed and modified by people without a Nextcloud account. Each project has an ID and a password for guest access.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently being developped!\n\n## Features\n\n* ✎ create/edit/delete projects, members, bills, bill categories, currencies\n* ⚖ check member balances\n* 🗠 display project statistics\n* ♻ display settlement plan\n* 🎇 automatically create reimbursement bills from settlement plan\n* 🗓 create recurring bills (daily/weekly/monthly/yearly)\n* 📊 optionally provide custom amount for each member in new bills\n* 🔗 link bills with personal files (picture of physical bill for example)\n* 👩 guest access for people outside Nextcloud\n* 👫 share projects with Nextcloud users/groups/circles\n* 🖫 import/export projects as csv (compatible with csv files from IHateMoney)\n* 🔗 generate link/QRCode to easily import projects in MoneyBuster\n* 🗲 implement Nextcloud notifications and activity stream\n\nThis app is tested on Nextcloud 20+ with Firefox 57+ and Chromium.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/eneiluj/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/eneiluj/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* it does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ](https://liberapay.com/eneiluj/donate)", "homepage": "https://github.com/julien-nc/cospend-nc", "licenses": [ @@ -50,15 +50,25 @@ ] }, "deck": { - "sha256": "18gscc95zay7nrzdm1h5b52r4bpmpzc1h1xb00214qnb59mydiwr", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.1/deck-v1.11.1.tar.gz", - "version": "1.11.1", + "sha256": "1bl7x3h91rcjd3xx8lq2rkx8khpw5f3n0kqi8mrs88hw0hin8sdi", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.3/deck-v1.11.3.tar.gz", + "version": "1.11.3", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ "agpl" ] }, + "end_to_end_encryption": { + "sha256": "1ha77k2mzr1q63fs1h8ff7vxkhry6vfj2ci1va7m8dkjn7s9pk5c", + "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.13.1/end_to_end_encryption-v1.13.1.tar.gz", + "version": "1.13.1", + "description": "Provides the necessary endpoint to enable end-to-end encryption.\n\n**Notice:** E2EE is currently not compatible to be used together with server-side encryption", + "homepage": "https://github.com/nextcloud/end_to_end_encryption", + "licenses": [ + "agpl" + ] + }, "files_markdown": { "sha256": "0p97ha6x3czzbflavmjn4jmz3z706h5f84spg4j7dwq3nc9bqrf7", "url": "https://github.com/icewind1991/files_markdown/releases/download/v2.4.1/files_markdown-v2.4.1.tar.gz", @@ -80,19 +90,29 @@ ] }, "forms": { - "sha256": "155z87wyv2p06c3kpy9zaw6qf5s7s0ah4wfw022s4cc21i3rcwxv", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.3.1/forms-v3.3.1.tar.gz", - "version": "3.3.1", + "sha256": "0rx3kcbachs3pk56cmzrc2iy5wg5cwvs8n6myxbgz86qm0pbxmzk", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.4/forms-v3.4.4.tar.gz", + "version": "3.4.4", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ "agpl" ] }, + "gpoddersync": { + "sha256": "1lm8lqvs1mvb3i2a8b5j9g7b26f747jfp696b9ima0hgpw8ycbfs", + "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.8.3/gpoddersync.tar.gz", + "version": "3.8.3", + "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod", + "homepage": "https://github.com/thrillfall/nextcloud-gpodder", + "licenses": [ + "agpl" + ] + }, "groupfolders": { - "sha256": "17wqhnbbmgw5ywi39ygf6m1hys7fvr5nhbjzqna6a0bjfr9g19d7", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.1/groupfolders-v15.3.1.tar.gz", - "version": "15.3.1", + "sha256": "1sihhcai7i7gnkl0adq1injlsvk5ainvy71a2373iqmpmi167pyf", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.4/groupfolders-v15.3.4.tar.gz", + "version": "15.3.4", "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": [ @@ -113,16 +133,16 @@ "sha256": "11q15ajg1357y5y5a640dvsy6hhvvar7wp34zfsb07n7hqlmyci0", "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.13/keeweb-0.6.13.tar.gz", "version": "0.6.13", - "description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your Nextcloud.", + "description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your\n Nextcloud.", "homepage": "https://github.com/jhass/nextcloud-keeweb", "licenses": [ "agpl" ] }, "mail": { - "sha256": "0ascail3vfkv3mm5s4s3ma74d6qxai76kdqxknmljnw56xb19qfv", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.4/mail-v3.4.4.tar.gz", - "version": "3.4.4", + "sha256": "0brhaqw1sdh3fj5vdj4h8rkgg92ghwy0gyz51n120rppd8fhsch6", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.4/mail-v3.5.4.tar.gz", + "version": "3.5.4", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -140,9 +160,9 @@ ] }, "memories": { - "sha256": "1yn1wkv4jxpc8faf4rl46yfddyplnryrkws3jz0x1wcr9zlxdkng", - "url": "https://github.com/pulsejet/memories/releases/download/v6.1.0/memories.tar.gz", - "version": "6.1.0", + "sha256": "1j3296d3arkr9344zzv6ynhg842ym36a1bp1r3y6m8wp552m5gay", + "url": "https://github.com/pulsejet/memories/releases/download/v6.2.2/memories.tar.gz", + "version": "6.2.2", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", "homepage": "https://memories.gallery", "licenses": [ @@ -170,9 +190,9 @@ ] }, "notes": { - "sha256": "1g4ibrymsfd2bcvmyfyrl23z2kh4bgkwrgyacvdx1glk44di6sgc", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.1/notes.tar.gz", - "version": "4.8.1", + "sha256": "02893azzq507frb3x7h13ypx09yn9rx740hgfw7q1a2il2ixww5f", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.2/notes.tar.gz", + "version": "4.9.2", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -180,9 +200,9 @@ ] }, "notify_push": { - "sha256": "0lwyy1pnyfw464vab1v5k8q0rgarrj5w12cf1nsywjaafb8y1ym0", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.5/notify_push-v0.6.5.tar.gz", - "version": "0.6.5", + "sha256": "1h2qa5j31jq2wzpsj69h8knm4jzg9i72p77l92l855n98r4iiws8", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.7/notify_push-v0.6.7.tar.gz", + "version": "0.6.7", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -199,6 +219,16 @@ "apache" ] }, + "phonetrack": { + "sha256": "1xvdmb2wlcldv8lk4jb8akhi80w26m2jpazfcz641frjm333kxch", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.7.7/phonetrack-0.7.7.tar.gz", + "version": "0.7.7", + "description": "# PhoneTrack Nextcloud application\n\n📱 PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\n🗺 It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n* Create a tracking session.\n* Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n* Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name. Setting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n* 📍 Display location history\n* ⛛ Filter points\n* ✎ Manually edit/add/delete points\n* ✎ Edit devices (rename, change colour/shape, move to another session)\n* ⛶ Define geofencing zones for devices\n* ⚇ Define proximity alerts for device pairs\n* 🖧 Share a session to other Nextcloud users or with a public link (read-only)\n* 🔗 Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n* 🖫 Import/export a session in GPX format (one file with one track per device or one file per device)\n* 🗠 Display sessions statistics\n* 🔒 [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n* 🗓 Toggle session auto export and auto purge (daily/weekly/monthly)\n* ◔ Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n* PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ](https://liberapay.com/eneiluj/donate)", + "homepage": "https://github.com/julien-nc/phonetrack-oc", + "licenses": [ + "agpl" + ] + }, "polls": { "sha256": "1dmws4ybv3pzxz5g9c7ghblx0nfal2ssmsg7hjcs1n4xcjc6585p", "url": "https://github.com/nextcloud/polls/releases/download/v5.4.2/polls.tar.gz", @@ -210,9 +240,9 @@ ] }, "previewgenerator": { - "sha256": "0ziyl7kqgivk9xvkd12byps6bb3fvcvdgprfa9ffy1zrgpl9syhk", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.3.0/previewgenerator-v5.3.0.tar.gz", - "version": "5.3.0", + "sha256": "08f0ivxqa2b54w2q4lycb3p5ngqyk92n2qll54pmpj54pfn1sj3m", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.4.0/previewgenerator-v5.4.0.tar.gz", + "version": "5.4.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -220,9 +250,9 @@ ] }, "qownnotesapi": { - "sha256": "1hkcqcc6y7x0zrc88qqmsf7mz0dl1kk06gsl6la3kr33fxr0cp0k", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.6.0/qownnotesapi-nc.tar.gz", - "version": "23.6.0", + "sha256": "1pyr4b3w6gsy83ci6cy0wfv870qm2v957nl4w6xk989iyknk4ana", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.12.0/qownnotesapi-nc.tar.gz", + "version": "23.12.0", "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", "homepage": "https://github.com/pbek/qownnotesapi", "licenses": [ @@ -240,9 +270,9 @@ ] }, "spreed": { - "sha256": "1hbgnz0zbhka82csh4rkr1p7zrgbc8wiznqmzh4w1q3d9pz47xis", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.2/spreed-v17.1.2.tar.gz", - "version": "17.1.2", + "sha256": "00fw0v4ybdfirdp62qvrzihz95vxh1bnni1zjwz5j9d4jzzv2xnn", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.4/spreed-v17.1.4.tar.gz", + "version": "17.1.4", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -270,9 +300,9 @@ ] }, "twofactor_webauthn": { - "sha256": "0z6m2chq5kxc8f10g6n1lh51yi10svy2qp5gp0v8xs71apqcc2wx", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.0/twofactor_webauthn-v1.3.0.tar.gz", - "version": "1.3.0", + "sha256": "1p4ng7nprlcgw7sdfd7wqx5az86a856f1v470lahg2nfbx3fg296", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.2/twofactor_webauthn-v1.3.2.tar.gz", + "version": "1.3.2", "description": "A two-factor provider for WebAuthn devices", "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", "licenses": [ @@ -289,10 +319,20 @@ "agpl" ] }, + "user_oidc": { + "sha256": "0a9hkp69xpw5nzb533nfh56zs7rf2cvhi4yc6d1yjqv9jdak7vi4", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v1.3.5/user_oidc-v1.3.5.tar.gz", + "version": "1.3.5", + "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", + "homepage": "https://github.com/nextcloud/user_oidc", + "licenses": [ + "agpl" + ] + }, "user_saml": { - "sha256": "04ivgqdls72p6x5yrh5p5ycbbfmxhzd0dqin1grblm6cbl7b4s2k", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.4/user_saml-v5.2.4.tar.gz", - "version": "5.2.4", + "sha256": "0rsrbbdvf8kb9l6afz86af33ri0ng9yj7d4xw28j50mfcx3kifg3", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.6/user_saml-v5.2.6.tar.gz", + "version": "5.2.6", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json new file mode 100644 index 0000000000000..479f6c585742d --- /dev/null +++ b/pkgs/servers/nextcloud/packages/28.json @@ -0,0 +1,292 @@ +{ + "bookmarks": { + "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", + "homepage": "https://github.com/nextcloud/bookmarks", + "licenses": [ + "agpl" + ] + }, + "calendar": { + "sha256": "0lz1sly8p2lhr425ggj3dacz0i28xg32041zdg3nl916yayvqj2p", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.3/calendar-v4.6.3.tar.gz", + "version": "4.6.3", + "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", + "homepage": "https://github.com/nextcloud/calendar/", + "licenses": [ + "agpl" + ] + }, + "contacts": { + "sha256": "1wq6xj9r1f2raqhpj222269y8dkn5zx9mnw7zrbxwpz8c67s3h6n", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.1/contacts-v5.5.1.tar.gz", + "version": "5.5.1", + "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", + "homepage": "https://github.com/nextcloud/contacts#readme", + "licenses": [ + "agpl" + ] + }, + "cookbook": { + "sha256": "0wd4vwfp4i8hfrlqfzac517iqfhzxy1sv0ryb96489q9fvbcvlnp", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz", + "version": "0.11.0", + "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", + "homepage": "https://github.com/nextcloud/cookbook/", + "licenses": [ + "agpl" + ] + }, + "cospend": { + "sha256": "0ygisjx3abxc2nsrwqrw9dbpvm38qxa0bk280962yh1bb54i04vs", + "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.14/cospend-1.5.14.tar.gz", + "version": "1.5.14", + "description": "# Nextcloud Cospend 💰\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share money with others.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be accessed and modified by people without a Nextcloud account. Each project has an ID and a password for guest access.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently being developped!\n\n## Features\n\n* ✎ create/edit/delete projects, members, bills, bill categories, currencies\n* ⚖ check member balances\n* 🗠 display project statistics\n* ♻ display settlement plan\n* 🎇 automatically create reimbursement bills from settlement plan\n* 🗓 create recurring bills (daily/weekly/monthly/yearly)\n* 📊 optionally provide custom amount for each member in new bills\n* 🔗 link bills with personal files (picture of physical bill for example)\n* 👩 guest access for people outside Nextcloud\n* 👫 share projects with Nextcloud users/groups/circles\n* 🖫 import/export projects as csv (compatible with csv files from IHateMoney)\n* 🔗 generate link/QRCode to easily import projects in MoneyBuster\n* 🗲 implement Nextcloud notifications and activity stream\n\nThis app is tested on Nextcloud 20+ with Firefox 57+ and Chromium.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/eneiluj/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/eneiluj/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* it does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ](https://liberapay.com/eneiluj/donate)", + "homepage": "https://github.com/julien-nc/cospend-nc", + "licenses": [ + "agpl" + ] + }, + "deck": { + "sha256": "08yxwrf5dx8fh70hcpr54ca5h6f2p2ck2hmjnxz5jymd6pnadsr6", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.12.1/deck-v1.12.1.tar.gz", + "version": "1.12.1", + "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", + "homepage": "https://github.com/nextcloud/deck", + "licenses": [ + "agpl" + ] + }, + "end_to_end_encryption": { + "sha256": "1ih44vrgm3fsm4xk3sz9b5rxf54dva01cfy18gw4lpgn60c63isq", + "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.14.1/end_to_end_encryption-v1.14.1.tar.gz", + "version": "1.14.1", + "description": "Provides the necessary endpoint to enable end-to-end encryption.\n\n**Notice:** E2EE is currently not compatible to be used together with server-side encryption", + "homepage": "https://github.com/nextcloud/end_to_end_encryption", + "licenses": [ + "agpl" + ] + }, + "forms": { + "sha256": "1ffga26v01d14rh4mjwyjqp7slh7h7d07vs3yldb8csi826ynji4", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.0.0/forms-v4.0.0.tar.gz", + "version": "4.0.0", + "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", + "homepage": "https://github.com/nextcloud/forms", + "licenses": [ + "agpl" + ] + }, + "gpoddersync": { + "sha256": "1lm8lqvs1mvb3i2a8b5j9g7b26f747jfp696b9ima0hgpw8ycbfs", + "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.8.3/gpoddersync.tar.gz", + "version": "3.8.3", + "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod", + "homepage": "https://github.com/thrillfall/nextcloud-gpodder", + "licenses": [ + "agpl" + ] + }, + "groupfolders": { + "sha256": "17v57z7fsbp2m3918x78zrm3ywnbm7vsrcb48x44v5pakdhca3gy", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.3/groupfolders-v16.0.3.tar.gz", + "version": "16.0.3", + "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": [ + "agpl" + ] + }, + "impersonate": { + "sha256": "0l1wmsiycwnn5py1mdc87paqlciclndrk72yf0ff7k11vidgb7mp", + "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.15.0/impersonate-v1.15.0.tar.gz", + "version": "1.15.0", + "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud.\n2. Open users administration interface.\n3. Select the impersonate button on the affected user.\n4. Confirm the impersonation.\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.\n- You can limit which users/groups can use impersonation in Administration settings > Additional settings.", + "homepage": "https://github.com/nextcloud/impersonate", + "licenses": [ + "agpl" + ] + }, + "keeweb": { + "sha256": "1mi0cghf8f3sjn77gppf0mn46b8a5jkg7fkm91dd2firygaj1g7b", + "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.15/keeweb-0.6.15.tar.gz", + "version": "0.6.15", + "description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your\n Nextcloud.", + "homepage": "https://github.com/jhass/nextcloud-keeweb", + "licenses": [ + "agpl" + ] + }, + "mail": { + "sha256": "0brhaqw1sdh3fj5vdj4h8rkgg92ghwy0gyz51n120rppd8fhsch6", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.4/mail-v3.5.4.tar.gz", + "version": "3.5.4", + "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", + "homepage": "https://github.com/nextcloud/mail#readme", + "licenses": [ + "agpl" + ] + }, + "maps": { + "sha256": "0rs5cqn2saip7fmj71ww879iqsmmigf0fi6fdbqmdxmrmvsnl9l6", + "url": "https://github.com/nextcloud/maps/releases/download/v1.3.1/maps-1.3.1.tar.gz", + "version": "1.3.1", + "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", + "licenses": [ + "agpl" + ] + }, + "memories": { + "sha256": "1j3296d3arkr9344zzv6ynhg842ym36a1bp1r3y6m8wp552m5gay", + "url": "https://github.com/pulsejet/memories/releases/download/v6.2.2/memories.tar.gz", + "version": "6.2.2", + "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", + "homepage": "https://memories.gallery", + "licenses": [ + "agpl" + ] + }, + "notes": { + "sha256": "02893azzq507frb3x7h13ypx09yn9rx740hgfw7q1a2il2ixww5f", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.2/notes.tar.gz", + "version": "4.9.2", + "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", + "homepage": "https://github.com/nextcloud/notes", + "licenses": [ + "agpl" + ] + }, + "notify_push": { + "sha256": "1h2qa5j31jq2wzpsj69h8knm4jzg9i72p77l92l855n98r4iiws8", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.7/notify_push-v0.6.7.tar.gz", + "version": "0.6.7", + "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", + "homepage": "", + "licenses": [ + "agpl" + ] + }, + "onlyoffice": { + "sha256": "14vqyr7yq95kiwkb2q25qa5kxfx0mri12bbyy2fpm94kk2y2km37", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.0.0/onlyoffice.tar.gz", + "version": "9.0.0", + "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", + "homepage": "https://www.onlyoffice.com", + "licenses": [ + "agpl" + ] + }, + "phonetrack": { + "sha256": "1xvdmb2wlcldv8lk4jb8akhi80w26m2jpazfcz641frjm333kxch", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.7.7/phonetrack-0.7.7.tar.gz", + "version": "0.7.7", + "description": "# PhoneTrack Nextcloud application\n\n📱 PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\n🗺 It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n* Create a tracking session.\n* Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n* Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name. Setting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n* 📍 Display location history\n* ⛛ Filter points\n* ✎ Manually edit/add/delete points\n* ✎ Edit devices (rename, change colour/shape, move to another session)\n* ⛶ Define geofencing zones for devices\n* ⚇ Define proximity alerts for device pairs\n* 🖧 Share a session to other Nextcloud users or with a public link (read-only)\n* 🔗 Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n* 🖫 Import/export a session in GPX format (one file with one track per device or one file per device)\n* 🗠 Display sessions statistics\n* 🔒 [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n* 🗓 Toggle session auto export and auto purge (daily/weekly/monthly)\n* ◔ Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n* PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ](https://liberapay.com/eneiluj/donate)", + "homepage": "https://github.com/julien-nc/phonetrack-oc", + "licenses": [ + "agpl" + ] + }, + "polls": { + "sha256": "1jsxgnn6vvbn1v0x8k2zf95pdqlrg6pxrvn32sms8sfzgq3lbn7m", + "url": "https://github.com/nextcloud/polls/releases/download/v6.0.1/polls.tar.gz", + "version": "6.0.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": [ + "agpl" + ] + }, + "previewgenerator": { + "sha256": "08f0ivxqa2b54w2q4lycb3p5ngqyk92n2qll54pmpj54pfn1sj3m", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.4.0/previewgenerator-v5.4.0.tar.gz", + "version": "5.4.0", + "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", + "homepage": "https://github.com/nextcloud/previewgenerator", + "licenses": [ + "agpl" + ] + }, + "qownnotesapi": { + "sha256": "1pyr4b3w6gsy83ci6cy0wfv870qm2v957nl4w6xk989iyknk4ana", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.12.0/qownnotesapi-nc.tar.gz", + "version": "23.12.0", + "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", + "homepage": "https://github.com/pbek/qownnotesapi", + "licenses": [ + "agpl" + ] + }, + "registration": { + "sha256": "1bcvc1vmvgr21slx2bk5idagkvvkcglkjbrs3ki5y7w3ls0my4al", + "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.3.0/registration-v2.3.0.tar.gz", + "version": "2.3.0", + "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", + "homepage": "https://github.com/nextcloud/registration", + "licenses": [ + "agpl" + ] + }, + "spreed": { + "sha256": "0wppkdb5rq2128jr62i700jc8v1p0j8fq61wfmxkx3pf0x67nri9", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.1/spreed-v18.0.1.tar.gz", + "version": "18.0.1", + "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", + "homepage": "https://github.com/nextcloud/spreed", + "licenses": [ + "agpl" + ] + }, + "tasks": { + "sha256": "0a1wpb9f08iqxl9vjp0slxwzn0w67ilpk21dsi0nhpm28ns2mhyc", + "url": "https://github.com/nextcloud/tasks/releases/download/v0.15.0/tasks.tar.gz", + "version": "0.15.0", + "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.", + "homepage": "https://github.com/nextcloud/tasks/", + "licenses": [ + "agpl" + ] + }, + "twofactor_nextcloud_notification": { + "sha256": "0gaqgzbryim580dxarak7p4g3wd8wp3w6lw9jhl84jh46wrsbrj8", + "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.8.0/twofactor_nextcloud_notification-v3.8.0.tar.gz", + "version": "3.8.0", + "description": "Allows using any of your logged in devices as second factor", + "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification", + "licenses": [ + "agpl" + ] + }, + "twofactor_webauthn": { + "sha256": "1p4ng7nprlcgw7sdfd7wqx5az86a856f1v470lahg2nfbx3fg296", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.2/twofactor_webauthn-v1.3.2.tar.gz", + "version": "1.3.2", + "description": "A two-factor provider for WebAuthn devices", + "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", + "licenses": [ + "agpl" + ] + }, + "user_oidc": { + "sha256": "0a9hkp69xpw5nzb533nfh56zs7rf2cvhi4yc6d1yjqv9jdak7vi4", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v1.3.5/user_oidc-v1.3.5.tar.gz", + "version": "1.3.5", + "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", + "homepage": "https://github.com/nextcloud/user_oidc", + "licenses": [ + "agpl" + ] + }, + "user_saml": { + "sha256": "130zp1c3bf0whgsx2jc3yi21qi74phwv4sdlv8bn4s5bfp4pf8yg", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.1.0/user_saml-v6.1.0.tar.gz", + "version": "6.1.0", + "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", + "homepage": "https://github.com/nextcloud/user_saml", + "licenses": [ + "agpl" + ] + } +} diff --git a/pkgs/servers/nextcloud/packages/README.md b/pkgs/servers/nextcloud/packages/README.md index 452dc4c62ae22..469b80ef694dc 100644 --- a/pkgs/servers/nextcloud/packages/README.md +++ b/pkgs/servers/nextcloud/packages/README.md @@ -30,11 +30,9 @@ services.nextcloud = { package = pkgs.nextcloud25; hostName = "localhost"; config.adminpassFile = "${pkgs.writeText "adminpass" "hunter2"}"; - extraApps = with pkgs.nextcloud25Packages.apps; [ - mail - calendar - contacts - ]; + extraApps = with pkgs.nextcloud25Packages.apps; { + inherit mail calendar contact; + }; extraAppsEnable = true; }; ``` diff --git a/pkgs/servers/nextcloud/packages/generate.sh b/pkgs/servers/nextcloud/packages/generate.sh index 48960ab24decd..b97673a54eeed 100755 --- a/pkgs/servers/nextcloud/packages/generate.sh +++ b/pkgs/servers/nextcloud/packages/generate.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../.. -i bash -p nc4nix +#! nix-shell -I nixpkgs=../../../.. -i bash -p nc4nix jq set -e set -u diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index 8b6f49c524c5c..559ebd981824a 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -5,9 +5,11 @@ , "cookbook": "agpl3Plus" , "cospend": "agpl3Plus" , "deck": "agpl3Plus" +, "end_to_end_encryption": "agpl3Plus" , "files_texteditor": "agpl3Plus" , "files_markdown": "agpl3Plus" , "forms": "agpl3Plus" +, "gpoddersync": "agpl3Only" , "groupfolders": "agpl3Plus" , "impersonate": "agpl3Plus" , "keeweb": "agpl3Plus" @@ -19,6 +21,7 @@ , "notes": "agpl3Plus" , "notify_push": "agpl3Plus" , "onlyoffice": "asl20" +, "phonetrack": "agpl3Plus" , "polls": "agpl3Plus" , "previewgenerator": "agpl3Plus" , "qownnotesapi": "agpl3Plus" @@ -29,5 +32,6 @@ , "twofactor_totp": "agpl3Plus" , "twofactor_webauthn": "agpl3Plus" , "unsplash": "agpl3Only" +, "user_oidc": "agpl3Plus" , "user_saml": "agpl3Plus" } diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index 7c46ba3461430..5f32437970c92 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.markuskowa ]; platforms = platforms.linux; license = licenses.lgpl3Plus; + mainProgram = "ganesha.nfsd"; }; } diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index b6b9b4e5922b6..6628eb48c1478 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nginx-sso"; - version = "0.27.2"; + version = "0.27.3"; src = fetchFromGitHub { owner = "Luzifer"; repo = "nginx-sso"; rev = "v${version}"; - hash = "sha256-Lpaqcxw1q609rYuEd1zrAKXE0GDEi72wl2eoFezvrV8="; + hash = "sha256-8ZfNHjf5sbcBasu3o3AHCL0tGROixdNZkDF9yd/uPbs="; }; - vendorHash = "sha256-XReXxugMfR2l2LMTvXpSJa7Z9BX7LytwYdYNijPtciE="; + vendorHash = "sha256-bquK6/xT+xhEGBDeNN3U1qwSxrHWQhdHNuw9RXoqM+8="; postInstall = '' mkdir -p $out/share diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix deleted file mode 100644 index 6610f26263c2e..0000000000000 --- a/pkgs/servers/nitter/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib -, buildNimPackage -, fetchFromGitHub -, nimPackages -, nixosTests -, substituteAll -, unstableGitUpdater -, flatty -, jester -, jsony -, karax -, markdown -, nimcrypto -, openssl -, packedjson -, redis -, redpool -, sass -, supersnappy -, zippy -}: - -buildNimPackage rec { - pname = "nitter"; - version = "unstable-2023-10-31"; - - src = fetchFromGitHub { - owner = "zedeus"; - repo = "nitter"; - rev = "b62d73dbd373f08af07c7a79efcd790d3bc1a49c"; - hash = "sha256-yCD7FbqWZMY0fyFf9Q3Ka06nw5Ha7jYLpmPONAhEVIM="; - }; - - patches = [ - (substituteAll { - src = ./nitter-version.patch; - inherit version; - inherit (src) rev; - url = builtins.replaceStrings [ "archive" ".tar.gz" ] [ "commit" "" ] src.url; - }) - ]; - - buildInputs = [ - flatty - jester - jsony - karax - markdown - nimcrypto - openssl - packedjson - redis - redpool - sass - supersnappy - zippy - ]; - - nimBinOnly = true; - - nimFlags = [ "--mm:refc" ]; - - postBuild = '' - nim c --hint[Processing]:off -r tools/gencss - nim c --hint[Processing]:off -r tools/rendermd - ''; - - postInstall = '' - mkdir -p $out/share/nitter - cp -r public $out/share/nitter/public - ''; - - passthru = { - tests = { inherit (nixosTests) nitter; }; - updateScript = unstableGitUpdater {}; - }; - - meta = with lib; { - homepage = "https://github.com/zedeus/nitter"; - description = "Alternative Twitter front-end"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ erdnaxe infinidoge ]; - mainProgram = "nitter"; - }; -} diff --git a/pkgs/servers/nitter/nitter-version.patch b/pkgs/servers/nitter/nitter-version.patch deleted file mode 100644 index 94c78ad2d2949..0000000000000 --- a/pkgs/servers/nitter/nitter-version.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/views/about.nim b/src/views/about.nim -index e7e8de9..54a6050 100644 ---- a/src/views/about.nim -+++ b/src/views/about.nim -@@ -3,10 +3,8 @@ import os, strformat - import karax/[karaxdsl, vdom] - - const -- date = staticExec("git show -s --format=\"%cd\" --date=format:\"%Y.%m.%d\"") -- hash = staticExec("git show -s --format=\"%h\"") -- link = "https://github.com/zedeus/nitter/commit/" & hash -- version = &"{date}-{hash}" -+ link = "@url@" -+ version = "@version@-@rev@" - - var aboutHtml: string - diff --git a/pkgs/servers/nitter/update.sh b/pkgs/servers/nitter/update.sh deleted file mode 100755 index 30405f34b22e8..0000000000000 --- a/pkgs/servers/nitter/update.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq nix nix-update patchutils -set -euo pipefail - -info() { - if [ -t 2 ]; then - set -- '\033[32m%s\033[39m\n' "$@" - else - set -- '%s\n' "$@" - fi - printf "$@" >&2 -} - -nitter_old_rev=$(nix-instantiate --eval --strict --json -A nitter.src.rev . | jq -r .) -nix-update --version=branch --commit nitter -nitter_new_rev=$(nix-instantiate --eval --strict --json -A nitter.src.rev . | jq -r .) -if [ "$nitter_new_rev" = "$nitter_old_rev" ]; then - info "nitter is up-to-date." - exit -fi - -if curl -Sfs "https://github.com/zedeus/nitter/compare/$nitter_old_rev...$nitter_new_rev.patch" \ -| lsdiff | grep -Fxe 'a/nitter.nimble' -e 'b/nitter.nimble' > /dev/null; then - info "nitter.nimble changed, some dependencies probably need updating." -fi diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/servers/nominatim/default.nix index 8c0410b87ac39..db126863fe04b 100644 --- a/pkgs/servers/nominatim/default.nix +++ b/pkgs/servers/nominatim/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { jinja2 pyicu datrie + pyosmium ])) # python3Packages.pylint # We don't want to run pylint because the package could break on pylint bumps which is really annoying. # python3Packages.pytest # disabled since I can't get it to run tests anyway @@ -63,5 +64,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.mausch ]; + mainProgram = "nominatim"; }; } diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index ba46d7f01289d..29a984ad4fde6 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -1,18 +1,18 @@ { lib -, buildGo121Module +, buildGoModule , fetchFromGitHub , nixosTests }: -buildGo121Module rec { +buildGoModule rec { pname = "ferretdb"; - version = "1.14.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-x5In8cBRki3rHaAB+iSglL19UCD8DtITr5gjb8KKuAw="; + hash = "sha256-NNfX0WY3AynH5CtvBMaPcurom7r7suxKwn+kVnlxM/A="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGo121Module rec { echo nixpkgs > build/version/package.txt ''; - vendorHash = "sha256-0DFNDfJmBFpgzarg9FaGb8GV11LhA1N8oq0kSXIWxi8="; + vendorHash = "sha256-4AUTKZ4eJZkaSKq5norUDeGhIRygLSIuXxhs3z3uGxs="; CGO_ENABLED = 0; diff --git a/pkgs/servers/nosql/immudb/default.nix b/pkgs/servers/nosql/immudb/default.nix index 716f9f0a9f743..74571dfff5f14 100644 --- a/pkgs/servers/nosql/immudb/default.nix +++ b/pkgs/servers/nosql/immudb/default.nix @@ -14,13 +14,13 @@ let in buildGoModule rec { pname = "immudb"; - version = "1.5.0"; + version = "1.9DOM.2"; src = fetchFromGitHub { owner = "codenotary"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xvbks6dUiS14cntydAjSNTujxsSwYzmf+B4Zh4V/NwI="; + sha256 = "sha256-bNMJZWXelHQatW9rhqf3eYs61nJJEBwMXZhUZWQv6S0="; }; preBuild = '' @@ -29,7 +29,7 @@ buildGoModule rec { go generate -tags webconsole ./webconsole ''; - vendorHash = "sha256-7mMutYx2/jmTx+7h9S412fYCFXiJnTGz0qwDSO7BIzM="; + vendorHash = "sha256-6DHmJrE+xkf8K38a8h1VSD33W6qj594Q5bJJXnfSW0Q="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 180f226845788..11579a7ad51e6 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub, stdenv, pkg-config, rustPlatform, libiconv, fetchpatch, nixosTests }: let - libflux_version = "0.170.1"; + libflux_version = "0.188.0"; # This is copied from influxdb2 with flux version matching the needed by thi flux = rustPlatform.buildRustPackage rec { @@ -11,20 +11,21 @@ let owner = "influxdata"; repo = "flux"; rev = "v${libflux_version}"; - sha256 = "sha256-P3SpleOVbL+nGWdscwjj9yWqRdck/9JsAwuJtGOO7N8="; + hash = "sha256-4Z6Vfdyh0zimQlE47plSIjTWBYiju0Qu09M+MgMQOL4="; }; patches = [ - # https://github.com/influxdata/flux/pull/5273 - # fix compile error with Rust 1.64 + # https://github.com/influxdata/flux/pull/5440 + # fix compile error with Rust 1.72.0 (fetchpatch { - url = "https://github.com/influxdata/flux/commit/20ca62138a0669f2760dd469ca41fc333e04b8f2.patch"; + url = "https://github.com/influxdata/flux/commit/8d1d6c8b485eb7e15b6a5f57762d1f766b17defd.patch"; stripLen = 2; extraPrefix = ""; - sha256 = "sha256-Fb4CuH9ZvrPha249dmLLI8MqSNQRKqKPxPbw2pjqwfY="; + hash = "sha256-BDBmGKsC2RWMyObDm7dPwFq/3cVIdBKF8ZVaCL+uftw="; + includes = [ "flux/src/lib.rs" ]; }) ]; sourceRoot = "${src.name}/libflux"; - cargoSha256 = "sha256-kYiZ5ZRiFHRf1RQeeUGjIhnEkTvhNSZ0t4tidpRIDyk="; + cargoHash = "sha256-925U9weBOvMuyApsTOjtQxik3nqT2UpK+DPM64opc7c="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; pkgcfg = '' @@ -47,16 +48,16 @@ let in buildGoModule rec { pname = "influxdb"; - version = "1.10.0"; + version = "1.10.5"; src = fetchFromGitHub { owner = "influxdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BMHR9EdYC+8oA0he7emzBRmNnHn15nO/5NqsLcr+R0k="; + hash = "sha256-FvKGNqy27q6/X2DI/joJXfGVrax6hQcNcx5nJDeSLm0="; }; - vendorHash = "sha256-AY04cmfg7vbrWR4+LBuCFYqBgQJBXlPpO+2oj0qqjM4="; + vendorHash = "sha256-1jeZBVmNOxF5NPlTKg+YRw6VqIIZDcT3snnoMLX3y4g="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/nosql/influxdb2/cli.nix b/pkgs/servers/nosql/influxdb2/cli.nix index dc7395a7eb7ff..10a3278c101b0 100644 --- a/pkgs/servers/nosql/influxdb2/cli.nix +++ b/pkgs/servers/nosql/influxdb2/cli.nix @@ -1,5 +1,4 @@ { buildGoModule -, buildGoPackage , fetchFromGitHub , lib }: diff --git a/pkgs/servers/nosql/janusgraph/default.nix b/pkgs/servers/nosql/janusgraph/default.nix index 36385fd46cca4..0c16f90db60da 100644 --- a/pkgs/servers/nosql/janusgraph/default.nix +++ b/pkgs/servers/nosql/janusgraph/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "janusgraph"; - version = "0.6.4"; + version = "1.0.0"; src = fetchzip { url = "https://github.com/JanusGraph/janusgraph/releases/download/v${version}/janusgraph-${version}.zip"; - sha256 = "sha256-rfqZE7HYgudVjrz+Ij+ggltaBXvYbczgRwCqsNTojTg="; + sha256 = "sha256-X/ZHvmCJzo0X/sUpbm1CkQcnNi3NMNAaVXep6cpoIAA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/mongodb/4.4.nix b/pkgs/servers/nosql/mongodb/4.4.nix index 001b473ff5d69..25298d55bdd27 100644 --- a/pkgs/servers/nosql/mongodb/4.4.nix +++ b/pkgs/servers/nosql/mongodb/4.4.nix @@ -6,8 +6,8 @@ let }; in buildMongoDB { - version = "4.4.25"; - sha256 = "sha256-oE5bs9M0E43e+8tmZaRkA/GtbKG5uZ+3Pf0sJiddTJk="; + version = "4.4.27"; + sha256 = "sha256-HcTI/0igzCR5g8Wai5zKEuK3BjFrpRP/9GwZh5wqmtc="; patches = [ ./forget-build-dependencies-4-4.patch ./fix-build-with-boost-1.79-4_4.patch diff --git a/pkgs/servers/nosql/mongodb/5.0.nix b/pkgs/servers/nosql/mongodb/5.0.nix index 05fed1ac92043..7d6985f21054e 100644 --- a/pkgs/servers/nosql/mongodb/5.0.nix +++ b/pkgs/servers/nosql/mongodb/5.0.nix @@ -6,8 +6,8 @@ let }; variants = if stdenv.isLinux then { - version = "5.0.22"; - sha256 = "sha256-NIsx6nwXGsuk+ff+LOCwOMpT/HAaNn89t4jtJvKprIA="; + version = "5.0.23"; + sha256 = "sha256-URIOBsR64ppZP4DiDg3hXnOGEUwRXhA1P5ZuecsT2mE="; patches = [ ./fix-build-with-boost-1.79-5_0-linux.patch ]; } else lib.optionalAttrs stdenv.isDarwin diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index 8d7d6fbe78f64..2a3ecb07bec41 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -6,8 +6,8 @@ let }; in buildMongoDB { - version = "6.0.11"; - sha256 = "sha256-hIbbCDQ0Sqnm6ohtEpbdGWk18nLIlr6T0T9UL6WAFA8="; + version = "6.0.12"; + sha256 = "sha256-5orVFio+4HIzhs63KJdZ1RHOPoOMa9Uk/8bygRs1JoY="; patches = [ (fetchpatch { name = "mongodb-6.1.0-rc-more-specific-cache-alignment-types.patch"; diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index df7efb33b68ee..f76236fc8be4a 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -9,6 +9,8 @@ , zlib , yaml-cpp , sasl +, net-snmp +, openldap , openssl , libpcap , python3 @@ -95,6 +97,8 @@ in stdenv.mkDerivation rec { libpcap yaml-cpp openssl + net-snmp + openldap pcre-cpp variants.python sasl diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index d989d125b2fb2..688d2867a8fdc 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "7.3.3"; + version = "7.3.7"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-THQGgvSxij1xpAsOj3oCYYDfhoe/ji3jZ6PMT+5UThc="; + hash = "sha256-RvEYnPllmK7ZFJ5l4cmnVrRYr/EFpu5wSqsGzR2Y2K4="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index c3ac0ebbf969b..923de9126b5f0 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, lua, jemalloc, pkg-config, nixosTests +{ lib, stdenv, fetchurl, fetchpatch, lua, jemalloc, pkg-config, nixosTests , tcl, which, ps, getconf , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd # dependency ordering is broken at the moment when building with openssl @@ -12,14 +12,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "redis"; - version = "7.2.3"; + version = "7.2.4"; src = fetchurl { url = "https://download.redis.io/releases/redis-${finalAttrs.version}.tar.gz"; - hash = "sha256-PisZbW603bnnQwiL/CkVzLtC1A9aij7djLaccW7DS+c="; + hash = "sha256-jRBMJqFUsp/WfWVotPN1ISISrUHgwsqj1mSA5429O1k="; }; - patches = lib.optionals useSystemJemalloc [ + patches = [ + # fixes: make test [exception]: Executing test client: permission denied + # https://github.com/redis/redis/issues/12792 + (fetchpatch { + url = "https://github.com/redis/redis/pull/12887.diff"; + hash = "sha256-VZEMShW7Ckn5hLJHffQvE94Uly41WZW1bwvxny+Y3W8="; + }) + ] ++ lib.optionals useSystemJemalloc [ # use system jemalloc (fetchurl { url = "https://gitlab.archlinux.org/archlinux/packaging/packages/redis/-/raw/102cc861713c796756abd541bf341a4512eb06e6/redis-5.0-use-system-jemalloc.patch"; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 8c83e794f30f0..4050ed5a89bd6 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "rethinkdb"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { url = "https://download.rethinkdb.com/repository/raw/dist/${pname}-${version}.tgz"; - hash = "sha256-w3iMeicPu0nj2kV4e2vlAHY8GQ+wWeObfe+UVPmkZ08="; + hash = "sha256-UJEjdgK2KDDbLLParKarNGMjI3QeZxDC8N5NhPRCcR8="; }; postPatch = '' diff --git a/pkgs/servers/nosql/surrealdb/default.nix b/pkgs/servers/nosql/surrealdb/default.nix index 22903725a5edc..d32ad52145654 100644 --- a/pkgs/servers/nosql/surrealdb/default.nix +++ b/pkgs/servers/nosql/surrealdb/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; rev = "v${version}"; - hash = "sha256-rBqg8tMcdc9VavYQDiKQwNp2IxYvpDNB/Qb74uiMmO4="; + hash = "sha256-3xH0trwTs2Cr07/PtA4K808PUwaT6WmrIr2+11L7t6A="; }; - cargoHash = "sha256-qbKc9/n4bOvdP2iXg6IF3jAwxx6Wj17Uxlj3F/gx+1g="; + cargoHash = "sha256-dNn2HMZ7c/q/EhfMUHqWV79+3gMA9URqEozdEixkV/0="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' @@ -43,6 +43,11 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + checkFlags = [ + # flaky + "--skip=ws_integration::none::merge" + ]; + passthru.tests.version = testers.testVersion { package = surrealdb; command = "surreal version"; diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 25517c0b437b8..fe0d637e74524 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.93.7"; + version = "1.96.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-MGIFM7PhKTeu7hnE9M2fj4EsJQv5AIDhFbypEJjYNwc="; + hash = "sha256-/YS0IDUdGIT3QuRbD+5c3VOqrzYvbcZefLSd+tYJ6dY="; }; vendorHash = null; diff --git a/pkgs/servers/nostr-rs-relay/default.nix b/pkgs/servers/nostr-rs-relay/default.nix index 80707431a0a70..f52e8ff16e238 100644 --- a/pkgs/servers/nostr-rs-relay/default.nix +++ b/pkgs/servers/nostr-rs-relay/default.nix @@ -11,15 +11,15 @@ rustPlatform.buildRustPackage rec { pname = "nostr-rs-relay"; - version = "0.8.12"; + version = "0.8.13"; src = fetchFromGitHub { owner = "scsibug"; repo = "nostr-rs-relay"; rev = version; - hash = "sha256-3/hd3w06bILcgd7gmmpzky4Sj3exHX5xn3XGrueGDbE="; + hash = "sha256-YgYi387b1qlGpjupqgGuLx8muHJ1iMx1sH82UW3TsQg="; }; - cargoHash = "sha256-ulCUJ59LSYxzSbMBZcv2/7wDTwTGGGXoHPAZO4rudDE="; + cargoHash = "sha256-CwyX8VlzH/y5LZtaMDd/4yWGCZLczc9bW4AqUzQFFKU="; buildInputs = [ openssl.dev ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index 870664854172d..5aa02e03c425e 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nsq"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "nsqio"; repo = "nsq"; rev = "v${version}"; - hash = "sha256-yOfhDf0jidAYvkgIIJy6Piu6GKGzph/Er/obYB2XWCo="; + hash = "sha256-qoAp8yAc4lJmlnHHcZskRzkleZ3Q5Gu3Lhk9u1jMR4g="; }; - vendorHash = "sha256-SkNxb90uet/DAApGjj+jpFnjdPiw4oxqxpEpqL9JXYc="; + vendorHash = "sha256-/5nH7zHg8zxWFgtVzSnfp7RZGvPWiuGSEyhx9fE2Pvo="; excludedPackages = [ "bench" ]; diff --git a/pkgs/servers/nzbhydra2/default.nix b/pkgs/servers/nzbhydra2/default.nix index fa6234a34eba1..7c70857585cc1 100644 --- a/pkgs/servers/nzbhydra2/default.nix +++ b/pkgs/servers/nzbhydra2/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [jamiemagee]; platforms = with platforms; linux; + mainProgram = "nzbhydra2"; }; } diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix index b9e457006c6cd..152b3a31d85e5 100644 --- a/pkgs/servers/oauth2-proxy/default.nix +++ b/pkgs/servers/oauth2-proxy/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/oauth2-proxy/oauth2-proxy/"; license = licenses.mit; maintainers = teams.serokell.members; + mainProgram = "oauth2-proxy"; }; } diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index d1a74eb4d136d..2fb76c1fc947f 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -53,5 +53,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ woky ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + mainProgram = "Ombi"; }; } diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/servers/onlyoffice-documentserver/default.nix index ea5a35eeb78ff..bc5a41750f55b 100644 --- a/pkgs/servers/onlyoffice-documentserver/default.nix +++ b/pkgs/servers/onlyoffice-documentserver/default.nix @@ -15,11 +15,11 @@ let # var/www/onlyoffice/documentserver/server/DocService/docservice onlyoffice-documentserver = stdenv.mkDerivation rec { pname = "onlyoffice-documentserver"; - version = "7.5.0"; + version = "7.5.1"; src = fetchurl { url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}/onlyoffice-documentserver_amd64.deb"; - sha256 = "sha256-0rtxKSVIyCzYnhRneLOEu1e1qtAO6dGBAUr/oKq95Hw="; + sha256 = "sha256-191PYpxs/TbVXoBPHvuyTp81ZMtw1YaFznY1hUSbh+0="; }; preferLocalBuild = true; diff --git a/pkgs/servers/osmocom/libosmocore/default.nix b/pkgs/servers/osmocom/libosmocore/default.nix index 68904cc43d3fb..acc72975617ff 100644 --- a/pkgs/servers/osmocom/libosmocore/default.nix +++ b/pkgs/servers/osmocom/libosmocore/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libosmocore"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - hash = "sha256-rFV2Sf45nq0L+65vt9a9Qz6xRoL5jReQ03ASQAD3DDg="; + hash = "sha256-rbdn7MiB0tluHgdQz1XpcQsN5FU8eGhmetzXzFAiCLg="; }; postPatch = '' diff --git a/pkgs/servers/owncast/default.nix b/pkgs/servers/owncast/default.nix index e5c0a8fbaf2bb..25cd615750eeb 100644 --- a/pkgs/servers/owncast/default.nix +++ b/pkgs/servers/owncast/default.nix @@ -9,7 +9,7 @@ }: let - version = "0.1.1"; + version = "0.1.2"; in buildGoModule { pname = "owncast"; inherit version; @@ -17,9 +17,9 @@ in buildGoModule { owner = "owncast"; repo = "owncast"; rev = "v${version}"; - hash = "sha256-nBTuvVVnFlC75p8bRCN+lNl9fExBZrsLEesvXWwNlAQ="; + hash = "sha256-pPBY2PcXe3k9G6kjj/vF5VB6DEmiwKDUrK4VGR4xNzU="; }; - vendorHash = "sha256-yjy5bDJjWk7UotBVqvVFiGx8mpfhpqMTxoQm/eWHcw4="; + vendorHash = "sha256-7HxiZh5X5AZVMiZT6B8DfOy6stJ3+dFEixwJYv5X0dY="; propagatedBuildInputs = [ ffmpeg ]; @@ -36,7 +36,7 @@ in buildGoModule { runHook postCheck ''; - passthru.tests.owncast = nixosTests.testOwncast; + passthru.tests.owncast = nixosTests.owncast; meta = with lib; { description = "self-hosted video live streaming solution"; @@ -44,6 +44,7 @@ in buildGoModule { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ MayNiklas ]; + mainProgram = "owncast"; }; } diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index e11167000dfc0..879f65454816c 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "oxigraph"; - version = "0.3.20"; + version = "0.3.22"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-gV7Yo14oGFzuO1b/JGXeuqn4k+9aNTwngEJHoD9+NMI="; + sha256 = "sha256-zwUiUDWdrmLF+Qj9Jy6JGXHaBskRnm+pMKW2GKGGeN8="; fetchSubmodules = true; }; - cargoHash = "sha256-bXf7PZm2l1hwnFVbfEJWLyRaVY3cZFaDSe8b77JtyaU="; + cargoHash = "sha256-O9/YvvFOaZ1F7HYO/AplWLz1vw0hysJEvGketk8zb9w="; nativeBuildInputs = [ rustPlatform.bindgenHook @@ -36,5 +36,6 @@ rustPlatform.buildRustPackage rec { platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; maintainers = with maintainers; [ astro ]; license = with licenses; [ asl20 mit ]; + mainProgram = "oxigraph_server"; }; } diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix index b6ba368d90d48..094194d59a03e 100644 --- a/pkgs/servers/p910nd/default.nix +++ b/pkgs/servers/p910nd/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + mainProgram = "p910nd"; }; } diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index d4c20cf2dd7b0..bc8dbde498454 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -6,7 +6,7 @@ , fetchYarnDeps , nixosTests , brotli -, fixup_yarn_lock +, prefetch-yarn-deps , jq , nodejs , which @@ -69,14 +69,14 @@ stdenv.mkDerivation rec { hash = "sha256-Ejzk/VEx7YtJpsrkHcXAZnJ+yRx1VhBJGpqquHYULNU="; }; - nativeBuildInputs = [ brotli fixup_yarn_lock jq nodejs which yarn ]; + nativeBuildInputs = [ brotli prefetch-yarn-deps jq nodejs which yarn ]; buildPhase = '' # Build node modules export HOME=$PWD - fixup_yarn_lock ~/yarn.lock - fixup_yarn_lock ~/server/tools/yarn.lock - fixup_yarn_lock ~/client/yarn.lock + fixup-yarn-lock ~/yarn.lock + fixup-yarn-lock ~/server/tools/yarn.lock + fixup-yarn-lock ~/client/yarn.lock yarn config --offline set yarn-offline-mirror $yarnOfflineCacheServer yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress cd ~/server/tools diff --git a/pkgs/servers/persistent-evdev/default.nix b/pkgs/servers/persistent-evdev/default.nix index 97f0ea01219ce..83518b904a509 100644 --- a/pkgs/servers/persistent-evdev/default.nix +++ b/pkgs/servers/persistent-evdev/default.nix @@ -39,5 +39,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = [ maintainers.lodi ]; platforms = platforms.linux; + mainProgram = "persistent-evdev.py"; }; } diff --git a/pkgs/servers/photofield/default.nix b/pkgs/servers/photofield/default.nix index 7ac5282fb9787..ffb647c03be53 100644 --- a/pkgs/servers/photofield/default.nix +++ b/pkgs/servers/photofield/default.nix @@ -5,17 +5,19 @@ , makeWrapper , exiftool , ffmpeg +, testers +, photofield }: let pname = "photofield-ui"; - version = "0.11.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "SmilyOrg"; repo = "photofield"; - rev = "v${version}"; - hash = "sha256-AqOhagqH0wRKjwcRHFVw0izC0DBv9uY3B5MMDBJoFVE="; + rev = "refs/tags/v${version}"; + hash = "sha256-6pJvOn3sN6zfjt2dVZ/xH6pSXM0WgbG7au9tSVUGYys="; }; webui = buildNpmPackage { @@ -24,7 +26,7 @@ let sourceRoot = "${src.name}/ui"; - npmDepsHash = "sha256-YVyaZsFh5bolDzMd5rXWrbbXQZBeEIV6Fh/kwN+rvPk="; + npmDepsHash = "sha256-trKcNuhRdiabFKMafOLtPg8x1bQHLOif6Hm4k5bTAYc="; installPhase = '' mkdir -p $out/share @@ -37,7 +39,7 @@ buildGoModule rec { pname = "photofield"; inherit version src; - vendorHash = "sha256-0rrBHkKZfStwzIv5Us/8Db6z3ZSqassCMWQMpScZq7Y="; + vendorHash = "sha256-4JFP3vs/Z8iSKgcwfxpdnQpO9kTF68XQArFHYP8IoDQ="; preBuild = '' cp -r ${webui}/share/photofield-ui ui/dist @@ -50,7 +52,7 @@ buildGoModule rec { "-X main.builtBy=Nix" ]; - tags = [ "embedstatic" ]; + tags = [ "embedui" ]; doCheck = false; # tries to modify filesytem @@ -61,10 +63,16 @@ buildGoModule rec { --prefix PATH : "${lib.makeBinPath [exiftool ffmpeg]}" ''; + passthru.tests.version = testers.testVersion { + package = photofield; + command = "photofield -version"; + }; + meta = with lib; { description = "Experimental fast photo viewer"; homepage = "https://github.com/SmilyOrg/photofield"; license = licenses.mit; + mainProgram = "photofield"; maintainers = with maintainers; [ dit7ya ]; }; } diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/servers/photoprism/default.nix index 0a2c2d3a4ffcd..8ad37a8aa387a 100644 --- a/pkgs/servers/photoprism/default.nix +++ b/pkgs/servers/photoprism/default.nix @@ -83,5 +83,6 @@ stdenv.mkDerivation { inherit (libtensorflow.meta) platforms; license = licenses.agpl3Only; maintainers = with maintainers; [ benesim ]; + mainProgram = "photoprism"; }; } diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 302dbe62b0c68..fac861d56b02a 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -18,12 +18,13 @@ with python3.pkgs; buildPythonApplication rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'sqlalchemy = "^1.4"' 'sqlalchemy = "*"' - ''; + pythonRelaxDeps = [ + "docutils" + "sqlalchemy" + ]; propagatedBuildInputs = [ click @@ -50,6 +51,7 @@ with python3.pkgs; buildPythonApplication rec { homepage = "https://supakeen.com/project/pinnwand/"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; + mainProgram = "pinnwand"; }; } diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index fc5d0b4ce7c28..485c27e12da88 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -7,14 +7,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-VFyFQ3c4EEbQAj3bUgjWbmpCyugcpfz0phgBz0ZUB/Q="; + sha256 = "sha256-VIGlJ5+99l+VSUl7c9jiQf94X/JV0+HFgI8xQ4ZLQ9s="; }; patches = [ diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 93cd01950d6b4..0f3055277efd2 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.32.7.7621-871adbd44"; + version = "1.32.8.7639-fb6452ebf"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0894hwbl05rsv80p3k0wjs1hv5jwn2zakv758kzx1dvqcmjzhy2w"; + sha256 = "sha256-v9Fb5dlgIWqXfL9a4GkbGDEzYueyHs8P8R6TSyXDLrc="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0r2i4y00pcd6hkrypzmgd03w4vj2hchhicgdy3zdwjmfk3aqs4jf"; + sha256 = "sha256-jdGVAdvm7kjxTP3CQ5w6dKZbfCRwSy9TrtxRHaV0/cs="; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/plik/programs.nix b/pkgs/servers/plik/programs.nix index 1ad89b1fb9b9c..1ab4342f6c31e 100644 --- a/pkgs/servers/plik/programs.nix +++ b/pkgs/servers/plik/programs.nix @@ -17,6 +17,7 @@ let description = "Scalable & friendly temporary file upload system"; maintainers = with maintainers; [ freezeboy ]; license = licenses.mit; + mainProgram = "plik"; }; postPatch = '' diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index fb70c7747e410..f8db6e2522094 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -1,20 +1,21 @@ { lib , buildGoModule , fetchFromGitHub +, nix-update-script }: buildGoModule rec { pname = "pocketbase"; - version = "0.19.2"; + version = "0.20.7"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-5VvjEFiZ7jnjqdagWeP2xrwDKtU9S6rQmsaupDFiK+c="; + hash = "sha256-ySdgq9U4pgXMSsP8fTbVop7Dwm3vUhTWwysndhNaBUU="; }; - vendorHash = "sha256-RGpB8f/1+eWZIAqb4OFUFlxhYRRm1WOh2edHp8KuGF4="; + vendorHash = "sha256-72Q9/lLs57y+OPMV/ITcLLxW79YzHjSFThK4txZ1qZo="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; @@ -32,10 +33,13 @@ buildGoModule rec { mv $out/bin/base $out/bin/pocketbase ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Open Source realtime backend in 1 file"; homepage = "https://github.com/pocketbase/pocketbase"; license = licenses.mit; maintainers = with maintainers; [ dit7ya thilobillerbeck ]; + mainProgram = "pocketbase"; }; } diff --git a/pkgs/servers/polaris/default.nix b/pkgs/servers/polaris/default.nix index fc3141d464473..68a767bb03aba 100644 --- a/pkgs/servers/polaris/default.nix +++ b/pkgs/servers/polaris/default.nix @@ -76,5 +76,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ pbsds ]; platforms = platforms.unix; + mainProgram = "polaris"; }; } diff --git a/pkgs/servers/polaris/web.nix b/pkgs/servers/polaris/web.nix index 19d35103281db..1834c01a0547b 100644 --- a/pkgs/servers/polaris/web.nix +++ b/pkgs/servers/polaris/web.nix @@ -5,13 +5,13 @@ buildNpmPackage rec { pname = "polaris-web"; - version = "68"; + version = "69"; src = fetchFromGitHub { owner = "agersant"; repo = "polaris-web"; rev = "build-${version}"; - hash = "sha256-YvVNTqv/DQzRyMuDgDdtCyoQbt4EqVztGa0NO92pO/Q="; + hash = "sha256-/UmAOunc/79DpZByUrzqNA7q7JNugEceKRZvyTGhtVQ="; }; npmDepsHash = "sha256-c11CWJB76gX+Bxmqac3VxWjJxQVzYCaaf+pmQQpnOds="; diff --git a/pkgs/servers/portunus/default.nix b/pkgs/servers/portunus/default.nix index b2cd17f016d25..6bd70ae5519f5 100644 --- a/pkgs/servers/portunus/default.nix +++ b/pkgs/servers/portunus/default.nix @@ -1,25 +1,23 @@ { lib , buildGoModule , fetchFromGitHub +, libxcrypt-legacy # TODO: switch to libxcrypt for NixOS 24.11 (cf. same note on nixos/modules/services/misc/portunus.nix) }: buildGoModule rec { pname = "portunus"; - version = "1.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "majewsky"; repo = "portunus"; rev = "v${version}"; - sha256 = "sha256-+sq5Wja0tVkPZ0Z++K2A6my9LfLJ4twxtoEAS6LHqzE="; + sha256 = "sha256-+pMMIutj+OWKZmOYH5NuA4a7aS5CD+33vAEC9bJmyfM="; }; - vendorHash = null; + buildInputs = [ libxcrypt-legacy ]; - postInstall = '' - mv $out/bin/{,portunus-}orchestrator - mv $out/bin/{,portunus-}server - ''; + vendorHash = null; meta = with lib; { description = "Self-contained user/group management and authentication service"; diff --git a/pkgs/servers/pr-tracker/default.nix b/pkgs/servers/pr-tracker/default.nix index 2f99d6f562329..750ac015c061e 100644 --- a/pkgs/servers/pr-tracker/default.nix +++ b/pkgs/servers/pr-tracker/default.nix @@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://git.qyliss.net/pr-tracker"; license = licenses.agpl3Plus; maintainers = with maintainers; [ qyliss sumnerevans ]; + mainProgram = "pr-tracker"; }; } diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 9e43e30559dbe..a2fca49db2d3a 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -21,15 +21,15 @@ let }.${stdenv.hostPlatform.system} or unsupported; hash = { - aarch64-darwin = "sha256-5K18Vd0Ly/2YSmAvTbgiSQR8ifaz9wMs3vI0WFtB90g="; - aarch64-linux = "sha256-QI4+TVW/Zj1sI4yoxTGpzYNPufKnp68fLgDmajzD+6Y="; - x86_64-darwin = "sha256-qofWOMJIen8dI1wDFwNWeYuV9Ett3KvaTLfuK/v2USs="; - x86_64-linux = "sha256-qqAoXPdsjpn6Al5CLcvqfsZe9PRp8Swg1Wiy0w20hHs="; + aarch64-darwin = "sha256-l2HS1/HoKYf93qKxfMU80J3QOXjMRtX2A9hJm8E2Kh4="; + aarch64-linux = "sha256-ab5xavO2TVL1j9vqNv97bgAmQLZQJxnbam08DzdgDVE="; + x86_64-darwin = "sha256-nXas2i2eq7qdTFV0S+F5sPuqzSwE4qeJ+ms4fcJgZmQ="; + x86_64-linux = "sha256-HltmiQSJSwoW5+iEiXlJiCWwKRmuxDBcPbvOkJwLQXA="; }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.9.4.4039"; + version = "1.10.5.4116"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/psitransfer/default.nix b/pkgs/servers/psitransfer/default.nix index 2bb4f03eb3335..e39ae107217e6 100644 --- a/pkgs/servers/psitransfer/default.nix +++ b/pkgs/servers/psitransfer/default.nix @@ -45,5 +45,6 @@ in buildNpmPackage { description = "Simple open source self-hosted file sharing solution"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ hyshka ]; + mainProgram = "psitransfer"; }; } diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix index 3761453f446bf..843ca539daf81 100644 --- a/pkgs/servers/pulseaudio/qpaeq.nix +++ b/pkgs/servers/pulseaudio/qpaeq.nix @@ -48,7 +48,7 @@ mkDerivation rec { description = "An equalizer interface for pulseaudio's equalizer sinks"; homepage = "http://www.pulseaudio.org/"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ lovek323 mkg20001 ]; + maintainers = with lib.maintainers; [ lovek323 ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index c86c97157c794..ed916f656421c 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -10,15 +10,15 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-SwlEbkhTjlnECK3Z3MYzHOQQvU1byipPM7whPQaJiDk="; - arm64-linux_hash = "sha256-gFlB/GaEXJIFXLG2zf/r6iqa8Uw98bjeAezc5UCXUz4="; - x64-osx_hash = "sha256-2ypOaHGsK4KEZAZzVEZuMRxcn16hINMQDyw92eSKy7g="; - arm64-osx_hash = "sha256-1tO7XYy0AoGOAgO+HkBb6Z2BIsBGDZ59rIy93CT7Fxg="; + x64-linux_hash = "sha256-RXvpKTIXDOcPUyRa07+8N4xkav23t8aWAshhPEK5pCI="; + arm64-linux_hash = "sha256-zAwlyW6uU+3/XQk2HxA/ClvF/EozxMnlH/6C2cx99bU="; + x64-osx_hash = "sha256-j7cvUyDMxf+9ry9pMSO+xfjBgoqeOhda3pnzHA2RDw4="; + arm64-osx_hash = "sha256-v8SuAWlyBT7bIFRkQDJ5E2y7uxckfdW5cCG/nJ+27cg="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "5.1.3.8246"; + version = "5.2.6.8376"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index e0a66d136db49..c7dacb2ced509 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-XWKslumO6o0kn9JMFTTuDTDALX6r4rzEyFFj2w13cYc="; - arm64-linux_hash = "sha256-rsgyTgSW1w/zrXbOvwbJ8KTRK6HheKpACoR3Tjw5z+k="; - x64-osx_hash = "sha256-tJkYWvJfxF2zMl1TEG5qhoV2qKya0bzIitNVIaeRLSI="; + x64-linux_hash = "sha256-i5ZlLHTV44hia3Vkm8Ht0vEN5XWjd9KJ4xOVNxrNxVE="; + arm64-linux_hash = "sha256-sX2Dn5/PfWdxh2qPDm2UbkqBIVpk+mb5CfuBwdPwloU="; + x64-osx_hash = "sha256-pBw0MnzxQ+dmRKARKB/Flr4ILS37Y2TVgIkRkjZyITo="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.10.2287"; + version = "0.3.14.2358"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index c8f2d80618407..4a93a46c6a854 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.2.14"; + version = "23.3.4"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-VvbyVAcNPe1UOEfX+HSY4OaOBS78YZuFgpIYo2s1kXo="; + sha256 = "sha256-Bcr+bMqurwpd7IFTBR73RcgekkiuQQ3JPjvrp03fpJ0="; }; server = callPackage ./server.nix { inherit src version; }; in @@ -21,7 +21,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-mLMMw48d1FOvIIjDNza0rZSWP55lP1AItR/hT3lYXDg="; + vendorHash = "sha256-nXAjtRhiLmzgb6OVerX2liCinstsnxeBBpxSAQoLrjg="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' @@ -48,5 +48,6 @@ buildGoModule rec { license = licenses.bsl11; maintainers = with maintainers; [ avakhrenev happysalada ]; platforms = platforms.all; + mainProgram = "rpk"; }; } diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/servers/reproxy/default.nix index 6192a492f2b8d..21077aa83d1c1 100644 --- a/pkgs/servers/reproxy/default.nix +++ b/pkgs/servers/reproxy/default.nix @@ -40,5 +40,6 @@ buildGoModule rec { homepage = "https://reproxy.io/"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; + mainProgram = "reproxy"; }; } diff --git a/pkgs/servers/resgate/default.nix b/pkgs/servers/resgate/default.nix index 1650dcd81955a..92b55c7c03dac 100644 --- a/pkgs/servers/resgate/default.nix +++ b/pkgs/servers/resgate/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://resgate.io"; license = licenses.mit; maintainers = with maintainers; [ farcaller ]; + mainProgram = "resgate"; }; } diff --git a/pkgs/servers/rinetd/default.nix b/pkgs/servers/rinetd/default.nix index 07611bba54a58..23f1e89a780fe 100644 --- a/pkgs/servers/rinetd/default.nix +++ b/pkgs/servers/rinetd/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/samhocevar/rinetd/blob/${src.rev}/CHANGES.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ janik ]; + mainProgram = "rinetd"; }; } diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 18a1e91ea4d6b..e1ad55a41d38d 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -139,5 +139,6 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ offline RaghavSood ]; license = licenses.isc; platforms = platforms.linux; + mainProgram = "rippled"; }; } diff --git a/pkgs/servers/rmfakecloud/default.nix b/pkgs/servers/rmfakecloud/default.nix index ada0ba0f03cfc..d2872e7e3732b 100644 --- a/pkgs/servers/rmfakecloud/default.nix +++ b/pkgs/servers/rmfakecloud/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rmfakecloud"; - version = "0.0.13.2"; + version = "0.0.17"; src = fetchFromGitHub { owner = "ddvk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7lVNbqQv6MNIhHMFbH8VFVIjKiuTCbeVkAKeGprzrkw="; + sha256 = "sha256-Rb81CbtC1V8AugTNIGx07CvK20sZ5d4hfc4OxF259IQ="; }; - vendorHash = "sha256-Pz/TtGjwGHaDSueBEHMtHjyAxYO5V+8jzXCowHcUW/4="; + vendorHash = "sha256-Rr2EVrQOdlOqSlTpXFMfnKNmdw6UiT7LZH0xBUwqkJc="; ui = callPackage ./webui.nix { inherit version src; }; @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://ddvk.github.io/rmfakecloud/"; license = licenses.agpl3Only; maintainers = with maintainers; [ pacien martinetd ]; + mainProgram = "rmfakecloud"; }; } diff --git a/pkgs/servers/rmfakecloud/webui.nix b/pkgs/servers/rmfakecloud/webui.nix index f870dc013b5a3..407afdb85ddd5 100644 --- a/pkgs/servers/rmfakecloud/webui.nix +++ b/pkgs/servers/rmfakecloud/webui.nix @@ -1,4 +1,4 @@ -{ version, src, stdenv, lib, fetchFromGitHub, fetchYarnDeps, fixup_yarn_lock, yarn, nodejs }: +{ version, src, stdenv, lib, fetchYarnDeps, prefetch-yarn-deps, yarn, nodejs }: stdenv.mkDerivation rec { inherit version src; @@ -7,15 +7,15 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/ui/yarn.lock"; - sha256 = "sha256-37P+acjaeG7TCyLoIHIHsB+DCUOsQOJ1H9T5SgajtLc="; + sha256 = "sha256-4boZCEly4HovK9BXlSoFd3wZoPaGnzbJg5AygSC/Lrg="; }; - nativeBuildInputs = [ fixup_yarn_lock yarn nodejs ]; + nativeBuildInputs = [ prefetch-yarn-deps yarn nodejs ]; buildPhase = '' export HOME=$(mktemp -d) cd ui - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress patchShebangs node_modules diff --git a/pkgs/servers/roadrunner/default.nix b/pkgs/servers/roadrunner/default.nix index 25f34346285e9..bf4d9abc280d5 100644 --- a/pkgs/servers/roadrunner/default.nix +++ b/pkgs/servers/roadrunner/default.nix @@ -6,12 +6,12 @@ buildGoModule rec { pname = "roadrunner"; - version = "2023.3.4"; + version = "2023.3.9"; src = fetchFromGitHub { repo = "roadrunner"; owner = "roadrunner-server"; rev = "v${version}"; - hash = "sha256-khG0T88TR7hg9OO7E9eCGTB3q3c5r94nANSZ1J6vCj0="; + hash = "sha256-nDtlOVbdCmo8U9w4glCeKjkk5s/IuxrpCaLxZ8TN4j4="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ buildGoModule rec { --replace "127.0.0.1:0" "127.0.0.1:55554" ''; - vendorHash = "sha256-UP+a47EALxFTxMl9yxinF4QiifQXAgAZ6ZOt9ebhlDc="; + vendorHash = "sha256-0O1gTRyV0YFuddFN1tEDBAUlegXF8vwBp6Y4dodE3XE="; meta = { changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/servers/roon-bridge/default.nix index 865dbd63f7afa..7a4b582ea687e 100644 --- a/pkgs/servers/roon-bridge/default.nix +++ b/pkgs/servers/roon-bridge/default.nix @@ -78,5 +78,6 @@ stdenv.mkDerivation { license = licenses.unfree; maintainers = with maintainers; [ lovesegfault ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; + mainProgram = "RoonBridge"; }; } diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index d46be38781de2..767eb9e3631d8 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -95,5 +95,6 @@ stdenv.mkDerivation { license = licenses.unfree; maintainers = with maintainers; [ lovesegfault steell ]; platforms = [ "x86_64-linux" ]; + mainProgram = "RoonServer"; }; } diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index a7e71c722fb5c..8e037e13497ac 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.4"; + version = "1.6.6"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-peq8fggo4CYYea7JCp1KbcAgPpiOFN4vk9bAYeZIkcg="; + sha256 = "sha256-wbk6Ptvil0VzlrCgMdixPIpdwwyTcHBN+5ssEiUBfVI="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 3ab45831389b6..1fdf6d8fdba23 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-gInJS7JpvEbmOuZecB4xjff2d7TnjcVV+8mPOmy5Oyo="; + hash = "sha256-ia9N2jZlFW0Gu5YDfwh023zorMyWWL/KggeBRvCD1W4="; }; - cargoHash = "sha256-c5SQysjO821pfGhnyB4aGOZuwrHaN502PfkA1gBPtY4="; + cargoHash = "sha256-RHT6+zrY4SjoC/hgoMRal+cG8Ruip/6v7oVtKvR8doU="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/NLnetLabs/routinator/blob/v${version}/Changelog.md"; license = licenses.bsd3; maintainers = with maintainers; [ _0x4A6F ]; + mainProgram = "routinator"; }; } diff --git a/pkgs/servers/rpiplay/default.nix b/pkgs/servers/rpiplay/default.nix index 5bcb9267f4841..cc9369f9ea29d 100644 --- a/pkgs/servers/rpiplay/default.nix +++ b/pkgs/servers/rpiplay/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = platforms.unix; + mainProgram = "rpiplay"; }; } diff --git a/pkgs/servers/rtrtr/default.nix b/pkgs/servers/rtrtr/default.nix index 228985f1cab56..fe6ce6f3a5b44 100644 --- a/pkgs/servers/rtrtr/default.nix +++ b/pkgs/servers/rtrtr/default.nix @@ -38,5 +38,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/NLnetLabs/rtrtr/blob/v${version}/Changelog.md"; license = licenses.bsd3; maintainers = with maintainers; [ steamwalker ]; + mainProgram = "rtrtr"; }; } diff --git a/pkgs/servers/rustdesk-server/Cargo.lock b/pkgs/servers/rustdesk-server/Cargo.lock index 1734fbf44cbf7..f8d7c9ae27f93 100644 --- a/pkgs/servers/rustdesk-server/Cargo.lock +++ b/pkgs/servers/rustdesk-server/Cargo.lock @@ -779,7 +779,7 @@ dependencies = [ [[package]] name = "hbbs" -version = "1.1.8" +version = "1.1.9" dependencies = [ "async-speed-limit", "async-trait", diff --git a/pkgs/servers/rustdesk-server/default.nix b/pkgs/servers/rustdesk-server/default.nix index 20f3b525e5461..684017fdaef0d 100644 --- a/pkgs/servers/rustdesk-server/default.nix +++ b/pkgs/servers/rustdesk-server/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "rustdesk-server"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk-server"; rev = version; - hash = "sha256-KzIylbPe+YN513UNFuisvDAIe4kICGYDUrfURDOw/no="; + hash = "sha256-bC1eraMSa9Lz5icvU7dPnEIeqE5TaW8HseBQMRmDCXQ="; }; cargoLock = { diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index 0dc72f74bb2da..e00d59648e030 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/pkgs/servers/rustypaste/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.14.1"; + version = "0.14.4"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9qP0/PGXRbQzSIsxUoGzbtc2KNg6SKrqGYcg/K6SuKo="; + sha256 = "sha256-7CZi76IQR6CIf3EnoysaTrVf2kIDP9sOBXL4kqFFHtY="; }; - cargoHash = "sha256-76s3cWAKS6aeIG1ctHU6uCMWHDKsMcf5HWhUWzEuAkI="; + cargoHash = "sha256-fAj/z21do0GV41MIn5hifEZyZPgrb288TRz55BFsdz8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/orhun/rustypaste/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda seqizz ]; + mainProgram = "rustypaste"; }; } diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 07c2ebe13b49b..5601ae2f7d0f7 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -2,7 +2,7 @@ , coreutils , fetchFromGitHub , python3 -, par2cmdline +, par2cmdline-turbo , unzip , unrar , p7zip @@ -43,18 +43,18 @@ let sgmllib3k six tempora - zc_lockfile + zc-lockfile ]); - path = lib.makeBinPath [ coreutils par2cmdline unrar unzip p7zip util-linux ]; + path = lib.makeBinPath [ coreutils par2cmdline-turbo unrar unzip p7zip util-linux ]; in stdenv.mkDerivation rec { - version = "4.1.0"; + version = "4.2.1"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-FN2BKvO9ToTvGdYqgv0wMSPgshMrVybDs9wsBo8MkII="; + sha256 = "sha256-M9DvwizNeCXkV07dkgiComdjoceUACCuccZb+y9RMdw="; }; nativeBuildInputs = [ makeWrapper ]; @@ -83,5 +83,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with lib.maintainers; [ fridh jojosch adamcstephens ]; + mainProgram = "sabnzbd"; }; } diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 4dfa8657224d3..fda0649de2204 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -27,6 +27,7 @@ , tdb , tevent , libxcrypt +, libxcrypt-legacy , cmocka , rpcsvc-proto , bash @@ -49,13 +50,22 @@ with lib; +let + # samba-tool requires libxcrypt-legacy algorithms + python = python3Packages.python.override { + libxcrypt = libxcrypt-legacy; + }; + wrapPython = python3Packages.wrapPython.override { + inherit python; + }; +in stdenv.mkDerivation rec { pname = "samba"; - version = "4.19.2"; + version = "4.19.4"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - hash = "sha256-nmPwUF4cYx8dsLepNJpR6SXAJsoDrz/V2BIii7WX05M="; + hash = "sha256-QCbZO4ZtsZjIyhaFsPXVJ5P2XG5jyzZBY69mH9/wlow="; }; outputs = [ "out" "dev" "man" ]; @@ -93,8 +103,8 @@ stdenv.mkDerivation rec { buildInputs = [ bash - python3Packages.wrapPython - python3Packages.python + wrapPython + python readline popt dbus @@ -165,7 +175,7 @@ stdenv.mkDerivation rec { # module, which works correctly in all cases. PYTHON_CONFIG = "/invalid"; - pythonPath = [ python3Packages.dnspython tdb ]; + pythonPath = [ python3Packages.dnspython python3Packages.markdown tdb ]; preBuild = '' export MAKEFLAGS="-j $NIX_BUILD_CORES" @@ -208,7 +218,7 @@ stdenv.mkDerivation rec { # Samba does its own shebang patching, but uses build Python find $out/bin -type f -executable | while read file; do isScript "$file" || continue - sed -i 's^${lib.getBin buildPackages.python3Packages.python}/bin^${lib.getBin python3Packages.python}/bin^' "$file" + sed -i 's^${lib.getBin buildPackages.python3Packages.python}^${lib.getBin python}^' "$file" done ''; diff --git a/pkgs/servers/scaphandre/default.nix b/pkgs/servers/scaphandre/default.nix index 21b72c031be2c..07aee5a715b31 100644 --- a/pkgs/servers/scaphandre/default.nix +++ b/pkgs/servers/scaphandre/default.nix @@ -66,5 +66,6 @@ rustPlatform.buildRustPackage rec { license = licenses.asl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ gaelreyrol ]; + mainProgram = "scaphandre"; }; } diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 9efa621e5b4bb..f439b0ae43046 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -18,10 +18,10 @@ let plat = elemAt info 1; hashes = { - x86_64-linux = "sha512-eiAT5Dx/w56GoxpzPMdMWH7yu6DAE/lc6HT5i0iKT48Ob7JUoe7dXAsOIQrtmgGV9zWPqWU8iQ4jRBP/kxkIBw=="; - x86_64-darwin = "sha512-5vSefA9Z4mCz49Q+Vzdck1KXbE9REYAF46kSf0G1n5XlHqFYzTGOmUEObZhGTqH4RDLJBdEqhLj2iyzjWQX5RA=="; - aarch64-linux = "sha512-8nkPSbecOBJGu/h0MZGUUq+Tqk/YqmvJwfkDHn7V2cZJ9bq4Z8KKfRYC4ihdP0pfePgJrAV0SwKtZ9aGELtnfQ=="; - aarch64-darwin = "sha512-dbZrYGULuC3FF/SllPpAgW077Lkr87NJ8+gyTMayl8i8rOvAjnZhiR/U7eA6CZ/qVsFQkpGATdAzRXF8NlZBcg=="; + x86_64-linux = "sha512-OiWGRxaCdRxXuxE/W04v87ytzOeUEcHRjF5nyRkdqSbZSnLXUyKOYQ4fKmk4til0VBOaKZYId20XyPiu/XTXNw=="; + x86_64-darwin = "sha512-V/vKYL96+M1lp7ZJlvuneRBePWZmucUANfUrFPMuq+fnUP4nN69RStLWcgwgt65EspFMBwKVyQbak4swV8rWxw=="; + aarch64-linux = "sha512-fNgVRaIIGx01reNHOnGKhMOG1aYU7gC8HLpIESSbM3+9xO1q9IHIaL/ObI/w2RYj/lD22d7PAdX5N6Hd1pVSAA=="; + aarch64-darwin = "sha512-DgexeyoxZ1YTPw9HjSUAM6eC8XtzIw7MY1WUVsIa8zl5j3RpCp25s3oI12BWefjYYCTjdtFDMsnoFSqZBabLig=="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index c23b5ad7a2bd2..58e74b746ee9c 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -38,7 +38,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.10" then "sha256-D08CVW/qHpZZaKnploM4aCJ4bunvPjVmieDYr1d6jQA=" + if version == "7.17.16" then "sha256-wgm6N5fofs5wTM25ZT3dJkg7iDesXsc3Up419IAY9gk=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -54,7 +54,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.10" then "sha256-cpgr2zPCpsLrmshWJWoGNcGl0X+bO/K4A9bMqLv8+H8=" + if version == "7.17.16" then "sha256-SShdBcWfm21XoVhghSSiWIhsoXzG7wz6162iOmuf5EU=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -87,7 +87,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.10" then "sha256-UmykO+hZDvlFhEbf7zL2bdw4j6NhByRBu9eH3F6/EtM=" + if version == "7.17.16" then "sha256-S/Cp9opeLitFh2/3Qw7/MFt6GcYKufxXKD6cJSi3SaQ=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -103,7 +103,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.10" then "sha256-Y/AbLfHSdocX0NQbnKm63gTWgwzssb4kpSwRqLozD9w=" + if version == "7.17.16" then "sha256-hMErTLd5fXg420Olz+j6Zv7WByA1aNq9FlEgCtkYIxY=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -119,7 +119,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; hash = - if version == "7.17.10" then "sha256-QIYD7cGpJQg+csv/tekN6GFtdnuhYU6VyAXk7nY/uWs=" + if version == "7.17.16" then "sha256-z0gfdx98urCzdQNlVn99CmteG6jweOmUDmGJW89twtU=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -135,7 +135,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; hash = - if version == "7.17.10" then "sha256-L8lS+EPYuhNNTnP3ImeZsBQ5a5DAncs3qBFDWGWISRI=" + if version == "7.17.16" then "sha256-TWMN8jzFjzBVTUB+zn4tJr47VMXHC8U+014BvnArK8M=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -151,7 +151,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; hash = - if version == "7.17.10" then "sha256-eXstbxlyS8WzW8u5YiMFXGpILCcEWrIb/IxXVzAGFLU=" + if version == "7.17.16" then "sha256-hG5wy1Xw4T1NzI7pja3CejwJg002/n6YqM1/QaVSWbg=" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -167,13 +167,13 @@ in pluginName = "search-guard"; version = # https://docs.search-guard.com/latest/search-guard-versions - if esVersion == "7.17.10" then "${esVersion}-53.7.0" + if esVersion == "7.17.16" then "${esVersion}-53.8.0" else throw "unsupported version ${esVersion} for plugin ${pluginName}"; src = - if esVersion == "7.17.10" then + if esVersion == "7.17.16" then fetchurl { url = "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip"; - hash = "sha256-FIF4O8z0U2giXVA2cNEdCDbpuJDJhaxHBOmv2fACucw="; + hash = "sha256-j8dz7rUKWqMvT6EksoFIuGJzYcgdMipKeg2d8UtzlDI="; } else throw "unsupported version ${version} for plugin ${pluginName}"; meta = with lib; { diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index fbf9f06cff72e..07f86a9ae8083 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,54 +1,66 @@ -{ lib, stdenv, fetchurl, autoreconfHook, mecab, kytea, libedit, pkg-config, libxcrypt -, suggestSupport ? false, zeromq, libevent, msgpack, openssl +{ lib, stdenv, cmake, fetchurl, kytea, msgpack-c, mecab, pkg-config, rapidjson, testers, xxHash, zstd, postgresqlPackages +, suggestSupport ? false, zeromq, libevent, openssl , lz4Support ? false, lz4 , zlibSupport ? true, zlib }: -stdenv.mkDerivation rec { - +stdenv.mkDerivation (finalAttrs: { pname = "groonga"; - version = "12.0.7"; + version = "13.1.1"; src = fetchurl { - url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-Eaei4Zi0Rg9zu7DInLAcaRo8Fyu2mqBblcYNRaS46c8="; + url = "https://packages.groonga.org/source/groonga/groonga-${finalAttrs.version}.tar.gz"; + hash = "sha256-eggMegWTpv+WIbzYq2GjSD66+Tj7zcvVUcbD2EkrFO8="; }; - preConfigure = '' - # To avoid problems due to libc++abi 11 using `#include <version>`. - rm version - ''; + patches = [ + ./fix-cmake-install-path.patch + ./do-not-use-vendored-libraries.patch + ]; - buildInputs = with lib; - [ mecab kytea libedit openssl libxcrypt ] - ++ optional lz4Support lz4 - ++ optional zlibSupport zlib - ++ optionals suggestSupport [ zeromq libevent msgpack ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ + rapidjson + xxHash + zstd + mecab + kytea + msgpack-c + ] ++ lib.optionals lz4Support [ + lz4 + ] ++ lib.optional zlibSupport [ + zlib + ] ++ lib.optionals suggestSupport [ + zeromq + libevent + ]; - configureFlags = with lib; - optional zlibSupport "--with-zlib" - ++ optional lz4Support "--with-lz4"; + env.NIX_CFLAGS_COMPILE = lib.optionalString zlibSupport "-I${zlib.dev}/include"; - env = lib.optionalAttrs stdenv.cc.isClang { - # Prevent warning about using a GNU extension from being promoted to an error. - NIX_CFLAGS_COMPILE = "-Wno-error=gnu-folding-constant"; + passthru.tests = { + inherit (postgresqlPackages) pgroonga; + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "groonga" ]; + }; }; - doInstallCheck = true; - installCheckPhase = "$out/bin/groonga --version"; - meta = with lib; { - homepage = "https://groonga.org/"; + homepage = "https://groonga.org/"; description = "An open-source fulltext search engine and column store"; - license = licenses.lgpl21; + license = licenses.lgpl21; maintainers = [ maintainers.ericsagnes ]; - platforms = platforms.unix; + platforms = platforms.all; longDescription = '' Groonga is an open-source fulltext search engine and column store. It lets you write high-performance applications that requires fulltext search. ''; }; - -} +}) diff --git a/pkgs/servers/search/groonga/do-not-use-vendored-libraries.patch b/pkgs/servers/search/groonga/do-not-use-vendored-libraries.patch new file mode 100644 index 0000000000000..8729031f14cbc --- /dev/null +++ b/pkgs/servers/search/groonga/do-not-use-vendored-libraries.patch @@ -0,0 +1,15 @@ +Do not use vendored libraries + +--- a/vendor/CMakeLists.txt ++++ b/vendor/CMakeLists.txt +@@ -14,10 +14,7 @@ + # License along with this library; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + add_subdirectory(onigmo) +-add_subdirectory(mruby) +-add_subdirectory(mecab) +-add_subdirectory(message_pack) + if(GRN_WITH_MRUBY) + add_subdirectory(groonga-log) + endif() diff --git a/pkgs/servers/search/groonga/fix-cmake-install-path.patch b/pkgs/servers/search/groonga/fix-cmake-install-path.patch new file mode 100644 index 0000000000000..5b00cd42404cf --- /dev/null +++ b/pkgs/servers/search/groonga/fix-cmake-install-path.patch @@ -0,0 +1,21 @@ +Fix CMake install path + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1141,11 +1141,11 @@ + + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix "\${prefix}") +-set(bindir "\${exec_prefix}/${CMAKE_INSTALL_BINDIR}") +-set(sbindir "\${exec_prefix}/${CMAKE_INSTALL_SBINDIR}") +-set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}") +-set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") +-set(datarootdir "\${prefix}/${CMAKE_INSTALL_DATAROOTDIR}") ++set(bindir "${CMAKE_INSTALL_FULL_BINDIR}") ++set(sbindir "${CMAKE_INSTALL_FULL_SBINDIR}") ++set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") ++set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") ++set(datarootdir "${CMAKE_INSTALL_FULL_DATAROOTDIR}") + set(datadir "\${datarootdir}") + set(expanded_pluginsdir "${GRN_PLUGINS_DIR}") + set(GRN_EXPANDED_DEFAULT_DOCUMENT_ROOT "${GRN_DEFAULT_DOCUMENT_ROOT}") diff --git a/pkgs/servers/search/khoj/default.nix b/pkgs/servers/search/khoj/default.nix index 058fe91ab7653..b09864492d7fc 100644 --- a/pkgs/servers/search/khoj/default.nix +++ b/pkgs/servers/search/khoj/default.nix @@ -2,74 +2,83 @@ , stdenv , fetchFromGitHub , python3 -, qt6 +, postgresql +, postgresqlTestHook }: python3.pkgs.buildPythonApplication rec { pname = "khoj"; - version = "0.3.0"; - format = "pyproject"; + version = "1.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "debanjum"; repo = "khoj"; rev = "refs/tags/${version}"; - hash = "sha256-9kKK0DXpLfPB2LMnYcC6BKgZaoRsNHBZVe4thI7b9tk="; + hash = "sha256-lvOeYTrvW5MfhuJ3lj9n9TRlvpRwVP2vFeaEeJdqIec="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "dateparser == 1.1.1" "dateparser" \ - --replace "defusedxml == 0.7.1" ""defusedxml"" \ - --replace "fastapi == 0.77.1" "fastapi" \ - --replace "jinja2 == 3.1.2" "jinja2" \ - --replace "openai == 0.20.0" "openai" \ - --replace "pillow == 9.3.0" "pillow" \ - --replace "pydantic == 1.9.1" "pydantic" \ - --replace "pyyaml == 6.0" "pyyaml" \ - --replace "pyqt6 == 6.3.1" "pyqt6" \ - --replace "rich >= 13.3.1" "rich" \ - --replace "schedule == 1.1.0" "schedule" \ - --replace "sentence-transformers == 2.2.2" "sentence-transformers" \ - --replace "torch == 1.13.1" "torch" \ - --replace "uvicorn == 0.17.6" "uvicorn" - ''; + env = { + DJANGO_SETTINGS_MODULE = "khoj.app.settings"; + postgresqlEnableTCP = 1; + }; nativeBuildInputs = with python3.pkgs; [ hatch-vcs hatchling - ] ++ (with qt6; [ - wrapQtAppsHook - ]); - - buildInputs = lib.optionals stdenv.isLinux [ - qt6.qtwayland - ] ++ lib.optionals stdenv.isDarwin [ - qt6.qtbase ]; propagatedBuildInputs = with python3.pkgs; [ + aiohttp + anyio + authlib + beautifulsoup4 dateparser defusedxml + django fastapi + google-auth + # gpt4all + gunicorn + httpx + itsdangerous jinja2 - numpy + langchain + lxml openai + openai-whisper + pgvector pillow + psycopg2 pydantic - pyqt6 + pymupdf + python-multipart pyyaml + # rapidocr-onnxruntime + requests rich schedule sentence-transformers + stripe + tenacity + tiktoken torch + transformers + tzdata uvicorn ]; nativeCheckInputs = with python3.pkgs; [ + freezegun + factory-boy + pytest-xdist + trio + psutil + pytest-django pytestCheckHook + ] ++ [ + (postgresql.withPackages (p: with p; [ pgvector ])) + postgresqlTestHook ]; preCheck = '' @@ -82,32 +91,51 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # Tests require network access - "test_search_with_valid_content_type" - "test_update_with_valid_content_type" - "test_regenerate_with_valid_content_type" - "test_image_search" - "test_notes_search" - "test_notes_search_with_only_filters" - "test_notes_search_with_include_filter" - "test_notes_search_with_exclude_filter" + "test_different_user_data_not_accessed" + "test_get_api_config_types" + "test_get_configured_types_via_api" "test_image_metadata" "test_image_search" - "test_image_search_query_truncated" "test_image_search_by_filepath" - "test_asymmetric_setup_with_missing_file_raises_error" - "test_asymmetric_setup_with_empty_file_raises_error" - "test_asymmetric_reload" - "test_asymmetric_setup" - "test_asymmetric_search" - "test_entry_chunking_by_max_tokens" - "test_incremental_update" + "test_image_search_query_truncated" + "test_index_update" + "test_index_update_with_no_auth_key" + "test_notes_search" + "test_notes_search_with_exclude_filter" + "test_notes_search_with_include_filter" + "test_parse_html_plaintext_file" + "test_regenerate_index_with_new_entry" + "test_regenerate_with_github_fails_without_pat" + "test_regenerate_with_invalid_content_type" + "test_regenerate_with_valid_content_type" + "test_search_for_user2_returns_empty" + "test_search_with_invalid_auth_key" + "test_search_with_invalid_content_type" + "test_search_with_no_auth_key" + "test_search_with_valid_content_type" + "test_text_index_same_if_content_unchanged" + "test_text_indexer_deletes_embedding_before_regenerate" + "test_text_search" + "test_text_search_setup_batch_processes" + "test_update_with_invalid_content_type" + "test_user_no_data_returns_empty" + + # Tests require rapidocr-onnxruntime + "test_multi_page_pdf_to_jsonl" + "test_single_page_pdf_to_jsonl" + "test_ocr_page_pdf_to_jsonl" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/test_conversation_utils.py" ]; meta = with lib; { description = "Natural Language Search Assistant for your Org-Mode and Markdown notes, Beancount transactions and Photos"; homepage = "https://github.com/debanjum/khoj"; changelog = "https://github.com/debanjum/khoj/releases/tag/${version}"; - license = licenses.gpl3Only; + license = licenses.agpl3Plus; maintainers = with maintainers; [ dit7ya ]; # src/tcmalloc.cc:333] Attempt to free invalid pointer broken = stdenv.isDarwin; diff --git a/pkgs/servers/search/manticoresearch/default.nix b/pkgs/servers/search/manticoresearch/default.nix deleted file mode 100644 index d7fe93a214b13..0000000000000 --- a/pkgs/servers/search/manticoresearch/default.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, bison -, cmake -, flex -, pkg-config -, boost -, icu -, libstemmer -, mariadb-connector-c -, re2 -, nlohmann_json -, testers -, manticoresearch -}: - -let - columnar = stdenv.mkDerivation (finalAttrs: { - pname = "columnar"; - version = "c21-s10"; # see NEED_COLUMNAR_API/NEED_SECONDARY_API in Manticore's cmake/GetColumnar.cmake - src = fetchFromGitHub { - owner = "manticoresoftware"; - repo = "columnar"; - rev = finalAttrs.version; - hash = "sha256-TGFGFfoyHnPSr2U/9dpqFLUN3Dt2jDQrTF/xxDY4pdE="; - }; - nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DAPI_ONLY=ON" ]; - meta = { - description = "A column-oriented storage and secondary indexing library"; - homepage = "https://github.com/manticoresoftware/columnar/"; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - }; - }); - uni-algo = stdenv.mkDerivation (finalAttrs: { - pname = "uni-algo"; - version = "0.7.2"; - src = fetchFromGitHub { - owner = "manticoresoftware"; - repo = "uni-algo"; - rev = "v${finalAttrs.version}"; - hash = "sha256-+V9w4UJ+3KsyZUYht6OEzms60mBHd8FewVc7f21Z9ww="; - }; - nativeBuildInputs = [ cmake ]; - meta = { - description = "Unicode Algorithms Implementation for C/C++"; - homepage = "https://github.com/manticoresoftware/uni-algo"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - }; - }); -in -stdenv.mkDerivation (finalAttrs: { - pname = "manticoresearch"; - version = "6.2.0"; - - src = fetchFromGitHub { - owner = "manticoresoftware"; - repo = "manticoresearch"; - rev = finalAttrs.version; - hash = "sha256-KmBIQa5C71Y/1oa3XiPfmb941QDU2rWo7Bl5QlAo+yA="; - }; - - nativeBuildInputs = [ - bison - cmake - flex - pkg-config - ]; - - buildInputs = [ - boost - columnar - icu.dev - libstemmer - mariadb-connector-c - nlohmann_json - uni-algo - re2 - ]; - - postPatch = '' - sed -i 's/set ( Boost_USE_STATIC_LIBS ON )/set ( Boost_USE_STATIC_LIBS OFF )/' src/CMakeLists.txt - - # supply our own packages rather than letting manticore download dependencies during build - sed -i 's/^with_get/with_menu/' CMakeLists.txt - sed -i 's/get_dep \( nlohmann_json .* \)/find_package(nlohmann_json)/' CMakeLists.txt - sed -i 's/get_dep \( uni-algo .* \)/find_package(uni-algo)/' CMakeLists.txt - ''; - - cmakeFlags = [ - "-DWITH_GALERA=0" - "-DWITH_MYSQL=1" - "-DMYSQL_INCLUDE_DIR=${mariadb-connector-c.dev}/include/mariadb" - "-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a" - ]; - - passthru.tests.version = testers.testVersion { - inherit (finalAttrs) version; - package = manticoresearch; - command = "searchd --version"; - }; - - meta = { - description = "Easy to use open source fast database for search"; - homepage = "https://manticoresearch.com"; - changelog = "https://github.com/manticoresoftware/manticoresearch/releases/tag/${finalAttrs.version}"; - license = lib.licenses.gpl2; - mainProgram = "searchd"; - maintainers = [ lib.maintainers.jdelStrother ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock index 23cc7c2904050..72701288f8b3c 100644 --- a/pkgs/servers/search/meilisearch/Cargo.lock +++ b/pkgs/servers/search/meilisearch/Cargo.lock @@ -46,7 +46,7 @@ dependencies = [ "actix-tls", "actix-utils", "ahash 0.8.3", - "base64 0.21.2", + "base64 0.21.5", "bitflags 1.3.2", "brotli", "bytes", @@ -56,7 +56,7 @@ dependencies = [ "flate2", "futures-core", "h2", - "http", + "http 0.2.9", "httparse", "httpdate", "itoa", @@ -71,17 +71,16 @@ dependencies = [ "tokio", "tokio-util", "tracing", - "zstd 0.12.3+zstd.1.5.2", ] [[package]] name = "actix-macros" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6" +checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] @@ -91,7 +90,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" dependencies = [ "bytestring", - "http", + "http 0.2.9", "regex", "serde", "tracing", @@ -121,7 +120,7 @@ dependencies = [ "futures-util", "mio", "num_cpus", - "socket2", + "socket2 0.4.9", "tokio", "tracing", ] @@ -190,7 +189,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "http", + "http 0.2.9", "itoa", "language-tags", "log", @@ -202,7 +201,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "smallvec", - "socket2", + "socket2 0.4.9", "time", "url", ] @@ -232,9 +231,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -247,9 +246,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher", @@ -281,9 +280,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -311,30 +310,29 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -350,9 +348,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -360,14 +358,20 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" dependencies = [ "backtrace", ] [[package]] +name = "anymap2" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" + +[[package]] name = "arbitrary" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -377,6 +381,24 @@ dependencies = [ ] [[package]] +name = "arroy" +version = "0.1.0" +source = "git+https://github.com/meilisearch/arroy.git#d372648212e561a4845077cdb9239423d78655a2" +dependencies = [ + "bytemuck", + "byteorder", + "heed", + "log", + "memmap2 0.9.0", + "ordered-float 4.2.0", + "rand", + "rayon", + "roaring", + "tempfile", + "thiserror", +] + +[[package]] name = "assert-json-diff" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -405,18 +427,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -436,15 +458,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] @@ -457,9 +479,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -469,7 +491,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "benchmarks" -version = "1.3.1" +version = "1.6.0" dependencies = [ "anyhow", "bytes", @@ -511,6 +533,21 @@ dependencies = [ ] [[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -518,9 +555,12 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +dependencies = [ + "serde", +] [[package]] name = "block-buffer" @@ -554,13 +594,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", - "once_cell", - "regex-automata", + "regex-automata 0.4.3", "serde", ] @@ -588,9 +627,9 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] @@ -603,14 +642,14 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -649,10 +688,72 @@ dependencies = [ ] [[package]] +name = "calendrical_calculations" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dfe3bc6a50b4667fafdb6d9cf26731c5418c457e317d8166c972014facf9a5d" +dependencies = [ + "core_maths", + "displaydoc", +] + +[[package]] +name = "candle-core" +version = "0.3.1" +source = "git+https://github.com/huggingface/candle.git#f4fcf6090045ac44122fd5f0a7e46db6e3e16528" +dependencies = [ + "byteorder", + "gemm", + "half 2.3.1", + "memmap2 0.7.1", + "num-traits", + "num_cpus", + "rand", + "rand_distr", + "rayon", + "safetensors", + "thiserror", + "yoke", + "zip", +] + +[[package]] +name = "candle-nn" +version = "0.3.1" +source = "git+https://github.com/huggingface/candle.git#f4fcf6090045ac44122fd5f0a7e46db6e3e16528" +dependencies = [ + "candle-core", + "half 2.3.1", + "num-traits", + "rayon", + "safetensors", + "serde", + "thiserror", +] + +[[package]] +name = "candle-transformers" +version = "0.3.1" +source = "git+https://github.com/huggingface/candle.git#f4fcf6090045ac44122fd5f0a7e46db6e3e16528" +dependencies = [ + "byteorder", + "candle-core", + "candle-nn", + "num-traits", + "rand", + "rayon", + "serde", + "serde_json", + "serde_plain", + "tracing", + "wav", +] + +[[package]] name = "cargo_toml" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f83bc2e401ed041b7057345ebc488c005efa0341d5541ce7004d30458d0090b" +checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" dependencies = [ "serde", "toml", @@ -666,11 +767,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -700,9 +802,9 @@ dependencies = [ [[package]] name = "charabia" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57aa1b4a8dda126c03ebf2f7e31d16cfc8781c2fe80dedd1a33459efc3e07578" +checksum = "ffb924701d850fbf0331302e7f9715c04e494b4b9bebb38ac48bdd30924e1936" dependencies = [ "aho-corasick", "cow-utils", @@ -710,11 +812,15 @@ dependencies = [ "deunicode", "either", "fst", + "icu", + "icu_provider", + "icu_provider_blob", "irg-kvariants", "jieba-rs", "lindera-core", "lindera-dictionary", "lindera-tokenizer", + "litemap 0.6.1", "once_cell", "pinyin", "serde", @@ -722,6 +828,7 @@ dependencies = [ "unicode-normalization", "wana_kana", "whatlang", + "zerovec 0.9.6", ] [[package]] @@ -748,7 +855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" dependencies = [ "ciborium-io", - "half", + "half 1.8.2", ] [[package]] @@ -763,45 +870,49 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.0" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", - "bitflags 1.3.2", "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] name = "colorchoice" @@ -829,6 +940,7 @@ dependencies = [ "encode_unicode", "lazy_static", "libc", + "unicode-width", "windows-sys 0.45.0", ] @@ -871,12 +983,31 @@ dependencies = [ ] [[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "core-foundation-sys" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + +[[package]] name = "cow-utils" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -884,9 +1015,9 @@ checksum = "79bb3adfaf5f75d24b01aee375f7555907840fa2800e5ec8fa3b9e2031830173" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -912,7 +1043,7 @@ dependencies = [ "clap", "criterion-plot", "is-terminal", - "itertools", + "itertools 0.10.5", "num-traits", "once_cell", "oorandom", @@ -933,7 +1064,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] @@ -979,9 +1110,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -1002,14 +1133,20 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] [[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" @@ -1076,14 +1213,33 @@ dependencies = [ ] [[package]] +name = "deduplicating_array" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a636096586ca093a10ac0175bfb384d024089dca0dae54e3e69bc1c1596358e8" +dependencies = [ + "serde", +] + +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] name = "derive_arbitrary" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cdeb9ec472d588e539a818b2dee436825730da08ad0017c4b1a17676bdc8b7" +checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] @@ -1132,9 +1288,9 @@ dependencies = [ [[package]] name = "deserr" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71c14985c842bf1e520b1ebcd22daff6aeece32f510e11f063cecf9b308c04b" +checksum = "61d55a63aabcb2f7893231e6b8ddf8acc00814d20a64463e52cf9b603ec326ee" dependencies = [ "actix-http", "actix-utils", @@ -1149,9 +1305,9 @@ dependencies = [ [[package]] name = "deserr-internal" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae1c51b191528c9e4e5d6cff671de94f61fcda1c206cc891251e0cf438c941a" +checksum = "8c4d5c86e5d887d880c7a3572a8041bfb3011acc81df86318855ea2cae66f3ef" dependencies = [ "convert_case 0.5.0", "proc-macro2", @@ -1177,6 +1333,15 @@ dependencies = [ ] [[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-next" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1187,6 +1352,18 @@ dependencies = [ ] [[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] name = "dirs-sys-next" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1198,13 +1375,39 @@ dependencies = [ ] [[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "doxygen-rs" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff670ea0c9bbb8414e7efa6e23ebde2b8f520a7eef78273a3918cf1903e7505" +dependencies = [ + "phf", +] + +[[package]] name = "dump" -version = "1.3.1" +version = "1.6.0" dependencies = [ "anyhow", "big_s", "flate2", - "http", + "http 0.2.9", "log", "maplit", "meili-snap", @@ -1219,19 +1422,35 @@ dependencies = [ "tempfile", "thiserror", "time", - "uuid 1.3.3", + "uuid 1.5.0", +] + +[[package]] +name = "dyn-stack" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b" +dependencies = [ + "bytemuck", + "reborrow", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" dependencies = [ "serde", ] [[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] name = "encode_unicode" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1336,7 +1555,7 @@ checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -1360,33 +1579,35 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "esaxx-rs" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" + +[[package]] +name = "fancy-regex" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" dependencies = [ - "cc", - "libc", + "bit-set", + "regex", ] [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "faux" @@ -1413,48 +1634,60 @@ dependencies = [ [[package]] name = "file-store" -version = "1.3.1" +version = "1.6.0" dependencies = [ "faux", "tempfile", "thiserror", - "uuid 1.3.3", + "uuid 1.5.0", ] [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] [[package]] name = "filter-parser" -version = "1.3.1" +version = "1.6.0" dependencies = [ "insta", "nom", "nom_locate", + "unescaper", +] + +[[package]] +name = "fixed_decimal" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5287d527037d0f35c8801880361eb38bb9bce194805350052c2a79538388faeb" +dependencies = [ + "displaydoc", + "smallvec", + "writeable", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] name = "flatten-serde-json" -version = "1.3.1" +version = "1.6.0" dependencies = [ "criterion", "serde_json", @@ -1468,9 +1701,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1483,9 +1716,9 @@ checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1498,9 +1731,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1508,15 +1741,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1525,38 +1758,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -1572,7 +1805,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.3.1" +version = "1.6.0" dependencies = [ "arbitrary", "clap", @@ -1593,6 +1826,123 @@ dependencies = [ ] [[package]] +name = "gemm" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b3afa707040531a7527477fd63a81ea4f6f3d26037a2f96776e57fb843b258e" +dependencies = [ + "dyn-stack", + "gemm-c32", + "gemm-c64", + "gemm-common", + "gemm-f16", + "gemm-f32", + "gemm-f64", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c32" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc3973a4c30c73f26a099113953d0c772bb17ee2e07976c0a06b8fe1f38a57d" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c64" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30362894b93dada374442cb2edf4512ddf19513c9bec88e06a445bcb6b22e64f" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-common" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "988499faa80566b046b4fee2c5f15af55b5a20c1fe8486b112ebb34efa045ad6" +dependencies = [ + "bytemuck", + "dyn-stack", + "half 2.3.1", + "num-complex", + "num-traits", + "once_cell", + "paste", + "pulp", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f16" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6cf2854a12371684c38d9a865063a27661812a3ff5803454c5742e8f5a388ce" +dependencies = [ + "dyn-stack", + "gemm-common", + "gemm-f32", + "half 2.3.1", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f32" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bc84003cf6d950a7c7ca714ad6db281b6cef5c7d462f5cd9ad90ea2409c7227" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-f64" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35187ef101a71eed0ecd26fb4a6255b4192a12f1c5335f3a795698f2d9b6cf33" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] name = "generic-array" version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1610,9 +1960,9 @@ checksum = "36d244a08113319b5ebcabad2b8b7925732d15eec46d7e7ac3c11734f3b7a6ad" [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -1633,9 +1983,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "git2" @@ -1658,27 +2008,28 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "grenad" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5232b2d157b7bf63d7abe1b12177039e58db2f29e377517c0cdee1578cca4c93" +checksum = "6a007932af5475ebb5c63bef8812bb1c36f317983bb4ca663e9d6dd58d6a0f8c" dependencies = [ "bytemuck", "byteorder", + "rayon", "tempfile", ] [[package]] name = "h2" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", "indexmap 1.9.3", "slab", "tokio", @@ -1693,6 +2044,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "bytemuck", + "cfg-if", + "crunchy", + "num-traits", + "rand", + "rand_distr", +] + +[[package]] name = "hash32" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1737,52 +2102,47 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "heed" -version = "0.12.7" -source = "git+https://github.com/meilisearch/heed?tag=v0.12.7#061a5276b1f336f5f3302bee291e336041d88632" +version = "0.20.0-alpha.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9648a50991c86df7d00c56c268c27754fcf4c80be2ba57fc4a00dc928c6fe934" dependencies = [ + "bitflags 2.4.1", + "bytemuck", "byteorder", "heed-traits", "heed-types", "libc", - "lmdb-rkv-sys", + "lmdb-master-sys", "once_cell", - "page_size 0.4.2", + "page_size 0.6.0", "synchronoise", "url", - "zerocopy", ] [[package]] name = "heed-traits" -version = "0.7.0" -source = "git+https://github.com/meilisearch/heed?tag=v0.12.7#061a5276b1f336f5f3302bee291e336041d88632" +version = "0.20.0-alpha.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab0b7d9cde969ad36dde692e487dc89d97f7168bf6a7bd3b894ad4bf7278298" [[package]] name = "heed-types" -version = "0.7.2" -source = "git+https://github.com/meilisearch/heed?tag=v0.12.7#061a5276b1f336f5f3302bee291e336041d88632" +version = "0.20.0-alpha.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0cb3567a7363f28b597bf6e9897b9466397951dd0e52df2c8196dd8a71af44a" dependencies = [ "bincode", + "byteorder", "heed-traits", "serde", "serde_json", - "zerocopy", ] [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -1791,6 +2151,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hf-hub" +version = "0.3.2" +source = "git+https://github.com/dureuill/hf-hub.git?branch=rust_tls#88d4f11cb9fa079f2912bacb96f5080b16825ce8" +dependencies = [ + "dirs", + "http 1.0.0", + "indicatif", + "log", + "rand", + "serde", + "serde_json", + "thiserror", + "ureq", +] + +[[package]] name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1811,13 +2187,24 @@ dependencies = [ ] [[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] name = "http-body" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.9", "pin-project-lite", ] @@ -1841,22 +2228,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http", + "http 0.2.9", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1865,15 +2252,497 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ - "http", + "futures-util", + "http 0.2.9", "hyper", - "rustls 0.21.1", + "rustls 0.21.6", "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "icu" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30f75f394ebee8d539bef8f6f02ad7b5f41c33de74c9eae1a50337b382a5aab1" +dependencies = [ + "icu_calendar", + "icu_casemap", + "icu_collator", + "icu_collections", + "icu_compactdecimal", + "icu_datetime", + "icu_decimal", + "icu_displaynames", + "icu_list", + "icu_locid", + "icu_locid_transform", + "icu_normalizer", + "icu_plurals", + "icu_properties", + "icu_provider", + "icu_relativetime", + "icu_segmenter", + "icu_timezone", + "icu_transliterate", +] + +[[package]] +name = "icu_calendar" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b520c5675775e3838447c33fc55bf558148c6824ef0d20ff7a9e0df7345a281c" +dependencies = [ + "calendrical_calculations", + "displaydoc", + "icu_calendar_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "serde", + "tinystr", + "writeable", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_calendar_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75d8d1a514ca7e6dc547be930f2fd661d578909c07cf1c1adade81c3f7a78840" + +[[package]] +name = "icu_casemap" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976068d7759293cbd9daa0d1669618bb9094c7ee54e546cd8b877dd4fe59007a" +dependencies = [ + "displaydoc", + "icu_casemap_data", + "icu_collections", + "icu_locid", + "icu_properties", + "icu_provider", + "serde", + "writeable", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_casemap_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1251070c14d5b94cd00f97025e9cedce6a6eeb39485e2a226c58432cc4f72ffd" + +[[package]] +name = "icu_collator" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be493c81154545a00fc5196e814cae0e1470bc696d518b5df877049aa6bcefe1" +dependencies = [ + "displaydoc", + "icu_collator_data", + "icu_collections", + "icu_locid", + "icu_locid_transform", + "icu_normalizer", + "icu_properties", + "icu_provider", + "serde", + "smallvec", + "utf16_iter", + "utf8_iter", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_collator_data" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dbe9abe5ce570ad4707026f37bc21ef95c36b945c3c4564b9aa4e2e1c043126" + +[[package]] +name = "icu_collections" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3907b2246e8dd5a29ead8a965e7c0c8a90e9b928e614a4279257d45c5e553e91" +dependencies = [ + "displaydoc", + "serde", + "yoke", + "zerofrom", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_compactdecimal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a8bb9143e7681fd5f5877c76f7b6365e173545d00d0e12ef23ba1888a996baa" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_compactdecimal_data", + "icu_decimal", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "writeable", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_compactdecimal_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e9b7585f26db531ea5aaedaa68cb66cd2be37fe698b33a289849ff3129545b" + +[[package]] +name = "icu_datetime" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5bf2e6dd961b59ee5935070220915db6cf0ab5137de362964f800c2b7d14fa" +dependencies = [ + "displaydoc", + "either", + "fixed_decimal", + "icu_calendar", + "icu_datetime_data", + "icu_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_timezone", + "litemap 0.7.1", + "serde", + "smallvec", + "tinystr", + "writeable", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_datetime_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078b2ed516a2f5054ee7f55b1fe970b92e90ae4cace8a0fe1e5f9fc2e94be609" + +[[package]] +name = "icu_decimal" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1986a0b7df834aaddb911b4593c990950ac5606fc83ce9aad4311be80f51e81a" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "serde", + "writeable", +] + +[[package]] +name = "icu_decimal_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c064b3828953151f8c610bfff6fec776f958641249ebfd1cf36f073f0654e77" + +[[package]] +name = "icu_displaynames" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c98329d348e918ac7e88e6d6613a46bef09ca8a65db4ddf70d86e6eaac0e2ec3" +dependencies = [ + "icu_displaynames_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "serde", + "tinystr", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_displaynames_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60f9f56c427f1e80383667e8fb13c07707f6561839283115617cc67307a5d020" + +[[package]] +name = "icu_list" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc1a44bbed77a7e7b555f9d7dd4b43f75ec1402b438a901d20451943d50cbd90" +dependencies = [ + "deduplicating_array", + "displaydoc", + "icu_list_data", + "icu_locid_transform", + "icu_provider", + "regex-automata 0.2.0", + "serde", + "writeable", +] + +[[package]] +name = "icu_list_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3237583f0cb7feafabb567c4492fe9ef1d2d4113f6a8798a923273ea5de996d" + +[[package]] +name = "icu_locid" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c" +dependencies = [ + "displaydoc", + "litemap 0.7.1", + "serde", + "tinystr", + "writeable", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_locid_transform" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "serde", + "tinystr", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44" + +[[package]] +name = "icu_normalizer" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080fc33a720d50a7342b0c58df010fbcfb842d6f78ef81555f8b1ac6bba57d3c" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "serde", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8d22f74066c2e6442db2a9aa14950278e86719e811e304e48bae03094b369d" + +[[package]] +name = "icu_plurals" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20556516b8be2b2f5dc3d6b23884b65c5c59ed8be0b44c419e4808c9b0792fce" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals_data", + "icu_provider", + "serde", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_plurals_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc552215224997aaaa4e05d95981386d3c52042acebfcc732137d5d9be96a21" + +[[package]] +name = "icu_properties" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3477ae70f8ca8dc08ff7574b5398ed0a2f2e4e6b66bdff2558a92ed67e262be1" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "serde", + "tinystr", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_properties_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c8bb3b67a8347e94d580434369e5c7ee89999b9309d04b7cfc88dfaa0f31b59" + +[[package]] +name = "icu_provider" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "postcard", + "serde", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_provider_blob" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31326d28c7f95a964a4f0ee86c24002da5f6db907e3bcb079949b4ff103b6a9" +dependencies = [ + "icu_provider", + "postcard", + "serde", + "writeable", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_provider_macros" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] + +[[package]] +name = "icu_relativetime" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4e6c1b531ab35f5b0cb552d3fb8dab1cb49f98e68e12bdc2169ca15e805207c" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_relativetime_data", + "serde", + "writeable", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_relativetime_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71ec2ca0aff8c6865075c6257bc91d21a77acb6465635306a280af89208bed24" + +[[package]] +name = "icu_segmenter" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcb3c1981ce2187a745f391a741cb14e77453325acb3b2e014b05da51c0a39f2" +dependencies = [ + "core_maths", + "displaydoc", + "icu_collections", + "icu_locid", + "icu_provider", + "icu_segmenter_data", + "serde", + "utf8_iter", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_segmenter_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9703f6713044d1c0a1335a6d78ffece4c9380582416ace6feeb608e84d279fc7" + +[[package]] +name = "icu_timezone" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e6401cd210ccda98b2e7fc707831b29c6efe319efbbec460f957b6f331f626" +dependencies = [ + "displaydoc", + "icu_calendar", + "icu_locid", + "icu_provider", + "icu_timezone_data", + "serde", + "tinystr", + "zerotrie", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_timezone_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7e214a653bac59b768c42f82d252f13af95e8a9cb07b6108b8bc723c561b43" + +[[package]] +name = "icu_transliterate" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4bdf006774b5a5898d97af6c95b148d34cd5c87cbed00610ff873e5b5885e28" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid", + "icu_normalizer", + "icu_properties", + "icu_provider", + "icu_unicodeset_parse", + "litemap 0.7.1", + "serde", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_unicodeset_parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2c3c1ab072cb9ec2dfb377ed7be07bf1bdce055b8324ba6392323f588c38c5a" +dependencies = [ + "icu_collections", + "icu_properties", + "icu_provider", + "tinystr", + "zerovec 0.10.0", ] [[package]] @@ -1884,9 +2753,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1894,7 +2763,7 @@ dependencies = [ [[package]] name = "index-scheduler" -version = "1.3.1" +version = "1.6.0" dependencies = [ "anyhow", "big_s", @@ -1905,6 +2774,7 @@ dependencies = [ "dump", "enum-iterator", "file-store", + "flate2", "insta", "log", "meili-snap", @@ -1912,6 +2782,7 @@ dependencies = [ "meilisearch-types", "nelson", "page_size 0.5.0", + "puffin", "roaring", "serde", "serde_json", @@ -1919,7 +2790,8 @@ dependencies = [ "tempfile", "thiserror", "time", - "uuid 1.3.3", + "ureq", + "uuid 1.5.0", ] [[package]] @@ -1930,7 +2802,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] @@ -1941,6 +2812,20 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", +] + +[[package]] +name = "indicatif" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", ] [[package]] @@ -1954,9 +2839,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.29.0" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a28d25139df397cbca21408bb742cf6837e04cdbebf1b07b760caf971d6a972" +checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" dependencies = [ "console", "lazy_static", @@ -1978,36 +2863,21 @@ dependencies = [ ] [[package]] -name = "instant-distance" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c619cdaa30bb84088963968bee12a45ea5fbbf355f2c021bcd15589f5ca494a" -dependencies = [ - "num_cpus", - "ordered-float", - "parking_lot", - "rand", - "rayon", - "serde", - "serde-big-array", -] - -[[package]] name = "io-lifetimes" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "irg-kvariants" @@ -2022,12 +2892,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "rustix 0.38.2", + "hermit-abi", + "rustix 0.38.26", "windows-sys 0.48.0", ] @@ -2041,20 +2911,29 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jieba-rs" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37228e06c75842d1097432d94d02f37fe3ebfca9791c2e8fef6e9db17ed128c1" +checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e" dependencies = [ "cedarwood", "fxhash", - "hashbrown 0.12.3", + "hashbrown 0.14.0", "lazy_static", "phf", "phf_codegen", @@ -2072,16 +2951,16 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] [[package]] name = "json-depth-checker" -version = "1.3.1" +version = "1.6.0" dependencies = [ "criterion", "serde_json", @@ -2093,7 +2972,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", "pem", "ring", "serde", @@ -2102,6 +2981,16 @@ dependencies = [ ] [[package]] +name = "kstring" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747" +dependencies = [ + "serde", + "static_assertions", +] + +[[package]] name = "language-tags" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2124,9 +3013,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libgit2-sys" @@ -2158,9 +3047,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -2170,9 +3059,9 @@ dependencies = [ [[package]] name = "lindera-cc-cedict-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2e8f2ca97ddf952fe340642511b9c14b373cb2eef711d526bb8ef2ca0969b8" +checksum = "6f567a47e47b5420908424de2c6c5e424e3cafe588d0146bd128c0f3755758a3" dependencies = [ "anyhow", "bincode", @@ -2189,9 +3078,9 @@ dependencies = [ [[package]] name = "lindera-compress" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f72b460559bcbe8a9cee85ea4a5056133ed3abf373031191589236e656d65b59" +checksum = "49f3e553d55ebe9881fa5e5de588b0a153456e93564d17dfbef498912caf63a2" dependencies = [ "anyhow", "flate2", @@ -2200,9 +3089,9 @@ dependencies = [ [[package]] name = "lindera-core" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f586eb8a9393c32d5525e0e9336a3727bd1329674740097126f3b0bff8a1a1ea" +checksum = "a9a2440cc156a4a911a174ec68203543d1efb10df3a700a59b6bf581e453c726" dependencies = [ "anyhow", "bincode", @@ -2217,9 +3106,9 @@ dependencies = [ [[package]] name = "lindera-decompress" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb1facd8da698072fcc7338bd757730db53d59f313f44dd583fa03681dcc0e1" +checksum = "e077a410e61c962cb526f71b7effd62ffc607488a8f61869c937582d2ccb529b" dependencies = [ "anyhow", "flate2", @@ -2228,9 +3117,9 @@ dependencies = [ [[package]] name = "lindera-dictionary" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7be7410b1da7017a8948986b87af67082f605e9a716f0989790d795d677f0c" +checksum = "d9f57491adf7b311a3ee87f5e4a36454df16a2ec73de4ef28b2106fac80bd782" dependencies = [ "anyhow", "bincode", @@ -2248,9 +3137,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705d07f8a45d04fd95149f7ad41a26d1f9e56c9c00402be6f9dd05e3d88b99c6" +checksum = "a3476ec7748aebd2eb23d496ddfce5e7e0a5c031cffcd214451043e02d029f11" dependencies = [ "anyhow", "bincode", @@ -2269,9 +3158,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-neologd-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633a93983ba13fba42328311a501091bd4a7aff0c94ae9eaa9d4733dd2b0468a" +checksum = "7b1c7576a02d5e4af2bf62de51790a01bc4b8bc0d0b6a6b86a46b157f5cb306d" dependencies = [ "anyhow", "bincode", @@ -2290,9 +3179,9 @@ dependencies = [ [[package]] name = "lindera-ko-dic" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a428e0d316b6c86f51bd919479692bc41ad840dba266ebc044663970f431ea18" +checksum = "b713ecd5b827d7d448c3c5eb3c6d5899ecaf22cd17087599996349a02c76828d" dependencies = [ "bincode", "byteorder", @@ -2307,9 +3196,9 @@ dependencies = [ [[package]] name = "lindera-ko-dic-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5288704c6b8a069c0a1705c38758e836497698b50453373ab3d56c6f9a7ef8" +checksum = "3e545752f6487be87b572529ad594cb3b48d2ef20821516f598b2d152d23277b" dependencies = [ "anyhow", "bincode", @@ -2327,9 +3216,9 @@ dependencies = [ [[package]] name = "lindera-tokenizer" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106ba439b2e87529d9bbedbb88d69f635baba1195c26502b308f55a85885fc81" +checksum = "24a2d4606a5a4da62ac4a3680ee884a75da7f0c892dc967fc9cb983ceba39a8f" dependencies = [ "bincode", "byteorder", @@ -2342,9 +3231,9 @@ dependencies = [ [[package]] name = "lindera-unidic" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3399b6dcfe1701333451d184ff3c677f433b320153427b146360c9e4bd8cb816" +checksum = "388b1bdf81794b5d5b8057ce0321c58ff4b90d676b637948ccc7863ae2f43d28" dependencies = [ "bincode", "byteorder", @@ -2359,9 +3248,9 @@ dependencies = [ [[package]] name = "lindera-unidic-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b698227fdaeac32289173ab389b990d4eb00a40cbc9912020f69a0c491dabf55" +checksum = "cdfa3e29a22c047da57fadd960ff674b720de15a1e2fb35b5ed67f3408afb469" dependencies = [ "anyhow", "bincode", @@ -2391,22 +3280,90 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] -name = "linux-raw-sys" -version = "0.4.3" +name = "liquid" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f68ae1011499ae2ef879f631891f21c78e309755f4a5e483c4a8f12e10b609" +dependencies = [ + "doc-comment", + "liquid-core", + "liquid-derive", + "liquid-lib", + "serde", +] + +[[package]] +name = "liquid-core" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e0724dfcaad5cfb7965ea0f178ca0870b8d7315178f4a7179f5696f7f04d5f" +dependencies = [ + "anymap2", + "itertools 0.10.5", + "kstring", + "liquid-derive", + "num-traits", + "pest", + "pest_derive", + "regex", + "serde", + "time", +] + +[[package]] +name = "liquid-derive" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "fc2fb41a9bb4257a3803154bdf7e2df7d45197d1941c9b1a90ad815231630721" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] [[package]] -name = "lmdb-rkv-sys" -version = "0.15.1" -source = "git+https://github.com/meilisearch/lmdb-rs#501aa34a1ab7f092e3ff54a6c22ff6c55931a2d8" +name = "liquid-lib" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2a17e273a6fb1fb6268f7a5867ddfd0bd4683c7e19b51084f3d567fad4348c0" +dependencies = [ + "itertools 0.10.5", + "liquid-core", + "once_cell", + "percent-encoding", + "regex", + "time", + "unicode-segmentation", +] + +[[package]] +name = "litemap" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "575d8a551c59104b4df91269921e5eab561aa1b77c618dac0414b5d44a4617de" + +[[package]] +name = "litemap" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1" +dependencies = [ + "serde", +] + +[[package]] +name = "lmdb-master-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "629c123f5321b48fa4f8f4d3b868165b748d9ba79c7103fb58e3a94f736bcedd" dependencies = [ "cc", + "doxygen-rs", "libc", "pkg-config", ] @@ -2431,9 +3388,9 @@ checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -2441,9 +3398,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "logging_timer" @@ -2468,6 +3425,28 @@ dependencies = [ ] [[package]] +name = "lz4_flex" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b8c72594ac26bfd34f2d99dfced2edfaddfe8a476e3ff2ca0eb293d925c4f83" + +[[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] name = "manifest-dir-macros" version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2476,7 +3455,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -2493,7 +3472,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.3.1" +version = "1.6.0" dependencies = [ "insta", "md5", @@ -2502,7 +3481,7 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.3.1" +version = "1.6.0" dependencies = [ "actix-cors", "actix-http", @@ -2531,12 +3510,12 @@ dependencies = [ "futures", "futures-util", "hex", - "http", + "http 0.2.9", "index-scheduler", - "indexmap 1.9.3", + "indexmap 2.0.0", "insta", "is-terminal", - "itertools", + "itertools 0.11.0", "jsonwebtoken", "lazy_static", "log", @@ -2550,12 +3529,13 @@ dependencies = [ "num_cpus", "obkv", "once_cell", - "ordered-float", + "ordered-float 3.7.0", "parking_lot", "permissive-json-pointer", "pin-project-lite", "platform-dirs", "prometheus", + "puffin", "rand", "rayon", "regex", @@ -2581,8 +3561,9 @@ dependencies = [ "tokio", "tokio-stream", "toml", + "url", "urlencoding", - "uuid 1.3.3", + "uuid 1.5.0", "vergen", "walkdir", "yaup", @@ -2591,9 +3572,9 @@ dependencies = [ [[package]] name = "meilisearch-auth" -version = "1.3.1" +version = "1.6.0" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", "enum-iterator", "hmac", "maplit", @@ -2605,12 +3586,12 @@ dependencies = [ "sha2", "thiserror", "time", - "uuid 1.3.3", + "uuid 1.5.0", ] [[package]] name = "meilisearch-types" -version = "1.3.1" +version = "1.6.0" dependencies = [ "actix-web", "anyhow", @@ -2624,7 +3605,7 @@ dependencies = [ "fst", "insta", "meili-snap", - "memmap2", + "memmap2 0.7.1", "milli", "roaring", "serde", @@ -2635,43 +3616,71 @@ dependencies = [ "thiserror", "time", "tokio", - "uuid 1.3.3", + "uuid 1.5.0", +] + +[[package]] +name = "meilitool" +version = "1.6.0" +dependencies = [ + "anyhow", + "clap", + "dump", + "file-store", + "meilisearch-auth", + "meilisearch-types", + "time", + "uuid 1.5.0", ] [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" -version = "0.5.10" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", + "stable_deref_trait", +] + +[[package]] +name = "memmap2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" dependencies = [ "libc", ] [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "milli" -version = "1.3.1" +version = "1.6.0" dependencies = [ + "arroy", "big_s", "bimap", "bincode", "bstr", "bytemuck", "byteorder", + "candle-core", + "candle-nn", + "candle-transformers", "charabia", "concat-arrays", "crossbeam-channel", @@ -2681,28 +3690,33 @@ dependencies = [ "filter-parser", "flatten-serde-json", "fst", + "futures", "fxhash", "geoutils", "grenad", "heed", - "indexmap 1.9.3", + "hf-hub", + "indexmap 2.0.0", "insta", - "instant-distance", - "itertools", + "itertools 0.11.0", "json-depth-checker", "levenshtein_automata", + "liquid", "log", "logging_timer", "maplit", "md5", - "memmap2", + "meili-snap", + "memmap2 0.7.1", "mimalloc", "obkv", "once_cell", - "ordered-float", + "ordered-float 3.7.0", + "puffin", "rand", "rand_pcg", "rayon", + "reqwest", "roaring", "rstar", "serde", @@ -2713,8 +3727,11 @@ dependencies = [ "smartstring", "tempfile", "thiserror", + "tiktoken-rs", "time", - "uuid 1.3.3", + "tokenizers", + "tokio", + "uuid 1.5.0", ] [[package]] @@ -2750,15 +3767,6 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" @@ -2768,9 +3776,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.7" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebffdb73fe72e917997fad08bdbf31ac50b0fa91cec93e69a0662e4264d454c" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "log", @@ -2779,6 +3787,27 @@ dependencies = [ ] [[package]] +name = "monostate" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f370ae88093ec6b11a710dec51321a61d420fafd1bad6e30d01bd9c920e8ee" +dependencies = [ + "monostate-impl", + "serde", +] + +[[package]] +name = "monostate-impl" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] + +[[package]] name = "nelson" version = "0.1.0" source = "git+https://github.com/meilisearch/nelson.git?rev=675f13885548fb415ead8fbb447e9e6d9314000a#675f13885548fb415ead8fbb447e9e6d9314000a" @@ -2825,6 +3854,16 @@ dependencies = [ ] [[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "bytemuck", + "num-traits", +] + +[[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2836,9 +3875,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", @@ -2846,28 +3885,34 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "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.30.3" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] [[package]] name = "obkv" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f69e48cd7c8e5bb52a1da1287fdbfd877c32673176583ce664cd63b201aba385" +checksum = "6c459142426056c639ff88d053ebaaaeca0ee1411c94362892398ef4ccd81080" [[package]] name = "once_cell" @@ -2876,12 +3921,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] name = "oorandom" version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[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 = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2891,10 +3964,19 @@ dependencies = [ ] [[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 = "page_size" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebde548fbbf1ea81a99b128872779c437752fb99f217c45245e1a61dcd9edcd" +checksum = "1b7663cbd190cfd818d08efa8497f6cd383076688c49a391ef7c0d03cd12b561" dependencies = [ "libc", "winapi", @@ -2902,9 +3984,9 @@ dependencies = [ [[package]] name = "page_size" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b7663cbd190cfd818d08efa8497f6cd383076688c49a391ef7c0d03cd12b561" +checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da" dependencies = [ "libc", "winapi", @@ -2922,15 +4004,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.1", ] [[package]] @@ -2946,9 +4028,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "path-matchers" @@ -2988,13 +4070,13 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.3.1" +version = "1.6.0" dependencies = [ "big_s", "serde_json", @@ -3002,9 +4084,9 @@ dependencies = [ [[package]] name = "pest" -version = "2.6.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" +checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" dependencies = [ "thiserror", "ucd-trie", @@ -3012,9 +4094,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.6.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb" +checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" dependencies = [ "pest", "pest_generator", @@ -3022,22 +4104,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.6.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e" +checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] name = "pest_meta" -version = "2.6.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411" +checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" dependencies = [ "once_cell", "pest", @@ -3046,18 +4128,19 @@ dependencies = [ [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ + "phf_macros", "phf_shared", ] [[package]] name = "phf_codegen" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", "phf_shared", @@ -3065,28 +4148,41 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared", "rand", ] [[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.28", +] + +[[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "2c516611246607d0c04186886dbb3a754368ef82c79e9827a802c6d836dd111c" [[package]] name = "pin-utils" @@ -3117,9 +4213,9 @@ dependencies = [ [[package]] name = "plotters" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -3130,20 +4226,43 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] [[package]] +name = "portable-atomic" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" + +[[package]] +name = "postcard" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +dependencies = [ + "cobs", + "embedded-io", + "serde", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3192,7 +4311,7 @@ dependencies = [ "byteorder", "hex", "lazy_static", - "rustix 0.36.14", + "rustix 0.36.16", ] [[package]] @@ -3219,10 +4338,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] +name = "puffin" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76425abd4e1a0ad4bd6995dd974b52f414fca9974171df8e3708b3e660d05a21" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "cfg-if", + "instant", + "lz4_flex", + "once_cell", + "parking_lot", + "serde", +] + +[[package]] +name = "pulp" +version = "0.18.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7057c1435edb390ebfc51743abad043377f1f698ce8e649a9b52a4b378be5e4d" +dependencies = [ + "bytemuck", + "libm", + "num-complex", + "reborrow", +] + +[[package]] name = "quote" -version = "1.0.31" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -3258,6 +4406,16 @@ dependencies = [ ] [[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand", +] + +[[package]] name = "rand_pcg" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3268,28 +4426,52 @@ dependencies = [ ] [[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", ] [[package]] +name = "rayon-cond" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +dependencies = [ + "either", + "itertools 0.11.0", + "rayon", +] + +[[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] +name = "reborrow" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" + +[[package]] name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3308,6 +4490,15 @@ dependencies = [ ] [[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.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3320,40 +4511,61 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.3" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", + "regex-automata 0.3.6", "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "e9368763f5a9b804326f3af749e16f9abf378d227bcdee7634b13d8f17793782" +dependencies = [ + "memchr", +] + +[[package]] +name = "regex-automata" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", "futures-util", "h2", - "http", + "http 0.2.9", "http-body", "hyper", "hyper-rustls", @@ -3364,19 +4576,20 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.1", + "rustls 0.21.6", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls 0.24.1", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.22.6", + "webpki-roots 0.25.3", "winreg", ] @@ -3387,6 +4600,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" [[package]] +name = "riff" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b1a3d5f46d53f4a3478e2be4a5a5ce5108ea58b100dcd139830eae7f79a3a1" + +[[package]] name = "ring" version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3403,9 +4622,9 @@ dependencies = [ [[package]] name = "roaring" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef0fb5e826a8bde011ecae6a8539dd333884335c57ff0f003fbe27c25bbe8f71" +checksum = "6106b5cf8587f5834158895e9715a3c6c9716c8aefab57f1f7680917191c7873" dependencies = [ "bytemuck", "byteorder", @@ -3415,9 +4634,9 @@ dependencies = [ [[package]] name = "rstar" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f39465655a1e3d8ae79c6d9e007f4953bfc5d55297602df9dc38f9ae9f1359a" +checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" dependencies = [ "heapless", "num-traits", @@ -3432,6 +4651,12 @@ 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" @@ -3442,9 +4667,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.14" +version = "0.36.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e4d67015953998ad0eb82887a0eb0129e18a7e2f3b7b0f6c422fddcd503d62" +checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab" dependencies = [ "bitflags 1.3.2", "errno", @@ -3456,29 +4681,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "errno", - "io-lifetimes", "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" -dependencies = [ - "bitflags 2.3.3", - "errno", - "libc", - "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", ] [[package]] @@ -3495,9 +4706,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.1" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring", @@ -3507,18 +4718,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" dependencies = [ "ring", "untrusted", @@ -3526,15 +4737,25 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "safetensors" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "d93279b86b3de76f820a8854dd06cbc33cfa57a417b19c47f6a25280112fb1df" +dependencies = [ + "serde", + "serde_json", +] [[package]] name = "same-file" @@ -3547,9 +4768,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -3577,26 +4798,23 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] -name = "serde" -version = "1.0.171" +name = "seq-macro" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" -dependencies = [ - "serde_derive", -] +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] -name = "serde-big-array" -version = "0.5.1" +name = "serde" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ - "serde", + "serde_derive", ] [[package]] @@ -3610,20 +4828,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "indexmap 2.0.0", "itoa", @@ -3632,10 +4850,19 @@ dependencies = [ ] [[package]] +name = "serde_plain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" +dependencies = [ + "serde", +] + +[[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -3676,9 +4903,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -3745,9 +4972,12 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +dependencies = [ + "serde", +] [[package]] name = "smartstring" @@ -3771,6 +5001,27 @@ dependencies = [ ] [[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "socks" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b" +dependencies = [ + "byteorder", + "libc", + "winapi", +] + +[[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3786,6 +5037,18 @@ dependencies = [ ] [[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom", + "serde", + "unicode-segmentation", +] + +[[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3833,9 +5096,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.26" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -3853,21 +5116,21 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.6" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.28", "unicode-xid", ] [[package]] name = "sysinfo" -version = "0.28.4" +version = "0.29.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" +checksum = "165d6d8539689e3d3bc8b98ac59541e1f21c7de7c85d60dc80e43ae0ed2113db" dependencies = [ "cfg-if", "core-foundation-sys", @@ -3879,10 +5142,31 @@ dependencies = [ ] [[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.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -3900,15 +5184,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.19", - "windows-sys 0.45.0", + "redox_syscall 0.4.1", + "rustix 0.38.26", + "windows-sys 0.48.0", ] [[package]] @@ -3922,31 +5206,48 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", +] + +[[package]] +name = "tiktoken-rs" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4427b6b1c6b38215b92dd47a83a0ecc6735573d0a5a4c14acc0ac5b33b28adb" +dependencies = [ + "anyhow", + "base64 0.21.5", + "bstr", + "fancy-regex", + "lazy_static", + "parking_lot", + "rustc-hash", ] [[package]] name = "time" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ + "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -3954,20 +5255,31 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] [[package]] +name = "tinystr" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +dependencies = [ + "displaydoc", + "serde", + "zerovec 0.10.0", +] + +[[package]] name = "tinytemplate" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3993,12 +5305,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] +name = "tokenizers" +version = "0.14.1" +source = "git+https://github.com/huggingface/tokenizers.git?tag=v0.14.1#6357206cdcce4d78ffb1e0372feb456caea09375" +dependencies = [ + "aho-corasick", + "derive_builder", + "esaxx-rs", + "getrandom", + "itertools 0.11.0", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand", + "rayon", + "rayon-cond", + "regex", + "regex-syntax", + "serde", + "serde_json", + "spm_precompiled", + "thiserror", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + +[[package]] name = "tokio" -version = "1.28.2" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", @@ -4006,20 +5348,20 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -4035,11 +5377,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.1", + "rustls 0.21.6", "tokio", ] @@ -4070,9 +5412,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -4082,20 +5424,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -4117,10 +5459,22 @@ dependencies = [ "cfg-if", "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.28", +] + +[[package]] name = "tracing-core" version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4143,9 +5497,18 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "unescaper" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "a96a44ae11e25afb520af4534fd7b0bd8cd613e35a78def813b8cf41631fa3c8" +dependencies = [ + "thiserror", +] [[package]] name = "unicase" @@ -4164,9 +5527,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -4178,18 +5541,39 @@ dependencies = [ ] [[package]] +name = "unicode-normalization-alignments" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" +dependencies = [ + "smallvec", +] + +[[package]] name = "unicode-segmentation" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[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 = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] name = "untrusted" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4197,35 +5581,46 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "ureq" -version = "2.7.1" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", + "flate2", "log", "once_cell", - "rustls 0.21.1", + "rustls 0.21.6", "rustls-webpki", + "serde", + "serde_json", + "socks", "url", - "webpki-roots 0.23.1", + "webpki-roots 0.25.3", ] [[package]] name = "url" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] name = "urlencoding" -version = "2.1.2" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf16_iter" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +checksum = "52df8b7fb78e7910d776fccf2e42ceaf3604d55e8e7eb2dbd183cb1441d8a692" [[package]] name = "utf8-width" @@ -4234,6 +5629,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" [[package]] +name = "utf8_iter" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a8922555b9500e3d865caed19330172cd67cbf82203f1a3311d8c305cc9f33" + +[[package]] name = "utf8parse" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4250,9 +5651,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.3.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom", "serde", @@ -4303,17 +5704,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "477976a5c56fb7b014795df5a2ce08d2de8bcd4d5980844c5bd3978a7fd1c30b" dependencies = [ "fnv", - "itertools", + "itertools 0.10.5", "lazy_static", ] [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -4325,9 +5725,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4335,24 +5735,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -4362,9 +5762,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4372,28 +5772,37 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wav" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a65e199c799848b4f997072aa4d673c034f80f40191f97fe2f0a23f410be1609" +dependencies = [ + "riff", +] [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -4401,9 +5810,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ "ring", "untrusted", @@ -4420,12 +5829,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.23.1" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki", -] +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "whatlang" @@ -4483,7 +5889,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.1", +] + +[[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.0", ] [[package]] @@ -4503,9 +5918,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", @@ -4517,6 +5932,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4529,6 +5959,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4541,6 +5977,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4553,6 +5995,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4565,6 +6013,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4577,6 +6031,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4589,6 +6049,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4601,28 +6067,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winnow" -version = "0.4.6" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2" + +[[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] @@ -4653,27 +6138,97 @@ dependencies = [ ] [[package]] -name = "zerocopy" -version = "0.3.0" +name = "yoke" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6580539ad917b7c026220c4b3f2c08d52ce54d6ce0dc491e66002e35388fab46" +checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" dependencies = [ - "byteorder", - "zerocopy-derive", + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", ] [[package]] -name = "zerocopy-derive" -version = "0.2.0" +name = "yoke-derive" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d498dbd1fd7beb83c86709ae1c33ca50942889473473d287d56ce4770a18edfb" +checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" dependencies = [ "proc-macro2", - "syn 1.0.109", + "quote", + "syn 2.0.28", "synstructure", ] [[package]] +name = "zerofrom" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9685bb4deb98dab812e87c296a9631fc00d7ca4bc5c2c5f304f375bbed711a8a" +dependencies = [ + "displaydoc", + "litemap 0.7.1", + "serde", + "yoke", + "zerofrom", + "zerovec 0.10.0", +] + +[[package]] +name = "zerovec" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "591691014119b87047ead4dcf3e6adfbf73cb7c38ab6980d4f18a32138f35d46" +dependencies = [ + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e" +dependencies = [ + "serde", + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acabf549809064225ff8878baedc4ce3732ac3b07e7c7ce6e5c2ccdbc485c324" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] + +[[package]] name = "zip" version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4690,7 +6245,7 @@ dependencies = [ "pbkdf2", "sha1", "time", - "zstd 0.11.2+zstd.1.5.2", + "zstd", ] [[package]] @@ -4699,16 +6254,7 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe 5.0.2+zstd.1.5.2", -] - -[[package]] -name = "zstd" -version = "0.12.3+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" -dependencies = [ - "zstd-safe 6.0.5+zstd.1.5.4", + "zstd-safe", ] [[package]] @@ -4722,16 +6268,6 @@ dependencies = [ ] [[package]] -name = "zstd-safe" -version = "6.0.5+zstd.1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] name = "zstd-sys" version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 6dc77b86271f8..262a5e9e63e07 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -3,11 +3,12 @@ , rustPlatform , fetchFromGitHub , Security +, SystemConfiguration , nixosTests , nix-update-script }: -let version = "1.3.1"; +let version = "1.6.0"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -17,7 +18,7 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "MeiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-jttT4qChoqwTnjjoW0Zc15ZieZN7KD1Us64Tk0eDG3Y="; + hash = "sha256-B1psJeGWG0E5oPu+OVAxkdJNblqaBzB/CurpLxdESB8="; }; cargoBuildFlags = [ @@ -28,9 +29,11 @@ rustPlatform.buildRustPackage { lockFile = ./Cargo.lock; outputHashes = { "actix-web-static-files-3.0.5" = "sha256-2BN0RzLhdykvN3ceRLkaKwSZtel2DBqZ+uz4Qut+nII="; - "heed-0.12.7" = "sha256-mthHMaTqmNae8gpe4ZnozABKBrgFQdn9KWCvIzJJ+u4="; - "lmdb-rkv-sys-0.15.1" = "sha256-zLHTprwF7aa+2jaD7dGYmOZpJYFijMTb4I3ODflNUII="; + "arroy-0.1.0" = "sha256-ybKdB0eP8AdxLMNM7Si9onWITNc2SPNTXMgKdWdy34E="; + "candle-core-0.3.1" = "sha256-KlkjTUcbnP+uZoA0fDZlEPT5qKC2ogMAuR8X14xRFgA="; + "hf-hub-0.3.2" = "sha256-tsn76b+/HRvPnZ7cWd8SBcEdnMPtjUEIRJipOJUbz54="; "nelson-0.1.0" = "sha256-eF672quU576wmZSisk7oDR7QiDafuKlSg0BTQkXnzqY="; + "tokenizers-0.14.1" = "sha256-cq7dQLttNkV5UUhXujxKKMuzhD7hz+zTTKxUKlvz1s0="; }; }; @@ -38,7 +41,7 @@ rustPlatform.buildRustPackage { buildNoDefaultFeatures = true; buildInputs = lib.optionals stdenv.isDarwin [ - Security + Security SystemConfiguration ]; passthru = { diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index 73eb1fd97fa78..8e71e14671b54 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-j9bN09E4VikDPqvhRULfOjATme5KgVGrdv0rIPdd4Sw="; + hash = "sha256-km6z+Z9ZLnUY1dweJQrhHRu0XvdmqQIiqN8Ruy7jWpw="; }; nativeBuildInputs = [ @@ -41,7 +41,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { --set JAVA_HOME "${jre_headless}" wrapProgram $out/bin/opensearch-plugin --set JAVA_HOME "${jre_headless}" - wrapProgram $out/bin/opensearch-cli --set JAVA_HOME "${jre_headless}" + + rm $out/bin/opensearch-cli runHook postInstall ''; diff --git a/pkgs/servers/search/qdrant/Cargo.lock b/pkgs/servers/search/qdrant/Cargo.lock index ddb34d1095bea..bc8317de61571 100644 --- a/pkgs/servers/search/qdrant/Cargo.lock +++ b/pkgs/servers/search/qdrant/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "actix-cors" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b340e9cfa5b08690aae90fb61beb44e9b06f44fe3d0f93781aaa58cfba86245e" +checksum = "0346d8c1f762b41b458ed3145eea914966bb9ad20b9be0d6d463b20d45586370" dependencies = [ "actix-utils", "actix-web", @@ -68,9 +68,9 @@ dependencies = [ "actix-service", "actix-tls", "actix-utils", - "ahash 0.8.3", + "ahash 0.8.5", "base64 0.21.0", - "bitflags 2.3.3", + "bitflags 2.4.1", "brotli", "bytes", "bytestring", @@ -142,7 +142,7 @@ dependencies = [ "parse-size", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] @@ -242,7 +242,7 @@ dependencies = [ "actix-tls", "actix-utils", "actix-web-codegen", - "ahash 0.8.3", + "ahash 0.8.5", "bytes", "bytestring", "cfg-if", @@ -262,7 +262,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "smallvec", - "socket2 0.5.3", + "socket2 0.5.5", "time", "url", ] @@ -280,6 +280,21 @@ dependencies = [ ] [[package]] +name = "actix-web-httpauth" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d613edf08a42ccc6864c941d30fe14e1b676a77d16f1dbadc1174d065a0a775" +dependencies = [ + "actix-utils", + "actix-web", + "base64 0.21.0", + "futures-core", + "futures-util", + "log", + "pin-project-lite", +] + +[[package]] name = "actix-web-validator" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -329,25 +344,26 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.11", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" dependencies = [ "cfg-if", - "getrandom 0.2.8", + "getrandom 0.2.11", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -375,6 +391,12 @@ dependencies = [ ] [[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] name = "android-tzdata" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -397,9 +419,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -435,9 +457,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -457,7 +479,7 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "api" -version = "1.6.1" +version = "1.7.3" dependencies = [ "chrono", "common", @@ -472,6 +494,7 @@ dependencies = [ "segment", "serde", "serde_json", + "sparse", "thiserror", "tokio", "tonic", @@ -541,13 +564,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] @@ -561,33 +584,22 @@ dependencies = [ [[package]] name = "atomic_refcell" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905" +checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" [[package]] name = "atomicwrites" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1163d9d7c51de51a2b79d6df5e8888d11e9df17c752ce4a285fb6ca1580734e" +checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" dependencies = [ - "rustix 0.37.19", + "rustix 0.38.21", "tempfile", "windows-sys 0.48.0", ] [[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -698,7 +710,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] @@ -724,9 +736,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "bitvec" @@ -835,6 +847,15 @@ dependencies = [ ] [[package]] +name = "cancel" +version = "0.0.0" +dependencies = [ + "thiserror", + "tokio", + "tokio-util", +] + +[[package]] name = "cast" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -876,9 +897,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cgroups-rs" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb3af90c8d48ad5f432d8afb521b5b40c2a2fce46dd60e05912de51c47fba64" +checksum = "6db7c2f5545da4c12c5701455d9471da5f07db52e49b9cccb4f5512226dd0836" dependencies = [ "libc", "log", @@ -889,9 +910,9 @@ dependencies = [ [[package]] name = "charabia" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098219a776307414866165a03a9cc68c1578764fe3616fe979e1c280790ddd73" +checksum = "ffb924701d850fbf0331302e7f9715c04e494b4b9bebb38ac48bdd30924e1936" dependencies = [ "aho-corasick", "cow-utils", @@ -904,12 +925,14 @@ dependencies = [ "lindera-core", "lindera-dictionary", "lindera-tokenizer", + "litemap", "once_cell", "pinyin", "serde", "slice-group-by", "unicode-normalization", "whatlang", + "zerovec", ] [[package]] @@ -986,9 +1009,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.4" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", "clap_derive", @@ -996,9 +1019,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.4" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", @@ -1008,21 +1031,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "codespan-reporting" @@ -1043,6 +1066,7 @@ dependencies = [ "arc-swap", "async-trait", "atomicwrites", + "cancel", "chrono", "common", "criterion", @@ -1052,11 +1076,11 @@ dependencies = [ "hashring", "indicatif", "io", - "itertools 0.11.0", + "itertools 0.12.0", "log", "merge", "num_cpus", - "ordered-float 3.9.1", + "ordered-float 4.2.0", "parking_lot", "pprof", "rand 0.8.5", @@ -1068,11 +1092,13 @@ dependencies = [ "serde", "serde_cbor", "serde_json", + "sparse", "tar", "tempfile", "thiserror", "tinyvec", "tokio", + "tokio-util", "tonic", "tower", "tracing", @@ -1090,11 +1116,10 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "colored" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" dependencies = [ - "is-terminal", "lazy_static", "windows-sys 0.48.0", ] @@ -1103,20 +1128,16 @@ dependencies = [ name = "common" version = "0.0.0" dependencies = [ - "ordered-float 3.9.1", + "ordered-float 4.2.0", "serde", "validator", ] [[package]] -name = "common-workspace-stub" -version = "0.0.0" - -[[package]] name = "config" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7" +checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca" dependencies = [ "async-trait", "json5", @@ -1212,10 +1233,20 @@ dependencies = [ ] [[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.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cow-utils" @@ -1242,21 +1273,15 @@ dependencies = [ ] [[package]] -name = "crc" -version = "3.0.0" +name = "crc32c" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" +checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" dependencies = [ - "crc-catalog", + "rustc_version", ] [[package]] -name = "crc-catalog" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" - -[[package]] name = "crc32fast" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1309,9 +1334,9 @@ checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1446,7 +1471,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] @@ -1457,7 +1482,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] @@ -1629,9 +1654,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -1647,19 +1672,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2d328fc287c61314c4a61af7cfdcbd7e678e39778488c7cb13ec133ce0f4059" dependencies = [ "fsio", - "indexmap", + "indexmap 1.9.2", ] [[package]] -name = "errno" -version = "0.2.8" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" @@ -1758,7 +1778,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] @@ -1769,22 +1789,21 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "fs4" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea55201cc351fdb478217c0fb641b59813da9b4efe4c414a9d8f989a657d149" +checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7" dependencies = [ - "libc", - "rustix 0.35.13", - "winapi", + "rustix 0.38.21", + "windows-sys 0.48.0", ] [[package]] @@ -1813,9 +1832,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1828,9 +1847,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1838,15 +1857,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1855,32 +1874,32 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-timer" @@ -1890,9 +1909,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -1940,9 +1959,9 @@ dependencies = [ [[package]] name = "geo" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" +checksum = "4841b40fdbccd4b7042bd6195e4de91da54af34c50632e371bcbfcdfb558b873" dependencies = [ "earcutr", "float_next_after", @@ -1952,13 +1971,14 @@ dependencies = [ "num-traits", "robust", "rstar", + "spade", ] [[package]] name = "geo-types" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa" +checksum = "567495020b114f1ce9bed679b29975aa0bfae06ac22beacd5cfde5dabe7b05d6" dependencies = [ "approx", "num-traits", @@ -2007,9 +2027,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", @@ -2042,9 +2062,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.17" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -2052,7 +2072,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.2", "slab", "tokio", "tokio-util", @@ -2080,20 +2100,24 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash 0.8.5", + "allocator-api2", +] [[package]] name = "hashring" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c499ff70b6f65833dd5961abe0464eb295ec69993ba3ab0066f42be4fbb98b85" +checksum = "aa283406d74fcfeb4778f4e300beaae30db96793371da168d003cbc833e149e0" dependencies = [ "siphasher", ] @@ -2132,18 +2156,9 @@ checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -2296,6 +2311,16 @@ dependencies = [ ] [[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 = "if_chain" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2319,6 +2344,16 @@ dependencies = [ ] [[package]] +name = "indexmap" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", +] + +[[package]] name = "indicatif" version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2333,13 +2368,13 @@ dependencies = [ [[package]] name = "inferno" -version = "0.11.13" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7207d75fcf6c1868f1390fc1c610431fe66328e9ee6813330a041ef6879eca1" +checksum = "abfb2e51b23c338595ae0b6bdaaa7a4a8b860b8d788a4331cb07b50fe5dea71b" dependencies = [ - "ahash 0.8.3", - "atty", - "indexmap", + "ahash 0.8.5", + "indexmap 2.0.1", + "is-terminal", "itoa", "log", "num-format", @@ -2380,17 +2415,11 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" - -[[package]] -name = "io-lifetimes" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -2428,9 +2457,9 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes 1.0.11", - "rustix 0.37.19", + "hermit-abi", + "io-lifetimes", + "rustix 0.37.27", "windows-sys 0.45.0", ] @@ -2445,9 +2474,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" dependencies = [ "either", ] @@ -2466,7 +2495,7 @@ checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e" dependencies = [ "cedarwood", "fxhash", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "lazy_static", "phf", "phf_codegen", @@ -2522,9 +2551,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libloading" @@ -2569,9 +2598,9 @@ dependencies = [ [[package]] name = "lindera-cc-cedict-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2e8f2ca97ddf952fe340642511b9c14b373cb2eef711d526bb8ef2ca0969b8" +checksum = "6f567a47e47b5420908424de2c6c5e424e3cafe588d0146bd128c0f3755758a3" dependencies = [ "anyhow", "bincode", @@ -2588,9 +2617,9 @@ dependencies = [ [[package]] name = "lindera-compress" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f72b460559bcbe8a9cee85ea4a5056133ed3abf373031191589236e656d65b59" +checksum = "49f3e553d55ebe9881fa5e5de588b0a153456e93564d17dfbef498912caf63a2" dependencies = [ "anyhow", "flate2", @@ -2599,9 +2628,9 @@ dependencies = [ [[package]] name = "lindera-core" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f586eb8a9393c32d5525e0e9336a3727bd1329674740097126f3b0bff8a1a1ea" +checksum = "a9a2440cc156a4a911a174ec68203543d1efb10df3a700a59b6bf581e453c726" dependencies = [ "anyhow", "bincode", @@ -2616,9 +2645,9 @@ dependencies = [ [[package]] name = "lindera-decompress" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb1facd8da698072fcc7338bd757730db53d59f313f44dd583fa03681dcc0e1" +checksum = "e077a410e61c962cb526f71b7effd62ffc607488a8f61869c937582d2ccb529b" dependencies = [ "anyhow", "flate2", @@ -2627,9 +2656,9 @@ dependencies = [ [[package]] name = "lindera-dictionary" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7be7410b1da7017a8948986b87af67082f605e9a716f0989790d795d677f0c" +checksum = "d9f57491adf7b311a3ee87f5e4a36454df16a2ec73de4ef28b2106fac80bd782" dependencies = [ "anyhow", "bincode", @@ -2647,9 +2676,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705d07f8a45d04fd95149f7ad41a26d1f9e56c9c00402be6f9dd05e3d88b99c6" +checksum = "a3476ec7748aebd2eb23d496ddfce5e7e0a5c031cffcd214451043e02d029f11" dependencies = [ "anyhow", "bincode", @@ -2668,9 +2697,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-neologd-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633a93983ba13fba42328311a501091bd4a7aff0c94ae9eaa9d4733dd2b0468a" +checksum = "7b1c7576a02d5e4af2bf62de51790a01bc4b8bc0d0b6a6b86a46b157f5cb306d" dependencies = [ "anyhow", "bincode", @@ -2689,9 +2718,9 @@ dependencies = [ [[package]] name = "lindera-ko-dic" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a428e0d316b6c86f51bd919479692bc41ad840dba266ebc044663970f431ea18" +checksum = "b713ecd5b827d7d448c3c5eb3c6d5899ecaf22cd17087599996349a02c76828d" dependencies = [ "bincode", "byteorder", @@ -2706,9 +2735,9 @@ dependencies = [ [[package]] name = "lindera-ko-dic-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5288704c6b8a069c0a1705c38758e836497698b50453373ab3d56c6f9a7ef8" +checksum = "3e545752f6487be87b572529ad594cb3b48d2ef20821516f598b2d152d23277b" dependencies = [ "anyhow", "bincode", @@ -2726,9 +2755,9 @@ dependencies = [ [[package]] name = "lindera-tokenizer" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106ba439b2e87529d9bbedbb88d69f635baba1195c26502b308f55a85885fc81" +checksum = "24a2d4606a5a4da62ac4a3680ee884a75da7f0c892dc967fc9cb983ceba39a8f" dependencies = [ "bincode", "byteorder", @@ -2741,9 +2770,9 @@ dependencies = [ [[package]] name = "lindera-unidic" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3399b6dcfe1701333451d184ff3c677f433b320153427b146360c9e4bd8cb816" +checksum = "388b1bdf81794b5d5b8057ce0321c58ff4b90d676b637948ccc7863ae2f43d28" dependencies = [ "bincode", "byteorder", @@ -2758,9 +2787,9 @@ dependencies = [ [[package]] name = "lindera-unidic-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b698227fdaeac32289173ab389b990d4eb00a40cbc9912020f69a0c491dabf55" +checksum = "cdfa3e29a22c047da57fadd960ff674b720de15a1e2fb35b5ed67f3408afb469" dependencies = [ "anyhow", "bincode", @@ -2793,27 +2822,21 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.0.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] -name = "linux-raw-sys" -version = "0.4.3" +name = "litemap" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "575d8a551c59104b4df91269921e5eab561aa1b77c618dac0414b5d44a4617de" [[package]] name = "local-channel" @@ -2895,9 +2918,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.7.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +checksum = "39a69c7c189ae418f83003da62820aca28d15a07725ce51fb924999335d622ff" dependencies = [ "libc", ] @@ -2916,7 +2939,7 @@ name = "memory" version = "0.0.0" dependencies = [ "log", - "memmap2 0.7.1", + "memmap2 0.9.2", "parking_lot", "serde", ] @@ -2985,9 +3008,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "log", @@ -3068,13 +3091,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] @@ -3103,7 +3126,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", ] @@ -3136,18 +3159,18 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "ordered-float" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ "num-traits", ] [[package]] name = "ordered-float" -version = "3.9.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" dependencies = [ "num-traits", ] @@ -3243,9 +3266,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permutation_iterator" @@ -3308,7 +3331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.9.2", ] [[package]] @@ -3475,7 +3498,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" dependencies = [ "proc-macro2", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] @@ -3513,15 +3536,25 @@ dependencies = [ [[package]] name = "procfs" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943ca7f9f29bab5844ecd8fdb3992c5969b6622bb9609b9502fef9b4310e3f1f" +checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 1.3.2", - "byteorder", + "bitflags 2.4.1", "hex", "lazy_static", - "rustix 0.36.13", + "procfs-core", + "rustix 0.38.21", +] + +[[package]] +name = "procfs-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +dependencies = [ + "bitflags 2.4.1", + "hex", ] [[package]] @@ -3540,19 +3573,19 @@ dependencies = [ [[package]] name = "proptest" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", - "bitflags 1.3.2", - "byteorder", + "bit-vec", + "bitflags 2.4.1", "lazy_static", "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.6.28", + "regex-syntax 0.8.2", "rusty-fork", "tempfile", "unarray", @@ -3610,7 +3643,7 @@ checksum = "30d3e647e9eb04ddfef78dfee2d5b3fefdf94821c84b710a3d8ebc89ede8b164" dependencies = [ "bytes", "heck", - "itertools 0.11.0", + "itertools 0.10.5", "log", "multimap", "once_cell", @@ -3619,7 +3652,7 @@ dependencies = [ "prost 0.12.0", "prost-types 0.12.0", "regex", - "syn 2.0.28", + "syn 2.0.32", "tempfile", "which", ] @@ -3644,10 +3677,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56075c27b20ae524d00f247b8a4dc333e5784f889fe63099f8e626bc8d73486c" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.10.5", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] @@ -3709,15 +3742,17 @@ dependencies = [ [[package]] name = "qdrant" -version = "1.6.1" +version = "1.7.3" dependencies = [ "actix-cors", "actix-files", "actix-multipart", "actix-web", + "actix-web-httpauth", "actix-web-validator", "anyhow", "api", + "cancel", "chrono", "clap", "collection", @@ -3728,7 +3763,7 @@ dependencies = [ "constant_time_eq 0.3.0", "futures", "futures-util", - "itertools 0.11.0", + "itertools 0.12.0", "log", "memory", "num-traits", @@ -3738,6 +3773,7 @@ dependencies = [ "prost 0.11.9", "raft", "raft-proto", + "rand 0.8.5", "reqwest", "rstack-self", "rustls", @@ -3752,6 +3788,7 @@ dependencies = [ "serde_urlencoded", "slog", "slog-stdlog", + "sparse", "storage", "sys-info", "tar", @@ -3775,7 +3812,7 @@ dependencies = [ [[package]] name = "quantization" version = "0.1.0" -source = "git+https://github.com/qdrant/quantization.git#ff306d0d990d7286ee1fa3a603daa7efd343ad0c" +source = "git+https://github.com/qdrant/quantization.git#939fdb627a8edcf92fd71e3c79017156690850e9" dependencies = [ "cc", "permutation_iterator", @@ -3901,7 +3938,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.11", ] [[package]] @@ -3934,9 +3971,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -3944,14 +3981,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -3965,9 +4000,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] @@ -4005,6 +4040,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[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.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4012,9 +4053,9 @@ checksum = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64 0.21.0", "bytes", @@ -4038,6 +4079,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-rustls", "tokio-util", @@ -4070,12 +4112,26 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] [[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.11", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + +[[package]] name = "rmp" version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4187,7 +4243,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.28", + "syn 2.0.32", "unicode-ident", ] @@ -4224,41 +4280,13 @@ dependencies = [ [[package]] name = "rustix" -version = "0.35.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" -dependencies = [ - "bitflags 1.3.2", - "errno 0.2.8", - "io-lifetimes 0.7.5", - "libc", - "linux-raw-sys 0.0.46", - "windows-sys 0.42.0", -] - -[[package]] -name = "rustix" -version = "0.36.13" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", - "errno 0.3.1", - "io-lifetimes 1.0.11", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustix" -version = "0.37.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -dependencies = [ - "bitflags 1.3.2", - "errno 0.3.1", - "io-lifetimes 1.0.11", + "errno", + "io-lifetimes", "libc", "linux-raw-sys 0.3.8", "windows-sys 0.48.0", @@ -4266,26 +4294,26 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.3" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.3.3", - "errno 0.3.1", + "bitflags 2.4.1", + "errno", "libc", - "linux-raw-sys 0.4.3", + "linux-raw-sys 0.4.11", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring", - "rustls-webpki 0.101.4", + "ring 0.17.5", + "rustls-webpki 0.101.7", "sct", ] @@ -4304,18 +4332,18 @@ version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -4377,13 +4405,13 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" +checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ "chrono", "dyn-clone", - "indexmap", + "indexmap 1.9.2", "schemars_derive", "serde", "serde_json", @@ -4393,9 +4421,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" +checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" dependencies = [ "proc-macro2", "quote", @@ -4427,8 +4455,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4478,17 +4506,19 @@ dependencies = [ "geohash", "io", "io-uring", - "itertools 0.11.0", + "itertools 0.12.0", + "lazy_static", "log", - "memmap2 0.7.1", + "memmap2 0.9.2", "memory", "num-derive", "num-traits", "num_cpus", - "ordered-float 3.9.1", + "ordered-float 4.2.0", "parking_lot", "pprof", "procfs", + "proptest", "quantization", "rand 0.8.5", "rand_distr", @@ -4518,15 +4548,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -4537,7 +4567,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" dependencies = [ - "ordered-float 2.10.0", + "ordered-float 2.10.1", "serde", ] @@ -4553,13 +4583,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] @@ -4575,9 +4605,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -4740,25 +4770,42 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", ] [[package]] +name = "spade" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87a3ef2efbc408c9051c1a27ce7edff430d74531d31a480b7ca4f618072c2670" +dependencies = [ + "hashbrown 0.14.2", + "num-traits", + "robust", + "smallvec", +] + +[[package]] name = "sparse" version = "0.1.0" dependencies = [ "common", "io", - "memmap2 0.7.1", + "itertools 0.12.0", + "memmap2 0.9.2", "memory", + "ordered-float 4.2.0", + "rand 0.8.5", + "schemars", "serde", "serde_json", "tempfile", + "validator", ] [[package]] @@ -4796,13 +4843,15 @@ dependencies = [ "api", "async-trait", "atomicwrites", + "cancel", "chrono", "collection", + "common", "env_logger", "futures", "http", "io", - "itertools 0.11.0", + "itertools 0.12.0", "log", "memory", "num_cpus", @@ -4884,9 +4933,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -4911,9 +4960,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.10" +version = "0.29.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" +checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4925,6 +4974,27 @@ dependencies = [ ] [[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 = "tap" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4943,14 +5013,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix 0.38.3", + "redox_syscall 0.4.1", + "rustix 0.38.21", "windows-sys 0.48.0", ] @@ -4975,22 +5045,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] @@ -5089,9 +5159,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.32.0" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" dependencies = [ "backtrace", "bytes", @@ -5101,7 +5171,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.5", "tokio-macros", "tracing", "windows-sys 0.48.0", @@ -5119,13 +5189,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] @@ -5151,9 +5221,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -5205,15 +5275,15 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b477abbe1d18c0b08f56cd01d1bc288668c5b5cfd19b2ae1886bbf599c546f1" +checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease 0.2.4", "proc-macro2", "prost-build 0.12.0", "quote", - "syn 2.0.28", + "syn 2.0.32", ] [[package]] @@ -5237,7 +5307,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap", + "indexmap 1.9.2", "pin-project", "pin-project-lite", "rand 0.8.5", @@ -5297,20 +5367,20 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -5423,6 +5493,12 @@ 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 = "unwind" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5460,12 +5536,12 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna", + "idna 0.5.0", "percent-encoding", "serde", ] @@ -5478,11 +5554,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.11", "serde", ] @@ -5492,7 +5568,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" dependencies = [ - "idna", + "idna 0.4.0", "lazy_static", "regex", "serde", @@ -5558,19 +5634,19 @@ dependencies = [ [[package]] name = "wal" version = "0.1.2" -source = "git+https://github.com/qdrant/wal.git?rev=a32f6a38acf7ffd761df83b0790eaefeb107cd60#a32f6a38acf7ffd761df83b0790eaefeb107cd60" +source = "git+https://github.com/qdrant/wal.git?rev=fad0e7c48be58d8e7db4cc739acd9b1cf6735de0#fad0e7c48be58d8e7db4cc739acd9b1cf6735de0" dependencies = [ "byteorder", - "crc", + "crc32c", "crossbeam-channel", "docopt", "env_logger", "fs4", "log", - "memmap2 0.7.1", + "memmap2 0.9.2", "rand 0.8.5", "rand_distr", - "rustix 0.38.3", + "rustix 0.38.21", "serde", ] @@ -5962,6 +6038,41 @@ dependencies = [ ] [[package]] +name = "zerocopy" +version = "0.7.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "zerofrom" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" + +[[package]] +name = "zerovec" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "591691014119b87047ead4dcf3e6adfbf73cb7c38ab6980d4f18a32138f35d46" +dependencies = [ + "zerofrom", +] + +[[package]] name = "zip" version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index a3aee4fc59360..e7df375495a07 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -8,39 +8,47 @@ , rust-jemalloc-sys , nix-update-script , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.6.1"; + version = "1.7.3"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-G9nA0F3KKl6mLgcpuMW1uikOyBcBsJ1qd2IlMhW4vhg="; + sha256 = "sha256-5c8lQ1CTtYjzrIfHev5aq1FbfctKr5UXylZzzJtyo+o="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "quantization-0.1.0" = "sha256-FfjLNSPjgVTx2ReqqMeyYujnCz9fPgjWX99r3Lik8oA="; + "quantization-0.1.0" = "sha256-ggVqJiftu0nvyEM0dzsH0JqIc/Z1XILyUSKiJHeuuZs="; "tonic-0.9.2" = "sha256-ZlcDUZy/FhxcgZE7DtYhAubOq8DMSO17T+TCmXar1jE="; - "wal-0.1.2" = "sha256-sMleBUAZcSnUx7/oQZr9lSDmVHxUjfGaVodvVtFEle0="; + "wal-0.1.2" = "sha256-nBGwpphtj+WBwL9TmWk7qXiEqlIWkgh/2V9uProqhMk="; }; }; - # Needed to get openssl-sys to use pkg-config. - OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl rust-jemalloc-sys - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.isDarwin [ + Security + SystemConfiguration + ]; nativeBuildInputs = [ protobuf rustPlatform.bindgenHook pkg-config ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + env = { + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-faligned-allocation"; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/servers/search/sonic-server/default.nix index 81d56fcf0340d..ff8ef63ef0e95 100644 --- a/pkgs/servers/search/sonic-server/default.nix +++ b/pkgs/servers/search/sonic-server/default.nix @@ -1,7 +1,10 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub +, fetchpatch , nix-update-script +, nixosTests , testers , sonic-server }: @@ -17,7 +20,17 @@ rustPlatform.buildRustPackage rec { hash = "sha256-V97K4KS46DXje4qKA11O9NEm0s13aTUnM+XW8lGc6fo="; }; - cargoHash = "sha256-vWAFWoscV0swwrBQoa3glKXMRgdGYa+QrPprlVCP1QM="; + cargoPatches = [ + # Update rocksdb to 0.21 to fix compilation issues against clang 16, see: + # https://github.com/valeriansaliou/sonic/issues/315 + # https://github.com/valeriansaliou/sonic/pull/316 + (fetchpatch { + url = "https://github.com/valeriansaliou/sonic/commit/81d5f1efec21ef8b911ed3303fcbe9ca6335f562.patch"; + hash = "sha256-nOvHThTc2L3UQRVusUsD/OzbSkhSleZc6n0WyZducHM="; + }) + ]; + + cargoHash = "sha256-k+gPCkf8DCnuv/aLXcQwjmsDUu/eqSEqKXlUyj8bRq8="; # Found argument '--test-threads' which wasn't expected, or isn't valid in this context doCheck = false; @@ -42,6 +55,7 @@ rustPlatform.buildRustPackage rec { passthru = { tests = { + inherit (nixosTests) sonic-server; version = testers.testVersion { command = "sonic --version"; package = sonic-server; diff --git a/pkgs/servers/search/typesense/sources.json b/pkgs/servers/search/typesense/sources.json index bd7a422a2f0b4..0e94b56e5ee1a 100644 --- a/pkgs/servers/search/typesense/sources.json +++ b/pkgs/servers/search/typesense/sources.json @@ -1,17 +1,17 @@ { - "version": "0.25.1", + "version": "0.25.2", "platforms": { "aarch64-linux": { "arch": "linux-arm64", - "hash": "sha256-u5gkAcSw0AG0+NK3/1O90leOyM8I03/EXxFAXoFSqt4=" + "hash": "sha256-cSKOSy31mwRn8hw4fSm3w7+8Y4MeQs4+ZN+/pOX15jM=" }, "x86_64-linux": { "arch": "linux-amd64", - "hash": "sha256-XebMzmTkLn+kKa0gAnoSMPmPxbxysfPnes4RQ3hqShc=" + "hash": "sha256-CuCKFAGgGhq4gKinjZn8bRz0BCJG5GbvW7rSaAXOhJo=" }, "x86_64-darwin": { "arch": "darwin-amd64", - "hash": "sha256-zz8GObtjDgMWx4HDcwugMWeS/n40/1jPwN/8rXIb5+8=" + "hash": "sha256-xNvsP6yIH8GI5RLH+jRgZC08Mch2Z1WFsEHIwfcI77A=" } } } diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/servers/search/weaviate/default.nix index f63805cd36e45..75f3efe175157 100644 --- a/pkgs/servers/search/weaviate/default.nix +++ b/pkgs/servers/search/weaviate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.21.7"; + version = "1.23.1"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-fhBjKmWtbivntgBFmxfG4bQNUvCdP5uWtysOvsSqFuw="; + hash = "sha256-sQp0RarW+SRxhDmXm1fSI1xEPKPMQ8coJiyJK5d2NlA="; }; - vendorHash = "sha256-/ylYXwgJKtkAIvYgSsl8MzBxuxp0Nco3ZR4ZBdmmS+w="; + vendorHash = "sha256-UEdGoXKq7ewNszahgcomjjuO2uzRZpiwkvvnXyFc9Og="; subPackages = [ "cmd/weaviate-server" ]; diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index 7ca94e4e402c2..8782e56fdb6d3 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - hash = "sha256-OFj9lYwI42zEcyUtsAwnkNUAaa6J4Ids4pMXquUcpJA="; + hash = "sha256-6G5kpMe58PaOII/8WzHTK2EkwD1cTUn7VP2EMlcuF14="; }; passthru = { @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ emantor ]; platforms = with platforms; linux; + mainProgram = "ser2net"; }; } diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix index 085f0fb8cc9fe..ee6d8c8d15b50 100644 --- a/pkgs/servers/sftpgo/default.nix +++ b/pkgs/servers/sftpgo/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.5.4"; + version = "2.5.6"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; rev = "refs/tags/v${version}"; - hash = "sha256-Xhu7QNPox0i6UuunRF1APYqdLrrlW0nR2BjzsABBnCw="; + hash = "sha256-ea4DbPwi2tcRgmbNsZKKUOVkp6vjRbr679yAP7znNUc="; }; - vendorHash = "sha256-XAfGNRHXLGzvZ5E397CNVx9VuSa///yoX49hwQKuAA4="; + vendorHash = "sha256-8TBDaDBLy+82BwsaLncDknVIrauF0eop9e2ZhwcLmIs="; ldflags = [ "-s" @@ -60,5 +60,6 @@ buildGoModule rec { ''; license = licenses.agpl3Only; maintainers = with maintainers; [ thenonameguy yayayayaka ]; + mainProgram = "sftpgo"; }; } diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix index 90db957d3c011..2a7e643b60fd3 100644 --- a/pkgs/servers/shairplay/default.nix +++ b/pkgs/servers/shairplay/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + mainProgram = "shairplay"; }; } diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index e75dc72a13540..68e427d61ab02 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.30.4"; + version = "3.30.7"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-me52Ji+IWPN6IEDWsAlIoGPS45uA22+dxHJjqnYPniE="; + hash = "sha256-J0nruwx2Tt2QmloDTQoUQiEjR7UD/B5kY8A5SrUob1I="; }; patches = [ diff --git a/pkgs/servers/simple-http-server/default.nix b/pkgs/servers/simple-http-server/default.nix index f2d8309d09019..4015927424261 100644 --- a/pkgs/servers/simple-http-server/default.nix +++ b/pkgs/servers/simple-http-server/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "simple-http-server"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "TheWaWaR"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xi5tJIfK4zjckKERhxHuDqeyOB9Dxul/eFLKOtpgR/w="; + sha256 = "sha256-QVNHomav8k1HflrOoQ7Ub5ZSCExpikbe0iAaVlAJEEs="; }; - cargoSha256 = "sha256-wv1hlBTQe1Mm67J2FqrrXSSlZkFPB0TzKc5VUMMfUIQ="; + cargoHash = "sha256-uDdzv0uPITE4DySoHPMFkJ0/wrPNZOao43Z7tOhRboI="; nativeBuildInputs = [ pkg-config ]; @@ -35,5 +35,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/TheWaWaR/simple-http-server/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda mephistophiles ]; + mainProgram = "simple-http-server"; }; } diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix index d673a201646dc..b14056f5adca1 100644 --- a/pkgs/servers/simplehttp2server/default.nix +++ b/pkgs/servers/simplehttp2server/default.nix @@ -20,6 +20,7 @@ buildGoPackage rec { description = "HTTP/2 server for development purposes"; license = licenses.asl20; maintainers = with maintainers; [ yrashk ]; + mainProgram = "simplehttp2server"; }; } diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 55721a38cd8bd..8174e85c3a439 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -104,12 +104,12 @@ in stdenv.mkDerivation rec { pname = "freeswitch"; - version = "1.10.10"; + version = "1.10.11"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3Mm/hbMwnlwbtiOFlODtKItVyj34O3beZDlV8YoJmts="; + hash = "sha256-LzGqrXzPED3PoCDnrwUmmSQsvlAucYo2gTkwFausM7A="; }; postPatch = '' @@ -126,20 +126,6 @@ stdenv.mkDerivation rec { done ''; - ## TODO Validate with the next upstream release - patches = [ - (fetchpatch { - name = "CVE-2023-44488.patch"; - url = "https://github.com/signalwire/freeswitch/commit/f1fb05214e4f427dcf922f531431ab649cf0622b.patch"; - hash = "sha256-6GMebE6O2EBx60NE2LSRVljaiLm9T4zTrkIpwGvaB08="; - }) - (fetchpatch { - name = "CVE-2023-5217.patch"; - url = "https://github.com/signalwire/freeswitch/commit/6f9e72c585265d8def8a613b36cd4f524c201980.patch"; - hash = "sha256-l64mBpyq/TzRM78n73kbuD0UNsk5zIH5QNJlMKdPfr4="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ pkg-config autoreconfHook perl which yasm ]; buildInputs = [ @@ -181,7 +167,7 @@ stdenv.mkDerivation rec { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = "https://freeswitch.org/"; license = lib.licenses.mpl11; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ mikaelfangel ]; platforms = with lib.platforms; unix; broken = stdenv.isDarwin; }; diff --git a/pkgs/servers/sip/kamailio/default.nix b/pkgs/servers/sip/kamailio/default.nix index 2db991ceacac7..2732216cc15fc 100644 --- a/pkgs/servers/sip/kamailio/default.nix +++ b/pkgs/servers/sip/kamailio/default.nix @@ -1,76 +1,111 @@ { callPackage , fetchurl , lib -, pkgs , stdenv +, pkg-config +, which +, bison +, flex +, json_c +, libevent +, libxml2 +, mariadb-connector-c +, pcre +, gnugrep +, gawk +, coreutils +, gdb +, gnused +, openssl }: stdenv.mkDerivation (finalAttrs: { pname = "kamailio"; - version = "5.7.2"; - - meta = { - description = "Fast and flexible SIP server, proxy, SBC, and load balancer"; - homepage = "https://www.kamailio.org/"; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ mawis ]; - platforms = lib.platforms.linux; - }; + version = "5.7.3"; src = fetchurl { - url = "https://www.kamailio.org/pub/kamailio/5.7.2/src/kamailio-${finalAttrs.version}_src.tar.gz"; - hash = "sha256-csmgZ9qNb6kg03N9mM1/ZsMh+Ay+EHbi1aOStCJQMSI="; + url = "https://www.kamailio.org/pub/kamailio/${finalAttrs.version}/src/kamailio-${finalAttrs.version}_src.tar.gz"; + hash = "sha256-x6YgsDl05OBNQZ4Iancf0Leo4mnz1pwZocZghaSY/Yw="; }; - buildInputs = with pkgs; [ - bison - flex - gnugrep - json_c.dev - libevent.dev - libxml2.dev - mariadb-connector-c.dev - pcre.dev + buildInputs = [ + json_c + libevent + libxml2 + mariadb-connector-c + pcre + openssl ]; - nativeBuildInputs = with pkgs; [ + nativeBuildInputs = [ pkg-config which + bison + flex + ]; + + modules = [ + "db_mysql" + "dialplan" + "jsonrpcc" + "json" + "lcr" + "presence" + "presence_conference" + "presence_dialoginfo" + "presence_mwi" + "presence_profile" + "presence_reginfo" + "presence_xml" + "pua" + "pua_bla" + "pua_dialoginfo" + "pua_json" + "pua_reginfo" + "pua_rpc" + "pua_usrloc" + "pua_xmpp" + "regex" + "rls" + "tls" + "xcap_client" + "xcap_server" ]; configurePhase = '' runHook preConfigure - make PREFIX="$out" include_modules="db_mysql dialplan jsonrpcc json lcr presence presence_conference presence_dialoginfo presence_mwi presence_profile presence_reginfo presence_xml pua pua_bla pua_dialoginfo pua_json pua_reginfo pua_rpc pua_usrloc pua_xmpp regex rls xcap_client xcap_server" cfg + make PREFIX="$out" include_modules="${lib.concatStringsSep " " finalAttrs.modules}" cfg runHook postConfigure ''; - buildPhase = '' - runHook preBuild - - make MYSQLCFG=${pkgs.mariadb-connector-c.dev}/bin/mariadb_config all - - runHook postBuild + preInstall = '' + makeFlagsArray+=(PREFIX="$out" "MYSQLCFG=${lib.getDev mariadb-connector-c}/bin/mariadb_config") ''; - installPhase = '' - runHook preInstall - - make MYSQLCFG=${pkgs.mariadb-connector-c.dev}/bin/mariadb_config install - echo 'MD5="${pkgs.coreutils}/bin/md5sum"' >> $out/etc/kamailio/kamctlrc - echo 'AWK="${pkgs.gawk}/bin/awk"' >> $out/etc/kamailio/kamctlrc - echo 'GDB="${pkgs.gdb}/bin/gdb"' >> $out/etc/kamailio/kamctlrc - echo 'GREP="${pkgs.gnugrep}/bin/grep "' >> $out/etc/kamailio/kamctlrc - echo 'EGREP="${pkgs.gnugrep}/bin/grep -E"' >> $out/etc/kamailio/kamctlrc - echo 'SED="${pkgs.gnused}/bin/sed"' >> $out/etc/kamailio/kamctlrc - echo 'LAST_LINE="${pkgs.coreutils}/bin/tail -n 1"' >> $out/etc/kamailio/kamctlrc - echo 'EXPR="${pkgs.gnugrep}/bin/expr"' >> $out/etc/kamailio/kamctlrc - - runHook postInstall + postInstall = '' + echo 'MD5="${coreutils}/bin/md5sum"' >> $out/etc/kamailio/kamctlrc + echo 'AWK="${gawk}/bin/awk"' >> $out/etc/kamailio/kamctlrc + echo 'GDB="${gdb}/bin/gdb"' >> $out/etc/kamailio/kamctlrc + echo 'GREP="${gnugrep}/bin/grep "' >> $out/etc/kamailio/kamctlrc + echo 'EGREP="${gnugrep}/bin/grep -E"' >> $out/etc/kamailio/kamctlrc + echo 'SED="${gnused}/bin/sed"' >> $out/etc/kamailio/kamctlrc + echo 'LAST_LINE="${coreutils}/bin/tail -n 1"' >> $out/etc/kamailio/kamctlrc + echo 'EXPR="${gnugrep}/bin/expr"' >> $out/etc/kamailio/kamctlrc ''; + enableParallelBuilding = true; + passthru.tests = { - kamailio-bin = callPackage ./test-kamailio-bin {}; + kamailio-bin = callPackage ./test-kamailio-bin { }; + }; + + meta = { + description = "Fast and flexible SIP server, proxy, SBC, and load balancer"; + homepage = "https://www.kamailio.org/"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ mawis ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 2ae2efbbb7596..6d23a42abb143 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { homepage = "https://github.com/skynetservices/skydns"; license = lib.licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "skydns"; }; } diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 08d9dbe97e6f7..c340ee1d9d215 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -16,6 +16,9 @@ let perlPackages = perl538Packages; + + binPath = lib.makeBinPath ([ lame flac faad2 sox wavpack ] ++ (lib.optional stdenv.isLinux monkeysAudio)); + libPath = lib.makeLibraryPath [ zlib stdenv.cc.cc.lib ]; in perlPackages.buildPerlPackage rec { pname = "slimserver"; @@ -118,6 +121,9 @@ perlPackages.buildPerlPackage rec { rm -r CPAN mv CPAN_used CPAN + # another set of vendored/modified modules exist in lib, more selectively cleaned for now + rm -rf lib/Audio + ${lib.optionalString (!enableUnfreeFirmware) '' # remove unfree firmware rm -rf Firmware @@ -130,9 +136,8 @@ perlPackages.buildPerlPackage rec { installPhase = '' cp -r . $out - wrapProgram $out/slimserver.pl \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib stdenv.cc.cc.lib ]}" \ - --prefix PATH : "${lib.makeBinPath ([ lame flac faad2 sox wavpack ] ++ (lib.optional stdenv.isLinux monkeysAudio))}" + wrapProgram $out/slimserver.pl --prefix LD_LIBRARY_PATH : "${libPath}" --prefix PATH : "${binPath}" + wrapProgram $out/scanner.pl --prefix LD_LIBRARY_PATH : "${libPath}" --prefix PATH : "${binPath}" mkdir $out/bin ln -s $out/slimserver.pl $out/bin/slimserver ''; diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index 49c2c27890ff0..d0d8e34347228 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.42"; + version = "2.45"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-cLSbmEZj5lyMtZMM2vaWqdrXFk1/VPws9yBPhSUka2E="; + hash = "sha256-zSmzG/Ws7/6rXBNqAtKqnWcsPA9jy/TidXlklwGhArc="; }; buildInputs = [ curl openssl ]; diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 312629fc3b62a..e8120224990e3 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.29.2"; + version = "2.33.0"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-f7xjjYy7uPSgssEftXPrfEcNrU6OFlXgwoTTWXgHfUU="; + sha256 = "sha256-71JgCkser7pGMVeSbiw97R2AoxQI76A6nPC7cTa2eow="; }; sourceRoot = "snappymail"; diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index 5def527fd0996..c29162090811c 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.7.1"; + version = "0.7.4"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - hash = "sha256-PY/BHfuDRHXpzyUawzZhDr1m0c1tWqawW7GP9muhYAs="; + hash = "sha256-sPsyZpmk0DJoM2Qn+hvv/FZZkogyi1fa7eEW68Vwf+g="; }; - vendorHash = "sha256-jtEiikjEOThTSrd+UIEInxQmt2z5YVyksuTC17VmdkA="; + vendorHash = "sha256-1Fy/DwCnWg8VNonRSAnm4M9EHwMUBhBxcWBoMqHPuHQ="; doCheck = false; diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index 63f94093a84cf..705c5b935bfbd 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sozu"; - version = "0.15.15"; + version = "0.15.19"; src = fetchFromGitHub { owner = "sozu-proxy"; repo = pname; rev = version; - hash = "sha256-zxGP2SWrq8beb+mJpgB39T7B1HpE76YP6se01vMewuw="; + hash = "sha256-9TSu27s/rnO48zEhBzaHaU3pHyIJ0LVZC8LBRhn0PNM="; }; - cargoHash = "sha256-KqCDOWCMRYpBMsESTdhMEgTu6qAxcg4RHe252JBggqs="; + cargoHash = "sha256-h9igqV9YqMqRhqwsKYIji8WAVmcPQfErcPPm0PcDwss="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index e776805d8e5df..1a61fa27b31d0 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.25.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-+/0raANdWXPnme/l82wzbhf+kYggBvs4iYswDUPFjlI="; + hash = "sha256-AQmYoTrCwS2IdA9N2RWmbnPNIfKW3ofreZv+VEbe1Wg="; }; - vendorHash = "sha256-r0crxfE3XtsT4+5lWNY6R/bcuxq2WeongK9l7ABXQo8="; + vendorHash = "sha256-LYVxKrFMtxG13cxpQ2btXO9EmKY0UBI+ZP3aYI88i3A="; subPackages = [ "cmd/spicedb" ]; @@ -28,5 +28,6 @@ buildGoModule rec { homepage = "https://authzed.com/"; license = licenses.asl20; maintainers = with maintainers; [ thoughtpolice ]; + mainProgram = "spicedb"; }; } diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index d0d4aba42a929..6369927868913 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "0.15.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-+YgGxqnHkdPbRbQj5o1+Hx259Ih07x0sdt6AHoD1UvI="; + hash = "sha256-MxIeQ8WbTEH342EA03irjpDjfZZyc0sau2hOZOGT27w="; }; - vendorHash = "sha256-f0UNUOi0WXm06dko+7O00C0dla/JlfGlXaZ00TMX0WU="; + vendorHash = "sha256-KhtT0v0FJiOvYUhN/rBYxbkUKs0DdIc5HwlhVUAi9cA="; meta = with lib; { description = "Command line for managing SpiceDB"; diff --git a/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix b/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix index 2e66ce3c646f9..363e7cd224a76 100644 --- a/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix +++ b/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix @@ -32,6 +32,10 @@ buildFHSEnv { runScript = "${src}/cockroach"; + extraInstallCommands = '' + cp -P $out/bin/cockroachdb $out/bin/cockroach + ''; + meta = with lib; { homepage = "https://www.cockroachlabs.com"; description = "A scalable, survivable, strongly-consistent SQL database"; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 73c826e968ad8..f83982778055e 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.24.0"; + version = "1.30.4"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-bft4fa/ZABodrm7uwl7o2whqWhxuL7l3nLqCuTv4V0k="; + sha256 = "sha256-c9NjwTCPMl694ijDbljoPaSf86NywLXuKpiG00whA1o="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-0UNIPwFiQisWDRFaCA3JuS9R0byhWcCDQb54DZXQJ2w="; + vendorHash = "sha256-kLFANKOGTHcUtgEARm/GzVH5zPEv5ioHCTpgqSbO+pw="; proxyVendor = true; doCheck = false; diff --git a/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/pkgs/servers/sql/mariadb/connector-c/3_1.nix index f5de11c7cc110..a51fc1d104b1e 100644 --- a/pkgs/servers/sql/mariadb/connector-c/3_1.nix +++ b/pkgs/servers/sql/mariadb/connector-c/3_1.nix @@ -2,5 +2,5 @@ callPackage ./. (args // { version = "3.1.21"; - hash = "sha256-PovyQvomT8+vGWS39/QjLauiGkSiuqKQpTrSXdyVyow="; + hash = "sha256-guN3Rcsb/EV4rxPE3yhJRSsT1+z44zUetg7ZBA4WjIc="; }) diff --git a/pkgs/servers/sql/mariadb/connector-c/3_2.nix b/pkgs/servers/sql/mariadb/connector-c/3_2.nix index d9ef5d8966fec..6619e261650c7 100644 --- a/pkgs/servers/sql/mariadb/connector-c/3_2.nix +++ b/pkgs/servers/sql/mariadb/connector-c/3_2.nix @@ -2,5 +2,5 @@ callPackage ./. (args // { version = "3.2.7"; - hash = "sha256-nXGWJI5ml8Ccc+Fz/psoIEX1XsnXrnQ8HrrQi56lbdo="; + hash = "sha256-F7s9fcbJiz6lsWrvlTpY+ZET8MPwlyWPKJZOvHEwBvo="; }) diff --git a/pkgs/servers/sql/mariadb/connector-c/3_3.nix b/pkgs/servers/sql/mariadb/connector-c/3_3.nix index ec70d9998283f..9f750fe8108be 100644 --- a/pkgs/servers/sql/mariadb/connector-c/3_3.nix +++ b/pkgs/servers/sql/mariadb/connector-c/3_3.nix @@ -2,5 +2,5 @@ callPackage ./. (args // { version = "3.3.5"; - hash = "sha256-ynLrJvbbK++nfkj/lm9xvNPLRLM72Lu4ELZebQEcHlw="; + hash = "sha256-RLHx8PyfbfIDr6X6ky5/w0XsGMFd+v5PgmQHvYOaf+k="; }) diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index 7a175620c7cbf..be4af113c1d9f 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake +{ lib, stdenv, fetchFromGitHub, cmake , curl, openssl, zlib, zstd , libiconv , version, hash, ... @@ -13,8 +13,10 @@ in stdenv.mkDerivation { pname = "mariadb-connector-c"; inherit version; - src = fetchurl { - url = "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"; + src = fetchFromGitHub { + owner = "mariadb-corporation"; + repo = "mariadb-connector-c"; + rev = "v${version}"; inherit hash; }; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ea50fc371981e..3ff31ba1d3abe 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -58,6 +58,10 @@ let patches = [ ./patch/cmake-includedir.patch + + # Fix build with libxml 2.12 and Clang 16. + # https://github.com/MariaDB/server/pull/2983 + ./patch/0001-Fix-build-with-libxml2-2.12.patch ] # Fixes a build issue as documented on # https://jira.mariadb.org/browse/MDEV-26769?focusedCommentId=206073&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-206073 @@ -136,7 +140,7 @@ let description = "An enhanced, drop-in replacement for MySQL"; homepage = "https://mariadb.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ thoughtpolice ajs124 das_j ]; + maintainers = with maintainers; [ thoughtpolice ] ++ teams.helsinki-systems.members; platforms = platforms.all; }; }; @@ -234,7 +238,6 @@ let ''; CXXFLAGS = lib.optionalString stdenv.hostPlatform.isi686 "-fpermissive"; - NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; }); in server // { @@ -245,36 +248,29 @@ in # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - version = "10.5.22"; - hash = "sha256-PiOGu17iWo3c0hz/xIx2CX5cpBpuSgmPay7kASsNY44="; + version = "10.5.23"; + hash = "sha256-P3wzsgjLeZ2wFKh09WcY6t/yLulXgfo2Cqa8aWEJrP4="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 - version = "10.6.15"; - hash = "sha256-sva9uhfq1NkcTSVPr8NKcorGsCfdHXF4vCZ1jc5pQzU="; - inherit (self.darwin) cctools; - inherit (self.darwin.apple_sdk.frameworks) CoreServices; - }; - mariadb_1010 = self.callPackage generic { - # Supported until 2023-11-17. TODO: remove ahead of 23.11 branchoff - version = "10.10.6"; - hash = "sha256-4eUwEZedKfDsJuE6uMr2E0gb8ClSBWb7loF1RhA5ONU="; + version = "10.6.16"; + hash = "sha256-Xvg4Q+eW3Nqa6keyRpDd9thI9D9D4R+dmgzCHHj7uc8="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 - version = "10.11.5"; - hash = "sha256-TJSEBI1NDHHdB2qzP8KpzoUQvfdiiG3g1j/lJJbz27s="; + version = "10.11.6"; + hash = "sha256-HAFjRj6Y1x9HgHQWEaQJge7ivETTkmAcpJu/lI0E3Wc="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_110 = self.callPackage generic { # Supported until 2024-06-07 - version = "11.0.3"; - hash = "sha256-Up8IoGTudzOhNuxHSkI56Kyb1tsTm4unC/+KfxMDg5o="; + version = "11.0.4"; + hash = "sha256-J2ls3zEVnyJUEOtchmW4VkWhxZmBzlr2vP9sll/u3ms="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 150e6edb66ac8..720bb050be250 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Galera 3 wsrep provider library"; homepage = "https://galeracluster.com/"; license = licenses.lgpl2Only; - maintainers = with maintainers; [ ajs124 izorkin ]; + maintainers = with maintainers; [ izorkin ] ++ teams.helsinki-systems.members; platforms = platforms.all; broken = stdenv.isDarwin; }; diff --git a/pkgs/servers/sql/mariadb/patch/0001-Fix-build-with-libxml2-2.12.patch b/pkgs/servers/sql/mariadb/patch/0001-Fix-build-with-libxml2-2.12.patch new file mode 100644 index 0000000000000..a12dfb73d09de --- /dev/null +++ b/pkgs/servers/sql/mariadb/patch/0001-Fix-build-with-libxml2-2.12.patch @@ -0,0 +1,167 @@ +From 1f1ee5d3776af7ef56ffa3f4dcd22532c2c86c74 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Sun, 7 Jan 2024 10:19:54 +0100 +Subject: [PATCH] Fix build with libxml2 2.12 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +libxml2 2.12.0 made `xmlGetLastError()` return `const` pointer: + +https://gitlab.gnome.org/GNOME/libxml2/-/commit/61034116d0a3c8b295c6137956adc3ae55720711 + +Clang 16 does not like this: + + error: assigning to 'xmlErrorPtr' (aka '_xmlError *') from 'const xmlError *' (aka 'const _xmlError *') discards qualifiers + error: cannot initialize a variable of type 'xmlErrorPtr' (aka '_xmlError *') with an rvalue of type 'const xmlError *' (aka 'const _xmlError *') + +Let’s update the variables to `const`. +For older versions, it will be automatically converted. + +But then `xmlResetError(xmlError*)` will not like the `const` pointer: + + error: no matching function for call to 'xmlResetError' + note: candidate function not viable: 1st argument ('const xmlError *' (aka 'const _xmlError *')) would lose const qualifier + +Let’s replace it with `xmlResetLastError()`. + +ALso remove `LIBXMLDOC::Xerr` protected member property. +It was introduced in 65b0e5455b547a3d574fa77b34cce23ae3bea0a0 +along with the `xmlResetError` calls. +It does not appear to be used for anything. +--- + storage/connect/libdoc.cpp | 39 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 20 deletions(-) + +diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp +index e414aa88355..10edcbc3ffa 100644 +--- a/storage/connect/libdoc.cpp ++++ b/storage/connect/libdoc.cpp +@@ -93,7 +93,6 @@ class LIBXMLDOC : public XMLDOCUMENT { + xmlXPathContextPtr Ctxp; + xmlXPathObjectPtr Xop; + xmlXPathObjectPtr NlXop; +- xmlErrorPtr Xerr; + char *Buf; // Temporary + bool Nofreelist; + }; // end of class LIBXMLDOC +@@ -327,7 +326,6 @@ LIBXMLDOC::LIBXMLDOC(char *nsl, char *nsdf, char *enc, PFBLOCK fp) + Ctxp = NULL; + Xop = NULL; + NlXop = NULL; +- Xerr = NULL; + Buf = NULL; + Nofreelist = false; + } // end of LIBXMLDOC constructor +@@ -365,8 +363,8 @@ bool LIBXMLDOC::ParseFile(PGLOBAL g, char *fn) + Encoding = (char*)Docp->encoding; + + return false; +- } else if ((Xerr = xmlGetLastError())) +- xmlResetError(Xerr); ++ } else if (xmlGetLastError()) ++ xmlResetLastError(); + + return true; + } // end of ParseFile +@@ -505,9 +503,9 @@ int LIBXMLDOC::DumpDoc(PGLOBAL g, char *ofn) + #if 1 + // This function does not crash ( + if (xmlSaveFormatFileEnc((const char *)ofn, Docp, Encoding, 0) < 0) { +- xmlErrorPtr err = xmlGetLastError(); ++ const xmlError *err = xmlGetLastError(); + strcpy(g->Message, (err) ? err->message : "Error saving XML doc"); +- xmlResetError(Xerr); ++ xmlResetLastError(); + rc = -1; + } // endif Save + // rc = xmlDocDump(of, Docp); +@@ -546,8 +544,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) + if (Nlist) { + xmlXPathFreeNodeSet(Nlist); + +- if ((Xerr = xmlGetLastError())) +- xmlResetError(Xerr); ++ if (xmlGetLastError()) ++ xmlResetLastError(); + + Nlist = NULL; + } // endif Nlist +@@ -555,8 +553,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) + if (Xop) { + xmlXPathFreeObject(Xop); + +- if ((Xerr = xmlGetLastError())) +- xmlResetError(Xerr); ++ if (xmlGetLastError()) ++ xmlResetLastError(); + + Xop = NULL; + } // endif Xop +@@ -564,8 +562,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) + if (NlXop) { + xmlXPathFreeObject(NlXop); + +- if ((Xerr = xmlGetLastError())) +- xmlResetError(Xerr); ++ if (xmlGetLastError()) ++ xmlResetLastError(); + + NlXop = NULL; + } // endif NlXop +@@ -573,8 +571,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) + if (Ctxp) { + xmlXPathFreeContext(Ctxp); + +- if ((Xerr = xmlGetLastError())) +- xmlResetError(Xerr); ++ if (xmlGetLastError()) ++ xmlResetLastError(); + + Ctxp = NULL; + } // endif Ctxp +@@ -590,6 +588,7 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) + /******************************************************************/ + xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) + { ++ const xmlError *xerr; + xmlNodeSetPtr nl; + + if (trace(1)) +@@ -649,11 +648,11 @@ xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) + } else + xmlXPathFreeObject(Xop); // Caused node not found + +- if ((Xerr = xmlGetLastError())) { +- strcpy(g->Message, Xerr->message); +- xmlResetError(Xerr); ++ if ((xerr = xmlGetLastError())) { ++ strcpy(g->Message, xerr->message); ++ xmlResetLastError(); + return NULL; +- } // endif Xerr ++ } // endif xerr + + } // endif Xop + +@@ -1079,7 +1078,7 @@ void XML2NODE::AddText(PGLOBAL g, PCSZ txtp) + /******************************************************************/ + void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp) + { +- xmlErrorPtr xerr; ++ const xmlError *xerr; + + if (trace(1)) + htrc("DeleteChild: node=%p\n", dnp); +@@ -1122,7 +1121,7 @@ void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp) + if (trace(1)) + htrc("DeleteChild: errmsg=%-.256s\n", xerr->message); + +- xmlResetError(xerr); ++ xmlResetLastError(); + } // end of DeleteChild + + /* -------------------- class XML2NODELIST ---------------------- */ +-- +2.42.0 + diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 668f5190be400..abb442bcaa79d 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.47.11"; + version = "11.49.1"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-ZYogc8KjFYbmS7OlL2ufGxdnMAYOYeUFk8AVe7rDer0="; + hash = "sha256-ahZegA9wVWx5TZI23eDvqnGS2Uhnbhoq9Jx8sw9yNko="; }; nativeBuildInputs = [ bison cmake python3 ]; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index e136f02757d99..521e748198a36 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.0.35"; + version = "8.0.36"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-kXxe04cE6ZIRGFzkviTjOowZyRJB7XOvQYGm840VdMI="; + hash = "sha256-9PJwa5WKinOA72yVjdlyMHvb7qRR76/DQuTEbim36d0="; }; nativeBuildInputs = [ bison cmake pkg-config ] diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 6d825ddb66809..3b2bd59d8c12d 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "pgpool-II"; - version = "4.4.4"; + version = "4.5.0"; src = fetchurl { url = "https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-${version}.tar.gz"; name = "pgpool-II-${version}.tar.gz"; - sha256 = "sha256-EL7Wb4GXx03LAKDnP2GAZtXV4K3IeIZcL8+hyUXmj08="; + hash = "sha256-WYSuzfJSCHKQA1as7QyapullN8LoIpfGWT7ZAZEYRRo="; }; buildInputs = [ diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index ec2f95f5bd55b..11fae33a6edd9 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -5,6 +5,7 @@ let { stdenv, lib, fetchurl, makeWrapper, fetchpatch , glibc, zlib, readline, openssl, icu, lz4, zstd, systemd, libossp_uuid , pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin + , linux-pam # This is important to obtain a version of `libpq` that does not depend on systemd. , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic @@ -24,6 +25,10 @@ let , nukeReferences, patchelf, llvmPackages , makeRustPlatform, buildPgxExtension, cargo, rustc + # PL/Python + , pythonSupport ? false + , python3 + # detection of crypt fails when using llvm stdenv, so we add it manually # for <13 (where it got removed: https://github.com/postgres/postgres/commit/c45643d618e35ec2fe91438df15abd4f3c0d85ca) , libxcrypt @@ -62,7 +67,9 @@ let ++ lib.optionals lz4Enabled [ lz4 ] ++ lib.optionals zstdEnabled [ zstd ] ++ lib.optionals enableSystemd [ systemd ] + ++ lib.optionals pythonSupport [ python3 ] ++ lib.optionals gssSupport [ libkrb5 ] + ++ lib.optionals stdenv'.isLinux [ linux-pam ] ++ lib.optionals (!stdenv'.isDarwin) [ libossp_uuid ]; nativeBuildInputs = [ @@ -95,8 +102,10 @@ let ] ++ lib.optionals lz4Enabled [ "--with-lz4" ] ++ lib.optionals zstdEnabled [ "--with-zstd" ] ++ lib.optionals gssSupport [ "--with-gssapi" ] + ++ lib.optionals pythonSupport [ "--with-python" ] ++ lib.optionals stdenv'.hostPlatform.isRiscV [ "--disable-spinlocks" ] - ++ lib.optionals jitSupport [ "--with-llvm" ]; + ++ lib.optionals jitSupport [ "--with-llvm" ] + ++ lib.optionals stdenv'.isLinux [ "--with-pam" ]; patches = [ (if atLeast "16" then ./patches/disable-normalize_exec_path.patch @@ -106,6 +115,17 @@ let ./patches/specify_pkglibdir_at_runtime.patch ./patches/findstring.patch + # Fix build with libxml2 2.12.0 and -Wincompatible-function-pointer-types + (if atLeast "16" then + # https://www.postgresql.org/message-id/CACpMh%2BDMZVHM%2BiDSyqdcpK8sr7jd_HxxLJRNvGTzcLBE0W07QA%40mail.gmail.com + fetchurl { + url = "https://www.postgresql.org/message-id/attachment/152769/v1-0001-Make-PostgreSQL-work-with-newer-version-of-libxml.patch"; + hash = "sha256-1j5mtG++hFmYwfS98PdN1SmNI4T86q4FXvKLz2VeJyg="; + } + else + ./patches/libxml2.12-15.patch + ) + (substituteAll { src = ./locale-binary-path.patch; locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index 3a1c1c8388bee..fb5d849925825 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -2,15 +2,16 @@ let hashes = { - "15" = "sha256-1vmwoflbU3++PFDcsLt9gyLkuzMRGNCD7vWl7/6Q+SE="; - "14" = "sha256-w93Q499sZRk4q85A9yqKQjGUd9Pl8UL8K1D3W7mHRTU="; - "13" = "sha256-Sot7FR0oW7kWA680pNCMCmlflu4RfJTSWZn9mrXrpzw="; - "12" = "sha256-XezcXoHHLCD1/2OHmKhxome2pdjOsYAfZlpvOoU3aS4="; + "16" = "sha256-sXh/vmGyYj00ALfFVdeql2DZ6nCJQDNKyNgzlOZnPAw="; + "15" = "sha256-webZWgWZGnSoXwTpk816tjbtHV1UIlXkogpBDAEL4gM="; + "14" = "sha256-jZXhcYBubpjIJ8M5JHXKV5f6VK/2BkypH3P7nLxZz3E="; + "13" = "sha256-HR6nnWt/V2a0rD5eHHUsFIZ1y7lmvLz36URt9pPJnCw="; + "12" = "sha256-JFNk17ESsIt20dwXrfBkQ5E6DbZzN/Q9eS6+WjCXGd4="; }; in stdenv.mkDerivation rec { pname = "age"; - version = "1.4.0-rc0"; + version = "1.5.0-rc0"; src = fetchFromGitHub { owner = "apache"; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { ]; installPhase = '' - install -D -t $out/lib *.so + install -D -t $out/lib *${postgresql.dlSuffix} install -D -t $out/share/postgresql/extension *.sql install -D -t $out/share/postgresql/extension *.control ''; diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix new file mode 100644 index 0000000000000..74f546d20b4b4 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, curl +, fetchFromGitHub +, lz4 +, postgresql +}: + +stdenv.mkDerivation rec { + pname = "citus"; + version = "12.1.0"; + + src = fetchFromGitHub { + owner = "citusdata"; + repo = "citus"; + rev = "v${version}"; + hash = "sha256-ypuinDOHvgjRdbnTTFBpALy6rIR3rrP00JDvlHtmCTk="; + }; + + buildInputs = [ + curl + lz4 + postgresql + ]; + + installPhase = '' + runHook preInstall + + install -D -t $out/lib src/backend/columnar/citus_columnar${postgresql.dlSuffix} + install -D -t $out/share/postgresql/extension src/backend/columnar/build/sql/*.sql + install -D -t $out/share/postgresql/extension src/backend/columnar/*.control + + install -D -t $out/lib src/backend/distributed/citus${postgresql.dlSuffix} + install -D -t $out/share/postgresql/extension src/backend/distributed/build/sql/*.sql + install -D -t $out/share/postgresql/extension src/backend/distributed/*.control + + runHook postInstall + ''; + + meta = with lib; { + # "Our soft policy for Postgres version compatibilty is to support Citus' + # latest release with Postgres' 3 latest releases." + # https://www.citusdata.com/updates/v12-0/#deprecated_features + broken = versionOlder postgresql.version "14"; + description = "Distributed PostgreSQL as an extension"; + homepage = "https://www.citusdata.com/"; + changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ marsam ]; + inherit (postgresql.meta) platforms; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix new file mode 100644 index 0000000000000..91437de345859 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +, h3_4 +, postgresql +, postgresqlTestHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "h3-pg"; + version = "4.1.3"; + + src = fetchFromGitHub { + owner = "zachasme"; + repo = "h3-pg"; + rev = "v${finalAttrs.version}"; + hash = "sha256-nkaDZ+JuMtsGUJVx70DD2coLrmc/T8/cNov7pfNF1Eg="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory(cmake/h3)" "include_directories(${lib.getDev h3_4}/include/h3)" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/AddPostgreSQLExtension.cmake \ + --replace "INTERPROCEDURAL_OPTIMIZATION TRUE" "" + ''; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + h3_4 + postgresql + ]; + + installPhase = '' + install -D -t $out/lib h3/h3.so + install -D -t $out/share/postgresql/extension h3/h3-*.sql h3/h3.control + install -D -t $out/lib h3_postgis/h3_postgis.so + install -D -t $out/share/postgresql/extension h3_postgis/h3_postgis-*.sql h3_postgis/h3_postgis.control + ''; + + passthru.tests.extension = stdenv.mkDerivation { + name = "h3-pg-test"; + dontUnpack = true; + doCheck = true; + buildInputs = [ postgresqlTestHook ]; + nativeCheckInputs = [ (postgresql.withPackages (ps: [ ps.h3-pg ps.postgis ])) ]; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + passAsFile = [ "sql" ]; + sql = '' + CREATE EXTENSION h3; + CREATE EXTENSION h3_postgis CASCADE; + + SELECT h3_lat_lng_to_cell(POINT('37.3615593,-122.0553238'), 5); + SELECT ST_NPoints(h3_cell_to_boundary_geometry('8a63a9a99047fff')); + ''; + failureHook = "postgresqlStop"; + checkPhase = '' + runHook preCheck + psql -a -v ON_ERROR_STOP=1 -f $sqlPath + runHook postCheck + ''; + installPhase = "touch $out"; + }; + + meta = with lib; { + description = "PostgreSQL bindings for H3, a hierarchical hexagonal geospatial indexing system"; + homepage = "https://github.com/zachasme/h3-pg"; + license = licenses.asl20; + maintainers = with maintainers; [ marsam ]; + inherit (postgresql.meta) platforms; + }; +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 6af250790d761..51b7d4fd70fab 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CLtLOzKRB9p6+SytMvWCYo7m7s/d+clAGOa2sWi6uZ0="; + sha256 = "sha256-OIWykfFbVskrkPG/zSmZtZjc+W956KSfIzK7f5QOqpI="; }; buildInputs = [ postgresql openssl zlib readline libkrb5 ] @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PostgreSQL extension and service for automated failover and high-availability"; homepage = "https://github.com/citusdata/pg_auto_failover"; - changelog = "https://github.com/citusdata/pg_auto_failover/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/citusdata/pg_auto_failover/blob/v${version}/CHANGELOG.md"; maintainers = [ maintainers.marsam ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index e008993fcfa5c..10e899f810d09 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "5.0.0"; + version = "5.0.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-T7+cPi8LIftWVwI9mi0LAwWCTxp/r6iyKT1wKO/Ztbk="; + sha256 = "sha256-sJODpyRgqpeg/Lb584wNgCCFRaH22ELcbof1bA612aw="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index fd07b4e105448..e29918373c77b 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -1,24 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: +{ lib +, stdenv +, fetchFromGitHub +, openssl +, postgresql +, postgresqlTestHook +, readline +, testers +, zlib +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pg_repack"; - version = "1.4.8"; + version = "1.5.0"; buildInputs = [ postgresql openssl zlib readline ]; src = fetchFromGitHub { - owner = "reorg"; - repo = "pg_repack"; - rev = "ver_${version}"; - sha256 = "sha256-Et8aMRzG7ez0uy9wG6qsg57/kPPZdUhb+/gFxW86D08="; + owner = "reorg"; + repo = "pg_repack"; + rev = "ver_${finalAttrs.version}"; + sha256 = "sha256-do80phyMxwcRIkYyUt9z02z7byNQhK+pbSaCUmzG+4c="; }; installPhase = '' install -D bin/pg_repack -t $out/bin/ install -D lib/pg_repack${postgresql.dlSuffix} -t $out/lib/ - install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/postgresql/extension + install -D lib/{pg_repack--${finalAttrs.version}.sql,pg_repack.control} -t $out/share/postgresql/extension ''; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + extension = stdenv.mkDerivation { + name = "plpgsql-check-test"; + dontUnpack = true; + doCheck = true; + buildInputs = [ postgresqlTestHook ]; + nativeCheckInputs = [ (postgresql.withPackages (ps: [ ps.pg_repack ])) ]; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + failureHook = "postgresqlStop"; + checkPhase = '' + runHook preCheck + psql -a -v ON_ERROR_STOP=1 -c "CREATE EXTENSION pg_repack;" + runHook postCheck + ''; + installPhase = "touch $out"; + }; + }; + meta = with lib; { description = "Reorganize tables in PostgreSQL databases with minimal locks"; longDescription = '' @@ -31,5 +61,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ danbst ]; inherit (postgresql.meta) platforms; + mainProgram = "pg_repack"; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index 06b8ce6909823..4c601896b45b1 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg-safeupdate"; - version = "1.4"; + version = "1.5"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "eradman"; repo = pname; rev = version; - sha256 = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; + sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; }; installPhase = '' @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple extension to PostgreSQL that requires criteria for UPDATE and DELETE"; homepage = "https://github.com/eradman/pg-safeupdate"; + changelog = "https://github.com/eradman/pg-safeupdate/raw/${src.rev}/NEWS"; platforms = postgresql.meta.platforms; license = licenses.postgresql; + broken = versionOlder postgresql.version "14"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix index 6daa5e0cf0ef1..7abeba5adda18 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "pg_uuidv7"; - version = "1.3.0"; + version = "1.4.1"; buildInputs = [ postgresql ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "fboulnois"; repo = "pg_uuidv7"; rev = "v${version}"; - hash = "sha256-kHxS9tL7fpKhjJ8Xx5tee1fv10zVcTt2FgUQSaRdNZo="; + hash = "sha256-1qEsDCcULceMqvR3DIC5rOfpzn2PYbFGq0H8p2+9GR4="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 535a16abad18f..ee582067dd85a 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "3.0.8"; + version = "3.1.6"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-2/dInLG8isiSJHJgNyxgbUwMd/mtcUJxcTvSnVpBZ9M="; + hash = "sha256-XfHpKstgdBQ6Oo0cDpOphUJNTu9KgfBuxAa8RadvjyA="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 51cef6b3f490a..323f8a4ec0901 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.5.1"; + version = "3.6.1"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X7ZXGPUkhPDBB2QpUGfqDTgOairkYZF78Ol0XEAmxD8="; + hash = "sha256-DyrBVGBLUkg0ODuHV3mCkyod2/hEtpZfLSvnrEQObaI="; }; installPhase = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "A PostgreSQL/PostGIS extension that provides geospatial routing functionality"; homepage = "https://pgrouting.org/"; changelog = "https://github.com/pgRouting/pgrouting/releases/tag/v${version}"; - maintainers = [ maintainers.steve-chavez ]; + maintainers = with maintainers; teams.geospatial.members ++ [ steve-chavez ]; platforms = postgresql.meta.platforms; license = licenses.gpl2Plus; }; diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 3e8ba36994ce5..c51de681a3cca 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }: +{ lib +, stdenv +, fetchFromGitHub +, perl +, perlPackages +, postgresql +, postgresqlTestHook +, which +}: stdenv.mkDerivation rec { pname = "pgtap"; @@ -14,9 +22,36 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ]; installPhase = '' + install -D src/pgtap.so -t $out/lib install -D {sql/pgtap--${version}.sql,pgtap.control} -t $out/share/postgresql/extension ''; + passthru.tests.extension = stdenv.mkDerivation { + name = "pgtap-test"; + dontUnpack = true; + doCheck = true; + buildInputs = [ postgresqlTestHook ]; + nativeCheckInputs = [ (postgresql.withPackages (ps: [ ps.pgtap ])) ]; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + passAsFile = [ "sql" ]; + sql = '' + CREATE EXTENSION pgtap; + + BEGIN; + SELECT plan(1); + SELECT pass('Test passed'); + SELECT * FROM finish(); + ROLLBACK; + ''; + failureHook = "postgresqlStop"; + checkPhase = '' + runHook preCheck + psql -a -v ON_ERROR_STOP=1 -f $sqlPath + runHook postCheck + ''; + installPhase = "touch $out"; + }; + meta = with lib; { description = "A unit testing framework for PostgreSQL"; longDescription = '' diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 61836a4573d78..db1199b20d77d 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestHook }: stdenv.mkDerivation rec { - pname = "plpgsql_check"; - version = "2.6.1"; + pname = "plpgsql-check"; + version = "2.7.2"; src = fetchFromGitHub { owner = "okbob"; - repo = pname; + repo = "plpgsql_check"; rev = "v${version}"; - hash = "sha256-mC8cDLfTu/gpMjNfXGCAV8EhE+kMq2MofzibIWijX3w="; + hash = "sha256-7CHKcUpqEXJ+z0OcxrEpYHaO/zUtRbCXa8LgL+/roSg="; }; buildInputs = [ postgresql ]; @@ -19,6 +19,22 @@ stdenv.mkDerivation rec { install -D -t $out/share/postgresql/extension *.control ''; + passthru.tests.extension = stdenv.mkDerivation { + name = "plpgsql-check-test"; + dontUnpack = true; + doCheck = true; + buildInputs = [ postgresqlTestHook ]; + nativeCheckInputs = [ (postgresql.withPackages (ps: [ ps.plpgsql_check ])) ]; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + failureHook = "postgresqlStop"; + checkPhase = '' + runHook preCheck + psql -a -v ON_ERROR_STOP=1 -c "CREATE EXTENSION plpgsql_check;" + runHook postCheck + ''; + installPhase = "touch $out"; + }; + meta = with lib; { description = "Linter tool for language PL/pgSQL"; homepage = "https://github.com/okbob/plpgsql_check"; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 583bde82f4816..65541730d296e 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -5,7 +5,7 @@ , postgresql , geos , proj -, gdal +, gdalMinimal , json_c , pkg-config , file @@ -14,15 +14,19 @@ , pcre2 , nixosTests }: + +let + gdal = gdalMinimal; +in stdenv.mkDerivation rec { pname = "postgis"; - version = "3.4.0"; + version = "3.4.1"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "sha256-rum2CmyITTVBZLMJbEZX8yRFQYZgf4WdHOBdiZeYr50="; + sha256 = "sha256-/vahQSE9D/J79FszuEnMOWwi3bH/xv7UNUacnokfyB0="; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ] @@ -31,7 +35,10 @@ stdenv.mkDerivation rec { dontDisableStatic = true; # postgis config directory assumes /include /lib from the same root for json-c library - NIX_LDFLAGS = "-L${lib.getLib json_c}/lib"; + NIX_LDFLAGS = "-L${lib.getLib json_c}/lib" + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + + lib.optionalString (stdenv.cc.isClang && stdenv.cc.libcxx != null) " -l${stdenv.cc.libcxx.cxxabi.libName}"; + preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 7eec155435a27..82f82e65f8c97 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -3,15 +3,15 @@ stdenv.mkDerivation rec { pname = "tds_fdw"; # Move to stable version when it's released. - version = "unstable-2023-09-28"; + version = "unstable-2023-12-04"; buildInputs = [ postgresql freetds ]; src = fetchFromGitHub { owner = "tds-fdw"; repo = "tds_fdw"; - rev = "22ee5d3f46909b35efb2600b44ec19a35179630e"; - hash = "sha256-MmaLN1OWUJMWJhPUXBevSyBmMgZqeEFPGuxuLPSp4Pk="; + rev = "14b147fde8d99f3946fbd7b84aaaf5fc00af90e2"; + hash = "sha256-h1kTcm796ibfcrkRRs+yi1TRpcyZog95Genw8hMh0cg="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index a567db9481215..912bca925d803 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.12.2"; + version = "2.13.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - hash = "sha256-bZHgkcCmkheTupVLOBZ5UsgIVyy7aIJoge+ot2SmMFg="; + hash = "sha256-7OMeH818f/wu55jQS/6pP+hl7ph2Ul5LiLrSDA47SeM="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ marsam ]; platforms = postgresql.meta.platforms; license = with licenses; if enableUnfree then tsl else asl20; - broken = versionOlder postgresql.version "12"; + broken = versionOlder postgresql.version "13"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index 2a0f3de88499e..4f0e02059adf2 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -1,27 +1,47 @@ { lib , fetchFromGitHub -, buildPgxExtension +, buildPgrxExtension , postgresql , nixosTests -, cargo-pgx_0_7_1 +, cargo-pgrx +, fetchCrate , nix-update-script , stdenv }: -(buildPgxExtension.override {cargo-pgx = cargo-pgx_0_7_1;})rec { +let + cargo-pgrx_0_10_2 = cargo-pgrx.overrideAttrs (old: rec { + name = "cargo-pgrx-${version}"; + version = "0.10.2"; + + src = fetchCrate { + pname = "cargo-pgrx"; + inherit version; + hash = "sha256-FqjfbJmSy5UCpPPPk4bkEyvQCnaH9zYtkI7txgIn+ls="; + }; + + cargoDeps = old.cargoDeps.overrideAttrs (_: { + inherit src; + outputHash = "sha256-XyI3RaPI3Edm/tCP2xoZemib2d2n2cAhobgk9Oafg6s="; + }); + }); + +in + +(buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_10_2; }) rec { inherit postgresql; pname = "timescaledb_toolkit"; - version = "1.16.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb-toolkit"; rev = version; - sha256 = "sha256-aivGURTsm0dGaFq75qR3wIkXwsbvBiDEg+qLMcqKMj8="; + hash = "sha256-Lm/LFBkG91GeWlJL9RBqP8W0tlhBEeGQ6kXUzzv4xRE="; }; - cargoSha256 = "sha256-AO5nSgQYvTmohXbzjWvDylnBgS2WpKP6wFOnkUx7ksI="; + cargoHash = "sha256-LME8oftHmmiN8GU3eTBTSB6m0CE+KtDFRssL1g2Cjm8="; buildAndTestSubdir = "extension"; passthru = { diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 6685602ec3a18..55be61dacf30b 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -4,6 +4,10 @@ self: super: { apache_datasketches = super.callPackage ./ext/apache_datasketches.nix { }; + citus = super.callPackage ./ext/citus.nix { }; + + h3-pg = super.callPackage ./ext/h3-pg.nix { }; + hypopg = super.callPackage ./ext/hypopg.nix { }; jsonb_deep_sum = super.callPackage ./ext/jsonb_deep_sum.nix { }; diff --git a/pkgs/servers/sql/postgresql/patches/libxml2.12-15.patch b/pkgs/servers/sql/postgresql/patches/libxml2.12-15.patch new file mode 100644 index 0000000000000..13438c7d4bb75 --- /dev/null +++ b/pkgs/servers/sql/postgresql/patches/libxml2.12-15.patch @@ -0,0 +1,22 @@ +diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c +index 6411f56b998..0eb39fcfc26 100644 +--- a/src/backend/utils/adt/xml.c ++++ b/src/backend/utils/adt/xml.c +@@ -119,7 +119,7 @@ struct PgXmlErrorContext + + static xmlParserInputPtr xmlPgEntityLoader(const char *URL, const char *ID, + xmlParserCtxtPtr ctxt); +-static void xml_errorHandler(void *data, xmlErrorPtr error); ++static void xml_errorHandler(void *data, const xmlError *error); + static void xml_ereport_by_code(int level, int sqlcode, + const char *msg, int errcode); + static void chopStringInfoNewlines(StringInfo str); +@@ -1749,7 +1749,7 @@ xml_ereport(PgXmlErrorContext *errcxt, int level, int sqlcode, const char *msg) + * Error handler for libxml errors and warnings + */ + static void +-xml_errorHandler(void *data, xmlErrorPtr error) ++xml_errorHandler(void *data, const xmlError *error) + { + PgXmlErrorContext *xmlerrcxt = (PgXmlErrorContext *) data; + xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) error->ctxt; diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index 9c8087887ea36..f75defb333fdb 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -163,12 +163,12 @@ stdenv.mkDerivation (finalAttrs: { sed -i s_/usr/bin/proxysql_$out/bin/proxysql_ $out/lib/systemd/system/*.service ''; - meta = { + meta = with lib; { broken = stdenv.isDarwin; description = "High-performance MySQL proxy"; homepage = "https://proxysql.com/"; - license = with lib.licenses; [ gpl3Only ]; - maintainers = with lib.maintainers; [ ajs124 ]; - platforms = lib.platforms.unix; + license = with licenses; [ gpl3Only ]; + maintainers = teams.helsinki-systems.members; + platforms = platforms.unix; }; }) diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix index 0eff264210a81..57df46ab8d497 100644 --- a/pkgs/servers/sql/rqlite/default.nix +++ b/pkgs/servers/sql/rqlite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rqlite"; - version = "7.6.1"; + version = "8.16.3"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WvEnMAz3dKG8xMlQzm7E0TmAgvsrRED50bb4Ved1+4U="; + sha256 = "sha256-rgA2OGw5a3J/13864jArqK0BInQSN/7U7wvZ4Yv3+2g="; }; - vendorHash = "sha256-qirt5g7dcjAnceejrBnfhDpA4LSEj7eOuznSlfUBUgo="; + vendorHash = "sha256-DTQiWE31rI0stANvc75Anguo5ymq8hH1vdZIZ5t4JLI="; subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; diff --git a/pkgs/servers/sqlpage/default.nix b/pkgs/servers/sqlpage/default.nix index cefa00d416349..d68ad9ddcace3 100644 --- a/pkgs/servers/sqlpage/default.nix +++ b/pkgs/servers/sqlpage/default.nix @@ -95,5 +95,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/lovasoa/SQLpage/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dit7ya ]; + mainProgram = "sqlpage"; }; } diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 5205115f83494..5968c7e1e340b 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -3,13 +3,13 @@ , cppunit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "squid"; - version = "5.9"; + version = "6.6"; src = fetchurl { - url = "http://www.squid-cache.org/Versions/v5/${pname}-${version}.tar.xz"; - hash = "sha256-P+XCAH2idXRGr5G275dPFUsggSCpo5OW6mgeXEq7BLU="; + url = "http://www.squid-cache.org/Versions/v6/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; + hash = "sha256-Vb1/n0iYFTFh6hIomYrLVRv4QIMrnluQ/I7NKUJCAxg="; }; nativeBuildInputs = [ pkg-config ]; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; knownVulnerabilities = [ "Squid has multiple unresolved security vulnerabilities, for more information see https://megamansec.github.io/Squid-Security-Audit/" ]; }; -} +}) diff --git a/pkgs/servers/sshportal/default.nix b/pkgs/servers/sshportal/default.nix index 307b945eba1cf..58c0b5a2077f6 100644 --- a/pkgs/servers/sshportal/default.nix +++ b/pkgs/servers/sshportal/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://manfred.life/sshportal"; license = licenses.asl20; maintainers = with maintainers; [ zaninime ]; + mainProgram = "sshportal"; }; } diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index 735054eb61a92..7c3cc4635e257 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libcap, libev, libconfig, perl, tcp_wrappers, pcre2, nixosTests }: +{ lib, stdenv, fetchFromGitHub, libcap, libev, libconfig, perl, tcp_wrappers, pcre2, nixosTests }: stdenv.mkDerivation rec { pname = "sslh"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs *.sh"; - buildInputs = [ libcap libev libconfig perl tcp_wrappers pcre2 ]; + buildInputs = [ libev libconfig perl pcre2 ] ++ lib.optionals stdenv.isLinux [ libcap tcp_wrappers ]; - makeFlags = [ "USELIBCAP=1" "USELIBWRAP=1" ]; + makeFlags = lib.optionals stdenv.isLinux [ "USELIBCAP=1" "USELIBWRAP=1" ]; postInstall = '' # install all flavours diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index a8057cac7e7de..824c56584e2bf 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.24.1"; + version = "2.24.2"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - hash = "sha256-U+B/k/stwjJw+mxUCb4A3yUtc/+Tg0PsWhVnovLLX4A="; + hash = "sha256-5Axqn3sYLM4yjGkN8d0ZUe8KrjYszaZmTg5GqmamNtc="; }; - cargoHash = "sha256-ZDrRjIM8187nr72MlzFr0NAqH2f8qkF1sGAT9+NvfhA="; + cargoHash = "sha256-xS2XARqXXcQ2J1k3jC5St19RdcK2korbEia4koUxG5s="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security @@ -37,5 +37,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/static-web-server/static-web-server/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; + mainProgram = "static-web-server"; }; } diff --git a/pkgs/servers/stone/default.nix b/pkgs/servers/stone/default.nix index 65ddb92da7a17..a565a609e12b8 100644 --- a/pkgs/servers/stone/default.nix +++ b/pkgs/servers/stone/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ corngood ]; + mainProgram = "stone"; }; } diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix index b5b855a4b6983..331770a565d5c 100644 --- a/pkgs/servers/sunshine/default.nix +++ b/pkgs/servers/sunshine/default.nix @@ -31,6 +31,7 @@ , libepoxy , libva , libvdpau +, libglvnd , numactl , amf-headers , intel-media-sdk @@ -131,6 +132,7 @@ stdenv.mkDerivation rec { mesa xorg.libXrandr libxcb + libglvnd ]; cmakeFlags = [ @@ -169,6 +171,7 @@ stdenv.mkDerivation rec { description = "Sunshine is a Game stream host for Moonlight"; homepage = "https://github.com/LizardByte/Sunshine"; license = licenses.gpl3Only; + mainProgram = "sunshine"; maintainers = with maintainers; [ devusb ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix index 99f238c46d05c..eb4bcccbbf9dc 100644 --- a/pkgs/servers/swego/default.nix +++ b/pkgs/servers/swego/default.nix @@ -33,5 +33,6 @@ buildGoModule rec { # darwin crashes with: # src/controllers/parsingArgs.go:130:4: undefined: PrintEmbeddedFiles broken = stdenv.isDarwin; + mainProgram = "swego"; }; } diff --git a/pkgs/servers/syncstorage-rs/default.nix b/pkgs/servers/syncstorage-rs/default.nix index 399c56376ecfc..96b1945df51f7 100644 --- a/pkgs/servers/syncstorage-rs/default.nix +++ b/pkgs/servers/syncstorage-rs/default.nix @@ -62,5 +62,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ pennae ]; platforms = lib.platforms.linux; + mainProgram = "syncserver"; }; } diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index b4c2d24751727..2f36358e912c0 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,7 +1,18 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, makeWrapper +, getent +, iproute2 +, iptables +, shadow +, procps +, nixosTests +}: let - version = "1.54.0"; + version = "1.58.2"; in buildGoModule { pname = "tailscale"; @@ -11,9 +22,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-/l3csuj1AZQo7C0BzkhqvkMNEQxc6Ers0KtZvxWS96Q="; + hash = "sha256-FiFFfUtse0CKR4XJ82HEjpZNxCaa4FnwSJfEzJ5kZgk="; }; - vendorHash = "sha256-/kuu7DKPklMZOvYqJpsOp3TeDG9KDEET4U0G+sq+4qY="; + vendorHash = "sha256-BK1zugKGtx2RpWHDvFZaFqz/YdoewsG8SscGt25uwtQ="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; @@ -38,6 +49,10 @@ buildGoModule { install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service ''; + passthru.tests = { + inherit (nixosTests) headscale; + }; + meta = with lib; { homepage = "https://tailscale.com"; description = "The node agent for Tailscale, a mesh VPN built on WireGuard"; diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix index 051ebe964ee24..4886b2f72cd94 100644 --- a/pkgs/servers/tarssh/default.nix +++ b/pkgs/servers/tarssh/default.nix @@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec { license = [ licenses.mit ]; maintainers = with maintainers; [ sohalt ]; platforms = platforms.unix ; + mainProgram = "tarssh"; }; } diff --git a/pkgs/servers/telegram-bot-api/default.nix b/pkgs/servers/telegram-bot-api/default.nix index 3d52ccc96f83a..d8dc668fb69bc 100644 --- a/pkgs/servers/telegram-bot-api/default.nix +++ b/pkgs/servers/telegram-bot-api/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { license = licenses.boost; maintainers = with maintainers; [ Anillc ]; platforms = platforms.all; + mainProgram = "telegram-bot-api"; }; } diff --git a/pkgs/servers/teleport/11/Cargo.lock b/pkgs/servers/teleport/11/Cargo.lock deleted file mode 100644 index 582ffb9b4c12a..0000000000000 --- a/pkgs/servers/teleport/11/Cargo.lock +++ /dev/null @@ -1,1685 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "asn1-rs" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "atomic-polyfill" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64ct" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" - -[[package]] -name = "bindgen" -version = "0.60.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "boring" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c713ad6d8d7a681a43870ac37b89efd2a08015ceb4b256d82707509c1f0b6bb" -dependencies = [ - "bitflags", - "boring-sys", - "foreign-types", - "lazy_static", - "libc", -] - -[[package]] -name = "boring-sys" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7663d3069437a5ccdb2b5f4f481c8b80446daea10fa8503844e89ac65fcdc363" -dependencies = [ - "bindgen", - "cmake", -] - -[[package]] -name = "bufstream" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8" - -[[package]] -name = "bumpalo" -version = "3.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "cbindgen" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6358dedf60f4d9b8db43ad187391afe959746101346fe51bb978126bec61dfb" -dependencies = [ - "clap", - "heck", - "indexmap", - "log", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn", - "tempfile", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cipher" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clang-sys" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "3.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "atty", - "bitflags", - "clap_lex", - "indexmap", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "cmake" -version = "0.1.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" -dependencies = [ - "cc", -] - -[[package]] -name = "const-oid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - -[[package]] -name = "const-oid" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" - -[[package]] -name = "critical-section" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - -[[package]] -name = "crypto-bigint" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" -dependencies = [ - "generic-array 0.14.6", - "subtle 2.4.1", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array 0.14.6", - "typenum", -] - -[[package]] -name = "crypto-mac" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" -dependencies = [ - "generic-array 0.12.4", - "subtle 1.0.0", -] - -[[package]] -name = "data-encoding" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" - -[[package]] -name = "delog" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd67f90cc14e0a91cf693141453cccf2b74db9d59c40f6be18b79169fe77dfd" -dependencies = [ - "log", -] - -[[package]] -name = "der" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" -dependencies = [ - "const-oid 0.7.1", - "crypto-bigint", - "pem-rfc7468 0.3.1", -] - -[[package]] -name = "der" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f" -dependencies = [ - "const-oid 0.9.1", - "pem-rfc7468 0.6.0", - "zeroize", -] - -[[package]] -name = "der-parser" -version = "8.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-bigint 0.4.3", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", -] - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "const-oid 0.9.1", - "crypto-common", -] - -[[package]] -name = "displaydoc" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "env_logger" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heapless" -version = "0.7.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version", - "spin 0.9.4", - "stable_deref_trait", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hmac" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" -dependencies = [ - "crypto-mac", - "digest 0.8.1", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array 0.14.6", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "iso7816" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e6ac743d509349b7865595ce90bbfcfbe59f42b8ec0db9e76ec361ace3f652" -dependencies = [ - "delog", - "heapless", -] - -[[package]] -name = "iso7816-tlv" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395d8e0ae63eb5016fbcf4a72864155880e34bce0158206fcfa7218efdd52e82" -dependencies = [ - "untrusted 0.9.0", -] - -[[package]] -name = "itoa" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - -[[package]] -name = "js-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.137" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libm" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "md-5" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18af3dcaf2b0219366cdb4e2af65a6101457b415c3d1a5c71dd9c2b7c77b9c8" -dependencies = [ - "block-buffer", - "digest 0.8.1", - "opaque-debug", -] - -[[package]] -name = "md4" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4030c65cf2aab7ada769cae7d1e7159f8d034d6ded4f39afba037f094bfd9a1" -dependencies = [ - "block-buffer", - "digest 0.8.1", - "fake-simd", - "opaque-debug", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_enum" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4" -dependencies = [ - "derivative", - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "oid-registry" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d4bda43fd1b844cbc6e6e54b5444e2b1bc7838bce59ad205902cccbb26d6761" -dependencies = [ - "asn1-rs", -] - -[[package]] -name = "once_cell" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem-rfc7468" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01de5d978f34aa4b2296576379fcc416034702fd94117c56ffd8a1a767cefb30" -dependencies = [ - "base64ct", -] - -[[package]] -name = "pem-rfc7468" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" -dependencies = [ - "base64ct", -] - -[[package]] -name = "pkcs1" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78f66c04ccc83dd4486fd46c33896f4e17b24a7a3a6400dedc48ed0ddd72320" -dependencies = [ - "der 0.5.1", - "pkcs8 0.8.0", - "zeroize", -] - -[[package]] -name = "pkcs1" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719" -dependencies = [ - "der 0.6.0", - "pkcs8 0.9.0", - "spki 0.6.0", - "zeroize", -] - -[[package]] -name = "pkcs8" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" -dependencies = [ - "der 0.5.1", - "spki 0.5.4", - "zeroize", -] - -[[package]] -name = "pkcs8" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" -dependencies = [ - "der 0.6.0", - "spki 0.6.0", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro2" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[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 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rc4" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1256e23efe6097f27aa82d6ca6889361c001586ae0f6917cbad072f05eb275" -dependencies = [ - "cipher", -] - -[[package]] -name = "rdp-client" -version = "0.1.0" -dependencies = [ - "bitflags", - "byteorder", - "cbindgen", - "env_logger", - "iso7816", - "iso7816-tlv", - "libc", - "log", - "num-derive", - "num-traits", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rdp-rs", - "rsa 0.7.2", - "tempfile", - "utf16string", - "uuid", -] - -[[package]] -name = "rdp-rs" -version = "0.1.0" -source = "git+https://github.com/gravitational/rdp-rs?rev=8f9f2ab4835f3e52cc9d1771114cc745f3c02759#8f9f2ab4835f3e52cc9d1771114cc745f3c02759" -dependencies = [ - "boring", - "bufstream", - "byteorder", - "gethostname", - "hmac", - "indexmap", - "md-5", - "md4", - "num-bigint 0.2.6", - "num_enum", - "oid-registry", - "rand 0.7.3", - "rc4", - "ring", - "rsa 0.6.1", - "rustls", - "x509-parser", - "yasna", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "rsa" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cf22754c49613d2b3b119f0e5d46e34a2c628a937e3024b8762de4e7d8c710b" -dependencies = [ - "byteorder", - "digest 0.10.6", - "num-bigint-dig", - "num-integer", - "num-iter", - "num-traits", - "pkcs1 0.3.3", - "pkcs8 0.8.0", - "rand_core 0.6.4", - "smallvec", - "subtle 2.4.1", - "zeroize", -] - -[[package]] -name = "rsa" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c" -dependencies = [ - "byteorder", - "digest 0.10.6", - "num-bigint-dig", - "num-integer", - "num-iter", - "num-traits", - "pkcs1 0.4.1", - "pkcs8 0.9.0", - "rand_core 0.6.4", - "signature", - "smallvec", - "subtle 2.4.1", - "zeroize", -] - -[[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 = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", -] - -[[package]] -name = "rustls" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "ryu" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted 0.7.1", -] - -[[package]] -name = "semver" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" - -[[package]] -name = "serde" -version = "1.0.148" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.148" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -dependencies = [ - "digest 0.10.6", - "rand_core 0.6.4", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" -dependencies = [ - "base64ct", - "der 0.5.1", -] - -[[package]] -name = "spki" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" -dependencies = [ - "base64ct", - "der 0.6.0", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subtle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] -name = "thiserror" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "time" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" -dependencies = [ - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" -dependencies = [ - "time-core", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[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.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 = "utf16string" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b62a1e85e12d5d712bf47a85f426b73d303e2d00a90de5f3004df3596e9d216" -dependencies = [ - "byteorder", -] - -[[package]] -name = "uuid" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[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.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" - -[[package]] -name = "web-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted 0.7.1", -] - -[[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-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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 = "x509-parser" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" -dependencies = [ - "asn1-rs", - "base64", - "data-encoding", - "der-parser", - "lazy_static", - "nom", - "oid-registry", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "yasna" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de7bff972b4f2a06c85f6d8454b09df153af7e3a4ec2aac81db1b105b684ddb" - -[[package]] -name = "zeroize" -version = "1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" diff --git a/pkgs/servers/teleport/11/default.nix b/pkgs/servers/teleport/11/default.nix deleted file mode 100644 index 3a935b630e721..0000000000000 --- a/pkgs/servers/teleport/11/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ callPackage, ... }@args: -callPackage ../generic.nix ({ - version = "11.3.27"; - hash = "sha256-A3EeFQsDOaggfb5S+eyRCe/vm054MabfRrcHPxhO0So="; - vendorHash = "sha256-hjMv/H4dlinlv3ku7i1km2/b+6uCdbznHtVOMIjDlUc="; - yarnHash = "sha256-hip0WQVZpx2qfVDmEy4nk4UFYEjX1Xhj8HsIIQ8PF1Y="; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "rdp-rs-0.1.0" = "sha256-GJfUyiYQwcDTMqt+iik3mFI0f6mu13RJ2XuoDzlg9sU="; - }; - }; - extPatches = [ - # https://github.com/NixOS/nixpkgs/issues/120738 - ../tsh.patch - # https://github.com/NixOS/nixpkgs/issues/132652 - ../test.patch - ]; -} // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/servers/teleport/12/Cargo.lock b/pkgs/servers/teleport/12/Cargo.lock index c150d003f3ac4..1eb7a42879cd8 100644 --- a/pkgs/servers/teleport/12/Cargo.lock +++ b/pkgs/servers/teleport/12/Cargo.lock @@ -41,7 +41,7 @@ checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "synstructure", ] @@ -53,7 +53,7 @@ checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -96,11 +96,11 @@ checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" [[package]] name = "bindgen" -version = "0.60.1" +version = "0.66.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" +checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cexpr", "clang-sys", "lazy_static", @@ -111,6 +111,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn 2.0.39", ] [[package]] @@ -120,6 +121,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] name = "block-buffer" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -142,25 +149,27 @@ dependencies = [ [[package]] name = "boring" -version = "2.1.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c713ad6d8d7a681a43870ac37b89efd2a08015ceb4b256d82707509c1f0b6bb" +checksum = "7ae1aba472e42d3cf45ac6d0a6c8fc3ddf743871209e1b40229aed9fbdf48ece" dependencies = [ - "bitflags", + "bitflags 2.4.1", "boring-sys", "foreign-types", - "lazy_static", "libc", + "once_cell", ] [[package]] name = "boring-sys" -version = "2.1.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7663d3069437a5ccdb2b5f4f481c8b80446daea10fa8503844e89ac65fcdc363" +checksum = "ceced5be0047c7c48d77599535fd7f0a81c1b0f0a1e97e7eece24c45022bb481" dependencies = [ "bindgen", "cmake", + "fs_extra", + "fslock", ] [[package]] @@ -201,7 +210,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn", + "syn 1.0.107", "tempfile", "toml", ] @@ -255,7 +264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_lex", "indexmap", "strsim", @@ -397,7 +406,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -427,7 +436,7 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -507,7 +516,7 @@ checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -517,6 +526,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + +[[package]] name = "generic-array" version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -888,7 +913,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -941,7 +966,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1045,7 +1070,7 @@ version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "flate2", "miniz_oxide", @@ -1068,18 +1093,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1168,7 +1193,7 @@ dependencies = [ name = "rdp-client" version = "0.1.0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "cbindgen", "env_logger", @@ -1191,7 +1216,7 @@ dependencies = [ [[package]] name = "rdp-rs" version = "0.1.0" -source = "git+https://github.com/gravitational/rdp-rs?rev=75eb6a30b83e7152ee6213964b5ac6e783304840#75eb6a30b83e7152ee6213964b5ac6e783304840" +source = "git+https://github.com/gravitational/rdp-rs?rev=0ddb504e10051aaa8f0de57580a973d2853a5b7d#0ddb504e10051aaa8f0de57580a973d2853a5b7d" dependencies = [ "boring", "bufstream", @@ -1219,7 +1244,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1240,15 +1265,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] name = "ring" version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1334,7 +1350,7 @@ version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -1399,7 +1415,7 @@ checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1506,6 +1522,17 @@ dependencies = [ ] [[package]] +name = "syn" +version = "2.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] name = "synstructure" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1513,22 +1540,21 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "unicode-xid", ] [[package]] name = "tempfile" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi", + "rustix", + "windows-sys", ] [[package]] @@ -1563,7 +1589,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1689,7 +1715,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-shared", ] @@ -1711,7 +1737,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/pkgs/servers/teleport/12/default.nix b/pkgs/servers/teleport/12/default.nix index 6fcba5773f3cf..ce91acb763f4c 100644 --- a/pkgs/servers/teleport/12/default.nix +++ b/pkgs/servers/teleport/12/default.nix @@ -1,19 +1,17 @@ { callPackage, ... }@args: callPackage ../generic.nix ({ - version = "12.4.23"; - hash = "sha256-kCHRBa9rdwfcb98XG/08ZaJmI1NhEiSCoXuH8/3xJlk="; - vendorHash = "sha256-yOvQQHjtDSLqQZcw2OIOy6CDqwYSgMpL2Rxlk2u//OE="; - yarnHash = "sha256-beHCg9qUSisYMJ/9eeqWmbc9+V9YGgXBheZSFpbqoPY="; + version = "12.4.32"; + hash = "sha256-dYriqQwrc3tfLv+/G/W8n+4cLbPUq7lq1/kGH/GIsHs="; + vendorHash = "sha256-1z1Aocxi34/6Kuwj30LWjEq+LrZThG6ZzrMb0Qtok8w="; + yarnHash = "sha256-Sr9T2TmrysMQs6A00rHU1IZjslu8jyYkVnYE6AmBmLA="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "rdp-rs-0.1.0" = "sha256-n4x4w7GZULxqaR109das12+ZGU0xvY3wGOTWngcwe4M="; + "rdp-rs-0.1.0" = "sha256-4NbAsEmyUdmBcHuzx+SLQCGKICC4V4FX4GTK2SzyHC0="; }; }; extPatches = [ # https://github.com/NixOS/nixpkgs/issues/120738 ../tsh.patch - # https://github.com/NixOS/nixpkgs/issues/132652 - ../test.patch ]; } // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/servers/teleport/13/Cargo.lock b/pkgs/servers/teleport/13/Cargo.lock index e0b56c33db8e3..52daefdf5c3a2 100644 --- a/pkgs/servers/teleport/13/Cargo.lock +++ b/pkgs/servers/teleport/13/Cargo.lock @@ -41,7 +41,7 @@ checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "synstructure", ] @@ -53,7 +53,7 @@ checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -96,11 +96,11 @@ checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" [[package]] name = "bindgen" -version = "0.60.1" +version = "0.66.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" +checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cexpr", "clang-sys", "lazy_static", @@ -111,6 +111,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn 2.0.39", ] [[package]] @@ -121,9 +122,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.1.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block-buffer" @@ -148,25 +149,27 @@ dependencies = [ [[package]] name = "boring" -version = "2.1.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c713ad6d8d7a681a43870ac37b89efd2a08015ceb4b256d82707509c1f0b6bb" +checksum = "7ae1aba472e42d3cf45ac6d0a6c8fc3ddf743871209e1b40229aed9fbdf48ece" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "boring-sys", "foreign-types", - "lazy_static", "libc", + "once_cell", ] [[package]] name = "boring-sys" -version = "2.1.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7663d3069437a5ccdb2b5f4f481c8b80446daea10fa8503844e89ac65fcdc363" +checksum = "ceced5be0047c7c48d77599535fd7f0a81c1b0f0a1e97e7eece24c45022bb481" dependencies = [ "bindgen", "cmake", + "fs_extra", + "fslock", ] [[package]] @@ -207,7 +210,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn", + "syn 1.0.107", "tempfile", "toml", ] @@ -403,7 +406,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -433,7 +436,7 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -522,7 +525,7 @@ checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -532,6 +535,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + +[[package]] name = "generic-array" version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -919,7 +938,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -972,7 +991,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1100,18 +1119,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1200,7 +1219,7 @@ dependencies = [ name = "rdp-client" version = "0.1.0" dependencies = [ - "bitflags 2.1.0", + "bitflags 2.4.1", "byteorder", "cbindgen", "env_logger", @@ -1223,7 +1242,7 @@ dependencies = [ [[package]] name = "rdp-rs" version = "0.1.0" -source = "git+https://github.com/gravitational/rdp-rs?rev=75eb6a30b83e7152ee6213964b5ac6e783304840#75eb6a30b83e7152ee6213964b5ac6e783304840" +source = "git+https://github.com/gravitational/rdp-rs?rev=0ddb504e10051aaa8f0de57580a973d2853a5b7d#0ddb504e10051aaa8f0de57580a973d2853a5b7d" dependencies = [ "boring", "bufstream", @@ -1435,7 +1454,7 @@ checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1548,6 +1567,17 @@ dependencies = [ ] [[package]] +name = "syn" +version = "2.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] name = "synstructure" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1555,7 +1585,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "unicode-xid", ] @@ -1604,7 +1634,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1730,7 +1760,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-shared", ] @@ -1752,7 +1782,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/pkgs/servers/teleport/13/default.nix b/pkgs/servers/teleport/13/default.nix index 65a4cf64064c6..02957376d9f21 100644 --- a/pkgs/servers/teleport/13/default.nix +++ b/pkgs/servers/teleport/13/default.nix @@ -1,19 +1,17 @@ { callPackage, ... }@args: callPackage ../generic.nix ({ - version = "13.4.5"; - hash = "sha256-uZolRnESFP65Xgvr29laEok2kBbm7G2qY9j8yKRrUdo="; - vendorHash = "sha256-Bkr6R9P2YTqvTEQkHvVdsRmWp6pv3Qg0WaQ+pERclWc="; - yarnHash = "sha256-60k4LRHpX4rYXZZ0CC44PqzL3PDu8PadV0kwXatnByI="; + version = "13.4.14"; + hash = "sha256-g11D5lekI3pUpKf5CLUuNjejs0gN/bEemHkCj3akha0="; + vendorHash = "sha256-wQywm41qnv/ryZwwyIg+La1Z7qAw2I/fUI3kLgHlq9Q="; + yarnHash = "sha256-E9T+7aXVoERdUnVEL4va2fcMnv1jsL9Js/R2LZo4hu4="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "rdp-rs-0.1.0" = "sha256-n4x4w7GZULxqaR109das12+ZGU0xvY3wGOTWngcwe4M="; + "rdp-rs-0.1.0" = "sha256-4NbAsEmyUdmBcHuzx+SLQCGKICC4V4FX4GTK2SzyHC0="; }; }; extPatches = [ # https://github.com/NixOS/nixpkgs/issues/120738 ../tsh.patch - # https://github.com/NixOS/nixpkgs/issues/132652 - ../test.patch ]; } // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/servers/teleport/14/Cargo.lock b/pkgs/servers/teleport/14/Cargo.lock index fc4c503d45469..d8ea54f8599fc 100644 --- a/pkgs/servers/teleport/14/Cargo.lock +++ b/pkgs/servers/teleport/14/Cargo.lock @@ -96,11 +96,11 @@ checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" [[package]] name = "bindgen" -version = "0.60.1" +version = "0.66.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" +checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cexpr", "clang-sys", "lazy_static", @@ -111,6 +111,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn 2.0.23", ] [[package]] @@ -148,25 +149,27 @@ dependencies = [ [[package]] name = "boring" -version = "2.1.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c713ad6d8d7a681a43870ac37b89efd2a08015ceb4b256d82707509c1f0b6bb" +checksum = "7ae1aba472e42d3cf45ac6d0a6c8fc3ddf743871209e1b40229aed9fbdf48ece" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "boring-sys", "foreign-types", - "lazy_static", "libc", + "once_cell", ] [[package]] name = "boring-sys" -version = "2.1.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7663d3069437a5ccdb2b5f4f481c8b80446daea10fa8503844e89ac65fcdc363" +checksum = "ceced5be0047c7c48d77599535fd7f0a81c1b0f0a1e97e7eece24c45022bb481" dependencies = [ "bindgen", "cmake", + "fs_extra", + "fslock", ] [[package]] @@ -529,6 +532,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + +[[package]] name = "generic-array" version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1214,7 +1233,7 @@ dependencies = [ [[package]] name = "rdp-rs" version = "0.1.0" -source = "git+https://github.com/gravitational/rdp-rs?rev=75eb6a30b83e7152ee6213964b5ac6e783304840#75eb6a30b83e7152ee6213964b5ac6e783304840" +source = "git+https://github.com/gravitational/rdp-rs?rev=0ddb504e10051aaa8f0de57580a973d2853a5b7d#0ddb504e10051aaa8f0de57580a973d2853a5b7d" dependencies = [ "boring", "bufstream", diff --git a/pkgs/servers/teleport/14/default.nix b/pkgs/servers/teleport/14/default.nix index d62c4549329bd..df97732bed580 100644 --- a/pkgs/servers/teleport/14/default.nix +++ b/pkgs/servers/teleport/14/default.nix @@ -1,13 +1,13 @@ { callPackage, ... }@args: callPackage ../generic.nix ({ - version = "14.1.1"; - hash = "sha256-xdJBl5imHuo1IP0ja33eaaE4i/sSP3kg/wQwehC1Hao="; - vendorHash = "sha256-+kCns/xHUfUOW2xBk6CaPZYWe/vcEguz2/4lqaJEbFc="; - yarnHash = "sha256-fWBMeat1bSIEMSADn8oDVfQtnUBojjy5ZCdVhw8PGMs="; + version = "14.3.0"; + hash = "sha256-yTbJeHCmPlelq7BrZQRY3XyNQiovV7NQ1tNh2NfYGbk="; + vendorHash = "sha256-ySe5YkBMt+1tF/8PWctfAkK/e03cqp5P1aJ2ANz7pLo="; + yarnHash = "sha256-m934P+KygGiCzr5fDsNTlmZ1T9JxA6P8zTimocQyVi0="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "rdp-rs-0.1.0" = "sha256-n4x4w7GZULxqaR109das12+ZGU0xvY3wGOTWngcwe4M="; + "rdp-rs-0.1.0" = "sha256-4NbAsEmyUdmBcHuzx+SLQCGKICC4V4FX4GTK2SzyHC0="; }; }; extPatches = [ diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index f98e01de51528..d8b630d1a5f3b 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -14,7 +14,7 @@ , stdenv , xdg-utils , yarn -, yarn2nix-moretea +, prefetch-yarn-deps , nixosTests , withRdpClient ? true @@ -72,7 +72,7 @@ let nativeBuildInputs = [ nodejs yarn - yarn2nix-moretea.fixup_yarn_lock + prefetch-yarn-deps ]; configurePhase = '' @@ -81,7 +81,7 @@ let buildPhase = '' yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline \ --frozen-lockfile \ diff --git a/pkgs/servers/teleport/test.patch b/pkgs/servers/teleport/test.patch deleted file mode 100644 index 49f5a17663e1c..0000000000000 --- a/pkgs/servers/teleport/test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tool/tsh/resolve_default_addr_test.go b/tool/tsh/resolve_default_addr_test.go -index d5976f156..aec5199aa 100644 ---- a/tool/tsh/resolve_default_addr_test.go -+++ b/tool/tsh/resolve_default_addr_test.go -@@ -237,7 +237,7 @@ func TestResolveDefaultAddrTimeoutBeforeAllRacersLaunched(t *testing.T) { - - blockingHandler, doneCh := newWaitForeverHandler() - -- servers := make([]*httptest.Server, 1000) -+ servers := make([]*httptest.Server, 100) - for i := 0; i < len(servers); i++ { - servers[i] = makeTestServer(t, blockingHandler) - } diff --git a/pkgs/servers/teleport/tsh.patch b/pkgs/servers/teleport/tsh.patch index 0d614f063d482..fac9c98ab0496 100644 --- a/pkgs/servers/teleport/tsh.patch +++ b/pkgs/servers/teleport/tsh.patch @@ -1,10 +1,10 @@ diff --git a/tool/tsh/tsh.go b/tool/tsh/tsh.go -index 57379c40f..cb4d7b84c 100644 +index f73b0a4e46..6848286781 100644 --- a/tool/tsh/tsh.go +++ b/tool/tsh/tsh.go -@@ -514,10 +514,11 @@ func Run(args []string, opts ...cliOption) error { - } - } +@@ -1065,10 +1065,11 @@ func Run(ctx context.Context, args []string, opts ...cliOption) error { + + var err error - cf.executablePath, err = os.Executable() + tempBinaryPath, err := os.Executable() @@ -13,5 +13,5 @@ index 57379c40f..cb4d7b84c 100644 } + cf.executablePath = path.Dir(tempBinaryPath) + "/tsh" - if err := client.ValidateAgentKeyOption(cf.AddKeysToAgent); err != nil { - return trace.Wrap(err) + // configs + setEnvFlags(&cf) diff --git a/pkgs/servers/tidb/default.nix b/pkgs/servers/tidb/default.nix index f5600579a0ef9..5d929dfe348ed 100644 --- a/pkgs/servers/tidb/default.nix +++ b/pkgs/servers/tidb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tidb"; - version = "7.3.0"; + version = "7.4.0"; src = fetchFromGitHub { owner = "pingcap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zpAduymFC17iL9eEssFoHxK+J4EP1QyamchfLetFN/k="; + sha256 = "sha256-OsyQ7YZjErjfWg/1wf21AxBu2wrotey8hJSzoQQ0OSc="; }; - vendorHash = "sha256-GbAZK2TQKc3bziZm202Q2QLLK0TDJ/AplSGKBSLSoqQ="; + vendorHash = "sha256-jtuf3/CClz37TTQ2zs49yryccoaraAG4UrIOIlBYFqQ="; ldflags = [ "-s" @@ -27,5 +27,6 @@ buildGoModule rec { homepage = "https://pingcap.com"; license = licenses.asl20; maintainers = []; + mainProgram = "tidb-server"; }; } diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/servers/tmate-ssh-server/default.nix index dff7f050fbf97..09cd26090e149 100644 --- a/pkgs/servers/tmate-ssh-server/default.nix +++ b/pkgs/servers/tmate-ssh-server/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ ck3d ]; + mainProgram = "tmate-ssh-server"; }; } diff --git a/pkgs/servers/tracing/honeycomb/refinery/default.nix b/pkgs/servers/tracing/honeycomb/refinery/default.nix index a44be19b35aba..d1c7f9d909587 100644 --- a/pkgs/servers/tracing/honeycomb/refinery/default.nix +++ b/pkgs/servers/tracing/honeycomb/refinery/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { doCheck = true; meta = with lib; { - homepage = "https://github.com/honeycomb/refinery"; + homepage = "https://github.com/honeycombio/refinery"; description = "A tail-sampling proxy for OpenTelemetry"; license = licenses.asl20; maintainers = with maintainers; [ lf- ]; diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index 9a35bf29bd88b..59bd418860faa 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tempo"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-vqYewQT2alW9HFYRh/Ok3jFt2a+VsfqDypNaT+mngys="; + hash = "sha256-U4qn4bBaVCDRQArlxXUURwjz5iPQv7R8o2+xR3PQHGc="; }; vendorHash = null; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 41b6ae78a8780..22ad9d0d94294 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "traefik"; - version = "2.10.5"; + version = "2.10.7"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - hash = "sha256-b6CqpVDgyZvgBInlgni1+zukZ7DMzFUV3JdXmh+A+18="; + hash = "sha256-I+jmMtqWadWfT7nk2D9im6C2BGpPLts/7cdJ3NHsIks="; stripRoot = false; }; - vendorHash = "sha256-bQy003IqezNSZU4K9qvApvYW+W4g6RkIqr4okkN/0gI="; + vendorHash = "sha256-3SyD1mC+tc8cf5MGcw891W5VbX+b7d0cIJQfwNq2NU8="; subPackages = [ "cmd/traefik" ]; preBuild = '' - go generate + GOOS= GOARCH= CGO_ENABLED=0 go generate CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary) @@ -35,5 +35,6 @@ buildGoModule rec { changelog = "https://github.com/traefik/traefik/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ vdemeester ]; + mainProgram = "traefik"; }; } diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix index 8d2f4f42afb3e..84ade1ef70ade 100644 --- a/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tt-rss-theme-feedly"; - version = "3.1.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "levito"; repo = "tt-rss-feedly-theme"; rev = "v${version}"; - sha256 = "sha256-sHKht4EXKIibk+McMR+fKv7eZFJsGgZWhfxlLssA/Sw="; + sha256 = "sha256-3mD1aY7gjdvucRzY7sLmZ1RsHtraAg1RGE/3uDp6/o4="; }; dontBuild = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Feedly theme for Tiny Tiny RSS"; - license = licenses.wtfpl; + license = licenses.mit; homepage = "https://github.com/levito/tt-rss-feedly-theme"; maintainers = with maintainers; [ das_j ]; platforms = platforms.all; diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index 435e872d332fe..68731b6f717da 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -20,11 +20,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; + passthru.tests = { + inherit (nixosTests) ttyd; + }; + meta = { description = "Share your terminal over the web"; homepage = "https://github.com/tsl0922/ttyd"; license = lib.licenses.mit; maintainers = [ lib.maintainers.thoughtpolice ]; platforms = lib.platforms.all; + mainProgram = "ttyd"; }; } diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 573a857becd77..499a046663aef 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -102,8 +102,6 @@ in stdenv.mkDerivation { ]; preConfigure = '' - patchShebangs ./configure - substituteInPlace src/config.c \ --replace /usr/bin/tar ${gnutar}/bin/tar @@ -131,5 +129,6 @@ in stdenv.mkDerivation { license = licenses.gpl3Only; platforms = platforms.unix; maintainers = with maintainers; [ simonvandel ]; + mainProgram = "tvheadend"; }; } diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index 0f50b1e18dd72..9056b4791672f 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { license = licenses.free; maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; + mainProgram = "u9fs"; }; } diff --git a/pkgs/servers/ucarp/default.nix b/pkgs/servers/ucarp/default.nix index b9a8bbea48045..90cbc562d382a 100644 --- a/pkgs/servers/ucarp/default.nix +++ b/pkgs/servers/ucarp/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ isc bsdOriginal bsd2 gpl2Plus ]; maintainers = with maintainers; [ oxzi ]; + mainProgram = "ucarp"; }; } diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 65447ecb74a1e..e2251e1a20c8f 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "uftp"; - version = "5.0.1"; + version = "5.0.3"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "sha256-8ENfvI6f+hJeBWAMtsf8kz19WH9brkGyVyZ75PLODmE="; + sha256 = "sha256-y4ZowZsfELxjoW/6iT4gXcPshjYQN9R32AAyYOvEAIA="; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 48398a5ba6e11..e862884a457b6 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thall snicket2100 ]; + mainProgram = "ums"; }; } diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index c961321a875fa..9a9df286dc3af 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -67,6 +67,12 @@ in rec { unifi7 = generic { version = "7.5.187"; + suffix = "-f57f5bf7ab"; sha256 = "sha256-a5kl8gZbRnhS/p1imPl7soM0/QSFHdM0+2bNmDfc1mY="; }; + + unifi8 = generic { + version = "8.0.26"; + sha256 = "96d79cad82656d490f99ea476b6e6b049836f705a9aad594572b46e5f0f535d1"; + }; } diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix index 140f4ddfa7933..26ee095e951d3 100644 --- a/pkgs/servers/unpackerr/default.nix +++ b/pkgs/servers/unpackerr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unpackerr"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "davidnewhall"; repo = "unpackerr"; rev = "v${version}"; - sha256 = "sha256-yMmn733j6k9r8I/lvVOZNL6o35eSPJZ5G8jw9xaJZRg="; + sha256 = "sha256-K6ZDRDtxeqtjToElix1qVgclHaEeOY0W6hOwehFNIgo="; }; - vendorHash = "sha256-1VMeRB34JS9EwyGhPxFsRIgKaY6NyIMsa132PQKoPYY="; + vendorHash = "sha256-1OSZzs/hUvauRIE5lzlXPIS2EkHm4aNK1iddjKCb6zA="; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; @@ -22,5 +22,6 @@ buildGoModule rec { homepage = "https://github.com/davidnewhall/unpackerr"; maintainers = with maintainers; [ nullx76 ]; license = licenses.mit; + mainProgram = "unpackerr"; }; } diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix index f71263469744b..b67cf7ce05496 100644 --- a/pkgs/servers/unpfs/default.nix +++ b/pkgs/servers/unpfs/default.nix @@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec { # macOS build fails: https://github.com/pfpacket/rust-9p/issues/7 platforms = with platforms; linux; + mainProgram = "unpfs"; }; } diff --git a/pkgs/servers/unstructured-api/default.nix b/pkgs/servers/unstructured-api/default.nix index 7fb028de5fc92..759096ea1b555 100644 --- a/pkgs/servers/unstructured-api/default.nix +++ b/pkgs/servers/unstructured-api/default.nix @@ -21,7 +21,7 @@ let safetensors uvicorn ] ++ packages.unstructured.optional-dependencies.local-inference); - version = "0.0.57"; + version = "0.0.61"; unstructured_api_nltk_data = symlinkJoin { name = "unstructured_api_nltk_data"; @@ -35,7 +35,7 @@ in stdenvNoCC.mkDerivation { owner = "Unstructured-IO"; repo = "unstructured-api"; rev = version; - hash = "sha256-FdRrGqF1cJImFVNs/tZo1457f9yhhpwxGGmpAdZUWso="; + hash = "sha256-Ucd+SKIES9E5WgKJjg8Vihjc1hMrJ9e956Sb7QlQea8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 2c7563fe03c08..beeca756d8678 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -168,5 +168,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ abbradar schneefux globin ]; platforms = lib.platforms.unix; + mainProgram = "uwsgi"; }; }) diff --git a/pkgs/servers/uxplay/default.nix b/pkgs/servers/uxplay/default.nix index d5d150bd0f2cd..c453c63e6f08d 100644 --- a/pkgs/servers/uxplay/default.nix +++ b/pkgs/servers/uxplay/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxplay"; - version = "1.66"; + version = "1.68.1"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${finalAttrs.version}"; - hash = "sha256-kIKBxkaFvwxWUkO7AAwehP9YPOci+u2g67hEWZ52UqE="; + hash = "sha256-9/fzEaOIgkBnEkmwemMEPTmxMOi1/PYhD9zbb/s2huM="; }; postPatch = '' @@ -53,5 +53,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.azuwis ]; platforms = lib.platforms.unix; + mainProgram = "uxplay"; }; }) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index a3521fe073fa8..93b17c219a3ea 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -45,7 +45,7 @@ let description = "Web application accelerator also known as a caching HTTP reverse proxy"; homepage = "https://www.varnish-cache.org"; license = licenses.bsd2; - maintainers = with maintainers; [ ajs124 ]; + maintainers = teams.helsinki-systems.members; platforms = platforms.unix; }; }; diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index 535ef7192d84a..cfb22c85dbec5 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -33,5 +33,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ leona erictapen ]; platforms = platforms.linux; + mainProgram = "vouch-proxy"; }; } diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index dcd95cdea07bc..6fe0974e4a88d 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 = "23.08.3"; + version = "23.12.1"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EJozYktTnruJTwnDZZ8LHp/DI/ZjwWScRTJewXJuC4k="; + sha256 = "0ax3mwkypv1wkjh7p7cjpkzi72a4183hw77bjlcjlziw37vsv6kc"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index 8fadb61c6f69b..2709f22c3d1d3 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -5,20 +5,20 @@ let "aws/aws-crt-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-crt-php-2f1dc7b7eda080498be96a4a6d683a41583030e9"; + name = "aws-aws-crt-php-eb0c6e4e142224a10b08f49ebf87f32611d162b2"; src = fetchurl { - url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/2f1dc7b7eda080498be96a4a6d683a41583030e9"; - sha256 = "12b7kvc8r5rw3g47hfpg5y37ybk6b67xvq6a36id5pxxkbzsqzwx"; + url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/eb0c6e4e142224a10b08f49ebf87f32611d162b2"; + sha256 = "10fnazz3gv51i6dngrc6hbcmzwrvl6mmd2z44rrdbzz3ry8v3vc9"; }; }; }; "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-ebd5e47c5be0425bb5cf4f80737850ed74767107"; + name = "aws-aws-sdk-php-2e34d45e970c77775e4c298e08732d64b647c41c"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/ebd5e47c5be0425bb5cf4f80737850ed74767107"; - sha256 = "0fnbhpr5awvq4463l51j4rr0cc15lqqa9ppdjjp4jw2g6azckb8y"; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/2e34d45e970c77775e4c298e08732d64b647c41c"; + sha256 = "1h08lxna8sjq90lrxj60w2cyf9iynvyw4b8r9nl1bxsdmbmgl27s"; }; }; }; @@ -62,13 +62,23 @@ let }; }; }; + "carbonphp/carbon-doctrine-types" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "carbonphp-carbon-doctrine-types-99f76ffa36cce3b70a4a6abce41dba15ca2e84cb"; + src = fetchurl { + url = "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/99f76ffa36cce3b70a4a6abce41dba15ca2e84cb"; + sha256 = "0vkhwbprqlcg4awdknaycbfydb4spk7vd1v0nxbq06zx22dmphaz"; + }; + }; + }; "dasprid/enum" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dasprid-enum-8e6b6ea76eabbf19ea2bf5b67b98e1860474012f"; + name = "dasprid-enum-6faf451159fb8ba4126b925ed2d78acfce0dc016"; src = fetchurl { - url = "https://api.github.com/repos/DASPRiD/Enum/zipball/8e6b6ea76eabbf19ea2bf5b67b98e1860474012f"; - sha256 = "0cckq42c9iyjfv7xmy6rl4xj3dn80v9k8qzc3ppdjm4wgj43rrkz"; + url = "https://api.github.com/repos/DASPRiD/Enum/zipball/6faf451159fb8ba4126b925ed2d78acfce0dc016"; + sha256 = "1c3c7zdmpd5j1pw9am0k3mj8n17vy6xjhsh2qa7c0azz0f21jk4j"; }; }; }; @@ -95,20 +105,20 @@ let "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-63646ffd71d1676d2f747f871be31b7e921c7864"; + name = "doctrine-dbal-0ac3c270590e54910715e9a1a044cc368df282b2"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/63646ffd71d1676d2f747f871be31b7e921c7864"; - sha256 = "0qqiq46983m5c4w0i59z2ik1v69slglr8nrj5p2zcpxq9zmczbkj"; + url = "https://api.github.com/repos/doctrine/dbal/zipball/0ac3c270590e54910715e9a1a044cc368df282b2"; + sha256 = "1qf6nhrrn7hdxqvym9l3mxj1sb0fmx2h1s3yi4mjkkb4ri5hcmm8"; }; }; }; "doctrine/deprecations" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-deprecations-612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"; + name = "doctrine-deprecations-4f2d4f2836e7ec4e7a8625e75c6aa916004db931"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"; - sha256 = "078w4k0xdywyb44caz5grbcbxsi87iy13g7a270rs9g5f0p245fi"; + url = "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931"; + sha256 = "1kxy6s4v9prkfvsnggm10kk0yyqsyd2vk238zhvv3c9il300h8sk"; }; }; }; @@ -145,10 +155,10 @@ let "dompdf/dompdf" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dompdf-dompdf-e8d2d5e37e8b0b30f0732a011295ab80680d7e85"; + name = "dompdf-dompdf-093f2d9739cec57428e39ddadedfd4f3ae862c0f"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/dompdf/zipball/e8d2d5e37e8b0b30f0732a011295ab80680d7e85"; - sha256 = "0a2qk57c3qwg7j8gp1hwyd8y8dwm5pb8lg1npb49sijig8kyjlv3"; + url = "https://api.github.com/repos/dompdf/dompdf/zipball/093f2d9739cec57428e39ddadedfd4f3ae862c0f"; + sha256 = "0852xp3qfg40byhv7z4bma9bpiyrc3yral3p9xhk8g62jjddvayn"; }; }; }; @@ -175,60 +185,60 @@ let "fruitcake/php-cors" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "fruitcake-php-cors-58571acbaa5f9f462c9c77e911700ac66f446d4e"; + name = "fruitcake-php-cors-3d158f36e7875e2f040f37bc0573956240a5a38b"; src = fetchurl { - url = "https://api.github.com/repos/fruitcake/php-cors/zipball/58571acbaa5f9f462c9c77e911700ac66f446d4e"; - sha256 = "18xm69q4dk9zqfwgp938y2byhlyy9lr5x5qln4k2mg8cq8xr2sm1"; + url = "https://api.github.com/repos/fruitcake/php-cors/zipball/3d158f36e7875e2f040f37bc0573956240a5a38b"; + sha256 = "1pdq0dxrmh4yj48y9azrld10qmz1w3vbb9q81r85fvgl62l2kiww"; }; }; }; "graham-campbell/result-type" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "graham-campbell-result-type-672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831"; + name = "graham-campbell-result-type-fbd48bce38f73f8a4ec8583362e732e4095e5862"; src = fetchurl { - url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831"; - sha256 = "156zbfs19r9g543phlpjwhqin3k2x4dsvr5p0wk7rk4j0wwp8l2v"; + url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862"; + sha256 = "1mzahy4df8d45qm716crs45rp5j7k31r0jhkmbrrvqsvapnmj9ip"; }; }; }; "guzzlehttp/guzzle" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-guzzle-fb7566caccf22d74d1ab270de3551f72a58399f5"; + name = "guzzlehttp-guzzle-41042bc7ab002487b876a0683fc8dce04ddce104"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5"; - sha256 = "0cmpq50s5xi9sg1dygllrhwj5dz5bxxj83xkvjspz63751xr51cs"; + url = "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104"; + sha256 = "0awhhka285kk0apv92n0a0yfbihi2ddnx3qr1c7s97asgxfnwxsv"; }; }; }; "guzzlehttp/promises" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-promises-111166291a0f8130081195ac4556a5587d7f1b5d"; + name = "guzzlehttp-promises-bbff78d96034045e58e13dedd6ad91b5d1253223"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d"; - sha256 = "17d50in3wq62y8gcgadiimn9s2mc90xvil5g851l9y2k0c4y31s2"; + url = "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223"; + sha256 = "1p0bry118c3lichkz8lag37ndvvhbd2nf0k9kzwi8gz1bzf9d45f"; }; }; }; "guzzlehttp/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-psr7-8bd7c33a0734ae1c5d074360512beb716bef3f77"; + name = "guzzlehttp-psr7-45b30f99ac27b5ca93cb4831afe16285f57b8221"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/psr7/zipball/8bd7c33a0734ae1c5d074360512beb716bef3f77"; - sha256 = "0c2b8n3ip5w91fg277dccak0z7p6jgc0fm7m8lc9s5n567aahmj3"; + url = "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221"; + sha256 = "0k60pzfpxd6q1rhr9gbf53j0hm9wj5p5spkc0zfyia4b8f8pgmdm"; }; }; }; "guzzlehttp/uri-template" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-uri-template-b945d74a55a25a949158444f09ec0d3c120d69e2"; + name = "guzzlehttp-uri-template-ecea8feef63bd4fef1f037ecb288386999ecc11c"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/uri-template/zipball/b945d74a55a25a949158444f09ec0d3c120d69e2"; - sha256 = "02vd4r2di8xh9n5awfjy1lyb7vn5gkaynbiiqilm8did0r89qdhf"; + url = "https://api.github.com/repos/guzzle/uri-template/zipball/ecea8feef63bd4fef1f037ecb288386999ecc11c"; + sha256 = "0r3cbb2pgsy4nawbylc0nbski2r9dkl335ay5m4i82yglspl9zz4"; }; }; }; @@ -245,60 +255,60 @@ let "knplabs/knp-snappy" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "knplabs-knp-snappy-b66f79334421c26d9c244427963fa2d92980b5d3"; + name = "knplabs-knp-snappy-3db13fe45d12a7bccb2b83f622e5a90f7e40b111"; src = fetchurl { - url = "https://api.github.com/repos/KnpLabs/snappy/zipball/b66f79334421c26d9c244427963fa2d92980b5d3"; - sha256 = "164zx6pr06maad8rsf2rq2p576pcx62khzpz808v3dpm4yadlh88"; + url = "https://api.github.com/repos/KnpLabs/snappy/zipball/3db13fe45d12a7bccb2b83f622e5a90f7e40b111"; + sha256 = "1l4nln4cg01ywv9lzi5srnm7jq4q1v0210j9sshq34vx8slll9di"; }; }; }; "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-e3350e87a52346af9cc655a3012d2175d2d05ad7"; + name = "laravel-framework-082345d76fc6a55b649572efe10b11b03e279d24"; src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/e3350e87a52346af9cc655a3012d2175d2d05ad7"; - sha256 = "1iqqiwvi3q8vhnhrnfismczga0q958i1h44xv3qna80l6iv5vv0m"; + url = "https://api.github.com/repos/laravel/framework/zipball/082345d76fc6a55b649572efe10b11b03e279d24"; + sha256 = "0gzpj0cgnqncxd4h196k5mvv169xzmy8c6bdwm5pkdy0f2hnb6lq"; }; }; }; "laravel/serializable-closure" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-serializable-closure-e5a3057a5591e1cfe8183034b0203921abe2c902"; + name = "laravel-serializable-closure-3dbf8a8e914634c48d389c1234552666b3d43754"; src = fetchurl { - url = "https://api.github.com/repos/laravel/serializable-closure/zipball/e5a3057a5591e1cfe8183034b0203921abe2c902"; - sha256 = "0sjcn7w31x14slfj2mqs32kj62ay86i47i441p5cg3ajw9kjb6iy"; + url = "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754"; + sha256 = "1vvayh1bzbw16xj8ash4flibkgn5afwn64nfwmjdi7lcr48cw65q"; }; }; }; "laravel/socialite" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-socialite-50148edf24b6cd3e428aa9bc06a5d915b24376bb"; + name = "laravel-socialite-4f6a8af6f3f7c18da03d19842dd0514315501c10"; src = fetchurl { - url = "https://api.github.com/repos/laravel/socialite/zipball/50148edf24b6cd3e428aa9bc06a5d915b24376bb"; - sha256 = "0xdp118b59winbyvh7pa43bcp8rkfd75fckj0mbpx7zf72ralp8a"; + url = "https://api.github.com/repos/laravel/socialite/zipball/4f6a8af6f3f7c18da03d19842dd0514315501c10"; + sha256 = "0329mzryfg198mgjb9k3ay5699mi4gz3i6dmaaxglar7gp0mlpvh"; }; }; }; "laravel/tinker" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-tinker-04a2d3bd0d650c0764f70bf49d1ee39393e4eb10"; + name = "laravel-tinker-b936d415b252b499e8c3b1f795cd4fc20f57e1f3"; src = fetchurl { - url = "https://api.github.com/repos/laravel/tinker/zipball/04a2d3bd0d650c0764f70bf49d1ee39393e4eb10"; - sha256 = "06rivrmcf8m8hm4vn9s7wwpfmgl89p73b78dm0qx26rs0lpr36p0"; + url = "https://api.github.com/repos/laravel/tinker/zipball/b936d415b252b499e8c3b1f795cd4fc20f57e1f3"; + sha256 = "1vggdik2nby6a9avwgylgihhwyglm0mdwm703bwv7ilwx0dsx1i7"; }; }; }; "league/commonmark" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-commonmark-d44a24690f16b8c1808bf13b1bd54ae4c63ea048"; + name = "league-commonmark-3669d6d5f7a47a93c08ddff335e6d945481a1dd5"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/commonmark/zipball/d44a24690f16b8c1808bf13b1bd54ae4c63ea048"; - sha256 = "1qx99m1qa2g3l6r2fim3rak6qh28zjj8sqjj86nq743dm3yszygw"; + url = "https://api.github.com/repos/thephpleague/commonmark/zipball/3669d6d5f7a47a93c08ddff335e6d945481a1dd5"; + sha256 = "1rbaydy1n1c1schskbabzd4nx57nvwpnzqapsfxjm6kyihca1nr3"; }; }; }; @@ -315,30 +325,30 @@ let "league/flysystem" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-a141d430414fcb8bf797a18716b09f759a385bed"; + name = "league-flysystem-d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem/zipball/a141d430414fcb8bf797a18716b09f759a385bed"; - sha256 = "0w476nkv4izdrh8dn4g58lrqnfwrp8ijhj6fj8d8cpvr81kq0wiv"; + url = "https://api.github.com/repos/thephpleague/flysystem/zipball/d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc"; + sha256 = "1xfgcslv66jid10yjjzp1chwv579xgaymlzkxiwfk5mh77fdfryi"; }; }; }; "league/flysystem-aws-s3-v3" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-aws-s3-v3-d8de61ee10b6a607e7996cff388c5a3a663e8c8a"; + name = "league-flysystem-aws-s3-v3-9808919ee5d819730d9582d4e1673e8d195c38d8"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/d8de61ee10b6a607e7996cff388c5a3a663e8c8a"; - sha256 = "0hr11wwn2c2f26w0kj5yanx17ln17plk0si8yajkd470z3ssprwj"; + url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/9808919ee5d819730d9582d4e1673e8d195c38d8"; + sha256 = "1339ix4nqkk54bfnms18fz853s9ngsgjvkjdln1ff045m7dm4svi"; }; }; }; "league/flysystem-local" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-local-543f64c397fefdf9cfeac443ffb6beff602796b3"; + name = "league-flysystem-local-5cf046ba5f059460e86a997c504dd781a39a109b"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-local/zipball/543f64c397fefdf9cfeac443ffb6beff602796b3"; - sha256 = "1f44jgjip7pgnjafwlazmbv9jap3xsw3jfzhgakbsa4bkx3aavr2"; + url = "https://api.github.com/repos/thephpleague/flysystem-local/zipball/5cf046ba5f059460e86a997c504dd781a39a109b"; + sha256 = "0yr12z32plvpz70y8ravb9w80y583wkpsl1d0xhnglcka24aysdr"; }; }; }; @@ -355,10 +365,10 @@ let "league/mime-type-detection" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-mime-type-detection-a6dfb1194a2946fcdc1f38219445234f65b35c96"; + name = "league-mime-type-detection-b6a5854368533df0295c5761a0253656a2e52d9e"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/a6dfb1194a2946fcdc1f38219445234f65b35c96"; - sha256 = "14yylg4lyyc522kpzlcby1zhfs01d8xrcc4rqvyink0ry8az12jj"; + url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e"; + sha256 = "0bsqha9c0pyb5l78iiv1klrpqmhki6nh9x73pgnmh7sphh6ilygj"; }; }; }; @@ -395,60 +405,60 @@ let "monolog/monolog" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "monolog-monolog-f259e2b15fb95494c83f52d3caad003bbf5ffaa1"; + name = "monolog-monolog-437cb3628f4cf6042cc10ae97fc2b8472e48ca1f"; src = fetchurl { - url = "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1"; - sha256 = "0lz7lgr1bcxsh4c63z8k26bxawkx14h689wgdiap8992rf97kbk2"; + url = "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f"; + sha256 = "02xaa057fj2bjf6g6zx80rb6ikcgn601ns50ml51b8yp48pjdla3"; }; }; }; "mtdowling/jmespath.php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "mtdowling-jmespath.php-9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; + name = "mtdowling-jmespath.php-bbb69a935c2cbb0c03d7f481a238027430f6440b"; src = fetchurl { - url = "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; - sha256 = "1ig3gi6f8gisagcn876598ps48s86s6m0c82diyksylarg3yn0yd"; + url = "https://api.github.com/repos/jmespath/jmespath.php/zipball/bbb69a935c2cbb0c03d7f481a238027430f6440b"; + sha256 = "1ksjdc2icgafkx16j05ir3vk1ryhgdr2l41wpfd6nhzzk42smiwb"; }; }; }; "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-4308217830e4ca445583a37d1bf4aff4153fa81c"; + name = "nesbot-carbon-2b3b3db0a2d0556a177392ff1a3bf5608fa09f78"; src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/4308217830e4ca445583a37d1bf4aff4153fa81c"; - sha256 = "1ycjj9d107nbv390qqm9phmhvc1slxl0pa2dzf8lhmcif58863vb"; + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/2b3b3db0a2d0556a177392ff1a3bf5608fa09f78"; + sha256 = "1wf1kc2v6n68x04kf5dqf96ihkly4yb77bj09isp3yadsnhqy69d"; }; }; }; "nette/schema" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nette-schema-c9ff517a53903b3d4e29ec547fb20feecb05b8ab"; + name = "nette-schema-0462f0166e823aad657c9224d0f849ecac1ba10a"; src = fetchurl { - url = "https://api.github.com/repos/nette/schema/zipball/c9ff517a53903b3d4e29ec547fb20feecb05b8ab"; - sha256 = "1b7xhxdm2hxm5m0b3d2sv2rhw5986bqkxfl9k7mqdfka78mpvmlx"; + url = "https://api.github.com/repos/nette/schema/zipball/0462f0166e823aad657c9224d0f849ecac1ba10a"; + sha256 = "0x2pz3mjnx78ndxm5532ld3kwzs9p43l4snk4vjbwnqiqgcpqwn7"; }; }; }; "nette/utils" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nette-utils-9124157137da01b1f5a5a22d6486cb975f26db7e"; + name = "nette-utils-a9d127dd6a203ce6d255b2e2db49759f7506e015"; src = fetchurl { - url = "https://api.github.com/repos/nette/utils/zipball/9124157137da01b1f5a5a22d6486cb975f26db7e"; - sha256 = "0ly27z4m2w9h24kssjc5x4rhksw5hd9nwjzxnzmxrz7kvh7068gd"; + url = "https://api.github.com/repos/nette/utils/zipball/a9d127dd6a203ce6d255b2e2db49759f7506e015"; + sha256 = "0py2072z0rmpzf1ylk7rf2k040lv3asnk2icf97qm384cjw9dzrp"; }; }; }; "nikic/php-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nikic-php-parser-a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"; + name = "nikic-php-parser-1bcbb2179f97633e98bbbc87044ee2611c7d7999"; src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"; - sha256 = "0a5a6fzgvcgxn5kc1mxa5grxmm8c1ax91pjr3gxpkji7nyc1zh1y"; + url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999"; + sha256 = "1all9j7b5cr87jjs2lam2s11kvygi9jkkc7fks43f9jf1sp2ybji"; }; }; }; @@ -505,30 +515,30 @@ let "phenx/php-svg-lib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phenx-php-svg-lib-76876c6cf3080bcb6f249d7d59705108166a6685"; + name = "phenx-php-svg-lib-8a8a1ebcf6aea861ef30197999f096f7bd4b4456"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/76876c6cf3080bcb6f249d7d59705108166a6685"; - sha256 = "0bjynrs81das9f9jwd5jgsxx9gjv2m6c0mkvlgx4w1f4pgbvwsf5"; + url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/8a8a1ebcf6aea861ef30197999f096f7bd4b4456"; + sha256 = "14iq5594y19dl5sr1f0zqvpg6fkv4hifb9y5i97phhplyprfdh7g"; }; }; }; "phpoption/phpoption" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpoption-phpoption-dd3a383e599f49777d8b628dadbb90cae435b87e"; + name = "phpoption-phpoption-80735db690fe4fc5c76dfa7f9b770634285fa820"; src = fetchurl { - url = "https://api.github.com/repos/schmittjoh/php-option/zipball/dd3a383e599f49777d8b628dadbb90cae435b87e"; - sha256 = "029gpfa66hwg395jvf7swcvrj085wsw5fw6041nrl5kbc36fvwlb"; + url = "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820"; + sha256 = "1f9hzyjnam157lb7iw9r8f5cnjjsiqam9mnkpqmba73g1668xn9s"; }; }; }; "phpseclib/phpseclib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpseclib-phpseclib-4580645d3fc05c189024eb3b834c6c1e4f0f30a1"; + name = "phpseclib-phpseclib-56c79f16a6ae17e42089c06a2144467acc35348a"; src = fetchurl { - url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/4580645d3fc05c189024eb3b834c6c1e4f0f30a1"; - sha256 = "0v3c7n9h99pw4f03bfxjsgni7wpq7xr47nw2hf2hq8yjndw19n3p"; + url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/56c79f16a6ae17e42089c06a2144467acc35348a"; + sha256 = "0xmv35m6fsw7rfaxs82ky0wgj3gsnp7qw0sjgkig2cw10anfs0gq"; }; }; }; @@ -545,10 +555,10 @@ let "predis/predis" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "predis-predis-5f2b410a74afaff296a87a494e4c5488cf9fab57"; + name = "predis-predis-b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1"; src = fetchurl { - url = "https://api.github.com/repos/predis/predis/zipball/5f2b410a74afaff296a87a494e4c5488cf9fab57"; - sha256 = "02bf6w5vrzxmd6zzzlgr31g5fbf8k5yyk9gj00a1ql09ndyx51sn"; + url = "https://api.github.com/repos/predis/predis/zipball/b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1"; + sha256 = "0pylca7in1fm6vyrfdp12pqamp7y09cr5mc8hyr1m22r9f6m82l9"; }; }; }; @@ -595,10 +605,10 @@ let "psr/http-client" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-http-client-0955afe48220520692d2d09f7ab7e0f93ffd6a31"; + name = "psr-http-client-bb5906edc1c324c9a05aa0873d40117941e5fa90"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31"; - sha256 = "09r970lfpwil861gzm47446ck1s6km6ijibkxl13p1ymwdchnv6m"; + url = "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90"; + sha256 = "1dfyjqj1bs2n2zddk8402v6rjq93fq26hwr0rjh53m11wy1wagsx"; }; }; }; @@ -645,10 +655,10 @@ let "psy/psysh" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psy-psysh-0fa27040553d1d280a67a4393194df5228afea5b"; + name = "psy-psysh-128fa1b608be651999ed9789c95e6e2a31b5802b"; src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/0fa27040553d1d280a67a4393194df5228afea5b"; - sha256 = "1as5sp2vi6873in83qnxq6iiad9qd9zsladw4smid8nlvgkpajfz"; + url = "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b"; + sha256 = "0lrmqw53kzgdldxiy2aj0dawdzz5cbsxqz9p47ca3c0ggnszlk1p"; }; }; }; @@ -675,10 +685,10 @@ let "ramsey/uuid" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "ramsey-uuid-60a4c63ab724854332900504274f6150ff26d286"; + name = "ramsey-uuid-5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e"; src = fetchurl { - url = "https://api.github.com/repos/ramsey/uuid/zipball/60a4c63ab724854332900504274f6150ff26d286"; - sha256 = "1w1i50pbd18awmvzqjkbszw79dl09912ibn95qm8lxr4nsjvbb27"; + url = "https://api.github.com/repos/ramsey/uuid/zipball/5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e"; + sha256 = "0gnpj6jsmwr5azxq8ymp0zpscgxcwld7ps2q9rbkbndr9f9cpkkg"; }; }; }; @@ -725,10 +735,10 @@ let "socialiteproviders/manager" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "socialiteproviders-manager-47402cbc5b7ef445317e799bf12fd5a12062206c"; + name = "socialiteproviders-manager-df5e45b53d918ec3d689f014d98a6c838b98ed96"; src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/47402cbc5b7ef445317e799bf12fd5a12062206c"; - sha256 = "0lmsb1ni27dw1zipd3l24dzm43xggh4dd92iws3r161s4pppf7sc"; + url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/df5e45b53d918ec3d689f014d98a6c838b98ed96"; + sha256 = "0hzgj5p3cdi4mxrnq3c20yyjr4c1hnqnz8d2440s308a4wahz33z"; }; }; }; @@ -745,20 +755,10 @@ let "socialiteproviders/okta" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "socialiteproviders-okta-e5fb62035bfa0ccdbc8facf4cf205428fc502edb"; - src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/Okta/zipball/e5fb62035bfa0ccdbc8facf4cf205428fc502edb"; - sha256 = "0lrinkzlf39yr990n5dzn6slpgihrkh970dfz3m8ddcgwa04rw2m"; - }; - }; - }; - "socialiteproviders/slack" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "socialiteproviders-slack-2b781c95daf06ec87a8f3deba2ab613d6bea5e8d"; + name = "socialiteproviders-okta-5e47cd7b4c19da94ecafbd91fa430e4151c09806"; src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/Slack/zipball/2b781c95daf06ec87a8f3deba2ab613d6bea5e8d"; - sha256 = "1xilg7l1wc1vgwyakhfl8dpvgkjqx90g4khvzi411j9xa2wvpprh"; + url = "https://api.github.com/repos/SocialiteProviders/Okta/zipball/5e47cd7b4c19da94ecafbd91fa430e4151c09806"; + sha256 = "0padnyfg93avx33gq2acsss3kpclxsg43b9zywas1rd98d3md1di"; }; }; }; @@ -895,90 +895,90 @@ let "symfony/polyfill-ctype" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-ctype-5bbc823adecdae860bb64756d639ecfec17b050a"; + name = "symfony-polyfill-ctype-ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a"; - sha256 = "0vyv70z1yi2is727d1mkb961w5r1pb1v3wy1pvdp30h8ffy15wk6"; + url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"; + sha256 = "0ynkrpl3hb448dhab1injwwzfx68l75yn9zgc7lgqwbx60dvhqm3"; }; }; }; "symfony/polyfill-intl-grapheme" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-grapheme-511a08c03c1960e08a883f4cffcacd219b758354"; + name = "symfony-polyfill-intl-grapheme-875e90aeea2777b6f135677f618529449334a612"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354"; - sha256 = "0ifsgsyxf0z0nkynqvr5259dm5dsmbgdpvyi5zfvy8935mi0ki0i"; + url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612"; + sha256 = "19j8qcbp525q7i61c2lhj6z2diysz45q06d990fvjby15cn0id0i"; }; }; }; "symfony/polyfill-intl-idn" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-idn-639084e360537a19f9ee352433b84ce831f3d2da"; + name = "symfony-polyfill-intl-idn-ecaafce9f77234a6a449d29e49267ba10499116d"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da"; - sha256 = "1i2wcsbfbwdyrx8545yrrvbdaf4l2393pjvg9266q74611j6pzxj"; + url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d"; + sha256 = "0f42w4975rakhysnmhsyw6n3rjg6rjg7b7x8gs1n0qfdb6wc8m3q"; }; }; }; "symfony/polyfill-intl-normalizer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-normalizer-19bd1e4fcd5b91116f14d8533c57831ed00571b6"; + name = "symfony-polyfill-intl-normalizer-8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6"; - sha256 = "1d80jph5ykiw6ydv8fwd43s0aglh24qc1yrzds2f3aqanpbk1gr2"; + url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"; + sha256 = "0msah2ii2174xh47v5x9vq1b1xn38yyx03sr3pa2rq3a849wi7nh"; }; }; }; "symfony/polyfill-mbstring" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-mbstring-8ad114f6b39e2c98a8b0e3bd907732c207c2b534"; + name = "symfony-polyfill-mbstring-42292d99c55abe617799667f454222c54c60e229"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534"; - sha256 = "1ym84qp609i50lv4vkd4yz99y19kaxd5kmpdnh66mxx1a4a104mi"; + url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229"; + sha256 = "1m3l12y0lid3i0zy3m1jrk0z3zy8wpa7nij85zk2h5vbf924jnwa"; }; }; }; "symfony/polyfill-php72" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php72-869329b1e9894268a8a61dabb69153029b7a8c97"; + name = "symfony-polyfill-php72-70f4aebd92afca2f865444d30a4d2151c13c3179"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97"; - sha256 = "1h0lbh8d41sa4fymmw03yzws3v3z0lz4lv1kgcld7r53i2m3wfwp"; + url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179"; + sha256 = "10j5ipx16p6rybkpawqscpr2wcnby4270rbdj1qchr598wkvi0kb"; }; }; }; "symfony/polyfill-php80" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php80-7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"; + name = "symfony-polyfill-php80-6caa57379c4aec19c0a12a38b59b26487dcfe4b5"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"; - sha256 = "16yydk7rsknlasrpn47n4b4js8svvp4rxzw99dkav52wr3cqmcwd"; + url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5"; + sha256 = "05yfindyip9lbfr5apxkz6m0mlljrc9z6qylpxr6k5nkivlrcn9x"; }; }; }; "symfony/polyfill-php81" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php81-707403074c8ea6e2edaf8794b0157a0bfa52157a"; + name = "symfony-polyfill-php81-7581cd600fa9fd681b797d00b02f068e2f13263b"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a"; - sha256 = "05qrjfnnnz402l11wm0ydblrip7hjll12yqxmh2wd02b0s8dj29f"; + url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b"; + sha256 = "0ngi5nhnbj4yycnf6yw628vmr7h6dhxxh7jawyp6gq7bzs94g2dy"; }; }; }; "symfony/polyfill-uuid" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-uuid-f3cf1a645c2734236ed1e2e671e273eeb3586166"; + name = "symfony-polyfill-uuid-9c44518a5aff8da565c8a55dbe85d2769e6f630e"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-uuid/zipball/f3cf1a645c2734236ed1e2e671e273eeb3586166"; - sha256 = "1pjh861iwlf71frm9f9i7acw4bbiq40gkh96a5wd09nfd2c3w7mc"; + url = "https://api.github.com/repos/symfony/polyfill-uuid/zipball/9c44518a5aff8da565c8a55dbe85d2769e6f630e"; + sha256 = "0w6mphwcz3n1qz0dc6nld5xqb179dvfcwys6r4nj4gjv5nm2nji0"; }; }; }; @@ -1065,20 +1065,20 @@ let "tijsverkoyen/css-to-inline-styles" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "tijsverkoyen-css-to-inline-styles-c42125b83a4fa63b187fdf29f9c93cb7733da30c"; + name = "tijsverkoyen-css-to-inline-styles-83ee6f38df0a63106a9e4536e3060458b74ccedb"; src = fetchurl { - url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/c42125b83a4fa63b187fdf29f9c93cb7733da30c"; - sha256 = "0ckk04hwwz0fdkfr20i7xrhdjcnnw1b0liknbb81qyr1y4b7x3dd"; + url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/83ee6f38df0a63106a9e4536e3060458b74ccedb"; + sha256 = "1ahj49c7qz6m3y65jd18cz2c8cg6zqhkmnsrqrw1bf3s8ly9a9bp"; }; }; }; "vlucas/phpdotenv" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "vlucas-phpdotenv-1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7"; + name = "vlucas-phpdotenv-2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"; src = fetchurl { - url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7"; - sha256 = "13h4xyxhdjn1n7xcxbcdhj20rv5fsaigbsbz61x2i224hj76620a"; + url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"; + sha256 = "0zb5gm5i6rnmm9zc4mi3wkkhpgciaa76w8jyxnw914xwq1xqzivx"; }; }; }; diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index 29d8eb1fdfc5f..a162448e637e9 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -5,25 +5,25 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.45.3"; + version = "0.45.9"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; - rev = "refs/tags/${version}"; - hash = "sha256-QTkkMFGyEGSakvFCiJ36Xr3IiG9K7GDy2dpNGWjUngs="; + rev = version; + hash = "sha256-xiKXp9DBaiSteqZwQLZ4zLwT5MeETJx01rKRrWGYioc="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace "apprise~=1.5.0" "apprise" \ + --replace "apprise~=1.6.0" "apprise" \ --replace "cryptography~=3.4" "cryptography" \ - --replace "dnspython<2.3.0" "dnspython" \ + --replace "dnspython~=2.4" "dnspython" \ --replace "pytest ~=7.2" "" \ --replace "pytest-flask ~=1.2" "" \ - --replace "selenium~=4.1.0" "selenium" \ - --replace "werkzeug~=2.0.0" "werkzeug" + --replace "selenium~=4.14.0" "selenium" \ + --replace "werkzeug~=3.0" "werkzeug" ''; propagatedBuildInputs = with python3.pkgs; [ @@ -75,6 +75,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/dgtlmoon/changedetection.io"; changelog = "https://github.com/dgtlmoon/changedetection.io/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ mikaelfangel ]; }; } diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 893404a6084f3..320eac3bc8ce6 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -279,6 +279,7 @@ let popd &>/dev/null redis-server >/dev/null & + REDIS_PID=$! initdb -A trust $NIX_BUILD_TOP/postgres >/dev/null postgres -D $NIX_BUILD_TOP/postgres -k $NIX_BUILD_TOP >/dev/null & @@ -304,6 +305,8 @@ let bundle exec rake db:migrate >/dev/null chmod -R +w tmp + + kill $REDIS_PID ''; buildPhase = '' diff --git a/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch b/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch deleted file mode 100644 index 30493b543e38c..0000000000000 --- a/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/discourse.rb b/lib/discourse.rb -index ea2a3cbafd..66454d9157 100644 ---- a/lib/discourse.rb -+++ b/lib/discourse.rb -@@ -62,7 +62,7 @@ module Discourse - fd.fsync() - end - -- File.rename(temp_destination, destination) -+ FileUtils.mv(temp_destination, destination) - - nil - end -@@ -76,7 +76,7 @@ module Discourse - FileUtils.mkdir_p(File.join(Rails.root, 'tmp')) - temp_destination = File.join(Rails.root, 'tmp', SecureRandom.hex) - execute_command('ln', '-s', source, temp_destination) -- File.rename(temp_destination, destination) -+ FileUtils.mv(temp_destination, destination) - - nil - end diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/servers/web-apps/dolibarr/default.nix index a1042c8e59c31..f689aff626bf5 100644 --- a/pkgs/servers/web-apps/dolibarr/default.nix +++ b/pkgs/servers/web-apps/dolibarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dolibarr"; - version = "18.0.3"; + version = "18.0.4"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; rev = version; - sha256 = "sha256-8RZqzuMjy83WNvIBpNxjJpfuILCXIuwP0mrs+/cSTns="; + sha256 = "sha256-VHLkd8WAyPcfDzmzZl4G1pSTaklC2k0ez/YaZ+ci/1Q="; }; dontBuild = true; @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "A enterprise resource planning (ERP) and customer relationship manager (CRM) server"; homepage = "https://dolibarr.org/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.raitobezarius ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix index ee92f58a2121b..9b9cf0ff3bfe5 100644 --- a/pkgs/servers/web-apps/engelsystem/default.nix +++ b/pkgs/servers/web-apps/engelsystem/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { pname = "engelsystem"; - version = "3.4.0"; + version = "3.4.1"; src = fetchzip { url = "https://github.com/engelsystem/engelsystem/releases/download/v${version}/engelsystem-v${version}.zip"; - hash = "sha256-Z0p+6QlMrj5OtiwFKBfWxkkd/kbL2dxDSKvljcTXWo0="; + hash = "sha256-5KniP1nrLfmWHruXnUJmlvgL95U+EsDmCs4tg/YLWtw="; }; buildInputs = [ phpExt ]; diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 8a8502ad823b4..639a9a780c626 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -3,18 +3,17 @@ , fetchFromGitHub , nixosTests , php -, pkgs }: stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.22.1"; + version = "1.23.1"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-e4+ZkhncgDIWE5NH2eYun2FeWxz1suM//6T6P3V4nQU="; + hash = "sha256-uidTsL8TREZ/qcqO/J+6hguP6Dr6J+995WNWCJCduBw="; }; passthru.tests = { @@ -31,8 +30,10 @@ stdenvNoCC.mkDerivation rec { ''; installPhase = '' + runHook preInstall mkdir -p $out cp -vr * $out/ + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index 1cf78fa2d76e6..f66d57d22bfd0 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "galene"; - version = "0.7.2"; + version = "0.8"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - hash = "sha256-9jFloYrAQXmhmRoJxGp1UUxzFEkzB32iohStbb39suU="; + hash = "sha256-UWh55+9+5s31VwRb7oOzOPKv9Ew7AxsOjWXaFRxuans="; }; - vendorHash = "sha256-+itNqxEy0S2g5UGpUIthJE2ILQzToISref/8F4zTmYg="; + vendorHash = "sha256-MEO6ktMrpvuWBPBgpBRAuIrup4Zc8IQKoJ/6JEnD6+U="; ldflags = [ "-s" "-w" ]; preCheck = "export TZ=UTC"; diff --git a/pkgs/servers/web-apps/invoiceplane/default.nix b/pkgs/servers/web-apps/invoiceplane/default.nix index ebf40fe3cee7d..596992d10a59b 100644 --- a/pkgs/servers/web-apps/invoiceplane/default.nix +++ b/pkgs/servers/web-apps/invoiceplane/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "invoiceplane"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://github.com/InvoicePlane/InvoicePlane/releases/download/v${version}/v${version}.zip"; - sha256 = "sha256-EwhOwUoOy3LNZTDgp9kvR/0OsO2TDpWkdT0fd7u0Ns8="; + sha256 = "sha256-QSl/9hnAd9QxQm0xyZJ4ElIQDSOVStSzWa+fq3AJHjw="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index d4d91a88c3473..0f3055361adbe 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.7531"; + version = "1.0.7712"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "lSntX5MRnp0GuimiqYGiBwi5wI62omvAN1ioyIz+Upc="; + sha256 = "NNO+lXSPGtEDN7cqBatH2l8jqaQnTdNXfo9uzc+SwUA="; }; dontBuild = true; diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index c8229c02cd4d0..1f5d3b8b4cea1 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { description = "🐀 Building a federated alternative to reddit in rust"; homepage = "https://join-lemmy.org/"; license = licenses.agpl3Only; - maintainers = with maintainers; [ happysalada billewanick adisbladis ]; + maintainers = with maintainers; [ happysalada billewanick ]; mainProgram = "lemmy_server"; }; } diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix index 4f219ae21abaf..2bb1ccaeb8428 100644 --- a/pkgs/servers/web-apps/lemmy/ui.nix +++ b/pkgs/servers/web-apps/lemmy/ui.nix @@ -92,7 +92,7 @@ mkYarnPackage { description = "Building a federated alternative to reddit in rust"; homepage = "https://join-lemmy.org/"; license = licenses.agpl3Only; - maintainers = with maintainers; [ happysalada billewanick adisbladis ]; + maintainers = with maintainers; [ happysalada billewanick ]; inherit (nodejs.meta) platforms; }; } diff --git a/pkgs/servers/web-apps/livebook/default.nix b/pkgs/servers/web-apps/livebook/default.nix index dee6017624dc1..e1815a819bbf2 100644 --- a/pkgs/servers/web-apps/livebook/default.nix +++ b/pkgs/servers/web-apps/livebook/default.nix @@ -1,7 +1,7 @@ { lib, beamPackages, makeWrapper, rebar3, elixir, erlang, fetchFromGitHub, nixosTests }: beamPackages.mixRelease rec { pname = "livebook"; - version = "0.11.3"; + version = "0.12.1"; inherit elixir; @@ -13,24 +13,20 @@ beamPackages.mixRelease rec { owner = "livebook-dev"; repo = "livebook"; rev = "v${version}"; - hash = "sha256-zUJM6OcXhHW8e09h2EKnfI9voF2k4AZ75ulQErNqjD0="; + hash = "sha256-Q4c0AelZZDPxE/rtoHIRQi3INMLHeiZ72TWgy183f4Q="; }; mixFodDeps = beamPackages.fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; - hash = "sha256-7GvtxEIEbC0QZEYIoARaX9uIsf/CoGE6dX60/mCvkYI="; + hash = "sha256-dyKhrbb7vazBV6LFERtGHLQXEx29vTgn074mY4fsHy4="; }; - installPhase = '' - mix escript.build - mkdir -p $out/bin - mv ./livebook $out/bin - + postInstall = '' wrapProgram $out/bin/livebook \ - --prefix PATH : ${lib.makeBinPath [ elixir ]} \ + --prefix PATH : ${lib.makeBinPath [ elixir erlang ]} \ --set MIX_REBAR3 ${rebar3}/bin/rebar3 - ''; + ''; passthru.tests = { livebook-service = nixosTests.livebook-service; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 4f0d02b670053..f4946809a6a99 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,15 +3,15 @@ let versions = { matomo = { - version = "4.15.1"; - hash = "sha256-XnfiprGLqFQqPk30gcAVLdBZ3pYMSdBPfnicm7V1PSc="; + version = "4.16.0"; + hash = "sha256-OFZT4195WTWw2XNAyGiNixW6hSNKC3IyBpa5kM9PCVk="; }; matomo-beta = { version = "5.0.0"; # `beta` examples: "b1", "rc1", null # when updating: use null if stable version is >= latest beta or release candidate - beta = "rc3"; - hash = "sha256-Q5GB4i0ew6+tr8Bsm9PYkzJ8U6DmVPwG2QCi8CTge5E="; + beta = "rc9"; + hash = "sha256-OXxJCEXcrl6UXYh+jbNqLQGYphrSjxaOAZg3AZVPAqs="; }; }; common = pname: { version, hash, beta ? null }: diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index 8ba18acf9cac5..23f0e6c2153c7 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "mediawiki"; - version = "1.40.1"; + version = "1.41.0"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - hash = "sha256-4F1BneQMatAxRaygfgjPmV0coWZ9l3k7tzlw4sEbCgQ="; + hash = "sha256-84Qrcqp6JYiPHsYyMj3YkEF3OaEg2VHEhfhQ4MzLQhs="; }; postPatch = '' diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 293a0a0c72598..35711eda3f8d2 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }: let - version = "4.3"; + version = "4.3.2"; versionParts = lib.take 2 (lib.splitVersion version); # 4.2 -> 402, 3.11 -> 311 @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz"; - hash = "sha256-zLBFUyadpsqGeEhBCPrh3KKWn6f3zCy64YxTBMLIGsk="; + hash = "sha256-CR+UVIPknk4yGqemx6V7qdCRW5uWdp2VnnxJS+I35N0="; }; phpConfig = writeText "config.php" '' diff --git a/pkgs/servers/web-apps/netbox/config_3_3.patch b/pkgs/servers/web-apps/netbox/config_3_3.patch deleted file mode 100644 index 1adc0b537a4ef..0000000000000 --- a/pkgs/servers/web-apps/netbox/config_3_3.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py -index d5a7bfaec..68754a8c5 100644 ---- a/netbox/netbox/settings.py -+++ b/netbox/netbox/settings.py -@@ -222,6 +222,7 @@ TASKS_REDIS_PASSWORD = TASKS_REDIS.get('PASSWORD', '') - TASKS_REDIS_DATABASE = TASKS_REDIS.get('DATABASE', 0) - TASKS_REDIS_SSL = TASKS_REDIS.get('SSL', False) - TASKS_REDIS_SKIP_TLS_VERIFY = TASKS_REDIS.get('INSECURE_SKIP_TLS_VERIFY', False) -+TASKS_REDIS_URL = TASKS_REDIS.get('URL') - - # Caching - if 'caching' not in REDIS: -@@ -236,11 +237,12 @@ CACHING_REDIS_SENTINELS = REDIS['caching'].get('SENTINELS', []) - CACHING_REDIS_SENTINEL_SERVICE = REDIS['caching'].get('SENTINEL_SERVICE', 'default') - CACHING_REDIS_PROTO = 'rediss' if REDIS['caching'].get('SSL', False) else 'redis' - CACHING_REDIS_SKIP_TLS_VERIFY = REDIS['caching'].get('INSECURE_SKIP_TLS_VERIFY', False) -+CACHING_REDIS_URL = REDIS['caching'].get('URL', f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_HOST}:{CACHING_REDIS_PORT}/{CACHING_REDIS_DATABASE}') - - CACHES = { - 'default': { - 'BACKEND': 'django_redis.cache.RedisCache', -- 'LOCATION': f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_HOST}:{CACHING_REDIS_PORT}/{CACHING_REDIS_DATABASE}', -+ 'LOCATION': CACHING_REDIS_URL, - 'OPTIONS': { - 'CLIENT_CLASS': 'django_redis.client.DefaultClient', - 'PASSWORD': CACHING_REDIS_PASSWORD, -@@ -383,7 +385,7 @@ USE_X_FORWARDED_HOST = True - X_FRAME_OPTIONS = 'SAMEORIGIN' - - # Static files (CSS, JavaScript, Images) --STATIC_ROOT = BASE_DIR + '/static' -+STATIC_ROOT = getattr(configuration, 'STATIC_ROOT', os.path.join(BASE_DIR, 'static')).rstrip('/') - STATIC_URL = f'/{BASE_PATH}static/' - STATICFILES_DIRS = ( - os.path.join(BASE_DIR, 'project-static', 'dist'), -@@ -562,6 +564,14 @@ if TASKS_REDIS_USING_SENTINEL: - 'socket_connect_timeout': TASKS_REDIS_SENTINEL_TIMEOUT - }, - } -+elif TASKS_REDIS_URL: -+ RQ_PARAMS = { -+ 'URL': TASKS_REDIS_URL, -+ 'PASSWORD': TASKS_REDIS_PASSWORD, -+ 'SSL': TASKS_REDIS_SSL, -+ 'SSL_CERT_REQS': None if TASKS_REDIS_SKIP_TLS_VERIFY else 'required', -+ 'DEFAULT_TIMEOUT': RQ_DEFAULT_TIMEOUT, -+ } - else: - RQ_PARAMS = { - 'HOST': TASKS_REDIS_HOST, diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index ab648d7daa7b4..ea29815974960 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -3,17 +3,17 @@ let generic = import ./generic.nix; in lib.fix (self: { - netbox = self.netbox_3_6; + netbox = self.netbox_3_7; - netbox_3_5 = callPackage generic { - version = "3.5.9"; - hash = "sha256-CJbcuCyTuihDXrObSGyJi2XF+zgWAwcJzjxtkX8pmKs="; + netbox_3_6 = callPackage generic { + version = "3.6.9"; + hash = "sha256-R/hcBKrylW3GnEy10DkrLVr8YJtsSCvCP9H9LhafO9I="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch ]; tests = { - netbox = nixosTests.netbox_3_5; + netbox = nixosTests.netbox_3_6; inherit (nixosTests) netbox-upgrade; }; @@ -21,15 +21,16 @@ lib.fix (self: { eol = true; }; - netbox_3_6 = callPackage generic { - version = "3.6.3"; - hash = "sha256-8Xir2Gvwh2cllHu5qVAzumuH0lknMMtjd8BuFuuf9A0="; + netbox_3_7 = callPackage generic { + version = "3.7.1"; + hash = "sha256-hAwkrrjrV+XVIYe3C8f/342SPlllXUhiFuaAp+TLMUw="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch + ./fix-doc-link.patch ]; tests = { - netbox = nixosTests.netbox_3_6; + netbox = nixosTests.netbox_3_7; inherit (nixosTests) netbox-upgrade; }; diff --git a/pkgs/servers/web-apps/netbox/fix-doc-link.patch b/pkgs/servers/web-apps/netbox/fix-doc-link.patch new file mode 100644 index 0000000000000..0be5aee957f31 --- /dev/null +++ b/pkgs/servers/web-apps/netbox/fix-doc-link.patch @@ -0,0 +1,10 @@ +diff --git a/docs/plugins/development/data-backends.md b/docs/plugins/development/data-backends.md +index feffa5bed..8b7226a41 100644 +--- a/docs/plugins/development/data-backends.md ++++ b/docs/plugins/development/data-backends.md +@@ -20,4 +20,4 @@ backends = [MyDataBackend] + !!! tip + The path to the list of search indexes can be modified by setting `data_backends` in the PluginConfig instance. + +-::: core.data_backends.DataBackend ++::: netbox.data_backends.DataBackend diff --git a/pkgs/servers/web-apps/netbox/generic.nix b/pkgs/servers/web-apps/netbox/generic.nix index afd02d7985351..ac705445499fd 100644 --- a/pkgs/servers/web-apps/netbox/generic.nix +++ b/pkgs/servers/web-apps/netbox/generic.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , python3 , version , hash @@ -59,6 +58,7 @@ pillow psycopg2 pyyaml + requests sentry-sdk social-auth-core social-auth-app-django @@ -94,6 +94,7 @@ passthru = { # PYTHONPATH of all dependencies used by the package pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; + gunicorn = python3.pkgs.gunicorn; inherit tests; }; diff --git a/pkgs/servers/web-apps/netbox/graphql-3_2_0.patch b/pkgs/servers/web-apps/netbox/graphql-3_2_0.patch deleted file mode 100644 index 1e97b7d85ce01..0000000000000 --- a/pkgs/servers/web-apps/netbox/graphql-3_2_0.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/netbox/netbox/graphql/scalars.py b/netbox/netbox/graphql/scalars.py -index 7d14189dd..0a18e79d2 100644 ---- a/netbox/netbox/graphql/scalars.py -+++ b/netbox/netbox/graphql/scalars.py -@@ -1,6 +1,6 @@ - from graphene import Scalar - from graphql.language import ast --from graphql.type.scalars import MAX_INT, MIN_INT -+from graphql.type.scalars import GRAPHQL_MAX_INT, GRAPHQL_MIN_INT - - - class BigInt(Scalar): -@@ -10,7 +10,7 @@ class BigInt(Scalar): - @staticmethod - def to_float(value): - num = int(value) -- if num > MAX_INT or num < MIN_INT: -+ if num > GRAPHQL_MAX_INT or num < GRAPHQL_MIN_INT: - return float(num) - return num - diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index 46535e0b4b4b8..182b1fb22fd50 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nifi"; - version = "1.23.2"; + version = "1.24.0"; src = fetchzip { url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip"; - hash = "sha256-NRX0lEE5/HsYnZXtLDlPUpgWMsg/2Z3cRUnJwKDGxfw="; + hash = "sha256-8S06E8RiH/EnfAa60eRzjmHmzMn+3UZbykJpvFFXEho="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 7adf281ff9bea..c1ea00484db96 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -3,29 +3,29 @@ , fetchFromGitHub , fetchYarnDeps , makeWrapper +, prefetch-yarn-deps , nodejs , yarn -, yarn2nix-moretea , nixosTests }: stdenv.mkDerivation rec { pname = "outline"; - version = "0.72.2"; + version = "0.74.0"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-y54EYWI1DbxosUflp5z+b4i1vO1qDju8LxEK0nt4S/g="; + hash = "sha256-fF//SgcBYcJmPDaev8G1s+svCW1bU9CmN3uWEoEeMUk="; }; - nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ]; + nativeBuildInputs = [ makeWrapper prefetch-yarn-deps ]; buildInputs = [ yarn nodejs ]; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-uXWBYZAjMA88NtADA4s2kB4Ubb2atrW6F4kAzDGA1WI="; + hash = "sha256-T5FrtPN0CxLjF5KkQyH6dA61kvzIOj1Fe5rIY7l+aFE="; }; configurePhase = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { export NODE_OPTIONS=--openssl-legacy-provider yarn config --offline set yarn-offline-mirror $yarnOfflineCache - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline \ --frozen-lockfile \ diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index c2acf17036748..9a73f738e1942 100644 --- a/pkgs/servers/web-apps/pict-rs/default.nix +++ b/pkgs/servers/web-apps/pict-rs/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "pict-rs"; - version = "0.4.5"; + version = "0.5.1"; src = fetchFromGitea { domain = "git.asonix.dog"; owner = "asonix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kCWzje3tGfSn3gSdS4AFsoWFOLV9DhWKmzJltZs1KqY="; + sha256 = "sha256-m0je0SfyjeMDJP/OTx41Goc6mcNavnlSDBZS5Uqw0p0="; }; - cargoHash = "sha256-PiKkCiMNMbgBN8qJvzHnZBC782uKsS9aGyKEzG0cEec="; + cargoHash = "sha256-O92m3Va8BAPZyDc4arufSkeHxGC8QpwOPx9FAG0A+TE="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index ed0c3961e2c16..919daa61e198b 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "shaarli"; - version = "0.12.2"; + version = "0.13.0"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "sha256-fCB3sd5JMBKnfY6b2SZxXxV29VIO/4aiObyW0t+A/R0="; + sha256 = "sha256-+iFic2WUZ3txiDRNRulznymA3qMqYovePXeP4RMWFUg="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/web-apps/slskd/default.nix b/pkgs/servers/web-apps/slskd/default.nix index c1a68f2d5e6a1..a085edfb1e146 100644 --- a/pkgs/servers/web-apps/slskd/default.nix +++ b/pkgs/servers/web-apps/slskd/default.nix @@ -8,13 +8,13 @@ }: let pname = "slskd"; - version = "0.18.2"; + version = "0.19.5"; src = fetchFromGitHub { owner = "slskd"; repo = "slskd"; rev = version; - sha256 = "sha256-hWK6nbXAZTjxukx9EzkJkyEFlqXUkjanmv4VfHZxW24="; + sha256 = "sha256-Vm+nA3yKiCMpQ41GTQF6Iuat89QrUtstQdHmX/DyU9g="; }; meta = with lib; { @@ -32,7 +32,7 @@ let src = "${src}/src/web"; npmFlags = [ "--legacy-peer-deps" ]; nodejs = nodejs_18; - npmDepsHash = "sha256-+2g3pCaGFbzQjKwhjmD6viuzVE5pRg+qSOXMrCtLQkI="; + npmDepsHash = "sha256-E1J4fYcY1N+UmN4Ch4Ss6ty+nYlmrv3ngvCJ8YCjPfI="; installPhase = '' cp -r build $out ''; diff --git a/pkgs/servers/web-apps/slskd/deps.nix b/pkgs/servers/web-apps/slskd/deps.nix index d40a61d3d2d62..7de44128b9aaa 100644 --- a/pkgs/servers/web-apps/slskd/deps.nix +++ b/pkgs/servers/web-apps/slskd/deps.nix @@ -2,112 +2,114 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AutoFixture"; version = "4.17.0"; sha256 = "03kgk728v7vjn8npv45wnc4jvqbhdd3pm1aklf0c7narlzfagkch"; }) - (fetchNuGet { pname = "AutoFixture.Xunit2"; version = "4.17.0"; sha256 = "134cn8isps8bc9d7wywdc2khbx83s07jrbjmgvmmkzc130j1k81i"; }) + (fetchNuGet { pname = "AutoFixture"; version = "4.18.1"; sha256 = "0whinrvkr2xbhkwd02jbcnws3wz7vlc25hk6w0iw4g92hrmgxqxd"; }) + (fetchNuGet { pname = "AutoFixture.Xunit2"; version = "4.18.1"; sha256 = "1xs5dbj410h29spdl5c07vrxqkdl3rcyl2fv4jv4g7vq3kanc5p6"; }) (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) - (fetchNuGet { pname = "coverlet.msbuild"; version = "3.1.2"; sha256 = "049ym2db6209a5hk4bwcscifi07gv8j3sdnf5i88h2lxzlmpxciq"; }) + (fetchNuGet { pname = "coverlet.msbuild"; version = "6.0.0"; sha256 = "18qgg6d0ybrr70g69yqamgn5qvpyizlii1123cnj65amd0w2rxjl"; }) (fetchNuGet { pname = "Fare"; version = "2.1.1"; sha256 = "1gagj8k2w5m2z6nlywrzhqx1q9n880yriwk0lsq3vcda9lcggmcz"; }) - (fetchNuGet { pname = "FluentFTP"; version = "43.0.1"; sha256 = "0zf96ydqwkj67vk1ia5kd2clkkf50wpszhclb0mh0nndaww3rlin"; }) - (fetchNuGet { pname = "IPAddressRange"; version = "4.2.0"; sha256 = "1nrdw0rxv24bqqml79bngbr1dcakrkc7y29w3nia1nm3cz5hb5kw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "7.0.0"; sha256 = "0sbpfrcq91qs6sz18vblfqnnyx30w6ngqq9hxzzircn49cf8hf01"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "7.0.0"; sha256 = "0iynxsk560g7sw5vb0hgpnn54b2cglshymaykvy4bvjwzc27gcfd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "7.0.0"; sha256 = "0yf0kn1d60312sxli0nhg1s2v5ah8dhxbw74rcz7mjrs0xgridhy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "7.0.0"; sha256 = "0ly2baanq7xn7flv11yrg0v0hfmylp5ng3w6b39q0d7wri4cdm39"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Versioning"; version = "5.0.0"; sha256 = "0fbbffi5s9bifqspcqm3w9453241ivb3649qgybi7fdzhdivlyma"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer"; version = "5.0.0"; sha256 = "1hdi05vfhr7yighmkbjia0y8q172irddda32npyvzqqmc84j69cc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "7.0.0"; sha256 = "0wgh98ca68qfwcq6q1nry5vm0ljqg2z01zz8hzqzxs4la348fqxq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "7.0.0"; sha256 = "0nfkzhsnvkip84raypqcaxz74nff2yrhikwp1wxp6n9iwxjz6423"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "7.0.0"; sha256 = "0w7sdi468j4h5ik275v5q8r71iimgpcq2paimpbxnqz8k63wbzhm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "7.0.0"; sha256 = "10pa5cj7k3p4yxhdsma856mkngk1mjvf6c0ygjy8ribpbip2scl1"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "7.0.0-preview1.22518.1"; sha256 = "19x3v0f11pq26ry9ycd2wwfkhwv9c98dxcim7rra8v1i8ix89xjl"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.7.1"; sha256 = "1farw63445cdyciplfs6l9j1gayxw16rkzmrwsiswfyjhqz70xd4"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "FluentFTP"; version = "48.0.3"; sha256 = "147n6vk3042jm1qspn2jss84qf5v5qh0spv3arpcak2nh61pjrf4"; }) + (fetchNuGet { pname = "IPAddressRange"; version = "6.0.0"; sha256 = "0fnaxxabamzijj7a418i1z5nnd5ymcjsbplqrj95z8vdw02b99ny"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "7.0.13"; sha256 = "1zzihfm2rwy5z11ndvpi0bx2llghg52msv1mwhgjlrm06q2zff5l"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "7.0.13"; sha256 = "091cim81z0r0yl33d8qgs5h1xm6r2fwzl4v805arfkjhjr02q3f3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "7.0.13"; sha256 = "1wp7dvm9cq3bxz8lxknkjyn9myxlcyr4f0a3296pr48r7jnhafk7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "7.0.13"; sha256 = "0n7g7581n9gmpxm2bi0mgxkwj63gva9kmy3njb3zpvvr2vz93fq2"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Versioning"; version = "5.1.0"; sha256 = "09v155s17px3d4zm2qz4syj6gdj17sb1a18fzwwvsrs3h357m4c1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer"; version = "5.1.0"; sha256 = "01bhvs1n7217js1rh3vgl5i2gmxvkgpa3b8i71sv3k8bcz29101l"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "7.0.13"; sha256 = "13mpw2rj0yb68gvjzb0yg5nzl9wi5pg95swmb4lj38vzypbc897p"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "7.0.13"; sha256 = "1lk74hsv3m1sc86cjrbx89a9w7f0a8v38sk6nmig49bk1fkpnb46"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "7.0.13"; sha256 = "0fvajiq24waqxh7pvp3kjnjbj7adhffhm21rmw6l09dvcin8hqwf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "7.0.13"; sha256 = "0kzisw542lvcn96n7vk2cwb9n2kb580hxanwahw57x3j8kyz97nz"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "7.0.4"; sha256 = "0x0gb6r9lr72jcnv3kkgi01zx1hgpx54niszmrjkdcfivbmmaa81"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "7.0.0"; sha256 = "182515ajcgpcj7fvv5pgnxp5m7cys2lscvk7g0hbbmsqd30vak0g"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.0"; sha256 = "0i7rq36cqw72zasw6k1nnx63f7mlvs85zr06nimghr1gmjliqgbn"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "7.0.0"; sha256 = "1fhn9wxdqbn3mvv6dpw5aswnzvpi7bqrpiplr85y3waja8rbp83q"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "7.0.0"; sha256 = "1a4ja7vi88wspdi0a7lg2hmf6g44azdjpqqwxxqw0z0whkfb0kzb"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "7.0.0"; sha256 = "1vy7cyy8p5akpmi31rfii0ybinvg0cfvpy96aig24aszi6678mjw"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "7.0.0"; sha256 = "0zfrwy1058rd7cb5y7gm5sf2p6hb1hs93nkphdaa9bm3ifs970li"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "7.0.0"; sha256 = "06b3qbwzhwyni9yrgfz3dvfzks8zzjzfhc8r3g5gc15sxxlydr23"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "7.0.13"; sha256 = "07k00mk8f9pd4gcmx81i3l5kqbih2abc939lixpak7hmqzf3a18r"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.13"; sha256 = "1rnm635jvjyxc7jb9isgarasrhmpvsahv6r6gp4b7li1y2sz3pyv"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "7.0.13"; sha256 = "0jmmfcqvxfacgycwdqqrxgimjk83m59w68lpy5vgnqwcbfabg7zj"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "7.0.13"; sha256 = "0r36s142lknwx8j9lnxnx70wv3i7f4z6y2d5fi7r2whd3rvidkpq"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "7.0.13"; sha256 = "030s0rz3xjdlr77p1s7w0mqs0jrwgsklz63bnm30sxgr6zb25pz3"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "7.0.13"; sha256 = "0kx5056d6qkyxdcpqz46gd344xmizp2w0hknxh1x06bdfsnd292i"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "7.0.13"; sha256 = "1mrgz6r4nllm3v8lgg1xy53am80kscr8kfh18xzc48w3frxwslr7"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "7.0.0"; sha256 = "1hv94kwd4v7969cq3ik2afg5ipn44zbhpsgaga9cd0z47swz4r3a"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "7.0.0"; sha256 = "09mq6g61rqjy5mdhsz2224m0rb0z9rkrxhhqym9zwpn272bbc9df"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.0"; sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.8"; sha256 = "05mlbia6vag0a0zfflv1m3ix48230wx0yib5hp7zsc72jpcmjd7q"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.0"; sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; sha256 = "1as8cygz0pagg17w22nsf6mb49lr2mcl1x8i3ad1wi8lyzygy1a3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.0"; sha256 = "13jj7jxihiswmhmql7r5jydbca4x5qj6h7zq10z17gagys6dc7pw"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.0.0"; sha256 = "0cqbvy49ph16rlba2f35qhi0n7vpcf5kjybvn5fbs7dchfdzw927"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.1.0"; sha256 = "1xc61dy07bn2q73mx1z3ylrw80xpa682qjby13gklnqq636a3gab"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.0.0"; sha256 = "06s8j8v0w06f12jxw6vvsd0l5zqrmsvc3rr2gqx9z3gcq7mdnr3l"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.8"; sha256 = "1vkhhyxpam3svbqkkxrcxh9h4r6h3vm76cdzmfqn7gbxgswc4y2w"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.0"; sha256 = "1pvms778xkyv1a3gfwrxnh8ja769cxi416n7pcidn9wvg15ifvbh"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.0.0"; sha256 = "1cm0hycgb33mf1ja9q91wxi3gk13d1p462gdq7gndrya23hw2jm5"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "7.0.0"; sha256 = "04wb6hw3r7mmhg57215r1mb01q17glyaddjw1j5g1drsws914fj4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "7.0.0"; sha256 = "1wjj7rf97hzg4y2vhvp7fhmilq1rjgri978452pssacw30rib1al"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "3.1.8"; sha256 = "0z173lsfypzjdx1a352svh1pgk7lgq2wpj5q60i1rgcrd3ib8b21"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "5.0.0"; sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "3.1.8"; sha256 = "1lc69rn259gd6y4rjy0hwrcfnhkr0y0ac8w4ldh6mpk073snfjq0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "5.0.0"; sha256 = "1k28hndmm8ky7sr2j5agdz9lls25mbb08dkypka0b76x5f4hplb5"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "6.0.0"; sha256 = "1wxsqvfy2arbwk0nhambjprazim6ynrb23r1hr5vk4gv10i26m95"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; sha256 = "02jnx23hm1vid3yd9pw4gghzn6qkgdl5xfc5r0zrcxdax70rsh5a"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; sha256 = "15m4j6w9n8h0mj7hlfzb83hd3wn7aq1s7fxbicm16slsjfwzj82i"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks"; version = "6.0.9"; sha256 = "06mx8zmlmi371ab5pskw8iawy8bbi4vx6rwrcj0andc59zfmg96q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"; version = "6.0.9"; sha256 = "1nv2rwq0q7ql63qip5ba45p97yxgva9jg6gnvrnfh2yk2fjwyag2"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "7.0.13"; sha256 = "1sdn9cssq7khq094zb5y8mrp3xapfbmccgm0wgd0chs0h3vxim49"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; sha256 = "1idq65fxwcn882c06yci7nscy9i0rgw6mqjrl7362prvvsd9f15r"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "6.0.0"; sha256 = "1mwjx6li4a82nb589763whpnhf5hfy1bpv1dzqqvczb1lhxhzhlj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; sha256 = "00d5dwmzw76iy8z40ly01hy9gly49a7rpf7k7m99vrid1kxp346h"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "3.1.0"; sha256 = "02ipxf75rqzsbmmy5ka44hh8krmxgky9mdxmh8f7fkbclpg2s6cy"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.1.0"; sha256 = "1d3yhqj1rav7vswm747j7w8fh8paybji4rz941hhlq4b12mfqfh4"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.8"; sha256 = "0iq8py91xvma10rysq3dl29nxhmlgniad3cvafb4jg8iz52ym24h"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.0"; sha256 = "1zyalrcksszmn9r5xjnirfh7847axncgzxkk3k5srbvlcch8fw8g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.2"; sha256 = "1wv54f3p3r2zj1pr9a6z8zqrh2ihm6v6qcw2pjwis1lcc0qb472m"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; sha256 = "0xv3sqc1lbx5j4yy6g2w3kakzvrpwqs2ihax6lqasj5sz5map6fk"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "7.0.0"; sha256 = "15lz0qk2gr2q52i05ip51dzm9p4hzqlrammkc0hv2ng6g0z72697"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.1.0"; sha256 = "0akccwhpn93a4qrssyb3rszdsp3j4p9hlxbsb7yhqb78xydaqhyh"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.0.0"; sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.1"; sha256 = "0ghz4y4gxnf2vw8yvhz9nkw21p6q2qqwh19phkk1xwxywyilr3mq"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.8"; sha256 = "1p48hk3r9ikv36wdpwdrbvaccziazncf7nl60fr82i04199lfhgl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.0"; sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.25.1"; sha256 = "0kkwjci3w5hpmvm4ibnddw7xlqq97ab8pa9mfqm52ri5dq1l9ffp"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.25.1"; sha256 = "16nk02qj8xzqwpgsas50j1w0hhnnxdl7dhqrmgyg7s165qxi5h70"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.0.3"; sha256 = "0njmg2lygnirnfjv9gck2f5lq4ly5rgws9cpf8qj3kwcwxfp0b9s"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.0.3"; sha256 = "1ayh85xqdq8rqjk2iqcn7iaczcl7d8qg6bxk0b4rgx59fmsmbqj7"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.1"; sha256 = "1jnswvv5d6gbnssmql08d72pb0a42xscp4k5k1svsk8k5pj3nf8p"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.25.1"; sha256 = "1r0v67w94wyvyhikcvk92khnzbsqsvmmcdz3yd71wzv6fr4rvrrh"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.0.3"; sha256 = "13cjqmf59k895q6gkd5ycl89mnpalckda7rhsdl11jdyr32hsfnv"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "6.15.1"; sha256 = "1075g2g30g7qmznc9mf97nm4k4xbz4s37bi59qxwbx0y2pnl1f2r"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "6.15.1"; sha256 = "19sbh8hxbbp24294k8vc6z92906wq366m49k5484mngwrw5jpsyf"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.1"; sha256 = "1ljg7nrxjkfcwh081831s30agpfx8f3flqvwg5piy6vfc9hqmxa8"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.25.1"; sha256 = "0srnsqzvr8yinl52ybpps0yg3dp0c8c96h7zariysp9cgb9pv8ds"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.7.1"; sha256 = "0yqxipj74ax2n76w9ccydppx78ym8m5fda88qnvj4670qjvl0kf8"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.0.3"; sha256 = "1pmhd0imh9wlhvbvvwjrpjsqvzagi2ly22nddwr4r0pi234khyz1"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.1"; sha256 = "12ilya3x6g5frbwmh41mwygax9v8vrycq3vnzhv3r258jwv69974"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.7.1"; sha256 = "0s9dyh99gzdpk1i5v468i2r9m6i3jrr41r394pwdwiajsz99kay0"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.7.1"; sha256 = "1xik06rxn9ps83in0zn9vcl2ibv3acmdqvrx07qq89lxj1sgqlhs"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; }) (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) (fetchNuGet { pname = "Moq"; version = "4.16.1"; sha256 = "1m2gwbx0gsy84rl9c3hgdaw9gz8d08ffg19nwg0idsdqmmiq887l"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) - (fetchNuGet { pname = "OneOf"; version = "3.0.255"; sha256 = "17m7nqiwfvpbmy0c9l1i71hh1n2vnjm7hdmb6ppgwmbq6ypnxy4a"; }) - (fetchNuGet { pname = "prometheus-net"; version = "7.0.0"; sha256 = "13h42444mx4nbafhn0aw7xg8gg5dxjszv3qxfz1dflayzmcwganf"; }) - (fetchNuGet { pname = "prometheus-net.AspNetCore"; version = "7.0.0"; sha256 = "0cjdh47qimcg6bmflnwl5xv77vxn4h4hmd1znv8b5a7krg1hrf5k"; }) - (fetchNuGet { pname = "prometheus-net.AspNetCore.HealthChecks"; version = "7.0.0"; sha256 = "0q9gal3hkd45d78s1p0f3dv0kxr0byq69k0aq6pmmh9h6rpx56dl"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) + (fetchNuGet { pname = "OneOf"; version = "3.0.263"; sha256 = "08jiy5ff6nx3bbmia7iqcfrva0bynr87m0m4nxkzm5ri21w49ri1"; }) + (fetchNuGet { pname = "prometheus-net"; version = "8.2.0"; sha256 = "19m9lkpc4h9a0jmn66p61x8960gk9fidcwic70nrvjhmd5m201fj"; }) + (fetchNuGet { pname = "prometheus-net.AspNetCore"; version = "8.2.0"; sha256 = "1lilk7xw19wgl2i7cjbf09ssd4jicla45wj29hfy6d1bzcnd6yn8"; }) + (fetchNuGet { pname = "prometheus-net.AspNetCore.HealthChecks"; version = "8.2.0"; sha256 = "1kzvlab31ypgp62663nnr6g964w19iabnyilqlkm6acl5f5vvfvv"; }) (fetchNuGet { pname = "prometheus-net.DotNetRuntime"; version = "4.4.0"; sha256 = "1hrzf2djkjiswyf4xg3pl6rb0a8i0mh294hrfbna782hfxya7c29"; }) - (fetchNuGet { pname = "prometheus-net.SystemMetrics"; version = "2.0.0"; sha256 = "0vn6xs16wci4x6v90qmjyr0qsz2ykj2h55gdpsfq6bsh095iwraz"; }) + (fetchNuGet { pname = "prometheus-net.SystemMetrics"; version = "3.0.0"; sha256 = "0gl1msasy19vy836dzwkp8046f141nlrx0fhzg70vzfzjnrh3jm5"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -153,29 +155,29 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Serilog"; version = "2.12.0"; sha256 = "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"; }) - (fetchNuGet { pname = "Serilog.AspNetCore"; version = "6.1.0"; sha256 = "04rx10qvgpampyf3yv0qbw1ydhp9pvjim7jwb164j4xkk1q326d8"; }) - (fetchNuGet { pname = "Serilog.Extensions.Hosting"; version = "5.0.1"; sha256 = "11fs8qiikv3flpl6yhfrwflgvbdy62np7blx7nzcf6gx02zdgy1b"; }) - (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.1.0"; sha256 = "0lv370ks2fjdn1nsgkbzbmw6hybnincw3jabr471a5w39pp4fl1c"; }) - (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "1.1.0"; sha256 = "1w3qhj1jrihb20gr9la4r4gcmdyyy6dai2xflwhzvgqrq05wlycy"; }) - (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "3.3.0"; sha256 = "1g9141b3k7fv5n6jh6pmph4f46byjqw1rcqnnicm1gwgzh6cdkpq"; }) + (fetchNuGet { pname = "Serilog"; version = "3.1.1"; sha256 = "0ck51ndmaqflsri7yyw5792z42wsp91038rx2i6vg7z4r35vfvig"; }) + (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.0"; sha256 = "0g1scn1a5paiydxk1nnrwzzqny2vabc3hniy6jwjqycag6ch2pni"; }) + (fetchNuGet { pname = "Serilog.Extensions.Hosting"; version = "8.0.0"; sha256 = "10cgp4nsrzkld5yxnvkfkwd0wkc1m8m7p5z42w4sqd8f188n8i9q"; }) + (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "8.0.0"; sha256 = "087ab94sfhkj6h6x3cwwf66g456704faxnfyc4pi6shxk45b318s"; }) + (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "2.0.0"; sha256 = "0y7vg2qji02riq7r0kgybarhkngw6gh3xw89w7c2hcmjawd96x3k"; }) + (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.0"; sha256 = "0245gvndwbj4nbp8q09vp7w4i9iddxr0vzda2c3ja5afz1zgs395"; }) (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "1.5.0"; sha256 = "0bcb3n6lmg5wfj806mziybfmbb8gyiszrivs3swf0msy8w505gyg"; }) - (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; sha256 = "1rpkphmqfh3bv3m7v1zwz88wz4sirj4xqyff9ga0c6bqhblj6wii"; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "5.0.1"; sha256 = "0cnjjpnnhlx3k4385dbnddkz3n6khdshjix0hlv4gjmrrmjaixva"; }) (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) (fetchNuGet { pname = "Serilog.Sinks.Grafana.Loki"; version = "7.1.1"; sha256 = "1c7csknq5v09j2x3ybrssxk59aca9x678j53wp73ryjh0niqxznl"; }) (fetchNuGet { pname = "Serilog.Sinks.Http"; version = "8.0.0"; sha256 = "1sx30n2cn5ixfvxs8llgk19r0vvv27246341bjy2h4994sl8zgld"; }) - (fetchNuGet { pname = "Soulseek"; version = "6.1.1"; sha256 = "10dg0nvhz3isq568r2ywg0wml680qysjx0sywx5m1qiwcchz4a2s"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.2"; sha256 = "07rc4pj3rphi8nhzkcvilnm0fv27qcdp68jdwk4g0zjk7yfvbcay"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.2"; sha256 = "19hxv895lairrjmk4gkzd3mcb6b0na45xn4n551h4kckplqadg3d"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.2"; sha256 = "0jn98bkjk8h4smi09z31ib6s6392054lwmkziqmkqf5gf614k2fz"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.2"; sha256 = "0bnm2fhvcsyg5ry74gal2cziqnyf5a8d2cb491vsa7j41hbbx7kv"; }) + (fetchNuGet { pname = "Soulseek"; version = "6.2.0"; sha256 = "1nz4fcqpf4mqbc8ig1311vkcn11wcx3nayk56cn7syqczpdqzqxv"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.4"; sha256 = "0shdspl9cm71wwqg9103s44r0l01r3sgnpxr523y4a0wlgac50g0"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.4"; sha256 = "11l85ksv1ck46j8z08fyf0c3l572zmp9ynb7p5chm5iyrh8xwkkn"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.4"; sha256 = "0b8f51nrjkq0pmfzjaqk5rp7r0cp2lbdm2whynj3xsjklppzmn35"; }) (fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.2.0-beta.435"; sha256 = "0dirz0av24ds2k7hgpss15y4wlhwlzz22qdjvkq0n3g3sxcckrsy"; }) (fetchNuGet { pname = "StyleCop.Analyzers.Unstable"; version = "1.2.0.435"; sha256 = "1jv4ha4y2c9922n21yf2dvfkmi8qfa8z28gk5zsqdyck08izp9mh"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.4.0"; sha256 = "1jkgjnkjcb6dif0lzn7whjwwdd4fi6mzkmkdx8sfmv5cffzq4fvk"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.4.0"; sha256 = "1wccx8ig2xc6xcfh774m5z34w6jn0hjffiwc5sq9yl63zkv01vnn"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.4.0"; sha256 = "1k58j6lfqcgrl5f7dw0xnbq6w5bvr42a9fc44vwbzl52kzjdlnh2"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.4.0"; sha256 = "1rxgf0hbkkzywh8z7asky2rrh1gpnrr514v1aj5vnmh49sa31kiz"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.5.0"; sha256 = "0k61chpz5j59s1yax28vx0mppx20ff8vg8grwja112hfrzj1f45n"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) @@ -190,22 +192,21 @@ (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.3.0"; sha256 = "1ab25njbjgqbnvkazv41ndc0fc7gx0dnnhzb57d2wbd7ljxm21fd"; }) (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "5.0.0"; sha256 = "08nmzabsmzar0ajfmkk8vb0k1pja1k42yx52pmf9ngd6fffm1r7k"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0"; sha256 = "08dadpd8lx6x7craw3h3444p7ncz4wk0a3j1681lyhhd56ln66f6"; }) (fetchNuGet { pname = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) - (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "5.0.1"; sha256 = "0jiinibqkicyw1j6v1hqbapl4mglvfrqhywpzmy1w2d068j5kk5y"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; sha256 = "0nzra1i0mljvmnj1qqqg37xs7bl71fnpl68nwmdajchh65l878zr"; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; sha256 = "1xnvcidh2qf6k7w8ij1rvj0viqkq84cq47biw0c98xhxg5rk3pxf"; }) + (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "8.0.0"; sha256 = "16dviw76i17kzprh6famsnng97znzzd0d6zj4l28grfwibxcpd09"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.0"; sha256 = "0fag8hr2v9bswrsjka311lhbr1a43yzcc36j4fadz0f0kl2hby7h"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) @@ -213,7 +214,7 @@ (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.25.1"; sha256 = "03ifsmlfs2v5ca6wc33q8xd89m2jm4h2q57s1s9f4yaigqbq1vrl"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.0.3"; sha256 = "1fls88ffq34j1gr6zay1crm27v3sjs5fa4mvj9akqjq05bxanlhk"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) @@ -251,6 +252,7 @@ (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) @@ -271,8 +273,6 @@ (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) @@ -287,23 +287,21 @@ (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0"; sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "5.0.0"; sha256 = "0jq1rcj5af2ydswld8ga3dyw2yi4c63wvb986b5kqsvpkwwc8x1b"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; sha256 = "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "5.0.0"; sha256 = "1xs1lagxr5blc0dfm6xv1nawcz552lq332x3j2a7sizqfarlk384"; }) (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.6.0"; sha256 = "0ism236hwi0k6axssfq58s1d8lihplwiz058pdvl8al71hagri39"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; }) (fetchNuGet { pname = "System.Text.Json"; version = "6.0.2"; sha256 = "1lz6gx1r4if8sbx6yp9h0mi0g9ffr40x0cg518l0z2aiqgil3fk0"; }) (fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; sha256 = "0scb0lp7wbgcinaa4kqiqs7b8i5nx4ppfad81138jiwd1sl37pyp"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) @@ -317,7 +315,6 @@ (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "5.0.0"; sha256 = "0q776jpacfjmps4sc6gjvqj89w1ynj41hb0lvqmfl3j221lsfdbz"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) @@ -326,15 +323,15 @@ (fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; sha256 = "1z7v9lrkss1f8s42sclsq3az9zjihgmhyxnwhjyf0scgk1amngrw"; }) (fetchNuGet { pname = "Utility.CommandLine.Arguments"; version = "6.0.0"; sha256 = "0i8m0vn1wm4wy7d3radyha6kxg0l50r2q02zlmkg6633yyiqry1a"; }) (fetchNuGet { pname = "Utility.EnvironmentVariables"; version = "1.0.5"; sha256 = "1x9vd5qni194yxc18pcrnvln9zib01sgai7ygw86zcj5137hj72i"; }) - (fetchNuGet { pname = "xunit"; version = "2.4.1"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; }) + (fetchNuGet { pname = "xunit"; version = "2.6.3"; sha256 = "0yy0579ipqk4fab877kc0y947q9i83329rwwf47apwgbhpkcfi62"; }) (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.1"; sha256 = "0c7zkf3i8n1mhc457q859klk067bw1xbf31lyxlwc5hlx9aqz65z"; }) (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.4.1"; sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; }) - (fetchNuGet { pname = "xunit.core"; version = "2.4.1"; sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "1.7.0"; sha256 = "0dga1c6icksd6y7c652pkwcmdsqxrgnxj3v2nijc0vayqa5prnvc"; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.6.3"; sha256 = "0i4g5sw0j2j4ajya671d4ragq3xrgpaf2bw5fzs7hlkykm0s5vgc"; }) + (fetchNuGet { pname = "xunit.core"; version = "2.6.3"; sha256 = "14jissxdzrshnrz8rbgxzvn93if808fvmcbha6bz9f5yh503z88p"; }) (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.2.0"; sha256 = "0l9fl09l709dq671r5yvmcrk9vhxgszmxf3ny1h9ja2sp9xx5pbs"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.1"; sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.1"; sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; }) - (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.3"; sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; }) - (fetchNuGet { pname = "YamlDotNet"; version = "12.0.2"; sha256 = "1v1h8a7x6l5gajqp5vcrh1pvxh9j4rxcs9w7razybzfl7h8q2qxi"; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.6.3"; sha256 = "1j9hjrar5lr3irxmpnbk564dc4g11hkjx6w4241xx333pz4h8jr5"; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.6.3"; sha256 = "0514n70rizl96kx9b62qpsia2nc7k9rjbmwn32vbclpvil2jdy07"; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.5"; sha256 = "06w2skg7vn1wag7x06z8gw2rbfzq21i3alg6dfcwj0rkq98zyxac"; }) + (fetchNuGet { pname = "YamlDotNet"; version = "13.7.1"; sha256 = "1m2lnfb2r8382fpjyxp79wnbis7l462zksj3618142q53y33bk5z"; }) ] diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index b08b2adcd2344..ab617dc291b24 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -5,13 +5,14 @@ , libwbxml }: gnustep.stdenv.mkDerivation rec { pname = "SOGo"; - version = "5.9.0"; + version = "5.9.1"; + # always update the sope package as well, when updating sogo src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOGo-${version}"; - hash = "sha256-Jv+gOWNcjdXk51I22+znYLTUWDEdAOAmRJql9P+/OuQ="; + hash = "sha256-b6BZZ61wY0Akt1Q6+Bq6JXAx/67MwBNbzHr3sB0NuRg="; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ]; @@ -44,6 +45,8 @@ gnustep.stdenv.mkDerivation rec { "--enable-mfa" ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=int-conversion -Wno-error=implicit-int"; + preFixup = '' # Create gnustep.conf mkdir -p $out/share/GNUstep @@ -74,7 +77,7 @@ gnustep.stdenv.mkDerivation rec { license = with licenses; [ gpl2Only lgpl21Only ]; homepage = "https://sogo.nu/"; platforms = platforms.linux; - maintainers = with maintainers; [ ajs124 das_j ]; + maintainers = with maintainers; []; }; } diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/servers/web-apps/vikunja/api.nix index a38983032fd5d..4658c6ece29fa 100644 --- a/pkgs/servers/web-apps/vikunja/api.nix +++ b/pkgs/servers/web-apps/vikunja/api.nix @@ -1,30 +1,30 @@ -{ lib, buildGoModule, fetchFromGitea, mage, writeShellScriptBin, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, mage, writeShellScriptBin, nixosTests }: buildGoModule rec { pname = "vikunja-api"; - version = "0.20.4"; + version = "0.22.0"; - src = fetchFromGitea { - domain = "kolaente.dev"; - owner = "vikunja"; + src = fetchFromGitHub { + owner = "go-vikunja"; repo = "api"; rev = "v${version}"; - hash = "sha256-SkZf8LFU4/HFEWVEEj7Gl2jVwIL834GRwyua4cw9nh4="; + hash = "sha256-hqyopIV/cLLC8An+ELN0a/cFAq6BoCZZjBRviaJ5ygI="; }; nativeBuildInputs = - let - fakeGit = writeShellScriptBin "git" '' - if [[ $@ = "describe --tags --always --abbrev=10" ]]; then - echo "${version}" - else - >&2 echo "Unknown command: $@" - exit 1 - fi - ''; - in [ fakeGit mage ]; - - vendorHash = "sha256-TY6xJnz6phIrybZ2Ix7xwuMzGQ1f0xk0KwgPnaTaKYw="; + let + fakeGit = writeShellScriptBin "git" '' + if [[ $@ = "describe --tags --always --abbrev=10" ]]; then + echo "${version}" + else + >&2 echo "Unknown command: $@" + exit 1 + fi + ''; + in + [ fakeGit mage ]; + + vendorHash = "sha256-+V6a6h5pg8FU87pA4JxZo07HGBXIgCv4FjmtjIpQUP4="; # checks need to be disabled because of needed internet for some checks doCheck = false; diff --git a/pkgs/servers/web-apps/vikunja/frontend.nix b/pkgs/servers/web-apps/vikunja/frontend.nix index 40dbca76cc185..65e3df5b47a71 100644 --- a/pkgs/servers/web-apps/vikunja/frontend.nix +++ b/pkgs/servers/web-apps/vikunja/frontend.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "vikunja-frontend"; - version = "0.20.5"; + version = "0.22.0"; src = fetchurl { url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - hash = "sha256-fUWMlayE8pxVBGloLrywVAFCXF/3vlrz/CHjHNBa7U8="; + hash = "sha256-LYU1IGAhSZOwMI44HW5IfcBKs9RkU/IXGVgPGDKnKAs="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 87bde25166c3f..792292066f53e 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -15,7 +15,7 @@ let pname = "wallabag"; - version = "2.6.7"; + version = "2.6.8"; in stdenv.mkDerivation { inherit pname version; @@ -23,7 +23,7 @@ stdenv.mkDerivation { # Release tarball includes vendored files src = fetchurl { url = "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz"; - hash = "sha256-prk/sF72v5qyBv1Lz/2nY6LPM+on5/gwAMM1u9+X8xA="; + hash = "sha256-pmQXafqpd5rTwBIYG9NnwIIPta6Ek7iYaPaHvz1s550="; }; patches = [ diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 77d85bc81ef4a..f4a9d05e8d94c 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -1,11 +1,11 @@ { callPackage }: builtins.mapAttrs (_: callPackage ./generic.nix) rec { - wordpress = wordpress6_3; + wordpress = wordpress6_4; wordpress6_3 = { version = "6.3.2"; hash = "sha256-Jo2/Vlm4Ml24ucPI6ZHs2mkbpY2rZB1dofmGXNPweA8="; }; wordpress6_4 = { - version = "6.4.1"; - hash = "sha256-NF3tvVNUYlKPvtvJZzM7djGflOUT4VUlm4AyHPFzfdw="; + version = "6.4.2"; + hash = "sha256-m4KJELf5zs3gwAQPmAhoPe2rhopZFsYN6OzAv6Wzo6c="; }; } diff --git a/pkgs/servers/web-apps/wordpress/packages/languages.json b/pkgs/servers/web-apps/wordpress/packages/languages.json index 66a2f6c1ba11b..6a9d4361f2260 100644 --- a/pkgs/servers/web-apps/wordpress/packages/languages.json +++ b/pkgs/servers/web-apps/wordpress/packages/languages.json @@ -1,20 +1,20 @@ { "de_DE": { "path": "de_DE", - "rev": "1238966", - "sha256": "1qrizj0smwlxzv70l2f4dz737qggij2saqx4dc0vfrp4pn0qxw56", - "version": "6.3" + "rev": "1286009", + "sha256": "1w6q2ja1y77yagg73zhrw94f2vpgd521zahwhvxqxa8isphbrybj", + "version": "6.4" }, "fr_FR": { "path": "fr_FR", - "rev": "1263147", - "sha256": "0rgypx5z7pi88da7ll0aby6hlvahja6wqjl8iacabwsnqawqbbx6", - "version": "6.3" + "rev": "1285884", + "sha256": "1qlq7p9pmspizbgjp895jldb6cbsvfal6h02p44r87ag356cjk6j", + "version": "6.4" }, "ro_RO": { "path": "ro_RO", - "rev": "1255832", - "sha256": "0c6hp40rgxg8ai3f35k2bgh4q66qf1g8qgv3jgbq6dcxr090fia2", - "version": "6.3" + "rev": "1296680", + "sha256": "0m98iaai240yn4lx4lhqgzi2wlxkz67v1cg86jhfi72n0rhr4l46", + "version": "6.4" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index 346c459530a58..e85bf69310c1c 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -1,9 +1,9 @@ { "add-widget-after-content": { - "path": "add-widget-after-content/tags/2.4.5", - "rev": "2844985", - "sha256": "17h55fzmssaqv5k2s2a2n5rz49flhzg9gflnps1qpr62apki5156", - "version": "2.4.5" + "path": "add-widget-after-content/tags/2.4.6", + "rev": "3003516", + "sha256": "1nqhx66fy82mwcnfg0r9v2mb6q2nnmhxy9j2451rphxhlxxjf1bf", + "version": "2.4.6" }, "akismet": { "path": "akismet/tags/5.3", @@ -24,10 +24,10 @@ "version": "2.21.08.31" }, "breeze": { - "path": "breeze/tags/2.0.32", - "rev": "2995658", - "sha256": "0c0sh7l6cwz6hbc54gjaasdldrv8h6ynx4b75zzkj2arrmyhjjxg", - "version": "2.0.32" + "path": "breeze/tags/2.1.2", + "rev": "3011880", + "sha256": "164sf180j99icn39215s997qqmqddyqnkf7k29fwpkgz5ww0zkkd", + "version": "2.1.2" }, "co-authors-plus": { "path": "co-authors-plus/tags/3.5.15", @@ -42,10 +42,10 @@ "version": "3.1.1" }, "cookie-notice": { - "path": "cookie-notice/tags/2.4.11.1", - "rev": "2974733", - "sha256": "0bq6i4s7zkx0x5qb65d93h0sdkd17vka10k8xicfin7qdy5fdcf6", - "version": "2.4.11.1" + "path": "cookie-notice/tags/2.4.13", + "rev": "3002920", + "sha256": "0rw511zygmg1i8zp388s4fc526wr4pgszsqxw0bmwia6sjz0a9pn", + "version": "2.4.13" }, "disable-xml-rpc": { "path": "disable-xml-rpc/tags/1.0.1", @@ -60,10 +60,10 @@ "version": "1.4.0" }, "gutenberg": { - "path": "gutenberg/tags/17.0.2", - "rev": "2995211", - "sha256": "07c1smvapzm0gzkjzjk5irnp47x6hl2d4zcmlfprzj17igdqwa5s", - "version": "17.0.2" + "path": "gutenberg/tags/17.3.0", + "rev": "3012944", + "sha256": "0n51lldbbk0sfzcjk8mcjnaj6dmhhbg45kc9a03igl6cnppw6g53", + "version": "17.3.0" }, "hello-dolly": { "path": "hello-dolly/tags/1.7.2", @@ -72,16 +72,16 @@ "version": "1.7.2" }, "hkdev-maintenance-mode": { - "path": "hkdev-maintenance-mode/tags/2.4.5", - "rev": "2971903", - "sha256": "1nq3f0qv8zkws490h86m57972wp7vcngr62x90m8bcq4v6r110wd", - "version": "2.4.5" + "path": "hkdev-maintenance-mode/trunk", + "rev": "3003933", + "sha256": "1mfn9njy7sp23hgpd597y74gs52gi9lm8qajv7xbgza82920mlgd", + "version": "2.5.0" }, "jetpack": { - "path": "jetpack/tags/12.8.1", - "rev": "2995420", - "sha256": "1i59npwwk29rsq5myl0axr1vsyfw19dyx22ckc2szkc3a4my8h40", - "version": "12.8.1" + "path": "jetpack/tags/12.9.3", + "rev": "3013460", + "sha256": "1lgkd3bgaqf155a39zfxx7ikmfxpzfsfak71mrlga12sfmyrrw74", + "version": "12.9.3" }, "jetpack-lite": { "path": "jetpack-lite/tags/3.0.3", @@ -90,28 +90,28 @@ "version": "3.0.3" }, "lightbox-photoswipe": { - "path": "lightbox-photoswipe/tags/5.0.44", - "rev": "2968868", - "sha256": "0nbs05lxdf85ig373l3k558ncw0li1zrqnajq5mw9vkw15mxgy90", - "version": "5.0.44" + "path": "lightbox-photoswipe/tags/5.1.0", + "rev": "3001652", + "sha256": "1mdrxc15skbg8gm18b88hj97mps668in7xvyvymfn5sgpf843glz", + "version": "5.1.0" }, "login-lockdown": { - "path": "login-lockdown/tags/2.06", - "rev": "2951219", - "sha256": "0sl1pydylz1xpp3404nv2rdw8y2ccjvwglncj8flhjmgiwkjf47x", - "version": "2.06" + "path": "login-lockdown/tags/2.08", + "rev": "3007562", + "sha256": "0s9ahqbqcl0rlbbszrbdggyhnqw8k60xzlwq3nzsh2dxaphnmbi5", + "version": "2.08" }, "mailpoet": { - "path": "mailpoet/tags/4.36.0", - "rev": "2995974", - "sha256": "1782z2b1bwg7mx9qzvyzpiymmkqiafd5ymb31q11i7ks19gxlmbw", - "version": "4.36.0" + "path": "mailpoet/tags/4.40.0", + "rev": "3008786", + "sha256": "18604065zjwdrr63ad0a8zqy0cdfh8f5i3jyq5na5iayspgmy0lz", + "version": "4.40.0" }, "merge-minify-refresh": { "path": "merge-minify-refresh/trunk", - "rev": "2997367", - "sha256": "158i9pqn4qqa5mzn57pg4m9gsln35c0gfb8v7sg1y02hp9876shg", - "version": "2.2" + "rev": "3007859", + "sha256": "1f9ppjkpza5h6z23ma7x9lrpqsq5qxc0n8zfffs44njf086n7k4f", + "version": "2.7" }, "opengraph": { "path": "opengraph/tags/1.11.2", @@ -125,6 +125,12 @@ "sha256": "1byq8f5qkxxnhjc4dk1ab7h8vzcr01y1nid81wwj2k1i03z9llqa", "version": "1.3.5" }, + "simple-mastodon-verification": { + "path": "simple-mastodon-verification/tags/1.1.3", + "rev": "2998678", + "sha256": "0ikymrf21l86gpdcjfawadqg1nbfsm6gggcc1g2g553pjg277grz", + "version": "1.1.3" + }, "static-mail-sender-configurator": { "path": "static-mail-sender-configurator/tags/0.10.0", "rev": "2941521", @@ -138,10 +144,10 @@ "version": "1.2.3" }, "webp-converter-for-media": { - "path": "webp-converter-for-media/tags/5.11.4", - "rev": "2995294", - "sha256": "0grlszp00rw63psv21n70alapkw1pgaq8cp9c0b1klk50jcnnx8q", - "version": "5.11.4" + "path": "webp-converter-for-media/tags/5.11.5", + "rev": "3006520", + "sha256": "1mkfki9148w43r3h8afp1j8vkrljsch68y8l4m6i8w5jsjvb5c18", + "version": "5.11.5" }, "webp-express": { "path": "webp-express/tags/0.25.8", @@ -150,16 +156,16 @@ "version": "0.25.8" }, "wordpress-seo": { - "path": "wordpress-seo/tags/21.5", - "rev": "2986840", - "sha256": "1a1mnsh4imy7ab0b7hp0nis46ixwvj47wgibifa90qndbkv2mwsn", - "version": "21.5" + "path": "wordpress-seo/tags/21.7", + "rev": "3008568", + "sha256": "1iigdycbxhdzrprnajw54b1jjmp8akig72z9v78infaf2sjawmgh", + "version": "21.7" }, "worker": { - "path": "worker/tags/4.9.17", - "rev": "2894123", - "sha256": "067zx6b8fl87g901vglci870z38kg8igrdxlrcra4xwrll2c01si", - "version": "4.9.17" + "path": "worker/tags/4.9.18", + "rev": "3010154", + "sha256": "1wkkabw0g2c9bfqwqddjqrc13wwf39h508bb25cxwz2yi5fdhp9v", + "version": "4.9.18" }, "wp-change-email-sender": { "path": "wp-change-email-sender/trunk", @@ -180,22 +186,22 @@ "version": "2.0.22" }, "wp-mail-smtp": { - "path": "wp-mail-smtp/tags/3.10.0", - "rev": "2992136", - "sha256": "0py4ns4vsy9rpqq5gjyfc2p1lvf2gy28klw9ixkm6gdiim8pvl61", - "version": "3.10.0" + "path": "wp-mail-smtp/tags/3.11.0", + "rev": "3009463", + "sha256": "1vk6bdchqka5nmiakq9s8kj7psk2nq2yxln377bidqyqj0q9kqmk", + "version": "3.11.0" }, "wp-statistics": { - "path": "wp-statistics/tags/14.2", - "rev": "2976338", - "sha256": "0vcw6qp5w2whbpwcd9m0dpxf4ah0i7snygszp211lqg4g53qbyyv", - "version": "14.2" + "path": "wp-statistics/tags/14.3.2", + "rev": "3013471", + "sha256": "03iahbjnyyy1lxvxmfgzzzin0sfng0dyagx0q0bvfa9bqx4pi37h", + "version": "14.3.2" }, "wp-swiper": { "path": "wp-swiper/trunk", - "rev": "2978937", - "sha256": "0pn3l5v43hc572bym15pcdirq9n64mdgshacnr92hryq4vagyvzb", - "version": "1.0.34" + "rev": "3013138", + "sha256": "1h5l99m73z7fn0l5sa4qbdpi3r8nanvrbciix5756qj4qbzb51li", + "version": "1.1.0" }, "wp-user-avatars": { "path": "wp-user-avatars/trunk", @@ -204,9 +210,9 @@ "version": "1.4.1" }, "wpforms-lite": { - "path": "wpforms-lite/tags/1.8.4.1", - "rev": "2982999", - "sha256": "08yl41kxxdq36wcrypjrrbmckkpx464sqcarbk7pkzz83933z2pv", - "version": "1.8.4.1" + "path": "wpforms-lite/tags/1.8.5.3", + "rev": "3009465", + "sha256": "1xj4wn1zfdjqxh1h6k9xa316276k8n26nmgjfcapwss452qajwkm", + "version": "1.8.5.3" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json index ebcf43c24b067..1850171243431 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json @@ -20,6 +20,7 @@ , "merge-minify-refresh" , "opengraph" , "simple-login-captcha" +, "simple-mastodon-verification" , "static-mail-sender-configurator" , "tc-custom-javascript" , "webp-converter-for-media" diff --git a/pkgs/servers/webdav-server-rs/default.nix b/pkgs/servers/webdav-server-rs/default.nix index 06c8716ba8778..695ab41dea62d 100644 --- a/pkgs/servers/webdav-server-rs/default.nix +++ b/pkgs/servers/webdav-server-rs/default.nix @@ -43,5 +43,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/miquels/webdav-server-rs"; license = licenses.asl20; maintainers = with maintainers; [ pmy ]; + mainProgram = "webdav-server"; }; } diff --git a/pkgs/servers/webdav/default.nix b/pkgs/servers/webdav/default.nix index f6380337e8640..248c5e882ccee 100644 --- a/pkgs/servers/webdav/default.nix +++ b/pkgs/servers/webdav/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/hacdias/webdav"; license = licenses.mit; maintainers = with maintainers; [ pmy ]; + mainProgram = "webdav"; }; } diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix index 2cae2887e9fba..11cbfa5adbf21 100644 --- a/pkgs/servers/webmetro/default.nix +++ b/pkgs/servers/webmetro/default.nix @@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec { ''; license = with licenses; [ mit ]; maintainers = with maintainers; [ leenaars ]; + mainProgram = "webmetro"; }; } diff --git a/pkgs/servers/wesher/default.nix b/pkgs/servers/wesher/default.nix index 5ab8edd173816..e9b243e325e48 100644 --- a/pkgs/servers/wesher/default.nix +++ b/pkgs/servers/wesher/default.nix @@ -26,5 +26,6 @@ buildGoModule rec { license = licenses.gpl3Only; maintainers = with maintainers; [ tylerjl ]; platforms = platforms.linux; + mainProgram = "wesher"; }; } diff --git a/pkgs/servers/windmill/Cargo.lock b/pkgs/servers/windmill/Cargo.lock deleted file mode 100644 index 89e22cadf65df..0000000000000 --- a/pkgs/servers/windmill/Cargo.lock +++ /dev/null @@ -1,8334 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - -[[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 = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", - "opaque-debug", -] - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.10", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom 0.2.10", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "argon2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" -dependencies = [ - "base64ct", - "blake2", - "cpufeatures", - "password-hash", -] - -[[package]] -name = "array-init" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] - -[[package]] -name = "ast_node" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c09c69dffe06d222d072c878c3afe86eee2179806f20503faec97250268b4c24" -dependencies = [ - "pmutil", - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.38", -] - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-compression" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" -dependencies = [ - "bzip2", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", - "xz2", - "zstd", - "zstd-safe", -] - -[[package]] -name = "async-compression" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-executor" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" -dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand 2.0.1", - "futures-lite", - "slab", -] - -[[package]] -name = "async-global-executor" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" -dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite", - "log", - "parking", - "polling", - "rustix 0.37.26", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-oauth2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beec3f8fb8f710b7be84ccd1716e17f38f2868168355cab5f2f168ae988e767e" -dependencies = [ - "base64 0.21.4", - "bytes", - "http", - "rand 0.8.5", - "reqwest", - "serde", - "serde-aux", - "serde_json", - "sha2 0.10.8", - "thiserror", - "url", -] - -[[package]] -name = "async-recursion" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - -[[package]] -name = "async-stripe" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b85eb331f5c2b6ae4ff00aabd20a8a21de88b9890c58579616bf760570b207" -dependencies = [ - "chrono", - "hex", - "hmac", - "http-types", - "hyper", - "hyper-tls", - "serde", - "serde_json", - "serde_qs 0.9.2", - "sha2 0.10.8", - "smart-default", - "smol_str", - "thiserror", - "tokio", - "uuid 0.8.2", -] - -[[package]] -name = "async-task" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" - -[[package]] -name = "async-trait" -version = "0.1.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "async_zip" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50d29ab7e2f9e808cca1a69ea56a36f4ff216f54a41a23aae1fd4afc05cc020" -dependencies = [ - "async-compression 0.3.15", - "chrono", - "crc32fast", - "log", - "pin-project", - "thiserror", - "tokio", -] - -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core", - "bitflags 1.3.2", - "bytes", - "futures-util", - "headers", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[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.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" - -[[package]] -name = "base64" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" - -[[package]] -name = "base64-simd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" -dependencies = [ - "outref", - "vsimd", -] - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bb8" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b4b0f25f18bcdc3ac72bdb486ed0acf7e185221fd4dc985bc15db5800b0ba2" -dependencies = [ - "async-trait", - "futures-channel", - "futures-util", - "parking_lot", - "tokio", -] - -[[package]] -name = "better_scoped_tls" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de" -dependencies = [ - "scoped-tls", -] - -[[package]] -name = "bigdecimal" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "bigdecimal" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06619be423ea5bb86c95f087d5707942791a08a85530df0db2209a3ecfb8bc9" -dependencies = [ - "autocfg", - "libm", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bindgen" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "prettyplease 0.2.15", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.38", - "which", -] - -[[package]] -name = "bindgen" -version = "0.68.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" -dependencies = [ - "bitflags 2.4.1", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.38", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -dependencies = [ - "serde", -] - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "block-padding", - "generic-array", -] - -[[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 = "block-modes" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e" -dependencies = [ - "block-padding", - "cipher", -] - -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - -[[package]] -name = "blocking" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "fastrand 2.0.1", - "futures-io", - "futures-lite", - "piper", - "tracing", -] - -[[package]] -name = "borsh" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" -dependencies = [ - "borsh-derive", - "hashbrown 0.13.2", -] - -[[package]] -name = "borsh-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" -dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", - "proc-macro-crate 0.1.5", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "brotli" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata 0.1.10", -] - -[[package]] -name = "built" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99c4cdc7b2c2364182331055623bdf45254fcb679fea565c40c3c11c101889a" -dependencies = [ - "cargo-lock", - "git2", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "bytecheck" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - -[[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 = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "candle-core" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d648a16c5e5a9ffa4a6630e13d32b6d7c106f6885fd6d8453e1d8b405c390322" -dependencies = [ - "byteorder", - "candle-gemm", - "half", - "memmap2", - "num-traits", - "num_cpus", - "rand 0.8.5", - "rand_distr", - "rayon", - "safetensors", - "thiserror", - "yoke", - "zip", -] - -[[package]] -name = "candle-gemm" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef9b07a4b0ba1a304b44432006580980ddff9748c201261c279437e7b11bba68" -dependencies = [ - "candle-gemm-c32", - "candle-gemm-c64", - "candle-gemm-common", - "candle-gemm-f16", - "candle-gemm-f32", - "candle-gemm-f64", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-c32" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f595241dad99811de285e029889f57c29dd98e33de7a8a6b881867b1488d7d4a" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-c64" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648f22fd8f5a4f330e29d791845b514966421308a6a2b5fedb949ee07e54c77f" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-common" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03c01b4ca3b9d71e4eb89e42946a08f8b0d2f1b861f7fa2ea0966233f1e0b08" -dependencies = [ - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-f16" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97f8af2a482131713d28a337abff6debf26c529afa1837caf2ba190909b2107c" -dependencies = [ - "candle-gemm-common", - "candle-gemm-f32", - "dyn-stack", - "half", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-f32" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938927961e2f0c0a6064fcf3524ea3f7f455fe5708419532a6fea9aea1ab45ae" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-f64" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d192d7126e59b81ef4cf13cd9f194e6dbdc09171f65d0074d059dc009ac06775" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-nn" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e438605fbbd1235dbfc5b10beda5ebe4bb0a19969b864a85b922c97ac9f686" -dependencies = [ - "candle-core", - "half", - "num-traits", - "rayon", - "safetensors", - "serde", - "thiserror", -] - -[[package]] -name = "candle-transformers" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196742c5676b9af54c782304609f3e480c871e5588451d9806b2df8fc11e324c" -dependencies = [ - "candle-core", - "candle-nn", - "num-traits", - "rand 0.8.5", - "rayon", - "serde", - "serde_json", - "tracing", - "wav", -] - -[[package]] -name = "cargo-lock" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" -dependencies = [ - "semver 1.0.20", - "serde", - "toml 0.7.8", - "url", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.48.5", -] - -[[package]] -name = "chrono-tz" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7" -dependencies = [ - "chrono", - "chrono-tz-build", - "phf 0.11.2", -] - -[[package]] -name = "chrono-tz-build" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf" -dependencies = [ - "parse-zoneinfo", - "phf 0.11.2", - "phf_codegen 0.11.2", -] - -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "clang-sys" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "4.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "clap_lex" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", - "tokio-util", -] - -[[package]] -name = "concurrent-queue" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.45.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-oid" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" - -[[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", - "konst", -] - -[[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 = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[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 = "cookie" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" -dependencies = [ - "percent-encoding", - "time", - "version_check", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cpufeatures" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" -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-any" -version = "2.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774646b687f63643eb0f4bf13dc263cb581c8c9e57973b6ddf78bda3994d88df" -dependencies = [ - "debug-helper", -] - -[[package]] -name = "crc-catalog" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "cron" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff76b51e4c068c52bfd2866e1567bee7c567ae8f24ada09fd4307019e25eab7" -dependencies = [ - "chrono", - "nom", - "once_cell", -] - -[[package]] -name = "crossbeam" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" -dependencies = [ - "cfg-if", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[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 = "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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" -dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", -] - -[[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", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.38", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" -dependencies = [ - "darling_core 0.20.3", - "quote", - "syn 2.0.38", -] - -[[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.2", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-encoding" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" - -[[package]] -name = "data-url" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" - -[[package]] -name = "data-url" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" - -[[package]] -name = "debug-helper" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" - -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "serde", - "uuid 1.5.0", -] - -[[package]] -name = "deno-proc-macro-rules" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c65c2ffdafc1564565200967edc4851c7b55422d3913466688907efd05ea26f" -dependencies = [ - "deno-proc-macro-rules-macros", - "proc-macro2", - "syn 2.0.38", -] - -[[package]] -name = "deno-proc-macro-rules-macros" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3047b312b7451e3190865713a4dd6e1f821aed614ada219766ebc3024a690435" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "deno_ast" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c93119b1c487a85603406a988a0ca9a1d0e5315404cccc5c158fb484b1f5a2" -dependencies = [ - "anyhow", - "base64 0.13.1", - "deno_media_type", - "dprint-swc-ext", - "serde", - "swc_atoms", - "swc_common", - "swc_config", - "swc_config_macro", - "swc_ecma_ast", - "swc_ecma_codegen", - "swc_ecma_codegen_macros", - "swc_ecma_loader", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_classes", - "swc_ecma_transforms_macros", - "swc_ecma_transforms_proposal", - "swc_ecma_transforms_react", - "swc_ecma_transforms_typescript", - "swc_ecma_utils", - "swc_ecma_visit", - "swc_eq_ignore_macros", - "swc_macros_common", - "swc_visit", - "swc_visit_macros", - "text_lines", - "url", -] - -[[package]] -name = "deno_console" -version = "0.115.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ab05b798826985966deb29fc6773ed29570de2f2147a30c4289c7cdf635214" -dependencies = [ - "deno_core", -] - -[[package]] -name = "deno_core" -version = "0.200.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8ba264b90ceb6e95b39d82e674d8ecae86ca012f900338ea50d1a077d9d75fd" -dependencies = [ - "anyhow", - "bytes", - "deno_ops", - "futures", - "indexmap 1.9.3", - "libc", - "log", - "once_cell", - "parking_lot", - "pin-project", - "serde", - "serde_json", - "serde_v8", - "smallvec", - "sourcemap", - "tokio", - "url", - "v8", -] - -[[package]] -name = "deno_fetch" -version = "0.139.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f1b9a643427c7f732a4540e250560e1801970f033bae0d5e4abc7b83e36160" -dependencies = [ - "bytes", - "data-url 0.2.0", - "deno_core", - "deno_tls", - "dyn-clone", - "http", - "reqwest", - "serde", - "tokio", - "tokio-util", -] - -[[package]] -name = "deno_media_type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a798670c20308e5770cc0775de821424ff9e85665b602928509c8c70430b3ee0" -dependencies = [ - "data-url 0.3.0", - "serde", - "url", -] - -[[package]] -name = "deno_ops" -version = "0.78.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffd1c83b1fd465ee0156f2917c9af9ca09fe2bf54052a2cae1a8dcbc7b89aefc" -dependencies = [ - "deno-proc-macro-rules", - "lazy-regex", - "once_cell", - "pmutil", - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "regex", - "strum", - "strum_macros", - "syn 1.0.109", - "syn 2.0.38", - "thiserror", -] - -[[package]] -name = "deno_tls" -version = "0.102.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "010ce5e0a920b2364c75a9e38bcd3344bfe55a6b6cd9ef6717d78e5478f9bcb3" -dependencies = [ - "deno_core", - "once_cell", - "rustls", - "rustls-native-certs", - "rustls-pemfile", - "serde", - "webpki", - "webpki-roots 0.22.6", -] - -[[package]] -name = "deno_url" -version = "0.115.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20490fff3b0f8c176a815e26371ff23313ea7f39cd51057701524c5b6fc36f6c" -dependencies = [ - "deno_core", - "serde", - "urlpattern", -] - -[[package]] -name = "deno_web" -version = "0.146.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dc8dda6e1337d4739ae9e94d75521689824d82a7deb154a2972b6eedac64507" -dependencies = [ - "async-trait", - "base64-simd", - "deno_core", - "encoding_rs", - "flate2", - "serde", - "tokio", - "uuid 1.5.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "deno_webidl" -version = "0.115.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73159d81053ead02e938b46d4bb7224c8e7cf25273ac16a250fb45bb09af7635" -dependencies = [ - "deno_core", -] - -[[package]] -name = "der" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" -dependencies = [ - "const-oid", - "pem-rfc7468 0.6.0", - "zeroize", -] - -[[package]] -name = "der" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" -dependencies = [ - "const-oid", - "pem-rfc7468 0.7.0", - "zeroize", -] - -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", - "serde", -] - -[[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 = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 1.0.109", -] - -[[package]] -name = "des" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac41dd49fb554432020d52c875fc290e110113f864c6b1b525cd62c7e7747a5d" -dependencies = [ - "byteorder", - "cipher", - "opaque-debug", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "const-oid", - "crypto-common", - "subtle", -] - -[[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-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dotenv" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" - -[[package]] -name = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - -[[package]] -name = "dprint-swc-ext" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f115ea5b6f5d0d02a25a9364f41b8c4f857452c299309dcfd29a694724d0566" -dependencies = [ - "bumpalo", - "num-bigint", - "rustc-hash", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "text_lines", -] - -[[package]] -name = "dyn-clone" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" - -[[package]] -name = "dyn-iter" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "131726693bce13b09331bee70734fe266666332b6ddfef23e9dca5b8bf6dea66" - -[[package]] -name = "dyn-stack" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe7f8d7bcc523381d3c437b82cf74805de3931de0da69309ae0fe1bdf7a256e" -dependencies = [ - "bytemuck", - "reborrow", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" -dependencies = [ - "serde", -] - -[[package]] -name = "ena" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" -dependencies = [ - "log", -] - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -dependencies = [ - "cfg-if", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "esaxx-rs" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" -dependencies = [ - "cc", -] - -[[package]] -name = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if", - "home", - "windows-sys 0.48.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[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.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", -] - -[[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - -[[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", - "libz-ng-sys", - "libz-sys", - "miniz_oxide", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "spin 0.9.8", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "from_variant" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ec5dc38ee19078d84a692b1c41181ff9f94331c76cee66ff0208c770b5e54f" -dependencies = [ - "pmutil", - "proc-macro2", - "swc_macros_common", - "syn 2.0.38", -] - -[[package]] -name = "frunk" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a351b59e12f97b4176ee78497dff72e4276fb1ceb13e19056aca7fa0206287" -dependencies = [ - "frunk_core", - "frunk_derives", - "frunk_proc_macros", -] - -[[package]] -name = "frunk_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2469fab0bd07e64ccf0ad57a1438f63160c69b2e57f04a439653d68eb558d6" - -[[package]] -name = "frunk_derives" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" -dependencies = [ - "frunk_proc_macro_helpers", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "frunk_proc_macro_helpers" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b54add839292b743aeda6ebedbd8b11e93404f902c56223e51b9ec18a13d2c" -dependencies = [ - "frunk_core", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "frunk_proc_macros" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b85a1d4a9a6b300b41c05e8e13ef2feca03e0334127f29eca9506a7fe13a93" -dependencies = [ - "frunk_core", - "frunk_proc_macro_helpers", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "fslock" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57eafdd0c16f57161105ae1b98a1238f97645f2f588438b2949c99a2af9616bf" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gcp_auth" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3b20d3058763d26d88e6e7a49998841e5296735b00dbfb064ff7cb142933dd" -dependencies = [ - "async-trait", - "base64 0.21.4", - "dirs-next", - "hyper", - "hyper-rustls", - "ring 0.16.20", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "thiserror", - "time", - "tokio", - "tracing", - "tracing-futures", - "url", - "which", -] - -[[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 = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[package]] -name = "git-version" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899" -dependencies = [ - "git-version-macro", - "proc-macro-hack", -] - -[[package]] -name = "git-version-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "git2" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" -dependencies = [ - "bitflags 1.3.2", - "libc", - "libgit2-sys", - "log", - "url", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "gosyn" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c003b8c167a1abb8b170baacf075dcdac2aaf5732bc94fead3d6ce429df7aa8" -dependencies = [ - "anyhow", - "strum", - "thiserror", - "unic-ucd-category", -] - -[[package]] -name = "h2" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 1.9.3", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" -dependencies = [ - "cfg-if", - "crunchy", - "num-traits", - "rand 0.8.5", - "rand_distr", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", -] - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.3", -] - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" -dependencies = [ - "ahash 0.8.3", - "allocator-api2", -] - -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.2", -] - -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64 0.21.4", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hf-hub" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" -dependencies = [ - "dirs", - "indicatif", - "log", - "native-tls", - "rand 0.8.5", - "serde", - "serde_json", - "thiserror", - "ureq", -] - -[[package]] -name = "hkdf" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - -[[package]] -name = "http-types" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" -dependencies = [ - "anyhow", - "async-channel", - "base64 0.13.1", - "futures-lite", - "http", - "infer", - "pin-project-lite", - "rand 0.7.3", - "serde", - "serde_json", - "serde_qs 0.8.5", - "serde_urlencoded", - "url", -] - -[[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 = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.4.10", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" -dependencies = [ - "futures-util", - "http", - "hyper", - "rustls", - "rustls-native-certs", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" -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 = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" -dependencies = [ - "equivalent", - "hashbrown 0.14.2", -] - -[[package]] -name = "indicatif" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "infer" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ipnet" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" - -[[package]] -name = "is-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e" -dependencies = [ - "Inflector", - "pmutil", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix 0.38.20", - "windows-sys 0.48.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "jsonwebtoken" -version = "8.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" -dependencies = [ - "base64 0.21.4", - "pem 1.1.1", - "ring 0.16.20", - "serde", - "serde_json", - "simple_asn1", -] - -[[package]] -name = "konst" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330f0e13e6483b8c34885f7e6c9f19b1a7bd449c673fbb948a51c99d66ef74f4" -dependencies = [ - "konst_macro_rules", -] - -[[package]] -name = "konst_macro_rules" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37" - -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - -[[package]] -name = "lalrpop" -version = "0.19.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" -dependencies = [ - "ascii-canvas", - "bit-set", - "diff", - "ena", - "is-terminal", - "itertools 0.10.5", - "lalrpop-util", - "petgraph", - "regex", - "regex-syntax 0.6.29", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", -] - -[[package]] -name = "lalrpop-util" -version = "0.19.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" -dependencies = [ - "regex", -] - -[[package]] -name = "lazy-regex" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff63c423c68ea6814b7da9e88ce585f793c87ddd9e78f646970891769c8235d4" -dependencies = [ - "lazy-regex-proc_macros", - "once_cell", - "regex", -] - -[[package]] -name = "lazy-regex-proc_macros" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8edfc11b8f56ce85e207e62ea21557cfa09bb24a8f6b04ae181b086ff8611c22" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lexical" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" -dependencies = [ - "lexical-core", -] - -[[package]] -name = "lexical-core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" -dependencies = [ - "lexical-parse-float", - "lexical-parse-integer", - "lexical-util", - "lexical-write-float", - "lexical-write-integer", -] - -[[package]] -name = "lexical-parse-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "lexical-write-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" -dependencies = [ - "lexical-util", - "lexical-write-integer", - "static_assertions", -] - -[[package]] -name = "lexical-write-integer" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" - -[[package]] -name = "libgit2-sys" -version = "0.15.2+1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libsqlite3-sys" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libxml" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe73cdec2bcb36d25a9fe3f607ffcd44bb8907ca0100c4098d1aa342d1e7bec" -dependencies = [ - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-ng-sys" -version = "1.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dd9f43e75536a46ee0f92b758f6b63846e594e86638c61a9251338a65baea63" -dependencies = [ - "cmake", - "libc", -] - -[[package]] -name = "libz-sys" -version = "1.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" - -[[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.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -dependencies = [ - "value-bag", -] - -[[package]] -name = "lru" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" -dependencies = [ - "hashbrown 0.13.2", -] - -[[package]] -name = "lz4_flex" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8cbbb2831780bc3b9c15a41f5b49222ef756b6730a95f3decfdd15903eb5a3" -dependencies = [ - "twox-hash", -] - -[[package]] -name = "lzma-sys" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "macro_rules_attribute" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" -dependencies = [ - "macro_rules_attribute-proc_macro", - "paste", -] - -[[package]] -name = "macro_rules_attribute-proc_macro" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" - -[[package]] -name = "magic-crypt" -version = "3.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0196bd5c76f5f51d7d6563545f86262fef4c82d75466ba6f6d359c40a523318d" -dependencies = [ - "aes", - "base64 0.13.1", - "block-modes", - "crc-any", - "des", - "digest 0.9.0", - "md-5 0.9.1", - "sha2 0.9.9", - "tiger", -] - -[[package]] -name = "mail-builder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef70f53409852d2612f2249810cbbe0c9931ca25b739b734bafc7f61d88051d4" -dependencies = [ - "gethostname", -] - -[[package]] -name = "mail-send" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbc58a799366b3b2956a2c5ae7e2892ea34b3016343cbbdc5deb844aa6c0973" -dependencies = [ - "base64 0.20.0", - "gethostname", - "mail-builder", - "rustls", - "smtp-proto", - "tokio", - "tokio-rustls", - "webpki-roots 0.25.2", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - -[[package]] -name = "md-5" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest 0.10.7", -] - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memmap2" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" -dependencies = [ - "libc", - "stable_deref_trait", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "monostate" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f370ae88093ec6b11a710dec51321a61d420fafd1bad6e30d01bd9c920e8ee" -dependencies = [ - "monostate-impl", - "serde", -] - -[[package]] -name = "monostate-impl" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "mysql-common-derive" -version = "0.30.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b0d8a0db9bf6d2213e11f2c701cb91387b0614361625ab7b9743b41aa4938f" -dependencies = [ - "darling 0.20.3", - "heck", - "num-bigint", - "proc-macro-crate 1.3.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.38", - "termcolor", - "thiserror", -] - -[[package]] -name = "mysql_async" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5272f59b5b1f93d65f7f826c1f025d6e410e89fb50a67e05aa20b35a55a8c0a" -dependencies = [ - "bytes", - "crossbeam", - "flate2", - "futures-core", - "futures-sink", - "futures-util", - "lazy_static", - "lru", - "mio", - "mysql_common", - "native-tls", - "once_cell", - "pem 2.0.1", - "percent-encoding", - "pin-project", - "priority-queue", - "serde", - "serde_json", - "socket2 0.5.5", - "thiserror", - "tokio", - "tokio-native-tls", - "tokio-util", - "twox-hash", - "url", -] - -[[package]] -name = "mysql_common" -version = "0.30.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57349d5a326b437989b6ee4dc8f2f34b0cc131202748414712a8e7d98952fc8c" -dependencies = [ - "base64 0.21.4", - "bigdecimal 0.3.1", - "bindgen 0.68.1", - "bitflags 2.4.1", - "bitvec", - "byteorder", - "bytes", - "cc", - "cmake", - "crc32fast", - "flate2", - "frunk", - "lazy_static", - "lexical", - "mysql-common-derive", - "num-bigint", - "num-traits", - "rand 0.8.5", - "regex", - "rust_decimal", - "saturating", - "serde", - "serde_json", - "sha1", - "sha2 0.10.8", - "smallvec", - "subprocess", - "thiserror", - "time", - "uuid 1.5.0", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "libc", -] - -[[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 = "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-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", - "rand 0.8.5", - "serde", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-complex" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" -dependencies = [ - "num-traits", - "serde", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", - "libm", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "onig" -version = "6.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" -dependencies = [ - "bitflags 1.3.2", - "libc", - "once_cell", - "onig_sys", -] - -[[package]] -name = "onig_sys" -version = "69.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" -dependencies = [ - "cc", - "pkg-config", -] - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openapiv3" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1a9f106eb0a780abd17ba9fca8e0843e3461630bcbe2af0ad4d5d3ba4e9aa4" -dependencies = [ - "indexmap 1.9.3", - "serde", - "serde_json", -] - -[[package]] -name = "openssl" -version = "0.10.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "outref" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[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 0.4.1", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "parse-zoneinfo" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" -dependencies = [ - "regex", -] - -[[package]] -name = "password-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "pem" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" -dependencies = [ - "base64 0.21.4", - "serde", -] - -[[package]] -name = "pem" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" -dependencies = [ - "base64 0.21.4", - "serde", -] - -[[package]] -name = "pem-rfc7468" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" -dependencies = [ - "base64ct", -] - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pest" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.0.2", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_macros 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros 0.11.2", - "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 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_codegen" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", -] - -[[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 0.8.5", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared 0.11.2", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[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 2.0.1", - "futures-io", -] - -[[package]] -name = "pkcs1" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719" -dependencies = [ - "der 0.6.1", - "pkcs8 0.9.0", - "spki 0.6.0", - "zeroize", -] - -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der 0.7.8", - "pkcs8 0.10.2", - "spki 0.7.2", -] - -[[package]] -name = "pkcs8" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" -dependencies = [ - "der 0.6.1", - "spki 0.6.0", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der 0.7.8", - "spki 0.7.2", -] - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "pmutil" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "portable-atomic" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" - -[[package]] -name = "postgres" -version = "0.19.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7915b33ed60abc46040cbcaa25ffa1c7ec240668e0477c4f3070786f5916d451" -dependencies = [ - "bytes", - "fallible-iterator", - "futures-util", - "log", - "tokio", - "tokio-postgres", -] - -[[package]] -name = "postgres-native-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d442770e2b1e244bb5eb03b31c79b65bb2568f413b899eaba850fa945a65954" -dependencies = [ - "futures", - "native-tls", - "tokio", - "tokio-native-tls", - "tokio-postgres", -] - -[[package]] -name = "postgres-protocol" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" -dependencies = [ - "base64 0.21.4", - "byteorder", - "bytes", - "fallible-iterator", - "hmac", - "md-5 0.10.6", - "memchr", - "rand 0.8.5", - "sha2 0.10.8", - "stringprep", -] - -[[package]] -name = "postgres-types" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" -dependencies = [ - "array-init", - "bytes", - "chrono", - "fallible-iterator", - "postgres-protocol", - "serde", - "serde_json", - "uuid 1.5.0", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[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.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "prettyplease" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" -dependencies = [ - "proc-macro2", - "syn 2.0.38", -] - -[[package]] -name = "priority-queue" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61" -dependencies = [ - "autocfg", - "indexmap 1.9.3", -] - -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml 0.5.11", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - -[[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-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "progenitor" -version = "0.3.0" -source = "git+https://github.com/oxidecomputer/progenitor?rev=3d96016ae8d422e90513b2d34fb5b63eeab30b01#3d96016ae8d422e90513b2d34fb5b63eeab30b01" -dependencies = [ - "anyhow", - "built", - "clap", - "openapiv3", - "progenitor-client", - "progenitor-impl", - "progenitor-macro", - "project-root", - "rustfmt-wrapper", - "serde", - "serde_json", - "serde_yaml", -] - -[[package]] -name = "progenitor-client" -version = "0.3.0" -source = "git+https://github.com/oxidecomputer/progenitor?rev=3d96016ae8d422e90513b2d34fb5b63eeab30b01#3d96016ae8d422e90513b2d34fb5b63eeab30b01" -dependencies = [ - "bytes", - "futures-core", - "percent-encoding", - "reqwest", - "serde", - "serde_json", - "serde_urlencoded", -] - -[[package]] -name = "progenitor-impl" -version = "0.3.0" -source = "git+https://github.com/oxidecomputer/progenitor?rev=3d96016ae8d422e90513b2d34fb5b63eeab30b01#3d96016ae8d422e90513b2d34fb5b63eeab30b01" -dependencies = [ - "getopts", - "heck", - "http", - "indexmap 1.9.3", - "openapiv3", - "proc-macro2", - "quote", - "regex", - "schemars", - "serde", - "serde_json", - "syn 2.0.38", - "thiserror", - "typify", - "unicode-ident", -] - -[[package]] -name = "progenitor-macro" -version = "0.3.0" -source = "git+https://github.com/oxidecomputer/progenitor?rev=3d96016ae8d422e90513b2d34fb5b63eeab30b01#3d96016ae8d422e90513b2d34fb5b63eeab30b01" -dependencies = [ - "openapiv3", - "proc-macro2", - "progenitor-impl", - "quote", - "schemars", - "serde", - "serde_json", - "serde_tokenstream", - "serde_yaml", - "syn 2.0.38", -] - -[[package]] -name = "project-root" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bccbff07d5ed689c4087d20d7307a52ab6141edeedf487c3876a55b86cf63df" - -[[package]] -name = "prometheus" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" -dependencies = [ - "cfg-if", - "fnv", - "lazy_static", - "memchr", - "parking_lot", - "thiserror", -] - -[[package]] -name = "psm" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] - -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "quick-xml" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "quick_cache" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f69f8d22fa3f34f3083d9a4375c038732c7a7e964de1beb81c544da92dfc40b8" -dependencies = [ - "ahash 0.8.3", - "equivalent", - "hashbrown 0.14.2", - "parking_lot", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "radix_fmt" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426" - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[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 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.10", -] - -[[package]] -name = "rand_distr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "raw-cpuid" -version = "10.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-cond" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" -dependencies = [ - "either", - "itertools 0.11.0", - "rayon", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "reborrow" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" - -[[package]] -name = "redis" -version = "0.23.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba" -dependencies = [ - "async-std", - "async-trait", - "bytes", - "combine", - "futures-util", - "itoa", - "percent-encoding", - "pin-project-lite", - "ryu", - "sha1_smol", - "socket2 0.4.10", - "tokio", - "tokio-util", - "url", -] - -[[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" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "regress" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a9ecfa0cb04d0b04dddb99b8ccf4f66bc8dfd23df694b398570bd8ae3a50fb" -dependencies = [ - "hashbrown 0.13.2", - "memchr", -] - -[[package]] -name = "rend" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" -dependencies = [ - "bytecheck", -] - -[[package]] -name = "reqwest" -version = "0.11.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" -dependencies = [ - "async-compression 0.4.4", - "base64 0.21.4", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tokio-socks", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots 0.25.2", - "winreg", -] - -[[package]] -name = "riff" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b1a3d5f46d53f4a3478e2be4a5a5ce5108ea58b100dcd139830eae7f79a3a1" - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" -dependencies = [ - "cc", - "getrandom 0.2.10", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "rkyv" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" -dependencies = [ - "bitvec", - "bytecheck", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid 1.5.0", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "rsa" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c" -dependencies = [ - "byteorder", - "digest 0.10.7", - "num-bigint-dig", - "num-integer", - "num-iter", - "num-traits", - "pkcs1 0.4.1", - "pkcs8 0.9.0", - "rand_core 0.6.4", - "signature 1.6.4", - "smallvec", - "subtle", - "zeroize", -] - -[[package]] -name = "rsa" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" -dependencies = [ - "byteorder", - "const-oid", - "digest 0.10.7", - "num-bigint-dig", - "num-integer", - "num-iter", - "num-traits", - "pkcs1 0.7.5", - "pkcs8 0.10.2", - "rand_core 0.6.4", - "signature 2.1.0", - "spki 0.7.2", - "subtle", - "zeroize", -] - -[[package]] -name = "rsmq_async" -version = "5.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b21409a26e25b1946ce3ab9903a2710fbae8727a05c17f79d165908592743cb" -dependencies = [ - "async-trait", - "bb8", - "lazy_static", - "radix_fmt", - "rand 0.8.5", - "redis", - "thiserror", -] - -[[package]] -name = "rust-embed" -version = "6.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "6.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils", - "syn 2.0.38", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "7.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" -dependencies = [ - "sha2 0.10.8", - "walkdir", -] - -[[package]] -name = "rust_decimal" -version = "1.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c4216490d5a413bc6d10fa4742bd7d4955941d062c0ef873141d6b0e7b30fd" -dependencies = [ - "arrayvec", - "borsh", - "bytes", - "num-traits", - "postgres", - "rand 0.8.5", - "rkyv", - "serde", - "serde_json", -] - -[[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.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.20", -] - -[[package]] -name = "rustfmt-wrapper" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed729e3bee08ec2befd593c27e90ca9fdd25efdc83c94c3b82eaef16e4f7406e" -dependencies = [ - "serde", - "tempfile", - "thiserror", - "toml 0.5.11", - "toolchain_find", -] - -[[package]] -name = "rustix" -version = "0.37.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys 0.4.10", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" -dependencies = [ - "log", - "ring 0.16.20", - "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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.4", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "rustpython-ast" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b83af38212db64ecfc76b6d53a1c6de89733236e39c69d4bc8ab565ae167b2" -dependencies = [ - "num-bigint", - "rustpython-compiler-core", -] - -[[package]] -name = "rustpython-compiler-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81870eb757460989d43ce41e069f1a01d0292b33011b23b0455d0a6394e4c77a" -dependencies = [ - "bincode", - "bitflags 1.3.2", - "bstr", - "itertools 0.10.5", - "lz4_flex", - "num-bigint", - "num-complex", - "serde", - "static_assertions", - "thiserror", -] - -[[package]] -name = "rustpython-parser" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7348e148144ba85bc1284d97004062137306554fd00e7eb500d91720de5e78" -dependencies = [ - "ahash 0.7.6", - "anyhow", - "itertools 0.10.5", - "lalrpop", - "lalrpop-util", - "log", - "num-bigint", - "num-traits", - "phf 0.10.1", - "phf_codegen 0.10.0", - "rustc-hash", - "rustpython-ast", - "rustpython-compiler-core", - "thiserror", - "tiny-keccak", - "unic-emoji-char", - "unic-ucd-ident", - "unicode_names2", -] - -[[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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "safetensors" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93279b86b3de76f820a8854dd06cbc33cfa57a417b19c47f6a25280112fb1df" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "samael" -version = "0.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7af1a6bbd2d98a207abf060c0734b0b9eb8a2a679008bf7bb5296c8876e27958" -dependencies = [ - "base64 0.21.4", - "bindgen 0.65.1", - "chrono", - "data-encoding", - "derive_builder", - "flate2", - "lazy_static", - "libc", - "libxml", - "openssl", - "openssl-probe", - "openssl-sys", - "pkg-config", - "quick-xml", - "rand 0.8.5", - "serde", - "thiserror", - "url", - "uuid 1.5.0", -] - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "saturating" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71" - -[[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "schemars" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" -dependencies = [ - "chrono", - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", - "uuid 1.5.0", -] - -[[package]] -name = "schemars_derive" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 1.0.109", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[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 = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser 0.7.0", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", -] - -[[package]] -name = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" -dependencies = [ - "serde", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - -[[package]] -name = "seq-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" - -[[package]] -name = "serde" -version = "1.0.189" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-aux" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3dfe1b7eb6f9dcf011bd6fad169cdeaae75eda0d61b1a99a3f015b41b0cae39" -dependencies = [ - "chrono", - "serde", - "serde_json", -] - -[[package]] -name = "serde-wasm-bindgen" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "serde_bytes" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.189" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "serde_derive_internals" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "serde_json" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" -dependencies = [ - "indexmap 2.0.2", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" -dependencies = [ - "itoa", - "serde", -] - -[[package]] -name = "serde_qs" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - -[[package]] -name = "serde_qs" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af4cee6cd4b23b45e6709150d1e9af5c748131de7e3316a7c2b3008051ed725" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - -[[package]] -name = "serde_spanned" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_tokenstream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a00ffd23fd882d096f09fcaae2a9de8329a328628e86027e049ee051dc1621f" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "syn 2.0.38", -] - -[[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 = "serde_v8" -version = "0.111.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "309b3060a9627882514f3a3ce3cc08ceb347a76aeeadc58f138c3f189cf88b71" -dependencies = [ - "bytes", - "derive_more", - "num-bigint", - "serde", - "serde_bytes", - "smallvec", - "thiserror", - "v8", -] - -[[package]] -name = "serde_yaml" -version = "0.9.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" -dependencies = [ - "indexmap 2.0.2", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "sha-1" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[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 = "shlex" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" - -[[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 = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -dependencies = [ - "digest 0.10.7", - "rand_core 0.6.4", -] - -[[package]] -name = "signature" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" -dependencies = [ - "digest 0.10.7", - "rand_core 0.6.4", -] - -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "simple_asn1" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror", - "time", -] - -[[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 = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "smart-default" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "static_assertions", - "version_check", -] - -[[package]] -name = "smol_str" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" -dependencies = [ - "serde", -] - -[[package]] -name = "smtp-proto" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4b756ac662e92a0e5b360349bea5f0b0784d4be4541eff2972049dfdfd7f862" - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "sourcemap" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90" -dependencies = [ - "data-encoding", - "debugid", - "if_chain", - "rustc_version 0.2.3", - "serde", - "serde_json", - "unicode-id", - "url", -] - -[[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" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" -dependencies = [ - "base64ct", - "der 0.6.1", -] - -[[package]] -name = "spki" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" -dependencies = [ - "base64ct", - "der 0.7.8", -] - -[[package]] -name = "spm_precompiled" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" -dependencies = [ - "base64 0.13.1", - "nom", - "serde", - "unicode-segmentation", -] - -[[package]] -name = "sql-builder" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1008d95d2ec2d062959352527be30e10fec42a1aa5e5a48d990a5ff0fb9bdc0" -dependencies = [ - "anyhow", - "thiserror", -] - -[[package]] -name = "sqlformat" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" -dependencies = [ - "itertools 0.11.0", - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" -dependencies = [ - "ahash 0.8.3", - "atoi", - "bigdecimal 0.3.1", - "byteorder", - "bytes", - "chrono", - "crc", - "crossbeam-queue", - "dotenvy", - "either", - "event-listener", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashlink", - "hex", - "indexmap 2.0.2", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "sha2 0.10.8", - "smallvec", - "sqlformat", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "url", - "uuid 1.5.0", - "webpki-roots 0.24.0", -] - -[[package]] -name = "sqlx-macros" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn 1.0.109", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" -dependencies = [ - "dotenvy", - "either", - "heck", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2 0.10.8", - "sqlx-core", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", - "syn 1.0.109", - "tempfile", - "tokio", - "url", -] - -[[package]] -name = "sqlx-mysql" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" -dependencies = [ - "atoi", - "base64 0.21.4", - "bigdecimal 0.3.1", - "bitflags 2.4.1", - "byteorder", - "bytes", - "chrono", - "crc", - "digest 0.10.7", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac", - "itoa", - "log", - "md-5 0.10.6", - "memchr", - "once_cell", - "percent-encoding", - "rand 0.8.5", - "rsa 0.9.2", - "serde", - "sha1", - "sha2 0.10.8", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "uuid 1.5.0", - "whoami", -] - -[[package]] -name = "sqlx-postgres" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" -dependencies = [ - "atoi", - "base64 0.21.4", - "bigdecimal 0.3.1", - "bitflags 2.4.1", - "byteorder", - "chrono", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "hex", - "hkdf", - "hmac", - "home", - "itoa", - "log", - "md-5 0.10.6", - "memchr", - "num-bigint", - "once_cell", - "rand 0.8.5", - "serde", - "serde_json", - "sha1", - "sha2 0.10.8", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "uuid 1.5.0", - "whoami", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" -dependencies = [ - "atoi", - "chrono", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "sqlx-core", - "tracing", - "url", - "uuid 1.5.0", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "stacker" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "winapi", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[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 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "string_enum" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fa4d4f81d7c05b9161f8de839975d3326328b8ba2831164b465524cc2f55252" -dependencies = [ - "pmutil", - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.38", -] - -[[package]] -name = "stringprep" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" -dependencies = [ - "finl_unicode", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.38", -] - -[[package]] -name = "subprocess" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "swc_atoms" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8066e17abb484602da673e2d35138ab32ce53f26368d9c92113510e1659220b" -dependencies = [ - "once_cell", - "rustc-hash", - "serde", - "string_cache", - "string_cache_codegen", - "triomphe", -] - -[[package]] -name = "swc_common" -version = "0.31.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5823ef063f116ad281cde9700f5be6dfb182e543ce3f62c42cee1c03ffbc6b" -dependencies = [ - "ast_node", - "better_scoped_tls", - "cfg-if", - "either", - "from_variant", - "new_debug_unreachable", - "num-bigint", - "once_cell", - "rustc-hash", - "serde", - "siphasher", - "sourcemap", - "string_cache", - "swc_atoms", - "swc_eq_ignore_macros", - "swc_visit", - "tracing", - "unicode-width", - "url", -] - -[[package]] -name = "swc_config" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba1c7a40d38f9dd4e9a046975d3faf95af42937b34b2b963be4d8f01239584b" -dependencies = [ - "indexmap 1.9.3", - "serde", - "serde_json", - "swc_config_macro", -] - -[[package]] -name = "swc_config_macro" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5b5aaca9a0082be4515f0fbbecc191bf5829cd25b5b9c0a2810f6a2bb0d6829" -dependencies = [ - "pmutil", - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.38", -] - -[[package]] -name = "swc_ecma_ast" -version = "0.107.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7191c8c57af059b75a2aadc927a2608c3962d19e4d09ce8f9c3f03739ddf833" -dependencies = [ - "bitflags 2.4.1", - "is-macro", - "num-bigint", - "scoped-tls", - "serde", - "string_enum", - "swc_atoms", - "swc_common", - "unicode-id", -] - -[[package]] -name = "swc_ecma_codegen" -version = "0.142.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4e3ee8a1f0bfaf630febbe0f6a03f2c28d66d373a9bbdb3f500f6bfb536b43" -dependencies = [ - "memchr", - "num-bigint", - "once_cell", - "rustc-hash", - "serde", - "sourcemap", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_codegen_macros", - "tracing", -] - -[[package]] -name = "swc_ecma_codegen_macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdff076dccca6cc6a0e0b2a2c8acfb066014382bc6df98ec99e755484814384" -dependencies = [ - "pmutil", - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.38", -] - -[[package]] -name = "swc_ecma_loader" -version = "0.43.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82f47bb1ab686f603da93a8b6e559d69b42369ab47d5dee6bdda38ae5902dc2a" -dependencies = [ - "anyhow", - "pathdiff", - "serde", - "swc_common", - "tracing", -] - -[[package]] -name = "swc_ecma_parser" -version = "0.137.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c0d554865a63bfa58cf1c433fa91d7d4adf40030fa8e4530e8065d0578166a" -dependencies = [ - "either", - "num-bigint", - "num-traits", - "serde", - "smallvec", - "smartstring", - "stacker", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "tracing", - "typed-arena", -] - -[[package]] -name = "swc_ecma_transforms_base" -version = "0.130.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8d8ca5dd849cea79e6a9792d725f4082ad3ade7a9541fba960c42d55ae778f2" -dependencies = [ - "better_scoped_tls", - "bitflags 2.4.1", - "indexmap 1.9.3", - "once_cell", - "phf 0.10.1", - "rustc-hash", - "serde", - "smallvec", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "swc_ecma_utils", - "swc_ecma_visit", - "tracing", -] - -[[package]] -name = "swc_ecma_transforms_classes" -version = "0.119.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a09d0e350963d4fb14bf9dc31c85eb28e58a88614e779c75f49296710f9cb381" -dependencies = [ - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_transforms_base", - "swc_ecma_utils", - "swc_ecma_visit", -] - -[[package]] -name = "swc_ecma_transforms_macros" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f59c4b6ed5d78d3ad9fc7c6f8ab4f85bba99573d31d9a2c0a712077a6b45efd2" -dependencies = [ - "pmutil", - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.38", -] - -[[package]] -name = "swc_ecma_transforms_proposal" -version = "0.164.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62d3a04de35f6c79d8f343822138e7313934d3530cc4e4f891a079f7e2415c1a" -dependencies = [ - "either", - "rustc-hash", - "serde", - "smallvec", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_transforms_base", - "swc_ecma_transforms_classes", - "swc_ecma_transforms_macros", - "swc_ecma_utils", - "swc_ecma_visit", -] - -[[package]] -name = "swc_ecma_transforms_react" -version = "0.176.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "607017e6fbfe3229b69ffce7b47383eb9b62025ea93a50cd1cc1788d2a29a4ca" -dependencies = [ - "base64 0.13.1", - "dashmap", - "indexmap 1.9.3", - "once_cell", - "serde", - "sha-1", - "string_enum", - "swc_atoms", - "swc_common", - "swc_config", - "swc_ecma_ast", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_macros", - "swc_ecma_utils", - "swc_ecma_visit", -] - -[[package]] -name = "swc_ecma_transforms_typescript" -version = "0.180.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea349e787a62af0dcf1b8b52d507045345871571c18cb78a2f892912f7d6b753" -dependencies = [ - "serde", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_transforms_base", - "swc_ecma_transforms_react", - "swc_ecma_utils", - "swc_ecma_visit", -] - -[[package]] -name = "swc_ecma_utils" -version = "0.120.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb60e20e1eb9e9f7c88d99ac8659fd0561d70abd27853f550fbd907a448c878" -dependencies = [ - "indexmap 1.9.3", - "num_cpus", - "once_cell", - "rustc-hash", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_visit", - "tracing", - "unicode-id", -] - -[[package]] -name = "swc_ecma_visit" -version = "0.93.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb23a48abd9f5731b6275dbf4ea89f6e03dc60b7c8e3e1e383bb4a6c39fd7e25" -dependencies = [ - "num-bigint", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_visit", - "tracing", -] - -[[package]] -name = "swc_eq_ignore_macros" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a95d367e228d52484c53336991fdcf47b6b553ef835d9159db4ba40efb0ee8" -dependencies = [ - "pmutil", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "swc_macros_common" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a273205ccb09b51fabe88c49f3b34c5a4631c4c00a16ae20e03111d6a42e832" -dependencies = [ - "pmutil", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "swc_visit" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c337fbb2d191bf371173dea6a957f01899adb8f189c6c31b122a6cfc98fc3" -dependencies = [ - "either", - "swc_visit_macros", -] - -[[package]] -name = "swc_visit_macros" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f322730fb82f3930a450ac24de8c98523af7d34ab8cb2f46bcb405839891a99" -dependencies = [ - "Inflector", - "pmutil", - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.38", -] - -[[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.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" -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 = "synstructure" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", - "unicode-xid", -] - -[[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 = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.3.5", - "rustix 0.38.20", - "windows-sys 0.48.0", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "text_lines" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd5828de7deaa782e1dd713006ae96b3bee32d3279b79eb67ecf8072c059bcf" -dependencies = [ - "serde", -] - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tiger" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443e531cbcf9de83258cfef70bcd56c91188de5819ebd4b19c85f589e0617005" -dependencies = [ - "block-buffer 0.9.0", - "byteorder", - "digest 0.9.0", -] - -[[package]] -name = "time" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" -dependencies = [ - "deranged", - "itoa", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" -dependencies = [ - "time-core", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[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 = "tinyvector" -version = "0.1.0" -source = "git+https://github.com/windmill-labs/tinyvector#20823b94c20f2b9093f318badd24026cf54dcc85" -dependencies = [ - "anyhow", - "bincode", - "lazy_static", - "rayon", - "schemars", - "serde", - "thiserror", - "tracing", -] - -[[package]] -name = "tokenizers" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9be88c795d8b9f9c4002b3a8f26a6d0876103a6f523b32ea3bac52d8560c17c" -dependencies = [ - "aho-corasick", - "clap", - "derive_builder", - "esaxx-rs", - "getrandom 0.2.10", - "indicatif", - "itertools 0.11.0", - "lazy_static", - "log", - "macro_rules_attribute", - "monostate", - "onig", - "paste", - "rand 0.8.5", - "rayon", - "rayon-cond", - "regex", - "regex-syntax 0.7.5", - "serde", - "serde_json", - "spm_precompiled", - "thiserror", - "unicode-normalization-alignments", - "unicode-segmentation", - "unicode_categories", -] - -[[package]] -name = "tokio" -version = "1.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.5", - "tokio-macros", - "tracing", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "tokio-metrics" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcb585a0069b53171684e22d5255984ec30d1c7304fd0a4a9a603ffd8c765cdd" -dependencies = [ - "futures-util", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-postgres" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" -dependencies = [ - "async-trait", - "byteorder", - "bytes", - "fallible-iterator", - "futures-channel", - "futures-util", - "log", - "parking_lot", - "percent-encoding", - "phf 0.11.2", - "pin-project-lite", - "postgres-protocol", - "postgres-types", - "rand 0.8.5", - "socket2 0.5.5", - "tokio", - "tokio-util", - "whoami", -] - -[[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-socks" -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-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-tar" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" -dependencies = [ - "filetime", - "futures-core", - "libc", - "redox_syscall 0.3.5", - "tokio", - "tokio-stream", - "xattr", -] - -[[package]] -name = "tokio-util" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.0.2", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toolchain_find" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e85654a10e7a07a47c6f19d93818f3f343e22927f2fa280c84f7c8042743413" -dependencies = [ - "home", - "lazy_static", - "regex", - "semver 0.11.0", - "walkdir", -] - -[[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-cookies" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40f38d941a2ffd8402b36e02ae407637a9caceb693aaf2edc910437db0f36984" -dependencies = [ - "async-trait", - "axum-core", - "cookie", - "futures-util", - "http", - "parking_lot", - "pin-project-lite", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-http" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" -dependencies = [ - "bitflags 2.4.1", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "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.38", -] - -[[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-flame" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9" -dependencies = [ - "lazy_static", - "tracing", - "tracing-subscriber", -] - -[[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.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", - "tracing-serde", -] - -[[package]] -name = "triomphe" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee8098afad3fb0c54a9007aab6804558410503ad676d4633f9c2559a00ac0f" -dependencies = [ - "serde", - "stable_deref_trait", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "rand 0.8.5", - "static_assertions", -] - -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "typify" -version = "0.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6658d09e71bfe59e7987dc95ee7f71809fdb5793ab0cdc1503cc0073990484d" -dependencies = [ - "typify-impl", - "typify-macro", -] - -[[package]] -name = "typify-impl" -version = "0.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d3bb47587b13edf526d6ed02bf360ecefe083ab47a4ef29fc43112828b2bef" -dependencies = [ - "heck", - "log", - "proc-macro2", - "quote", - "regress", - "schemars", - "serde_json", - "syn 2.0.38", - "thiserror", - "unicode-ident", -] - -[[package]] -name = "typify-macro" -version = "0.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3f7e627c18be12d53bc1f261830b9c2763437b6a86ac57293b9085af2d32ffe" -dependencies = [ - "proc-macro2", - "quote", - "schemars", - "serde", - "serde_json", - "serde_tokenstream", - "syn 2.0.38", - "typify-impl", -] - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "ulid" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" -dependencies = [ - "rand 0.8.5", - "uuid 1.5.0", -] - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-emoji-char" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b07221e68897210270a38bde4babb655869637af0f69407f96053a34f76494d" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-category" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8d4591f5fcfe1bd4453baaf803c40e1b1e69ff8455c47620440b46efef91c0" -dependencies = [ - "matches", - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-ident" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - -[[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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-id" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" - -[[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.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-normalization-alignments" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" -dependencies = [ - "smallvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[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 = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "unicode_names2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029df4cc8238cefc911704ff8fa210853a0f3bce2694d8f51181dd41ee0f3301" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" - -[[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 = "ureq" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" -dependencies = [ - "base64 0.21.4", - "flate2", - "log", - "native-tls", - "once_cell", - "rustls", - "rustls-webpki", - "serde", - "serde_json", - "url", - "webpki-roots 0.25.2", -] - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "urlpattern" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609" -dependencies = [ - "derive_more", - "regex", - "serde", - "unic-ucd-ident", - "url", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.10", -] - -[[package]] -name = "uuid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" -dependencies = [ - "getrandom 0.2.10", - "serde", -] - -[[package]] -name = "v8" -version = "0.74.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eedac634b8dd39b889c5b62349cbc55913780226239166435c5cf66771792ea" -dependencies = [ - "bitflags 1.3.2", - "fslock", - "once_cell", - "which", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "value-bag" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" - -[[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 = "vsimd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" - -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - -[[package]] -name = "walkdir" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[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.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[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.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.38", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "wasm-bindgen-test" -version = "0.3.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6e302a7ea94f83a6d09e78e7dc7d9ca7b186bc2829c24a22d0753efd680671" -dependencies = [ - "console_error_panic_hook", - "js-sys", - "scoped-tls", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "wasm-streams" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wav" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a65e199c799848b4f997072aa4d673c034f80f40191f97fe2f0a23f410be1609" -dependencies = [ - "riff", -] - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.5", - "untrusted 0.9.0", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" -dependencies = [ - "rustls-webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.20", -] - -[[package]] -name = "whoami" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[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-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[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 = "windmill" -version = "1.188.1" -dependencies = [ - "anyhow", - "axum", - "base64 0.21.4", - "chrono", - "dotenv", - "futures", - "gethostname", - "git-version", - "lazy_static", - "once_cell", - "prometheus", - "rand 0.8.5", - "reqwest", - "rsmq_async", - "serde", - "serde_json", - "sha2 0.10.8", - "sqlx", - "tokio", - "tokio-metrics", - "tracing", - "url", - "uuid 1.5.0", - "windmill-api", - "windmill-api-client", - "windmill-common", - "windmill-queue", - "windmill-worker", -] - -[[package]] -name = "windmill-api" -version = "1.188.1" -dependencies = [ - "anyhow", - "argon2", - "async-oauth2", - "async-recursion", - "async-stripe", - "async_zip", - "axum", - "base64 0.21.4", - "bytes", - "candle-core", - "candle-nn", - "candle-transformers", - "chrono", - "chrono-tz", - "cookie", - "cron", - "futures", - "git-version", - "hex", - "hf-hub", - "hmac", - "hyper", - "itertools 0.11.0", - "lazy_static", - "magic-crypt", - "mail-send", - "mime_guess", - "prometheus", - "quick_cache", - "rand 0.8.5", - "regex", - "reqwest", - "rsa 0.7.2", - "rsmq_async", - "rust-embed", - "samael", - "serde", - "serde_json", - "serde_urlencoded", - "sha2 0.10.8", - "sql-builder", - "sqlx", - "tempfile", - "time", - "tinyvector", - "tokenizers", - "tokio", - "tokio-tar", - "tokio-util", - "tower", - "tower-cookies", - "tower-http", - "tracing", - "tracing-subscriber", - "urlencoding", - "uuid 1.5.0", - "windmill-audit", - "windmill-common", - "windmill-parser", - "windmill-parser-py-imports", - "windmill-queue", -] - -[[package]] -name = "windmill-api-client" -version = "1.188.1" -dependencies = [ - "base64 0.21.4", - "chrono", - "openapiv3", - "prettyplease 0.1.25", - "progenitor", - "progenitor-client", - "rand 0.8.5", - "reqwest", - "serde", - "serde_json", - "syn 1.0.109", - "uuid 1.5.0", -] - -[[package]] -name = "windmill-audit" -version = "1.188.1" -dependencies = [ - "chrono", - "serde", - "serde_json", - "sql-builder", - "sqlx", - "tracing", - "windmill-common", -] - -[[package]] -name = "windmill-common" -version = "1.188.1" -dependencies = [ - "anyhow", - "axum", - "chrono", - "hex", - "hmac", - "hyper", - "itertools 0.11.0", - "lazy_static", - "prometheus", - "rand 0.8.5", - "regex", - "reqwest", - "serde", - "serde_json", - "sha2 0.10.8", - "sqlx", - "thiserror", - "tokio", - "tracing", - "tracing-flame", - "tracing-subscriber", - "uuid 1.5.0", -] - -[[package]] -name = "windmill-parser" -version = "1.188.1" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "windmill-parser-bash" -version = "1.188.1" -dependencies = [ - "anyhow", - "lazy_static", - "regex", - "serde_json", - "windmill-parser", -] - -[[package]] -name = "windmill-parser-go" -version = "1.188.1" -dependencies = [ - "anyhow", - "gosyn", - "itertools 0.11.0", - "lazy_static", - "regex", - "windmill-parser", -] - -[[package]] -name = "windmill-parser-graphql" -version = "1.188.1" -dependencies = [ - "anyhow", - "lazy_static", - "regex", - "serde_json", - "windmill-parser", -] - -[[package]] -name = "windmill-parser-py" -version = "1.188.1" -dependencies = [ - "anyhow", - "itertools 0.11.0", - "rustpython-parser", - "serde_json", - "windmill-parser", -] - -[[package]] -name = "windmill-parser-py-imports" -version = "1.188.1" -dependencies = [ - "anyhow", - "async-recursion", - "itertools 0.11.0", - "lazy_static", - "phf 0.11.2", - "regex", - "rustpython-parser", - "serde_json", - "sqlx", - "windmill-common", - "windmill-parser", -] - -[[package]] -name = "windmill-parser-sql" -version = "1.188.1" -dependencies = [ - "anyhow", - "lazy_static", - "regex", - "serde_json", - "windmill-parser", -] - -[[package]] -name = "windmill-parser-ts" -version = "1.188.1" -dependencies = [ - "anyhow", - "convert_case 0.6.0", - "regex", - "serde-wasm-bindgen", - "serde_json", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "swc_ecma_visit", - "wasm-bindgen", - "windmill-parser", -] - -[[package]] -name = "windmill-parser-wasm" -version = "1.188.1" -dependencies = [ - "anyhow", - "getrandom 0.2.10", - "serde_json", - "wasm-bindgen", - "wasm-bindgen-test", - "windmill-parser", - "windmill-parser-bash", - "windmill-parser-go", - "windmill-parser-graphql", - "windmill-parser-py", - "windmill-parser-sql", - "windmill-parser-ts", -] - -[[package]] -name = "windmill-queue" -version = "1.188.1" -dependencies = [ - "anyhow", - "async-recursion", - "axum", - "bigdecimal 0.4.2", - "chrono", - "chrono-tz", - "cron", - "futures-core", - "hex", - "hmac", - "itertools 0.11.0", - "lazy_static", - "prometheus", - "reqwest", - "rsmq_async", - "serde", - "serde_json", - "sql-builder", - "sqlx", - "tokio", - "tracing", - "ulid", - "uuid 1.5.0", - "windmill-audit", - "windmill-common", -] - -[[package]] -name = "windmill-worker" -version = "1.188.1" -dependencies = [ - "anyhow", - "async-recursion", - "base64 0.21.4", - "bytes", - "chrono", - "const_format", - "deno_ast", - "deno_console", - "deno_core", - "deno_fetch", - "deno_url", - "deno_web", - "deno_webidl", - "dotenv", - "dyn-iter", - "futures", - "gcp_auth", - "git-version", - "itertools 0.11.0", - "jsonwebtoken", - "lazy_static", - "mysql_async", - "native-tls", - "nix", - "once_cell", - "pem 3.0.2", - "postgres-native-tls", - "prometheus", - "rand 0.8.5", - "regex", - "reqwest", - "rsmq_async", - "rust_decimal", - "serde", - "serde_json", - "sha2 0.10.8", - "sqlx", - "tokio", - "tokio-postgres", - "tracing", - "urlencoding", - "uuid 1.5.0", - "windmill-audit", - "windmill-common", - "windmill-parser", - "windmill-parser-bash", - "windmill-parser-go", - "windmill-parser-graphql", - "windmill-parser-py", - "windmill-parser-py-imports", - "windmill-parser-sql", - "windmill-parser-ts", - "windmill-queue", -] - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[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-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -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-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_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[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_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[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_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[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_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[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_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "winnow" -version = "0.5.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" -dependencies = [ - "memchr", -] - -[[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 = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "xattr" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" -dependencies = [ - "libc", -] - -[[package]] -name = "xz2" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" -dependencies = [ - "lzma-sys", -] - -[[package]] -name = "yoke" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", - "synstructure", -] - -[[package]] -name = "zerofrom" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", - "synstructure", -] - -[[package]] -name = "zeroize" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" - -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "byteorder", - "crc32fast", - "crossbeam-utils", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/pkgs/servers/windmill/default.nix b/pkgs/servers/windmill/default.nix deleted file mode 100644 index a10610ea19580..0000000000000 --- a/pkgs/servers/windmill/default.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, buildNpmPackage -, bash -, cmake -, cairo -, deno -, fetchurl -, go -, lld -, makeWrapper -, nsjail -, openssl -, pango -, pixman -, pkg-config -, python3 -, rustfmt -, stdenv -, swagger-cli -}: - -let - pname = "windmill"; - version = "1.188.1"; - - fullSrc = fetchFromGitHub { - owner = "windmill-labs"; - repo = "windmill"; - rev = "v${version}"; - hash = "sha256-IiCIiP5KYRw10aPlR40RPW0ynXq5itf0LLtpDtxCNE4="; - }; - - pythonEnv = python3.withPackages (ps: [ ps.pip-tools ]); - - frontend-build = buildNpmPackage { - inherit version; - - pname = "windmill-ui"; - src = fullSrc; - - sourceRoot = "${fullSrc.name}/frontend"; - - npmDepsHash = "sha256-TgAv3iUD0kP2mOvMVOW4yYCDCsf2Cr8IfXK+V+f35uw"; - - # without these you get a - # FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory - env.NODE_OPTIONS="--max-old-space-size=8192"; - - preBuild = '' - npm run generate-backend-client - ''; - - buildInputs = [ pixman cairo pango ]; - nativeBuildInputs = [ python3 pkg-config ]; - - installPhase = '' - mkdir -p $out/share - mv build $out/share/windmill-frontend - ''; - }; -in -rustPlatform.buildRustPackage { - inherit pname version; - src = "${fullSrc}/backend"; - - env = { - SQLX_OFFLINE = "true"; - RUSTY_V8_ARCHIVE = - let - fetch_librusty_v8 = args: - fetchurl { - name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; - sha256 = args.shas.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); - meta = { inherit (args) version; }; - }; - in - fetch_librusty_v8 { - version = "0.74.3"; - shas = { - x86_64-linux = "sha256-8pa8nqA6rbOSBVnp2Q8/IQqh/rfYQU57hMgwU9+iz4A="; - aarch64-linux = "sha256-3kXOV8rlCNbNBdXgOtd3S94qO+JIKyOByA4WGX+XVP0="; - x86_64-darwin = "sha256-iBBVKZiSoo08YEQ8J/Rt1/5b7a+2xjtuS6QL/Wod5nQ="; - aarch64-darwin = "sha256-Djnuc3l/jQKvBf1aej8LG5Ot2wPT0m5Zo1B24l1UHsM="; - }; - }; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "progenitor-0.3.0" = "sha256-F6XRZFVIN6/HfcM8yI/PyNke45FL7jbcznIiqj22eIQ="; - "tinyvector-0.1.0" = "sha256-NYGhofU4rh+2IAM+zwe04YQdXY8Aa4gTmn2V2HtzRfI="; - }; - }; - - patches = [ - ./swagger-cli.patch - ./run.go.config.proto.patch - ./run.python3.config.proto.patch - ./run.bash.config.proto.patch - ]; - - postPatch = '' - substituteInPlace windmill-worker/src/bash_executor.rs \ - --replace '"/bin/bash"' '"${bash}/bin/bash"' - - substituteInPlace windmill-api/src/lib.rs \ - --replace 'unknown-version' 'v${version}' - - substituteInPlace src/main.rs \ - --replace 'unknown-version' 'v${version}' - ''; - - buildInputs = [ - openssl - rustfmt - lld - ]; - - nativeBuildInputs = [ - pkg-config - makeWrapper - swagger-cli - cmake # for libz-ng-sys crate - ]; - - preBuild = '' - pushd .. - - mkdir -p frontend/build - - cp -R ${frontend-build}/share/windmill-frontend/* frontend/build - cp ${fullSrc}/openflow.openapi.yaml . - - popd - ''; - - # needs a postgres database running - doCheck = false; - - postFixup = '' - patchelf --set-rpath ${lib.makeLibraryPath [openssl]} $out/bin/windmill - - wrapProgram "$out/bin/windmill" \ - --prefix PATH : ${lib.makeBinPath [go pythonEnv deno nsjail bash]} \ - --set PYTHON_PATH "${pythonEnv}/bin/python3" \ - --set GO_PATH "${go}/bin/go" \ - --set DENO_PATH "${deno}/bin/deno" \ - --set NSJAIL_PATH "${nsjail}/bin/nsjail" - ''; - - meta = { - changelog = "https://github.com/windmill-labs/windmill/blob/${fullSrc.rev}/CHANGELOG.md"; - description = "Open-source developer platform to turn scripts into workflows and UIs"; - homepage = "https://windmill.dev"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ dit7ya happysalada ]; - mainProgram = "windmill"; - # limited by librusty_v8 - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - }; -} diff --git a/pkgs/servers/windmill/run.bash.config.proto.patch b/pkgs/servers/windmill/run.bash.config.proto.patch deleted file mode 100644 index 874fe0607ee70..0000000000000 --- a/pkgs/servers/windmill/run.bash.config.proto.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/windmill-worker/nsjail/run.bash.config.proto b/backend/windmill-worker/nsjail/run.bash.config.proto -index e93e6b45..bbedb165 100644 ---- a/windmill-worker/nsjail/run.bash.config.proto -+++ b/windmill-worker/nsjail/run.bash.config.proto -@@ -18,6 +18,12 @@ clone_newuser: {CLONE_NEWUSER} - keep_caps: false - keep_env: true - -+mount { -+ src: "/nix/store" -+ dst: "/nix/store" -+ is_bind: true -+} -+ - mount { - src: "/bin" - dst: "/bin" -@@ -25,6 +31,7 @@ mount { - } - - mount { -+ mandatory: false - src: "/lib" - dst: "/lib" - is_bind: true -@@ -32,6 +39,7 @@ mount { - - - mount { -+ mandatory: false - src: "/lib64" - dst: "/lib64" - is_bind: true -@@ -39,6 +47,7 @@ mount { - - - mount { -+ mandatory: false - src: "/usr" - dst: "/usr" - is_bind: true diff --git a/pkgs/servers/windmill/run.go.config.proto.patch b/pkgs/servers/windmill/run.go.config.proto.patch deleted file mode 100644 index a5e3b68b07d7c..0000000000000 --- a/pkgs/servers/windmill/run.go.config.proto.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/windmill-worker/nsjail/run.go.config.proto b/windmill-worker/nsjail/run.go.config.proto -index 3af548d1..39ff4da7 100644 ---- a/windmill-worker/nsjail/run.go.config.proto -+++ b/windmill-worker/nsjail/run.go.config.proto -@@ -25,6 +25,13 @@ mount { - } - - mount { -+ src: "/nix/store" -+ dst: "/nix/store" -+ is_bind: true -+} -+ -+mount { -+ mandatory: false - src: "/lib" - dst: "/lib" - is_bind: true -@@ -32,6 +39,7 @@ mount { - - - mount { -+ mandatory: false - src: "/lib64" - dst: "/lib64" - is_bind: true -@@ -39,6 +47,7 @@ mount { - - - mount { -+ mandatory: false - src: "/usr" - dst: "/usr" - is_bind: true diff --git a/pkgs/servers/windmill/run.python3.config.proto.patch b/pkgs/servers/windmill/run.python3.config.proto.patch deleted file mode 100644 index 85e87d7b34330..0000000000000 --- a/pkgs/servers/windmill/run.python3.config.proto.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/windmill-worker/nsjail/run.python3.config.proto b/windmill-worker/nsjail/run.python3.config.proto -index 9f106c23..9da2d2a8 100644 ---- a/windmill-worker/nsjail/run.python3.config.proto -+++ b/windmill-worker/nsjail/run.python3.config.proto -@@ -27,6 +27,13 @@ mount { - } - - mount { -+ src: "/nix/store" -+ dst: "/nix/store" -+ is_bind: true -+} -+ -+mount { -+ mandatory: false - src: "/lib" - dst: "/lib" - is_bind: true -@@ -34,6 +35,7 @@ mount { - - - mount { -+ mandatory: false - src: "/lib64" - dst: "/lib64" - is_bind: true -@@ -41,6 +43,7 @@ mount { - - - mount { -+ mandatory: false - src: "/usr" - dst: "/usr" - is_bind: true diff --git a/pkgs/servers/windmill/swagger-cli.patch b/pkgs/servers/windmill/swagger-cli.patch deleted file mode 100644 index 61b92db48072c..0000000000000 --- a/pkgs/servers/windmill/swagger-cli.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/windmill-api-client/bundle.sh b/windmill-api-client/bundle.sh -index 0fe4b172..bd66b49f 100644 ---- a/windmill-api-client/bundle.sh -+++ b/windmill-api-client/bundle.sh -@@ -1,3 +1,3 @@ - #!/bin/sh - --npx swagger-cli bundle ../windmill-api/openapi.yaml > bundled.json -\ No newline at end of file -+swagger-cli bundle ../windmill-api/openapi.yaml > bundled.json diff --git a/pkgs/servers/wishlist/default.nix b/pkgs/servers/wishlist/default.nix index 93986677b28ea..19ce2c32e220f 100644 --- a/pkgs/servers/wishlist/default.nix +++ b/pkgs/servers/wishlist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wishlist"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "wishlist"; rev = "v${version}"; - sha256 = "sha256-NSL67j/nnE6Ftm39XNav3/TPUSFXHxQE5OxpNEIdtVc="; + sha256 = "sha256-B4p2j/U+vTiku7rTj5Ho6BY84kjrNHLDIkI9pZZdmHI="; }; - vendorHash = "sha256-8TQkzsvHjdkYXVmUKaqbs7nURx8kUv2HGs9cBv3hPJc="; + vendorHash = "sha256-kfeIEpe6g4T9joAZesgqdE5dd9UD9+a0nALceKq1/zc="; doCheck = false; @@ -23,5 +23,6 @@ buildGoModule rec { changelog = "https://github.com/charmbracelet/wishlist/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ caarlos0 penguwin ]; + mainProgram = "wishlist"; }; } diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix index 8e1f61dc5dd35..6b99e6c593738 100644 --- a/pkgs/servers/wsdd/default.nix +++ b/pkgs/servers/wsdd/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ izorkin ]; license = licenses.mit; platforms = platforms.all; + mainProgram = "wsdd"; }; } diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index e561e854a7102..8786e0798627c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1450,7 +1450,7 @@ self: with self; { buildInputs = [ libX11 libXext xorgproto libXt ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xmuu" "xmu" ]; + pkgConfigModules = [ "xmu" "xmuu" ]; platforms = lib.platforms.unix; }; })) {}; @@ -1650,7 +1650,7 @@ self: with self; { buildInputs = [ xorgproto libX11 libXext libXv ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xvmc-wrapper" "xvmc" ]; + pkgConfigModules = [ "xvmc" "xvmc-wrapper" ]; platforms = lib.platforms.unix; }; })) {}; @@ -1811,7 +1811,7 @@ self: with self; { buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xcb-composite" "xcb-xtest" "xcb-record" "xcb-glx" "xcb-dpms" "xcb-xevie" "xcb-dri2" "xcb-shm" "xcb-sync" "xcb-xprint" "xcb-dri3" "xcb-screensaver" "xcb-render" "xcb-xkb" "xcb-xinput" "xcb-shape" "xcb-ge" "xcb-xfixes" "xcb" "xcb-damage" "xcb-present" "xcb-xf86dri" "xcb-xvmc" "xcb-randr" "xcb-xinerama" "xcb-xselinux" "xcb-xv" "xcb-res" ]; + pkgConfigModules = [ "xcb" "xcb-composite" "xcb-damage" "xcb-dbe" "xcb-dpms" "xcb-dri2" "xcb-dri3" "xcb-ge" "xcb-glx" "xcb-present" "xcb-randr" "xcb-record" "xcb-render" "xcb-res" "xcb-screensaver" "xcb-shape" "xcb-shm" "xcb-sync" "xcb-xevie" "xcb-xf86dri" "xcb-xfixes" "xcb-xinerama" "xcb-xinput" "xcb-xkb" "xcb-xprint" "xcb-xselinux" "xcb-xtest" "xcb-xv" "xcb-xvmc" ]; platforms = lib.platforms.unix; }; })) {}; @@ -2271,7 +2271,7 @@ self: with self; { buildInputs = [ gperf libxcb xorgproto ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xcb-atom" "xcb-event" "xcb-aux" "xcb-util" ]; + pkgConfigModules = [ "xcb-atom" "xcb-aux" "xcb-event" "xcb-util" ]; platforms = lib.platforms.unix; }; })) {}; @@ -2391,7 +2391,7 @@ self: with self; { buildInputs = [ gperf libxcb xorgproto ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xcb-icccm" "xcb-ewmh" ]; + pkgConfigModules = [ "xcb-ewmh" "xcb-icccm" ]; platforms = lib.platforms.unix; }; })) {}; @@ -4151,7 +4151,7 @@ self: with self; { buildInputs = [ libXt ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { - pkgConfigModules = [ "xf86vidmodeproto" "xineramaproto" "xproxymngproto" "glproto" "presentproto" "applewmproto" "xcmiscproto" "recordproto" "resourceproto" "printproto" "xcalibrateproto" "renderproto" "fontsproto" "dpmsproto" "kbproto" "videoproto" "dri2proto" "bigreqsproto" "dri3proto" "evieproto" "inputproto" "fixesproto" "lg3dproto" "xf86rushproto" "compositeproto" "xwaylandproto" "trapproto" "dmxproto" "xextproto" "xproto" "xf86dgaproto" "xf86miscproto" "xf86bigfontproto" "windowswmproto" "scrnsaverproto" "damageproto" "xf86driproto" "randrproto" "fontcacheproto" ]; + pkgConfigModules = [ "applewmproto" "bigreqsproto" "compositeproto" "damageproto" "dmxproto" "dpmsproto" "dri2proto" "dri3proto" "evieproto" "fixesproto" "fontcacheproto" "fontsproto" "glproto" "inputproto" "kbproto" "lg3dproto" "presentproto" "printproto" "randrproto" "recordproto" "renderproto" "resourceproto" "scrnsaverproto" "trapproto" "videoproto" "windowswmproto" "xcalibrateproto" "xcmiscproto" "xextproto" "xf86bigfontproto" "xf86dgaproto" "xf86driproto" "xf86miscproto" "xf86rushproto" "xf86vidmodeproto" "xineramaproto" "xproto" "xproxymngproto" "xwaylandproto" ]; platforms = lib.platforms.unix; }; })) {}; @@ -4159,11 +4159,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; - version = "21.1.9"; + version = "21.1.11"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.9.tar.xz"; - sha256 = "0fjk9ggcrn96blq0bm80739yj23s3gjjjsc0nxk4jk0v07i7nsgz"; + url = "mirror://xorg/individual/xserver/xorg-server-21.1.11.tar.xz"; + sha256 = "1vr6sc38sqipazsm61bcym2ggbgfgaamz7wf05mb31pvayyssg8x"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 175ee92208d8f..94755a1637ba3 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -332,7 +332,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { my $pcProvidesStr = ""; if (defined $pcProvides{$pkg}) { - $pcProvidesStr = join "", map { "\"" . $_ . "\" " } @{$pcProvides{$pkg}}; + $pcProvidesStr = join "", map { "\"" . $_ . "\" " } (sort @{$pcProvides{$pkg}}); } print OUT <<EOF diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 6a2cfd52886ee..1234f05b97232 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.4.tar.xz mirror://xorg/individual/util/makedepend-1.0.8.tar.xz mirror://xorg/individual/util/util-macros-1.20.0.tar.xz mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz -mirror://xorg/individual/xserver/xorg-server-21.1.9.tar.xz +mirror://xorg/individual/xserver/xorg-server-21.1.11.tar.xz diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 9bfc745ff51a4..6b2efa04a5c4e 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -3,6 +3,7 @@ , fetchurl , fontutil , lib +, libei , libGL , libGLU , libX11 @@ -45,11 +46,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "23.2.2"; + version = "23.2.4"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-n3wJONKkHpQf+gT5nDXl2yvNPuwDSv6NNdXIEKIusKg="; + sha256 = "sha256-qZ4Vm20NMwmLO2qyKoi/zs4jyLnQynLFNcVdywaBtGs="; }; depsBuildBuild = [ @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { buildInputs = [ egl-wayland libepoxy + libei fontutil libGL libGLU diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index e5238b90814fe..f61d5c1a02c56 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -44,5 +44,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3Plus; changelog = "https://github.com/jelmer/xandikos/blob/v${version}/NEWS"; maintainers = with maintainers; [ _0x4A6F ]; + mainProgram = "xandikos"; }; } diff --git a/pkgs/servers/xteve/default.nix b/pkgs/servers/xteve/default.nix index 47302d6e9d499..75591ddfbc147 100644 --- a/pkgs/servers/xteve/default.nix +++ b/pkgs/servers/xteve/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/xteve-project/xTeVe"; license = licenses.mit; maintainers = with maintainers; [ nrhelmi ]; + mainProgram = "xteve"; }; } diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 1b8ae2e317872..43ef277ffba38 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -1,27 +1,25 @@ { lib , buildNpmPackage , fetchFromGitHub -, python3 +, nodejs_18 , nixosTests , nix-update-script }: buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.33.2"; + version = "1.35.1"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-pRY4FOIJwsLSKYieN0D1esKdoUqx62NMFgiYXaXguJ0="; + hash = "sha256-ZOIV7PLBnPbisIStC+MNMZgf+Hw/+n4lONpgomRkZEE="; }; - npmDepsHash = "sha256-9bOFM8Ie0334H2L94ypgkMrB6zyVJ9YTvNnKeBJjOUI="; + npmDepsHash = "sha256-2WSuc9bmt5kK477c3AMOLFguvXZ2Nl+Qb67j5k7eL3o="; - nativeBuildInputs = [ - python3 - ]; + nodejs = nodejs_18; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; passthru.updateScript = nix-update-script { }; @@ -39,5 +37,6 @@ buildNpmPackage rec { ''; maintainers = with maintainers; [ sweber hexa ]; platforms = platforms.linux; + mainProgram = "zigbee2mqtt"; }; } |