diff options
Diffstat (limited to 'pkgs/servers')
360 files changed, 3195 insertions, 10259 deletions
diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/servers/akkoma/admin-fe/default.nix index 08da604bfbae..20ffd3054762 100644 --- a/pkgs/servers/akkoma/admin-fe/default.nix +++ b/pkgs/servers/akkoma/admin-fe/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Admin interface for Akkoma"; homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mvs ]; }; } diff --git a/pkgs/servers/akkoma/akkoma-fe/default.nix b/pkgs/servers/akkoma/akkoma-fe/default.nix index 7cce84c2ab4f..2e3dd149140d 100644 --- a/pkgs/servers/akkoma/akkoma-fe/default.nix +++ b/pkgs/servers/akkoma/akkoma-fe/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Frontend for Akkoma"; homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mvs ]; }; } diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index 7aea0eaa2771..e9a9fa63ebc5 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -228,7 +228,7 @@ beamPackages.mixRelease rec { meta = with lib; { description = "ActivityPub microblogging server"; homepage = "https://akkoma.social"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mvs ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/bililiverecorder/default.nix b/pkgs/servers/bililiverecorder/default.nix index e37c357089f0..222d20637c51 100644 --- a/pkgs/servers/bililiverecorder/default.nix +++ b/pkgs/servers/bililiverecorder/default.nix @@ -13,8 +13,8 @@ let aspnetcore_6_0 ]; - version = "2.10.1"; - hash = "sha256-7F/Hgt0p73QY5Sa3MRP//x7EpfcHCbnAPKDf00XzUbw="; + version = "2.11.1"; + hash = "sha256-GY6YRgebWeJtjAIm64Pf8wx6pUdZjbevNzKRdyPi1ow="; in stdenv.mkDerivation { diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 1116c5a36d6f..e52b0cb00bd4 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -64,7 +64,7 @@ buildGoModule rec { meta = with lib; { description = "Trezor address/account balance backend"; homepage = "https://github.com/trezor/blockbook"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mmahut _1000101 ]; platforms = platforms.unix; mainProgram = "blockbook"; diff --git a/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/servers/caddy/xcaddy/default.nix index 35d95269db57..930b3db4327b 100644 --- a/pkgs/servers/caddy/xcaddy/default.nix +++ b/pkgs/servers/caddy/xcaddy/default.nix @@ -29,6 +29,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/caddyserver/xcaddy"; description = "Build Caddy with plugins"; + mainProgram = "xcaddy"; license = licenses.asl20; maintainers = with maintainers; [ tjni emilylange ]; }; diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/servers/computing/slurm-spank-x11/default.nix index 4a5e2d52b2f5..278e1320fa0a 100644 --- a/pkgs/servers/computing/slurm-spank-x11/default.nix +++ b/pkgs/servers/computing/slurm-spank-x11/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/hautreux/slurm-spank-x11"; description = "Plugin for SLURM to allow for interactive X11 sessions"; + mainProgram = "slurm-spank-x11"; platforms = platforms.linux; license = licenses.gpl3Only; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 1046ead01ad0..c1507d4ea5cd 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.24"; + version = "9.18.25"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-cJ1zAjyRFd2tO6tltsjHmlkBltDRFPXQyiUz29Ut32Y="; + hash = "sha256-WkpwQyoz0Anw5unbsyiq56XidQfpjii/PAxrJQzLKrM="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index c5e3a9445557..994b584232ae 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -73,6 +73,7 @@ in buildGoModule rec { meta = with lib; { homepage = "https://coredns.io"; description = "A DNS server that runs middleware"; + mainProgram = "coredns"; license = licenses.asl20; maintainers = with maintainers; [ rushmorem rtreffer deltaevo ]; }; diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index b06dc704520a..98a1bf7cc8c8 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "DNS Loadbalancer"; + mainProgram = "dnsdist"; homepage = "https://dnsdist.org"; license = licenses.gpl2; maintainers = with maintainers; [ jojosch ]; diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index 4c379717ebe2..d4c664802aa3 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.4"; + version = "4.9.0"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-f0DIy8RlDQb+Sau6eZAuurs4Q2Pau9XO8nGWSgfDZFw="; + hash = "sha256-/h1UM8iERu1w2TFgXG7Dd9qZg5xOFRuQtxqiEb1u6pI="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 572d9a8e2b90..c1b03e1f667b 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { meta = with lib; { description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ ]; mainProgram = "documize"; homepage = "https://www.documize.com/"; diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix index 2a8233e5e0dc..3c111c0070cd 100644 --- a/pkgs/servers/etebase/default.nix +++ b/pkgs/servers/etebase/default.nix @@ -65,6 +65,7 @@ python.pkgs.buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/etesync/server"; description = "An Etebase (EteSync 2.0) server so you can run your own"; + mainProgram = "etebase-server"; changelog = "https://github.com/etesync/server/blob/${version}/ChangeLog.md"; license = licenses.agpl3Only; maintainers = with maintainers; [ felschr phaer ]; diff --git a/pkgs/servers/fastnetmon-advanced/default.nix b/pkgs/servers/fastnetmon-advanced/default.nix index 8f11df7048ad..2605bb0809c9 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.358"; + version = "2.0.362"; src = fetchurl { url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb"; - hash = "sha256-qL+LxePCZnSpbeeNANvI/f8ntNStHe02fSqMA+XKFng="; + hash = "sha256-9RKZyFntv2LsVZbN4sgb3C35kkDvM6kN7WpqdwwxnsE="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/filtron/default.nix b/pkgs/servers/filtron/default.nix index 768f3b204f2c..4b82e147cd4d 100644 --- a/pkgs/servers/filtron/default.nix +++ b/pkgs/servers/filtron/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { meta = with lib; { description = "Reverse HTTP proxy to filter requests by different rules."; homepage = "https://github.com/asciimoo/filtron"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = [ maintainers.dasj19 ]; platforms = platforms.linux; mainProgram = "filtron"; diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index eab68fb93dbf..a46a2503e802 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A minimal ftp server"; + mainProgram = "bftpd"; downloadPage = "http://bftpd.sf.net/download.html"; homepage = "http://bftpd.sf.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 601d14d342a1..133fe17ec088 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A very secure FTP daemon"; + mainProgram = "vsftpd"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index a59003ac7396..4dd4c7f7303e 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mbrubeck/agate"; changelog = "https://github.com/mbrubeck/agate/blob/master/CHANGELOG.md"; description = "Very simple server for the Gemini hypertext protocol"; + mainProgram = "agate"; longDescription = '' Agate is a server for the Gemini network protocol, built with the Rust programming language. Agate has very few features, and can only serve diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/servers/gemini/gmnisrv/default.nix index c13d4dda5056..c55da9cc5759 100644 --- a/pkgs/servers/gemini/gmnisrv/default.nix +++ b/pkgs/servers/gemini/gmnisrv/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple Gemini protocol server"; + mainProgram = "gmnisrv"; homepage = "https://git.sr.ht/~sircmpwn/gmnisrv"; license = licenses.gpl3Only; maintainers = with maintainers; [ bsima jb55 ]; diff --git a/pkgs/servers/gemini/molly-brown/default.nix b/pkgs/servers/gemini/molly-brown/default.nix index 351f54f21d49..f5529f038996 100644 --- a/pkgs/servers/gemini/molly-brown/default.nix +++ b/pkgs/servers/gemini/molly-brown/default.nix @@ -18,6 +18,7 @@ buildGoModule rec { meta = with lib; { description = "Full-featured Gemini server"; + mainProgram = "molly-brown"; homepage = "https://tildegit.org/solderpunk/molly-brown"; maintainers = with maintainers; [ ehmry ]; license = licenses.bsd2; diff --git a/pkgs/servers/gemini/stargazer/default.nix b/pkgs/servers/gemini/stargazer/default.nix index 5d346ec15a0c..a77f64a75a9d 100644 --- a/pkgs/servers/gemini/stargazer/default.nix +++ b/pkgs/servers/gemini/stargazer/default.nix @@ -41,6 +41,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A fast and easy to use Gemini server"; + mainProgram = "stargazer"; homepage = "https://sr.ht/~zethra/stargazer/"; license = licenses.agpl3Plus; changelog = "https://git.sr.ht/~zethra/stargazer/refs/${version}"; diff --git a/pkgs/servers/geospatial/mbtileserver/default.nix b/pkgs/servers/geospatial/mbtileserver/default.nix index 6b2831f87f1a..4a1495ad32d6 100644 --- a/pkgs/servers/geospatial/mbtileserver/default.nix +++ b/pkgs/servers/geospatial/mbtileserver/default.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "A simple Go-based server for map tiles stored in mbtiles format"; + mainProgram = "mbtileserver"; homepage = "https://github.com/consbio/mbtileserver"; changelog = "https://github.com/consbio/mbtileserver/blob/v${version}/CHANGELOG.md"; license = licenses.isc; diff --git a/pkgs/servers/geospatial/pg_featureserv/default.nix b/pkgs/servers/geospatial/pg_featureserv/default.nix index 04a226650ac5..df7bba48abe6 100644 --- a/pkgs/servers/geospatial/pg_featureserv/default.nix +++ b/pkgs/servers/geospatial/pg_featureserv/default.nix @@ -37,6 +37,7 @@ buildGoModule rec { meta = with lib; { description = "Lightweight RESTful Geospatial Feature Server for PostGIS in Go"; + mainProgram = "pg_featureserv"; homepage = "https://github.com/CrunchyData/pg_featureserv"; license = licenses.asl20; maintainers = teams.geospatial.members; diff --git a/pkgs/servers/geospatial/pg_tileserv/default.nix b/pkgs/servers/geospatial/pg_tileserv/default.nix index 38d59d57b30b..0173559576ef 100644 --- a/pkgs/servers/geospatial/pg_tileserv/default.nix +++ b/pkgs/servers/geospatial/pg_tileserv/default.nix @@ -39,6 +39,7 @@ buildGoModule rec { meta = with lib; { description = "A very thin PostGIS-only tile server in Go"; + mainProgram = "pg_tileserv"; homepage = "https://github.com/CrunchyData/pg_tileserv"; license = licenses.asl20; maintainers = teams.geospatial.members; diff --git a/pkgs/servers/geospatial/tegola/default.nix b/pkgs/servers/geospatial/tegola/default.nix index 3a3c40c2b20c..db6659172d05 100644 --- a/pkgs/servers/geospatial/tegola/default.nix +++ b/pkgs/servers/geospatial/tegola/default.nix @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://www.tegola.io/"; description = "Mapbox Vector Tile server"; + mainProgram = "tegola"; maintainers = with maintainers; [ ingenieroariel ]; license = licenses.mit; }; diff --git a/pkgs/servers/go-libp2p-daemon/default.nix b/pkgs/servers/go-libp2p-daemon/default.nix index 8ab0ff823117..9da79d04546f 100644 --- a/pkgs/servers/go-libp2p-daemon/default.nix +++ b/pkgs/servers/go-libp2p-daemon/default.nix @@ -16,6 +16,10 @@ buildGoModule rec { doCheck = false; meta = with lib; { + # Won't build with Go >1.20 because of outdated quic-go dependency and interface mismatches on update. + # https://github.com/libp2p/go-libp2p-daemon/issues/291 + broken = true; + description = "a libp2p-backed daemon wrapping the functionalities of go-libp2p for use in other languages"; homepage = "https://github.com/libp2p/go-libp2p-daemon"; license = licenses.mit; maintainers = with maintainers; [ fare ]; diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix index 0692fc1bff35..58e916d625f8 100644 --- a/pkgs/servers/gotosocial/default.nix +++ b/pkgs/servers/gotosocial/default.nix @@ -43,8 +43,18 @@ buildGoModule rec { # tests are working only on x86_64-linux doCheck = stdenv.isLinux && stdenv.isx86_64; - # flaky test - checkFlags = [ "-skip=^TestPage/minID,_maxID_and_limit_set$" ]; + checkFlags = + let + # flaky / broken tests + skippedTests = [ + # See: https://github.com/superseriousbusiness/gotosocial/issues/2651 + "TestPage/minID,_maxID_and_limit_set" + # See: https://github.com/superseriousbusiness/gotosocial/pull/2760. Stop skipping + # this test when fixed for go 1.21.8 and above + "TestValidationTestSuite/TestValidateEmail" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; passthru.tests.gotosocial = nixosTests.gotosocial; diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index 9e45cce09ed6..9e5e95315f62 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Share your terminal as a web application"; + mainProgram = "gotty"; homepage = "https://github.com/sorenisanerd/gotty"; maintainers = with maintainers; [ prusnak ]; license = licenses.mit; diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index b8ec1a92fe30..09e1a5fd95c1 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -30,5 +30,6 @@ buildGoModule rec { meta = { inherit (hasura-graphql-engine.meta) license homepage maintainers; description = "Hasura GraphQL Engine CLI"; + mainProgram = "hasura"; }; } diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 167e740f2181..40c55e9f5d78 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -51,6 +51,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Sandboxed Python execution environment for writing automation apps for Home Assistant"; + mainProgram = "appdaemon"; homepage = "https://github.com/AppDaemon/appdaemon"; changelog = "https://github.com/AppDaemon/appdaemon/blob/${version}/docs/HISTORY.md"; license = licenses.mit; diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index 32f17178fb33..b567cb0fe536 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -55,6 +55,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Command-line tool for Home Assistant"; + mainProgram = "hass-cli"; homepage = "https://github.com/home-assistant-ecosystem/home-assistant-cli"; changelog = "https://github.com/home-assistant-ecosystem/home-assistant-cli/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 78fbdbadeae2..ebed5dab1989 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 = "2024.3.0"; + version = "2024.3.3"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -2430,6 +2430,7 @@ "joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api "juicenet" = ps: with ps; [ + python-juicenet ]; "justnimbus" = ps: with ps; [ justnimbus @@ -4025,12 +4026,13 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + aioraven fnv-hash-fast psutil-home-assistant pyserial pyudev sqlalchemy - ]; # missing inputs: aioraven + ]; "rainmachine" = ps: with ps; [ regenmaschine ]; @@ -6395,6 +6397,7 @@ "radiotherm" "rainbird" "rainforest_eagle" + "rainforest_raven" "rainmachine" "random" "rapt_ble" diff --git a/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix b/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix index a4a514b2693c..d61d1850e13b 100644 --- a/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix +++ b/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix @@ -19,6 +19,6 @@ buildHomeAssistantComponent rec { "Smart TRV control integrates room-temp sensors, window/door sensors, weather forecasts, and ambient probes for efficient heating and calibration, enhancing energy savings and comfort."; homepage = "https://better-thermostat.org/"; maintainers = with maintainers; [ mguentner ]; - license = licenses.agpl3; + license = licenses.agpl3Only; }; } diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 81e708b637bc..fb558e343220 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -10,6 +10,10 @@ emporia_vue = callPackage ./emporia_vue {}; + epex_spot = callPackage ./epex_spot {}; + + frigate = callPackage ./frigate {}; + govee-lan = callPackage ./govee-lan {}; gpio = callPackage ./gpio {}; @@ -18,7 +22,13 @@ miele = callPackage ./miele {}; + moonraker = callPackage ./moonraker {}; + + omnik_inverter = callPackage ./omnik_inverter {}; + prometheus_sensor = callPackage ./prometheus_sensor {}; + sensi = callPackage ./sensi {}; + waste_collection_schedule = callPackage ./waste_collection_schedule {}; } diff --git a/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix b/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix new file mode 100644 index 000000000000..e655a0d788d9 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, buildHomeAssistantComponent +, beautifulsoup4 +}: + +buildHomeAssistantComponent rec { + owner = "mampfes"; + domain = "epex_spot"; + version = "2.3.5"; + + src = fetchFromGitHub { + owner = "mampfes"; + repo = "ha_epex_spot"; + rev = "refs/tags/${version}"; + hash = "sha256-WmPsFfQm8ChEr41XVgKi2BGwta5aKH9GDz4iIfTAPK4="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + ]; + + postPatch = '' + substituteInPlace custom_components/epex_spot/manifest.json --replace-fail 'bs4' 'beautifulsoup4' + ''; + + #skip phases without activity + dontConfigure = true; + doCheck = false; + dontBuild = true; + + meta = with lib; { + changelog = "https://github.com/mampfes/ha_epex_spot/releases/tag/${version}"; + description = "This component adds electricity prices from stock exchange EPEX Spot to Home Assistant"; + homepage = "https://github.com/mampfes/ha_epex_spot"; + maintainers = with maintainers; [ _9R ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/frigate/default.nix b/pkgs/servers/home-assistant/custom-components/frigate/default.nix new file mode 100644 index 000000000000..0065c94b6ebc --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/frigate/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchFromGitHub +, buildHomeAssistantComponent +, pytz +}: + +buildHomeAssistantComponent rec { + owner = "presto8"; + domain = "frigate"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "blakeblackshear"; + repo = "frigate-hass-integration"; + rev = "v${version}"; + hash = "sha256-6W9U0Q0wW36RsErvtFQo1sc1AF7js6MMHxgMQcDFexw="; + }; + + propagatedBuildInputs = [ + pytz + ]; + + dontBuild = true; + + meta = with lib; { + description = "Provides Home Assistant integration to interface with a separately running Frigate service"; + homepage = "https://github.com/blakeblackshear/frigate-hass-integration"; + changelog = "https://github.com/blakeblackshear/frigate-hass-integration/releases/tag/v${version}"; + maintainers = with maintainers; [ presto8 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/default.nix b/pkgs/servers/home-assistant/custom-components/moonraker/default.nix new file mode 100644 index 000000000000..660847ddd2e3 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/moonraker/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, buildHomeAssistantComponent +, moonraker-api +}: + +buildHomeAssistantComponent rec { + owner = "marcolivierarsenault"; + domain = "moonraker"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "marcolivierarsenault"; + repo = "moonraker-home-assistant"; + rev = "refs/tags/${version}"; + hash = "sha256-jxMi4hmSVBU9ztoHxFINoJo8klirfo6j7gWty7FXFkQ="; + }; + + propagatedBuildInputs = [ + moonraker-api + ]; + + #skip phases with nothing to do + dontConfigure = true; + dontBuild = true; + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/marcolivierarsenault/moonraker-home-assistant/releases/tag/${version}"; + description = "Custom integration for Moonraker and Klipper in Home Assistant"; + homepage = "https://github.com/marcolivierarsenault/moonraker-home-assistant"; + maintainers = with maintainers; [ _9R ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/omnik_inverter/default.nix b/pkgs/servers/home-assistant/custom-components/omnik_inverter/default.nix new file mode 100644 index 000000000000..a0a33f644bac --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/omnik_inverter/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchFromGitHub +, buildHomeAssistantComponent +, omnikinverter +}: + +buildHomeAssistantComponent rec { + owner = "robbinjanssen"; + domain = "omnik_inverter"; + version = "2.6.4"; + + src = fetchFromGitHub { + owner = "robbinjanssen"; + repo = "home-assistant-omnik-inverter"; + rev = "refs/tags/v${version}"; + hash = "sha256-O1NxT7u27xLydPqEqH72laU0tlYVrMPo0TwWIVNJ+0Q="; + }; + + propagatedBuildInputs = [ + omnikinverter + ]; + + doCheck = false; # no tests + + meta = with lib; { + changelog = "https://github.com/robbinjanssen/home-assistant-omnik-inverter/releases/tag/v${version}"; + description = "The Omnik Inverter integration will scrape data from an Omnik inverter connected to your local network"; + homepage = "https://github.com/robbinjanssen/home-assistant-omnik-inverter"; + maintainers = with maintainers; [ _9R ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/sensi/default.nix b/pkgs/servers/home-assistant/custom-components/sensi/default.nix new file mode 100644 index 000000000000..f8293518a51e --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/sensi/default.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, + websockets, +}: +buildHomeAssistantComponent rec { + owner = "iprak"; + domain = "sensi"; + version = "1.3.4"; + + src = fetchFromGitHub { + inherit owner; + repo = domain; + rev = "refs/tags/v${version}"; + hash = "sha256-NbK9h0nvcWNSwsc04YgjqKl+InijxftPJ3SLCQF/Hns="; + }; + + propagatedBuildInputs = [ + websockets + ]; + + meta = with lib; { + changelog = "https://github.com/iprak/sensi/releases/tag/v${version}"; + description = "HomeAssistant integration for Sensi thermostat"; + homepage = "https://github.com/iprak/sensi"; + maintainers = with maintainers; [ ivan ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/default.nix index 68ec48997d5d..1846339bd1e4 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mini-graph-card"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "kalkih"; repo = "mini-graph-card"; rev = "refs/tags/v${version}"; - hash = "sha256-o87c1tqZAQDlzxsxVdPZj1ei37nx7dVIZDzoQIUkmPk="; + hash = "sha256-cDgfAfS4U3ihN808KPcG+jEQR+S2Q1M5SPqOkkYwYkI="; }; - npmDepsHash = "sha256-4GgFlSpqGxY7TCgyovqMSoLUin46bKN8tUQTdjv1eog="; + npmDepsHash = "sha256-v+DqUAMNtDruR8E0sy7uAu3jndZUHkOw2xKtpY163R8="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1a41629d92c7..797b2ecae5f6 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -30,6 +30,28 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (self: super: { + aioaladdinconnect = super.aioaladdinconnect.overridePythonAttrs (oldAttrs: rec { + version = "0.1.58"; + src = fetchPypi { + pname = "AIOAladdinConnect"; + inherit version; + hash = "sha256-ymynaOKvnqqHIEuQc+5CagsaH5cHnQit8ileoUO6G+I="; + }; + }); + + aioelectricitymaps = super.aioelectricitymaps.overridePythonAttrs (oldAttrs: rec { + version = "0.4.0"; + src = fetchFromGitHub { + owner = "jpbede"; + repo = "aioelectricitymaps"; + rev = "refs/tags/v${version}"; + hash = "sha256-q06B40c0uvSuzH/3YCoxg4p9aNIOPrphsoESktF+B14="; + }; + nativeCheckInputs = with self; [ + aresponses + ]; + }); + aiogithubapi = super.aiogithubapi.overridePythonAttrs (oldAttrs: rec { version = "22.10.1"; src = fetchFromGitHub { @@ -112,12 +134,36 @@ let ]; }); + bluecurrent-api = super.bluecurrent-api.overridePythonAttrs (oldAttrs: rec { + version = "1.0.6"; + src = fetchPypi { + pname = "bluecurrent-api"; + inherit version; + hash = "sha256-XHVdtkiG0ff/OY8g+W5iur7OAyhhk1UGA+XUfB2L8/o="; + }; + build-system = oldAttrs.build-system ++ (with self; [ + pythonRelaxDepsHook + ]); + pythonRemoveDeps = [ "asyncio" ]; + }); + debugpy = super.debugpy.overridePythonAttrs (oldAttrs: { # tests are deadlocking too often # https://github.com/NixOS/nixpkgs/issues/262000 doCheck = false; }); + dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec { + version = "1.3.1"; + src = fetchFromGitHub { + owner = "ndokter"; + repo = "dsmr_parser"; + rev = "refs/tags/v${version}"; + hash = "sha256-PULrKRHrCuDFZcR+5ha0PjkN438QFgf2CrpYhKIqYTs="; + }; + doCheck = false; + }); + geojson = super.geojson.overridePythonAttrs (oldAttrs: rec { version = "2.5.0"; src = fetchFromGitHub { @@ -128,6 +174,19 @@ let doCheck = false; }); + gspread = super.gspread.overridePythonAttrs (oldAttrs: rec { + version = "5.12.4"; + src = fetchFromGitHub { + owner = "burnash"; + repo = "gspread"; + rev = "refs/tags/v${version}"; + hash = "sha256-i+QbnF0Y/kUMvt91Wzb8wseO/1rZn9xzeA5BWg1haks="; + }; + dependencies = with self; [ + requests + ]; + }); + ha-av = super.av.overridePythonAttrs (oldAttrs: rec { pname = "ha-av"; version = "10.1.1"; @@ -167,6 +226,25 @@ let }; }); + jaraco-collections = super.jaraco-collections.overridePythonAttrs (oldAttrs: rec { + version = "3.4.0"; + src = fetchPypi { + pname = "jaraco.collections"; + inherit version; + hash = "sha256-NE0Udp1xbnSWr4eaxxs8br3UarxkvZ7CHRUkg2WqOsk="; + }; + }); + + lmcloud = super.lmcloud.overridePythonAttrs (oldAttrs: rec { + version = "0.4.35"; + src = fetchFromGitHub { + owner = "zweckj"; + repo = "lmcloud"; + rev = "refs/tags/v${version}"; + hash = "sha256-TUve21yamtEmEceK/V1w7IZjnMgKConMfSY/GlqFpp8="; + }; + }); + lxml = super.lxml.overridePythonAttrs (oldAttrs: rec { version = "5.1.0"; pyprojet = true; @@ -283,6 +361,30 @@ let }; }); + python-roborock = super.python-roborock.overridePythonAttrs (oldAttrs: rec { + version = "0.40.0"; + src = fetchFromGitHub { + owner = "humbertogontijo"; + repo = "python-roborock"; + rev = "refs/tags/v${version}"; + hash = "sha256-H4xwgulNLs3R1Q5GhvQffpAZ1CWXZUJAja8BskW+YJk="; + }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "poetry-core==" "poetry-core>=" + ''; + }); + + pytibber = super.pytibber.overridePythonAttrs (oldAttrs: rec { + version = "0.28.2"; + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pyTibber"; + rev = "refs/tags/${version}"; + hash = "sha256-vi5f4V0nPb9K3nwdmwMDoNE85Or6haOWjMY4d/2Fj2s="; + }; + }); + pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { version = "1.0.1"; src = fetchFromGitHub { @@ -292,6 +394,16 @@ let }; }); + pyoctoprintapi = super.pyoctoprintapi.overridePythonAttrs (oldAttrs: rec { + version = "0.1.12"; + src = fetchFromGitHub { + owner = "rfleming71"; + repo = "pyoctoprintapi"; + rev = "refs/tags/v${version}"; + hash = "sha256-Jf/zYnBHVl3TYxFy9Chy6qNH/eCroZkmUOEWfd62RIo="; + }; + }); + pysnooz = super.pysnooz.overridePythonAttrs (oldAttrs: rec { version = "0.8.6"; src = fetchFromGitHub { @@ -312,6 +424,36 @@ let }; }); + pywaze = super.pywaze.overridePythonAttrs (oldAttrs: rec { + version = "0.5.1"; + src = fetchFromGitHub { + owner = "eifinger"; + repo = "pywaze"; + rev = "refs/tags/v${version}"; + hash = "sha256-r7ROEdgHdjXkveVUbuALHtwCX4IO0lwx9Zo3u6R9I58="; + }; + }); + + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "2.0.27"; + src = fetchFromGitHub { + owner = "sqlalchemy"; + repo = "sqlalchemy"; + rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-6R+A7rVq1olRXj1wMolHhEq418bpr5rsmH8RjxajmmQ="; + }; + }); + + tesla-powerwall = super.tesla-powerwall.overridePythonAttrs (oldAttrs: rec { + version = "0.5.1"; + src = fetchFromGitHub { + owner = "jrester"; + repo = "tesla_powerwall"; + rev = "refs/tags/v${version}"; + hash = "sha256-if/FCfxAB48WGXZOMvCtdSOW2FWO43OrlcHZbXIPmGE="; + }; + }); + versioningit = super.versioningit.overridePythonAttrs (oldAttrs: rec { version = "2.2.0"; src = fetchPypi { @@ -399,7 +541,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2024.3.0"; + hassVersion = "2024.3.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -417,13 +559,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-/DCE2IHdS+oImpzwIaFgXotAsoiPPbe3X3HG7RXbv9g="; + hash = "sha256-EutnNqENt1MTmbMe9vtSM+bM5PzvjsfMhpkwXdxWoeI="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-G9M1WV+s4zu9BY10RWmJ71ghafAOHMjnCR6BOlggguM="; + hash = "sha256-9i8snvozDKgvcEQfk9KTYfqHxQbDBluvArXYVVnNvnA="; }; nativeBuildInputs = with python.pkgs; [ @@ -436,6 +578,7 @@ in python.pkgs.buildPythonApplication rec { "bcrypt" "ciso8601" "cryptography" + "hass-nabucasa" "httpx" "orjson" "pyopenssl" @@ -482,6 +625,7 @@ in python.pkgs.buildPythonApplication rec { certifi ciso8601 cryptography + hass-nabucasa httpx home-assistant-bluetooth ifaddr diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 1795e8daa7ba..ec699e83164a 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 = "20240306.0"; + version = "20240307.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-eDuJC23PJbjaKC9TBCLg5ML3XR6admKrT9RVgfUQCw8="; + hash = "sha256-Wy5TzJ6+Dbkk51TMt9zGIfjI7gMrT4mK0IIRnl4byVE="; }; # 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 ddb576795880..d0c77694413c 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.2.28"; + version = "2024.3.12"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-EmnaYc+L1PHOv6M7odYDl+UBZkLJRtP86xPoqdbuOqU="; + hash = "sha256-9oMn5ogHcuopAnXgATu9xlBBBMeWJ9RT5C//xJ5FOBI="; }; postPatch = '' diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index ec529a683341..aa701e92b1ed 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -21,13 +21,13 @@ in buildGoModule rec { pname = "evcc"; - version = "0.124.9"; + version = "0.124.10"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-I5dotao26D2fn1opQunUOFtJ/vS19lGumN6A21jkBjA="; + hash = "sha256-NbM8Uev2qIIS6WriP7QnVUumF29rZSOCavouPkPmYpE="; }; vendorHash = "sha256-PZWMqv3R4Dq4cLtGNuvHCQ/GiYvlKJfSKEmBn0JYnb8="; diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 07f0c1dc4858..aa08f781121c 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "5.2.0-6"; + version = "5.5.0-13"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc37/${pname}-${version}.fc37.x86_64.rpm"; - hash = "sha256-AJKSj7t1yog3EXrzdods9Jk35ibEbegnXQzFcsr2N7I="; + hash = "sha256-yfdgsQu2w56apq5lyD0JcEkM9/EtlfdZQ9I5x1BBOcU="; }; unpackPhase = '' 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 bc7d0d667b63..5dd2fee040e9 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/latchset/mod_auth_mellon"; description = "An Apache module with a simple SAML 2.0 service provider"; + mainProgram = "mellon_create_metadata.sh"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ womfoo ]; diff --git a/pkgs/servers/http/apache-modules/mod_ca/default.nix b/pkgs/servers/http/apache-modules/mod_ca/default.nix index a357f0291ce5..4eb67f02c9a0 100644 --- a/pkgs/servers/http/apache-modules/mod_ca/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ca/default.nix @@ -1,33 +1,53 @@ -{ lib, stdenv, fetchurl, pkg-config, apacheHttpd, openssl, openldap, apr, aprutil }: +{ + apacheHttpd, + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + openldap, + openssl, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_ca"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "0gs66br3aig749rzifxn6j1rz2kps4hc4jppscly48lypgyygy8s"; + hash = "sha256-HGnhypOO0WOgRw9i9oqO4da131zAwBXOdrc9dypFjyk="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ apacheHttpd openssl openldap apr aprutil ]; + + buildInputs = [ + apacheHttpd + apr + aprutil + openldap + openssl + ]; # Note that configureFlags and installFlags are inherited by # the various submodules. # - configureFlags = [ - "--with-apxs=${apacheHttpd.dev}/bin/apxs" - ]; + configureFlags = [ "--with-apxs=${apacheHttpd.dev}/bin/apxs" ]; installFlags = [ "INCLUDEDIR=${placeholder "out"}/include" "LIBEXECDIR=${placeholder "out"}/modules" ]; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax CA service module"; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_ca/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; diff --git a/pkgs/servers/http/apache-modules/mod_crl/default.nix b/pkgs/servers/http/apache-modules/mod_crl/default.nix index a8025c153e05..340bc3a962ed 100644 --- a/pkgs/servers/http/apache-modules/mod_crl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_crl/default.nix @@ -1,23 +1,41 @@ -{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: - +{ + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + mod_ca, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_crl"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "1x186kp6fr8nwg0jlv5phagxndvw4rjqfga9mkibmn6dx252p61d"; + hash = "sha256-w8YIhed9J1uo5uwhfOVe5LhNLUvFZCgUO4FrHm344Rg="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mod_ca apr aprutil ]; + + buildInputs = [ + apr + aprutil + mod_ca + ]; + inherit (mod_ca) configureFlags installFlags; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax module for Certificate Revocation Lists"; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_crl/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; diff --git a/pkgs/servers/http/apache-modules/mod_csr/default.nix b/pkgs/servers/http/apache-modules/mod_csr/default.nix index c334939a1c53..0fb6d8d0a0ac 100644 --- a/pkgs/servers/http/apache-modules/mod_csr/default.nix +++ b/pkgs/servers/http/apache-modules/mod_csr/default.nix @@ -1,23 +1,41 @@ -{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: - +{ + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + mod_ca, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_csr"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "1p4jc0q40453wpvwqgnr1n007b4jxpkizzy3r4jygsxxgg4x9w7x"; + hash = "sha256-JVd5N5UnAxDwq6AavEHA0HsY2TRa+9RmLLJeRZbj+4Q="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mod_ca apr aprutil ]; + + buildInputs = [ + apr + aprutil + mod_ca + ]; + inherit (mod_ca) configureFlags installFlags; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax CA service module to handle Certificate Signing Requests"; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_csr/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index 4f4236e91b58..7f574f9fd962 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://0pointer.de/lennart/projects/mod_dnssd"; + homepage = "https://0pointer.de/lennart/projects/mod_dnssd"; description = "Provide Zeroconf support via DNS-SD using Avahi"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix index 116a9822291f..2f4b754cfc6b 100644 --- a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix @@ -1,22 +1,41 @@ -{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: +{ + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + mod_ca, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_ocsp"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "0wy5363m4gq1w08iny2b3sh925bnznlln88pr9lgj9vgbn8pqnrn"; + hash = "sha256-G+m/KdJCCTlSMeJzUnCRJkBEQ8cOQ+rJhA3NPrwh1Us="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mod_ca apr aprutil ]; + + buildInputs = [ + apr + aprutil + mod_ca + ]; + inherit (mod_ca) configureFlags installFlags; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax CA service modules of OCSP Online Certificate Validation"; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_csr/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix index bbb38eb969bd..c0a9e11a6ce5 100644 --- a/pkgs/servers/http/apache-modules/mod_perl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_perl/default.nix @@ -1,20 +1,33 @@ -{ stdenv, fetchurl, apacheHttpd, perl, nixosTests }: +{ + apacheHttpd, + directoryListingUpdater, + fetchurl, + lib, + nixosTests, + perl, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_perl"; - version = "2.0.12"; + version = "2.0.13"; src = fetchurl { url = "mirror://apache/perl/${pname}-${version}.tar.gz"; - sha256 = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk="; + sha256 = "sha256-reO+McRHuESIaf7N/KziWNbVh7jGx3PF8ic19w2C1to="; }; - buildInputs = [ apacheHttpd perl ]; + buildInputs = [ + apacheHttpd + perl + ]; + buildPhase = '' perl Makefile.PL \ MP_APXS=${apacheHttpd.dev}/bin/apxs make ''; + installPhase = '' mkdir -p $out make install DESTDIR=$out @@ -24,5 +37,22 @@ stdenv.mkDerivation rec { rm $out/nix -rf ''; - passthru.tests = nixosTests.mod_perl; + passthru = { + updateScript = directoryListingUpdater { + url = "https://archive.apache.org/dist/perl/"; + }; + tests = nixosTests.mod_perl; + }; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "Integration of perl with the Apache2 web server"; + homepage = "https://perl.apache.org/download/index.html"; + changelog = "https://github.com/apache/mod_perl/blob/trunk/Changes"; + license = licenses.asl20; + mainProgram = "mp2bug"; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + }; } diff --git a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix index 1632ed381b0e..0f8962b275c0 100644 --- a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix +++ b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix @@ -1,22 +1,41 @@ -{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: +{ + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + mod_ca, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_pkcs12"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "1jfyax3qrw9rpf2n0pn6iw4dpn2nl4j0i2a998n5p1mdmjx9ch73"; + hash = "sha256-k7BZ5d0WigyTmoUyFds7UCJ/tFBiUxd5pS4cVxmAI1g="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mod_ca apr aprutil ]; + + buildInputs = [ + apr + aprutil + mod_ca + ]; + inherit (mod_ca) configureFlags installFlags; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax CA service modules for PKCS#12 format files"; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_pkcs12/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index 2f427d170fdf..8b4fcd5d94be 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -1,13 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, apacheHttpd, python3, libintl }: +{ + apacheHttpd, + fetchFromGitHub, + lib, + libintl, + nix-update-script, + python3, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_python"; - version = "unstable-2022-10-18"; + version = "3.5.0.2"; src = fetchFromGitHub { owner = "grisha"; repo = pname; - rev = "d066b07564d2194839eceb535485eb1ba0c292d8"; + rev = "refs/tags/${version}"; hash = "sha256-EH8wrXqUAOFWyPKfysGeiIezgrVc789RYO4AHeSA6t4="; }; @@ -18,14 +26,23 @@ stdenv.mkDerivation rec { "BINDIR=$(out)/bin" ]; - passthru = { inherit apacheHttpd; }; + buildInputs = [ + apacheHttpd + python3 + ] ++ lib.optionals stdenv.isDarwin [ + libintl + ]; - buildInputs = [ apacheHttpd python3 ] - ++ lib.optional stdenv.isDarwin libintl; + passthru = { + inherit apacheHttpd; + updateScript = nix-update-script { }; + }; meta = with lib; { homepage = "https://modpython.org/"; + changelog = "https://github.com/grisha/mod_python/blob/${version}/NEWS"; description = "An Apache module that embeds the Python interpreter within the server"; + mainProgram = "mod_python"; platforms = platforms.unix; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/servers/http/apache-modules/mod_scep/default.nix b/pkgs/servers/http/apache-modules/mod_scep/default.nix index 68aeded93d00..40561e41ba88 100644 --- a/pkgs/servers/http/apache-modules/mod_scep/default.nix +++ b/pkgs/servers/http/apache-modules/mod_scep/default.nix @@ -1,22 +1,41 @@ -{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: +{ + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + mod_ca, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_scep"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "1imddqyi81l90valvndx9r0ywn32ggijrdfrjmbx8j1abaccagrc"; + hash = "sha256-HFPQ1A3ULtT2MduIQZS1drdQvCdZqJqKpOsJLEw67sI="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mod_ca apr aprutil ]; + + buildInputs = [ + apr + aprutil + mod_ca + ]; + inherit (mod_ca) configureFlags installFlags; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax CA service modules for SCEP (Automatic ceritifcate issue/renewal)"; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_scep/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; diff --git a/pkgs/servers/http/apache-modules/mod_spkac/default.nix b/pkgs/servers/http/apache-modules/mod_spkac/default.nix index 01ecae55b2ed..639045d18aff 100644 --- a/pkgs/servers/http/apache-modules/mod_spkac/default.nix +++ b/pkgs/servers/http/apache-modules/mod_spkac/default.nix @@ -1,22 +1,41 @@ -{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: +{ + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + mod_ca, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_spkac"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "0hpr58yazbi21m0sjn22a8ns4h81s4jlab9szcdw7j9w9jdc7j0h"; + hash = "sha256-J1pGz+/AD0IPwRPBA+wt9PgV9qnZEHX66VCBGqhf0b8="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mod_ca apr aprutil ]; + + buildInputs = [ + apr + aprutil + mod_ca + ]; + inherit (mod_ca) configureFlags installFlags; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax CA service module for handling the Netscape keygen requests. "; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_spkac/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix index 85ff5a97e636..f97ae6269011 100644 --- a/pkgs/servers/http/apache-modules/mod_tile/default.nix +++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix @@ -15,17 +15,18 @@ , iniparser , libmemcached , mapnik +, nix-update-script }: stdenv.mkDerivation rec { pname = "mod_tile"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "mod_tile"; - rev = "v${version}"; - hash = "sha256-jDuOcmKzZGU6L0aOfPKRGpDLbX0O9ueTufBy7Bd6KMU="; + rev = "refs/tags/v${version}"; + hash = "sha256-zXUwTG8cqAkY5MC1jAc2TtMgNMQPLc5nc22okVYP4ME="; }; nativeBuildInputs = [ @@ -64,6 +65,8 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/openstreetmap/mod_tile"; description = "Efficiently render and serve OpenStreetMap tiles using Apache and Mapnik"; diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix index d1d254c30b4b..1dbe4101dfe6 100644 --- a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix @@ -1,22 +1,46 @@ -{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: +{ + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + mod_ca, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_timestamp"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "1p18mgxx2ainfrc2wm27rl3lh6yl0ihx6snib60jnp694587bfwg"; + hash = "sha256-X49gJ1wQtwQT3GOZkluxdMIY2ZRpM9Y7DZln6Ag9DvM="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mod_ca apr aprutil ]; + + buildInputs = [ + apr + aprutil + mod_ca + ]; + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=int-conversion" + "-Wno-error=implicit-function-declaration" + ]); + inherit (mod_ca) configureFlags installFlags; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax CA service module for issuing signed timestamps"; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_timestamp/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index dd3648961439..72a456ab17f9 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A caching proxy specialized for Linux distribution files"; + mainProgram = "apt-cacher-ng"; homepage = "https://www.unix-ag.uni-kl.de/~bloch/acng/"; license = licenses.bsdOriginal; platforms = platforms.linux; diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index a0678299ac9c..0d55b3b6b588 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small and secure static webserver"; + mainProgram = "darkhttpd"; homepage = "https://unix4lyfe.org/darkhttpd/"; license = licenses.bsd3; maintainers = with maintainers; [ bobvanderlinden ]; diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix index a889f42f97aa..433a68d1a54a 100644 --- a/pkgs/servers/http/dufs/default.nix +++ b/pkgs/servers/http/dufs/default.nix @@ -42,6 +42,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A file server that supports static serving, uploading, searching, accessing control, webdav"; + mainProgram = "dufs"; homepage = "https://github.com/sigoden/dufs"; changelog = "https://github.com/sigoden/dufs/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 9a50c3063eb3..bb8a5e6a575c 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -193,6 +193,7 @@ buildBazelPackage { homepage = "https://envoyproxy.io"; changelog = "https://github.com/envoyproxy/envoy/releases/tag/v${version}"; description = "Cloud-native edge and service proxy"; + mainProgram = "envoy"; license = licenses.asl20; maintainers = with maintainers; [ lukegb ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/servers/http/hyp/default.nix index 7380a7a35191..76562311ac64 100644 --- a/pkgs/servers/http/hyp/default.nix +++ b/pkgs/servers/http/hyp/default.nix @@ -11,6 +11,7 @@ python3Packages.buildPythonPackage rec { meta = with lib; { description = "Hyperminimal https server"; + mainProgram = "hyp"; homepage = "https://github.com/rnhmjoj/hyp"; license = with licenses; [gpl3Plus mit]; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/servers/http/jetty/11.x.nix b/pkgs/servers/http/jetty/11.x.nix index b6a1d4599c1e..0744d76a32d1 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.19"; - hash = "sha256-CJpJSeIuFNiduCpiSoa52vYIncWn5/tMEgMVslJCcy0="; + version = "11.0.20"; + hash = "sha256-qOpIWht7Q8zjNRiHvpN5SBy+hOhddhgor5S55gWxHlQ="; } diff --git a/pkgs/servers/http/jetty/12.x.nix b/pkgs/servers/http/jetty/12.x.nix index 2115879b8a29..c3ad743310da 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.5"; - hash = "sha256-TnKoDgn59t0m5dBuMISQPpQrIFcTsv77V/KXJabpsyA="; + version = "12.0.7"; + hash = "sha256-n85MgRRWCaa7+KvGH1QyiQ03TFoAw7N2jPCJbmuGZNg="; } diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 45dadae35567..051f1c18e64e 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.74"; + version = "1.4.75"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-XAhzboMIj34Bl5cVnzBuiOxymr6XbcmPs77XG50+U7U="; + sha256 = "sha256-i3IcqTnTEq+qbvMdy9avtRYe04Wsgo5vzNTFt2vhidY="; }; postPatch = '' diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index 5aff026aa9ce..bc155d353b9f 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight high-performance multi-threaded web server"; + mainProgram = "lwan"; longDescription = "A lightweight and speedy web server with a low memory footprint (~500KiB for 10k idle connections), with minimal system calls and memory allocation. Lwan contains a hand-crafted HTTP request parser. Files are diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index d56f83366f9e..fdf5012514f6 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://mini-httpd.nongnu.org/"; description = "minimalistic high-performance web server"; + mainProgram = "httpd"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.peti ]; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 81e785e4ec73..e998675b5766 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -200,6 +200,7 @@ stdenv.mkDerivation { meta = if meta != null then meta else with lib; { description = "A reverse proxy and lightweight webserver"; + mainProgram = "nginx"; homepage = "http://nginx.org"; license = [ licenses.bsd2 ] ++ concatMap (m: m.meta.license) modules; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index ac631331fe71..978a1c854b38 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -77,7 +77,7 @@ let self = { meta = with lib; { description = "Validates Akamai v2 query string tokens"; homepage = "https://github.com/kaltura/nginx-akamai-token-validate-module"; - license = with licenses; [ agpl3 ]; + license = with licenses; [ agpl3Only ]; maintainers = with maintainers; [ ]; }; }; @@ -685,7 +685,7 @@ let self = { meta = with lib; { description = "Generates CDN tokens, either as a cookie or as a query string parameter"; homepage = "https://github.com/kaltura/nginx-secure-token-module"; - license = with licenses; [ agpl3 ]; + license = with licenses; [ agpl3Only ]; maintainers = with maintainers; [ ]; }; }; @@ -1004,7 +1004,7 @@ let self = { meta = with lib; { description = "VOD packager"; homepage = "https://github.com/kaltura/nginx-vod-module"; - license = with licenses; [ agpl3 ]; + license = with licenses; [ agpl3Only ]; maintainers = with maintainers; [ ]; }; }; diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index e4443d93be20..248b7ae1f3e7 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -14,12 +14,12 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256-mRAxqazTlNNPp54Q94TjhbCY+4Ul1Cw4VTCa1iuGOoY="; + hash = "sha256-xVPyiwKtSBchXC0FhNegeJlUej877zwNvrlAhSy6dJE="; }; vendorHash = "sha256-GdeZkKkENacc11FmEAFUfX9efInfhpv2Lz0/3CtixFQ="; @@ -121,6 +121,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://pomerium.io"; description = "Authenticating reverse proxy"; + mainProgram = "pomerium"; license = licenses.asl20; maintainers = with maintainers; [ lukegb devusb ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index bbac8b843b15..e7715881541a 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Pretty small HTTP server - a command-line tool to share files"; + mainProgram = "pshs"; homepage = "https://github.com/mgorny/pshs"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; diff --git a/pkgs/servers/http/quark/default.nix b/pkgs/servers/http/quark/default.nix index 629e61b43397..e178fe91a34a 100644 --- a/pkgs/servers/http/quark/default.nix +++ b/pkgs/servers/http/quark/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Extremely small and simple HTTP GET/HEAD-only web server for static content"; + mainProgram = "quark"; homepage = "http://tools.suckless.org/quark"; license = licenses.isc; maintainers = with maintainers; [ sikmir ]; diff --git a/pkgs/servers/http/ran/default.nix b/pkgs/servers/http/ran/default.nix index b5dcb136a31e..d22750fce3a0 100644 --- a/pkgs/servers/http/ran/default.nix +++ b/pkgs/servers/http/ran/default.nix @@ -40,6 +40,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/m3ng9i/ran"; description = "Ran is a simple web server for serving static files"; + mainProgram = "ran"; license = licenses.mit; maintainers = with maintainers; [ tomberek ]; }; diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix index 30027467a2ea..869f2c1f3b04 100644 --- a/pkgs/servers/http/redstore/default.nix +++ b/pkgs/servers/http/redstore/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "An HTTP interface to Redland RDF store"; + mainProgram = "redstore"; homepage = "https://www.aelius.com/njh/redstore/"; maintainers = [ lib.maintainers.raskin ]; platforms = with lib.platforms; diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix index c57cc816524d..3a4d9c8597c5 100644 --- a/pkgs/servers/http/spawn-fcgi/default.nix +++ b/pkgs/servers/http/spawn-fcgi/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://redmine.lighttpd.net/projects/spawn-fcgi"; description = "Provides an interface to external programs that support the FastCGI interface"; + mainProgram = "spawn-fcgi"; license = licenses.bsd3; maintainers = with maintainers; [ ]; platforms = with platforms; unix; diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index b03a285a1d02..591f180893b3 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -118,6 +118,7 @@ stdenv.mkDerivation rec { meta = { description = "A web server based on Nginx and has many advanced features, originated by Taobao"; + mainProgram = "nginx"; homepage = "https://tengine.taobao.org"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index fdbafa313dc7..710caedc094e 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -39,12 +39,12 @@ let in { tomcat9 = common { - version = "9.0.85"; - hash = "sha256-oYdNXi5yADqBJ25alSAASsoRPxNfyEEzQim2j20luh4="; + version = "9.0.87"; + hash = "sha256-2kgvuSIAhtvzceGAqgnGQCr48EhYZzTN7dSgjEjUzgI="; }; tomcat10 = common { - version = "10.1.18"; - hash = "sha256-baC0y9MUDmSocZot4ZwgvzkC0mShQqgWrFUq4hat4xE="; + version = "10.1.19"; + hash = "sha256-w+pp2SvPw+15Ko2AeUrNuFbxwF2KBF4XpxoliKDHULc="; }; } diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index d6c17dfb885f..c77428688da5 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -76,6 +76,7 @@ in stdenv.mkDerivation rec { meta = { description = "Dynamic web and application server, designed to run applications in multiple languages"; + mainProgram = "unitd"; homepage = "https://unit.nginx.org/"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix index 789382def1dc..d4ee36713e4c 100644 --- a/pkgs/servers/http/webhook/default.nix +++ b/pkgs/servers/http/webhook/default.nix @@ -25,6 +25,7 @@ buildGoModule rec { meta = with lib; { description = "Incoming webhook server that executes shell commands"; + mainProgram = "webhook"; homepage = "https://github.com/adnanh/webhook"; license = licenses.mit; maintainers = with maintainers; [ azahi ]; diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 7609c6ea5454..5e5a401d35d2 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A webserver for dynamic content written in Erlang."; + mainProgram = "yaws"; homepage = "https://github.com/erlyaws/yaws"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index e04716214fec..de375bb51841 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Server software for streaming multimedia"; + mainProgram = "icecast"; longDescription = '' Icecast is a streaming media server which currently supports diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix index ee759ac55ea1..c027e143b503 100644 --- a/pkgs/servers/identd/nullidentdmod/default.nix +++ b/pkgs/servers/identd/nullidentdmod/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple identd that just replies with a random string or customized userid"; + mainProgram = "nullidentdmod"; license = licenses.gpl2; homepage = "http://acidhub.click/NullidentdMod"; maintainers = with maintainers; [ das_j ]; diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index 1b219ee76cc3..510834ed282f 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Configurable Ident protocol server"; + mainProgram = "oidentd"; homepage = "https://oidentd.janikrabe.com/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index fd2b1758cc45..3187346c07eb 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.20.0"; + version = "3.23.0"; src = fetchFromGitHub { owner = pname; repo = pname; - hash = "sha256-qTOMoeTk9fGBSmioTRBUa3xRXOIW6OJj8aH0b/vP7dw="; + hash = "sha256-nsXIy/JpI7nDu40dUGPosMAOtFt/OzfSWyxD6JuKA+s="; rev = "v${version}"; }; - vendorHash = "sha256-SaxoFCEDniphr1ZZ5prE996CeHegB+a8dpGaMpjsrtQ="; + vendorHash = "sha256-KtqXhi8VwH1aZt/vLHuug5MJLchs0t4tqA7PIZUVPHQ="; nativeBuildInputs = [ pkg-config gobject-introspection ]; @@ -25,6 +25,7 @@ buildGoModule rec { meta = with lib; { description = "Fast and secure on-the-fly image processing server written in Go"; + mainProgram = "imgproxy"; homepage = "https://imgproxy.net"; changelog = "https://github.com/imgproxy/imgproxy/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index b68a4a3563d0..4b53b2de067f 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -47,6 +47,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/usbarmory/interlock"; description = "File encryption tool and an HSM frontend"; + mainProgram = "interlock"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/servers/invidious/default.nix b/pkgs/servers/invidious/default.nix index 3f5bb42a48f2..f659b75df443 100644 --- a/pkgs/servers/invidious/default.nix +++ b/pkgs/servers/invidious/default.nix @@ -107,8 +107,9 @@ crystal.buildCrystalPackage rec { meta = with lib; { description = "An open source alternative front-end to YouTube"; + mainProgram = "invidious"; homepage = "https://invidious.io/"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ infinisil sbruder ]; }; } diff --git a/pkgs/servers/irc/ergochat/default.nix b/pkgs/servers/irc/ergochat/default.nix index 5fa160dabeb1..ad8e3f44a809 100644 --- a/pkgs/servers/irc/ergochat/default.nix +++ b/pkgs/servers/irc/ergochat/default.nix @@ -18,6 +18,7 @@ buildGoModule rec { meta = { changelog = "https://github.com/ergochat/ergo/blob/v${version}/CHANGELOG.md"; description = "A modern IRC server (daemon/ircd) written in Go"; + mainProgram = "ergo"; homepage = "https://github.com/ergochat/ergo"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lassulus tv ]; diff --git a/pkgs/servers/irc/irccat/default.nix b/pkgs/servers/irc/irccat/default.nix index fb4b1c6c6bad..ce0ba4785ca7 100644 --- a/pkgs/servers/irc/irccat/default.nix +++ b/pkgs/servers/irc/irccat/default.nix @@ -16,6 +16,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/irccloud/irccat"; description = "Send events to IRC channels from scripts and other applications"; + mainProgram = "irccat"; maintainers = with maintainers; [ qyliss ]; license = licenses.gpl3Only; }; diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index 870a7836fe4f..3ec80a5075e0 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Next Generation IRC Daemon"; + mainProgram = "ngircd"; homepage = "https://ngircd.barton.de"; license = lib.licenses.gpl2; platforms = lib.platforms.all; diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/servers/irc/robustirc-bridge/default.nix index 985b17945d09..2d5c6ef1231b 100644 --- a/pkgs/servers/irc/robustirc-bridge/default.nix +++ b/pkgs/servers/irc/robustirc-bridge/default.nix @@ -21,6 +21,7 @@ buildGoModule rec { meta = with lib; { description = "Bridge to robustirc.net-IRC-Network"; + mainProgram = "robustirc-bridge"; homepage = "https://robustirc.net/"; license = licenses.bsd3; maintainers = [ maintainers.hax404 ]; diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 735db1f0b435..f7cedae7cf1c 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -69,6 +69,7 @@ buildPythonApplication rec { meta = with lib; { description = "A commenting server similar to Disqus"; + mainProgram = "isso"; homepage = "https://posativ.org/isso/"; license = licenses.mit; maintainers = with maintainers; [ fgaz ]; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index d82f7fd1c9ec..110e9c854535 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.1915"; + version = "0.21.2134"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-gqNtmLgAkanWjBIScic5yRCDeH0SF75H83xzpgdf0Xui1lylAPZEc6+FijoURXsDRH/H6taL3DFmO8tfzIpgGw=="; + hash = "sha512-kaqHa7uvlD0twqU6/ZEp1u2OZh4v4gPi2n4lh2SXewEDHo2ffX8K91UYzphKu0aQAfIq0abDu8TlSR8JwE89lQ=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/jackett/deps.nix b/pkgs/servers/jackett/deps.nix index 0690b30aeac2..02a599fe440d 100644 --- a/pkgs/servers/jackett/deps.nix +++ b/pkgs/servers/jackett/deps.nix @@ -2,7 +2,7 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AngleSharp"; version = "1.0.1"; sha256 = "04ivdl3fdhmv0i8n1nnmisbvksxay4axpkp5i4anjwl0571nnyva"; }) + (fetchNuGet { pname = "AngleSharp"; version = "1.1.2"; sha256 = "0rfild46lmqhxkfh6nhy7a9m8zzv25lj29riav5j6dmzw07l7wif"; }) (fetchNuGet { pname = "AngleSharp.Xml"; version = "1.0.0"; sha256 = "14xjzig65kslr4pfhl11313gcjci0s5jxm3z012606xagrc5fg2k"; }) (fetchNuGet { pname = "Autofac"; version = "6.5.0"; sha256 = "01sbsids0r7iv2w4wlncyfv410qphjd9w8y9jlaiyrh5y0v6y303"; }) (fetchNuGet { pname = "Autofac.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "02pvdn5yrdv44q0hb9qha92b9g4ycpbyymp1jd2z2z6lkwwwzhhp"; }) @@ -11,7 +11,7 @@ (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) (fetchNuGet { pname = "coverlet.msbuild"; version = "3.2.0"; sha256 = "0lyw70xgri3jqxzd06s077p8wymislljsyrsyn081pb0xc20vd00"; }) (fetchNuGet { pname = "DotNet4.SocksProxy"; version = "1.4.0.1"; sha256 = "1ig2a9ism041a6qrqkxa9xhvp19yxzcadlap5i1kz97f05a2msvb"; }) - (fetchNuGet { pname = "FlareSolverrSharp"; version = "3.0.6"; sha256 = "1zciw2vahakiarkgrf2d63kb6krf0jffrwh29hj8i0l7mv522dcn"; }) + (fetchNuGet { pname = "FlareSolverrSharp"; version = "3.0.7"; sha256 = "04nw6y4mm2l4zgcjby52am51ka461rfd7jj2s63587b2sd92kfnf"; }) (fetchNuGet { pname = "FluentAssertions"; version = "6.8.0"; sha256 = "102977059vkllkr1pg43kcmgvlf9jm1bpmdkq4hx4ljrn1wflwnb"; }) (fetchNuGet { pname = "Microsoft.AspNetCore"; version = "2.2.0"; sha256 = "0vsv7hcsmnsgqhs67zp207n7m9ix3dbwm1p2ch3dizkcdvz235f9"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Antiforgery"; version = "2.2.0"; sha256 = "026wjdwjx0lgccqv0xi5gxylxzgz5ifgxf25p5pqakgrhkz0a59l"; }) @@ -24,11 +24,11 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "2.2.0"; sha256 = "1rl94r8b0zq14f3dhfnvfjj1ivr81iw9zh5kdgs3zkdv0xc9x21j"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Cors"; version = "2.2.0"; sha256 = "0qskbz87i74kfbklxqfyqaccyba21kkx2lcdfa54kxj9r8daq7sc"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "2.2.0"; sha256 = "01lg2fx85b47ldgdrhs6clsivj35x54xwc9r5xk3f1v8rr3gycsv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "6.0.12"; sha256 = "1mym1ny1cwbd97k08azfawrxdhai1hi6i73jym2kswh215bph53k"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "6.0.28"; sha256 = "156abks0g130277dj5cqi81254a0znik6d9w8c4hvwlvvkhfjn4w"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection"; version = "2.2.0"; sha256 = "09lzbp084xxy1xxfbxpqdff8phv2pzd1n5v30xfm03hhl7a038gx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection"; version = "6.0.12"; sha256 = "1f0iyai3wh3aqyp3yrl7q2q7v3hx1rg566j3dc7fxj9qxg498ngf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection"; version = "6.0.28"; sha256 = "1p9p1rp9jhwiwcs9mp55i3xlax6yskb52ccy71h1x8ad6z9yznxq"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection.Abstractions"; version = "2.2.0"; sha256 = "1gi4hpssmrrdf5lm6idkhvqbfy12bx14976y4gbhmx9z8lxaqcfz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection.Abstractions"; version = "6.0.12"; sha256 = "1y8kz358j7qfi4z89f8qh5blqlxchb41mpzfpbmhv978xv87xx9n"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection.Abstractions"; version = "6.0.28"; sha256 = "064z1b8im4hcpmpllgv12aw61m8ys2x5cny60hizybspxw8jmv2i"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Diagnostics"; version = "2.2.0"; sha256 = "0hq5s2h0k2714352bdz2s3c3m6spkn4ckfw3pv9c4rmn6adbw9b1"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Diagnostics.Abstractions"; version = "2.2.0"; sha256 = "061cdhjh5w2f1frhimcgk68vx8p743jb9h4qik3lm1c734r0drm0"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.HostFiltering"; version = "2.2.0"; sha256 = "06wbgkbh24w9yxz6g8446l7nnjm3rdp1wklri710zqzr7zbfcx43"; }) @@ -48,7 +48,7 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; sha256 = "0xrlq8i61vzhzzy25n80m7wh2kn593rfaii3aqnxdsxsg6sfgnx1"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.HttpOverrides"; version = "2.2.0"; sha256 = "1pbmmczxilgrf4qyaql88dc3av7kaixb1r36358kil68gl3irjy6"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "2.2.0"; sha256 = "07cihb5sqkavg42nvircdwjp0b67mhrla97jgx285zdjphplg4h2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.12"; sha256 = "1c3s660zy8hrqkr22d5xnrkd32aam4wx5rlxjvwpdll7l0pqbakw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.28"; sha256 = "1d07kh3smgnphxpf4rhb1g7mbyni00gkh0lqkg6msfsm3f9mwb8w"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Localization"; version = "2.2.0"; sha256 = "08knc70cy7ycid5sbbbzy6my4b7ddj4j760k5xf1qnfb0njxhfh7"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc"; version = "2.2.0"; sha256 = "16jrikcywkd4r4jh551p8gxxw6hj3aizdzd5i7agb06gwpgqqv9c"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Abstractions"; version = "2.2.0"; sha256 = "09p447ipd19517vy8xx9ykvspn6b4fgbm2rskpmzyw41x9wz4k0b"; }) @@ -59,7 +59,7 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.DataAnnotations"; version = "2.2.0"; sha256 = "0vdhdjarh4az7g71gkvmhq6xpvwhh8si3sbrpdwb8p60i94cdyl6"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Formatters.Json"; version = "2.2.0"; sha256 = "0421fcf2z8a6z81ql123ili32wbr3x25zpq17xjf4s9fmsr0069a"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Localization"; version = "2.2.0"; sha256 = "0d27xirwsr3j7jacsrz6g2r4py35hgzjyy6ak6gkd07cm707wgc6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.12"; sha256 = "0hhcqyw526az30rn3cq8gq71wkbkd8yp29459j8r9k47asnjim3z"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.28"; sha256 = "0szissvyxcrh52j4bqvs9nbkwg4pi190ivr49vq31dxxf51mrppy"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor"; version = "2.2.0"; sha256 = "06fqg7rfyvfj3hdppkhy37ddjff2d6pg7khj6lccs9lwc732yr7q"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; version = "2.2.0"; sha256 = "04javqbzv7mkakqjl40j429giaagjj7hmwcljrgj8q1jknk0x9xc"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.RazorPages"; version = "2.2.0"; sha256 = "0zqyqfxzl3lkqfy9chd0ipani75q3109imlxrnhdfiwmxrd8xqbm"; }) @@ -138,7 +138,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.1"; sha256 = "1sgpwj0sa0ac7m5fnkb482mnch8fsv8hfbvk53c6lyh47s1xhdjg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.3"; sha256 = "1lpr7bwandzvppjsx75b1nsh52whlsq2ddgwv1ncwdbi595jrkpc"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.4"; sha256 = "0pjdbar2nkp7kcciys92pkld4kgpb362vdgp67lxqg1xkf0ajswn"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "2.2.0"; sha256 = "1npblvkb4f251277sm6mc1xj2yww6nzag0azfz772nzkbdpj1q19"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "2.2.0"; sha256 = "1g4wcd1kac0b4l0k4blr3qxpyfaf092cs2wnsjb3paj60rhr5agf"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "2.2.0"; sha256 = "1z5zzf43dw5xzvylkcgdi0q2mfhig6fmw2p5mxdxx916c5s007np"; }) @@ -187,8 +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 = "8.2.0"; sha256 = "0gxdi4sf60vpxsb258v592ykkq9a3dq2awayp99yy9djys8bglks"; }) - (fetchNuGet { pname = "Polly.Core"; version = "8.2.0"; sha256 = "00b4jbyiyslqvswy4j2lfw0rl0gq8m4v5fj2asb96i6l224bs7d3"; }) + (fetchNuGet { pname = "Polly"; version = "8.3.1"; sha256 = "19q7s493sv90879052pxfcbsk3bmxjg5688ya7l12964ddafiwsl"; }) + (fetchNuGet { pname = "Polly.Core"; version = "8.3.1"; sha256 = "15ylkqdcwpr76n0nfzpvd6s00ywjagn1ignyrcz9arwahrxpsm4b"; }) (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"; }) @@ -225,7 +225,6 @@ (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) @@ -261,15 +260,14 @@ (fetchNuGet { pname = "System.Security.Permissions"; version = "4.5.0"; sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "6.0.0"; sha256 = "1x4i8jlpfvca3bmsm0fjzq3zswpd2cszjq93v2nxaq3d57vv5npa"; }) + (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "6.0.1"; sha256 = "15nvnflqfrz2fsclcwgaq8r532x2fbv1ds3rck95l8psb7pgx1v5"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.5.0"; sha256 = "0srd5bva52n92i90wd88pzrqjsxnfgka3ilybwh7s6sf469y5s53"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.5.1"; sha256 = "0pya3ggs4pds6m8hgvjdljpacxwn3qx4bfq59nwi0qrs7zxihxhp"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.8"; sha256 = "0jhxpkx68fiih6p68s1bb0g45ab6qalkf1xl0g8bj4jdx7m5xhqi"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.9"; sha256 = "1fvqlicbn774da3b1zyfbnd7lw350sxq8hr7jcincv1fbz2yyf76"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.0"; sha256 = "05mpkdc7aigwadlcc9q3ash88hygkyz5pmkj360jj6c6ffhm91s8"; }) @@ -285,5 +283,5 @@ (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) (fetchNuGet { pname = "System.Xml.XPath.XDocument"; version = "4.3.0"; sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; }) - (fetchNuGet { pname = "YamlDotNet"; version = "13.0.1"; sha256 = "07shrvmc4ks6l8zsjjgmabyg5j6smqqlh3lvz9111d8wf3gfdcxy"; }) + (fetchNuGet { pname = "YamlDotNet"; version = "13.1.1"; sha256 = "1jwc9a4p08j0nhlw850v0x31bra13ans9zrklv4nh41zd2h4rszg"; }) ] diff --git a/pkgs/servers/jibri/default.nix b/pkgs/servers/jibri/default.nix index 1c97d18d98c3..0898ba34a16b 100644 --- a/pkgs/servers/jibri/default.nix +++ b/pkgs/servers/jibri/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "JItsi BRoadcasting Infrastructure"; + mainProgram = "jibri"; longDescription = '' Jibri provides services for recording or streaming a Jitsi Meet conference. It works by launching a Chrome instance rendered in a virtual framebuffer and capturing and diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix index b567c701ff7e..ddabc7c467ea 100644 --- a/pkgs/servers/jicofo/default.nix +++ b/pkgs/servers/jicofo/default.nix @@ -2,10 +2,10 @@ let pname = "jicofo"; - version = "1.0-1062"; + version = "1.0-1075"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "bU7h7kjs2yu1O+qhKcs6C63DH/omo/R1+Ms40KHkjHU="; + sha256 = "tRlCZGBWlonTkKMxr2Rry70ZqC3mjcbF627XEn2D2UI="; }; in stdenv.mkDerivation { @@ -36,6 +36,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A server side focus component used in Jitsi Meet conferences"; + mainProgram = "jicofo"; longDescription = '' JItsi COnference FOcus is a server side focus component used in Jitsi Meet conferences. ''; diff --git a/pkgs/servers/jigasi/default.nix b/pkgs/servers/jigasi/default.nix index d9f8ed60c09b..b1c646db5846 100644 --- a/pkgs/servers/jigasi/default.nix +++ b/pkgs/servers/jigasi/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A server-side application that allows regular SIP clients to join Jitsi Meet conferences"; + mainProgram = "jigasi"; longDescription = '' Jitsi Gateway to SIP: a server-side application that allows regular SIP clients to join Jitsi Meet conferences hosted by Jitsi Videobridge. ''; diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 06aa43e5fce3..9f25ec1fdc9c 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-67-gb2d4229f"; + version = "2.3-92-g64f9f34f"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "aE9QFzOJk3jMzNTEitcaBZVKpa1IJ55JahLfNDCujJI="; + sha256 = "fatkARiFgSEQl/caVUjJX77os7IZDIEZrxp0RLLaK/M="; }; in stdenv.mkDerivation { diff --git a/pkgs/servers/kanidm/Cargo.lock b/pkgs/servers/kanidm/Cargo.lock index c821e78af6df..5b6349079aba 100644 --- a/pkgs/servers/kanidm/Cargo.lock +++ b/pkgs/servers/kanidm/Cargo.lock @@ -221,8 +221,6 @@ dependencies = [ "memchr", "pin-project-lite", "tokio", - "zstd", - "zstd-safe", ] [[package]] @@ -644,7 +642,6 @@ version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ - "jobserver", "libc", ] @@ -2861,15 +2858,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - -[[package]] name = "jpeg-decoder" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6888,34 +6876,6 @@ dependencies = [ ] [[package]] -name = "zstd" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" -dependencies = [ - "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", -] - -[[package]] name = "zxcvbn" version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/servers/kanidm/default.nix b/pkgs/servers/kanidm/default.nix index 479b865f7a0f..39d86c36a9de 100644 --- a/pkgs/servers/kanidm/default.nix +++ b/pkgs/servers/kanidm/default.nix @@ -24,8 +24,9 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - hash = "sha256-UavMiHe91UrCZfmG6b+yhdduOY2eKMev9HSjtXq1Tlw="; + # Latest revision of 1.1.0-rc.16 stable branch + rev = "4c88d6b27c9b82ad5b2482bda140025d7068293f"; + hash = "sha256-tatZ56uIusNvAAGwJ731rfmHvheOtPXjPUxLuAPFxXs="; }; cargoLock = { diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index e1d15d55722c..b2067020ad9f 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2024-02-17"; + version = "unstable-2024-03-19"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "28f06a104bc0cfe3a7d36db343ade5a805b3e132"; - sha256 = "sha256-v2nv4g3dQTMbUKIrEJo8s66WRWXnSkWO8K+12fK/cZw="; + rev = "235b75be3c287a9fdcde54b347734bf6a8de2ade"; + sha256 = "sha256-PTdLhoKTlvrTljAvrK8q/JF9w50kKJHkWrzdPPaSfCc="; }; sourceRoot = "${src.name}/klippy"; @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Klipper 3D printer firmware"; + mainProgram = "klippy"; homepage = "https://github.com/KevinOConnor/klipper"; maintainers = with maintainers; [ lovesegfault zhaofengli cab404 ]; platforms = platforms.linux; diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/servers/kubemq-community/default.nix index 929b8460ae27..6fb080623a56 100644 --- a/pkgs/servers/kubemq-community/default.nix +++ b/pkgs/servers/kubemq-community/default.nix @@ -21,6 +21,7 @@ buildGoModule rec { meta = { homepage = "https://github.com/kubemq-io/kubemq-community"; description = "KubeMQ Community is the open-source version of KubeMQ, the Kubernetes native message broker."; + mainProgram = "kubemq-community"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ brianmcgee ]; }; diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/servers/kwakd/default.nix index e65e6b5ab59a..fc0cdc43831d 100644 --- a/pkgs/servers/kwakd/default.nix +++ b/pkgs/servers/kwakd/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A super small webserver that serves blank pages"; + mainProgram = "kwakd"; license = licenses.gpl2; maintainers = [ maintainers.nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/servers/ldap/apache-directory-server/default.nix b/pkgs/servers/ldap/apache-directory-server/default.nix index 7008e0e40d25..46e52ef1bce9 100644 --- a/pkgs/servers/ldap/apache-directory-server/default.nix +++ b/pkgs/servers/ldap/apache-directory-server/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An extensible and embeddable directory server"; + mainProgram = "apache-directory-server"; homepage = "https://directory.apache.org/apacheds/"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index f7a77c6962c5..246697c937f4 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Private front-end for Reddit"; + mainProgram = "libreddit"; homepage = "https://github.com/libreddit/libreddit"; changelog = "https://github.com/libreddit/libreddit/releases/tag/v${version}"; license = with licenses; [ agpl3Only ]; diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 9b2042113e15..f27f82aeff6a 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.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; rev = version; - sha256 = "sha256-xhQdEgW/FqzK/OBGq0QVZhEHj/hCnvfV7joEKUsk/Uk="; + sha256 = "sha256-8D2K0i6wJZfvhRIZKqGPS1tWzBOTPKzn1YMAhDIPkw0="; }; buildInputs = [ dovecot xapian icu64 sqlite ]; diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index a7f0a1986b99..b5446f7df190 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -3,11 +3,15 @@ , procps, killall , enableLDAP ? false, openldap , enableMySQL ? false, libmysqlclient, zlib +, enablePgSQL ? false, postgresql +, enableSqlite ? false, sqlite , enableAuthDovecot ? false, dovecot , enablePAM ? false, pam , enableSPF ? true, libspf2 , enableDMARC ? true, opendmarc , enableRedis ? false, hiredis +, enableJSON ? false, jansson +, enableSRS ? false, }: let perl' = perl.withPackages (p: with p; [ FileFcntlLock ]); @@ -26,11 +30,14 @@ in stdenv.mkDerivation rec { buildInputs = [ coreutils db openssl perl' pcre2 libxcrypt ] ++ lib.optional enableLDAP openldap ++ lib.optionals enableMySQL [ libmysqlclient zlib ] + ++ lib.optional enablePgSQL postgresql + ++ lib.optionals enableSqlite [ sqlite sqlite.dev zlib ] ++ lib.optional enableAuthDovecot dovecot ++ lib.optional enablePAM pam ++ lib.optional enableSPF libspf2 ++ lib.optional enableDMARC opendmarc - ++ lib.optional enableRedis hiredis; + ++ lib.optional enableRedis hiredis + ++ lib.optional enableJSON jansson; configurePhase = '' runHook preConfigure @@ -71,9 +78,25 @@ in stdenv.mkDerivation rec { s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -lm -lpthread -lz: s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient.dev}/include/mysql/: ''} + ${lib.optionalString enablePgSQL '' + s:^# \(LOOKUP_PGSQL=yes\)$:\1: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lpq -L${postgresql.lib}/lib: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lpq -L${postgresql.lib}/lib: + s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${postgresql}/include: + ''} + ${lib.optionalString enableSqlite '' + s:^# \(LOOKUP_SQLITE=yes\)$:\1: + s:^# \(LOOKUP_SQLITE_PC=sqlite3\)$:\1: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lsqlite3 -L${sqlite}/lib: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lsqlite3 -L${sqlite}/lib -lssl -lm -lpthread -lz: + s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${sqlite.dev}/include: + ''} ${lib.optionalString enableAuthDovecot '' s:^# \(AUTH_DOVECOT\)=.*:\1=yes: ''} + ${lib.optionalString enableSRS '' + s:^# \(SUPPORT_SRS\)=.*:\1=yes: + ''} ${lib.optionalString enablePAM '' s:^# \(SUPPORT_PAM\)=.*:\1=yes: s:^\(EXTRALIBS_EXIM\)=\(.*\):\1=\2 -lpam: @@ -94,6 +117,13 @@ in stdenv.mkDerivation rec { s:^\(LOOKUP_INCLUDE\)=\(.*\):\1=\2 -I${hiredis}/include/hiredis/: s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${hiredis}/include/hiredis/: ''} + ${lib.optionalString enableJSON '' + s:^# \(LOOKUP_JSON=yes\)$:\1: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -ljansson -L${jansson}/lib: + s:^# \(LOOKUP_LIBS\)=.*:\1=-ljansson -L${jansson}/lib: + s:^\(LOOKUP_INCLUDE\)=\(.*\):\1=\2 -I${jansson}/include: + s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${jansson}/include: + ''} #/^\s*#.*/d #/^\s*$/d ' < src/EDITME > Local/Makefile diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index d4c358ec47f5..ef20fa92f385 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -17,6 +17,7 @@ buildGoPackage rec { meta = with lib; { description = "Web and API based SMTP testing"; + mainProgram = "MailHog"; homepage = "https://github.com/mailhog/MailHog"; changelog = "https://github.com/mailhog/MailHog/releases/tag/v${version}"; maintainers = with maintainers; [ disassembler jojosch ]; diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index d347f434ab50..dc5ef230c235 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://gitlab.com/mailman/mailman-web"; description = "Django project for Mailman 3 web interface"; + mainProgram = "mailman-web"; license = licenses.gpl3Plus; maintainers = with maintainers; [ qyliss m1cr0man ]; }; diff --git a/pkgs/servers/mail/mox/default.nix b/pkgs/servers/mail/mox/default.nix index 8ee46f7faeba..cb266f89bc4d 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.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "mjl-"; repo = "mox"; rev = "v${version}"; - hash = "sha256-QDDNWGuDWxUBdoYEHQC7Ug0i8NyaqqGVsmFtTWfiM0M="; + hash = "sha256-BigxFlMkagw82Lkz1xMMSwAJyfSdSbeQr6G6rCaomNg="; }; # set the version during buildtime @@ -27,6 +27,7 @@ buildGoModule rec { meta = { description = "Modern full-featured open source secure mail server for low-maintenance self-hosted email"; + mainProgram = "mox"; homepage = "https://github.com/mjl-/mox"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dit7ya ]; diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix index d36d26b5d520..da7ba498f243 100644 --- a/pkgs/servers/mail/popa3d/default.nix +++ b/pkgs/servers/mail/popa3d/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.openwall.com/popa3d/"; description = "Tiny POP3 daemon with security as the primary goal"; + mainProgram = "popa3d"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index e40c30ff79fa..6ebd41d850ac 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.6"; + version = "3.9.0"; src = fetchurl { url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz"; - hash = "sha256-S24XyCbMQ4zDAWqcClXqfnfGy6+6fdVyQdgbaQsOl3Q="; + hash = "sha256-VvXkIOfCVFWk6WwZtnL4D5oKNftb7MkkfJ49XcxhfzQ="; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix index 800a69e95096..d70cde6b9da2 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -29,6 +29,7 @@ perlPackages.buildPerlPackage rec { homepage = "http://jimsun.linxnet.com/postfix_contrib.html"; maintainers = with lib.maintainers; [ schneefux ]; description = "Postfix activity overview"; + mainProgram = "pflogsumm"; license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch b/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch index d93eaf0aaa0d..69dcee41d418 100644 --- a/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch +++ b/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch @@ -8,7 +8,7 @@ diff -ru3 postfix-3.0.3/conf/postfix-script postfix-3.0.3-new/conf/postfix-scrip -# If this is a secondary instance, don't touch shared files. - -instances=`test ! -f $def_config_directory/main.cf || -- $command_directory/postconf -c $def_config_directory \ +- $command_directory/postconf -qc $def_config_directory \ - -h multi_instance_directories | sed 's/,/ /'` || { - $FATAL cannot execute $command_directory/postconf! - exit 1 diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix index 99e3dbfdc435..c31fadc8ecbd 100644 --- a/pkgs/servers/mail/postsrsd/default.nix +++ b/pkgs/servers/mail/postsrsd/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/roehling/postsrsd"; description = "Postfix Sender Rewriting Scheme daemon"; + mainProgram = "postsrsd"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/servers/mail/smtprelay/default.nix b/pkgs/servers/mail/smtprelay/default.nix index 8142dc76b98b..688c415caf26 100644 --- a/pkgs/servers/mail/smtprelay/default.nix +++ b/pkgs/servers/mail/smtprelay/default.nix @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/decke/smtprelay"; description = "Simple Golang SMTP relay/proxy server"; + mainProgram = "smtprelay"; changelog = "https://github.com/decke/smtprelay/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ juliusrickert ]; diff --git a/pkgs/servers/matrix-hebbot/default.nix b/pkgs/servers/matrix-hebbot/default.nix index 59e4ca1b1916..e8c0f7076a17 100644 --- a/pkgs/servers/matrix-hebbot/default.nix +++ b/pkgs/servers/matrix-hebbot/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { description = "A Matrix bot which can generate \"This Week in X\" like blog posts "; homepage = "https://github.com/haecker-felix/hebbot"; changelog = "https://github.com/haecker-felix/hebbot/releases/tag/v${version}"; - license = with licenses; [ agpl3 ]; + license = with licenses; [ agpl3Only ]; mainProgram = "hebbot"; maintainers = with maintainers; [ a-kenji ]; }; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 2370dbc94349..81c87f307e37 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchPypi , python3 , openssl , libiconv @@ -12,25 +13,39 @@ }: let - plugins = python3.pkgs.callPackage ./plugins { }; + python = python3.override { + packageOverrides = self: super: { + netaddr = super.netaddr.overridePythonAttrs (oldAttrs: rec { + version = "1.0.0"; + + src = fetchPypi { + pname = "netaddr"; + inherit version; + hash = "sha256-6wRrVTVOelv4AcBJAq6SO9aZGQJC2JsJnolvmycktNM="; + }; + }); + }; + }; + + plugins = python.pkgs.callPackage ./plugins { }; tools = callPackage ./tools { }; in -python3.pkgs.buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.102.0"; + version = "1.103.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-RJsuvNqqUiiVw6uKkG81rqo1ZoszUHK4UIJh8MReFqo="; + hash = "sha256-NwHX4pOM2PUf2MldaPTOzP9gOcTmILxM1Sx2HPkLBcw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-PoPJnSZ9QpcpVbqDMlqwgAqu0K8oornpihErLHXb6Gc="; + hash = "sha256-AyV0JPPJkJ4jdaw0FUXPqGF3Qkce1+RK70FkXAw+bLA="; }; postPatch = '' @@ -48,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { sed -i 's/Pillow = ".*"/Pillow = ">=5.4.0"/' pyproject.toml ''; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python.pkgs; [ poetry-core rustPlatform.cargoSetupHook setuptools-rust @@ -62,7 +77,7 @@ python3.pkgs.buildPythonApplication rec { libiconv ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ attrs bcrypt bleach @@ -95,7 +110,7 @@ python3.pkgs.buildPythonApplication rec { ] ++ twisted.optional-dependencies.tls; - passthru.optional-dependencies = with python3.pkgs; { + passthru.optional-dependencies = with python.pkgs; { postgres = if isPyPy then [ psycopg2cffi ] else [ @@ -133,7 +148,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = [ openssl - ] ++ (with python3.pkgs; [ + ] ++ (with python.pkgs; [ mock parameterized ]) @@ -154,15 +169,14 @@ python3.pkgs.buildPythonApplication rec { NIX_BUILD_CORES=4 fi - PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests + PYTHONPATH=".:$PYTHONPATH" ${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests runHook postCheck ''; passthru = { tests = { inherit (nixosTests) matrix-synapse matrix-synapse-workers; }; - inherit plugins tools; - python = python3; + inherit plugins tools python; }; meta = with lib; { diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 753118528bdd..3d2e4058d061 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Node.js IRC bridge for Matrix"; + mainProgram = "matrix-appservice-irc"; maintainers = with maintainers; [ rhysmdnz ]; homepage = "https://github.com/matrix-org/matrix-appservice-irc"; license = licenses.asl20; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index bbfc36ad4268..e7928dab5417 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -49,6 +49,7 @@ mkYarnPackage rec { meta = with lib; { description = "A Matrix <--> Slack bridge"; + mainProgram = "matrix-appservice-slack"; maintainers = with maintainers; [ beardhatcode chvp ]; license = licenses.asl20; }; diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix index f784036075c8..e89e4e1e682b 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix @@ -72,10 +72,16 @@ mkYarnPackage rec { "$out/libexec/matrix-hookshot/deps/matrix-hookshot/lib/App/BridgeApp.js" ''; + postFixup = '' + # Scrub reference to rustc + rm $out/libexec/matrix-hookshot/deps/matrix-hookshot/target/.rustc_info.json + ''; + doDist = false; meta = with lib; { description = "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA"; + mainProgram = "matrix-hookshot"; maintainers = with maintainers; [ chvp ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix index 8999c6982577..9033049c33bd 100644 --- a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix +++ b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Synapse storage provider to fetch and store media in Amazon S3"; + mainProgram = "s3_media_upload"; homepage = "https://github.com/matrix-org/synapse-s3-storage-provider"; changelog = "https://github.com/matrix-org/synapse-s3-storage-provider/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/servers/matrix-synapse/tools/synadm.nix index e69319477493..6d24ea59abcf 100644 --- a/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -34,6 +34,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Command line admin tool for Synapse"; + mainProgram = "synadm"; longDescription = '' A CLI tool to help admins of Matrix Synapse homeservers conveniently issue commands available via its admin API's diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index a383bc3650b9..ca152079e073 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -77,7 +77,7 @@ buildGoModule rec { meta = with lib; { 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 ]; + license = with licenses; [ agpl3Only asl20 ]; maintainers = with maintainers; [ ryantm numinit kranzes mgdelacroix ]; mainProgram = "mattermost"; }; diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index c66d5557d76f..9a3b5b6357f7 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Minimal IRC server bridge to Mattermost"; + mainProgram = "matterircd"; homepage = "https://github.com/42wim/matterircd"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index f45b687acaed..26f5156e31ab 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mautrix-signal"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; rev = "v${version}"; - hash = "sha256-qlWp9SnS8dWZNAua9HOyOrQwBXQFaaWB3eP9aCGlDFc="; + hash = "sha256-juem0enwwY5HOgci9Am2xcAsJK0F48DtpU7J/Osqd9k="; }; buildInputs = [ @@ -18,7 +18,7 @@ buildGoModule rec { libsignal-ffi ]; - vendorHash = "sha256-sa6M9rMrI7fa8T4su3yfJID4AYB6YnlfrVBM6cPQLvY="; + vendorHash = "sha256-CnuRzDiUVJt4PrU8u7UmT1ejrdpsohmDv8M0qfFb0Ac="; doCheck = false; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 3423985f6584..76ac8bfd5712 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.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-bn9nUTtpaEkzF2SEdCcKG27WQDL7xsgfgA/72wElQqA="; + hash = "sha256-foYmHJk25SOCv+o6eiJTeD2VP8vi6PpeeDm845Lq43Y="; }; buildInputs = [ olm ]; - vendorHash = "sha256-PDUSjza+0SDanQwKYQRuLzsiA/sHjRnG0xpzlzhkm+U="; + vendorHash = "sha256-2xHgGBVFzEnOFiZrg1ClgjUrzKVD3CLxPsvRO2iQBC4="; doCheck = false; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 6ad1343645e8..71740cf41908 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.23"; + version = "1.6.24"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-hbAzSQT0QClqaFzP2nXw9FF7+JIquO+m0MSzySw1TUw="; + sha256 = "sha256-+QXsCzhDKoqAvM0E6Q501ey6mLj2R+XWHku1QIWnpCI="; }; configureFlags = [ diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix index e26b13bb25ab..3efaae630198 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/servers/mesos-dns/default.nix @@ -18,4 +18,5 @@ buildGoPackage rec { }; goDeps = ./deps.nix; + meta.mainProgram = "mesos-dns"; } diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 42d776d79705..d35d0e6c259d 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.48.7"; + version = "0.49.1"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-W0FP9c6vMLCfK93eaXPeF1mkBAI2KMjQ9EpGx7hbRg8="; + hash = "sha256-oyh25h59udfwuLqZJ4ngGYL+tup9GEWgegcTNb0PeHE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index f1553889e4de..e36a1662907d 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-03-07T00-43-48Z"; + version = "2024-03-10T02-53-48Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-W82479M4Bgq1ERpiAR6Zc5YDr8vADOtQThV6lSlDuTs="; + hash = "sha256-XcJm5FcX0NNjjY/WDQyR2RF8J3GkqEvpAhFDZj9ztks="; }; - vendorHash = "sha256-VHokz58pSZd2Tt3hG8MgpeilEMFGjOZ/y6YKt9Fe5xw="; + vendorHash = "sha256-0W2D5CQkrZMPlehvmExeQ6txwEyRe3XZl0Bv0Ww5COs="; doCheck = false; diff --git a/pkgs/servers/minio/legacy_fs.nix b/pkgs/servers/minio/legacy_fs.nix index 170001b3ae6e..3cf4bed41eba 100644 --- a/pkgs/servers/minio/legacy_fs.nix +++ b/pkgs/servers/minio/legacy_fs.nix @@ -43,6 +43,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://www.minio.io/"; description = "An S3-compatible object storage server"; + mainProgram = "minio"; changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}"; maintainers = with maintainers; [ eelco bachp ]; license = licenses.agpl3Plus; diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix index d6a25b3675ff..a02daa179833 100644 --- a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix +++ b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix @@ -13,4 +13,5 @@ mkDerivation { executableHaskellDepends = [ base bytestring network ]; description = "accepts TCP connections and echoes the client's IP address back to it"; license = lib.licenses.lgpl3; + mainProgram = "client-ip-echo"; } diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 8d7a8f563ea8..48003cae4693 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { description = "BGP implemented in Go"; + mainProgram = "gobgpd"; homepage = "https://osrg.github.io/gobgp/"; changelog = "https://github.com/osrg/gobgp/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 76e20469faa0..b663df8809a8 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -77,6 +77,7 @@ buildGoModule rec { meta = { description = "Navidrome Music Server and Streamer compatible with Subsonic/Airsonic"; + mainProgram = "navidrome"; homepage = "https://www.navidrome.org/"; license = lib.licenses.gpl3Only; sourceProvenance = with lib.sourceTypes; [ fromSource ]; diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index cd9e12377f5a..35db446c70a2 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open-source streaming video service with sub-second latency"; + mainProgram = "OvenMediaEngine"; homepage = "https://ovenmediaengine.com"; license = licenses.agpl3Only; maintainers = with maintainers; [ lukegb ]; diff --git a/pkgs/servers/misc/podgrab/default.nix b/pkgs/servers/misc/podgrab/default.nix index 225421b973d6..4e5846faba56 100644 --- a/pkgs/servers/misc/podgrab/default.nix +++ b/pkgs/servers/misc/podgrab/default.nix @@ -23,6 +23,7 @@ buildGoModule rec { meta = with lib; { description = "A self-hosted podcast manager to download episodes as soon as they become live"; + mainProgram = "podgrab"; homepage = "https://github.com/akhilrex/podgrab"; license = licenses.gpl3Only; maintainers = with maintainers; [ ambroisie ]; diff --git a/pkgs/servers/misc/qremotecontrol-server/default.nix b/pkgs/servers/misc/qremotecontrol-server/default.nix index 31d66070d42f..5fba2c0a382f 100644 --- a/pkgs/servers/misc/qremotecontrol-server/default.nix +++ b/pkgs/servers/misc/qremotecontrol-server/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ fgaz ]; homepage = "https://sourceforge.net/projects/qrc/"; description = "Remote control your desktop from your mobile"; + mainProgram = "qremotecontrol-server"; longDescription = '' With QRemoteControl installed on your desktop you can easily control your computer via WiFi from your mobile. By using the touch pad of your diff --git a/pkgs/servers/misc/shell2http/default.nix b/pkgs/servers/misc/shell2http/default.nix index 994df898215f..ae1a6840f496 100644 --- a/pkgs/servers/misc/shell2http/default.nix +++ b/pkgs/servers/misc/shell2http/default.nix @@ -43,6 +43,7 @@ buildGoModule rec { meta = with lib; { description = "Executing shell commands via HTTP server"; + mainProgram = "shell2http"; homepage = "https://github.com/msoap/shell2http"; changelog = "https://github.com/msoap/shell2http/releases/tag/${src.rev}"; license = licenses.mit; diff --git a/pkgs/servers/misc/starcharts/default.nix b/pkgs/servers/misc/starcharts/default.nix index 05245213b5b5..c866f18b2c6a 100644 --- a/pkgs/servers/misc/starcharts/default.nix +++ b/pkgs/servers/misc/starcharts/default.nix @@ -26,6 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Plot your repository stars over time"; + mainProgram = "starcharts"; homepage = "https://github.com/caarlos0/starcharts"; changelog = "https://github.com/caarlos0/starcharts/releases/tag/${src.rev}"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/alerta/client.nix b/pkgs/servers/monitoring/alerta/client.nix index d8de093c2765..d3de741e53bc 100644 --- a/pkgs/servers/monitoring/alerta/client.nix +++ b/pkgs/servers/monitoring/alerta/client.nix @@ -23,6 +23,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://alerta.io"; description = "Alerta Monitoring System command-line interface"; + mainProgram = "alerta"; license = licenses.asl20; }; } diff --git a/pkgs/servers/monitoring/alerta/default.nix b/pkgs/servers/monitoring/alerta/default.nix index e69599498182..f84bb3302eca 100644 --- a/pkgs/servers/monitoring/alerta/default.nix +++ b/pkgs/servers/monitoring/alerta/default.nix @@ -43,6 +43,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://alerta.io"; description = "Alerta Monitoring System server"; + mainProgram = "alertad"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix index 7b06eed72ce6..fb5f524c0afe 100644 --- a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix +++ b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Alertmanager IRC Relay is a bot relaying Prometheus alerts to IRC"; + mainProgram = "alertmanager-irc-relay"; longDescription = '' Alertmanager IRC Relay is a bot relaying Prometheus alerts to IRC. Alerts are received from Prometheus using Webhooks and are relayed to an diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 409ae5f37562..dc0d890a429f 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -24,6 +24,7 @@ buildGoModule rec { meta = with lib; { description = "Analyzes resource usage and performance characteristics of running docker containers"; + mainProgram = "cadvisor"; homepage = "https://github.com/google/cadvisor"; license = licenses.asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index d13c48544898..ad9f7fc80c44 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -25,6 +25,7 @@ buildGoModule rec { meta = with lib; { description = "DigitalOcean droplet system metrics agent"; + mainProgram = "do-agent"; longDescription = '' do-agent is a program provided by DigitalOcean that collects system metrics from a DigitalOcean Droplet (on which the program runs) and sends diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 622147f92f97..0597eaa75351 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.40.2"; + version = "0.40.3"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-muSgFBg+/XWx2f9EGYYLQ0wUzZ7AxEC2F19A5Qs5cgw="; + hash = "sha256-oezfeUW+CVwqe8T3pEkLU1vxI1dntMQ6cvE9AqxKtR8="; }; - vendorHash = "sha256-ekFl+aSmyUvgv4pkpS86HwPMfqtDaJEaZhWiwHjHp9g="; + vendorHash = "sha256-64etBHKlEPByDzrEP3YYhgR4vnj4yvHk6cjB92myqyc="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 7975bf514e3c..3a4217c6995e 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.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-fl2vDaGLR2ZlHnljfHYPN0EmbGqJwVs5dBkXRDJ3fM8="; + hash = "sha256-hfq0wuDoZ/3kiXVgwFPGRXMGxeRRVvCzi+VWJczOwgM="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-6x42/UaTNmoglgHDqfa0LjQz8PeOwUVqI5BOEuzdnuM="; + hash = "sha256-NqzADMMjxxZQOPt0lJOWoJ8WEU7hFJmnwRnSQPYMtLo="; }; packageJSON = ./package.json; @@ -60,6 +60,7 @@ mkYarnPackage rec { meta = with lib; { homepage = "https://github.com/grafana/grafana-image-renderer"; description = "A Grafana backend plugin that handles rendering of panels & dashboards to PNGs using headless browser (Chromium/Chrome)"; + mainProgram = "grafana-image-renderer"; license = licenses.asl20; maintainers = with maintainers; [ ma27 ]; platforms = platforms.all; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index 7d360f78c6b1..10bd43ab4621 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -59,7 +59,7 @@ "@types/supertest": "^2.0.15", "@typescript-eslint/eslint-plugin": "5.37.0", "@typescript-eslint/parser": "5.37.0", - "axios": "1.6.0", + "axios": "1.6.7", "cross-env": "7.0.3", "eslint": "8.23.1", "eslint-config-prettier": "8.5.0", diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index 60cf6d51224c..1b4d0d04fa30 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -25,6 +25,7 @@ buildGoPackage rec { meta = { description = "PDF report generator from a Grafana dashboard"; + mainProgram = "grafana-reporter"; homepage = "https://github.com/IzakMarais/reporter"; license = licenses.mit; maintainers = with maintainers; [ disassembler ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 8b2a9c02e0df..99846f7babfe 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -18,29 +18,18 @@ let 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.3.3"; + version = "10.4.0"; - excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" "modowners" ]; + subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; src = fetchFromGitHub { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-uAfHcW9j+al8IIH2N6X5wssQmSXqJjVQzwERBCxGxVE="; + hash = "sha256-Rp2jGspbmqJFzSbiVy2/5oqQJnAdGG/T+VNBHVsHSwg="; }; offlineCache = stdenv.mkDerivation { @@ -48,7 +37,7 @@ buildGoModule rec { inherit src; nativeBuildInputs = [ yarn nodejs cacert - jq moreutils + jq moreutils python3 ]; postPatch = '' ${patchAwayGrafanaE2E} @@ -67,12 +56,12 @@ buildGoModule rec { dontInstall = true; dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-70eMa8E483f/Bz7iy+4Seap1EfIdjD5krnt6W9CUows="; + outputHash = "sha256-QdyXSPshzugkDTJoUrJlHNuhPAyR9gae5Cbk8Q8FSl4="; }; disallowedRequisites = [ offlineCache ]; - vendorHash = "sha256-nGv/DBNnQ4AOJtrsYIGLCrV1xNmBN0dDf6u46R3TAHo="; + vendorHash = "sha256-cNkMVLXp3hPMcW0ilOM0VlrrDX/IsZaze+/6qlTfmRs="; nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 ]; @@ -89,36 +78,6 @@ buildGoModule rec { GOARCH= CGO_ENABLED=0 go generate ./pkg/plugins/plugindef GOARCH= CGO_ENABLED=0 go generate ./kinds/gen.go GOARCH= CGO_ENABLED=0 go generate ./public/app/plugins/gen.go - GOARCH= CGO_ENABLED=0 go generate ./pkg/kindsys/report.go - - # Work around `main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/pkg/util/xorm`. - # Apparently these files confuse the dependency resolution for the go builder implemented here. - rm pkg/util/xorm/go.{mod,sum} - - # The testcase makes an API call against grafana.com: - # - # [...] - # 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" - ${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) - ${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 - - # Requires making API calls against storage.googleapis.com: - # - # [...] - # 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)" @@ -175,7 +134,7 @@ buildGoModule rec { meta = with lib; { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; - license = licenses.agpl3; + license = licenses.agpl3Only; homepage = "https://grafana.com"; maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/servers/monitoring/karma/default.nix b/pkgs/servers/monitoring/karma/default.nix index 5bc19740d8de..c27bffa3598f 100644 --- a/pkgs/servers/monitoring/karma/default.nix +++ b/pkgs/servers/monitoring/karma/default.nix @@ -62,6 +62,7 @@ buildGoModule rec { meta = with lib; { changelog = "https://github.com/prymitive/karma/blob/${src.rev}/CHANGELOG.md"; description = "Alert dashboard for Prometheus Alertmanager"; + mainProgram = "karma"; homepage = "https://karma-dashboard.io/"; license = licenses.asl20; maintainers = with maintainers; [ nukaduka ]; diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index a667d1d442b1..22de6d4ebb6f 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -1,33 +1,21 @@ { acl , fetchFromGitHub -, fetchpatch , lib , rustPlatform }: rustPlatform.buildRustPackage rec { pname = "laurel"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "threathunters-io"; repo = "laurel"; rev = "refs/tags/v${version}"; - hash = "sha256-lWVrp0ytomrQBSDuQCMFJpSuAuwjSYPwoE4yh/WO2ls="; + hash = "sha256-dGgBcugIQ3ZPnqyTw6wRMN2PZLm6GqobeFZ1/uzMKbs="; }; - cargoHash = "sha256-GY7vpst+Epsy/x/ths6pwtGQgM6Bx0KI+NsCMFCBujE="; - - cargoPatches = [ - # Upstream forgot to bump the Cargo.lock before tagging the release. - # This patch is the first commit immediately after the tag fixing this mistake. - # Needs to be removed next release. - (fetchpatch { - name = "Cargo-lock-version-bump.patch"; - url = "https://github.com/threathunters-io/laurel/commit/f38393d1098e8f75394f83ad3da5c1160fb96652.patch"; - hash = "sha256-x+7p21X38KYqLclFtGnLO5nOHz819+XTaSPMvDbSo/I="; - }) - ]; + cargoHash = "sha256-8JNLssWTCfwrfQ/jg/rj7BUo9bCNCsM2RDwPI7cacRw="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 2578bb5a0405..2935b9d0bf4c 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.9.5"; + version = "2.9.6"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-+X9ODzyIaeizLItUqorDdvgpIOPML+MzgwmyKbes9dA="; + hash = "sha256-79hK7axHf6soku5DvdXkE/0K4WKc4pnS9VMbVc1FS2I="; }; vendorHash = null; @@ -52,6 +52,7 @@ buildGoModule rec { meta = with lib; { description = "Like Prometheus, but for logs"; + mainProgram = "promtail"; license = with licenses; [ agpl3Only asl20 ]; homepage = "https://grafana.com/oss/loki/"; changelog = "https://github.com/grafana/loki/releases/tag/v${version}"; diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index d2cc7c040e5d..cfd9ddab9a2c 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.linode.com/longview"; description = "Collects all of your system-level metrics and sends them to Linode"; + mainProgram = "longview"; license = licenses.gpl2Plus; maintainers = [ maintainers.rvl ]; inherit version; diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index b99309fb05e5..a240c1aee990 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.79.0"; + version = "0.80.0"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UKSrNUKS7VYK/hcKdNetaq6HNPqZyK7VtlJZjoyxU6o="; + sha256 = "sha256-ETM7OTJEdySej9wrV9sth1JCJAtfBVdsPH8ndOBV118="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorHash = "sha256-AnkjmgcFSI8RadfTdtCk+NCiAw+NecfaU/vc7WOgbuk="; + vendorHash = "sha256-pCUHDHKNaSoIPB3fS+Jf953YMI5cXcUOLF+YP62iPMo="; subPackages = [ "." ]; @@ -33,6 +33,7 @@ buildGoModule rec { meta = with lib; { description = "System monitoring service for mackerel.io"; + mainProgram = "mackerel-agent"; homepage = "https://github.com/mackerelio/mackerel-agent"; license = licenses.asl20; maintainers = with maintainers; [ midchildan ]; diff --git a/pkgs/servers/monitoring/matrix-alertmanager/default.nix b/pkgs/servers/monitoring/matrix-alertmanager/default.nix index 80685e94662c..a5c6212f6c8e 100644 --- a/pkgs/servers/monitoring/matrix-alertmanager/default.nix +++ b/pkgs/servers/monitoring/matrix-alertmanager/default.nix @@ -27,6 +27,7 @@ buildNpmPackage rec { meta = with lib; { changelog = "https://github.com/jaywink/matrix-alertmanager/blob/${src.rev}/CHANGELOG.md"; description = "Bot to receive Alertmanager webhook events and forward them to chosen rooms"; + mainProgram = "matrix-alertmanager"; homepage = "https://github.com/jaywink/matrix-alertmanager"; license = licenses.mit; maintainers = with maintainers; [ yuka ]; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 783384eb9610..9572c1d2c87e 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.80.0"; + version = "2.81.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-1KYolUA5AZ9fQLfNb4UE1WlMTj6GiAnNszPTLlERBvc="; + hash = "sha256-6C6shxu9ze0ffx6Mg2K9TkqJl98Wz7loTcCptg92IY8="; }; nativeBuildInputs = [ @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Nagios plugin to check the CA and validity of an X.509 certificate"; + mainProgram = "check_ssl_cert"; homepage = "https://github.com/matteocorti/check_ssl_cert"; changelog = "https://github.com/matteocorti/check_ssl_cert/releases/tag/v${version}"; license = licenses.gpl3Plus; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix b/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix index 9904147420aa..fe1500d53f54 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix @@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Nagios / Icinga monitoring plugin to check systemd for failed units"; + mainProgram = "check_systemd"; inherit (src.meta) homepage; changelog = "https://github.com/Josef-Friedrich/check_systemd/releases"; maintainers = with maintainers; [ symphorien ]; diff --git a/pkgs/servers/monitoring/nagios/plugins/smartmon.nix b/pkgs/servers/monitoring/nagios/plugins/smartmon.nix index 42554cfafe99..25adfefe84e2 100644 --- a/pkgs/servers/monitoring/nagios/plugins/smartmon.nix +++ b/pkgs/servers/monitoring/nagios/plugins/smartmon.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Nagios-Plugin that uses smartmontools to check disk health status and temperature"; + mainProgram = "check_smartmon"; homepage = "https://github.com/driehuis/Nagios_check_smartmon"; license = licenses.gpl2Plus; maintainers = with maintainers; [ mariaa144 ]; diff --git a/pkgs/servers/monitoring/nagios/plugins/zfs.nix b/pkgs/servers/monitoring/nagios/plugins/zfs.nix index 724aa498afb7..0ec84722d201 100644 --- a/pkgs/servers/monitoring/nagios/plugins/zfs.nix +++ b/pkgs/servers/monitoring/nagios/plugins/zfs.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Check the health, capacity, fragmentation, and other things for use with Nagios monitoring"; + mainProgram = "check_zfs"; homepage = "https://github.com/zlacelle/nagios_check_zfs_linux"; license = licenses.gpl3Only; maintainers = with maintainers; [ mariaa144 ]; diff --git a/pkgs/servers/monitoring/openobserve/Cargo.lock b/pkgs/servers/monitoring/openobserve/Cargo.lock index eaff98567453..81665794e141 100644 --- a/pkgs/servers/monitoring/openobserve/Cargo.lock +++ b/pkgs/servers/monitoring/openobserve/Cargo.lock @@ -326,7 +326,7 @@ dependencies = [ "actix-http", "actix-web", "futures-util", - "opentelemetry 0.21.0", + "opentelemetry", "opentelemetry-semantic-conventions", "serde", ] @@ -1181,7 +1181,7 @@ dependencies = [ "hyper-rustls", "lazy_static", "pin-project-lite", - "rustls", + "rustls 0.21.10", "tokio", "tower", "tracing", @@ -1824,6 +1824,16 @@ dependencies = [ ] [[package]] +name = "chumsky" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" +dependencies = [ + "hashbrown 0.14.3", + "stacker", +] + +[[package]] name = "ciborium" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2072,6 +2082,7 @@ dependencies = [ "hex", "indexmap 2.1.0", "itertools 0.12.1", + "lettre", "log", "memchr", "murmur3", @@ -2088,7 +2099,7 @@ dependencies = [ "sysinfo", "tokio", "tracing", - "tracing-log 0.2.0", + "tracing-log", "tracing-subscriber", "utoipa", "walkdir", @@ -2784,6 +2795,22 @@ dependencies = [ ] [[package]] +name = "email-encoding" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbfb21b9878cf7a348dcb8559109aabc0ec40d69924bd706fa5149846c4fef75" +dependencies = [ + "base64 0.21.7", + "memchr", +] + +[[package]] +name = "email_address" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112" + +[[package]] name = "ena" version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3532,10 +3559,10 @@ dependencies = [ "http 0.2.11", "hyper", "log", - "rustls", + "rustls 0.21.10", "rustls-native-certs", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", ] [[package]] @@ -3895,6 +3922,36 @@ dependencies = [ ] [[package]] +name = "lettre" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357ff5edb6d8326473a64c82cf41ddf78ab116f89668c50c4fac1b321e5e80f4" +dependencies = [ + "async-trait", + "base64 0.21.7", + "chumsky", + "email-encoding", + "email_address", + "fastrand 2.0.1", + "futures-io", + "futures-util", + "hostname", + "httpdate", + "idna", + "mime", + "nom", + "percent-encoding", + "quoted_printable", + "rustls 0.22.2", + "rustls-pemfile 2.0.0", + "socket2", + "tokio", + "tokio-rustls 0.25.0", + "url", + "webpki-roots 0.26.1", +] + +[[package]] name = "lexical-core" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4291,9 +4348,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -4625,7 +4682,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openobserve" -version = "0.8.1" +version = "0.9.0" dependencies = [ "actix-cors", "actix-multipart", @@ -4671,15 +4728,17 @@ dependencies = [ "ipnetwork 0.20.0", "itertools 0.12.1", "jsonwebtoken", + "lettre", "log", "maxminddb", "memory-stats", "mimalloc", "object_store", "once_cell", - "opentelemetry 0.18.0", + "opentelemetry", "opentelemetry-otlp", - "opentelemetry-proto 0.2.0", + "opentelemetry-proto", + "opentelemetry_sdk", "parking_lot 0.12.1", "parquet", "prometheus", @@ -4709,8 +4768,8 @@ dependencies = [ "time", "tokio", "tokio-stream", - "tonic 0.8.3", - "tonic-build 0.8.4", + "tonic 0.9.2", + "tonic-build 0.9.2", "tracing", "tracing-appender", "tracing-opentelemetry", @@ -4732,26 +4791,6 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "opentelemetry" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" -dependencies = [ - "opentelemetry_api 0.18.0", - "opentelemetry_sdk 0.18.0", -] - -[[package]] -name = "opentelemetry" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4b8347cc26099d3aeee044065ecc3ae11469796b4d65d065a23a584ed92a6f" -dependencies = [ - "opentelemetry_api 0.19.0", - "opentelemetry_sdk 0.19.0", -] - -[[package]] -name = "opentelemetry" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" @@ -4768,66 +4807,50 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" +checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" dependencies = [ "async-trait", "bytes", "http 0.2.11", - "opentelemetry_api 0.18.0", + "opentelemetry", "reqwest", ] [[package]] name = "opentelemetry-otlp" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" +checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" dependencies = [ "async-trait", - "futures", - "futures-util", + "futures-core", "http 0.2.11", - "opentelemetry 0.18.0", + "opentelemetry", "opentelemetry-http", - "opentelemetry-proto 0.1.0", + "opentelemetry-proto", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", "prost 0.11.9", "reqwest", "serde", "thiserror", "tokio", - "tonic 0.8.3", -] - -[[package]] -name = "opentelemetry-proto" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" -dependencies = [ - "futures", - "futures-util", - "opentelemetry 0.18.0", - "prost 0.11.9", - "tonic 0.8.3", - "tonic-build 0.8.4", + "tonic 0.9.2", ] [[package]] name = "opentelemetry-proto" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045f8eea8c0fa19f7d48e7bc3128a39c2e5c533d5c61298c548dfefc1064474c" +checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" dependencies = [ - "futures", - "futures-util", - "opentelemetry 0.19.0", + "opentelemetry", + "opentelemetry_sdk", "prost 0.11.9", - "protobuf", "serde", - "serde_json", - "tonic 0.8.3", + "tonic 0.9.2", ] [[package]] @@ -4836,84 +4859,33 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" dependencies = [ - "opentelemetry 0.21.0", -] - -[[package]] -name = "opentelemetry_api" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" -dependencies = [ - "fnv", - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", -] - -[[package]] -name = "opentelemetry_api" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed41783a5bf567688eb38372f2b7a8530f5a607a4b49d38dd7573236c23ca7e2" -dependencies = [ - "fnv", - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", + "opentelemetry", ] [[package]] name = "opentelemetry_sdk" -version = "0.18.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4" dependencies = [ "async-trait", "crossbeam-channel", - "dashmap", - "fnv", "futures-channel", "futures-executor", "futures-util", + "glob", "once_cell", - "opentelemetry_api 0.18.0", + "opentelemetry", + "ordered-float 4.2.0", "percent-encoding", "rand", + "serde_json", "thiserror", "tokio", "tokio-stream", ] [[package]] -name = "opentelemetry_sdk" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b3a2a91fdbfdd4d212c0dcc2ab540de2c2bcbbd90be17de7a7daf8822d010c1" -dependencies = [ - "async-trait", - "crossbeam-channel", - "dashmap", - "fnv", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry_api 0.19.0", - "percent-encoding", - "rand", - "thiserror", -] - -[[package]] name = "option-ext" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5568,9 +5540,14 @@ name = "protobuf" version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" dependencies = [ - "serde", - "serde_derive", + "cc", ] [[package]] @@ -5846,7 +5823,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.21.10", "rustls-native-certs", "rustls-pemfile 1.0.4", "serde", @@ -5855,7 +5832,7 @@ dependencies = [ "sync_wrapper", "system-configuration", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", @@ -5863,7 +5840,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", + "webpki-roots 0.25.4", "winreg", ] @@ -6103,11 +6080,25 @@ checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring 0.17.7", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] [[package]] +name = "rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +dependencies = [ + "log", + "ring 0.17.7", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + +[[package]] name = "rustls-native-certs" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6155,6 +6146,17 @@ dependencies = [ ] [[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring 0.17.7", + "rustls-pki-types", + "untrusted 0.9.0", +] + +[[package]] name = "rustversion" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6680,7 +6682,7 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rustls", + "rustls 0.21.10", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -6692,7 +6694,7 @@ dependencies = [ "tokio-stream", "tracing", "url", - "webpki-roots", + "webpki-roots 0.25.4", ] [[package]] @@ -6849,6 +6851,19 @@ 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 1.0.0", + "libc", + "psm", + "winapi 0.3.9", +] + +[[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7281,7 +7296,18 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.10", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.2", + "rustls-pki-types", "tokio", ] @@ -7340,14 +7366,13 @@ dependencies = [ [[package]] name = "tonic" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ - "async-stream", "async-trait", "axum", - "base64 0.13.1", + "base64 0.21.7", "bytes", "flate2", "futures-core", @@ -7360,15 +7385,12 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.11.9", - "prost-derive 0.11.9", "tokio", "tokio-stream", - "tokio-util", "tower", "tower-layer", "tower-service", "tracing", - "tracing-futures", ] [[package]] @@ -7390,10 +7412,10 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.12.3", - "rustls", + "rustls 0.21.10", "rustls-pemfile 1.0.4", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-stream", "tower", "tower-layer", @@ -7403,9 +7425,9 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.8.4" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" +checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ "prettyplease 0.1.25", "proc-macro2", @@ -7505,27 +7527,6 @@ dependencies = [ ] [[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] name = "tracing-log" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7538,16 +7539,20 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.18.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" +checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" dependencies = [ + "js-sys", "once_cell", - "opentelemetry 0.18.0", + "opentelemetry", + "opentelemetry_sdk", + "smallvec", "tracing", "tracing-core", - "tracing-log 0.1.4", + "tracing-log", "tracing-subscriber", + "web-time", ] [[package]] @@ -7577,7 +7582,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", "tracing-serde", ] @@ -8078,6 +8083,16 @@ dependencies = [ ] [[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] name = "webbrowser" version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8101,6 +8116,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + +[[package]] name = "which" version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/servers/monitoring/openobserve/default.nix b/pkgs/servers/monitoring/openobserve/default.nix index 5a99d017b601..59a0d203e258 100644 --- a/pkgs/servers/monitoring/openobserve/default.nix +++ b/pkgs/servers/monitoring/openobserve/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch , pkg-config , protobuf , bzip2 @@ -16,12 +15,12 @@ }: let - version = "0.8.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "openobserve"; repo = "openobserve"; rev = "v${version}"; - hash = "sha256-J8TuaWjtuR39XA7tizyI+DFkpOaLFweM+/9VImGj8UE="; + hash = "sha256-AQxSR2cMkNst5YEv4TqVNgdriMsg/0ed5YN4W8qZKxM="; }; web = buildNpmPackage { inherit src version; @@ -29,7 +28,7 @@ let sourceRoot = "${src.name}/web"; - npmDepsHash = "sha256-RNUCR80ewFt9F/VHv7kXLa87h0fz0YBp+9gSOUhtrdU="; + npmDepsHash = "sha256-c82NLNLfqQrS/jv7ixpLCYDMEUtx6+Mm8cSwvVis2fc="; preBuild = '' # Patch vite config to not open the browser to visualize plugin composition @@ -56,12 +55,6 @@ rustPlatform.buildRustPackage { inherit version src; patches = [ - (fetchpatch { - name = "fix-test-hash-partition.patch"; - url = "https://github.com/openobserve/openobserve/commit/24919333d6b6696f0f9d9aff0a883431481e8fce.patch"; - includes = ["src/common/meta/stream.rs"]; - hash = "sha256-GB3Pgmp1swJt6ESgKL2eWOZ3jBcsN0r+5Dxasgg50D4="; - }) # prevent using git to determine version info during build time ./build.rs.patch ]; diff --git a/pkgs/servers/monitoring/phlare/default.nix b/pkgs/servers/monitoring/phlare/default.nix index 35d6d5fd80cf..bc2c7cee63e5 100644 --- a/pkgs/servers/monitoring/phlare/default.nix +++ b/pkgs/servers/monitoring/phlare/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { meta = with lib; { description = "Grafana Phlare is an open source database that provides fast, scalable, highly available, and efficient storage and querying of profiling data."; - license = licenses.agpl3; + license = licenses.agpl3Only; homepage = "https://grafana.com/oss/phlare"; maintainers = with maintainers; [ cathalmullan ]; }; diff --git a/pkgs/servers/monitoring/plugins/openvpn.nix b/pkgs/servers/monitoring/plugins/openvpn.nix index 2b7e69ab8f0b..3ae474d6d9e8 100644 --- a/pkgs/servers/monitoring/plugins/openvpn.nix +++ b/pkgs/servers/monitoring/plugins/openvpn.nix @@ -16,6 +16,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A nagios/icinga/sensu check plugin for OpenVPN"; + mainProgram = "check_openvpn"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/servers/monitoring/plugins/wmic-bin.nix b/pkgs/servers/monitoring/plugins/wmic-bin.nix index 4cfbcd254133..64cf171afea1 100644 --- a/pkgs/servers/monitoring/plugins/wmic-bin.nix +++ b/pkgs/servers/monitoring/plugins/wmic-bin.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "WMI client for Linux (binary)"; + mainProgram = "wmic"; homepage = "https://www.openvas.org"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix index 5bb98203fa2d..1f6dd51d8989 100644 --- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Provides a Prometheus exporter for the apcupsd Network Information Server (NIS)"; + mainProgram = "apcupsd_exporter"; homepage = "https://github.com/mdlayher/apcupsd_exporter"; license = licenses.mit; maintainers = with maintainers; [ _1000101 mdlayher ]; diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index 54b5c8370bdf..b9a11f47d8db 100644 --- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -33,6 +33,7 @@ buildGoModule rec { meta = with lib; { description = "JFrog Artifactory Prometheus Exporter"; + mainProgram = "artifactory_exporter"; homepage = "https://github.com/peimanja/artifactory_exporter"; changelog = "https://github.com/peimanja/artifactory_exporter/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix index ce40a93e66f8..c46959598149 100644 --- a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for RIPE Atlas measurement results "; + mainProgram = "atlas_exporter"; homepage = "https://github.com/czerwonk/atlas_exporter"; license = licenses.lgpl3; maintainers = with maintainers; [ clerie ]; diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix index dd0ea4ec5ec4..b3855f532e9a 100644 --- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Exports Prometheus metrics about S3 buckets and objects"; + mainProgram = "s3_exporter"; homepage = "https://github.com/ribbybibby/s3_exporter"; license = licenses.asl20; maintainers = [ maintainers.mmahut ]; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index 1ee84e5e703a..8b8516f7967f 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for bind9 server"; + mainProgram = "bind_exporter"; homepage = "https://github.com/digitalocean/bind_exporter"; license = licenses.asl20; maintainers = with maintainers; [ rtreffer ]; diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/servers/monitoring/prometheus/bird-exporter.nix index f61e400d860f..25a90e1fdb0a 100644 --- a/pkgs/servers/monitoring/prometheus/bird-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bird-exporter.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for the bird routing daemon"; + mainProgram = "bird_exporter"; homepage = "https://github.com/czerwonk/bird_exporter"; license = licenses.mit; maintainers = with maintainers; [ lukegb ]; diff --git a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix index f2d50fe85014..4abd65235fab 100644 --- a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix @@ -34,6 +34,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Prometheus exporter for Bitcoin Core nodes"; + mainProgram = "bitcoind-monitor.py"; homepage = "https://github.com/jvstein/bitcoin-prometheus-exporter"; license = licenses.bsd3; maintainers = with maintainers; [ mmilata ]; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 8025cffca843..8c929353a820 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -31,6 +31,7 @@ buildGoModule rec { meta = with lib; { description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP"; + mainProgram = "blackbox_exporter"; homepage = "https://github.com/prometheus/blackbox_exporter"; license = licenses.asl20; maintainers = with maintainers; [ globin fpletz willibutz Frostman ma27 ]; diff --git a/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix b/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix index 6d15188aaebe..7abcfeb32887 100644 --- a/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus Cloudflare Exporter"; + mainProgram = "cloudflare-exporter"; homepage = "https://github.com/lablabs/cloudflare-exporter"; license = licenses.asl20; maintainers = with maintainers; [ bbigras ]; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 1ff0ad38f47a..7997bacdb1bf 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { description = "Relay server for exporting metrics from collectd to Prometheus"; + mainProgram = "collectd_exporter"; homepage = "https://github.com/prometheus/collectd_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index a365bda5202a..4cc241af7c65 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -23,6 +23,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for Consul metrics"; + mainProgram = "consul_exporter"; homepage = "https://github.com/prometheus/consul_exporter"; changelog = "https://github.com/prometheus/consul_exporter/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix index c995d4036ae0..7c4d2cfae06e 100644 --- a/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix @@ -48,7 +48,7 @@ buildGoModule rec { vendorHash = "sha256-Fjvx15e/psxoqoS6c6GhiQfe7g2aI40EmPR26xLhrzg="; nativeBuildInputs = [ - cudaPackages.autoAddOpenGLRunpathHook + cudaPackages.autoAddDriverRunpath ]; # Tests try to interact with running DCGM service. diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index 2b2c5354ca1c..3968f0b5c11c 100644 --- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -53,6 +53,7 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Export Prometheus metrics from DMARC reports"; + mainProgram = "dmarc-metrics-exporter"; homepage = "https://github.com/jgosmann/dmarc-metrics-exporter"; changelog = "https://github.com/jgosmann/dmarc-metrics-exporter/blob/v${version}/CHANGELOG.rst"; license = lib.licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index f6af24264fe9..eb2297648b56 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { inherit (src.meta) homepage; description = "A dnsmasq exporter for Prometheus"; + mainProgram = "dnsmasq_exporter"; license = licenses.asl20; maintainers = with maintainers; [ willibutz globin ]; }; diff --git a/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/pkgs/servers/monitoring/prometheus/domain-exporter.nix index 5f5ce702cebc..26afdca834a3 100644 --- a/pkgs/servers/monitoring/prometheus/domain-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/domain-exporter.nix @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/caarlos0/domain_exporter"; description = "Exports the expiration time of your domains as prometheus metrics"; + mainProgram = "domain_exporter"; license = licenses.mit; maintainers = with maintainers; [ mmilata prusnak peterhoeg caarlos0 ]; }; diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index ff7156360a9c..7041c9df29d4 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -20,6 +20,7 @@ buildGoPackage rec { meta = with lib; { inherit (src.meta) homepage; description = "Prometheus metrics exporter for Dovecot"; + mainProgram = "dovecot_exporter"; license = licenses.asl20; maintainers = with maintainers; [ willibutz globin ]; }; diff --git a/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/pkgs/servers/monitoring/prometheus/exportarr/default.nix index 00b4690c5619..a451e46df2ab 100644 --- a/pkgs/servers/monitoring/prometheus/exportarr/default.nix +++ b/pkgs/servers/monitoring/prometheus/exportarr/default.nix @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { description = "AIO Prometheus Exporter for Sonarr, Radarr or Lidarr"; + mainProgram = "exportarr"; homepage = "https://github.com/onedr0p/exportarr"; changelog = "https://github.com/onedr0p/exportarr/releases/tag/${src.rev}"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/flow-exporter.nix b/pkgs/servers/monitoring/prometheus/flow-exporter.nix index 1b9f05dae3e2..e5fa4a7dcf83 100644 --- a/pkgs/servers/monitoring/prometheus/flow-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/flow-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Export network flows from kafka to Prometheus"; + mainProgram = "flow-exporter"; homepage = "https://github.com/neptune-networks/flow-exporter"; license = licenses.mit; maintainers = with maintainers; [ kloenk ]; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 99d306f9710d..d964f90cba44 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus Exporter for FRITZ!Box (TR64 and UPnP)"; + mainProgram = "exporter"; homepage = "https://github.com/mxschmitt/fritzbox_exporter"; license = licenses.asl20; maintainers = with maintainers; [ bachp flokli sbruder ]; diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index ddcc080983df..8e86aa10b671 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus / OpenMetrics exporter for GitLab CI pipelines insights"; + mainProgram = "gitlab-ci-pipelines-exporter"; homepage = "https://github.com/mvisonneau/gitlab-ci-pipelines-exporter"; license = licenses.asl20; maintainers = with maintainers; [ mmahut mvisonneau ]; diff --git a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix index 3c27d018d781..819a4c3947a1 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.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "graphite_exporter"; rev = "v${version}"; - hash = "sha256-2u8grG5n0XkBS6zNxYrPyL+HP5/jEe/bXLt/1l759o4="; + hash = "sha256-KBqLPKd8XP7PbjHJu1DIQ2ir+Lyk7LEBaNjJCr91LP8="; }; - vendorHash = "sha256-wt2eDCNZAss3zSqvXeKTlsrPfj8pMXKWa3Yb33uuW0M="; + vendorHash = "sha256-he2bmcTNkuKRsNGkn1IkhtOe+Eo/5RLWLYlNFWLo/As="; preCheck = let skippedTests = [ diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index aa558bc8c9fd..6795885afd3d 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "HAProxy Exporter for the Prometheus monitoring system"; + mainProgram = "haproxy_exporter"; homepage = "https://github.com/prometheus/haproxy_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; diff --git a/pkgs/servers/monitoring/prometheus/idrac-exporter.nix b/pkgs/servers/monitoring/prometheus/idrac-exporter.nix index 3c1a0066be8a..1160984f0023 100644 --- a/pkgs/servers/monitoring/prometheus/idrac-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/idrac-exporter.nix @@ -24,6 +24,7 @@ buildGoModule rec { meta = with lib; { inherit (src.meta) homepage; description = "Simple iDRAC exporter for Prometheus"; + mainProgram = "idrac_exporter"; license = licenses.mit; maintainers = with maintainers; [ codec ]; }; diff --git a/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix b/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix index e603c2a8811d..bd06041d0209 100644 --- a/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix @@ -21,6 +21,7 @@ buildGoModule rec { meta = with lib; { description = "Export Prometheus-style metrics about how many emails you have in your INBOX and in additional configured folders"; + mainProgram = "imap-mailstat-exporter"; homepage = "https://github.com/bt909/imap-mailstat-exporter"; license = licenses.mit; maintainers = with maintainers; [ raboof ]; diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix index 07ef8febf3de..2690481b45f8 100644 --- a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter that accepts InfluxDB metrics"; + mainProgram = "influxdb_exporter"; homepage = "https://github.com/prometheus/influxdb_exporter"; changelog = "https://github.com/prometheus/influxdb_exporter/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix index 1b1ac3c62420..ae39f6c98f74 100644 --- a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix @@ -33,6 +33,7 @@ buildGoModule rec { meta = with lib; { description = "An IPMI exporter for Prometheus"; + mainProgram = "ipmi_exporter"; homepage = "https://github.com/prometheus-community/ipmi_exporter"; changelog = "https://github.com/prometheus-community/ipmi_exporter/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix b/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix index 5b90c26eed7e..13ce969b826c 100644 --- a/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix @@ -16,6 +16,7 @@ buildGoModule rec { meta = with lib; { description = "Export Jitsi Videobridge metrics to Prometheus"; + mainProgram = "jitsiexporter"; homepage = "https://git.xsfx.dev/prometheus/jitsiexporter"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index cf180de54a70..532461234763 100644 --- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/prometheus/jmx_exporter"; description = "A process for exposing JMX Beans via HTTP for Prometheus consumption"; + mainProgram = "jmx_prometheus_httpserver"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ maintainers.offline ]; diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix index 2b50c7850702..37631a00c679 100644 --- a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Exporter for metrics from devices running JunOS"; + mainProgram = "junos_exporter"; homepage = "https://github.com/czerwonk/junos_exporter"; license = licenses.mit; maintainers = teams.wdz.members; diff --git a/pkgs/servers/monitoring/prometheus/kea-exporter.nix b/pkgs/servers/monitoring/prometheus/kea-exporter.nix index 572fed8a99d9..f4965bd54fa8 100644 --- a/pkgs/servers/monitoring/prometheus/kea-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/kea-exporter.nix @@ -1,22 +1,28 @@ -{ lib, python3Packages, fetchPypi, nixosTests }: +{ lib +, python3Packages +, fetchPypi +, nixosTests +}: python3Packages.buildPythonApplication rec { pname = "kea-exporter"; - version = "0.5.1"; + version = "0.7.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-rNGA5XEx9xVUP1SeDPgXcaqgDhgX6JFhRX9GM454P5A="; + pname = "kea_exporter"; + inherit version; + hash = "sha256-kn2iwYWcyW90tgfWmzLF7rU06fJyLRzqYKNLOgu/Yqk="; }; nativeBuildInputs = with python3Packages; [ - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = with python3Packages; [ click prometheus-client + requests ]; checkPhase = '' @@ -25,11 +31,13 @@ python3Packages.buildPythonApplication rec { ''; passthru.tests = { - inherit (nixosTests.prometheus-exporters) kea; + inherit (nixosTests) kea; }; meta = with lib; { + changelog = "https://github.com/mweinelt/kea-exporter/blob/v${version}/HISTORY"; description = "Export Kea Metrics in the Prometheus Exposition Format"; + mainProgram = "kea-exporter"; homepage = "https://github.com/mweinelt/kea-exporter"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix index d2c816c7433a..59dcd621ca72 100644 --- a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix @@ -18,6 +18,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/mdlayher/keylight_exporter"; description = "Prometheus exporter for Elgato Key Light devices"; + mainProgram = "keylight_exporter"; license = licenses.mit; maintainers = with maintainers; [ mdlayher ]; }; diff --git a/pkgs/servers/monitoring/prometheus/kthxbye.nix b/pkgs/servers/monitoring/prometheus/kthxbye.nix index 897a58926d34..a0eb30f6819b 100644 --- a/pkgs/servers/monitoring/prometheus/kthxbye.nix +++ b/pkgs/servers/monitoring/prometheus/kthxbye.nix @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus Alertmanager alert acknowledgement management daemon"; + mainProgram = "kthxbye"; homepage = "https://github.com/prymitive/kthxbye"; license = licenses.asl20; maintainers = with maintainers; [ nukaduka ]; diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix index e66ab8852f1d..707d59b78bfa 100644 --- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix @@ -21,6 +21,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/lightninglabs/lndmon"; description = "Prometheus exporter for lnd (Lightning Network Daemon)"; + mainProgram = "lndmon"; license = licenses.mit; maintainers = with maintainers; [ mmilata ]; }; diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index ae13becd0aed..851d297e760f 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -24,6 +24,7 @@ buildGoModule { meta = with lib; { description = "Export Prometheus-style metrics about mail server functionality"; + mainProgram = "mailexporter"; homepage = "https://github.com/cherti/mailexporter"; license = licenses.gpl3; maintainers = with maintainers; [ willibutz globin ]; diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 431b029db9f3..5d335f504bb3 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { inherit (src.meta) homepage; description = "Prometheus MikroTik device(s) exporter"; + mainProgram = "mikrotik-exporter"; license = licenses.bsd3; maintainers = with maintainers; [ mmilata ]; }; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 93e9bca3283d..504611848ca9 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -27,6 +27,7 @@ buildGoPackage rec { meta = with lib; { description = "A Prometheus exporter for Minio cloud storage server"; + mainProgram = "minio-exporter"; homepage = "https://github.com/joe-pll/minio-exporter"; license = licenses.asl20; maintainers = with maintainers; [ bachp ]; diff --git a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix index 271be41aee97..6975f2570435 100644 --- a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix @@ -18,6 +18,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/mdlayher/modemmanager_exporter"; description = "Prometheus exporter for ModemManager and its devices"; + mainProgram = "modemmanager_exporter"; license = licenses.mit; maintainers = with maintainers; [ mdlayher ]; }; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 2e2bead90b35..598b3220e4a3 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -29,6 +29,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for MySQL server metrics"; + mainProgram = "mysqld_exporter"; homepage = "https://github.com/prometheus/mysqld_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley globin ]; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 11862b58e004..a233b34a18d9 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { description = "NGINX Prometheus Exporter for NGINX and NGINX Plus"; + mainProgram = "nginx-prometheus-exporter"; homepage = "https://github.com/nginxinc/nginx-prometheus-exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz willibutz globin ]; diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index 8c8964ec093f..3883cdaff5cc 100644 --- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { description = "Export metrics from Nginx access log files to Prometheus"; + mainProgram = "prometheus-nginxlog-exporter"; homepage = "https://github.com/martin-helmich/prometheus-nginxlog-exporter"; license = licenses.asl20; maintainers = with maintainers; [ mmahut ]; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 78d611cd3f92..bce3eaeaa408 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -38,6 +38,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for machine metrics"; + mainProgram = "node_exporter"; homepage = "https://github.com/prometheus/node_exporter"; changelog = "https://github.com/prometheus/node_exporter/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/servers/monitoring/prometheus/nut-exporter.nix index 7b1ea2087bed..c9ec09a92172 100644 --- a/pkgs/servers/monitoring/prometheus/nut-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nut-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for Network UPS Tools"; + mainProgram = "nut_exporter"; homepage = "https://github.com/DRuggeri/nut_exporter"; license = licenses.asl20; maintainers = with maintainers; [ jhh ]; diff --git a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix index 3d574d1bb93f..49181699d65a 100644 --- a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix @@ -24,6 +24,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/tomcz/openldap_exporter"; description = "Simple service that scrapes metrics from OpenLDAP and exports them via HTTP for Prometheus consumption"; + mainProgram = "openldap_exporter"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; }; diff --git a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix index 57f51e4997c5..ca62b415bfb9 100644 --- a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for PgBouncer"; + mainProgram = "pgbouncer_exporter"; homepage = "https://github.com/prometheus-community/pgbouncer_exporter"; license = licenses.mit; maintainers = with maintainers; [ _1000101 ]; diff --git a/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix b/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix index e9ba97d1f3f7..12c80b39ff3b 100644 --- a/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix @@ -20,7 +20,7 @@ buildGoModule rec { hash = "sha256-ggrFnyEdGBoZVh4dHMw+7RUm8nJ1hJXo/fownO3wvzE="; }; - vendorHash = "sha256-OK36tHkBtosdfEWFPYMtlbzCkh5cF35NBWYyJrb9fwg= "; + vendorHash = "sha256-OK36tHkBtosdfEWFPYMtlbzCkh5cF35NBWYyJrb9fwg="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix index 2ceddeb8a4b2..a5dba8e43725 100644 --- a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for PI-Hole's Raspberry PI ad blocker"; + mainProgram = "pihole-exporter"; homepage = "https://github.com/eko/pihole-exporter"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/monitoring/prometheus/ping-exporter.nix b/pkgs/servers/monitoring/prometheus/ping-exporter.nix index becbde065af3..6abe6ed605bf 100644 --- a/pkgs/servers/monitoring/prometheus/ping-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/ping-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for ICMP echo requests"; + mainProgram = "ping_exporter"; homepage = "https://github.com/czerwonk/ping_exporter"; license = licenses.mit; maintainers = with maintainers; [ nudelsalat ]; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 90439c9091fc..ad85dfb73318 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -36,6 +36,7 @@ buildGoModule rec { meta = with lib; { inherit (src.meta) homepage; description = "A Prometheus exporter for Postfix"; + mainProgram = "postfix_exporter"; license = licenses.asl20; maintainers = with maintainers; [ willibutz globin ]; }; diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index 62f041b285ba..130789ca4bd5 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { inherit (src.meta) homepage; description = "A Prometheus exporter for PostgreSQL"; + mainProgram = "postgres_exporter"; license = licenses.asl20; maintainers = with maintainers; [ fpletz globin willibutz ma27 ]; }; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index c197bf6366c3..a011dbb68b7e 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; + mainProgram = "prom2json"; homepage = "https://github.com/prometheus/prom2json"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; diff --git a/pkgs/servers/monitoring/prometheus/promscale/default.nix b/pkgs/servers/monitoring/prometheus/promscale/default.nix index 821cab907850..9b1d070e18f4 100644 --- a/pkgs/servers/monitoring/prometheus/promscale/default.nix +++ b/pkgs/servers/monitoring/prometheus/promscale/default.nix @@ -47,6 +47,7 @@ buildGoModule rec { meta = with lib; { description = "An open-source analytical platform for Prometheus metrics"; + mainProgram = "promscale"; homepage = "https://github.com/timescale/promscale"; changelog = "https://github.com/timescale/promscale/blob/${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index ea194bccffb3..0354cb258594 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -29,6 +29,7 @@ buildGoModule rec { meta = with lib; { description = "Allows ephemeral and batch jobs to expose metrics to Prometheus"; + mainProgram = "pushgateway"; homepage = "https://github.com/prometheus/pushgateway"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix index 82ca70bfef81..72009591e899 100644 --- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -32,6 +32,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Exposes information gathered from Proxmox VE cluster for use by the Prometheus monitoring system"; + mainProgram = "pve_exporter"; homepage = "https://github.com/prometheus-pve/prometheus-pve-exporter"; license = licenses.asl20; maintainers = with maintainers; [ nukaduka ]; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 213b2285c5e7..6c012111c4d1 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for RabbitMQ"; + mainProgram = "rabbitmq_exporter"; homepage = "https://github.com/kbudde/rabbitmq_exporter"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 177537588d63..d6cb49b2eaf8 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.57.0"; + version = "1.58.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-M5Mv2gAQMR0j2zIX6OwePA9w7OtjJ0i2mR9I4BvUcXI="; + sha256 = "sha256-tZ09vQBFUWw2l6OYwT/bXhBEMOTSl5r/Hu732msPGkg="; }; vendorHash = "sha256-32EjLEPeFsihdG83ru4SSf03F2XJGD8+tbO9ANaI1hs="; @@ -26,6 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for Redis metrics"; + mainProgram = "redis_exporter"; homepage = "https://github.com/oliver006/redis_exporter"; license = licenses.mit; maintainers = with maintainers; [ eskytthe srhb ma27 ]; diff --git a/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix b/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix index 40cde1c15a6f..7319f8e2a7f4 100644 --- a/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus time-series DB exporter for rtl_433 433MHz radio packet decoder"; + mainProgram = "rtl_433_prometheus"; homepage = "https://github.com/mhansen/rtl_433_prometheus"; license = licenses.mit; maintainers = with maintainers; [ zopieux ]; diff --git a/pkgs/servers/monitoring/prometheus/sachet.nix b/pkgs/servers/monitoring/prometheus/sachet.nix index 20dda305543c..977e5d906074 100644 --- a/pkgs/servers/monitoring/prometheus/sachet.nix +++ b/pkgs/servers/monitoring/prometheus/sachet.nix @@ -18,6 +18,7 @@ buildGoModule rec { meta = with lib; { description = "An SMS alerting tool for Prometheus's Alertmanager"; + mainProgram = "sachet"; homepage = "https://github.com/messagebird/sachet"; license = licenses.bsd2; maintainers = with maintainers; [ govanify ]; diff --git a/pkgs/servers/monitoring/prometheus/script-exporter.nix b/pkgs/servers/monitoring/prometheus/script-exporter.nix index 5af5a5488d86..dae56703ebd6 100644 --- a/pkgs/servers/monitoring/prometheus/script-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/script-exporter.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Shell script prometheus exporter"; + mainProgram = "script_exporter"; homepage = "https://github.com/adhocteam/script_exporter"; license = licenses.mit; maintainers = with maintainers; [ Flakebi ]; diff --git a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix index 106e76b62460..8dde552e665e 100644 --- a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Shelly humidity sensor exporter for prometheus"; + mainProgram = "shelly_exporter"; homepage = "https://github.com/aexel90/shelly_exporter"; license = licenses.asl20; maintainers = with maintainers; [drupol]; diff --git a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix b/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix index 2e916367c924..b03a006982ec 100644 --- a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "smartctl_exporter"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oUdMsUAlN/4uRSzxQrO0TOVRgyEdxYkGtf3VoNbxdhw="; + hash = "sha256-QQoWAsnE/7ifvgEfQJ6cbzmwOrE7oe2zalTbu/P7r18="; }; - vendorHash = "sha256-0WLI+nLhRkf1CGhSer1Jkv1nUho5sxIbTE/Mf5JmX7U="; + vendorHash = "sha256-WUB2FgBl4Tybz7T0yvcSYIlG75NEhXpn1F0yuB9F21g="; ldflags = [ "-X github.com/prometheus/common/version.Version=${version}" @@ -25,6 +25,7 @@ buildGoModule rec { meta = with lib; { description = "Export smartctl statistics for Prometheus"; + mainProgram = "smartctl_exporter"; homepage = "https://github.com/prometheus-community/smartctl_exporter"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index 0f4e21defc04..38e124a60181 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "smokeping_prober"; - version = "0.7.2"; + version = "0.7.3"; ldflags = let setVars = rec { @@ -20,7 +20,7 @@ buildGoModule rec { owner = "SuperQ"; repo = "smokeping_prober"; rev = "v${version}"; - sha256 = "sha256-Z+K3cRMD885V9aJwu3N/vP6aqtzD3LfMrxJ8DSCa5Xo="; + sha256 = "sha256-MP8AJ8XnIp/+9s7qeAGRHv2OtLL5zrjEhuzZ36V/GrY="; }; vendorHash = "sha256-39/0reEt4Rfe7DfysS4BROUgBUg+x95z6DU3IjC6m5U="; @@ -30,6 +30,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for sending continual ICMP/UDP pings"; + mainProgram = "smokeping_prober"; homepage = "https://github.com/SuperQ/smokeping_prober"; license = licenses.asl20; maintainers = with maintainers; [ lukegb ]; diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index b88534cb5ac7..bab564702c17 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "justwatchcom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Cp8+vVGyAwYcrBiEN1SmUnHqWFGtuypvzfDROJgOn28="; + sha256 = "sha256-ADfJxo9/CcWi9LgX31a7GYAdigFYRbkFy4PYzecG50Y="; }; vendorHash = null; @@ -30,6 +30,7 @@ buildGoModule rec { meta = with lib; { description = "Flexible SQL exporter for Prometheus"; + mainProgram = "sql_exporter"; homepage = "https://github.com/justwatchcom/sql_exporter"; license = licenses.mit; maintainers = with maintainers; [ justinas ]; diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 201ec3a32e36..4c13824f44aa 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "statsd_exporter"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "statsd_exporter"; rev = "v${version}"; - hash = "sha256-C7+4v40T667KJHEQ3ebLDg2wJNrxD/nossfT6rMlER8="; + hash = "sha256-hKwbC56Z6tMolLnYB5G7iSLZoM+cWCh5lPzWiFkOd6E="; }; ldflags = @@ -26,10 +26,11 @@ buildGoModule rec { "-X ${t}.BuildDate=unknown" ]; - vendorHash = "sha256-scBpRZeECgAtpu9lnkIk1I2c8UmAkEL8LYNPUeUNYto="; + vendorHash = "sha256-UcdRcHZUJ3XHZNqYXSboaor5WRVPYfilEvRWZjA1YNc="; meta = with lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; + mainProgram = "statsd_exporter"; homepage = "https://github.com/prometheus/statsd_exporter"; changelog = "https://github.com/prometheus/statsd_exporter/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 39e475df1974..d3365fc92bf4 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -17,6 +17,7 @@ buildGoPackage rec { meta = with lib; { description = "Arris Surfboard signal metrics exporter"; + mainProgram = "surfboard_exporter"; homepage = "https://github.com/ipstatic/surfboard_exporter"; license = licenses.mit; maintainers = with maintainers; [ disassembler ]; diff --git a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix index 7abe243d3036..5448aeb52d59 100644 --- a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix @@ -27,6 +27,7 @@ buildGoModule rec { meta = with lib; { description = "Exporter for systemd unit metrics"; + mainProgram = "systemd_exporter"; homepage = "https://github.com/prometheus-community/systemd_exporter"; license = licenses.asl20; maintainers = with maintainers; [ chkno ]; diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/servers/monitoring/prometheus/tor-exporter.nix index fcfe87806eb9..3b54e23f81ae 100644 --- a/pkgs/servers/monitoring/prometheus/tor-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/tor-exporter.nix @@ -31,6 +31,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Prometheus exporter that exposes metrics from a Tor daemon"; + mainProgram = "prometheus-tor-exporter"; homepage = "https://github.com/atx/prometheus-tor_exporter"; license = licenses.mit; maintainers = with maintainers; [ delroth ]; diff --git a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix index e683ca72b9e5..5237abe6148a 100644 --- a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix @@ -27,6 +27,7 @@ buildGoModule { meta = with lib; { changelog = "https://github.com/letsencrypt/unbound_exporter/releases/tag/v${version}"; description = "Prometheus exporter for Unbound DNS resolver"; + mainProgram = "unbound_exporter"; homepage = "https://github.com/letsencrypt/unbound_exporter/tree/main"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix b/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix index 51bf3d8ccac6..0cb3dc77162b 100644 --- a/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for V2Ray daemon"; + mainProgram = "v2ray-exporter"; homepage = "https://github.com/wi1dcard/v2ray-exporter"; license = licenses.mit; maintainers = with maintainers; [ jqqqqqqqqqq ]; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index aa86f0642409..ff3a301d3340 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -25,6 +25,7 @@ buildGoModule rec { meta = { homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter"; description = "Varnish exporter for Prometheus"; + mainProgram = "prometheus_varnish_exporter"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ MostAwesomeDude ]; }; diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index da6013b9b5ec..16897e894f69 100644 --- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -54,6 +54,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "XMPP Web hook for Prometheus"; + mainProgram = "prometheus-xmpp-alerts"; homepage = "https://github.com/jelmer/prometheus-xmpp-alerts"; maintainers = with lib.maintainers; [ fpletz ]; license = with lib.licenses; [ asl20 ]; diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix index d229daa14b81..4488b85dd10b 100644 --- a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { description = "ZFS Exporter for the Prometheus monitoring system"; + mainProgram = "zfs_exporter"; homepage = "https://github.com/pdf/zfs_exporter"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index e55630a36335..f539fd6394e9 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://riemann.io/"; description = "A network monitoring system"; + mainProgram = "riemann"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index 3ae3a990d069..a4752a26fb40 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An alerting dashboard for Graphite"; + mainProgram = "seyren"; homepage = "https://github.com/scobal/seyren"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 4d21ef645a70..96e9c86cf74f 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -38,6 +38,7 @@ buildGoModule rec { meta = with lib; { description = "The plugin-driven server agent for collecting & reporting metrics"; + mainProgram = "telegraf"; homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; changelog = "https://github.com/influxdata/telegraf/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index 952f3190546d..c2e0f6c9f7ed 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.5"; + version = "2.10.0"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-hNDRzQGTS3sAdt/0ZdJV5zRpSdrBHGLDZJ62X+kFg7M="; + hash = "sha256-aJbK1Fhlfm0CrI1O7sWh1xjk+OR8gLa1goSnQ4wfrI0="; }; - vendorHash = "sha256-+fXNfDGzZy43WjQrvK2enOWtSv2qN3Zo+O+9Bn+KO1s="; + vendorHash = "sha256-iOfjjRjN07iD+B7GjWKbmQu/xNm5wjFQOTA4jBxMh/E="; ldflags = [ "-w" "-s" diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index 7b82a205b264..e6df980b77ef 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -37,6 +37,7 @@ buildNpmPackage rec { meta = with lib; { description = "A fancy self-hosted monitoring tool"; + mainProgram = "uptime-kuma-server"; homepage = "https://github.com/louislam/uptime-kuma"; changelog = "https://github.com/louislam/uptime-kuma/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/servers/monitoring/vmagent/default.nix index 74b2a2de096d..7c979f009cd7 100644 --- a/pkgs/servers/monitoring/vmagent/default.nix +++ b/pkgs/servers/monitoring/vmagent/default.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/VictoriaMetrics/VictoriaMetrics/tree/master/app/vmagent"; description = "VictoriaMetrics metrics scraper"; + mainProgram = "vmagent"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ nullx76 ]; diff --git a/pkgs/servers/mqtt/flashmq/default.nix b/pkgs/servers/mqtt/flashmq/default.nix index 4603ffbda0c8..8a579d948881 100644 --- a/pkgs/servers/mqtt/flashmq/default.nix +++ b/pkgs/servers/mqtt/flashmq/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast light-weight MQTT broker/server"; + mainProgram = "flashmq"; homepage = "https://www.flashmq.org/"; license = licenses.agpl3Only; maintainers = with maintainers; [ sikmir ]; diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index ae556728d3b3..a1014b44ab66 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.11"; + version = "2.10.12"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-fRbjAqu1tFLUUk7aeIkEifcWkDUhNCbVZ957b2ntD+o="; + hash = "sha256-T0rwSa1xTPUZHkFDu9hnD2Kk1ME/vMUa4iK+Zbic6PM="; }; - vendorHash = "sha256-lVCWTZvzLkYl+o+EUQ0kzIhgl9C236w9i3RRA5o+IAw="; + vendorHash = "sha256-pSjtUSbJPclsd30KLhLOkN4u6pSn307s3RohroxmExc="; doCheck = false; diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index a62746700968..6518e8694f4c 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -72,5 +72,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ ]; platforms = platforms.unix; + # error: wcwidth-0.2.13 not supported for interpreter python2.7 + broken = true; # Added 2024-03-17 }; } diff --git a/pkgs/servers/networking/rustus/default.nix b/pkgs/servers/networking/rustus/default.nix index 651ed424fc5f..53c76184a8b8 100644 --- a/pkgs/servers/networking/rustus/default.nix +++ b/pkgs/servers/networking/rustus/default.nix @@ -63,6 +63,7 @@ rustPlatform.buildRustPackage { meta = with lib; { description = "TUS protocol implementation in Rust."; + mainProgram = "rustus"; homepage = "https://s3rius.github.io/rustus/"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix index bb66a9463a05..d72f13687124 100644 --- a/pkgs/servers/nextcloud/news-updater.nix +++ b/pkgs/servers/nextcloud/news-updater.nix @@ -15,6 +15,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Fast parallel feed updater for the Nextcloud news app"; + mainProgram = "nextcloud-news-updater"; homepage = "https://github.com/nextcloud/news-updater"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ schneefux ]; diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index 2322c4f7eac3..f94449d87b16 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -42,6 +42,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { changelog = "https://github.com/nextcloud/notify_push/releases/tag/v${version}"; description = "Update notifications for nextcloud clients"; + mainProgram = "notify_push"; homepage = "https://github.com/nextcloud/notify_push"; license = licenses.agpl3Plus; platforms = platforms.linux; diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index 5dda0767c639..12cb89c2133e 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -29,8 +29,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flash-optimized, in-memory, NoSQL database"; + mainProgram = "asd"; homepage = "https://aerospike.com/"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kalbasit ]; }; diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 526253c7b67f..b00b67449ace 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -39,6 +39,8 @@ buildGoModule rec { meta = with lib; { description = "A truly Open Source MongoDB alternative"; + mainProgram = "ferretdb"; + changelog = "https://github.com/FerretDB/FerretDB/releases/tag/v${version}"; homepage = "https://www.ferretdb.io/"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya noisersup julienmalka ]; diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 928e50a0ae8c..a51144c48d4e 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -144,6 +144,7 @@ in stdenv.mkDerivation rec { preBuild = '' sconsFlags+=" CC=$CC" sconsFlags+=" CXX=$CXX" + '' + optionalString (!stdenv.isDarwin) '' sconsFlags+=" AR=$AR" '' + optionalString stdenv.isAarch64 '' sconsFlags+=" CCFLAGS='-march=armv8-a+crc'" diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 3bf736bdc238..a3a8b49242cf 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "neo4j"; - version = "5.17.0"; + version = "5.18.0"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - hash = "sha256-l1t5RI5KfgzT9ynDQxSbUtIEdPs1BVCdY4396GHJxEA="; + hash = "sha256-XPpX6alLb81o5IBX16eHHkJMi8V/R/2YXWOCxEHKdU0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 4050ed5a89bd..3d39d698ac92 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { meta = { description = "An open-source distributed database built with love"; + mainProgram = "rethinkdb"; longDescription = '' RethinkDB is built to store JSON documents, and scale to multiple machines with very little effort. It has a pleasant diff --git a/pkgs/servers/nosql/surrealdb/default.nix b/pkgs/servers/nosql/surrealdb/default.nix deleted file mode 100644 index ce1ed67d2046..000000000000 --- a/pkgs/servers/nosql/surrealdb/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, rocksdb -, testers -, surrealdb -, SystemConfiguration -, protobuf -}: - -rustPlatform.buildRustPackage rec { - pname = "surrealdb"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "surrealdb"; - repo = "surrealdb"; - rev = "v${version}"; - hash = "sha256-ICQvAyBV+7cyHiwwiPEaoGT/W/pM4yiSpqByzkByRK4="; - }; - - cargoHash = "sha256-a9ZRr6U7mKCk2uaXJmCJMaCQxJ9adbRLMRUpJrsookk="; - - # error: linker `aarch64-linux-gnu-gcc` not found - postPatch = '' - rm .cargo/config.toml - ''; - - PROTOC = "${protobuf}/bin/protoc"; - PROTOC_INCLUDE = "${protobuf}/include"; - - ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; - ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - - nativeBuildInputs = [ - pkg-config - rustPlatform.bindgenHook - ]; - - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; - - checkFlags = [ - # flaky - "--skip=ws_integration::none::merge" - ]; - - passthru.tests.version = testers.testVersion { - package = surrealdb; - command = "surreal version"; - }; - - meta = with lib; { - description = "A scalable, distributed, collaborative, document-graph database, for the realtime web"; - homepage = "https://surrealdb.com/"; - mainProgram = "surreal"; - license = licenses.bsl11; - maintainers = with maintainers; [ sikmir happysalada ]; - }; -} diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/servers/onlyoffice-documentserver/default.nix index bc5a41750f55..61ea3cf6fd94 100644 --- a/pkgs/servers/onlyoffice-documentserver/default.nix +++ b/pkgs/servers/onlyoffice-documentserver/default.nix @@ -137,12 +137,13 @@ let meta = with lib; { description = "ONLYOFFICE Document Server is an online office suite comprising viewers and editors"; + mainProgram = "documentserver-prepare4shutdown.sh"; longDescription = '' ONLYOFFICE Document Server is an online office suite comprising viewers and editors for texts, spreadsheets and presentations, fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and enabling collaborative editing in real time. ''; homepage = "ONLYOFFICE Document Server is an online office suite comprising viewers and editors"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = [ "x86_64-linux" ]; sourceProvenance = [ sourceTypes.binaryNativeCode ]; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index 422ee821cd50..fe6f36617d23 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -60,13 +60,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openvscode-server"; - version = "1.84.0"; + version = "1.87.1"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${finalAttrs.version}"; - hash = "sha256-kYKvJrHWKHDIqJsN0j1WFN3OBWwEyNgY5hjNHBg+kKQ="; + hash = "sha256-v9q0+qhgDhqejSI6ioAUNsAKK27o/Uo0KUtuAuSQYig="; }; yarnCache = stdenv.mkDerivation { @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-oW/JngHpXb8kscikscI7N9csSyZsZQgG75jOdWll6dw="; + outputHash = "sha256-oRuy7PjVv3Y24GQlvX4tPPndvKTgxbv7TR8ytTBY2DQ="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/osmocom/libosmo-sccp/default.nix b/pkgs/servers/osmocom/libosmo-sccp/default.nix index 39b6d845e01b..d8a27e2704fe 100644 --- a/pkgs/servers/osmocom/libosmo-sccp/default.nix +++ b/pkgs/servers/osmocom/libosmo-sccp/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SCCP + SIGTRAN (SUA/M3UA) libraries as well as OsmoSTP"; + mainProgram = "osmo-stp"; homepage = "https://osmocom.org/projects/libosmo-sccp"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/servers/osmocom/osmo-hnbgw/default.nix b/pkgs/servers/osmocom/osmo-hnbgw/default.nix index 3214667da333..30f0923073cb 100644 --- a/pkgs/servers/osmocom/osmo-hnbgw/default.nix +++ b/pkgs/servers/osmocom/osmo-hnbgw/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { meta = { description = "Osmocom Home NodeB Gateway, for attaching femtocells to the 3G CN (OsmoMSC, OsmoSGSN)"; + mainProgram = "osmo-hnbgw"; homepage = "https://osmocom.org/projects/osmohnbgw"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ janik ]; diff --git a/pkgs/servers/osmocom/osmo-hnodeb/default.nix b/pkgs/servers/osmocom/osmo-hnodeb/default.nix index 20f925dc98ee..95dd6bf72b70 100644 --- a/pkgs/servers/osmocom/osmo-hnodeb/default.nix +++ b/pkgs/servers/osmocom/osmo-hnodeb/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { meta = { description = "(upper layers of) HomeNodeB"; + mainProgram = "osmo-hnodeb"; homepage = "https://osmocom.org/projects/osmo-hnodeb"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ janik ]; diff --git a/pkgs/servers/osmocom/osmo-mgw/default.nix b/pkgs/servers/osmocom/osmo-mgw/default.nix index fb94451aaadd..939f062a7b4f 100644 --- a/pkgs/servers/osmocom/osmo-mgw/default.nix +++ b/pkgs/servers/osmocom/osmo-mgw/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { meta = { description = "Osmocom Media Gateway (MGW). speaks RTP and E1 as well as MGCP"; + mainProgram = "osmo-mgw"; homepage = "https://osmocom.org/projects/osmo-mgw"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ janik ]; diff --git a/pkgs/servers/osmocom/osmo-msc/default.nix b/pkgs/servers/osmocom/osmo-msc/default.nix index 1a46a010fbf9..da6e719707ef 100644 --- a/pkgs/servers/osmocom/osmo-msc/default.nix +++ b/pkgs/servers/osmocom/osmo-msc/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "Osmocom implementation of 3GPP Mobile Swtiching Centre (MSC)"; + mainProgram = "osmo-msc"; homepage = "https://osmocom.org/projects/osmomsc/wiki"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ janik ]; diff --git a/pkgs/servers/osmocom/osmo-pcu/default.nix b/pkgs/servers/osmocom/osmo-pcu/default.nix index 7349e03d9722..13b34b67b333 100644 --- a/pkgs/servers/osmocom/osmo-pcu/default.nix +++ b/pkgs/servers/osmocom/osmo-pcu/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Osmocom Packet control Unit (PCU): Network-side GPRS (RLC/MAC); BTS- or BSC-colocated"; + mainProgram = "osmo-pcu"; homepage = "https://osmocom.org/projects/osmopcu"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ janik ]; diff --git a/pkgs/servers/osmocom/osmo-sip-connector/default.nix b/pkgs/servers/osmocom/osmo-sip-connector/default.nix index 0dad592b7a30..0a5ab9ab9fd5 100644 --- a/pkgs/servers/osmocom/osmo-sip-connector/default.nix +++ b/pkgs/servers/osmocom/osmo-sip-connector/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { meta = { description = "This implements an interface between the MNCC (Mobile Network Call Control) interface of OsmoMSC (and also previously OsmoNITB) and SIP"; + mainProgram = "osmo-sip-connector"; homepage = "https://osmocom.org/projects/osmo-sip-conector"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ janik ]; diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix index 34e2315ff273..32e2141d2a9d 100644 --- a/pkgs/servers/pinnwand/steck.nix +++ b/pkgs/servers/pinnwand/steck.nix @@ -44,6 +44,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/supakeen/steck"; license = licenses.mit; description = "Client for pinnwand pastebin"; + mainProgram = "steck"; maintainers = with maintainers; [ hexa ]; }; } diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index c57c1bad3d87..a1876b1fa374 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -163,7 +163,7 @@ beamPackages.mixRelease rec { meta = with lib; { description = "ActivityPub microblogging server"; homepage = "https://git.pleroma.social/pleroma/pleroma"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ picnoir yuka kloenk yayayayaka ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index c6751136dd62..5b5af73e1805 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.40.0.7998-c29d4c0c8"; + version = "1.40.1.8227-c0dd5a73e"; 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 = "sha256-uVsOI6sItfq7wLP+xPOYSC9ueOv/lcDeL+vnrx1WdRA="; + sha256 = "16gc8fwb29x3l9s263xs9c7nb0i1rzgaps2wlx0cil8bs2a9izz8"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-ucxDtnGpfTpQURaGvLwohHeIZPE3aulXtoITRZCYA9c="; + sha256 = "03sx5fvwy2njpfh7k4xvkqscrxnafdvzh42g4hsn2hqxp0bqkl51"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/polaris/Cargo.lock b/pkgs/servers/polaris/Cargo.lock deleted file mode 100644 index 3a44683e8d2f..000000000000 --- a/pkgs/servers/polaris/Cargo.lock +++ /dev/null @@ -1,2731 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "actix-codec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8" -dependencies = [ - "bitflags 1.3.2", - "bytes", - "futures-core", - "futures-sink", - "memchr", - "pin-project-lite", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "actix-files" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d832782fac6ca7369a70c9ee9a20554623c5e51c76e190ad151780ebea1cf689" -dependencies = [ - "actix-http", - "actix-service", - "actix-utils", - "actix-web", - "askama_escape", - "bitflags 1.3.2", - "bytes", - "derive_more", - "futures-core", - "http-range", - "log", - "mime", - "mime_guess", - "percent-encoding", - "pin-project-lite", -] - -[[package]] -name = "actix-http" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9" -dependencies = [ - "actix-codec", - "actix-rt", - "actix-service", - "actix-utils", - "ahash", - "base64 0.21.3", - "bitflags 2.4.0", - "brotli", - "bytes", - "bytestring", - "derive_more", - "encoding_rs", - "flate2", - "futures-core", - "h2", - "http", - "httparse", - "httpdate", - "itoa", - "language-tags", - "local-channel", - "mime", - "percent-encoding", - "pin-project-lite", - "rand", - "sha1 0.10.5", - "smallvec", - "tokio", - "tokio-util", - "tracing", - "zstd", -] - -[[package]] -name = "actix-http-test" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff10f950882f80a9dc29fb5325db8f66a0692a7c9be3bf547f79e955b699b76" -dependencies = [ - "actix-codec", - "actix-rt", - "actix-server", - "actix-service", - "actix-tls", - "actix-utils", - "awc", - "bytes", - "futures-core", - "http", - "log", - "serde", - "serde_json", - "serde_urlencoded", - "slab", - "socket2 0.4.9", - "tokio", -] - -[[package]] -name = "actix-macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" -dependencies = [ - "quote", - "syn 2.0.31", -] - -[[package]] -name = "actix-router" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" -dependencies = [ - "bytestring", - "http", - "regex", - "serde", - "tracing", -] - -[[package]] -name = "actix-rt" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d" -dependencies = [ - "actix-macros", - "futures-core", - "tokio", -] - -[[package]] -name = "actix-server" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb13e7eef0423ea6eab0e59f6c72e7cb46d33691ad56a726b3cd07ddec2c2d4" -dependencies = [ - "actix-rt", - "actix-service", - "actix-utils", - "futures-core", - "futures-util", - "mio", - "socket2 0.5.3", - "tokio", - "tracing", -] - -[[package]] -name = "actix-service" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" -dependencies = [ - "futures-core", - "paste", - "pin-project-lite", -] - -[[package]] -name = "actix-test" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2173910d0c7d0a21730d3e1304576d9c969eead2b91f3257a7435f7face702e0" -dependencies = [ - "actix-codec", - "actix-http", - "actix-http-test", - "actix-rt", - "actix-service", - "actix-utils", - "actix-web", - "awc", - "futures-core", - "futures-util", - "log", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", -] - -[[package]] -name = "actix-tls" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72616e7fbec0aa99c6f3164677fa48ff5a60036d0799c98cab894a44f3e0efc3" -dependencies = [ - "actix-rt", - "actix-service", - "actix-utils", - "futures-core", - "http", - "impl-more", - "pin-project-lite", - "rustls 0.21.7", - "rustls-webpki 0.101.4", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "actix-utils" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" -dependencies = [ - "local-waker", - "pin-project-lite", -] - -[[package]] -name = "actix-web" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9" -dependencies = [ - "actix-codec", - "actix-http", - "actix-macros", - "actix-router", - "actix-rt", - "actix-server", - "actix-service", - "actix-utils", - "actix-web-codegen", - "ahash", - "bytes", - "bytestring", - "cfg-if", - "cookie 0.16.2", - "derive_more", - "encoding_rs", - "futures-core", - "futures-util", - "itoa", - "language-tags", - "log", - "mime", - "once_cell", - "pin-project-lite", - "regex", - "serde", - "serde_json", - "serde_urlencoded", - "smallvec", - "socket2 0.5.3", - "time 0.3.28", - "url", -] - -[[package]] -name = "actix-web-codegen" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5" -dependencies = [ - "actix-router", - "proc-macro2", - "quote", - "syn 2.0.31", -] - -[[package]] -name = "actix-web-httpauth" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dda62cf04bc3a9ad2ea8f314f721951cfdb4cdacec4e984d20e77c7bb170991" -dependencies = [ - "actix-utils", - "actix-web", - "base64 0.13.1", - "futures-core", - "futures-util", - "log", - "pin-project-lite", -] - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" -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 = "ape" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cdc864958f3a41f67f998dd2fe9635a525d2f232787d0268690b5e0876a2262" -dependencies = [ - "byteorder", -] - -[[package]] -name = "askama_escape" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "awc" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fa3c705a9c7917ac0f41c0757a0a747b43bbc29b0b364b081bd7c5fc67fb223" -dependencies = [ - "actix-codec", - "actix-http", - "actix-rt", - "actix-service", - "actix-tls", - "actix-utils", - "base64 0.21.3", - "bytes", - "cfg-if", - "cookie 0.16.2", - "derive_more", - "futures-core", - "futures-util", - "h2", - "http", - "itoa", - "log", - "mime", - "percent-encoding", - "pin-project-lite", - "rand", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", -] - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[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 = "branca" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04de6ca7d864c7bdf6da0d4f33c9c447794856070d89e697ce87fd43d75f5f3f" -dependencies = [ - "base-x", - "byteorder", - "orion", -] - -[[package]] -name = "brotli" -version = "3.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "bytestring" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238e4886760d98c4f899360c834fa93e62cf7f721ac3c2da375cbdf4b8679aae" -dependencies = [ - "bytes", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chunked_transfer" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca491388666e04d7248af3f60f0c40cfb0991c72205595d7c396e3510207d1a" - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cookie" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" -dependencies = [ - "percent-encoding", - "time 0.2.27", - "version_check", -] - -[[package]] -name = "cookie" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" -dependencies = [ - "percent-encoding", - "time 0.3.28", - "version_check", -] - -[[package]] -name = "cookie_store" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3" -dependencies = [ - "cookie 0.14.4", - "idna 0.2.3", - "log", - "publicsuffix", - "serde", - "serde_json", - "time 0.2.27", - "url", -] - -[[package]] -name = "cpufeatures" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[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-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[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 = "ct-codecs" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" - -[[package]] -name = "daemonize" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfdaacb3c887a54d41bdf48d3af8873b3f5566469f8ba21b92057509f116e" -dependencies = [ - "libc", -] - -[[package]] -name = "deranged" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 1.0.109", -] - -[[package]] -name = "diesel" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98235fdc2f355d330a8244184ab6b4b33c28679c0b4158f63138e51d6cf7e88" -dependencies = [ - "diesel_derives", - "libsqlite3-sys", - "r2d2", - "time 0.3.28", -] - -[[package]] -name = "diesel_derives" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e054665eaf6d97d1e7125512bb2d35d07c73ac86cc6920174cb42d1ab697a554" -dependencies = [ - "diesel_table_macro_syntax", - "proc-macro2", - "quote", - "syn 2.0.31", -] - -[[package]] -name = "diesel_migrations" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac" -dependencies = [ - "diesel", - "migrations_internals", - "migrations_macros", -] - -[[package]] -name = "diesel_table_macro_syntax" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" -dependencies = [ - "syn 2.0.31", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "fdeflate" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "fiat-crypto" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" - -[[package]] -name = "flate2" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[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.31", -] - -[[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-core", - "futures-macro", - "futures-sink", - "futures-task", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[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 = "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.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[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 = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64 0.21.3", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha1 0.10.5", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", -] - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[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-range" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" - -[[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 = "id3" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9389dd9c8c4671b1e4b2878a6329bccb573f9c24a75bc91c641c451ce5436501" -dependencies = [ - "bitflags 2.4.0", - "byteorder", - "flate2", -] - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[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 = "image" -version = "0.24.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif", - "jpeg-decoder", - "num-rational", - "num-traits", - "png", -] - -[[package]] -name = "impl-more" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" - -[[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", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown 0.14.0", -] - -[[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.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" - -[[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 = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lewton" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" -dependencies = [ - "byteorder", - "ogg", - "tinyvec", -] - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[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 = "local-channel" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f303ec0e94c6c54447f84f3b0ef7af769858a9c4ef56ef2a986d3dcd4c3fc9c" -dependencies = [ - "futures-core", - "futures-sink", - "futures-util", - "local-waker", -] - -[[package]] -name = "local-waker" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1" - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "memchr" -version = "2.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metaflac" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1470d3cc1bb0d692af5eb3afb594330b8ba09fd91c32c4e1c6322172a5ba750" -dependencies = [ - "byteorder", - "hex", - "log", -] - -[[package]] -name = "migrations_internals" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" -dependencies = [ - "serde", - "toml 0.7.8", -] - -[[package]] -name = "migrations_macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08" -dependencies = [ - "migrations_internals", - "proc-macro2", - "quote", -] - -[[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 = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys", -] - -[[package]] -name = "mp3-duration" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348bdc7300502f0801e5b57c448815713cd843b744ef9bda252a2698fdf90a0f" -dependencies = [ - "thiserror", -] - -[[package]] -name = "mp4ameta" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb23d62e8eb5299a3f79657c70ea9269eac8f6239a76952689bcd06a74057e81" -dependencies = [ - "lazy_static", - "mp4ameta_proc", -] - -[[package]] -name = "mp4ameta_proc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dcca13d1740c0a665f77104803360da0bdb3323ecce2e93fa2c959a6d52806" - -[[package]] -name = "native-windows-derive" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76134ae81020d89d154f619fd2495a2cecad204276b1dc21174b55e4d0975edd" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "native-windows-gui" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7003a669f68deb6b7c57d74fff4f8e533c44a3f0b297492440ef4ff5a28454" -dependencies = [ - "bitflags 1.3.2", - "lazy_static", - "winapi", - "winapi-build", -] - -[[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-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "object" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" -dependencies = [ - "memchr", -] - -[[package]] -name = "ogg" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" -dependencies = [ - "byteorder", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "opus_headers" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afbb993947f111397c2bc536944f8dac7f54a4e73383d478efe1990b56404b60" - -[[package]] -name = "orion" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11468cc6afd61a126fe3f91cc4cc8a0dbe7917d0a4b5e8357ba91cc47444462" -dependencies = [ - "ct-codecs", - "fiat-crypto", - "getrandom", - "subtle", - "zeroize", -] - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] - -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "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" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[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 = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "png" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polaris" -version = "0.14.1" -dependencies = [ - "actix-files", - "actix-test", - "actix-web", - "actix-web-httpauth", - "ape", - "base64 0.21.3", - "branca", - "crossbeam-channel", - "daemonize", - "diesel", - "diesel_migrations", - "fs_extra", - "futures-util", - "getopts", - "headers", - "http", - "id3", - "image", - "lewton", - "libsqlite3-sys", - "log", - "metaflac", - "mp3-duration", - "mp4ameta", - "native-windows-derive", - "native-windows-gui", - "num_cpus", - "opus_headers", - "pbkdf2", - "percent-encoding", - "rand", - "rayon", - "regex", - "rustfm-scrobble", - "sd-notify", - "serde", - "serde_derive", - "serde_json", - "simplelog", - "thiserror", - "toml 0.7.8", - "ureq 2.7.1", - "url", - "winres", -] - -[[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 0.5.11", -] - -[[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.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "publicsuffix" -version = "1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" -dependencies = [ - "idna 0.2.3", - "url", -] - -[[package]] -name = "qstring" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "r2d2" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" -dependencies = [ - "log", - "parking_lot", - "scheduled-thread-pool", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[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 = "regex" -version = "1.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[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", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[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.18", -] - -[[package]] -name = "rustfm-scrobble" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c46a75fb6409a528f7e0d8e99826684f88461d1b0d0edeec60d82e3f554dad5" -dependencies = [ - "md5", - "serde", - "serde_json", - "ureq 1.5.5", - "wrapped-vec", -] - -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.1", - "log", - "ring", - "sct 0.6.1", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.4", - "sct 0.7.0", -] - -[[package]] -name = "rustls-webpki" -version = "0.100.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "scheduled-thread-pool" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" -dependencies = [ - "parking_lot", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "sd-notify" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" - -[[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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.31", -] - -[[package]] -name = "serde_json" -version = "1.0.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[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_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 = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[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.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[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 = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simplelog" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" -dependencies = [ - "log", - "termcolor", - "time 0.3.28", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1 0.6.1", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[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.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.31", -] - -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros 0.1.1", - "version_check", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" -dependencies = [ - "deranged", - "itoa", - "libc", - "num_threads", - "serde", - "time-core", - "time-macros 0.2.14", -] - -[[package]] -name = "time-core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" -dependencies = [ - "time-core", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn 1.0.109", -] - -[[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 = "tokio" -version = "1.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.3", - "windows-sys", -] - -[[package]] -name = "tokio-util" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -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.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "log", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[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-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[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-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "ureq" -version = "1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b8b063c2d59218ae09f22b53c42eaad0d53516457905f5235ca4bc9e99daa71" -dependencies = [ - "base64 0.13.1", - "chunked_transfer", - "cookie 0.14.4", - "cookie_store", - "log", - "once_cell", - "qstring", - "rustls 0.19.1", - "url", - "webpki", - "webpki-roots 0.21.1", -] - -[[package]] -name = "ureq" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" -dependencies = [ - "base64 0.21.3", - "flate2", - "log", - "once_cell", - "rustls 0.21.7", - "rustls-webpki 0.100.2", - "url", - "webpki-roots 0.23.1", -] - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna 0.4.0", - "percent-encoding", -] - -[[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 = "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.31", - "wasm-bindgen-shared", -] - -[[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.31", - "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 = "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.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" -dependencies = [ - "webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.2", -] - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[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-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[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 = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" -dependencies = [ - "memchr", -] - -[[package]] -name = "winres" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" -dependencies = [ - "toml 0.5.11", -] - -[[package]] -name = "wrapped-vec" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85e08702c1e919669e1e90213c9c75ea4bb689d0f3970347e2b37c04600b4e5" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "zeroize" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" - -[[package]] -name = "zstd" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" -dependencies = [ - "zstd-safe", -] - -[[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.8+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" -dependencies = [ - "cc", - "libc", - "pkg-config", -] diff --git a/pkgs/servers/polaris/default.nix b/pkgs/servers/polaris/default.nix index 32435eefd20c..35ebd2d66d88 100644 --- a/pkgs/servers/polaris/default.nix +++ b/pkgs/servers/polaris/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "polaris"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "agersant"; repo = "polaris"; rev = version; - hash = "sha256-YI2IBlZm+RIFcZgXYh9HdxVpSMjPN/s9oBXDrb2V3iE="; + hash = "sha256-UC66xRL9GyTPHJ3z0DD/yyI9GlyqelCaHHDyl79ptJg="; # The polaris version upstream in Cargo.lock is "0.0.0". # We're unable to simply patch it in the patch phase due to @@ -30,9 +30,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-+4WN6TTIzVu3Jj0SfPq2jnYh0oWRo/C4qDMeJLrj1kk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 6e53489af971..8bb1f29de42d 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-fYIHpO36nnWZlhS5ExOeLIBTUV7RSQlImdQjiRIzpGU="; - aarch64-linux = "sha256-vnJiC5lUVMEl0SLLiKrY1nrZf9Lc89x7+GgqdeuXUFs="; - x86_64-darwin = "sha256-aba1OR7I5fDr1WmgK5gxwtt/5c8FCuR/U0XOD3I4oEM="; - x86_64-linux = "sha256-8yESqqILrYZXhOPXLrlEVkQca0MYRfzKO+GtFqyLeGs="; + aarch64-darwin = "sha256-mHXoX526X0PYNViHgAdCPTRX6cqzlCyYLybdY1LRS8c="; + aarch64-linux = "sha256-wgHASkz6RMtKzBehnbqXsNbF057eK0i6xpOmuefMVx8="; + x86_64-darwin = "sha256-3EkGKDDsuUdbTvBILBClwPVvXN5JzTWGHBaG2lmHQ7s="; + x86_64-linux = "sha256-l24/thKqDCJQbeirSYiL5sqH8LRs7k3rk0qY6DZQvD8="; }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.13.3.4273"; + version = "1.14.3.4333"; 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/pufferpanel/bump-sha1cd.patch b/pkgs/servers/pufferpanel/bump-sha1cd.patch deleted file mode 100644 index 944d4adac5d7..000000000000 --- a/pkgs/servers/pufferpanel/bump-sha1cd.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/go.mod b/go.mod -index 107660ef..8efd7ebf 100644 ---- a/go.mod -+++ b/go.mod -@@ -128,7 +128,7 @@ require ( - github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.6 // indirect - github.com/pierrec/lz4/v4 v4.1.2 // indirect -- github.com/pjbgf/sha1cd v0.2.0 // indirect -+ github.com/pjbgf/sha1cd v0.3.0 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/robfig/cron/v3 v3.0.1 // indirect - github.com/rogpeppe/go-internal v1.9.0 // indirect -diff --git a/go.sum b/go.sum -index 021d3ab9..13592e36 100644 ---- a/go.sum -+++ b/go.sum -@@ -485,8 +485,9 @@ github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvI - github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= - github.com/pierrec/lz4/v4 v4.1.2 h1:qvY3YFXRQE/XB8MlLzJH7mSzBs74eA2gg52YTk6jUPM= - github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= --github.com/pjbgf/sha1cd v0.2.0 h1:gIsJVwjbRviE4gydidGztxH1IlJQoYBcCrwG4Dz8wvM= - github.com/pjbgf/sha1cd v0.2.0/go.mod h1:HOK9QrgzdHpbc2Kzip0Q1yi3M2MFGPADtR6HjG65m5M= -+github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= -+github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= - github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ= - github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= - github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= diff --git a/pkgs/servers/pufferpanel/default.nix b/pkgs/servers/pufferpanel/default.nix index 2f56068df252..eb5558bf1d47 100644 --- a/pkgs/servers/pufferpanel/default.nix +++ b/pkgs/servers/pufferpanel/default.nix @@ -22,7 +22,8 @@ buildGoModule rec { patches = [ # Bump sha1cd package, otherwise i686-linux fails to build. - ./bump-sha1cd.patch + # Also bump github.com/swaggo/swag for PR 257790. + ./deps.patch # Seems to be an anti-feature. Startup is the only place where user/group is # hardcoded and checked. @@ -57,7 +58,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper go-swag ]; - vendorHash = "sha256-402ND99FpU+zNV1e5Th1+aZKok49cIEdpPPLLfNyL3E="; + vendorHash = "sha256-itiWROoIhnMbG9evH6X7kjClC4VdpX983d/SCwr4HbY="; proxyVendor = true; # Generate code for Swagger documentation endpoints (see web/swagger/docs.go). diff --git a/pkgs/servers/pufferpanel/deps.patch b/pkgs/servers/pufferpanel/deps.patch new file mode 100644 index 000000000000..c9d634609569 --- /dev/null +++ b/pkgs/servers/pufferpanel/deps.patch @@ -0,0 +1,146 @@ +diff --git a/go.mod b/go.mod +index e7ed3367..6022e4cd 100644 +--- a/go.mod ++++ b/go.mod +@@ -36,9 +36,9 @@ require ( + github.com/stretchr/testify v1.8.3 + github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a + github.com/swaggo/gin-swagger v1.5.3 +- github.com/swaggo/swag v1.8.8 +- golang.org/x/crypto v0.9.0 +- golang.org/x/sys v0.8.0 ++ github.com/swaggo/swag v1.16.3 ++ golang.org/x/crypto v0.14.0 ++ golang.org/x/sys v0.13.0 + gopkg.in/go-playground/validator.v9 v9.31.0 + gorm.io/driver/mysql v1.4.4 + gorm.io/driver/postgres v1.4.5 +@@ -132,7 +132,7 @@ require ( + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.8 // indirect + github.com/pierrec/lz4/v4 v4.1.2 // indirect +- github.com/pjbgf/sha1cd v0.2.0 // indirect ++ github.com/pjbgf/sha1cd v0.3.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/robfig/cron/v3 v3.0.1 // indirect + github.com/rogpeppe/go-internal v1.9.0 // indirect +@@ -151,12 +151,12 @@ require ( + github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect + github.com/yusufpapurcu/wmi v1.2.2 // indirect + golang.org/x/arch v0.3.0 // indirect +- golang.org/x/mod v0.8.0 // indirect +- golang.org/x/net v0.10.0 // indirect ++ golang.org/x/mod v0.9.0 // indirect ++ golang.org/x/net v0.17.0 // indirect + golang.org/x/sync v0.1.0 // indirect +- golang.org/x/term v0.8.0 // indirect +- golang.org/x/text v0.9.0 // indirect +- golang.org/x/tools v0.6.0 // indirect ++ golang.org/x/term v0.13.0 // indirect ++ golang.org/x/text v0.13.0 // indirect ++ golang.org/x/tools v0.7.0 // indirect + google.golang.org/protobuf v1.30.0 // indirect + gopkg.in/go-playground/assert.v1 v1.2.1 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect +diff --git a/go.sum b/go.sum +index 5be69957..b70625d4 100644 +--- a/go.sum ++++ b/go.sum +@@ -497,8 +497,9 @@ github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZ + github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= + github.com/pierrec/lz4/v4 v4.1.2 h1:qvY3YFXRQE/XB8MlLzJH7mSzBs74eA2gg52YTk6jUPM= + github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +-github.com/pjbgf/sha1cd v0.2.0 h1:gIsJVwjbRviE4gydidGztxH1IlJQoYBcCrwG4Dz8wvM= + github.com/pjbgf/sha1cd v0.2.0/go.mod h1:HOK9QrgzdHpbc2Kzip0Q1yi3M2MFGPADtR6HjG65m5M= ++github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= ++github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= + github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ= + github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= + github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +@@ -579,8 +580,8 @@ github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a/go.mod h1:lKJPbtWzJ9J + github.com/swaggo/gin-swagger v1.5.3 h1:8mWmHLolIbrhJJTflsaFoZzRBYVmEE7JZGIq08EiC0Q= + github.com/swaggo/gin-swagger v1.5.3/go.mod h1:3XJKSfHjDMB5dBo/0rrTXidPmgLeqsX89Yp4uA50HpI= + github.com/swaggo/swag v1.8.1/go.mod h1:ugemnJsPZm/kRwFUnzBlbHRd0JY9zE1M4F+uy2pAaPQ= +-github.com/swaggo/swag v1.8.8 h1:/GgJmrJ8/c0z4R4hoEPZ5UeEhVGdvsII4JbVDLbR7Xc= +-github.com/swaggo/swag v1.8.8/go.mod h1:ezQVUUhly8dludpVk+/PuwJWvLLanB13ygV5Pr9enSk= ++github.com/swaggo/swag v1.16.3 h1:PnCYjPCah8FK4I26l2F/KQ4yz3sILcVUN3cTlBFA9Pg= ++github.com/swaggo/swag v1.16.3/go.mod h1:DImHIuOFXKpMFAQjcC7FG4m3Dg4+QuUgUzJmKjI/gRk= + github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= + github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= + github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +@@ -651,8 +652,8 @@ golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0 + golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= + golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= + golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +-golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= +-golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= ++golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= ++golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= + golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= + golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= + golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +@@ -688,8 +689,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= + golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= + golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +-golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= +-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= ++golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= ++golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= + golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= + golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= + golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +@@ -733,8 +734,8 @@ golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su + golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= + golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= + golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +-golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= ++golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= ++golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= + golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= + golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= + golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +@@ -828,16 +829,16 @@ golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBc + golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= ++golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= + golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY= + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= + golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= + golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +-golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= +-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= ++golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= ++golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= + golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +@@ -847,8 +848,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= + golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= + golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= + golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= ++golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= ++golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= + golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= + golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= + golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +@@ -912,8 +913,8 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f + golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= + golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= + golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +-golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= ++golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= ++golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= + golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= + golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= + golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix index 843ca539daf8..417647f9a3c1 100644 --- a/pkgs/servers/pulseaudio/qpaeq.nix +++ b/pkgs/servers/pulseaudio/qpaeq.nix @@ -46,6 +46,7 @@ mkDerivation rec { meta = { description = "An equalizer interface for pulseaudio's equalizer sinks"; + mainProgram = "qpaeq"; homepage = "http://www.pulseaudio.org/"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ lovek323 ]; diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/servers/radicale/2.x.nix index 7e86322e31c6..c1e596669030 100644 --- a/pkgs/servers/radicale/2.x.nix +++ b/pkgs/servers/radicale/2.x.nix @@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://radicale.org/v2.html"; description = "CalDAV CardDAV server"; + mainProgram = "radicale"; longDescription = '' The Radicale Project is a complete CalDAV (calendar) and CardDAV (contact) server solution. Calendars and address books are available for diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 3df1ae7c4d1d..92db274bf708 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -1,34 +1,29 @@ { lib , python3 , fetchFromGitHub -, fetchpatch , nixosTests }: python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.1.8"; + version = "3.1.9"; + pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "v${version}"; - hash = "sha256-V0nqgxGUxcTRAYFuxpKUEVB/g/Mbvw+9OIcvAexXwuM="; + hash = "sha256-i4NQ1+ltRE0g8AoyGKKVcgZgSmLeppnobu6bf2+XmWY="; }; - patches = [ - # https://github.com/Kozea/Radicale/pull/1328 - (fetchpatch { - name = "fix-python3.11-tests.patch"; - url = "https://github.com/Kozea/Radicale/commit/110ec3a7885f523ce894a8c0e336c1a081dcd092.patch"; - hash = "sha256-WEiwzJ+Vzv8PXmZUi1X7Qzs+oE6qgmpvHqm/xiOMrt0="; - }) - ]; - postPatch = '' sed -i '/addopts/d' setup.cfg ''; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ defusedxml passlib @@ -44,12 +39,18 @@ python3.pkgs.buildPythonApplication rec { waitress ]; + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + passthru.tests = { inherit (nixosTests) radicale; }; meta = with lib; { homepage = "https://radicale.org/v3.html"; + changelog = "https://github.com/Kozea/Radicale/blob/${src.rev}/CHANGELOG.md"; description = "CalDAV and CardDAV server"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda erictapen ]; diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix index 1c7c76b2bd43..f034f83f4835 100644 --- a/pkgs/servers/rainloop/default.nix +++ b/pkgs/servers/rainloop/default.nix @@ -54,7 +54,7 @@ description = "Simple, modern & fast web-based email client"; homepage = "https://www.rainloop.net"; downloadPage = "https://github.com/RainLoop/rainloop-webmail/releases"; - license = with licenses; if edition == "" then unfree else agpl3; + license = with licenses; if edition == "" then unfree else agpl3Only; platforms = platforms.all; maintainers = with maintainers; [ das_j ]; }; diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index 2c80eb30e458..3f29cc8d7f23 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-uNZQizvOPygP+LVyBAGshBcfjC4rrX9mGtaqv8pBWKA="; - arm64-linux_hash = "sha256-6wXqUZ1D3E3LB+FlJDhQ0XVawHYQ2QtiAYOeJKZv/ek="; - x64-osx_hash = "sha256-JowEooaANOaMTlQCGuXwSp87EdULjbGmY+1RBfddcng="; + x64-linux_hash = "sha256-4kCDbmq47wb7OuE5JzHPZ/mM9w6wcupFblJieu5dFxc="; + arm64-linux_hash = "sha256-Val9dEB4E3dnfeXT2ERwE+VoITSXeA7Lc51dyz1jJyQ="; + x64-osx_hash = "sha256-LvjAeftlNw5F6YFyhKLW9Fv9UIk6AgnGnxOu6ctmQNg="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.19.2437"; + version = "0.3.20.2452"; 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 e593b2f57307..e99593bd8883 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.3.7"; + version = "23.3.9"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-z5V9u81skkCBDoYGyC3ThGKI4KhQEdtmBqJSEbBHPF0="; + sha256 = "sha256-CvHAjUwW1pkagebZQRXY51DazFCWRCD1seB46AwDVX8="; }; 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-dSCF44F+2GjWD/IcdA4fsfHsjVnX0bCXsG7r6C6ECak="; + vendorHash = "sha256-qjX0DVAZqr7Ec1dFs4zBlDpu69IkhgLkvy4FA7br7bk="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 767eb9e3631d..0ffa7871bd88 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1272"; + version = "2.0-1382"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-oLHdgOaGnu7hRm863ryf4r05nN8wQL7WKxN3ONG67J4="; + hash = "sha256-KOZkTsQrUYh3geezsA1h2ZcU3Ns/v67iD1QNWalA6H4="; }; dontConfigure = true; diff --git a/pkgs/servers/scylladb/configure-etc-osrelease.patch b/pkgs/servers/scylladb/configure-etc-osrelease.patch deleted file mode 100644 index 5fd6c7caf085..000000000000 --- a/pkgs/servers/scylladb/configure-etc-osrelease.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/configure.py b/configure.py -index 25ca951ac..454140420 100755 ---- a/configure.py -+++ b/configure.py -@@ -36,13 +36,16 @@ tempfile.tempdir = "./build/tmp" - - configure_args = str.join(' ', [shlex.quote(x) for x in sys.argv[1:]]) - --for line in open('/etc/os-release'): -- key, _, value = line.partition('=') -- value = value.strip().strip('"') -- if key == 'ID': -- os_ids = [value] -- if key == 'ID_LIKE': -- os_ids += value.split(' ') -+try: -+ for line in open('/etc/os-release'): -+ key, _, value = line.partition('=') -+ value = value.strip().strip('"') -+ if key == 'ID': -+ os_ids = [value] -+ if key == 'ID_LIKE': -+ os_ids += value.split(' ') -+except FileNotFoundError: -+ os_ids = ["linux"] - - - # distribution "internationalization", converting package names. diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix deleted file mode 100644 index ef55409d280f..000000000000 --- a/pkgs/servers/scylladb/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3Packages, - pkg-config, - gcc8Stdenv, - boost, - git, - systemd, - gnutls, - cmake, - makeWrapper, - ninja, - ragel, - hwloc, - jsoncpp, - antlr3, - numactl, - protobuf, - cryptopp, - libxfs, - yaml-cpp, - libsystemtap, - lksctp-tools, - lz4, - libxml2, - zlib, - libpciaccess, - snappy, - libtool, - thrift -}: -gcc8Stdenv.mkDerivation { - pname = "scylladb"; - version = "3.0.5"; - - src = fetchFromGitHub { - owner = "scylladb"; - repo = "scylla"; - rev = "403f66ecad6bc773712c69c4a80ebd172eb48b13"; - sha256 = "sha256-UXOPLA2dhspbH40/se0r+jCdiW82BR895rvnef8Er5I="; - fetchSubmodules = true; - }; - - patches = [ ./seastar-configure-script-paths.patch ./configure-etc-osrelease.patch ]; - - nativeBuildInputs = [ - pkg-config - cmake - makeWrapper - ninja - ]; - - buildInputs = [ - antlr3 - python3Packages.pyparsing - boost - git - systemd - gnutls - ragel - jsoncpp - numactl - protobuf - cryptopp - libxfs - yaml-cpp - libsystemtap - lksctp-tools - lz4 - libxml2 - zlib - libpciaccess - snappy - libtool - thrift - ]; - - postPatch = '' - patchShebangs ./configure.py - patchShebangs seastar/json/json2code.py - ''; - - configurePhase = '' - ./configure.py --mode=release - ''; - - installPhase = '' - mkdir $out - cp -r * $out/ - ''; - - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - description = "NoSQL data store using the seastar framework, compatible with Apache Cassandra"; - homepage = "https://scylladb.com"; - license = licenses.agpl3; - platforms = lib.platforms.linux; - hydraPlatforms = []; # It's huge ATM, about 18 GB. - maintainers = [ lib.maintainers.farlion ]; - broken = true; - }; -} diff --git a/pkgs/servers/scylladb/seastar-configure-script-paths.patch b/pkgs/servers/scylladb/seastar-configure-script-paths.patch deleted file mode 100644 index 19c5c8161296..000000000000 --- a/pkgs/servers/scylladb/seastar-configure-script-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/seastar/configure.py b/seastar/configure.py -index 62d9c204..f6520635 100755 ---- a/seastar/configure.py -+++ b/seastar/configure.py -@@ -924,7 +924,7 @@ with open(buildfile, 'w') as f: - command = ragel -G2 -o $out $in && sed -i -e '1h;2,$$H;$$!d;g' -re 's/static const char _nfa[^;]*;//g' $out - description = RAGEL $out - rule gen -- command = /bin/echo -e $text > $out -+ command = echo -e $text > $out - description = GEN $out - rule swagger - command = json/json2code.py -f $in -o $out diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 07f86a9ae808..e9bd1a2ae58e 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "groonga"; - version = "13.1.1"; + version = "14.0.1"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/groonga-${finalAttrs.version}.tar.gz"; - hash = "sha256-eggMegWTpv+WIbzYq2GjSD66+Tj7zcvVUcbD2EkrFO8="; + hash = "sha256-zXiDXYSvdyQ2HBZHUZaYHtZMs7BjzHJaix1ShLbkWtA="; }; patches = [ diff --git a/pkgs/servers/search/lnx/default.nix b/pkgs/servers/search/lnx/default.nix index 5bb41267d26f..34b9f9c7c5ba 100644 --- a/pkgs/servers/search/lnx/default.nix +++ b/pkgs/servers/search/lnx/default.nix @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage { buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; meta = with lib; { description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants. "; + mainProgram = "lnx"; homepage = "https://lnx.rs/"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock index 37c8e8ec207c..18858d021413 100644 --- a/pkgs/servers/search/meilisearch/Cargo.lock +++ b/pkgs/servers/search/meilisearch/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "actix-cors" -version = "0.6.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b340e9cfa5b08690aae90fb61beb44e9b06f44fe3d0f93781aaa58cfba86245e" +checksum = "f9e772b3bcafe335042b5db010ab7c09013dad6eac4915c91d8d50902769f331" dependencies = [ "actix-utils", "actix-web", @@ -36,18 +36,18 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.3.1" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2079246596c18b4a33e274ae10c0e50613f4d32a4198e09c7b93771013fed74" +checksum = "d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-tls", "actix-utils", - "ahash 0.8.3", - "base64 0.21.5", - "bitflags 1.3.2", + "ahash", + "base64 0.21.7", + "bitflags 2.4.1", "brotli", "bytes", "bytestring", @@ -56,7 +56,7 @@ dependencies = [ "flate2", "futures-core", "h2", - "http 0.2.9", + "http 0.2.11", "httparse", "httpdate", "itoa", @@ -80,7 +80,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -90,7 +90,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" dependencies = [ "bytestring", - "http 0.2.9", + "http 0.2.11", "regex", "serde", "tracing", @@ -98,9 +98,9 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e" +checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d" dependencies = [ "actix-macros", "futures-core", @@ -138,19 +138,20 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.0.3" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fde0cf292f7cdc7f070803cb9a0d45c018441321a78b1042ffbbb81ec333297" +checksum = "d4cce60a2f2b477bc72e5cde0af1812a6e82d8fd85b5570a5dcf2a5bf2c5be5f" dependencies = [ - "actix-codec", "actix-rt", "actix-service", "actix-utils", "futures-core", - "log", + "impl-more", "pin-project-lite", + "tokio", "tokio-rustls 0.23.4", "tokio-util", + "tracing", "webpki-roots 0.22.6", ] @@ -166,9 +167,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.3.1" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96" +checksum = "43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984" dependencies = [ "actix-codec", "actix-http", @@ -180,7 +181,7 @@ dependencies = [ "actix-tls", "actix-utils", "actix-web-codegen", - "ahash 0.7.6", + "ahash", "bytes", "bytestring", "cfg-if", @@ -189,7 +190,6 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "http 0.2.9", "itoa", "language-tags", "log", @@ -201,7 +201,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "smallvec", - "socket2 0.4.9", + "socket2 0.5.5", "time", "url", ] @@ -257,25 +257,15 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.3" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -303,6 +293,12 @@ dependencies = [ ] [[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] name = "anes" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -310,9 +306,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" dependencies = [ "anstyle", "anstyle-parse", @@ -358,9 +354,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" dependencies = [ "backtrace", ] @@ -373,24 +369,25 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" [[package]] name = "arbitrary" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" dependencies = [ "derive_arbitrary", ] [[package]] name = "arroy" -version = "0.1.0" -source = "git+https://github.com/meilisearch/arroy.git#d372648212e561a4845077cdb9239423d78655a2" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efddeb1e7c32a551cc07ef4c3e181e3cd5478fdaf4f0bd799983171c1f6efe57" dependencies = [ "bytemuck", "byteorder", "heed", "log", - "memmap2 0.9.0", - "ordered-float 4.2.0", + "memmap2 0.9.3", + "ordered-float", "rand", "rayon", "roaring", @@ -427,21 +424,27 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] +name = "atomic" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" + +[[package]] name = "atomic-polyfill" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -479,9 +482,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -491,7 +494,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "benchmarks" -version = "1.6.2" +version = "1.7.3" dependencies = [ "anyhow", "bytes", @@ -533,6 +536,26 @@ dependencies = [ ] [[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.48", +] + +[[package]] name = "bit-set" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -573,9 +596,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -584,9 +607,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -594,16 +617,25 @@ dependencies = [ [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", - "regex-automata 0.4.3", + "regex-automata", "serde", ] [[package]] +name = "build-info" +version = "1.7.3" +dependencies = [ + "anyhow", + "time", + "vergen-git2", +] + +[[package]] name = "bumpalo" version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -642,7 +674,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -653,9 +685,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bytestring" @@ -688,24 +720,25 @@ dependencies = [ ] [[package]] -name = "calendrical_calculations" -version = "0.1.0" +name = "camino" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dfe3bc6a50b4667fafdb6d9cf26731c5418c457e317d8166c972014facf9a5d" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ - "core_maths", - "displaydoc", + "serde", ] [[package]] name = "candle-core" -version = "0.3.1" -source = "git+https://github.com/huggingface/candle.git#f4fcf6090045ac44122fd5f0a7e46db6e3e16528" +version = "0.3.3" +source = "git+https://github.com/huggingface/candle.git#5270224f407502b82fe90bc2622894ce3871b002" dependencies = [ "byteorder", + "candle-kernels", + "cudarc", "gemm", "half 2.3.1", - "memmap2 0.7.1", + "memmap2 0.9.3", "num-traits", "num_cpus", "rand", @@ -718,10 +751,20 @@ dependencies = [ ] [[package]] -name = "candle-nn" +name = "candle-kernels" version = "0.3.1" source = "git+https://github.com/huggingface/candle.git#f4fcf6090045ac44122fd5f0a7e46db6e3e16528" dependencies = [ + "anyhow", + "glob", + "rayon", +] + +[[package]] +name = "candle-nn" +version = "0.3.3" +source = "git+https://github.com/huggingface/candle.git#5270224f407502b82fe90bc2622894ce3871b002" +dependencies = [ "candle-core", "half 2.3.1", "num-traits", @@ -733,8 +776,8 @@ dependencies = [ [[package]] name = "candle-transformers" -version = "0.3.1" -source = "git+https://github.com/huggingface/candle.git#f4fcf6090045ac44122fd5f0a7e46db6e3e16528" +version = "0.3.3" +source = "git+https://github.com/huggingface/candle.git#5270224f407502b82fe90bc2622894ce3871b002" dependencies = [ "byteorder", "candle-core", @@ -750,10 +793,33 @@ dependencies = [ ] [[package]] +name = "cargo-platform" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] + +[[package]] name = "cargo_toml" -version = "0.15.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +checksum = "802b755090e39835a4b0440fb0bbee0df7495a8b337f63db21e616f7821c7e8c" dependencies = [ "serde", "toml", @@ -767,9 +833,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", "libc", @@ -785,6 +851,15 @@ dependencies = [ ] [[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" @@ -802,9 +877,9 @@ dependencies = [ [[package]] name = "charabia" -version = "0.8.5" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb924701d850fbf0331302e7f9715c04e494b4b9bebb38ac48bdd30924e1936" +checksum = "3a9071b1586dd067b5fdfd2069fab932c047ca5bbce4bd2bdee8af0f4b155053" dependencies = [ "aho-corasick", "cow-utils", @@ -812,15 +887,12 @@ dependencies = [ "deunicode", "either", "fst", - "icu", - "icu_provider", - "icu_provider_blob", "irg-kvariants", "jieba-rs", "lindera-core", "lindera-dictionary", "lindera-tokenizer", - "litemap 0.6.1", + "litemap", "once_cell", "pinyin", "serde", @@ -828,7 +900,7 @@ dependencies = [ "unicode-normalization", "wana_kana", "whatlang", - "zerovec 0.9.6", + "zerovec", ] [[package]] @@ -869,10 +941,21 @@ dependencies = [ ] [[package]] +name = "clang-sys" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] name = "clap" -version = "4.4.8" +version = "4.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "80932e03c33999b9235edb8655bc9df3204adc9887c2f95b50cb1deb9fd54253" dependencies = [ "clap_builder", "clap_derive", @@ -880,9 +963,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "d6c0db58c659eef1c73e444d298c27322a1b52f6927d2ad470c0c0f96fa7b8fa" dependencies = [ "anstream", "anstyle", @@ -899,7 +982,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -909,10 +992,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] -name = "cobs" -version = "0.2.3" +name = "color-spantrace" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] [[package]] name = "colorchoice" @@ -958,12 +1047,6 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "convert_case" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" - -[[package]] -name = "convert_case" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" @@ -999,15 +1082,6 @@ 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" @@ -1075,11 +1149,10 @@ checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" [[package]] name = "crossbeam" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -1089,56 +1162,46 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -1158,9 +1221,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -1170,21 +1233,40 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] [[package]] +name = "cudarc" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9395df0cab995685664e79cc35ad6302bf08fb9c5d82301875a183affe1278b1" +dependencies = [ + "half 2.3.1", +] + +[[package]] name = "darling" version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "darling_core", - "darling_macro", + "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]] @@ -1202,23 +1284,48 @@ dependencies = [ ] [[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.48", +] + +[[package]] name = "darling_macro" version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ - "darling_core", + "darling_core 0.14.4", "quote", "syn 1.0.109", ] [[package]] -name = "deduplicating_array" -version = "0.1.5" +name = "darling_macro" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a636096586ca093a10ac0175bfb384d024089dca0dae54e3e69bc1c1596358e8" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ - "serde", + "darling_core 0.20.3", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "uuid", ] [[package]] @@ -1233,13 +1340,13 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -1248,7 +1355,16 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" dependencies = [ - "derive_builder_macro", + "derive_builder_macro 0.12.0", +] + +[[package]] +name = "derive_builder" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f59169f400d8087f238c5c0c7db6a28af18681717f3b623227d92f397e938c7" +dependencies = [ + "derive_builder_macro 0.13.1", ] [[package]] @@ -1257,7 +1373,19 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" dependencies = [ - "darling", + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_core" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4ec317cc3e7ef0928b0ca6e4a634a4d6c001672ae210438cf114a83e56b018d" +dependencies = [ + "darling 0.14.4", "proc-macro2", "quote", "syn 1.0.109", @@ -1269,7 +1397,17 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" dependencies = [ - "derive_builder_core", + "derive_builder_core 0.12.0", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870368c3fb35b8031abb378861d4460f573b92238ec2152c927a21f77e3e0127" +dependencies = [ + "derive_builder_core 0.13.1", "syn 1.0.109", ] @@ -1288,9 +1426,9 @@ dependencies = [ [[package]] name = "deserr" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61d55a63aabcb2f7893231e6b8ddf8acc00814d20a64463e52cf9b603ec326ee" +checksum = "3418e814bb893a61b25a60db71dccab7cb70035d94ffe58c9b4a70387ac42083" dependencies = [ "actix-http", "actix-utils", @@ -1305,21 +1443,21 @@ dependencies = [ [[package]] name = "deserr-internal" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4d5c86e5d887d880c7a3572a8041bfb3011acc81df86318855ea2cae66f3ef" +checksum = "9cadd9624c995ecbd6d6c81ec0804fbbb335e3acba5326a06067ccd33295a37e" dependencies = [ - "convert_case 0.5.0", + "convert_case 0.6.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "deunicode" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1bba4f227a4a53d12b653f50ca7bf10c9119ae2aba56aff9e0338b5c98f36a" +checksum = "3ae2a35373c5c74340b79ae6780b498b2b183915ec5dacf263aac5a099bf485a" [[package]] name = "digest" @@ -1375,17 +1513,6 @@ 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" @@ -1402,13 +1529,12 @@ dependencies = [ [[package]] name = "dump" -version = "1.6.2" +version = "1.7.3" dependencies = [ "anyhow", "big_s", "flate2", - "http 0.2.9", - "log", + "http 0.2.11", "maplit", "meili-snap", "meilisearch-auth", @@ -1422,7 +1548,8 @@ dependencies = [ "tempfile", "thiserror", "time", - "uuid 1.5.0", + "tracing", + "uuid", ] [[package]] @@ -1445,12 +1572,6 @@ dependencies = [ ] [[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" @@ -1539,30 +1660,42 @@ dependencies = [ ] [[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] name = "enum-iterator" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" +checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" +checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[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", @@ -1595,9 +1728,9 @@ checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" [[package]] name = "fancy-regex" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05" dependencies = [ "bit-set", "regex", @@ -1605,15 +1738,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "faux" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3b5e56a69ca67c241191cd9d484e14fb0fe89f5e539c2e8448eafd1f65c1f0" +checksum = "14b55a7f424e532314115b5cdc6d9711b15ac453bfe0dcfa212baebc5efacd60" dependencies = [ "faux_macros", "paste", @@ -1621,25 +1754,26 @@ dependencies = [ [[package]] name = "faux_macros" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c9bb4a2c13ffb3a93a39902aaf4e7190a1706a4779b6db0449aee433d26c4a" +checksum = "d15473d7f83b54a44826907af16ae5727eaacaf6e53b51474016d3efd9aa35d5" dependencies = [ - "darling", + "darling 0.20.3", "proc-macro2", "quote", - "syn 1.0.109", - "uuid 0.8.2", + "syn 2.0.48", + "uuid", ] [[package]] name = "file-store" -version = "1.6.2" +version = "1.7.3" dependencies = [ "faux", "tempfile", "thiserror", - "uuid 1.5.0", + "tracing", + "uuid", ] [[package]] @@ -1656,7 +1790,7 @@ dependencies = [ [[package]] name = "filter-parser" -version = "1.6.2" +version = "1.7.3" dependencies = [ "insta", "nom", @@ -1665,17 +1799,6 @@ dependencies = [ ] [[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.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1687,7 +1810,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "1.6.2" +version = "1.7.3" dependencies = [ "criterion", "serde_json", @@ -1716,9 +1839,9 @@ checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1731,9 +1854,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1741,15 +1864,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1758,38 +1881,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1805,7 +1928,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.6.2" +version = "1.7.3" dependencies = [ "arbitrary", "clap", @@ -1826,10 +1949,23 @@ dependencies = [ ] [[package]] +name = "fxprof-processed-profile" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" +dependencies = [ + "bitflags 2.4.1", + "debugid", + "fxhash", + "serde", + "serde_json", +] + +[[package]] name = "gemm" -version = "0.16.15" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3afa707040531a7527477fd63a81ea4f6f3d26037a2f96776e57fb843b258e" +checksum = "e97d506c68f4fb12325b52a638e7d54cc87e3593a4ded0de60218b6dfd65f645" dependencies = [ "dyn-stack", "gemm-c32", @@ -1847,9 +1983,9 @@ dependencies = [ [[package]] name = "gemm-c32" -version = "0.16.15" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cc3973a4c30c73f26a099113953d0c772bb17ee2e07976c0a06b8fe1f38a57d" +checksum = "0dd16f26e8f34661edc906d8c9522b59ec1655c865a98a58950d0246eeaca9da" dependencies = [ "dyn-stack", "gemm-common", @@ -1862,9 +1998,9 @@ dependencies = [ [[package]] name = "gemm-c64" -version = "0.16.15" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30362894b93dada374442cb2edf4512ddf19513c9bec88e06a445bcb6b22e64f" +checksum = "a8e34381bc060b47fbd25522a281799ef763cd27f43bbd1783d935774659242a" dependencies = [ "dyn-stack", "gemm-common", @@ -1877,9 +2013,9 @@ dependencies = [ [[package]] name = "gemm-common" -version = "0.16.15" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "988499faa80566b046b4fee2c5f15af55b5a20c1fe8486b112ebb34efa045ad6" +checksum = "22518a76339b09276f77c3166c44262e55f633712fe8a44fd0573505887feeab" dependencies = [ "bytemuck", "dyn-stack", @@ -1892,13 +2028,14 @@ dependencies = [ "raw-cpuid", "rayon", "seq-macro", + "sysctl", ] [[package]] name = "gemm-f16" -version = "0.16.15" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6cf2854a12371684c38d9a865063a27661812a3ff5803454c5742e8f5a388ce" +checksum = "70409bbf3ef83b38cbe4a58cd4b797c1c27902505bdd926a588ea61b6c550a84" dependencies = [ "dyn-stack", "gemm-common", @@ -1914,9 +2051,9 @@ dependencies = [ [[package]] name = "gemm-f32" -version = "0.16.15" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bc84003cf6d950a7c7ca714ad6db281b6cef5c7d462f5cd9ad90ea2409c7227" +checksum = "5ea3068edca27f100964157211782eba19e961aa4d0d2bdac3e1775a51aa7680" dependencies = [ "dyn-stack", "gemm-common", @@ -1929,9 +2066,9 @@ dependencies = [ [[package]] name = "gemm-f64" -version = "0.16.15" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35187ef101a71eed0ecd26fb4a6255b4192a12f1c5335f3a795698f2d9b6cf33" +checksum = "5fd41e8f5a60dce8d8acd852a3f4b22f8e18be957e1937731be692c037652510" dependencies = [ "dyn-stack", "gemm-common", @@ -1989,11 +2126,11 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "git2" -version = "0.16.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" +checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "libc", "libgit2-sys", "log", @@ -2020,17 +2157,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.9", - "indexmap 1.9.3", + "http 0.2.11", + "indexmap", "slab", "tokio", "tokio-util", @@ -2068,20 +2205,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.7.6", + "ahash", + "allocator-api2", ] [[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] name = "heapless" version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2177,9 +2309,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -2204,7 +2336,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http 0.2.9", + "http 0.2.11", "pin-project-lite", ] @@ -2237,7 +2369,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 0.2.9", + "http 0.2.11", "http-body", "httparse", "httpdate", @@ -2257,495 +2389,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ "futures-util", - "http 0.2.9", + "http 0.2.11", "hyper", - "rustls 0.21.6", + "rustls 0.21.10", "tokio", "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]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2762,27 +2413,32 @@ dependencies = [ ] [[package]] +name = "impl-more" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" + +[[package]] name = "index-scheduler" -version = "1.6.2" +version = "1.7.3" dependencies = [ "anyhow", "big_s", "bincode", "crossbeam", "csv", - "derive_builder", + "derive_builder 0.12.0", "dump", "enum-iterator", "file-store", "flate2", "insta", - "log", "meili-snap", "meilisearch-auth", "meilisearch-types", - "nelson", "page_size 0.5.0", "puffin", + "rayon", "roaring", "serde", "serde_json", @@ -2790,28 +2446,19 @@ dependencies = [ "tempfile", "thiserror", "time", + "tracing", "ureq", - "uuid 1.5.0", + "uuid", ] [[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", -] - -[[package]] -name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown", "serde", ] @@ -2839,9 +2486,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.31.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "lazy_static", @@ -2892,13 +2539,13 @@ dependencies = [ [[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 0.38.26", - "windows-sys 0.48.0", + "rustix 0.38.31", + "windows-sys 0.52.0", ] [[package]] @@ -2933,7 +2580,7 @@ checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e" dependencies = [ "cedarwood", "fxhash", - "hashbrown 0.14.0", + "hashbrown", "lazy_static", "phf", "phf_codegen", @@ -2960,7 +2607,7 @@ dependencies = [ [[package]] name = "json-depth-checker" -version = "1.6.2" +version = "1.7.3" dependencies = [ "criterion", "serde_json", @@ -2972,9 +2619,9 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "pem", - "ring", + "ring 0.16.20", "serde", "serde_json", "simple_asn1", @@ -3003,6 +2650,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] name = "levenshtein_automata" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3013,15 +2666,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libgit2-sys" -version = "0.14.2+1.5.1" +version = "0.16.2+1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" dependencies = [ "cc", "libc", @@ -3030,6 +2683,16 @@ dependencies = [ ] [[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] name = "libm" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3037,19 +2700,30 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmimalloc-sys" -version = "0.1.33" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" dependencies = [ "cc", "libc", ] [[package]] +name = "libproc" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229004ebba9d1d5caf41623f1523b6d52abb47d9f6ab87f7e6fc992e3b854aef" +dependencies = [ + "bindgen", + "errno", + "libc", +] + +[[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" dependencies = [ "cc", "libc", @@ -3059,9 +2733,9 @@ dependencies = [ [[package]] name = "lindera-cc-cedict-builder" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f567a47e47b5420908424de2c6c5e424e3cafe588d0146bd128c0f3755758a3" +checksum = "a90d23f7cef31c6ab7ac0d4f3b23940754207f7b5a80b080c39193caffe99ac2" dependencies = [ "anyhow", "bincode", @@ -3078,9 +2752,9 @@ dependencies = [ [[package]] name = "lindera-compress" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f3e553d55ebe9881fa5e5de588b0a153456e93564d17dfbef498912caf63a2" +checksum = "1927b7d2bd4ffc19e07691bf8609722663c341f80260a1c636cee8f1ec420dce" dependencies = [ "anyhow", "flate2", @@ -3089,9 +2763,9 @@ dependencies = [ [[package]] name = "lindera-core" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a2440cc156a4a911a174ec68203543d1efb10df3a700a59b6bf581e453c726" +checksum = "3299caa2b81c9a076535a4651a83bf7d624c15f2349f243187fffc64b5a78251" dependencies = [ "anyhow", "bincode", @@ -3106,9 +2780,9 @@ dependencies = [ [[package]] name = "lindera-decompress" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e077a410e61c962cb526f71b7effd62ffc607488a8f61869c937582d2ccb529b" +checksum = "7b82b8d2323a67dc8ff0c40751d199b7ba94cd5e3c13a5b31622d318acc79e5b" dependencies = [ "anyhow", "flate2", @@ -3117,9 +2791,9 @@ dependencies = [ [[package]] name = "lindera-dictionary" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f57491adf7b311a3ee87f5e4a36454df16a2ec73de4ef28b2106fac80bd782" +checksum = "cddf783b459d54b130d956889bec052c25fcb478a304e03fa9b2289387572bc5" dependencies = [ "anyhow", "bincode", @@ -3137,9 +2811,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-builder" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3476ec7748aebd2eb23d496ddfce5e7e0a5c031cffcd214451043e02d029f11" +checksum = "27c708f08f14b0806f6c4cce5324b4bcba27209463026b78c31f399f8be9d30d" dependencies = [ "anyhow", "bincode", @@ -3158,9 +2832,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-neologd-builder" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1c7576a02d5e4af2bf62de51790a01bc4b8bc0d0b6a6b86a46b157f5cb306d" +checksum = "e5e67eb91652203d202f7d27ead220d1d8c9099552709b8429eae9c70f2312fb" dependencies = [ "anyhow", "bincode", @@ -3179,9 +2853,9 @@ dependencies = [ [[package]] name = "lindera-ko-dic" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b713ecd5b827d7d448c3c5eb3c6d5899ecaf22cd17087599996349a02c76828d" +checksum = "d45da8d9a5888f4d4e78bb29fc82ff9ae519962efb0d2d92343b6cf8e373952f" dependencies = [ "bincode", "byteorder", @@ -3196,9 +2870,9 @@ dependencies = [ [[package]] name = "lindera-ko-dic-builder" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e545752f6487be87b572529ad594cb3b48d2ef20821516f598b2d152d23277b" +checksum = "41c0933295dc945178bbc08f34111dc3ef22bfee38820f78453c8f8d4f3463d1" dependencies = [ "anyhow", "bincode", @@ -3216,9 +2890,9 @@ dependencies = [ [[package]] name = "lindera-tokenizer" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a2d4606a5a4da62ac4a3680ee884a75da7f0c892dc967fc9cb983ceba39a8f" +checksum = "348ce9bb3f2e5edc577420b98cca05b2177f3af50ef5ae278a1d8a1351d56197" dependencies = [ "bincode", "byteorder", @@ -3231,9 +2905,9 @@ dependencies = [ [[package]] name = "lindera-unidic" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388b1bdf81794b5d5b8057ce0321c58ff4b90d676b637948ccc7863ae2f43d28" +checksum = "74022a57c395ed7e213a9cd5833207e3c583145078ee9a164aeaec68b30c9d8e" dependencies = [ "bincode", "byteorder", @@ -3248,9 +2922,9 @@ dependencies = [ [[package]] name = "lindera-unidic-builder" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdfa3e29a22c047da57fadd960ff674b720de15a1e2fb35b5ed67f3408afb469" +checksum = "a34e5564ee81af82603cd6a03c3abe6e17cc0ae598bfa5078809f06e59e96e08" dependencies = [ "anyhow", "bincode", @@ -3323,7 +2997,7 @@ checksum = "fc2fb41a9bb4257a3803154bdf7e2df7d45197d1941c9b1a90ad815231630721" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -3343,18 +3017,9 @@ dependencies = [ [[package]] name = "litemap" -version = "0.6.1" +version = "0.7.2" 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", -] +checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" [[package]] name = "lmdb-master-sys" @@ -3403,28 +3068,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] -name = "logging_timer" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e96f261d684b7089aa576bb74e823241dccd994b27d30fabf1dcb3af284fe9" -dependencies = [ - "log", - "logging_timer_proc_macros", -] - -[[package]] -name = "logging_timer_proc_macros" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a9062912d7952c5588cc474795e0b9ee008e7e6781127945b85413d4b99d81" -dependencies = [ - "log", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "lz4_flex" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3448,14 +3091,14 @@ checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" [[package]] name = "manifest-dir-macros" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450e5ef583bc05177c4975b9ea907047091a9f62e74e81fcafb99dbffac51e7e" +checksum = "9c6d40de1ccdbf8bde2eaa0750595478a368f7b3a3f89c426e3454f64e29f593" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -3472,7 +3115,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.6.2" +version = "1.7.3" dependencies = [ "insta", "md5", @@ -3481,7 +3124,7 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.6.2" +version = "1.7.3" dependencies = [ "actix-cors", "actix-http", @@ -3495,6 +3138,7 @@ dependencies = [ "async-trait", "brotli", "bstr", + "build-info", "byte-unit", "bytes", "cargo_toml", @@ -3503,22 +3147,20 @@ dependencies = [ "deserr", "dump", "either", - "env_logger", "file-store", "flate2", "fst", "futures", "futures-util", "hex", - "http 0.2.9", + "http 0.2.11", "index-scheduler", - "indexmap 2.0.0", + "indexmap", "insta", "is-terminal", "itertools 0.11.0", "jsonwebtoken", "lazy_static", - "log", "manifest-dir-macros", "maplit", "meili-snap", @@ -3529,7 +3171,7 @@ dependencies = [ "num_cpus", "obkv", "once_cell", - "ordered-float 3.7.0", + "ordered-float", "parking_lot", "permissive-json-pointer", "pin-project-lite", @@ -3540,7 +3182,7 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustls 0.20.8", + "rustls 0.20.9", "rustls-pemfile", "segment", "serde", @@ -3548,7 +3190,7 @@ dependencies = [ "serde_urlencoded", "sha-1", "sha2", - "siphasher", + "siphasher 1.0.0", "slice-group-by", "static-files", "sysinfo", @@ -3561,10 +3203,13 @@ dependencies = [ "tokio", "tokio-stream", "toml", + "tracing", + "tracing-actix-web", + "tracing-subscriber", + "tracing-trace", "url", "urlencoding", - "uuid 1.5.0", - "vergen", + "uuid", "walkdir", "yaup", "zip", @@ -3572,9 +3217,9 @@ dependencies = [ [[package]] name = "meilisearch-auth" -version = "1.6.2" +version = "1.7.3" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "enum-iterator", "hmac", "maplit", @@ -3586,12 +3231,12 @@ dependencies = [ "sha2", "thiserror", "time", - "uuid 1.5.0", + "uuid", ] [[package]] name = "meilisearch-types" -version = "1.6.2" +version = "1.7.3" dependencies = [ "actix-web", "anyhow", @@ -3616,12 +3261,12 @@ dependencies = [ "thiserror", "time", "tokio", - "uuid 1.5.0", + "uuid", ] [[package]] name = "meilitool" -version = "1.6.2" +version = "1.7.3" dependencies = [ "anyhow", "clap", @@ -3630,14 +3275,14 @@ dependencies = [ "meilisearch-auth", "meilisearch-types", "time", - "uuid 1.5.0", + "uuid", ] [[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 = "memmap2" @@ -3646,30 +3291,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" dependencies = [ "libc", - "stable_deref_trait", ] [[package]] name = "memmap2" -version = "0.9.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" dependencies = [ "libc", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", + "stable_deref_trait", ] [[package]] name = "milli" -version = "1.6.2" +version = "1.7.3" dependencies = [ "arroy", "big_s", @@ -3696,14 +3332,12 @@ dependencies = [ "grenad", "heed", "hf-hub", - "indexmap 2.0.0", + "indexmap", "insta", "itertools 0.11.0", "json-depth-checker", "levenshtein_automata", "liquid", - "log", - "logging_timer", "maplit", "md5", "meili-snap", @@ -3711,7 +3345,7 @@ dependencies = [ "mimalloc", "obkv", "once_cell", - "ordered-float 3.7.0", + "ordered-float", "puffin", "rand", "rand_pcg", @@ -3731,14 +3365,15 @@ dependencies = [ "time", "tokenizers", "tokio", - "uuid 1.5.0", + "tracing", + "uuid", ] [[package]] name = "mimalloc" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" +checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" dependencies = [ "libmimalloc-sys", ] @@ -3776,9 +3411,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -3804,13 +3439,14 @@ checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] -name = "nelson" -version = "0.1.0" -source = "git+https://github.com/meilisearch/nelson.git?rev=675f13885548fb415ead8fbb447e9e6d9314000a#675f13885548fb415ead8fbb447e9e6d9314000a" +name = "mutually_exclusive_features" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d02c0b00610773bb7fc61d85e13d86c7858cbdf00e1a120bfc41bc055dbaa0e" [[package]] name = "nom" @@ -3824,9 +3460,9 @@ dependencies = [ [[package]] name = "nom_locate" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e299bf5ea7b212e811e71174c5d1a5d065c4c0ad0c8691ecb1f97e3e66025e" +checksum = "1e3c83c053b0713da60c5b8de47fe8e494fe3ece5267b2f23090a07a053ba8f3" dependencies = [ "bytecount", "memchr", @@ -3843,6 +3479,16 @@ dependencies = [ ] [[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.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3864,6 +3510,12 @@ dependencies = [ ] [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3894,6 +3546,15 @@ dependencies = [ ] [[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] name = "number_prefix" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3916,9 +3577,9 @@ checksum = "6c459142426056c639ff88d053ebaaaeca0ee1411c94362892398ef4ccd81080" [[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 = "onig" @@ -3956,21 +3617,24 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "3.7.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" dependencies = [ "num-traits", ] [[package]] -name = "ordered-float" -version = "4.2.0" +name = "overload" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" -dependencies = [ - "num-traits", -] +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "page_size" @@ -4060,6 +3724,12 @@ dependencies = [ ] [[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" @@ -4076,7 +3746,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.6.2" +version = "1.7.3" dependencies = [ "big_s", "serde_json", @@ -4112,7 +3782,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -4166,7 +3836,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -4175,14 +3845,34 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", +] + +[[package]] +name = "pin-project" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] name = "pin-project-lite" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c516611246607d0c04186886dbb3a754368ef82c79e9827a802c6d836dd111c" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -4192,9 +3882,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pinyin" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd12336e3afa34152e002f57df37a7056778daa59ea542b3473b87f5fb260c4" +checksum = "16f2611cd06a1ac239a0cea4521de9eb068a6ca110324ee00631aa68daa74fc0" [[package]] name = "pkg-config" @@ -4246,17 +3936,6 @@ 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" @@ -4294,9 +3973,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] @@ -4368,9 +4047,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -4436,9 +4115,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -4457,9 +4136,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -4490,15 +4169,6 @@ 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" @@ -4511,61 +4181,52 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.6", - "regex-syntax", + "regex-automata", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9368763f5a9b804326f3af749e16f9abf378d227bcdee7634b13d8f17793782" -dependencies = [ - "memchr", -] - -[[package]] -name = "regex-automata" -version = "0.3.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] -name = "regex-automata" -version = "0.4.3" +name = "regex-syntax" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[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.5", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", "h2", - "http 0.2.9", + "http 0.2.11", "http-body", "hyper", "hyper-rustls", @@ -4576,7 +4237,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.6", + "rustls 0.21.10", "rustls-pemfile", "serde", "serde_json", @@ -4584,10 +4245,12 @@ dependencies = [ "system-configuration", "tokio", "tokio-rustls 0.24.1", + "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "webpki-roots 0.25.3", "winreg", @@ -4615,12 +4278,26 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] [[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + +[[package]] name = "roaring" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4681,9 +4358,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.26" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ "bitflags 2.4.1", "errno", @@ -4694,45 +4371,45 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring", + "ring 0.17.7", "rustls-webpki", "sct", ] [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] [[package]] name = "rustls-webpki" -version = "0.101.3" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -4749,9 +4426,9 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safetensors" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93279b86b3de76f820a8854dd06cbc33cfa57a417b19c47f6a25280112fb1df" +checksum = "1659ef1c27917eb58c2d53664b5506d0b68c9cb9b460d3e0901011cf71269a8e" dependencies = [ "serde", "serde_json", @@ -4774,19 +4451,19 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[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", - "untrusted", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] name = "segment" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb93f3f738322ce8f33c4e80c251fb1560ca81f3a241355271fcb912eeb48e3" +checksum = "12485833e00457a6bbba60397d3f19362751a0caefe27f6755fff1a2be4fd601" dependencies = [ "async-trait", "reqwest", @@ -4801,6 +4478,9 @@ name = "semver" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +dependencies = [ + "serde", +] [[package]] name = "seq-macro" @@ -4810,9 +4490,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] @@ -4828,22 +4508,22 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ - "indexmap 2.0.0", + "indexmap", "itoa", "ryu", "serde", @@ -4860,9 +4540,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -4903,9 +4583,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -4913,6 +4593,21 @@ dependencies = [ ] [[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.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] name = "signal-hook-registry" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4941,9 +4636,15 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "siphasher" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" [[package]] name = "slab" @@ -4972,12 +4673,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" -dependencies = [ - "serde", -] +checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" [[package]] name = "smartstring" @@ -5096,9 +4794,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -5122,15 +4820,29 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", "unicode-xid", ] [[package]] +name = "sysctl" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" +dependencies = [ + "bitflags 2.4.1", + "byteorder", + "enum-as-inner", + "libc", + "thiserror", + "walkdir", +] + +[[package]] name = "sysinfo" -version = "0.29.7" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165d6d8539689e3d3bc8b98ac59541e1f21c7de7c85d60dc80e43ae0ed2113db" +checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" dependencies = [ "cfg-if", "core-foundation-sys", @@ -5138,7 +4850,7 @@ dependencies = [ "ntapi", "once_cell", "rayon", - "winapi", + "windows", ] [[package]] @@ -5175,63 +4887,72 @@ dependencies = [ [[package]] name = "temp-env" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9547444bfe52cbd79515c6c8087d8ae6ca8d64d2d31a27746320f5cb81d1a15c" +checksum = "96374855068f47402c3121c6eed88d29cb1de8f3ab27090e273e420bdabcf050" dependencies = [ "parking_lot", ] [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", - "rustix 0.38.26", - "windows-sys 0.48.0", + "rustix 0.38.31", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[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.28", + "syn 2.0.48", +] + +[[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 = "tiktoken-rs" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4427b6b1c6b38215b92dd47a83a0ecc6735573d0a5a4c14acc0ac5b33b28adb" +checksum = "40894b788eb28bbb7e36bdc8b7b1b1488b9c93fa3730f315ab965330c94c0842" dependencies = [ "anyhow", - "base64 0.21.5", + "base64 0.21.7", "bstr", "fancy-regex", "lazy_static", @@ -5241,12 +4962,15 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "libc", + "num-conv", + "num_threads", "powerfmt", "serde", "time-core", @@ -5261,25 +4985,15 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "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" @@ -5310,7 +5024,7 @@ version = "0.14.1" source = "git+https://github.com/huggingface/tokenizers.git?tag=v0.14.1#6357206cdcce4d78ffb1e0372feb456caea09375" dependencies = [ "aho-corasick", - "derive_builder", + "derive_builder 0.12.0", "esaxx-rs", "getrandom", "itertools 0.11.0", @@ -5324,7 +5038,7 @@ dependencies = [ "rayon", "rayon-cond", "regex", - "regex-syntax", + "regex-syntax 0.7.4", "serde", "serde_json", "spm_precompiled", @@ -5336,9 +5050,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.34.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -5361,7 +5075,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -5370,7 +5084,7 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.8", + "rustls 0.20.9", "tokio", "webpki", ] @@ -5381,7 +5095,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.6", + "rustls 0.21.10", "tokio", ] @@ -5412,9 +5126,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -5424,20 +5138,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap 2.0.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -5452,11 +5166,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -5464,6 +5177,19 @@ dependencies = [ ] [[package]] +name = "tracing-actix-web" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fe0d5feac3f4ca21ba33496bcb1ccab58cca6412b1405ae80f0581541e0ca78" +dependencies = [ + "actix-web", + "mutually_exclusive_features", + "pin-project", + "tracing", + "uuid", +] + +[[package]] name = "tracing-attributes" version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5471,16 +5197,81 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-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.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "nu-ansi-term", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "tracing-trace" +version = "0.1.0" +dependencies = [ + "byte-unit", + "color-spantrace", + "fxprof-processed-profile", + "libproc", + "serde", + "serde_json", + "tokio", + "tracing", + "tracing-error", + "tracing-subscriber", ] [[package]] @@ -5503,9 +5294,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unescaper" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96a44ae11e25afb520af4534fd7b0bd8cd613e35a78def813b8cf41631fa3c8" +checksum = "d8f0f68e58d297ba8b22b8b5a96a87b863ba6bb46aaf51e19a4b02c5a6dd5b7f" dependencies = [ "thiserror", ] @@ -5580,16 +5371,22 @@ 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.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "flate2", "log", "once_cell", - "rustls 0.21.6", + "rustls 0.21.10", "rustls-webpki", "serde", "serde_json", @@ -5617,24 +5414,12 @@ 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 = "52df8b7fb78e7910d776fccf2e42ceaf3604d55e8e7eb2dbd183cb1441d8a692" - -[[package]] name = "utf8-width" version = "0.1.6" 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" @@ -5642,22 +5427,20 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "0.8.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ + "atomic", "getrandom", + "serde", ] [[package]] -name = "uuid" -version = "1.5.0" +name = "valuable" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" -dependencies = [ - "getrandom", - "serde", -] +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "vcpkg" @@ -5667,18 +5450,42 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "7.5.1" +version = "9.0.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21b881cd6636ece9735721cf03c1fe1e774fe258683d084bb2812ab67435749" +checksum = "107dc53b443fe8cc380798abb75ad6b7038281165109afea1f1b28bb47047ed5" dependencies = [ "anyhow", - "cfg-if", - "enum-iterator", + "derive_builder 0.13.1", "getset", + "rustversion", + "vergen-lib", +] + +[[package]] +name = "vergen-git2" +version = "1.0.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8875c5d71074bb67118774e3d795ab6fe77c3ae3161cb54e19104cabc49487f1" +dependencies = [ + "anyhow", + "derive_builder 0.13.1", "git2", "rustversion", - "thiserror", "time", + "vergen", + "vergen-lib", +] + +[[package]] +name = "vergen-lib" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26ebfba72ba904559f25f41ea1512335b5a46459084258cea0857549d9645187" +dependencies = [ + "anyhow", + "derive_builder 0.13.1", + "getset", + "rustversion", ] [[package]] @@ -5689,9 +5496,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -5744,7 +5551,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -5778,7 +5585,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5790,6 +5597,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[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" @@ -5810,12 +5630,12 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -5835,11 +5655,11 @@ checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "whatlang" -version = "0.16.2" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c531a2dc4c462b833788be2c07eef4e621d0e9edbd55bf280cc164c1c1aa043" +checksum = "471d1c1645d361eb782a1650b1786a8fb58dd625e681a04c09f5ff7c8764a7b0" dependencies = [ - "hashbrown 0.12.3", + "hashbrown", "once_cell", ] @@ -5875,6 +5695,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-sys" version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6074,9 +5913,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.4" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] @@ -6092,18 +5931,6 @@ dependencies = [ ] [[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 = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6113,6 +5940,29 @@ dependencies = [ ] [[package]] +name = "xtask" +version = "1.7.3" +dependencies = [ + "anyhow", + "build-info", + "cargo_metadata", + "clap", + "futures-core", + "futures-util", + "reqwest", + "serde", + "serde_json", + "sha2", + "sysinfo", + "time", + "tokio", + "tracing", + "tracing-subscriber", + "tracing-trace", + "uuid", +] + +[[package]] name = "yada" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6157,75 +6007,58 @@ checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", "synstructure", ] [[package]] -name = "zerofrom" -version = "0.1.3" +name = "zerocopy" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ - "zerofrom-derive", + "zerocopy-derive", ] [[package]] -name = "zerofrom-derive" -version = "0.1.3" +name = "zerocopy-derive" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", - "synstructure", + "syn 2.0.48", ] [[package]] -name = "zerotrie" -version = "0.1.1" +name = "zerofrom" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9685bb4deb98dab812e87c296a9631fc00d7ca4bc5c2c5f304f375bbed711a8a" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" dependencies = [ - "displaydoc", - "litemap 0.7.1", - "serde", - "yoke", - "zerofrom", - "zerovec 0.10.0", + "zerofrom-derive", ] [[package]] -name = "zerovec" -version = "0.9.6" +name = "zerofrom-derive" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "591691014119b87047ead4dcf3e6adfbf73cb7c38ab6980d4f18a32138f35d46" +checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ - "zerofrom", + "proc-macro2", + "quote", + "syn 2.0.48", + "synstructure", ] [[package]] name = "zerovec" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e" +checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" 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]] diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 1a0f387d15ef..0c988d345d22 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -8,7 +8,7 @@ , nix-update-script }: -let version = "1.6.2"; +let version = "1.7.3"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "MeiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-D8KAleYaeMv3rCwhGE0IteuDUVk4RiOxsTBe7LhLAKg="; + hash = "sha256-2kwogur6hS7/xjUhH9aRJevWbtgg5xQkvB/aIj7wyJ8="; }; cargoBuildFlags = [ @@ -29,10 +29,9 @@ rustPlatform.buildRustPackage { lockFile = ./Cargo.lock; outputHashes = { "actix-web-static-files-3.0.5" = "sha256-2BN0RzLhdykvN3ceRLkaKwSZtel2DBqZ+uz4Qut+nII="; - "arroy-0.1.0" = "sha256-ybKdB0eP8AdxLMNM7Si9onWITNc2SPNTXMgKdWdy34E="; - "candle-core-0.3.1" = "sha256-KlkjTUcbnP+uZoA0fDZlEPT5qKC2ogMAuR8X14xRFgA="; + "candle-core-0.3.3" = "sha256-umWvG+82B793PQtY9VeHjPTtTVmSPdts25buw4v4TQc="; + "candle-kernels-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="; }; }; @@ -56,6 +55,7 @@ rustPlatform.buildRustPackage { meta = with lib; { description = "Powerful, fast, and an easy to use search engine"; + mainProgram = "meilisearch"; homepage = "https://docs.meilisearch.com/"; changelog = "https://github.com/meilisearch/meilisearch/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index 5e3c48053b56..eb6fc6c71943 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -46,8 +46,6 @@ rustPlatform.buildRustPackage rec { 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 = { diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/servers/search/sonic-server/default.nix index 9bece306b2f1..cbe8b431fa93 100644 --- a/pkgs/servers/search/sonic-server/default.nix +++ b/pkgs/servers/search/sonic-server/default.nix @@ -28,8 +28,6 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - # Work around https://github.com/NixOS/nixpkgs/issues/166205. - env.NIX_LDFLAGS = lib.optionalString stdenv.cc.isClang "-l${stdenv.cc.libcxx.cxxabi.libName}"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; postPatch = '' diff --git a/pkgs/servers/search/typesense/default.nix b/pkgs/servers/search/typesense/default.nix index b78c5d083847..30e09db055f2 100644 --- a/pkgs/servers/search/typesense/default.nix +++ b/pkgs/servers/search/typesense/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://typesense.org"; description = "Typesense is a fast, typo-tolerant search engine for building delightful search experiences."; + mainProgram = "typesense-server"; license = licenses.gpl3; # There has been an attempt at building this from source, which were deemed # unfeasible at the time of writing this (July 2023) for the following reasons. diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/servers/search/weaviate/default.nix index fb3fbbbf30bd..75f9e700cc0f 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.24.1"; + version = "1.24.4"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-9FA0GxLgzw3D329JdQ044QC/D9ncxsadmCHlppnf9fI="; + hash = "sha256-kovhusZ/4/wLr8FeBY6jBPdD1V718yI41fTjbtjGleM="; }; - vendorHash = "sha256-G5ya2O5IY7+DE4UeXuH5lTT0jbjIc9W09ePLsJsjQ78="; + vendorHash = "sha256-0CPdBrEjBJiX/Fv0DhFaZqkixuEPW2Pttl5wCNxieYc="; subPackages = [ "cmd/weaviate-server" ]; diff --git a/pkgs/servers/search/zincsearch/default.nix b/pkgs/servers/search/zincsearch/default.nix index a5b17b9825b6..ad95c1cf3d68 100644 --- a/pkgs/servers/search/zincsearch/default.nix +++ b/pkgs/servers/search/zincsearch/default.nix @@ -5,12 +5,12 @@ }: let - version = "0.4.9"; + version = "0.4.10"; src = fetchFromGitHub { owner = "zinclabs"; repo = "zincsearch"; rev = "v${version}"; - hash = "sha256-NIrLhbtpk1mFbWRFPxkH1r4mBiwT488MYBjRgIV7igE="; + hash = "sha256-lScwnmu4hM78Va7Yi5HA0E5f2WQXrZaeqjRYJYxnQ5E="; }; webui = buildNpmPackage { @@ -40,7 +40,7 @@ buildGoModule rec { cp -r ${webui}/share/zinc-ui web/dist ''; - vendorHash = "sha256-kP7QlES7VpZrOS4TGOFB9qciXGBEUVqzVLhz+2KiK98="; + vendorHash = "sha256-SZG5/ISGblpcwwR/HOKxFl9SthXpE+IYS0S+4HYtHos="; subPackages = [ "cmd/zincsearch" ]; ldflags = [ @@ -51,7 +51,8 @@ buildGoModule rec { meta = with lib; { description = "A lightweight alternative to elasticsearch that requires minimal resources, written in Go"; - homepage = "https://zinc.dev"; + mainProgram = "zincsearch"; + homepage = "https://zincsearch-docs.zinc.dev/"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya ]; }; diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 56206e7e80f3..1b8d4ca271c9 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -33,6 +33,7 @@ buildGoModule rec { meta = with lib; { description = "Service orchestration and management tool"; + mainProgram = "serf"; longDescription = '' Serf is a decentralized solution for service discovery and orchestration that is lightweight, highly available, and fault tolerant. diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index d8f37b79b4d9..c240c5d7ffda 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.13"; + version = "3.30.15"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-Ka2WYU2hU9aemEiTNwFZLraerfisfL8vK2ujx0wDcPo="; + hash = "sha256-/6D4jehI94KwE5BFZiMWddcinwmU8Rb/83NifTEvudA="; }; patches = [ @@ -33,6 +33,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "The most reliable stable TV fork of the great Sick-Beard to fully automate TV enjoyment with innovation"; + mainProgram = "sickgear"; license = licenses.gpl3; homepage = "https://github.com/SickGear/SickGear"; maintainers = with lib.maintainers; [ rembo10 ]; diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/servers/silc-server/default.nix index 83596cffadfb..53a2f47cf2ad 100644 --- a/pkgs/servers/silc-server/default.nix +++ b/pkgs/servers/silc-server/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://silcnet.org/"; description = "Secure Internet Live Conferencing server"; + mainProgram = "silcd"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix deleted file mode 100644 index 1703c03dee26..000000000000 --- a/pkgs/servers/slimserver/default.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ faad2 -, fetchFromGitHub -, flac -, lame -, lib -, makeWrapper -, monkeysAudio -, nixosTests -, perl538Packages -, sox -, stdenv -, wavpack -, zlib -, enableUnfreeFirmware ? false -}: - -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"; - version = "8.4.0"; - - src = fetchFromGitHub { - owner = "Logitech"; - repo = "slimserver"; - rev = version; - hash = "sha256-92mKchgAWRIrNOeK/zXUYRqIAk6THdtz1zQe3fg2kE0="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = with perlPackages; [ - AnyEvent - ArchiveZip - AsyncUtil - AudioScan - CarpClan - CGI - ClassAccessor - ClassAccessorChained - ClassC3 - # ClassC3Componentised # Error: DBIx::Class::Row::throw_exception(): DBIx::Class::Relationship::BelongsTo::belongs_to(): Can't infer join condition for track - ClassDataInheritable - ClassInspector - ClassISA - ClassMember - ClassSingleton - ClassVirtual - ClassXSAccessor - CompressRawZlib - CryptOpenSSLRSA - DataDump - DataPage - DataURIEncode - DBDSQLite - DBI - # DBIxClass # https://github.com/Logitech/slimserver/issues/138 - DigestSHA1 - EncodeDetect - EV - ExporterLite - FileBOM - FileCopyRecursive - FileNext - FileReadBackwards - FileSlurp - FileWhich - HTMLParser - HTTPCookies - HTTPDaemon - HTTPMessage - ImageScale - IOAIO - IOInterface - IOSocketSSL - IOString - JSONXS - JSONXSVersionOneAndTwo - # LogLog4perl # Internal error: Root Logger not initialized. - LWP - LWPProtocolHttps - MP3CutGapless - NetHTTP - NetHTTPSNB - PathClass - ProcBackground - # SQLAbstract # DBI Exception: DBD::SQLite::db prepare_cached failed: no such function: ARRAY - SQLAbstractLimit - SubName - TemplateToolkit - TextUnidecode - TieCacheLRU - TieCacheLRUExpires - TieRegexpHash - TimeDate - URI - URIFind - UUIDTiny - XMLParser - XMLSimple - YAMLLibYAML - ] - # ++ (lib.optional stdenv.isDarwin perlPackages.MacFSEvents) - ++ (lib.optional stdenv.isLinux perlPackages.LinuxInotify2); - - prePatch = '' - # remove vendored binaries - rm -rf Bin - - # remove most vendored modules, keeping necessary ones - mkdir -p CPAN_used/Class/C3/ CPAN_used/SQL - rm -r CPAN/SQL/Abstract/Limit.pm - cp -rv CPAN/Class/C3/Componentised.pm CPAN_used/Class/C3/ - cp -rv CPAN/DBIx CPAN_used/ - cp -rv CPAN/Log CPAN_used/ - cp -rv CPAN/SQL/* CPAN_used/SQL/ - 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 - ''} - - touch Makefile.PL - ''; - - doCheck = false; - - installPhase = '' - cp -r . $out - 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 - ''; - - outputs = [ "out" ]; - - passthru.tests = { - inherit (nixosTests) slimserver; - }; - - meta = with lib; { - homepage = "https://github.com/Logitech/slimserver"; - changelog = "https://github.com/Logitech/slimserver/blob/${version}/Changelog${lib.versions.major version}.html"; - description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; - # the firmware is not under a free license, so we do not include firmware in the default package - # https://github.com/Logitech/slimserver/blob/public/8.3/License.txt - license = if enableUnfreeFirmware then licenses.unfree else licenses.gpl2Only; - mainProgram = "slimserver"; - maintainers = with maintainers; [ adamcstephens jecaro ]; - platforms = platforms.unix; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 4e65ed11c0e2..0604c8c50b3c 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.35.2"; + version = "2.35.4"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-aEM1In7BmtiPy0xOgUV6sIvMnX6fac4mSErr7dB2gRU="; + sha256 = "sha256-l75s2ntZM/eqoFqw8bMkmxwPBvOFwf2Y8TpSsyzu3cU="; }; sourceRoot = "snappymail"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://snappymail.eu"; changelog = "https://github.com/the-djmaze/snappymail/blob/v${version}/CHANGELOG.md"; downloadPage = "https://github.com/the-djmaze/snappymail/releases"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.all; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index cf56476719a1..f0a85b251db0 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -10,15 +10,15 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-9YNhyhxnnn2CesXLJH5Cs7yB9w23YUAZPrk9vEHvevk="; - arm64-linux_hash = "sha256-RBCyfozmBpWrmsfMcdb1BqcBXj64CMDrgpMZTzj85ZQ="; - x64-osx_hash = "sha256-+AKENBZohBUEKQEM3L69EzC84MhCX3fGvsNFn5p2v84="; - arm64-osx_hash = "sha256-Arx8usecAN+d0NGL7Hv+rB4GG7p/KLAaqpJFgNg7C2Y="; + x64-linux_hash = "sha256-S9j6zXEJM963tki88awPW0uK0fQd1bBwBcsHBlDSg/E="; + arm64-linux_hash = "sha256-73FkmdliX5SNrQRRZeAkU0G96ehCd9mT8NVyJoZiA38="; + x64-osx_hash = "sha256-XZ4ITJtc2ENw7IAYrBZF0N/NCjUVve+SkWhu6kfQIQA="; + arm64-osx_hash = "sha256-2tA17mDuCX5X0U96Rp6QUQOVWvu9sPMOimD6kks+S00="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "sonarr"; - version = "4.0.1.929"; + version = "4.0.2.1183"; src = fetchurl { url = "https://github.com/Sonarr/Sonarr/releases/download/v${version}/Sonarr.main.${version}.${os}-${arch}.tar.gz"; diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index 705c5b935bfb..53907baed59d 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { "Open Source HTTP Reverse Proxy built in Rust for Immutable Infrastructures"; homepage = "https://www.sozu.io"; changelog = "https://github.com/sozu-proxy/sozu/releases/tag/${version}"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ Br1ght0ne gaelreyrol ]; mainProgram = "sozu"; # error[E0432]: unresolved import `std::arch::x86_64` diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index ca90f78acf4e..c82984154879 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.29.5"; + version = "1.30.0"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-93+o2pLilHAad794Bae83spLsC+pdvOgS6WRNSWrei4="; + hash = "sha256-enMUGLOoVy56PCAqfW6jTOgEr/Me6kbuUvq3YmlxMPs="; }; - vendorHash = "sha256-MfpXYvgUjfNZkAA19FWM0X8A9mbDhcYCM5L9PLL4En0="; + vendorHash = "sha256-lMhfCkuLuA8aj3Q+I/v/Ohof/htBJjPRmQ3c9QXsioc="; subPackages = [ "cmd/spicedb" ]; diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index 32421450d758..5d85e9f74e84 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -5,19 +5,20 @@ buildGoModule rec { pname = "zed"; - version = "0.16.4"; + version = "0.17.0"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-PLOzzsW0v4T12NFrQlOYcsC7Cd3OnGD0TYmuavqEtxw="; + hash = "sha256-C/vX8gocU7teSACqHBrYTPJryaUP4tuzEo/4TUEdNt0="; }; - vendorHash = "sha256-KhtT0v0FJiOvYUhN/rBYxbkUKs0DdIc5HwlhVUAi9cA="; + vendorHash = "sha256-qf1jGNCW/ewwqkbsU7fZdYvazhMYw+/DGWkdugQRrec="; meta = with lib; { description = "Command line for managing SpiceDB"; + mainProgram = "zed"; longDescription = '' SpiceDB is an open-source permissions database inspired by Google Zanzibar. zed is the command line client for SpiceDB. diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix deleted file mode 100644 index 19a128dfc003..000000000000 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, buildGoPackage, fetchurl -, cmake, xz, which, autoconf -, ncurses6, libedit, libunwind -, installShellFiles -, removeReferencesTo, go -}: - -let - darwinDeps = [ libunwind libedit ]; - linuxDeps = [ ncurses6 ]; - - buildInputs = if stdenv.isDarwin then darwinDeps else linuxDeps; - nativeBuildInputs = [ installShellFiles cmake xz which autoconf ]; - -in -buildGoPackage rec { - pname = "cockroach"; - version = "20.1.8"; - - goPackagePath = "github.com/cockroachdb/cockroach"; - - src = fetchurl { - url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "0mm3hfr778c7djza8gr1clwa8wca4d3ldh9hlg80avw4x664y5zi"; - }; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]); - - inherit nativeBuildInputs buildInputs; - - buildPhase = '' - runHook preBuild - cd $NIX_BUILD_TOP/go/src/${goPackagePath} - patchShebangs . - make buildoss - cd src/${goPackagePath} - for asset in man autocomplete; do - ./cockroachoss gen $asset - done - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -D cockroachoss $out/bin/cockroach - installShellCompletion cockroach.bash - - mkdir -p $man/share/man - cp -r man $man/share/man - - runHook postInstall - ''; - - outputs = [ "out" "man" ]; - - # fails with `GOFLAGS=-trimpath` - allowGoReference = true; - preFixup = '' - find $out -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${go} '{}' + - ''; - - meta = with lib; { - homepage = "https://www.cockroachlabs.com"; - description = "A scalable, survivable, strongly-consistent SQL database"; - license = licenses.bsl11; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ rushmorem thoughtpolice ]; - }; -} diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index ee3b30bd0363..bb6687c20473 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,23 +2,24 @@ buildGoModule rec { pname = "dolt"; - version = "1.35.3"; + version = "1.35.4"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-p4hScXdIDa3zAHltUMhg61YyfpdFWZaJ8LAdQi8OZv8="; + sha256 = "sha256-9EEqwS7IKlRfE5bwxjScDX7KMCTpmbxixAznRhbaOE0="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-1fH9JrWi38jtPjaN2lEplCkiLdYa4g6FsdcB8ZQqVD4="; + vendorHash = "sha256-TXx+YmXsAwh2J+nHpff0oHatI6G2QY2QZmMMcHAG6Lc="; proxyVendor = true; doCheck = false; meta = with lib; { description = "Relational database with version control and CLI a-la Git"; + mainProgram = "dolt"; homepage = "https://github.com/dolthub/dolt"; license = licenses.asl20; maintainers = with maintainers; [ danbst ]; diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index f934d6a00822..0898c6a3bfc4 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Galera 3 wsrep provider library"; + mainProgram = "garbd"; homepage = "https://galeracluster.com/"; license = licenses.lgpl2Only; maintainers = with maintainers; [ izorkin ] ++ teams.helsinki-systems.members; diff --git a/pkgs/servers/sql/postgresql/12.nix b/pkgs/servers/sql/postgresql/12.nix new file mode 100644 index 000000000000..9e0388be0451 --- /dev/null +++ b/pkgs/servers/sql/postgresql/12.nix @@ -0,0 +1,10 @@ +import ./generic.nix { + version = "12.18"; + hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo="; + muslPatches = { + icu-collations-hack = { + url = "https://git.alpinelinux.org/aports/plain/testing/postgresql12/icu-collations-hack.patch?id=d5227c91adda59d4e7f55f13468f0314e8869174"; + hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg="; + }; + }; +} diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix new file mode 100644 index 000000000000..a4870812acdb --- /dev/null +++ b/pkgs/servers/sql/postgresql/13.nix @@ -0,0 +1,14 @@ +import ./generic.nix { + version = "13.14"; + hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0="; + muslPatches = { + icu-collations-hack = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; + hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg="; + }; + disable-test-collate-icu-utf8 = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; + hash = "sha256-jS/qxezaiaKhkWeMCXwpz1SDJwUWn9tzN0uKaZ3Ph2Y="; + }; + }; +} diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix new file mode 100644 index 000000000000..2de876cf4ad6 --- /dev/null +++ b/pkgs/servers/sql/postgresql/14.nix @@ -0,0 +1,14 @@ +import ./generic.nix { + version = "14.11"; + hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg="; + muslPatches = { + icu-collations-hack = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; + hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg="; + }; + disable-test-collate-icu-utf8 = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; + hash = "sha256-jXe23AxnFjEl+TZQm4R7rStk2Leo08ctxMNmu1xr5zM="; + }; + }; +} diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix new file mode 100644 index 000000000000..f633dc975085 --- /dev/null +++ b/pkgs/servers/sql/postgresql/15.nix @@ -0,0 +1,10 @@ +import ./generic.nix { + version = "15.6"; + hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs="; + muslPatches = { + icu-collations-hack = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/icu-collations-hack.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; + hash = "sha256-HgtmhF4OJYU9macGJbTB9PjQi/yW7c3Akm3U0niWs8I="; + }; + }; +} diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix new file mode 100644 index 000000000000..6a6420643b31 --- /dev/null +++ b/pkgs/servers/sql/postgresql/16.nix @@ -0,0 +1,10 @@ +import ./generic.nix { + version = "16.2"; + hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI="; + muslPatches = { + icu-collations-hack = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/icu-collations-hack.patch?id=08a24be262339fd093e641860680944c3590238e"; + hash = "sha256-+urQdVIlADLdDPeT68XYv5rljhbK8M/7mPZn/cF+FT0="; + }; + }; +} diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 700f0ad99bd1..d11a2d06b2d2 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,412 +1,24 @@ +self: let + versions = { + postgresql_12 = ./12.nix; + postgresql_13 = ./13.nix; + postgresql_14 = ./14.nix; + postgresql_15 = ./15.nix; + postgresql_16 = ./16.nix; + }; - generic = - # dependencies - { 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 - , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic - - # for postgresql.pkgs - , this, self, newScope, buildEnv - - # source specification - , version, hash, psqlSchema - - # for tests - , testers, nixosTests, thisAttr - - # JIT - , jitSupport ? false - , 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 - }: - let - atLeast = lib.versionAtLeast version; - olderThan = lib.versionOlder version; - lz4Enabled = atLeast "14"; - zstdEnabled = atLeast "15"; - - pname = "postgresql"; - - stdenv' = if jitSupport then llvmPackages.stdenv else stdenv; - in stdenv'.mkDerivation (finalAttrs: { - inherit pname version; - - src = fetchurl { - url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2"; - inherit hash; - }; - - hardeningEnable = lib.optionals (!stdenv'.cc.isClang) [ "pie" ]; - - outputs = [ "out" "lib" "doc" "man" ]; - setOutputFlags = false; # $out retains configureFlags :-/ - - buildInputs = [ - zlib - readline - openssl - libxml2 - icu - ] - ++ lib.optionals (olderThan "13") [ libxcrypt ] - ++ lib.optionals jitSupport [ llvmPackages.llvm ] - ++ 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 = [ - makeWrapper - pkg-config - ] - ++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences patchelf ]; - - enableParallelBuilding = !stdenv'.isDarwin; - - separateDebugInfo = true; - - buildFlags = [ "world" ]; - - env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; - - # Otherwise it retains a reference to compiler and fails; see #44767. TODO: better. - preConfigure = "CC=${stdenv'.cc.targetPrefix}cc"; - - configureFlags = [ - "--with-openssl" - "--with-libxml" - "--with-icu" - "--sysconfdir=/etc" - "--libdir=$(lib)/lib" - "--with-system-tzdata=${tzdata}/share/zoneinfo" - "--enable-debug" - (lib.optionalString enableSystemd "--with-systemd") - (if stdenv'.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") - ] ++ 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 stdenv'.isLinux [ "--with-pam" ]; - - patches = [ - (if atLeast "16" then ./patches/disable-normalize_exec_path.patch - else ./patches/disable-resolve_symlinks.patch) - ./patches/less-is-more.patch - ./patches/hardcode-pgxs-path.patch - ./patches/specify_pkglibdir_at_runtime.patch - ./patches/findstring.patch - - (substituteAll { - src = ./locale-binary-path.patch; - locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; - }) - - ] ++ lib.optionals stdenv'.hostPlatform.isMusl ( + mkAttributes = jitSupport: + self.lib.mapAttrs' (version: path: let - self = { - "12" = { - icu-collations-hack = fetchurl { - url = "https://git.alpinelinux.org/aports/plain/testing/postgresql12/icu-collations-hack.patch?id=d5227c91adda59d4e7f55f13468f0314e8869174"; - hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg="; - }; - }; - "13" = { - inherit (self."14") icu-collations-hack; - disable-test-collate-icu-utf8 = fetchurl { - url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; - hash = "sha256-jS/qxezaiaKhkWeMCXwpz1SDJwUWn9tzN0uKaZ3Ph2Y="; - }; - }; - "14" = { - icu-collations-hack = fetchurl { - url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; - hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg="; - }; - disable-test-collate-icu-utf8 = fetchurl { - url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; - hash = "sha256-jXe23AxnFjEl+TZQm4R7rStk2Leo08ctxMNmu1xr5zM="; - }; - }; - "15" = { - icu-collations-hack = fetchurl { - url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/icu-collations-hack.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; - hash = "sha256-HgtmhF4OJYU9macGJbTB9PjQi/yW7c3Akm3U0niWs8I="; - }; - }; - "16" = { - icu-collations-hack = fetchurl { - url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/icu-collations-hack.patch?id=08a24be262339fd093e641860680944c3590238e"; - hash = "sha256-+urQdVIlADLdDPeT68XYv5rljhbK8M/7mPZn/cF+FT0="; - }; - }; - }; - - patchesForVersion = self.${lib.versions.major version} or (throw "no musl patches for postgresql ${version}"); + attrName = if jitSupport then "${version}_jit" else version; in - lib.attrValues patchesForVersion - ) ++ lib.optionals stdenv'.isLinux [ - (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch) - ]; - - installTargets = [ "install-world" ]; - - LC_ALL = "C"; - - postPatch = '' - # Hardcode the path to pgxs so pg_config returns the path in $out - substituteInPlace "src/common/config_info.c" --replace HARDCODED_PGXS_PATH "$out/lib" - '' + lib.optionalString jitSupport '' - # Force lookup of jit stuff in $out instead of $lib - substituteInPlace src/backend/jit/jit.c --replace pkglib_path \"$out/lib\" - substituteInPlace src/backend/jit/llvm/llvmjit.c --replace pkglib_path \"$out/lib\" - substituteInPlace src/backend/jit/llvm/llvmjit_inline.cpp --replace pkglib_path \"$out/lib\" - ''; - - postInstall = - '' - moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it - moveToOutput "lib/libpgcommon*.a" "$out" - moveToOutput "lib/libpgport*.a" "$out" - moveToOutput "lib/libecpg*" "$out" - - # Prevent a retained dependency on gcc-wrapper. - substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/ld ld - - if [ -z "''${dontDisableStatic:-}" ]; then - # Remove static libraries in case dynamic are available. - for i in $out/lib/*.a $lib/lib/*.a; do - name="$(basename "$i")" - ext="${stdenv'.hostPlatform.extensions.sharedLibrary}" - if [ -e "$lib/lib/''${name%.a}$ext" ] || [ -e "''${i%.a}$ext" ]; then - rm "$i" - fi - done - fi - '' + lib.optionalString jitSupport '' - # Move the bitcode and libllvmjit.so library out of $lib; otherwise, every client that - # depends on libpq.so will also have libLLVM.so in its closure too, bloating it - moveToOutput "lib/bitcode" "$out" - moveToOutput "lib/llvmjit*" "$out" - - # In the case of JIT support, prevent a retained dependency on clang-wrapper - substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${self.llvmPackages.stdenv.cc}/bin/clang clang - nuke-refs $out/lib/llvmjit_types.bc $(find $out/lib/bitcode -type f) - - # Stop out depending on the default output of llvm - substituteInPlace $out/lib/pgxs/src/Makefile.global \ - --replace ${self.llvmPackages.llvm.out}/bin "" \ - --replace '$(LLVM_BINPATH)/' "" - - # Stop out depending on the -dev output of llvm - substituteInPlace $out/lib/pgxs/src/Makefile.global \ - --replace ${self.llvmPackages.llvm.dev}/bin/llvm-config llvm-config \ - --replace -I${self.llvmPackages.llvm.dev}/include "" - - ${lib.optionalString (!stdenv'.isDarwin) '' - # Stop lib depending on the -dev output of llvm - rpath=$(patchelf --print-rpath $out/lib/llvmjit.so) - nuke-refs -e $out $out/lib/llvmjit.so - # Restore the correct rpath - patchelf $out/lib/llvmjit.so --set-rpath "$rpath" - ''} - ''; - - postFixup = lib.optionalString (!stdenv'.isDarwin && stdenv'.hostPlatform.libc == "glibc") - '' - # initdb needs access to "locale" command from glibc. - wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin - ''; - - doCheck = !stdenv'.isDarwin; - # autodetection doesn't seem to able to find this, but it's there. - checkTarget = "check"; - - preCheck = - # On musl, comment skip the following tests, because they break due to - # ! ERROR: could not load library "/build/postgresql-11.5/tmp_install/nix/store/...-postgresql-11.5-lib/lib/libpqwalreceiver.so": Error loading shared library libpq.so.5: No such file or directory (needed by /build/postgresql-11.5/tmp_install/nix/store/...-postgresql-11.5-lib/lib/libpqwalreceiver.so) - # See also here: - # https://git.alpinelinux.org/aports/tree/main/postgresql/disable-broken-tests.patch?id=6d7d32c12e073a57a9e5946e55f4c1fbb68bd442 - if stdenv'.hostPlatform.isMusl then '' - substituteInPlace src/test/regress/parallel_schedule \ - --replace "subscription" "" \ - --replace "object_address" "" - '' else null; - - doInstallCheck = false; # needs a running daemon? - - disallowedReferences = [ stdenv'.cc ]; - - passthru = let - jitToggle = this.override { - jitSupport = !jitSupport; - this = jitToggle; - }; - in - { - inherit readline psqlSchema jitSupport; - - withJIT = if jitSupport then this else jitToggle; - withoutJIT = if jitSupport then jitToggle else this; - - dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary; - - pkgs = let - scope = { - postgresql = this; - stdenv = stdenv'; - buildPgxExtension = buildPgxExtension.override { - stdenv = stdenv'; - rustPlatform = makeRustPlatform { - stdenv = stdenv'; - inherit rustc cargo; - }; - }; - }; - newSelf = self // scope; - newSuper = { callPackage = newScope (scope // this.pkgs); }; - in import ./packages.nix newSelf newSuper; - - withPackages = postgresqlWithPackages { - inherit makeWrapper buildEnv; - postgresql = this; - } - this.pkgs; - - tests = { - postgresql = nixosTests.postgresql-wal-receiver.${thisAttr}; - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - } // lib.optionalAttrs jitSupport { - postgresql-jit = nixosTests.postgresql-jit.${thisAttr}; - }; - } // lib.optionalAttrs jitSupport { - inherit (llvmPackages) llvm; - }; - - meta = with lib; { - homepage = "https://www.postgresql.org"; - description = "A powerful, open source object-relational database system"; - license = licenses.postgresql; - changelog = "https://www.postgresql.org/docs/release/${finalAttrs.version}/"; - maintainers = with maintainers; [ thoughtpolice danbst globin marsam ivan ma27 ]; - pkgConfigModules = [ "libecpg" "libecpg_compat" "libpgtypes" "libpq" ]; - platforms = platforms.unix; - - # JIT support doesn't work with cross-compilation. It is attempted to build LLVM-bytecode - # (`%.bc` is the corresponding `make(1)`-rule) for each sub-directory in `backend/` for - # the JIT apparently, but with a $(CLANG) that can produce binaries for the build, not the - # host-platform. - # - # I managed to get a cross-build with JIT support working with - # `depsBuildBuild = [ llvmPackages.clang ] ++ buildInputs`, but considering that the - # resulting LLVM IR isn't platform-independent this doesn't give you much. - # In fact, I tried to test the result in a VM-test, but as soon as JIT was used to optimize - # a query, postgres would coredump with `Illegal instruction`. - broken = jitSupport && (stdenv.hostPlatform != stdenv.buildPlatform); - }; - }); - - postgresqlWithPackages = { postgresql, makeWrapper, buildEnv }: pkgs: f: buildEnv { - name = "postgresql-and-plugins-${postgresql.version}"; - paths = f pkgs ++ [ - postgresql - postgresql.lib - postgresql.man # in case user installs this into environment - ]; - nativeBuildInputs = [ makeWrapper ]; - - - # We include /bin to ensure the $out/bin directory is created, which is - # needed because we'll be removing the files from that directory in postBuild - # below. See #22653 - pathsToLink = ["/" "/bin"]; - - # Note: the duplication of executables is about 4MB size. - # So a nicer solution was patching postgresql to allow setting the - # libdir explicitly. - postBuild = '' - mkdir -p $out/bin - rm $out/bin/{pg_config,postgres,pg_ctl} - cp --target-directory=$out/bin ${postgresql}/bin/{postgres,pg_config,pg_ctl} - wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib - ''; - - passthru.version = postgresql.version; - passthru.psqlSchema = postgresql.psqlSchema; - }; - - mkPackages = self: { - postgresql_12 = self.callPackage generic { - version = "12.18"; - psqlSchema = "12"; - hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo="; - this = self.postgresql_12; - thisAttr = "postgresql_12"; - inherit self; - }; - - postgresql_13 = self.callPackage generic { - version = "13.14"; - psqlSchema = "13"; - hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0="; - this = self.postgresql_13; - thisAttr = "postgresql_13"; - inherit self; - }; - - postgresql_14 = self.callPackage generic { - version = "14.11"; - psqlSchema = "14"; - hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg="; - this = self.postgresql_14; - thisAttr = "postgresql_14"; - inherit self; - }; - - postgresql_15 = self.callPackage generic { - version = "15.6"; - psqlSchema = "15"; - hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs="; - this = self.postgresql_15; - thisAttr = "postgresql_15"; - inherit self; - }; - - postgresql_16 = self.callPackage generic { - version = "16.2"; - psqlSchema = "16"; - hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI="; - this = self.postgresql_16; - thisAttr = "postgresql_16"; - inherit self; - }; - }; + self.lib.nameValuePair attrName (import path { + inherit jitSupport self; + thisAttr = attrName; + }) + ) versions; -in self: - let packages = mkPackages self; in - packages - // self.lib.mapAttrs' - (attrName: postgres: self.lib.nameValuePair "${attrName}_jit" (postgres.override rec { - jitSupport = true; - thisAttr = "${attrName}_jit"; - this = self.${thisAttr}; - })) - packages +in +# variations without and with JIT +(mkAttributes false) // (mkAttributes true) diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix new file mode 100644 index 000000000000..4bb5aa544440 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, pg-dump-anon, postgresql, runtimeShell, jitSupport, llvm }: + +stdenv.mkDerivation (finalAttrs: { + pname = "postgresql_anonymizer"; + + inherit (pg-dump-anon) version src passthru; + + buildInputs = [ postgresql ]; + nativeBuildInputs = [ postgresql ] ++ lib.optional jitSupport llvm; + + strictDeps = true; + + makeFlags = [ + "BINDIR=${placeholder "out"}/bin" + "datadir=${placeholder "out"}/share/postgresql" + "pkglibdir=${placeholder "out"}/lib" + "DESTDIR=" + ]; + + postInstall = '' + cat >$out/bin/pg_dump_anon.sh <<'EOF' + #!${runtimeShell} + echo "This script is deprecated by upstream. To use the new script," + echo "please install pkgs.pg-dump-anon." + exit 1 + EOF + ''; + + meta = lib.getAttrs [ "homepage" "maintainers" "license" ] pg-dump-anon.meta // { + description = "Extension to mask or replace personally identifiable information (PII) or commercially sensitive data from a PostgreSQL database"; + }; +}) diff --git a/pkgs/servers/sql/postgresql/ext/default.nix b/pkgs/servers/sql/postgresql/ext/default.nix new file mode 100644 index 000000000000..b6181da6cf02 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/default.nix @@ -0,0 +1,107 @@ +self: super: { + + age = super.callPackage ./age.nix { }; + + anonymizer = super.callPackage ./anonymizer.nix { }; + + apache_datasketches = super.callPackage ./apache_datasketches.nix { }; + + citus = super.callPackage ./citus.nix { }; + + h3-pg = super.callPackage ./h3-pg.nix { }; + + hypopg = super.callPackage ./hypopg.nix { }; + + jsonb_deep_sum = super.callPackage ./jsonb_deep_sum.nix { }; + + lantern = super.callPackage ./lantern.nix { }; + + periods = super.callPackage ./periods.nix { }; + + postgis = super.callPackage ./postgis.nix { }; + + pg_auto_failover = super.callPackage ./pg_auto_failover.nix { }; + + pg_bigm = super.callPackage ./pg_bigm.nix { }; + + pg_ed25519 = super.callPackage ./pg_ed25519.nix { }; + + pg_embedding = super.callPackage ./pg_embedding.nix { }; + + pg_hint_plan = super.callPackage ./pg_hint_plan.nix { }; + + pg_ivm = super.callPackage ./pg_ivm.nix { }; + + pg_rational = super.callPackage ./pg_rational.nix { }; + + pg_repack = super.callPackage ./pg_repack.nix { }; + + pg_similarity = super.callPackage ./pg_similarity.nix { }; + + pgaudit = super.callPackage ./pgaudit.nix { }; + + pgroonga = super.callPackage ./pgroonga.nix { }; + + pgsodium = super.callPackage ./pgsodium.nix { }; + + pgsql-http = super.callPackage ./pgsql-http.nix { }; + + pgvecto-rs = super.callPackage ./pgvecto-rs { }; + + pgvector = super.callPackage ./pgvector.nix { }; + + plpgsql_check = super.callPackage ./plpgsql_check.nix { }; + + plr = super.callPackage ./plr.nix { }; + + plv8 = super.callPackage ./plv8 { }; + + pgjwt = super.callPackage ./pgjwt.nix { }; + + cstore_fdw = super.callPackage ./cstore_fdw.nix { }; + + pg_hll = super.callPackage ./pg_hll.nix { }; + + pg_cron = super.callPackage ./pg_cron.nix { }; + + pg_topn = super.callPackage ./pg_topn.nix { }; + + pg_net = super.callPackage ./pg_net.nix { }; + + pgtap = super.callPackage ./pgtap.nix { }; + + smlar = super.callPackage ./smlar.nix { }; + + temporal_tables = super.callPackage ./temporal_tables.nix { }; + + timescaledb = super.callPackage ./timescaledb.nix { }; + timescaledb-apache = super.callPackage ./timescaledb.nix { enableUnfree = false; }; + + timescaledb_toolkit = super.callPackage ./timescaledb_toolkit.nix { }; + + tsearch_extras = super.callPackage ./tsearch_extras.nix { }; + + tds_fdw = super.callPackage ./tds_fdw.nix { }; + + pgrouting = super.callPackage ./pgrouting.nix { }; + + pg_partman = super.callPackage ./pg_partman.nix { }; + + pg_relusage = super.callPackage ./pg_relusage.nix { }; + + pg_safeupdate = super.callPackage ./pg_safeupdate.nix { }; + + pg_squeeze = super.callPackage ./pg_squeeze.nix { }; + + pg_uuidv7 = super.callPackage ./pg_uuidv7.nix { }; + + promscale_extension = super.callPackage ./promscale_extension.nix { }; + + repmgr = super.callPackage ./repmgr.nix { }; + + rum = super.callPackage ./rum.nix { }; + + tsja = super.callPackage ./tsja.nix { }; + + wal2json = super.callPackage ./wal2json.nix { }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index ad3c6895b2ae..7a1741b70490 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PostgreSQL extension and service for automated failover and high-availability"; + mainProgram = "pg_autoctl"; homepage = "https://github.com/citusdata/pg_auto_failover"; changelog = "https://github.com/citusdata/pg_auto_failover/blob/v${version}/CHANGELOG.md"; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix index 7abeba5adda1..9bbde3b195da 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.4.1"; + version = "1.5.0"; buildInputs = [ postgresql ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "fboulnois"; repo = "pg_uuidv7"; rev = "v${version}"; - hash = "sha256-1qEsDCcULceMqvR3DIC5rOfpzn2PYbFGq0H8p2+9GR4="; + hash = "sha256-oVyRtjl3KsD3j96qvQb8bFLMhoWO81OudOL4wVXrjzI="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix index 23d4499029ea..d6a4f24bf5e6 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix @@ -1,6 +1,6 @@ { lib , buildPgrxExtension -, cargo-pgrx +, cargo-pgrx_0_11_2 , clang_16 , fetchCrate , fetchFromGitHub @@ -23,27 +23,11 @@ let bindgenHook = rustPlatform.bindgenHook.override { inherit clang; }; }; +in +(buildPgrxExtension.override { # Upstream only works with a fixed version of cargo-pgrx for each release, # so we're pinning it here to avoid future incompatibility. # See https://docs.pgvecto.rs/developers/development.html#environment, step 6 - cargo-pgrx_0_11_2 = cargo-pgrx.overrideAttrs (old: rec { - pname = "cargo-pgrx"; - version = "0.11.2"; - - src = fetchCrate { - pname = "cargo-pgrx"; - inherit version; - hash = "sha256-8NlpMDFaltTIA8G4JioYm8LaPJ2RGKH5o6sd6lBHmmM="; - }; - - cargoDeps = old.cargoDeps.overrideAttrs (_: { - inherit src; - outputHash = "sha256-qTb3JV3u42EilaK2jP9oa5D09mkuHyRbGGRs9Rg4TzI="; - }); - }); - -in -(buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_11_2; rustPlatform = rustPlatform'; }) rec { diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index e30e59d9da93..1dfda512e1d4 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "pgvector"; repo = "pgvector"; rev = "v${version}"; - hash = "sha256-NS9iNgrVnoqmAIXd4sJFnPISQvYYl8YQ84bnLjpChx4="; + hash = "sha256-r+TpFJg6WrMn0L2B7RpmSRvw3XxpHzMRtpFWDCzLvgs="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index c2c974a8d872..ac6f0e948722 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql-check"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "okbob"; repo = "plpgsql_check"; rev = "v${version}"; - hash = "sha256-VFM8SplBGlJd2RfUgS0FLH+xkyLOCVY2jaK6mn878CQ="; + hash = "sha256-qPYH6i8XJZVH+5zM/gozf+0Kts/Tzv6fRWkayGEe+5U="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix index 241aa610c8f9..fa2f1b7ad2d8 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -4,6 +4,7 @@ , v8 , perl , postgresql +, jitSupport # For test , runCommand , coreutils @@ -138,6 +139,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ marsam ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; license = licenses.postgresql; - broken = postgresql.jitSupport; + broken = jitSupport; }; }) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 87333fe97504..523bd154f6e5 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -13,6 +13,8 @@ , libiconv , pcre2 , nixosTests +, jitSupport +, llvm }: let @@ -31,13 +33,11 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ] ++ lib.optional stdenv.isDarwin libiconv; - nativeBuildInputs = [ perl pkg-config ] ++ lib.optional postgresql.jitSupport postgresql.llvm; + nativeBuildInputs = [ perl pkg-config ] ++ lib.optional jitSupport llvm; dontDisableStatic = true; # postgis config directory assumes /include /lib from the same root for json-c library - 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}"; + env.NIX_LDFLAGS = "-L${lib.getLib json_c}/lib"; preConfigure = '' diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index 77dd41db7f6d..96bff3fe20b3 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -3,31 +3,12 @@ , buildPgrxExtension , postgresql , nixosTests -, cargo-pgrx +, cargo-pgrx_0_10_2 , fetchCrate , nix-update-script , stdenv }: -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; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix new file mode 100644 index 000000000000..5d93cf9aa31b --- /dev/null +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -0,0 +1,322 @@ +let + + generic = + # dependencies + { 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. + , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic + , enableSystemd ? null + , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic + + # for postgresql.pkgs + , self, newScope, buildEnv + + # source specification + , version, hash, muslPatches + + # for tests + , testers, nixosTests, thisAttr + + # JIT + , jitSupport + , 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 + } @args: + let + atLeast = lib.versionAtLeast version; + olderThan = lib.versionOlder version; + lz4Enabled = atLeast "14"; + zstdEnabled = atLeast "15"; + + systemdSupport' = if enableSystemd == null then systemdSupport else (lib.warn "postgresql: argument enableSystemd is deprecated, please use systemdSupport instead." enableSystemd); + + pname = "postgresql"; + + stdenv' = if jitSupport then llvmPackages.stdenv else stdenv; + in stdenv'.mkDerivation (finalAttrs: { + inherit pname version; + + src = fetchurl { + url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2"; + inherit hash; + }; + + hardeningEnable = lib.optionals (!stdenv'.cc.isClang) [ "pie" ]; + + outputs = [ "out" "lib" "doc" "man" ]; + setOutputFlags = false; # $out retains configureFlags :-/ + + buildInputs = [ + zlib + readline + openssl + libxml2 + icu + ] + ++ lib.optionals (olderThan "13") [ libxcrypt ] + ++ lib.optionals jitSupport [ llvmPackages.llvm ] + ++ lib.optionals lz4Enabled [ lz4 ] + ++ lib.optionals zstdEnabled [ zstd ] + ++ lib.optionals systemdSupport' [ systemd ] + ++ lib.optionals pythonSupport [ python3 ] + ++ lib.optionals gssSupport [ libkrb5 ] + ++ lib.optionals stdenv'.isLinux [ linux-pam ] + ++ lib.optionals (!stdenv'.isDarwin) [ libossp_uuid ]; + + nativeBuildInputs = [ + makeWrapper + pkg-config + ] + ++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences patchelf ]; + + enableParallelBuilding = !stdenv'.isDarwin; + + separateDebugInfo = true; + + buildFlags = [ "world" ]; + + env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; + + # Otherwise it retains a reference to compiler and fails; see #44767. TODO: better. + preConfigure = "CC=${stdenv'.cc.targetPrefix}cc"; + + configureFlags = [ + "--with-openssl" + "--with-libxml" + "--with-icu" + "--sysconfdir=/etc" + "--libdir=$(lib)/lib" + "--with-system-tzdata=${tzdata}/share/zoneinfo" + "--enable-debug" + (lib.optionalString systemdSupport' "--with-systemd") + (if stdenv'.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") + ] ++ 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 stdenv'.isLinux [ "--with-pam" ]; + + patches = [ + (if atLeast "16" then ./patches/disable-normalize_exec_path.patch + else ./patches/disable-resolve_symlinks.patch) + ./patches/less-is-more.patch + ./patches/hardcode-pgxs-path.patch + ./patches/specify_pkglibdir_at_runtime.patch + ./patches/findstring.patch + + (substituteAll { + src = ./patches/locale-binary-path.patch; + locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; + }) + + ] ++ lib.optionals stdenv'.hostPlatform.isMusl ( + # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141 + map fetchurl (lib.attrValues muslPatches) + ) ++ lib.optionals stdenv'.isLinux [ + (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch) + ]; + + installTargets = [ "install-world" ]; + + LC_ALL = "C"; + + postPatch = '' + # Hardcode the path to pgxs so pg_config returns the path in $out + substituteInPlace "src/common/config_info.c" --replace HARDCODED_PGXS_PATH "$out/lib" + '' + lib.optionalString jitSupport '' + # Force lookup of jit stuff in $out instead of $lib + substituteInPlace src/backend/jit/jit.c --replace pkglib_path \"$out/lib\" + substituteInPlace src/backend/jit/llvm/llvmjit.c --replace pkglib_path \"$out/lib\" + substituteInPlace src/backend/jit/llvm/llvmjit_inline.cpp --replace pkglib_path \"$out/lib\" + ''; + + postInstall = + '' + moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it + moveToOutput "lib/libpgcommon*.a" "$out" + moveToOutput "lib/libpgport*.a" "$out" + moveToOutput "lib/libecpg*" "$out" + + # Prevent a retained dependency on gcc-wrapper. + substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/ld ld + + if [ -z "''${dontDisableStatic:-}" ]; then + # Remove static libraries in case dynamic are available. + for i in $out/lib/*.a $lib/lib/*.a; do + name="$(basename "$i")" + ext="${stdenv'.hostPlatform.extensions.sharedLibrary}" + if [ -e "$lib/lib/''${name%.a}$ext" ] || [ -e "''${i%.a}$ext" ]; then + rm "$i" + fi + done + fi + '' + lib.optionalString jitSupport '' + # Move the bitcode and libllvmjit.so library out of $lib; otherwise, every client that + # depends on libpq.so will also have libLLVM.so in its closure too, bloating it + moveToOutput "lib/bitcode" "$out" + moveToOutput "lib/llvmjit*" "$out" + + # In the case of JIT support, prevent a retained dependency on clang-wrapper + substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/clang clang + nuke-refs $out/lib/llvmjit_types.bc $(find $out/lib/bitcode -type f) + + # Stop out depending on the default output of llvm + substituteInPlace $out/lib/pgxs/src/Makefile.global \ + --replace ${llvmPackages.llvm.out}/bin "" \ + --replace '$(LLVM_BINPATH)/' "" + + # Stop out depending on the -dev output of llvm + substituteInPlace $out/lib/pgxs/src/Makefile.global \ + --replace ${llvmPackages.llvm.dev}/bin/llvm-config llvm-config \ + --replace -I${llvmPackages.llvm.dev}/include "" + + ${lib.optionalString (!stdenv'.isDarwin) '' + # Stop lib depending on the -dev output of llvm + rpath=$(patchelf --print-rpath $out/lib/llvmjit.so) + nuke-refs -e $out $out/lib/llvmjit.so + # Restore the correct rpath + patchelf $out/lib/llvmjit.so --set-rpath "$rpath" + ''} + ''; + + postFixup = lib.optionalString (!stdenv'.isDarwin && stdenv'.hostPlatform.libc == "glibc") + '' + # initdb needs access to "locale" command from glibc. + wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin + ''; + + doCheck = !stdenv'.isDarwin; + # autodetection doesn't seem to able to find this, but it's there. + checkTarget = "check"; + + preCheck = + # On musl, comment skip the following tests, because they break due to + # ! ERROR: could not load library "/build/postgresql-11.5/tmp_install/nix/store/...-postgresql-11.5-lib/lib/libpqwalreceiver.so": Error loading shared library libpq.so.5: No such file or directory (needed by /build/postgresql-11.5/tmp_install/nix/store/...-postgresql-11.5-lib/lib/libpqwalreceiver.so) + # See also here: + # https://git.alpinelinux.org/aports/tree/main/postgresql/disable-broken-tests.patch?id=6d7d32c12e073a57a9e5946e55f4c1fbb68bd442 + if stdenv'.hostPlatform.isMusl then '' + substituteInPlace src/test/regress/parallel_schedule \ + --replace "subscription" "" \ + --replace "object_address" "" + '' else null; + + disallowedReferences = [ stdenv'.cc ]; + + passthru = let + this = self.callPackage generic args; + jitToggle = this.override { + jitSupport = !jitSupport; + }; + in + { + psqlSchema = lib.versions.major version; + + withJIT = if jitSupport then this else jitToggle; + withoutJIT = if jitSupport then jitToggle else this; + + dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary; + + pkgs = let + scope = { + inherit jitSupport; + inherit (llvmPackages) llvm; + postgresql = this; + stdenv = stdenv'; + buildPgxExtension = buildPgxExtension.override { + stdenv = stdenv'; + rustPlatform = makeRustPlatform { + stdenv = stdenv'; + inherit rustc cargo; + }; + }; + }; + newSelf = self // scope; + newSuper = { callPackage = newScope (scope // this.pkgs); }; + in import ./ext newSelf newSuper; + + withPackages = postgresqlWithPackages { + inherit makeWrapper buildEnv; + postgresql = this; + } + this.pkgs; + + tests = { + postgresql = nixosTests.postgresql-wal-receiver.${thisAttr}; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + } // lib.optionalAttrs jitSupport { + postgresql-jit = nixosTests.postgresql-jit.${thisAttr}; + }; + }; + + meta = with lib; { + homepage = "https://www.postgresql.org"; + description = "A powerful, open source object-relational database system"; + license = licenses.postgresql; + changelog = "https://www.postgresql.org/docs/release/${finalAttrs.version}/"; + maintainers = with maintainers; [ thoughtpolice danbst globin marsam ivan ma27 ]; + pkgConfigModules = [ "libecpg" "libecpg_compat" "libpgtypes" "libpq" ]; + platforms = platforms.unix; + + # JIT support doesn't work with cross-compilation. It is attempted to build LLVM-bytecode + # (`%.bc` is the corresponding `make(1)`-rule) for each sub-directory in `backend/` for + # the JIT apparently, but with a $(CLANG) that can produce binaries for the build, not the + # host-platform. + # + # I managed to get a cross-build with JIT support working with + # `depsBuildBuild = [ llvmPackages.clang ] ++ buildInputs`, but considering that the + # resulting LLVM IR isn't platform-independent this doesn't give you much. + # In fact, I tried to test the result in a VM-test, but as soon as JIT was used to optimize + # a query, postgres would coredump with `Illegal instruction`. + broken = jitSupport && (stdenv.hostPlatform != stdenv.buildPlatform); + }; + }); + + postgresqlWithPackages = { postgresql, makeWrapper, buildEnv }: pkgs: f: buildEnv { + name = "postgresql-and-plugins-${postgresql.version}"; + paths = f pkgs ++ [ + postgresql + postgresql.lib + postgresql.man # in case user installs this into environment + ]; + nativeBuildInputs = [ makeWrapper ]; + + + # We include /bin to ensure the $out/bin directory is created, which is + # needed because we'll be removing the files from that directory in postBuild + # below. See #22653 + pathsToLink = ["/" "/bin"]; + + # Note: the duplication of executables is about 4MB size. + # So a nicer solution was patching postgresql to allow setting the + # libdir explicitly. + postBuild = '' + mkdir -p $out/bin + rm $out/bin/{pg_config,postgres,pg_ctl} + cp --target-directory=$out/bin ${postgresql}/bin/{postgres,pg_config,pg_ctl} + wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib + ''; + + passthru.version = postgresql.version; + passthru.psqlSchema = postgresql.psqlSchema; + }; + +in +# passed by <major>.nix +versionArgs: +# passed by default.nix +{ self, ... } @defaultArgs: +self.callPackage generic (defaultArgs // versionArgs) diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix deleted file mode 100644 index 9cc83118c526..000000000000 --- a/pkgs/servers/sql/postgresql/packages.nix +++ /dev/null @@ -1,105 +0,0 @@ -self: super: { - - age = super.callPackage ./ext/age.nix { }; - - 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 { }; - - lantern = super.callPackage ./ext/lantern.nix { }; - - periods = super.callPackage ./ext/periods.nix { }; - - postgis = super.callPackage ./ext/postgis.nix { }; - - pg_auto_failover = super.callPackage ./ext/pg_auto_failover.nix { }; - - pg_bigm = super.callPackage ./ext/pg_bigm.nix { }; - - pg_ed25519 = super.callPackage ./ext/pg_ed25519.nix { }; - - pg_embedding = super.callPackage ./ext/pg_embedding.nix { }; - - pg_hint_plan = super.callPackage ./ext/pg_hint_plan.nix { }; - - pg_ivm = super.callPackage ./ext/pg_ivm.nix { }; - - pg_rational = super.callPackage ./ext/pg_rational.nix { }; - - pg_repack = super.callPackage ./ext/pg_repack.nix { }; - - pg_similarity = super.callPackage ./ext/pg_similarity.nix { }; - - pgaudit = super.callPackage ./ext/pgaudit.nix { }; - - pgroonga = super.callPackage ./ext/pgroonga.nix { }; - - pgsodium = super.callPackage ./ext/pgsodium.nix { }; - - pgsql-http = super.callPackage ./ext/pgsql-http.nix { }; - - pgvecto-rs = super.callPackage ./ext/pgvecto-rs { }; - - pgvector = super.callPackage ./ext/pgvector.nix { }; - - plpgsql_check = super.callPackage ./ext/plpgsql_check.nix { }; - - plr = super.callPackage ./ext/plr.nix { }; - - plv8 = super.callPackage ./ext/plv8 { }; - - pgjwt = super.callPackage ./ext/pgjwt.nix { }; - - cstore_fdw = super.callPackage ./ext/cstore_fdw.nix { }; - - pg_hll = super.callPackage ./ext/pg_hll.nix { }; - - pg_cron = super.callPackage ./ext/pg_cron.nix { }; - - pg_topn = super.callPackage ./ext/pg_topn.nix { }; - - pg_net = super.callPackage ./ext/pg_net.nix { }; - - pgtap = super.callPackage ./ext/pgtap.nix { }; - - smlar = super.callPackage ./ext/smlar.nix { }; - - temporal_tables = super.callPackage ./ext/temporal_tables.nix { }; - - timescaledb = super.callPackage ./ext/timescaledb.nix { }; - timescaledb-apache = super.callPackage ./ext/timescaledb.nix { enableUnfree = false; }; - - timescaledb_toolkit = super.callPackage ./ext/timescaledb_toolkit.nix { }; - - tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { }; - - tds_fdw = super.callPackage ./ext/tds_fdw.nix { }; - - pgrouting = super.callPackage ./ext/pgrouting.nix { }; - - pg_partman = super.callPackage ./ext/pg_partman.nix { }; - - pg_relusage = super.callPackage ./ext/pg_relusage.nix { }; - - pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { }; - - pg_squeeze = super.callPackage ./ext/pg_squeeze.nix { }; - - pg_uuidv7 = super.callPackage ./ext/pg_uuidv7.nix { }; - - promscale_extension = super.callPackage ./ext/promscale_extension.nix { }; - - repmgr = super.callPackage ./ext/repmgr.nix { }; - - rum = super.callPackage ./ext/rum.nix { }; - - tsja = super.callPackage ./ext/tsja.nix { }; - - wal2json = super.callPackage ./ext/wal2json.nix { }; -} diff --git a/pkgs/servers/sql/postgresql/locale-binary-path.patch b/pkgs/servers/sql/postgresql/patches/locale-binary-path.patch index 08e90bce750c..08e90bce750c 100644 --- a/pkgs/servers/sql/postgresql/locale-binary-path.patch +++ b/pkgs/servers/sql/postgresql/patches/locale-binary-path.patch diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index 891ee8e53134..e0a6f23a4631 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -166,6 +166,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { broken = stdenv.isDarwin; description = "High-performance MySQL proxy"; + mainProgram = "proxysql"; homepage = "https://proxysql.com/"; license = with licenses; [ gpl3Only ]; maintainers = teams.helsinki-systems.members; diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix index d8bcadbb9df9..3f06ae1e43da 100644 --- a/pkgs/servers/sql/rqlite/default.nix +++ b/pkgs/servers/sql/rqlite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rqlite"; - version = "8.22.1"; + version = "8.23.0"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g5W+rHD4gUS82E+wFLQ3VTSwIWQUogwTutwPTtf+IdM="; + sha256 = "sha256-n4ALjayvcOR+VcpKPRh6WswAEEdlYyxhYyfPRje98Rs="; }; - vendorHash = "sha256-onR4n6ok6y9APRwGjBoMISbidGDVw19D48TkogRp1uM="; + vendorHash = "sha256-UYO5asCX+KpESAT1ws7O91QaOJ8zPbd06JzHexBiWj0="; subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index 7c3cc4635e25..ba02f33cee62 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sslh"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "yrutschle"; repo = pname; rev = "v${version}"; - hash = "sha256-KXjoYtiGaOrdWRbI0umNfxbtS7p+YaW352lC/5f+AM4="; + hash = "sha256-fIKiUrpHn2VcUFH6WblZDDpa+AenC2qtgrQ6uUUIyoQ="; }; postPatch = "patchShebangs *.sh"; diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix index aa7b079fea19..a4fd4abc109c 100644 --- a/pkgs/servers/sunshine/default.nix +++ b/pkgs/servers/sunshine/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoPatchelfHook , makeWrapper , buildNpmPackage @@ -50,32 +49,26 @@ let in stdenv'.mkDerivation rec { pname = "sunshine"; - version = "0.22.0"; + version = "0.22.2"; src = fetchFromGitHub { owner = "LizardByte"; repo = "Sunshine"; rev = "v${version}"; - sha256 = "sha256-O9U4zP1o6yWtzk+2DW7ueimvsTuajLY8IETlvCT4jTE="; + sha256 = "sha256-So8fX0XQoW2cdTWWENoE07EU6e8vvjeTpizLoaDTjeg="; fetchSubmodules = true; }; patches = [ # remove npm install as it needs internet access -- handled separately below ./dont-build-webui.patch - # revert https://github.com/LizardByte/Sunshine/pull/2046 - let cmake install handle udev and systemd files - (fetchpatch { - url = "https://github.com/LizardByte/Sunshine/commit/0d4dfcd708c0027b7d8827a03163858800fa79fa.patch"; - hash = "sha256-77NtfX0zB7ty92AyFOz9wJoa1jHshlNbPQ7NOpqUuYo="; - revert = true; - }) ]; # build webui ui = buildNpmPackage { inherit src version; pname = "sunshine-ui"; - npmDepsHash = "sha256-jAZUu2CfcqhC2xMiZYpY7KPCRVFQgT/kgUvSI+5Cpkc="; + npmDepsHash = "sha256-0487ntbJZ20MZHezQ+Z3EJkidF3Dgoh/mynYwR7k/+I="; # use generated package-lock.json as upstream does not provide one postPatch = '' @@ -94,7 +87,7 @@ stdenv'.mkDerivation rec { autoPatchelfHook makeWrapper ] ++ lib.optionals cudaSupport [ - cudaPackages.autoAddOpenGLRunpathHook + cudaPackages.autoAddDriverRunpath ]; buildInputs = [ @@ -152,17 +145,21 @@ stdenv'.mkDerivation rec { cmakeFlags = [ "-Wno-dev" + # upstream tries to use systemd and udev packages to find these directories in FHS; set the paths explicitly instead + (lib.cmakeFeature "UDEV_RULES_INSTALL_DIR" "lib/udev/rules.d") + (lib.cmakeFeature "SYSTEMD_USER_UNIT_INSTALL_DIR" "lib/systemd/user") ]; postPatch = '' - # fix hardcoded libevdev path - substituteInPlace cmake/compile_definitions/linux.cmake \ - --replace '/usr/include/libevdev-1.0' '${libevdev}/include/libevdev-1.0' + # remove upstream dependency on systemd and udev + substituteInPlace cmake/packaging/linux.cmake \ + --replace-fail 'find_package(Systemd)' "" \ + --replace-fail 'find_package(Udev)' "" substituteInPlace packaging/linux/sunshine.desktop \ - --replace '@PROJECT_NAME@' 'Sunshine' \ - --replace '@PROJECT_DESCRIPTION@' 'Self-hosted game stream host for Moonlight' \ - --replace '/usr/bin/env systemctl start --u sunshine' 'sunshine' + --subst-var-by PROJECT_NAME 'Sunshine' \ + --subst-var-by PROJECT_DESCRIPTION 'Self-hosted game stream host for Moonlight' \ + --replace-fail '/usr/bin/env systemctl start --u sunshine' 'sunshine' ''; preBuild = '' diff --git a/pkgs/servers/sunshine/dont-build-webui.patch b/pkgs/servers/sunshine/dont-build-webui.patch index cba7a1e243b1..f4addc55e468 100644 --- a/pkgs/servers/sunshine/dont-build-webui.patch +++ b/pkgs/servers/sunshine/dont-build-webui.patch @@ -1,14 +1,14 @@ diff --git a/cmake/targets/common.cmake b/cmake/targets/common.cmake -index 3dd629e..acec58d 100644 +index 9f2ce08..8c32b8f 100644 --- a/cmake/targets/common.cmake +++ b/cmake/targets/common.cmake -@@ -37,8 +37,4 @@ endif() - - target_compile_options(sunshine PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${SUNSHINE_COMPILE_OPTIONS}>;$<$<COMPILE_LANGUAGE:CUDA>:${SUNSHINE_COMPILE_OPTIONS_CUDA};-std=c++17>) # cmake-lint: disable=C0301 +@@ -48,8 +48,4 @@ else() + set(NPM_BUILD_HOMEBREW "") + endif() -#WebUI build -add_custom_target(web-ui ALL - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - COMMENT "Installing NPM Dependencies and Building the Web UI" -- COMMAND bash -c \"npm install && SUNSHINE_SOURCE_ASSETS_DIR=${SUNSHINE_SOURCE_ASSETS_DIR} SUNSHINE_ASSETS_DIR=${CMAKE_BINARY_DIR} npm run build\") # cmake-lint: disable=C0301 +- COMMAND bash -c \"npm install && SUNSHINE_BUILD_HOMEBREW=${NPM_BUILD_HOMEBREW} SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR} SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR} npm run build\") # cmake-lint: disable=C0301 + diff --git a/pkgs/servers/sunshine/package-lock.json b/pkgs/servers/sunshine/package-lock.json index ea31d56d727c..63a10b418964 100644 --- a/pkgs/servers/sunshine/package-lock.json +++ b/pkgs/servers/sunshine/package-lock.json @@ -1,5 +1,5 @@ { - "name": "Sunshine", + "name": "sunshine", "lockfileVersion": 3, "requires": true, "packages": { @@ -790,9 +790,9 @@ } }, "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.3.tgz", + "integrity": "sha512-H/5Vyeo/I1hqIdOS0m1Q63OPr0yFdZLaiVkr8ap/WyIVGdU3PyoOV/HXY8+PJE2M43+n11FY5zWQnNRNnD1UFg==", "engines": { "node": ">=0.10.0" } diff --git a/pkgs/servers/syncstorage-rs/Cargo.lock b/pkgs/servers/syncstorage-rs/Cargo.lock deleted file mode 100644 index 059eca302cc5..000000000000 --- a/pkgs/servers/syncstorage-rs/Cargo.lock +++ /dev/null @@ -1,4523 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "actix-codec" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78d1833b3838dbe990df0f1f87baf640cf6146e898166afe401839d1b001e570" -dependencies = [ - "bitflags 1.3.2", - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "pin-project 0.4.30", - "tokio 0.2.25", - "tokio-util 0.3.1", -] - -[[package]] -name = "actix-connect" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177837a10863f15ba8d3ae3ec12fac1099099529ed20083a27fdfe247381d0dc" -dependencies = [ - "actix-codec", - "actix-rt", - "actix-service", - "actix-utils", - "derive_more", - "either", - "futures-util", - "http", - "log", - "trust-dns-proto", - "trust-dns-resolver", -] - -[[package]] -name = "actix-cors" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b133d8026a9f209a9aeeeacd028e7451bcca975f592881b305d37983f303d7" -dependencies = [ - "actix-web", - "derive_more", - "futures-util", - "log", - "once_cell", - "tinyvec", -] - -[[package]] -name = "actix-http" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be6b66b62a794a8e6d366ac9415bb7d475ffd1e9f4671f38c1d8a8a5df950b3" -dependencies = [ - "actix-codec", - "actix-connect", - "actix-rt", - "actix-service", - "actix-threadpool", - "actix-utils", - "base64 0.13.1", - "bitflags 1.3.2", - "brotli", - "bytes 0.5.6", - "cookie", - "copyless", - "derive_more", - "either", - "encoding_rs", - "flate2", - "futures-channel", - "futures-core", - "futures-util", - "fxhash", - "h2 0.2.7", - "http", - "httparse", - "indexmap", - "itoa 0.4.8", - "language-tags", - "lazy_static", - "log", - "mime", - "percent-encoding 2.3.0", - "pin-project 1.1.3", - "rand 0.7.3", - "regex", - "serde 1.0.189", - "serde_json", - "serde_urlencoded", - "sha-1", - "slab", - "time 0.2.27", -] - -[[package]] -name = "actix-macros" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ca8ce00b267af8ccebbd647de0d61e0674b6e61185cc7a592ff88772bed655" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "actix-router" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad299af73649e1fc893e333ccf86f377751eb95ff875d095131574c6f43452c" -dependencies = [ - "bytestring", - "http", - "log", - "regex", - "serde 1.0.189", -] - -[[package]] -name = "actix-rt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143fcc2912e0d1de2bcf4e2f720d2a60c28652ab4179685a1ee159e0fb3db227" -dependencies = [ - "actix-macros", - "actix-threadpool", - "copyless", - "futures-channel", - "futures-util", - "smallvec", - "tokio 0.2.25", -] - -[[package]] -name = "actix-server" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45407e6e672ca24784baa667c5d32ef109ccdd8d5e0b5ebb9ef8a67f4dfb708e" -dependencies = [ - "actix-codec", - "actix-rt", - "actix-service", - "actix-utils", - "futures-channel", - "futures-util", - "log", - "mio 0.6.23", - "mio-uds", - "num_cpus", - "slab", - "socket2 0.3.19", -] - -[[package]] -name = "actix-service" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb" -dependencies = [ - "futures-util", - "pin-project 0.4.30", -] - -[[package]] -name = "actix-testing" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47239ca38799ab74ee6a8a94d1ce857014b2ac36f242f70f3f75a66f691e791c" -dependencies = [ - "actix-macros", - "actix-rt", - "actix-server", - "actix-service", - "log", - "socket2 0.3.19", -] - -[[package]] -name = "actix-threadpool" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d209f04d002854b9afd3743032a27b066158817965bf5d036824d19ac2cc0e30" -dependencies = [ - "derive_more", - "futures-channel", - "lazy_static", - "log", - "num_cpus", - "parking_lot 0.11.2", - "threadpool", -] - -[[package]] -name = "actix-tls" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24789b7d7361cf5503a504ebe1c10806896f61e96eca9a7350e23001aca715fb" -dependencies = [ - "actix-codec", - "actix-service", - "actix-utils", - "futures-util", -] - -[[package]] -name = "actix-utils" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9022dec56632d1d7979e59af14f0597a28a830a9c1c7fec8b2327eb9f16b5a" -dependencies = [ - "actix-codec", - "actix-rt", - "actix-service", - "bitflags 1.3.2", - "bytes 0.5.6", - "either", - "futures-channel", - "futures-sink", - "futures-util", - "log", - "pin-project 0.4.30", - "slab", -] - -[[package]] -name = "actix-web" -version = "3.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6534a126df581caf443ba2751cab42092c89b3f1d06a9d829b1e17edfe3e277" -dependencies = [ - "actix-codec", - "actix-http", - "actix-macros", - "actix-router", - "actix-rt", - "actix-server", - "actix-service", - "actix-testing", - "actix-threadpool", - "actix-tls", - "actix-utils", - "actix-web-codegen", - "awc", - "bytes 0.5.6", - "derive_more", - "encoding_rs", - "futures-channel", - "futures-core", - "futures-util", - "fxhash", - "log", - "mime", - "pin-project 1.1.3", - "regex", - "serde 1.0.189", - "serde_json", - "serde_urlencoded", - "socket2 0.3.19", - "time 0.2.27", - "tinyvec", - "url 2.4.1", -] - -[[package]] -name = "actix-web-codegen" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad26f77093333e0e7c6ffe54ebe3582d908a104e448723eec6d43d08b07143fb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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 = "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 = "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 = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "arc-swap" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "assert-json-diff" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" -dependencies = [ - "serde 1.0.189", - "serde_json", -] - -[[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 = "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 0.3.9", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "awc" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b381e490e7b0cfc37ebc54079b0413d8093ef43d14a4e4747083f7fa47a9e691" -dependencies = [ - "actix-codec", - "actix-http", - "actix-rt", - "actix-service", - "base64 0.13.1", - "bytes 0.5.6", - "cfg-if 1.0.0", - "derive_more", - "futures-core", - "log", - "mime", - "percent-encoding 2.3.0", - "rand 0.7.3", - "serde 1.0.189", - "serde_json", - "serde_urlencoded", -] - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" - -[[package]] -name = "bindgen" -version = "0.59.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "clap", - "env_logger 0.9.3", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "which", -] - -[[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" - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "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 = "boringssl-src" -version = "0.5.2+6195bf8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab565ccc5e276ea82a2013dd08bf2c999866b06daf1d4f30fee419c4aaec6d5" -dependencies = [ - "cmake", -] - -[[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 = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "bytestring" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238e4886760d98c4f899360c834fa93e62cf7f721ac3c2da375cbdf4b8679aae" -dependencies = [ - "bytes 1.5.0", -] - -[[package]] -name = "cadence" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f39286bc075b023101dccdb79456a1334221c768b8faede0c2aff7ed29a9482d" -dependencies = [ - "crossbeam-channel", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom 7.1.3", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[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 0.2.17", - "wasm-bindgen", - "windows-targets", -] - -[[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 = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "colored" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" -dependencies = [ - "is-terminal", - "lazy_static", - "windows-sys", -] - -[[package]] -name = "config" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" -dependencies = [ - "lazy_static", - "nom 5.1.3", - "serde 1.0.189", -] - -[[package]] -name = "config" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369" -dependencies = [ - "lazy_static", - "nom 5.1.3", - "rust-ini", - "serde 1.0.189", - "serde-hjson", - "serde_json", - "toml", - "yaml-rust", -] - -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cookie" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" -dependencies = [ - "percent-encoding 2.3.0", - "time 0.2.27", - "version_check", -] - -[[package]] -name = "copyless" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.16", -] - -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if 1.0.0", -] - -[[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 = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2 0.4.9", - "winapi 0.3.9", -] - -[[package]] -name = "curl-sys" -version = "0.4.68+curl-8.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "windows-sys", -] - -[[package]] -name = "deadpool" -version = "0.5.2" -source = "git+https://github.com/mozilla-services/deadpool?branch=deadpool-v0.5.2-issue92#ede2a1f1fa22a7266cf4681edd2b988dfd333af9" -dependencies = [ - "async-trait", - "config 0.10.1", - "crossbeam-queue", - "num_cpus", - "serde 1.0.189", - "tokio 0.2.25", -] - -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "serde 1.0.189", - "uuid 1.5.0", -] - -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 1.0.109", -] - -[[package]] -name = "diesel" -version = "1.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28135ecf6b7d446b43e27e225622a038cc4e2930a1022f51cdb97ada19b8e4d" -dependencies = [ - "byteorder", - "diesel_derives", - "mysqlclient-sys", - "r2d2", - "url 1.7.2", -] - -[[package]] -name = "diesel_derives" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "diesel_logger" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1793935ad14586bf2aa51574a7157932640c345205ccfb2db431846d846e3db7" -dependencies = [ - "diesel", - "log", -] - -[[package]] -name = "diesel_migrations" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c" -dependencies = [ - "migrations_internals", - "migrations_macros", -] - -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - -[[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", - "crypto-common", - "subtle", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[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 0.3.9", -] - -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -[[package]] -name = "docopt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" -dependencies = [ - "lazy_static", - "regex", - "serde 1.0.189", - "strsim 0.10.0", -] - -[[package]] -name = "dyn-clone" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "enum-as-inner" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570d109b813e904becc80d8d5da38376818a143348413f7149f1340fe04754d4" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "erased-serde" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" -dependencies = [ - "serde 1.0.189", -] - -[[package]] -name = "errno" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "findshlibs" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64" -dependencies = [ - "cc", - "lazy_static", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "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 2.3.0", -] - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags 1.3.2", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] -name = "futures" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - -[[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-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[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 0.1.31", - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite 0.2.13", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "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 1.0.0", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "google-cloud-rust-raw" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbabcfb0bcc5e3222191c3f0fba962b0cbf4242d2effe2a865090eee492ffc9c" -dependencies = [ - "futures 0.3.28", - "grpcio", - "protobuf", -] - -[[package]] -name = "grpcio" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "609832ca501baeb662dc81932fda9ed83f5d058f4b899a807ba222ce696f430a" -dependencies = [ - "futures-executor", - "futures-util", - "grpcio-sys", - "libc", - "log", - "parking_lot 0.12.1", - "protobuf", -] - -[[package]] -name = "grpcio-sys" -version = "0.12.1+1.46.5-patched" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf625d1803b6f44203f0428ddace847fb4994def5c803fc8a7a2f18fb3daec62" -dependencies = [ - "bindgen", - "boringssl-src", - "cc", - "cmake", - "libc", - "libz-sys", - "pkg-config", - "walkdir", -] - -[[package]] -name = "h2" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio 0.2.25", - "tokio-util 0.3.1", - "tracing", - "tracing-futures", -] - -[[package]] -name = "h2" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" -dependencies = [ - "bytes 1.5.0", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio 1.33.0", - "tokio-util 0.7.9", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hawk" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7539c8d8699bae53238aacd3f93cfb0bcaef77b85dc963902b9367c5d7a84c48" -dependencies = [ - "anyhow", - "base64 0.12.3", - "log", - "once_cell", - "ring", - "thiserror", - "url 2.4.1", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[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.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 = "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", -] - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi 0.3.9", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes 1.5.0", - "fnv", - "itoa 1.0.9", -] - -[[package]] -name = "http-body" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -dependencies = [ - "bytes 0.5.6", - "http", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes 1.5.0", - "http", - "pin-project-lite 0.2.13", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.13.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" -dependencies = [ - "bytes 0.5.6", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.2.7", - "http", - "http-body 0.3.1", - "httparse", - "httpdate 0.3.2", - "itoa 0.4.8", - "pin-project 1.1.3", - "socket2 0.3.19", - "tokio 0.2.25", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes 1.5.0", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.21", - "http", - "http-body 0.4.5", - "httparse", - "httpdate 1.0.3", - "itoa 1.0.9", - "pin-project-lite 0.2.13", - "socket2 0.4.9", - "tokio 1.33.0", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" -dependencies = [ - "bytes 0.5.6", - "futures-util", - "hyper 0.13.10", - "log", - "rustls", - "tokio 0.2.25", - "tokio-rustls", - "webpki", -] - -[[package]] -name = "hyper-tls" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" -dependencies = [ - "bytes 0.5.6", - "hyper 0.13.10", - "native-tls", - "tokio 0.2.25", - "tokio-tls", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes 1.5.0", - "hyper 0.14.27", - "native-tls", - "tokio 1.33.0", - "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 = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[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", -] - -[[package]] -name = "indoc" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -dependencies = [ - "indoc-impl", - "proc-macro-hack", -] - -[[package]] -name = "indoc-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", - "unindent", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "ipconfig" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7" -dependencies = [ - "socket2 0.3.19", - "widestring", - "winapi 0.3.9", - "winreg 0.6.2", -] - -[[package]] -name = "ipnet" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.3", - "rustix", - "windows-sys", -] - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[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 = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "language-tags" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec", - "bitflags 1.3.2", - "cfg-if 1.0.0", - "ryu", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", -] - -[[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 = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[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" - -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "migrations_internals" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860" -dependencies = [ - "diesel", -] - -[[package]] -name = "migrations_macros" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" -dependencies = [ - "migrations_internals", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", -] - -[[package]] -name = "mio-uds" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" -dependencies = [ - "iovec", - "libc", - "mio 0.6.23", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "mockito" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d10030163d67f681db11810bc486df3149e6d91c8b4f3f96fa8b62b546c2cef8" -dependencies = [ - "assert-json-diff", - "colored", - "difference", - "httparse", - "lazy_static", - "log", - "rand 0.8.5", - "regex", - "serde_json", - "serde_urlencoded", -] - -[[package]] -name = "mysqlclient-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61b381528ba293005c42a409dd73d034508e273bf90481f17ec2e964a6e969b" -dependencies = [ - "pkg-config", - "vcpkg", -] - -[[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 = "net2" -version = "0.2.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "nom" -version = "5.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" -dependencies = [ - "lexical-core", - "memchr", - "version_check", -] - -[[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 = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.17", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.3", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[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 = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[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 1.0.0", - "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 = "os_info" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" -dependencies = [ - "log", - "serde 1.0.189", - "winapi 0.3.9", -] - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[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 0.9.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi 0.3.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.4.1", - "smallvec", - "windows-targets", -] - -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pin-project" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" -dependencies = [ - "pin-project-internal 0.4.30", -] - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal 1.1.3", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - -[[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 = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[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 = "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 = "protobuf" -version = "2.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" - -[[package]] -name = "pyo3" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35100f9347670a566a67aa623369293703322bb9db77d99d7df7313b575ae0c8" -dependencies = [ - "cfg-if 1.0.0", - "indoc", - "libc", - "parking_lot 0.11.2", - "paste", - "pyo3-build-config", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d12961738cacbd7f91b7c43bc25cfeeaa2698ad07a04b3be0aa88b950865738f" -dependencies = [ - "once_cell", -] - -[[package]] -name = "pyo3-macros" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0bc5215d704824dfddddc03f93cb572e1155c68b6761c37005e1c288808ea8" -dependencies = [ - "pyo3-macros-backend", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71623fc593224afaab918aa3afcaf86ed2f43d34f6afde7f3922608f253240df" -dependencies = [ - "proc-macro2", - "pyo3-build-config", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "r2d2" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" -dependencies = [ - "log", - "parking_lot 0.12.1", - "scheduled-thread-pool", -] - -[[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_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 = "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", - "regex-syntax", -] - -[[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", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "reqwest" -version = "0.10.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" -dependencies = [ - "base64 0.13.1", - "bytes 0.5.6", - "encoding_rs", - "futures-core", - "futures-util", - "http", - "http-body 0.3.1", - "hyper 0.13.10", - "hyper-rustls", - "hyper-tls 0.4.3", - "ipnet", - "js-sys", - "lazy_static", - "log", - "mime", - "mime_guess", - "native-tls", - "percent-encoding 2.3.0", - "pin-project-lite 0.2.13", - "rustls", - "serde 1.0.189", - "serde_json", - "serde_urlencoded", - "tokio 0.2.25", - "tokio-rustls", - "tokio-tls", - "url 2.4.1", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg 0.7.0", -] - -[[package]] -name = "reqwest" -version = "0.11.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" -dependencies = [ - "base64 0.21.4", - "bytes 1.5.0", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.21", - "http", - "http-body 0.4.5", - "hyper 0.14.27", - "hyper-tls 0.5.0", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding 2.3.0", - "pin-project-lite 0.2.13", - "serde 1.0.189", - "serde_json", - "serde_urlencoded", - "system-configuration", - "tokio 1.33.0", - "tokio-native-tls", - "tower-service", - "url 2.4.1", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.50.0", -] - -[[package]] -name = "resolv-conf" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" -dependencies = [ - "hostname", - "quick-error", -] - -[[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", - "untrusted", - "web-sys", - "winapi 0.3.9", -] - -[[package]] -name = "rust-ini" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" - -[[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 = "rustix" -version = "0.38.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "rustls" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" -dependencies = [ - "base64 0.12.3", - "log", - "ring", - "sct", - "webpki", -] - -[[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 = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "scheduled-thread-pool" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" -dependencies = [ - "parking_lot 0.12.1", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - -[[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", -] - -[[package]] -name = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "sentry" -version = "0.31.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc" -dependencies = [ - "curl", - "httpdate 1.0.3", - "native-tls", - "reqwest 0.11.22", - "sentry-backtrace", - "sentry-contexts", - "sentry-core", - "sentry-debug-images", - "sentry-panic", - "sentry-tracing", - "tokio 1.33.0", - "ureq", -] - -[[package]] -name = "sentry-backtrace" -version = "0.31.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a7b80fa1dd6830a348d38a8d3a9761179047757b7dca29aef82db0118b9670" -dependencies = [ - "backtrace", - "once_cell", - "regex", - "sentry-core", -] - -[[package]] -name = "sentry-contexts" -version = "0.31.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7615dc588930f1fd2e721774f25844ae93add2dbe2d3c2f995ce5049af898147" -dependencies = [ - "hostname", - "libc", - "os_info", - "rustc_version 0.4.0", - "sentry-core", - "uname", -] - -[[package]] -name = "sentry-core" -version = "0.31.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f51264e4013ed9b16558cce43917b983fa38170de2ca480349ceb57d71d6053" -dependencies = [ - "once_cell", - "rand 0.8.5", - "sentry-types", - "serde 1.0.189", - "serde_json", -] - -[[package]] -name = "sentry-debug-images" -version = "0.31.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe6180fa564d40bb942c9f0084ffb5de691c7357ead6a2b7a3154fae9e401dd" -dependencies = [ - "findshlibs", - "once_cell", - "sentry-core", -] - -[[package]] -name = "sentry-panic" -version = "0.31.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "323160213bba549f9737317b152af116af35c0410f4468772ee9b606d3d6e0fa" -dependencies = [ - "sentry-backtrace", - "sentry-core", -] - -[[package]] -name = "sentry-tracing" -version = "0.31.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38033822128e73f7b6ca74c1631cef8868890c6cb4008a291cf73530f87b4eac" -dependencies = [ - "sentry-backtrace", - "sentry-core", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "sentry-types" -version = "0.31.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e663b3eb62ddfc023c9cf5432daf5f1a4f6acb1df4d78dd80b740b32dd1a740" -dependencies = [ - "debugid", - "hex", - "rand 0.8.5", - "serde 1.0.189", - "serde_json", - "thiserror", - "time 0.3.30", - "url 2.4.1", - "uuid 1.5.0", -] - -[[package]] -name = "serde" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" - -[[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-hjson" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8" -dependencies = [ - "lazy_static", - "num-traits 0.1.43", - "regex", - "serde 0.8.23", -] - -[[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_json" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" -dependencies = [ - "itoa 1.0.9", - "ryu", - "serde 1.0.189", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.9", - "ryu", - "serde 1.0.189", -] - -[[package]] -name = "sha-1" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[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.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.10.7", -] - -[[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 = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slog" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06" -dependencies = [ - "erased-serde", -] - -[[package]] -name = "slog-async" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c8038f898a2c79507940990f05386455b3a317d8f18d4caea7cbc3d5096b84" -dependencies = [ - "crossbeam-channel", - "slog", - "take_mut", - "thread_local", -] - -[[package]] -name = "slog-envlogger" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "906a1a0bc43fed692df4b82a5e2fbfc3733db8dad8bb514ab27a4f23ad04f5c0" -dependencies = [ - "log", - "regex", - "slog", - "slog-async", - "slog-scope", - "slog-stdlog", - "slog-term", -] - -[[package]] -name = "slog-mozlog-json" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f400f1c5db96f1f52065e8931ca0c524cceb029f7537c9e6d5424488ca137ca0" -dependencies = [ - "chrono", - "serde 1.0.189", - "serde_json", - "slog", -] - -[[package]] -name = "slog-scope" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f95a4b4c3274cd2869549da82b57ccc930859bdbf5bcea0424bc5f140b3c786" -dependencies = [ - "arc-swap", - "lazy_static", - "slog", -] - -[[package]] -name = "slog-stdlog" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6706b2ace5bbae7291d3f8d2473e2bfab073ccd7d03670946197aec98471fa3e" -dependencies = [ - "log", - "slog", - "slog-scope", -] - -[[package]] -name = "slog-term" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87d29185c55b7b258b4f120eab00f48557d4d9bc814f41713f449d35b0f8977c" -dependencies = [ - "atty", - "slog", - "term", - "thread_local", - "time 0.3.30", -] - -[[package]] -name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "socket2" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde 1.0.189", - "serde_derive", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde 1.0.189", - "serde_derive", - "serde_json", - "sha1", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[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 = "syncserver" -version = "0.14.1" -dependencies = [ - "actix-cors", - "actix-http", - "actix-rt", - "actix-web", - "async-trait", - "backtrace", - "base64 0.21.4", - "cadence", - "chrono", - "docopt", - "dyn-clone", - "env_logger 0.10.0", - "futures 0.3.28", - "hawk", - "hex", - "hmac", - "hostname", - "lazy_static", - "mime", - "rand 0.8.5", - "regex", - "reqwest 0.10.10", - "sentry", - "sentry-backtrace", - "serde 1.0.189", - "serde_derive", - "serde_json", - "sha2", - "slog", - "slog-async", - "slog-envlogger", - "slog-mozlog-json", - "slog-scope", - "slog-stdlog", - "slog-term", - "syncserver-common", - "syncserver-db-common", - "syncserver-settings", - "syncstorage-db", - "syncstorage-settings", - "thiserror", - "time 0.3.30", - "tokenserver-auth", - "tokenserver-common", - "tokenserver-db", - "tokenserver-settings", - "tokio 0.2.25", - "urlencoding", - "validator", - "validator_derive", - "woothee", -] - -[[package]] -name = "syncserver-common" -version = "0.14.1" -dependencies = [ - "actix-web", - "cadence", - "futures 0.3.28", - "hkdf", - "serde 1.0.189", - "serde_json", - "sha2", - "slog", - "slog-scope", -] - -[[package]] -name = "syncserver-db-common" -version = "0.14.1" -dependencies = [ - "backtrace", - "deadpool", - "diesel", - "diesel_migrations", - "futures 0.3.28", - "http", - "syncserver-common", - "thiserror", -] - -[[package]] -name = "syncserver-settings" -version = "0.14.1" -dependencies = [ - "config 0.11.0", - "num_cpus", - "serde 1.0.189", - "slog-scope", - "syncserver-common", - "syncstorage-settings", - "tokenserver-settings", - "url 2.4.1", -] - -[[package]] -name = "syncstorage-db" -version = "0.14.1" -dependencies = [ - "async-trait", - "cadence", - "env_logger 0.10.0", - "futures 0.3.28", - "hostname", - "lazy_static", - "log", - "rand 0.8.5", - "slog-scope", - "syncserver-common", - "syncserver-db-common", - "syncserver-settings", - "syncstorage-db-common", - "syncstorage-mysql", - "syncstorage-settings", - "syncstorage-spanner", - "tokio 0.2.25", -] - -[[package]] -name = "syncstorage-db-common" -version = "0.14.1" -dependencies = [ - "async-trait", - "backtrace", - "chrono", - "diesel", - "diesel_migrations", - "futures 0.3.28", - "http", - "lazy_static", - "serde 1.0.189", - "serde_json", - "syncserver-common", - "syncserver-db-common", - "thiserror", -] - -[[package]] -name = "syncstorage-mysql" -version = "0.14.1" -dependencies = [ - "async-trait", - "backtrace", - "base64 0.21.4", - "diesel", - "diesel_logger", - "diesel_migrations", - "env_logger 0.10.0", - "futures 0.3.28", - "http", - "slog-scope", - "syncserver-common", - "syncserver-db-common", - "syncserver-settings", - "syncstorage-db-common", - "syncstorage-settings", - "thiserror", - "url 2.4.1", -] - -[[package]] -name = "syncstorage-settings" -version = "0.14.1" -dependencies = [ - "rand 0.8.5", - "serde 1.0.189", - "syncserver-common", - "time 0.3.30", -] - -[[package]] -name = "syncstorage-spanner" -version = "0.14.1" -dependencies = [ - "async-trait", - "backtrace", - "cadence", - "deadpool", - "env_logger 0.10.0", - "form_urlencoded", - "futures 0.3.28", - "google-cloud-rust-raw", - "grpcio", - "http", - "log", - "protobuf", - "slog-scope", - "syncserver-common", - "syncserver-db-common", - "syncstorage-db-common", - "syncstorage-settings", - "thiserror", - "tokio 0.2.25", - "url 2.4.1", - "uuid 0.8.2", -] - -[[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 = "take_mut" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi 0.3.9", -] - -[[package]] -name = "termcolor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" -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 1.0.0", - "once_cell", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros 0.1.1", - "version_check", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" -dependencies = [ - "deranged", - "itoa 1.0.9", - "libc", - "num_threads", - "powerfmt", - "serde 1.0.189", - "time-core", - "time-macros 0.2.15", -] - -[[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.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[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 = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn 1.0.109", -] - -[[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 = "tokenserver-auth" -version = "0.14.1" -dependencies = [ - "async-trait", - "dyn-clone", - "futures 0.3.28", - "mockito", - "pyo3", - "reqwest 0.10.10", - "serde 1.0.189", - "serde_json", - "syncserver-common", - "tokenserver-common", - "tokenserver-settings", - "tokio 0.2.25", -] - -[[package]] -name = "tokenserver-common" -version = "0.14.1" -dependencies = [ - "actix-web", - "backtrace", - "serde 1.0.189", - "serde_json", - "syncserver-common", - "thiserror", -] - -[[package]] -name = "tokenserver-db" -version = "0.14.1" -dependencies = [ - "async-trait", - "backtrace", - "diesel", - "diesel_logger", - "diesel_migrations", - "env_logger 0.10.0", - "futures 0.3.28", - "http", - "serde 1.0.189", - "serde_derive", - "serde_json", - "slog-scope", - "syncserver-common", - "syncserver-db-common", - "syncserver-settings", - "thiserror", - "tokenserver-common", - "tokenserver-settings", - "tokio 0.2.25", -] - -[[package]] -name = "tokenserver-settings" -version = "0.14.1" -dependencies = [ - "serde 1.0.189", - "tokenserver-common", -] - -[[package]] -name = "tokio" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "iovec", - "lazy_static", - "libc", - "memchr", - "mio 0.6.23", - "mio-uds", - "pin-project-lite 0.1.12", - "signal-hook-registry", - "slab", - "tokio-macros", - "winapi 0.3.9", -] - -[[package]] -name = "tokio" -version = "1.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" -dependencies = [ - "backtrace", - "bytes 1.5.0", - "libc", - "mio 0.8.8", - "num_cpus", - "pin-project-lite 0.2.13", - "socket2 0.5.4", - "windows-sys", -] - -[[package]] -name = "tokio-macros" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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 1.33.0", -] - -[[package]] -name = "tokio-rustls" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" -dependencies = [ - "futures-core", - "rustls", - "tokio 0.2.25", - "webpki", -] - -[[package]] -name = "tokio-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" -dependencies = [ - "native-tls", - "tokio 0.2.25", -] - -[[package]] -name = "tokio-util" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -dependencies = [ - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "pin-project-lite 0.1.12", - "tokio 0.2.25", -] - -[[package]] -name = "tokio-util" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" -dependencies = [ - "bytes 1.5.0", - "futures-core", - "futures-sink", - "pin-project-lite 0.2.13", - "tokio 1.33.0", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde 1.0.189", -] - -[[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.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" -dependencies = [ - "log", - "pin-project-lite 0.2.13", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project 1.1.3", - "tracing", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "tracing-core", -] - -[[package]] -name = "trust-dns-proto" -version = "0.19.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cad71a0c0d68ab9941d2fb6e82f8fb2e86d9945b94e1661dd0aaea2b88215a9" -dependencies = [ - "async-trait", - "cfg-if 1.0.0", - "enum-as-inner", - "futures 0.3.28", - "idna 0.2.3", - "lazy_static", - "log", - "rand 0.7.3", - "smallvec", - "thiserror", - "tokio 0.2.25", - "url 2.4.1", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.19.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710f593b371175db53a26d0b38ed2978fafb9e9e8d3868b1acd753ea18df0ceb" -dependencies = [ - "cfg-if 0.1.10", - "futures 0.3.28", - "ipconfig", - "lazy_static", - "log", - "lru-cache", - "resolv-conf", - "smallvec", - "thiserror", - "tokio 0.2.25", - "trust-dns-proto", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - -[[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-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-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unindent" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "ureq" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" -dependencies = [ - "base64 0.21.4", - "log", - "native-tls", - "once_cell", - "url 2.4.1", -] - -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna 0.4.0", - "percent-encoding 2.3.0", - "serde 1.0.189", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.10", - "serde 1.0.189", -] - -[[package]] -name = "uuid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" -dependencies = [ - "serde 1.0.189", -] - -[[package]] -name = "validator" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" -dependencies = [ - "idna 0.4.0", - "lazy_static", - "regex", - "serde 1.0.189", - "serde_derive", - "serde_json", - "url 2.4.1", -] - -[[package]] -name = "validator_derive" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" -dependencies = [ - "if_chain", - "lazy_static", - "proc-macro-error", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "validator_types", -] - -[[package]] -name = "validator_types" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[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 1.0.0", - "serde 1.0.189", - "serde_json", - "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 1.0.0", - "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 = "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.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" -dependencies = [ - "webpki", -] - -[[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", -] - -[[package]] -name = "widestring" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[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-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[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 0.3.9", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "winreg" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winreg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys", -] - -[[package]] -name = "woothee" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "896174c6a4779d4d7d4523dd27aef7d46609eda2497e370f6c998325c6bf6971" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] diff --git a/pkgs/servers/syncstorage-rs/default.nix b/pkgs/servers/syncstorage-rs/default.nix deleted file mode 100644 index 96b1945df51f..000000000000 --- a/pkgs/servers/syncstorage-rs/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ fetchFromGitHub -, rustPlatform -, pkg-config -, python3 -, cmake -, libmysqlclient -, makeBinaryWrapper -, lib -}: - -let - pyFxADeps = python3.withPackages (p: [ - p.setuptools # imports pkg_resources - # remainder taken from requirements.txt - p.pyfxa - p.tokenlib - p.cryptography - ]); -in - -rustPlatform.buildRustPackage rec { - pname = "syncstorage-rs"; - version = "0.14.1"; - - src = fetchFromGitHub { - owner = "mozilla-services"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-7lIFHK0XSOtfDEy6N9jcPGOd5Por5i1CBdDZQBiHm8c="; - }; - - nativeBuildInputs = [ - cmake - makeBinaryWrapper - pkg-config - python3 - ]; - - buildInputs = [ - libmysqlclient - ]; - - preFixup = '' - wrapProgram $out/bin/syncserver \ - --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]} - ''; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "deadpool-0.5.2" = "sha256-V3v03t8XWA6rA8RaNunq2kh2U+6Lc2C2moKdaF2bmEc="; - }; - }; - - # almost all tests need a DB to test against - doCheck = false; - - meta = { - description = "Mozilla Sync Storage built with Rust"; - homepage = "https://github.com/mozilla-services/syncstorage-rs"; - changelog = "https://github.com/mozilla-services/syncstorage-rs/releases/tag/${version}"; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ pennae ]; - platforms = lib.platforms.linux; - mainProgram = "syncserver"; - }; -} diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 5761f84c29e7..9938658259d5 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -2,6 +2,7 @@ , stdenv , buildGoModule , fetchFromGitHub +, fetchpatch , trezor-udev-rules , AppKit }: @@ -21,6 +22,13 @@ buildGoModule rec { vendorHash = "sha256-wXgAmZEXdM4FcMCQbAs+ydXshCAMu7nl/yVv/3sqaXE="; + patches = [ + (fetchpatch { + url = "https://github.com/trezor/trezord-go/commit/616473d53a8ae49f1099e36ab05a2981a08fa606.patch"; + hash = "sha256-yKTwgqWr4L6XEPV85A6D1wpRdpef8hkIbl4LrRmOyuo="; + }) + ]; + propagatedBuildInputs = lib.optionals stdenv.isLinux [ trezor-udev-rules ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix index db8d6942a61f..7b527a5c20b2 100644 --- a/pkgs/servers/trickster/trickster.nix +++ b/pkgs/servers/trickster/trickster.nix @@ -41,6 +41,7 @@ buildGoModule rec { meta = with lib; { description = "Reverse proxy cache and time series dashboard accelerator"; + mainProgram = "trickster"; longDescription = '' Trickster is a fully-featured HTTP Reverse Proxy Cache for HTTP applications like static file servers and web APIs. diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix index 96dfaa7f29b7..7ef093e3f70d 100644 --- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix +++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { The name of the plugin in TT-RSS is 'ff_instagram'. ''; - license = licenses.agpl3; + license = licenses.agpl3Plus; homepage = "https://github.com/wltb/ff_instagram"; maintainers = with maintainers; [ das_j ]; platforms = platforms.all; diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index c59b6dae131e..227d4185baf8 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "24.02"; + version = "24.02.2"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F1CNutWFtFaRXsT8InyMww7OR40TXnzVGA/6t0eLBIw="; + sha256 = "1b4166vd3ribs69ad5ljp71im0fh0n0m5c5l04i3l44a5bw25b2h"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index 2709f22c3d1d..7c343011726c 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -15,10 +15,10 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-2e34d45e970c77775e4c298e08732d64b647c41c"; + name = "aws-aws-sdk-php-957ccef631684d612d01ced2fa3b0506f2ec78c3"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/2e34d45e970c77775e4c298e08732d64b647c41c"; - sha256 = "1h08lxna8sjq90lrxj60w2cyf9iynvyw4b8r9nl1bxsdmbmgl27s"; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/957ccef631684d612d01ced2fa3b0506f2ec78c3"; + sha256 = "1chckiccr061c063wwf502d545wji4p5g6ak6z6dl36jjkrip7v4"; }; }; }; @@ -105,20 +105,20 @@ let "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-0ac3c270590e54910715e9a1a044cc368df282b2"; + name = "doctrine-dbal-a19a1d05ca211f41089dffcc387733a6875196cb"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/0ac3c270590e54910715e9a1a044cc368df282b2"; - sha256 = "1qf6nhrrn7hdxqvym9l3mxj1sb0fmx2h1s3yi4mjkkb4ri5hcmm8"; + url = "https://api.github.com/repos/doctrine/dbal/zipball/a19a1d05ca211f41089dffcc387733a6875196cb"; + sha256 = "11lcmw8pmgfp7wmn4miainyl2c060s4igq4g94azxl1v5bqaypis"; }; }; }; "doctrine/deprecations" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-deprecations-4f2d4f2836e7ec4e7a8625e75c6aa916004db931"; + name = "doctrine-deprecations-dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931"; - sha256 = "1kxy6s4v9prkfvsnggm10kk0yyqsyd2vk238zhvv3c9il300h8sk"; + url = "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"; + sha256 = "1qydhnf94wgjlrgzydjcz31rr5f87pg3vlkkd0gynggw1ycgkkcg"; }; }; }; @@ -135,20 +135,20 @@ let "doctrine/inflector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-inflector-f9301a5b2fb1216b2b08f02ba04dc45423db6bff"; + name = "doctrine-inflector-5817d0659c5b50c9b950feb9af7b9668e2c436bc"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff"; - sha256 = "1kdq3sbwrzwprxr36cdw9m1zlwn15c0nz6i7mw0sq9mhnd2sgbrb"; + url = "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc"; + sha256 = "0yj0f6w0v35d0xdhy4bf7hsjrkjjxsglc879rdciybsk6vz70g96"; }; }; }; "doctrine/lexer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-lexer-39ab8fcf5a51ce4b85ca97c7a7d033eb12831124"; + name = "doctrine-lexer-861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124"; - sha256 = "19kak8fh8sf5bpmcn7a90sqikgx30mk2bmjf0jbzcvlbnsjyggah"; + url = "https://api.github.com/repos/doctrine/lexer/zipball/861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6"; + sha256 = "0q25i1d6nqkrj4yc35my6b51kn2nksddhddm13vkc7ilkkn20pg7"; }; }; }; @@ -285,30 +285,30 @@ let "laravel/socialite" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-socialite-4f6a8af6f3f7c18da03d19842dd0514315501c10"; + name = "laravel-socialite-7dae1b072573809f32ab6dcf4aebb57c8b3e8acf"; src = fetchurl { - url = "https://api.github.com/repos/laravel/socialite/zipball/4f6a8af6f3f7c18da03d19842dd0514315501c10"; - sha256 = "0329mzryfg198mgjb9k3ay5699mi4gz3i6dmaaxglar7gp0mlpvh"; + url = "https://api.github.com/repos/laravel/socialite/zipball/7dae1b072573809f32ab6dcf4aebb57c8b3e8acf"; + sha256 = "1jd65mk5hww4iq6xkky1dkmz8c06czlb466s4svg4vf1xhb9dxqj"; }; }; }; "laravel/tinker" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-tinker-b936d415b252b499e8c3b1f795cd4fc20f57e1f3"; + name = "laravel-tinker-502e0fe3f0415d06d5db1f83a472f0f3b754bafe"; src = fetchurl { - url = "https://api.github.com/repos/laravel/tinker/zipball/b936d415b252b499e8c3b1f795cd4fc20f57e1f3"; - sha256 = "1vggdik2nby6a9avwgylgihhwyglm0mdwm703bwv7ilwx0dsx1i7"; + url = "https://api.github.com/repos/laravel/tinker/zipball/502e0fe3f0415d06d5db1f83a472f0f3b754bafe"; + sha256 = "13l5lm6xz9qad3nmld8sjr4bznh82z8s4kr8kkd8d8a1ai6jd0aq"; }; }; }; "league/commonmark" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-commonmark-3669d6d5f7a47a93c08ddff335e6d945481a1dd5"; + name = "league-commonmark-91c24291965bd6d7c46c46a12ba7492f83b1cadf"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/commonmark/zipball/3669d6d5f7a47a93c08ddff335e6d945481a1dd5"; - sha256 = "1rbaydy1n1c1schskbabzd4nx57nvwpnzqapsfxjm6kyihca1nr3"; + url = "https://api.github.com/repos/thephpleague/commonmark/zipball/91c24291965bd6d7c46c46a12ba7492f83b1cadf"; + sha256 = "1i7yqcp4hdzz1k6qga96jwp9qpw7dxlfr5miw48zyym60ndk9n02"; }; }; }; @@ -325,30 +325,30 @@ let "league/flysystem" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc"; + name = "league-flysystem-b25a361508c407563b34fac6f64a8a17a8819675"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem/zipball/d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc"; - sha256 = "1xfgcslv66jid10yjjzp1chwv579xgaymlzkxiwfk5mh77fdfryi"; + url = "https://api.github.com/repos/thephpleague/flysystem/zipball/b25a361508c407563b34fac6f64a8a17a8819675"; + sha256 = "07fd3nqvs9wnl7wwlii3aaalpdldgf6agk2l1ihl3w253qyg8ynn"; }; }; }; "league/flysystem-aws-s3-v3" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-aws-s3-v3-9808919ee5d819730d9582d4e1673e8d195c38d8"; + name = "league-flysystem-aws-s3-v3-809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/9808919ee5d819730d9582d4e1673e8d195c38d8"; - sha256 = "1339ix4nqkk54bfnms18fz853s9ngsgjvkjdln1ff045m7dm4svi"; + url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513"; + sha256 = "0iv1n4y6w4pa2051wxvnkcap08jb86qgfx1hb6w8z5rngg67nz4d"; }; }; }; "league/flysystem-local" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-local-5cf046ba5f059460e86a997c504dd781a39a109b"; + name = "league-flysystem-local-b884d2bf9b53bb4804a56d2df4902bb51e253f00"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-local/zipball/5cf046ba5f059460e86a997c504dd781a39a109b"; - sha256 = "0yr12z32plvpz70y8ravb9w80y583wkpsl1d0xhnglcka24aysdr"; + url = "https://api.github.com/repos/thephpleague/flysystem-local/zipball/b884d2bf9b53bb4804a56d2df4902bb51e253f00"; + sha256 = "1ggpc08rdaqk2wxkvklfi6l7nqzd6ch2dgf9icr1shfiv09l0mp6"; }; }; }; @@ -365,10 +365,10 @@ let "league/mime-type-detection" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-mime-type-detection-b6a5854368533df0295c5761a0253656a2e52d9e"; + name = "league-mime-type-detection-ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e"; - sha256 = "0bsqha9c0pyb5l78iiv1klrpqmhki6nh9x73pgnmh7sphh6ilygj"; + url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301"; + sha256 = "1yvjnqb6wv6kxfs21qw31yqcb653dz2xw9g646y2g9via33fxvpd"; }; }; }; @@ -425,10 +425,10 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-2b3b3db0a2d0556a177392ff1a3bf5608fa09f78"; + name = "nesbot-carbon-0c6fd108360c562f6e4fd1dedb8233b423e91c83"; src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/2b3b3db0a2d0556a177392ff1a3bf5608fa09f78"; - sha256 = "1wf1kc2v6n68x04kf5dqf96ihkly4yb77bj09isp3yadsnhqy69d"; + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83"; + sha256 = "1qwdzf2jgppj2r8jpxxd1q08aycyvj17azy2ixlw4cnmwhcqzgnh"; }; }; }; @@ -445,20 +445,20 @@ let "nette/utils" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nette-utils-a9d127dd6a203ce6d255b2e2db49759f7506e015"; + name = "nette-utils-d3ad0aa3b9f934602cb3e3902ebccf10be34d218"; src = fetchurl { - url = "https://api.github.com/repos/nette/utils/zipball/a9d127dd6a203ce6d255b2e2db49759f7506e015"; - sha256 = "0py2072z0rmpzf1ylk7rf2k040lv3asnk2icf97qm384cjw9dzrp"; + url = "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218"; + sha256 = "11df93i9xkwkfq33hqf2x562a36sibzpc6rkbblz2r10mna6qw6q"; }; }; }; "nikic/php-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nikic-php-parser-1bcbb2179f97633e98bbbc87044ee2611c7d7999"; + name = "nikic-php-parser-2218c2252c874a4624ab2f613d86ac32d227bc69"; src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999"; - sha256 = "1all9j7b5cr87jjs2lam2s11kvygi9jkkc7fks43f9jf1sp2ybji"; + url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/2218c2252c874a4624ab2f613d86ac32d227bc69"; + sha256 = "1dkil9kcp1abwa4nhpmy8my6srj70994mjh7wnhyw8yy084nf11z"; }; }; }; @@ -505,20 +505,20 @@ let "phenx/php-font-lib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phenx-php-font-lib-dd448ad1ce34c63d09baccd05415e361300c35b4"; + name = "phenx-php-font-lib-a1681e9793040740a405ac5b189275059e2a9863"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/php-font-lib/zipball/dd448ad1ce34c63d09baccd05415e361300c35b4"; - sha256 = "0l20inbvipjdg9fdd32v8b7agjyvcs0rpqswcylld64vbm2sf3il"; + url = "https://api.github.com/repos/dompdf/php-font-lib/zipball/a1681e9793040740a405ac5b189275059e2a9863"; + sha256 = "0xb28w943pg0xb5mmm2jd74vr14k2lwh40azpfv0p4ghfg16v3jp"; }; }; }; "phenx/php-svg-lib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phenx-php-svg-lib-8a8a1ebcf6aea861ef30197999f096f7bd4b4456"; + name = "phenx-php-svg-lib-732faa9fb4309221e2bd9b2fda5de44f947133aa"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/8a8a1ebcf6aea861ef30197999f096f7bd4b4456"; - sha256 = "14iq5594y19dl5sr1f0zqvpg6fkv4hifb9y5i97phhplyprfdh7g"; + url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/732faa9fb4309221e2bd9b2fda5de44f947133aa"; + sha256 = "0hjf562cm8mvb36c2s63bh5104j6m5c27lwd4pgj3lwmq6mpzns6"; }; }; }; @@ -535,10 +535,10 @@ let "phpseclib/phpseclib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpseclib-phpseclib-56c79f16a6ae17e42089c06a2144467acc35348a"; + name = "phpseclib-phpseclib-c2fb5136162d4be18fdd4da9980696f3aee96d7b"; src = fetchurl { - url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/56c79f16a6ae17e42089c06a2144467acc35348a"; - sha256 = "0xmv35m6fsw7rfaxs82ky0wgj3gsnp7qw0sjgkig2cw10anfs0gq"; + url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/c2fb5136162d4be18fdd4da9980696f3aee96d7b"; + sha256 = "1n13c34w27vkrjz87vq7dxzz1xi0vj7xzj5slibdm1wfpvbsbg2m"; }; }; }; @@ -655,10 +655,10 @@ let "psy/psysh" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psy-psysh-128fa1b608be651999ed9789c95e6e2a31b5802b"; + name = "psy-psysh-750bf031a48fd07c673dbe3f11f72362ea306d0d"; src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b"; - sha256 = "0lrmqw53kzgdldxiy2aj0dawdzz5cbsxqz9p47ca3c0ggnszlk1p"; + url = "https://api.github.com/repos/bobthecow/psysh/zipball/750bf031a48fd07c673dbe3f11f72362ea306d0d"; + sha256 = "0kcs6g31v6k760dwapdbx34vqliispf8dhwrjjgrv34ysfbwrgvc"; }; }; }; @@ -705,10 +705,10 @@ let "sabberworm/php-css-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "sabberworm-php-css-parser-e41d2140031d533348b2192a83f02d8dd8a71d30"; + name = "sabberworm-php-css-parser-4a3d572b0f8b28bb6fd016ae8bbfc445facef152"; src = fetchurl { - url = "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30"; - sha256 = "0slqh0ra9cwk1pm4q7bqhndynir0yxypzrxb2vrfzfkmnh0rm02c"; + url = "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4a3d572b0f8b28bb6fd016ae8bbfc445facef152"; + sha256 = "1gs3q8j70ccwa2s3icf936xxik8h3qi5plkpvw4ygzkb9vkcicdv"; }; }; }; @@ -735,10 +735,10 @@ let "socialiteproviders/manager" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "socialiteproviders-manager-df5e45b53d918ec3d689f014d98a6c838b98ed96"; + name = "socialiteproviders-manager-a67f194f0f4c4c7616c549afc697b78df9658d44"; src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/df5e45b53d918ec3d689f014d98a6c838b98ed96"; - sha256 = "0hzgj5p3cdi4mxrnq3c20yyjr4c1hnqnz8d2440s308a4wahz33z"; + url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/a67f194f0f4c4c7616c549afc697b78df9658d44"; + sha256 = "0r5c6q7dm02hnk574br5mrm1z8amrxjxcbf4n94l02vq9din2c0m"; }; }; }; @@ -895,90 +895,90 @@ let "symfony/polyfill-ctype" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-ctype-ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"; + name = "symfony-polyfill-ctype-ef4d7e442ca910c4764bce785146269b30cb5fc4"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"; - sha256 = "0ynkrpl3hb448dhab1injwwzfx68l75yn9zgc7lgqwbx60dvhqm3"; + url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4"; + sha256 = "16wr6dp9yr4wks11d1qjyzpc343ri2nr7q7fmrnp3jhmp949rppy"; }; }; }; "symfony/polyfill-intl-grapheme" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-grapheme-875e90aeea2777b6f135677f618529449334a612"; + name = "symfony-polyfill-intl-grapheme-32a9da87d7b3245e09ac426c83d334ae9f06f80f"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612"; - sha256 = "19j8qcbp525q7i61c2lhj6z2diysz45q06d990fvjby15cn0id0i"; + url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f"; + sha256 = "03wk7yxavld4jnvavy7m2d3xxn5h4938wypgwjkblgx8n7s93jiq"; }; }; }; "symfony/polyfill-intl-idn" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-idn-ecaafce9f77234a6a449d29e49267ba10499116d"; + name = "symfony-polyfill-intl-idn-a287ed7475f85bf6f61890146edbc932c0fff919"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d"; - sha256 = "0f42w4975rakhysnmhsyw6n3rjg6rjg7b7x8gs1n0qfdb6wc8m3q"; + url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919"; + sha256 = "14x9hv01fn5dmpkm7480lgzhz4lqdi3w1hlkh3sjpb6ic87k0wc1"; }; }; }; "symfony/polyfill-intl-normalizer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-normalizer-8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"; + name = "symfony-polyfill-intl-normalizer-bc45c394692b948b4d383a08d7753968bed9a83d"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"; - sha256 = "0msah2ii2174xh47v5x9vq1b1xn38yyx03sr3pa2rq3a849wi7nh"; + url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d"; + sha256 = "1zq1kklvjl4zj2v6yjzg7rv6ibvhxfymgi2xb0m5cw9r6i63rinw"; }; }; }; "symfony/polyfill-mbstring" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-mbstring-42292d99c55abe617799667f454222c54c60e229"; + name = "symfony-polyfill-mbstring-9773676c8a1bb1f8d4340a62efe641cf76eda7ec"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229"; - sha256 = "1m3l12y0lid3i0zy3m1jrk0z3zy8wpa7nij85zk2h5vbf924jnwa"; + url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec"; + sha256 = "1jpa4wwjfdkkhdpisviy1p4fhik00cldj5msipwl0izkia1d2qgf"; }; }; }; "symfony/polyfill-php72" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php72-70f4aebd92afca2f865444d30a4d2151c13c3179"; + name = "symfony-polyfill-php72-861391a8da9a04cbad2d232ddd9e4893220d6e25"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179"; - sha256 = "10j5ipx16p6rybkpawqscpr2wcnby4270rbdj1qchr598wkvi0kb"; + url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25"; + sha256 = "0b4nw7x6c7jjn9bvkpqjnpszx647lncyswpk2iz57c1xl5dqywvh"; }; }; }; "symfony/polyfill-php80" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php80-6caa57379c4aec19c0a12a38b59b26487dcfe4b5"; + name = "symfony-polyfill-php80-87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5"; - sha256 = "05yfindyip9lbfr5apxkz6m0mlljrc9z6qylpxr6k5nkivlrcn9x"; + url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"; + sha256 = "1pn6dzj8b3h8851w3y6mj5qrwklwky5w71v4m455553qlga5cfr7"; }; }; }; "symfony/polyfill-php81" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php81-7581cd600fa9fd681b797d00b02f068e2f13263b"; + name = "symfony-polyfill-php81-c565ad1e63f30e7477fc40738343c62b40bc672d"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b"; - sha256 = "0ngi5nhnbj4yycnf6yw628vmr7h6dhxxh7jawyp6gq7bzs94g2dy"; + url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d"; + sha256 = "0xy6jjnqvc6v1s7wvdm1yplblpbh43ilis93vjrlv7hc7i6ygfzg"; }; }; }; "symfony/polyfill-uuid" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-uuid-9c44518a5aff8da565c8a55dbe85d2769e6f630e"; + name = "symfony-polyfill-uuid-3abdd21b0ceaa3000ee950097bc3cf9efc137853"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-uuid/zipball/9c44518a5aff8da565c8a55dbe85d2769e6f630e"; - sha256 = "0w6mphwcz3n1qz0dc6nld5xqb179dvfcwys6r4nj4gjv5nm2nji0"; + url = "https://api.github.com/repos/symfony/polyfill-uuid/zipball/3abdd21b0ceaa3000ee950097bc3cf9efc137853"; + sha256 = "15g5ng1bcca4nqxjrcjabc1v679zl6xwm1wwfngvww1hvrbgd98d"; }; }; }; diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index b9156d2e5b7d..4d058e916ab7 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.45.14"; + version = "0.45.16"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = version; - hash = "sha256-O+kWivVc/FZmIDjOE/fsUccrOyHrQ8GakjulEnm4w88="; + hash = "sha256-ln522U3XqZfhvLvMEzrqXV3SjhpgnrRk2MxQQRBL5VU="; }; postPatch = '' @@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { feedgen flask flask-compress + flask-cors flask-expects-json flask-login flask-paginate @@ -52,6 +53,8 @@ python3.pkgs.buildPythonApplication rec { paho-mqtt pillow playwright + pyee + pyppeteer pytz requests selenium diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 58eabadfb6e2..b1e24720450e 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -186,7 +186,7 @@ let # available for aarch64. It has to be called # libpsl.x86_64.so or it isn't found. postPatch = '' - cp $(readlink -f ${libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so + cp $(readlink -f ${lib.getLib libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so ''; }; }; diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix index 9b9cf0ff3bfe..4f6563db90b7 100644 --- a/pkgs/servers/web-apps/engelsystem/default.nix +++ b/pkgs/servers/web-apps/engelsystem/default.nix @@ -1,19 +1,21 @@ -{ lib, stdenv, fetchzip, php, writeText, nixosTests }: +{ lib +, fetchzip +, nixosTests +, php +, stdenv +, writeText +}: -let - phpExt = php.withExtensions - ({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql ]); -in stdenv.mkDerivation rec { pname = "engelsystem"; - version = "3.4.1"; + version = "3.5.0"; src = fetchzip { url = "https://github.com/engelsystem/engelsystem/releases/download/v${version}/engelsystem-v${version}.zip"; - hash = "sha256-5KniP1nrLfmWHruXnUJmlvgL95U+EsDmCs4tg/YLWtw="; + hash = "sha256-RbzAHBZN02u14WaLtq5EOh4XwIdHKvzX7NhDBhn/CaU="; }; - buildInputs = [ phpExt ]; + buildInputs = [ php ]; installPhase = '' runHook preInstall @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { echo $(command -v php) # The patchShebangAuto function always used the php without extensions, so path the shebang manually - sed -i -e "1 s|.*|#\!${phpExt}/bin/php|" "$out/share/engelsystem/bin/migrate" + sed -i -e "1 s|.*|#\!${lib.getExe php}|" "$out/share/engelsystem/bin/migrate" ln -s "$out/share/engelsystem/bin/migrate" "$out/bin/migrate" runHook postInstall @@ -39,13 +41,13 @@ stdenv.mkDerivation rec { passthru.tests = nixosTests.engelsystem; meta = with lib; { + changelog = "https://github.com/engelsystem/engelsystem/releases/tag/v${version}"; description = "Coordinate your volunteers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what"; homepage = "https://engelsystem.de"; - changelog = "https://github.com/engelsystem/engelsystem/releases/tag/v${version}"; license = licenses.gpl2; - maintainers = with maintainers; [ kloenk ]; mainProgram = "migrate"; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix index b6abc423eb85..337f178a1c50 100644 --- a/pkgs/servers/web-apps/fileshelter/default.nix +++ b/pkgs/servers/web-apps/fileshelter/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/epoupon/fileshelter"; description = "FileShelter is a 'one-click' file sharing web application"; + mainProgram = "fileshelter"; maintainers = [ maintainers.willibutz ]; license = licenses.gpl3; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index 0f2073f24a6f..1992c14270e7 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -75,6 +75,7 @@ in stdenv.mkDerivation { yarn --immutable-cache yarn run build + rm bin/heroku patchShebangs bin/* runHook postBuild @@ -83,13 +84,19 @@ in stdenv.mkDerivation { installPhase = '' runHook preInstall - mkdir -p $out - cp -R {app.js,bin,lib,locales,node_modules,package.json,public} $out + mkdir -p $out/share/hedgedoc + cp -r bin $out + cp -r {app.js,lib,locales,node_modules,package.json,public} $out/share/hedgedoc + for bin in $out/bin/*; do + wrapProgram $bin \ + --set NODE_ENV production \ + --set NODE_PATH "$out/share/hedgedoc/lib/node_modules" + done makeWrapper ${nodejs}/bin/node $out/bin/hedgedoc \ - --add-flags $out/app.js \ + --add-flags $out/share/hedgedoc/app.js \ --set NODE_ENV production \ - --set NODE_PATH "$out/lib/node_modules" + --set NODE_PATH "$out/share/hedgedoc/lib/node_modules" runHook postInstall ''; @@ -101,7 +108,7 @@ in stdenv.mkDerivation { meta = { description = "Realtime collaborative markdown notes on all platforms"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; homepage = "https://hedgedoc.org"; mainProgram = "hedgedoc"; maintainers = with lib.maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/servers/web-apps/jirafeau/default.nix b/pkgs/servers/web-apps/jirafeau/default.nix index 8001e5804970..bf67125e1dab 100644 --- a/pkgs/servers/web-apps/jirafeau/default.nix +++ b/pkgs/servers/web-apps/jirafeau/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Website permitting upload of a file in a simple way and giving a unique link to it"; - license = licenses.agpl3; + license = licenses.agpl3Plus; homepage = "https://gitlab.com/mojo42/Jirafeau"; platforms = platforms.all; maintainers = with maintainers; [ davidtwco ]; diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index f0e307dabb85..c07ea1f64733 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.7762"; + version = "1.0.7790"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "SsmMQdR6JczL63/o/LHbg5sjnBA+TuYPu4WR+tlGaC4="; + sha256 = "qW3Zcrq+a1I5LABUc4uhr58E7Ig8SmrJVNdjLs0l0io="; }; dontBuild = true; diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json index 813c77507225..97600d6801a2 100644 --- a/pkgs/servers/web-apps/lemmy/package.json +++ b/pkgs/servers/web-apps/lemmy/package.json @@ -3,7 +3,7 @@ "description": "An isomorphic UI for lemmy", "version": "0.19.3", "author": "Dessalines <tyhou13@gmx.com>", - "license": "AGPL-3.0", + "license": "AGPL-3.0-only", "scripts": { "analyze": "webpack --mode=none", "build:dev": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=development", diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 383a8658c521..c9584fb25e35 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -114,6 +114,7 @@ let meta = with lib; { description = "A real-time web analytics application"; + mainProgram = "matomo-console"; license = licenses.gpl3Plus; homepage = "https://matomo.org/"; platforms = platforms.all; diff --git a/pkgs/servers/web-apps/meme-bingo-web/default.nix b/pkgs/servers/web-apps/meme-bingo-web/default.nix index 4ba25a524bf9..6a0228899f08 100644 --- a/pkgs/servers/web-apps/meme-bingo-web/default.nix +++ b/pkgs/servers/web-apps/meme-bingo-web/default.nix @@ -27,6 +27,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Play meme bingo using this neat web app"; + mainProgram = "meme-bingo-web"; homepage = "https://codeberg.org/annaaurora/meme-bingo-web"; license = licenses.unlicense; maintainers = with maintainers; [ annaaurora ]; diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix index 2aa6f0d1cf89..b44d2e03bf16 100644 --- a/pkgs/servers/web-apps/morty/default.nix +++ b/pkgs/servers/web-apps/morty/default.nix @@ -15,6 +15,7 @@ buildGoModule { meta = with lib; { description = "Privacy aware web content sanitizer proxy as a service"; + mainProgram = "morty"; longDescription = '' Morty rewrites web pages to exclude malicious HTML tags and attributes. It also replaces external resource references to prevent third party information leaks. @@ -23,6 +24,6 @@ buildGoModule { ''; homepage = "https://github.com/asciimoo/morty"; maintainers = with maintainers; [ leenaars SuperSandro2000 ]; - license = licenses.agpl3; + license = licenses.agpl3Only; }; } diff --git a/pkgs/servers/web-apps/netbox/generic.nix b/pkgs/servers/web-apps/netbox/generic.nix index ac705445499f..862b817be90e 100644 --- a/pkgs/servers/web-apps/netbox/generic.nix +++ b/pkgs/servers/web-apps/netbox/generic.nix @@ -101,6 +101,7 @@ meta = { homepage = "https://github.com/netbox-community/netbox"; description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool"; + mainProgram = "netbox"; license = lib.licenses.asl20; knownVulnerabilities = (lib.optional eol "Netbox version ${version} is EOL; please upgrade by following the current release notes instructions."); # Warning: diff --git a/pkgs/servers/web-apps/peering-manager/default.nix b/pkgs/servers/web-apps/peering-manager/default.nix index c564629b4fcb..aec18b2904c6 100644 --- a/pkgs/servers/web-apps/peering-manager/default.nix +++ b/pkgs/servers/web-apps/peering-manager/default.nix @@ -77,6 +77,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://peering-manager.net/"; license = licenses.asl20; description = "BGP sessions management tool"; + mainProgram = "peering-manager"; maintainers = teams.wdz.members; platforms = platforms.linux; }; diff --git a/pkgs/servers/web-apps/phylactery/default.nix b/pkgs/servers/web-apps/phylactery/default.nix index b200ae637f56..2dfccdabbb98 100644 --- a/pkgs/servers/web-apps/phylactery/default.nix +++ b/pkgs/servers/web-apps/phylactery/default.nix @@ -23,6 +23,7 @@ buildGoModule rec { meta = with lib; { description = "Old school comic web server"; + mainProgram = "phylactery"; homepage = "https://git.sr.ht/~cnx/phylactery"; license = licenses.agpl3Plus; maintainers = with maintainers; [ McSinyx ]; diff --git a/pkgs/servers/web-apps/pict-rs/0.3.nix b/pkgs/servers/web-apps/pict-rs/0.3.nix index c113322a3794..875aecd55610 100644 --- a/pkgs/servers/web-apps/pict-rs/0.3.nix +++ b/pkgs/servers/web-apps/pict-rs/0.3.nix @@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A simple image hosting service"; + mainProgram = "pict-rs"; homepage = "https://git.asonix.dog/asonix/pict-rs"; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index 55437c7926db..fdd975e3682c 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.5.7"; + version = "0.5.9"; src = fetchFromGitea { domain = "git.asonix.dog"; owner = "asonix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MBV92+mu41ulT6wuzTGbobbspoQA0hNbRIiISol0n48="; + sha256 = "sha256-ZRT382ClImnlwvWyA1w7ZIIF4PXr3rWmeIsqJYngkfM="; }; - cargoHash = "sha256-p7s/gs+sMXR1l08C81tY4K3oV9fWgm07C0nRGspfoR8="; + cargoHash = "sha256-FTb8VoQJFS55CKlQvoWkBQEBUCvUnFaUAxIW22zEIHI="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; @@ -42,6 +42,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { broken = stdenv.isDarwin; description = "A simple image hosting service"; + mainProgram = "pict-rs"; homepage = "https://git.asonix.dog/asonix/pict-rs"; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index e933877a53ab..24f684c0c954 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -88,7 +88,8 @@ beamPackages.mixRelease { homepage = "https://plausible.io/"; changelog = "https://github.com/plausible/analytics/blob/${src.rev}/CHANGELOG.md"; description = " Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics"; - maintainers = with maintainers; [ softinio ]; + mainProgram = "plausible"; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index f4a1872ca93d..8a9fc7973f98 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -21,6 +21,7 @@ buildGoModule rec { meta = with lib; { description = "Simple bookmark manager built with Go"; + mainProgram = "shiori"; homepage = "https://github.com/go-shiori/shiori"; license = licenses.mit; maintainers = with maintainers; [ minijackson ]; diff --git a/pkgs/servers/web-apps/slskd/default.nix b/pkgs/servers/web-apps/slskd/default.nix index a085edfb1e14..7a2a388086c1 100644 --- a/pkgs/servers/web-apps/slskd/default.nix +++ b/pkgs/servers/web-apps/slskd/default.nix @@ -20,7 +20,7 @@ let meta = with lib; { description = "A modern client-server application for the Soulseek file sharing network"; homepage = "https://github.com/slskd/slskd"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ ppom ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9be49dc4f0ef..590559d3188b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1238,11 +1238,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXcursor = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes, libXrender, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXcursor"; - version = "1.2.1"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXcursor-1.2.1.tar.xz"; - sha256 = "011195an3w4xld3x0dr534kar1xjf52q96hmf0hgvfhh2rrl7ha6"; + url = "mirror://xorg/individual/lib/libXcursor-1.2.2.tar.xz"; + sha256 = "1vl87819mnhlbnccchysv9nmax4abil5x3cr61x52vn55jyp3l2k"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2158,11 +2158,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xauth"; - version = "1.1.2"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xauth-1.1.2.tar.xz"; - sha256 = "0072ivzn4z59ysanz838nh8s4mcmdsx6q9xkvlfysv2k37ynmfkq"; + url = "mirror://xorg/individual/app/xauth-1.1.3.tar.xz"; + sha256 = "0cwxzq7lv932rcfad3baanr541qcjjdhyrhxy0bzjcp3pac581z7"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index d0516bd8669d..1c91ae4794e9 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -22,7 +22,7 @@ mirror://xorg/individual/app/transset-1.0.3.tar.xz mirror://xorg/individual/app/twm-1.0.12.tar.xz mirror://xorg/individual/app/viewres-1.0.7.tar.xz mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2 -mirror://xorg/individual/app/xauth-1.1.2.tar.xz +mirror://xorg/individual/app/xauth-1.1.3.tar.xz mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2 mirror://xorg/individual/app/xcalc-1.1.2.tar.xz mirror://xorg/individual/app/xclock-1.1.1.tar.xz @@ -178,7 +178,7 @@ mirror://xorg/individual/lib/libXau-1.0.11.tar.xz mirror://xorg/individual/lib/libXaw-1.0.15.tar.xz mirror://xorg/individual/lib/libxcb-1.16.tar.xz mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz -mirror://xorg/individual/lib/libXcursor-1.2.1.tar.xz +mirror://xorg/individual/lib/libXcursor-1.2.2.tar.xz mirror://xorg/individual/lib/libxcvt-0.1.2.tar.xz mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz mirror://xorg/individual/lib/libXdmcp-1.1.4.tar.xz diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index 50d2cfa964e0..9d63356abd6b 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Modern XMPP IRC gateway"; + mainProgram = "biboumi"; platforms = platforms.unix; homepage = "https://lab.louiz.org/louiz/biboumi"; license = licenses.zlib; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 9e0601fbd093..821465ec3a52 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -118,6 +118,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Open-source XMPP application server written in Erlang"; + mainProgram = "ejabberdctl"; license = licenses.gpl2; homepage = "https://www.ejabberd.im"; platforms = platforms.linux; diff --git a/pkgs/servers/xmpp/prosody-filer/default.nix b/pkgs/servers/xmpp/prosody-filer/default.nix index 7665a7f7450d..11ba842e5cb8 100644 --- a/pkgs/servers/xmpp/prosody-filer/default.nix +++ b/pkgs/servers/xmpp/prosody-filer/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.linux; description = "A simple file server for handling XMPP http_upload requests"; + mainProgram = "prosody-filer"; }; } diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index 6590f10fbb8c..bf905324e0ac 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, fetchurl, jdk11_headless, makeWrapper, nixosTests, bash, coreutils }: let - # Latest supported LTS JDK for Zookeeper 3.7: - # https://zookeeper.apache.org/doc/r3.7.2/zookeeperAdmin.html#sc_requiredSoftware + # Latest supported LTS JDK for Zookeeper 3.9: + # https://zookeeper.apache.org/doc/r3.9.2/zookeeperAdmin.html#sc_requiredSoftware jre = jdk11_headless; in stdenv.mkDerivation rec { pname = "zookeeper"; - version = "3.7.2"; + version = "3.9.2"; src = fetchurl { url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz"; - hash = "sha512-avv8GvyLk3AoG9mGLzfbscuV7FS7LtQ3GDGqXA8Iz+53UFC9V85fwINuYa8n7tnwB29UuYmX3Q4VFZGWBW5S6g=="; + hash = "sha512-K1rgLWGKJ8qM1UkkhV1TRCY7fZ3udgGB+dZrr6kjAyTSrTF4aJXwZUyWncONSj0Ad/dMw3a1i1+i+5S+satEXw=="; }; nativeBuildInputs = [ makeWrapper ]; @@ -20,14 +20,11 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out cp -R conf docs lib $out - # Without this, zkCli.sh tries creating a log file in the Nix store. - substituteInPlace $out/conf/log4j.properties \ - --replace 'INFO, RFAAUDIT' 'INFO, CONSOLE' mkdir -p $out/bin cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer,zkSnapShotToolkit,zkTxnLogToolkit}.sh $out/bin patchShebangs $out/bin substituteInPlace $out/bin/zkServer.sh \ - --replace /bin/echo ${coreutils}/bin/echo + --replace-fail /bin/echo ${coreutils}/bin/echo for i in $out/bin/{zkCli,zkCleanup,zkServer,zkSnapShotToolkit,zkTxnLogToolkit}.sh; do wrapProgram $i \ --set JAVA_HOME "${jre}" \ @@ -47,8 +44,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://zookeeper.apache.org"; description = "Apache Zookeeper"; + changelog = "https://zookeeper.apache.org/doc/r${version}/releasenotes.html"; license = licenses.asl20; maintainers = with maintainers; [ nathan-gs pradeepchhetri ztzg ]; platforms = platforms.unix; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; } |