diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 8cc0c8caba0e..9957db3b8f60 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -221,3 +221,5 @@ adb9714bd909df283c66bbd641bd631ff50a4260 667d42c00d566e091e6b9a19b365099315d0e611 84d4f874c2bac9f3118cb6907d7113b3318dcb5e +# tmuxPlugins sha-to-sri.py script +516b1e74c358a9c4b06e5591f8c1a2897aad0c33 diff --git a/doc/doc-support/python-interpreter-table.nix b/doc/doc-support/python-interpreter-table.nix index f06609e363f2..0ea478812872 100644 --- a/doc/doc-support/python-interpreter-table.nix +++ b/doc/doc-support/python-interpreter-table.nix @@ -37,7 +37,10 @@ let lib.attrNames ( lib.filterAttrs ( name: value: - isPythonInterpreter name && name != pname && interpreterName name == interpreterName pname + # use tryEval to handle entries in aliases.nix + (builtins.tryEval ( + isPythonInterpreter name && name != pname && interpreterName name == interpreterName pname + )).value ) pkgs ); diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 24347a8e252e..8cb52ba29861 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -57,7 +57,6 @@ sets are * `pkgs.python313Packages` * `pkgs.python314Packages` * `pkgs.pypy27Packages` -* `pkgs.pypy39Packages` * `pkgs.pypy310Packages` and the aliases @@ -66,7 +65,7 @@ and the aliases * `pkgs.python3Packages` pointing to `pkgs.python312Packages` * `pkgs.pythonPackages` pointing to `pkgs.python2Packages` * `pkgs.pypy2Packages` pointing to `pkgs.pypy27Packages` -* `pkgs.pypy3Packages` pointing to `pkgs.pypy39Packages` +* `pkgs.pypy3Packages` pointing to `pkgs.pypy310Packages` * `pkgs.pypyPackages` pointing to `pkgs.pypy2Packages` diff --git a/lib/strings-with-deps.nix b/lib/strings-with-deps.nix index 7b88b018da57..900827fe0e4b 100644 --- a/lib/strings-with-deps.nix +++ b/lib/strings-with-deps.nix @@ -52,10 +52,81 @@ let in rec { - /* !!! The interface of this function is kind of messed up, since - it's way too overloaded and almost but not quite computes a - topological sort of the depstrings. */ + /** + Topologically sort a collection of dependent strings. + Only the values to keys listed in `arg` and their dependencies will be included in the result. + ::: {.note} + This function doesn't formally fulfill the definition of topological sorting, but it's good enough for our purposes in Nixpkgs. + ::: + + # Inputs + + `predefined` (attribute set) + + : strings with annotated dependencies (strings or attribute set) + A value can be a simple string if it has no dependencies. + Otherwise, is can be an attribute set with the following attributes: + - `deps` (list of strings) + - `text` (Any + + `arg` (list of strings) + + : Keys for which the values in the dependency closure will be included in the result + + # Type + + ``` + textClosureList :: { ${phase} :: { deps :: [String]; text :: String; } | String; } -> [String] -> [String] + ``` + + # Examples + :::{.example} + ## `lib.stringsWithDeps.textClosureList` usage example + + ```nix + textClosureList { + a = { + deps = [ "b" "c" "e" ]; + text = "a: depends on b, c and e"; + }; + b = { + deps = [ ]; + text = "b: no dependencies"; + }; + c = { + deps = [ "b" ]; + text = "c: depends on b"; + }; + d = { + deps = [ "c" ]; + text = "d: not being depended on by anything in `arg`"; + }; + e = { + deps = [ "c" ]; + text = "e: depends on c, depended on by a, not in `arg`"; + }; + } [ + "a" + "b" + "c" + ] + => [ + "b: no dependencies" + "c: depends on b" + "e: depends on c, depended on by a, not in `arg`" + "a: depends on b, c and e" + ] + ``` + ::: + + Common real world usages are: + - Ordering the dependent phases of `system.activationScripts` + - Ordering the dependent phases of `system.userActivationScripts` + + For further examples see: [NixOS activation script](https://nixos.org/manual/nixos/stable/#sec-activation-script) + + */ textClosureList = predefined: arg: let f = done: todo: diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3e1a1e1cbcfe..2a3b5a1f2b08 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2138,6 +2138,11 @@ name = "aszlig"; keys = [ { fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; } ]; }; + atagen = { + name = "atagen"; + github = "atagen"; + githubId = 11548989; + }; atalii = { email = "taliauster@gmail.com"; github = "atalii"; @@ -18541,8 +18546,8 @@ }; pwnwriter = { name = "Nabeen Tiwaree"; - email = "hey@pwnwriter.xyz"; - keys = [ { fingerprint = "B681 763F 9B5B DF27 9A13 9E0C 0544 A89B C519 20AA"; } ]; + email = "hi@pwnwriter.me"; + keys = [ { fingerprint = "C153 DE7C 0A0D 432E F033 2B0B A524 11EC 5582 DE3A"; } ]; github = "pwnwriter"; githubId = 90331517; }; @@ -20349,6 +20354,11 @@ githubId = 3958212; name = "Tom Sorlie"; }; + scd31 = { + name = "scd31"; + github = "scd31"; + githubId = 57571338; + }; schinmai-akamai = { email = "schinmai@akamai.com"; github = "tchinmai7"; @@ -25027,6 +25037,12 @@ githubId = 58453832; keys = [ { fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; } ]; }; + yechielw = { + name = "yechielw"; + email = "yechielworen@gmail.com"; + github = "yechielw"; + githubId = 41305372; + }; yelite = { name = "Lite Ye"; email = "yelite958@gmail.com"; diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index b37cd1d34525..aa136ba8e9cb 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -343,6 +343,12 @@ have a predefined type and string generator already declared under and returning a set with TOML-specific attributes `type` and `generate` as specified [below](#pkgs-formats-result). +`pkgs.formats.cdn` { } + +: A function taking an empty attribute set (for future extensibility) + and returning a set with [CDN](https://github.com/dzikoysk/cdn)-specific + attributes `type` and `generate` as specified [below](#pkgs-formats-result). + `pkgs.formats.elixirConf { elixir ? pkgs.elixir }` : A function taking an attribute set with values diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index b404fa35052f..a7ebb49b62b8 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -875,6 +875,12 @@ "module-services-networking-dnsmasq-references": [ "index.html#module-services-networking-dnsmasq-references" ], + "module-service-doh-server": [ + "index.html#module-service-doh-server" + ], + "module-service-doh-server-quick-start": [ + "index.html#module-service-doh-server-quick-start" + ], "module-services-samba": [ "index.html#module-services-samba" ], diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 6935f32309d6..d9e68316a2b5 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -56,6 +56,8 @@ - [networking.modemmanager](options.html#opt-networking.modemmanager) has been split out of [networking.networkmanager](options.html#opt-networking.networkmanager). NetworkManager still enables ModemManager by default, but options exist now to run NetworkManager without ModemManager. +- [doh-server](https://github.com/m13253/dns-over-https), a high performance DNS over HTTPS server. Available as [services.doh-server](options.html#opt-services.doh-server.enable). + - [ncps](https://github.com/kalbasit/ncps), a Nix binary cache proxy service implemented in Go using [go-nix](https://github.com/nix-community/go-nix). Available as [services.ncps](options.html#opt-services.ncps.enable). - [Conduwuit](https://conduwuit.puppyirl.gay/), a federated chat server implementing the Matrix protocol, forked from Conduit. Available as [services.conduwuit](#opt-services.conduwuit.enable). @@ -157,6 +159,10 @@ access or want to access home directory via `killHook`, hardening setting can be changed via, e.g. `systemd.services.earlyoom.serviceConfig.ProtectSystem`. + `services.earlyoom.extraArgs` is now shell-escaped for each element without + word-breaking. So you want to write `extraArgs = [ "--prefer" "spaced pat" ]` + rather than previous `extraArgs = [ "--prefer 'spaced pat'" ]`. + - `nodePackages.vls` has been deprecated, as the upstream consumer of it, vetur, has been deprecated by upstream. Upstream suggests migrating to Volar for Vue LSP tooling instead. - `nodePackages.create-react-native-app` has been removed, as it is deprecated. Upstream suggests using a framework for React Native apps instead. diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 6a320b8cc4a3..5a700f070b62 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -870,6 +870,7 @@ in # Create the ISO image. image.extension = if config.isoImage.compressImage then "iso.zst" else "iso"; image.filePath = "iso/${config.image.fileName}"; + image.baseName = "nixos${lib.optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}" }-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}"; system.build.image = config.system.build.isoImage; system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({ inherit (config.isoImage) compressImage volumeID contents; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index be529602d675..b5b6fd8c0e2f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1055,6 +1055,7 @@ ./services/networking/dnsmasq.nix ./services/networking/dnsproxy.nix ./services/networking/doh-proxy-rust.nix + ./services/networking/doh-server.nix ./services/networking/ejabberd.nix ./services/networking/envoy.nix ./services/networking/epmd.nix diff --git a/nixos/modules/services/networking/doh-server.md b/nixos/modules/services/networking/doh-server.md new file mode 100644 index 000000000000..2ac1630aa29d --- /dev/null +++ b/nixos/modules/services/networking/doh-server.md @@ -0,0 +1,69 @@ +# DNS-over-HTTPS Server {#module-service-doh-server} + +[DNS-over-HTTPS](https://github.com/m13253/dns-over-https) is a high performance DNS over HTTPS client & server. This module enables its server part (`doh-server`). + +## Quick Start {#module-service-doh-server-quick-start} + +Setup with Nginx + ACME (recommended): + +```nix +{ + services.doh-server = { + enable = true; + settings = { + upstream = [ "udp:1.1.1.1:53" ]; + }; + }; + + services.nginx = { + enable = true; + virtualHosts."doh.example.com" = { + enableACME = true; + forceSSL = true; + http2 = true; + locations."/".return = 404; + locations."/dns-query" = { + proxyPass = "http://127.0.0.1:8053/dns-query"; + recommendedProxySettings = true; + }; + }; + # and other virtual hosts ... + }; + + security.acme = { + acceptTerms = true; + defaults.email = "you@example.com"; + }; + + networking.firewall.allowedTCPPorts = [ 80 443 ]; +} +``` + +`doh-server` can also work as a standalone HTTPS web server (with SSL cert and key specified), but this is not recommended as `doh-server` does not do OCSP Stabbing. + +Setup a standalone instance with ACME: + +```nix +let + domain = "doh.example.com"; +in +{ + security.acme.certs.${domain} = { + dnsProvider = "cloudflare"; + credentialFiles."CF_DNS_API_TOKEN_FILE" = "/run/secrets/cf-api-token"; + }; + + services.doh-server = { + enable = true; + settings = { + listen = [ ":443" ]; + upstream = [ "udp:1.1.1.1:53" ]; + }; + useACMEHost = domain; + }; + + networking.firewall.allowedTCPPorts = [ 443 ]; +} +``` + +See a full configuration in https://github.com/m13253/dns-over-https/blob/master/doh-server/doh-server.conf. diff --git a/nixos/modules/services/networking/doh-server.nix b/nixos/modules/services/networking/doh-server.nix new file mode 100644 index 000000000000..baa3e1844946 --- /dev/null +++ b/nixos/modules/services/networking/doh-server.nix @@ -0,0 +1,175 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.doh-server; + toml = pkgs.formats.toml { }; +in +{ + options.services.doh-server = { + enable = lib.mkEnableOption "DNS-over-HTTPS server"; + + package = lib.mkPackageOption pkgs "dns-over-https" { }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = toml.type; + options = { + + listen = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ + "127.0.0.1:8053" + "[::1]:8053" + ]; + example = [ ":443" ]; + description = "HTTP listen address and port"; + }; + + path = lib.mkOption { + type = lib.types.str; + default = "/dns-query"; + example = "/dns-query"; + description = "HTTP path for resolve application"; + }; + + upstream = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ + "udp:1.1.1.1:53" + "udp:1.0.0.1:53" + "udp:8.8.8.8:53" + "udp:8.8.4.4:53" + ]; + example = [ "udp:127.0.0.1:53" ]; + description = '' + Upstream DNS resolver. + If multiple servers are specified, a random one will be chosen each time. + You can use "udp", "tcp" or "tcp-tls" for the type prefix. + For "udp", UDP will first be used, and switch to TCP when the server asks to or the response is too large. + For "tcp", only TCP will be used. + For "tcp-tls", DNS-over-TLS (RFC 7858) will be used to secure the upstream connection. + ''; + }; + + timeout = lib.mkOption { + type = lib.types.int; + default = 10; + example = 15; + description = "Upstream timeout"; + }; + + tries = lib.mkOption { + type = lib.types.int; + default = 3; + example = 5; + description = "Number of tries if upstream DNS fails"; + }; + + verbose = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = "Enable logging"; + }; + + log_guessed_client_ip = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = '' + Enable log IP from HTTPS-reverse proxy header: X-Forwarded-For or X-Real-IP + Note: http uri/useragent log cannot be controlled by this config + ''; + }; + + ecs_allow_non_global_ip = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = '' + By default, non global IP addresses are never forwarded to upstream servers. + This is to prevent two things from happening: + 1. the upstream server knowing your private LAN addresses; + 2. the upstream server unable to provide geographically near results, + or even fail to provide any result. + However, if you are deploying a split tunnel corporation network environment, or for any other reason you want to inhibit this behavior and allow local (eg RFC1918) address to be forwarded, change the following option to "true". + ''; + }; + + ecs_use_precise_ip = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = '' + If ECS is added to the request, let the full IP address or cap it to 24 or 128 mask. This option is to be used only on private networks where knowledge of the terminal endpoint may be required for security purposes (eg. DNS Firewalling). Not a good option on the internet where IP address may be used to identify the user and not only the approximate location. + ''; + }; + }; + }; + default = { }; + example = { + listen = [ ":8153" ]; + upstream = [ "udp:127.0.0.1:53" ]; + }; + description = "Configuration of doh-server in toml. See example in https://github.com/m13253/dns-over-https/blob/master/doh-server/doh-server.conf"; + }; + + useACMEHost = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + example = "doh.example.com"; + description = '' + A host of an existing Let's Encrypt certificate to use. + *Note that this option does not create any certificates, nor it does add subdomains to existing ones – you will need to create them manually using [](#opt-security.acme.certs).* + ''; + }; + + configFile = lib.mkOption { + type = lib.types.path; + example = "/path/to/doh-server.conf"; + description = '' + The config file for the doh-server. + Setting this option will override any configuration applied by the `settings` option. + ''; + }; + }; + config = lib.mkIf cfg.enable { + services.doh-server.configFile = lib.mkDefault (toml.generate "doh-server.conf" cfg.settings); + services.doh-server.settings = lib.mkIf (cfg.useACMEHost != null) ( + let + sslCertDir = config.security.acme.certs.${cfg.useACMEHost}.directory; + in + { + cert = "${sslCertDir}/cert.pem"; + key = "${sslCertDir}/key.pem"; + } + ); + systemd.services.doh-server = { + description = "DNS-over-HTTPS Server"; + documentation = [ "https://github.com/m13253/dns-over-https" ]; + after = [ + "network.target" + ] ++ lib.optional (cfg.useACMEHost != null) "acme-${cfg.useACMEHost}.service"; + wants = lib.optional (cfg.useACMEHost != null) "acme-finished-${cfg.useACMEHost}.target"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + ExecStart = "${cfg.package}/bin/doh-server -conf ${cfg.configFile}"; + LimitNOFILE = 1048576; + Restart = "always"; + RestartSec = 3; + Type = "simple"; + DynamicUser = true; + SupplementaryGroups = lib.optional (cfg.useACMEHost != null) "acme"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ DictXiong ]; + meta.doc = ./doh-server.md; +} diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix index 616dea3eb236..532c8c75076f 100644 --- a/nixos/modules/services/system/earlyoom.nix +++ b/nixos/modules/services/system/earlyoom.nix @@ -139,9 +139,14 @@ in default = [ ]; example = [ "-g" - "--prefer '(^|/)(java|chromium)$'" + "--prefer" + "(^|/)(java|chromium)$" ]; - description = "Extra command-line arguments to be passed to earlyoom."; + description = '' + Extra command-line arguments to be passed to earlyoom. Each element in + the value list will be escaped as an argument without further + word-breaking. + ''; }; }; diff --git a/nixos/release.nix b/nixos/release.nix index 69abef4b982d..7c843173ecc4 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -61,9 +61,7 @@ let hydraJob ((import lib/eval-config.nix { inherit system; - modules = makeModules module { - image.baseName = "nixos-${type}"; - }; + modules = makeModules module { }; }).config.system.build.isoImage); diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index a178dac8b47f..3588f2cc639b 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -78,12 +78,24 @@ let passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; }; preConfigure = '' + # include llvm-config in path + export PATH="${lib.getDev llvm_18}/bin:$PATH" cd build - sed -i 's@LIBNCURSES_PATH ?= .*@LIBNCURSES_PATH ?= ${ncurses_static}/lib/libncurses.a@' Make.llvm.static substituteInPlace Make.llvm.static \ --replace 'mkdir -p $@ && cd $@ && ar -x ../../$<' 'mkdir -p $@ && cd $@ && ar -x ../source/build/lib/libfaust.a && cd ../source/build/' substituteInPlace Make.llvm.static \ - --replace 'rm -rf $(TMP)' ' ' + --replace 'rm -rf $(TMP)' ' ' \ + --replace-fail "ar" "${stdenv.cc.targetPrefix}ar" + sed -i 's@LIBNCURSES_PATH ?= .*@LIBNCURSES_PATH ?= ${ncurses_static}/lib/libncurses.a@' Make.llvm.static + cd .. + shopt -s globstar + for f in **/Makefile **/Makefile.library **/CMakeLists.txt build/Make.llvm.static embedded/faustjava/faust2engine architecture/autodiff/autodiff.sh source/tools/faust2appls/* **/llvm.cmake tools/benchmark/faust2object; do + echo $f "llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + substituteInPlace $f \ + --replace-quiet "llvm-config" "llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + done + shopt -u globstar + cd build ''; cmakeFlags = [ diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index 2fe663431aac..5429d1bfb45a 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -1,4 +1,5 @@ { + bash, faust, jack2, qtbase, @@ -32,6 +33,10 @@ faust.wrapWithBuildEnv { "faust2jackserver" ]; + buildInputs = [ + bash + ]; + propagatedBuildInputs = [ jack2 qtbase diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/pkgs/applications/audio/faust/faust2lv2.nix index 92c2e9df9423..4a310440ad8a 100644 --- a/pkgs/applications/audio/faust/faust2lv2.nix +++ b/pkgs/applications/audio/faust/faust2lv2.nix @@ -1,4 +1,5 @@ { + bash, boost, faust, lv2, @@ -9,6 +10,10 @@ faust.wrapWithBuildEnv { baseName = "faust2lv2"; + buildInputs = [ + bash + ]; + propagatedBuildInputs = [ boost lv2 diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 91885898b7d6..25fa6358bbd6 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -1,31 +1,33 @@ { lib , stdenv -, curl -, jq -, htmlq -, xorg , alsa-lib -, freetype -, p7zip , autoPatchelfHook -, writeShellScript -, zlib -, libjack2 -, makeWrapper , copyDesktopItems -, makeDesktopItem +, curl +, freetype +, htmlq +, jq +, libglvnd , librsvg +, makeDesktopItem +, makeWrapper +, p7zip +, writeShellScript }: let versionForFile = v: builtins.replaceStrings [ "." ] [ "" ] v; + archdirs = + if stdenv.hostPlatform.isx86_64 then ["x86-64bit" "amd64"] + else if stdenv.hostPlatform.isAarch64 then ["arm-64bit" "arm"] + else throw "unsupported platform"; + mkPianoteq = { name , mainProgram , startupWMClass , src , version - , archdir ? if (stdenv.hostPlatform.system == "aarch64-linux") then "arm-64bit" else "x86-64bit" , ... }: stdenv.mkDerivation rec { @@ -45,11 +47,10 @@ let ]; buildInputs = [ - (lib.getLib stdenv.cc.cc) - xorg.libX11 # libX11.so.6 - xorg.libXext # libXext.so.6 + (lib.getLib stdenv.cc.cc) # libgcc_s.so.1, libstdc++.so.6 alsa-lib # libasound.so.2 freetype # libfreetype.so.6 + libglvnd # libGL.so.1 ]; desktopItems = [ @@ -68,20 +69,7 @@ let installPhase = '' runHook preInstall mkdir -p $out/bin - mv -t $out/bin Pianoteq*/${archdir}/* - for f in $out/bin/Pianoteq*; do - if [ -x "$f" ] && [ -f "$f" ]; then - wrapProgram "$f" --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath (buildInputs ++ [ - xorg.libXcursor - xorg.libXinerama - xorg.libXrandr - libjack2 - zlib - ]) - } - fi - done + mv -t $out/bin ${builtins.concatStringsSep " " (builtins.map (dir: "Pianoteq*/${dir}/*") archdirs)} install -Dm644 ${./pianoteq.svg} $out/share/icons/hicolor/scalable/apps/pianoteq.svg for size in 16 22 32 48 64 128 256; do dir=$out/share/icons/hicolor/"$size"x"$size"/apps @@ -219,59 +207,64 @@ let ''; }; -in -{ - # TODO currently can't install more than one because `lame` clashes - stage-trial = mkPianoteq rec { - name = "stage-trial"; - mainProgram = "Pianoteq 8 STAGE"; - startupWMClass = "Pianoteq STAGE Trial"; - version = "8.2.0"; - src = fetchPianoteqTrial { - name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z"; - hash = "sha256-66xbcqNrnVJ+C9FQ8Bg8A7nj/bFrjt6jKheusrXVWvI="; - }; - }; - standard-trial = mkPianoteq rec { - name = "standard-trial"; - mainProgram = "Pianoteq 8"; - startupWMClass = "Pianoteq Trial"; - version = "8.2.0"; - src = fetchPianoteqTrial { - name = "pianoteq_linux_trial_v${versionForFile version}.7z"; - hash = "sha256-IFFQMn8EFo5X8sUZV2/vtQOA83NHEFrUsU++CvYbN1c="; - }; - }; - stage-6 = mkPianoteq rec { - name = "stage-6"; - mainProgram = "Pianoteq 6 STAGE"; - startupWMClass = "Pianoteq STAGE"; - version = "6.7.3"; - archdir = if (stdenv.hostPlatform.system == "aarch64-linux") then throw "Pianoteq stage-6 is not supported on aarch64-linux" else "amd64"; - src = fetchPianoteqWithLogin { - name = "pianoteq_stage_linux_v${versionForFile version}.7z"; - hash = "0jy0hkdynhwv0zhrqkby0hdphgmcc09wxmy74rhg9afm1pzl91jy"; - }; - }; - stage-7 = mkPianoteq rec { - name = "stage-7"; - mainProgram = "Pianoteq 7 STAGE"; - startupWMClass = "Pianoteq STAGE"; - version = "7.3.0"; - src = fetchPianoteqWithLogin { - name = "pianoteq_stage_linux_v${versionForFile version}.7z"; - hash = "05w7sv9v38r6ljz9xai816w5z2qqwx88hcfjm241fvgbs54125hx"; - }; - }; - standard-8 = mkPianoteq rec { - name = "standard-8"; - mainProgram = "Pianoteq 8"; + version6 = "6.7.3"; + version7 = "7.5.4"; + version8 = "8.4.0"; + + mkStandard = version: hash: mkPianoteq { + name = "standard"; + mainProgram = "Pianoteq ${lib.versions.major version}"; startupWMClass = "Pianoteq"; - version = "8.2.0"; + inherit version; src = fetchPianoteqWithLogin { name = "pianoteq_linux_v${versionForFile version}.7z"; - hash = "sha256-ME0urUc1jwUKpg+5BdawYo9WhvMsrztYTVOrJTVxtkY="; + inherit hash; }; }; - # TODO other paid binaries, I don't own that so I don't know their hash. + mkStage = version: hash: mkPianoteq { + name = "stage"; + mainProgram = "Pianoteq ${lib.versions.major version} STAGE"; + startupWMClass = "Pianoteq STAGE"; + inherit version; + src = fetchPianoteqWithLogin { + name = "pianoteq_stage_linux_v${versionForFile version}.7z"; + inherit hash; + }; + }; + mkStandardTrial = version: hash: mkPianoteq { + name = "standard-trial"; + mainProgram = "Pianoteq ${lib.versions.major version}"; + startupWMClass = "Pianoteq Trial"; + inherit version; + src = fetchPianoteqTrial { + name = "pianoteq_linux_trial_v${versionForFile version}.7z"; + inherit hash; + }; + }; + mkStageTrial = version: hash: mkPianoteq { + name = "stage-trial"; + mainProgram = "Pianoteq ${lib.versions.major version} STAGE"; + startupWMClass = "Pianoteq STAGE Trial"; + inherit version; + src = fetchPianoteqTrial { + name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z"; + inherit hash; + }; + }; +in +{ + standard_8 = mkStandard version8 "sha256-ZDGB/SOOz+sWz7P+sNzyaipEH452n8zq5LleO3ztSXc="; + stage_8 = mkStage version8 ""; + standard-trial_8 = mkStandardTrial version8 "sha256-K3LbAWxciXt9hVAyRayxSoE/IYJ38Fd03+j0s7ZsMuw="; + stage-trial_8 = mkStageTrial version8 "sha256-k0p7SnkEq90bqIlT7PTYAQuhKEDVi+srHwYrpMUtIbM="; + + standard_7 = mkStandard version7 "sha256-TA9CiuT21fQedlMUGz7bNNxYun5ArmRjvIxjOGqXDCs="; + stage_7 = mkStage version7 ""; + standard-trial_7 = mkStandardTrial version7 "sha256-3a3+SKTEhvDtqK5Kg4E6KiLvn5+j6JN6ntIb72u2bdQ="; + stage-trial_7 = mkStageTrial version7 "sha256-ybtq+hjnaQxpLxv2KE0ZcbQXtn5DJJsnMwCmh3rlrIc="; + + standard_6 = mkStandard version6 "sha256-u6ZNpmHFVOk+r+6Q8OURSfAi41cxMoDvaEXrTtHEAVY="; + stage_6 = mkStage version6 ""; + standard-trial_6 = mkStandardTrial version6 "sha256-nHTAqosOJqC0VnRw2/xVpZ6y02vvau6CgfNmgiN/AHs="; + stage-trial_6 = mkStageTrial version6 "sha256-zrv0c/Mxt1EysR7ZvmxtksXAF5MyXTFMNj4KAdO3QnE="; } diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 32eef50a1068..7f49c31fd38c 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { hash = "sha256-hcPUvTYgtAHntdWEeHoFIIKylMTE7us1g9dwnZP9BMI="; }; + patches = [ + # expose error function used by dependents + ./expose-error.patch + ]; + nativeBuildInputs = [ autoreconfHook gettext diff --git a/pkgs/applications/audio/puredata/expose-error.patch b/pkgs/applications/audio/puredata/expose-error.patch new file mode 100644 index 000000000000..3d7d4103d40b --- /dev/null +++ b/pkgs/applications/audio/puredata/expose-error.patch @@ -0,0 +1,13 @@ +diff --git a/src/m_pd.h b/src/m_pd.h +index c658fa5..a3a506c 100644 +--- a/src/m_pd.h ++++ b/src/m_pd.h +@@ -8,6 +8,8 @@ + extern "C" { + #endif + ++extern void error(const char* fmt, ...); ++ + #define PD_MAJOR_VERSION 0 + #define PD_MINOR_VERSION 54 + #define PD_BUGFIX_VERSION 1 diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 4a1bae404d36..e40c3e231dcc 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -1,100 +1,135 @@ -{ config, lib, stdenv -, fetchurl -, autoPatchelfHook -, makeWrapper -, undmg +{ + config, + lib, + stdenv, + fetchurl, + autoPatchelfHook, + makeWrapper, + undmg, -, alsa-lib -, curl -, gtk3 -, lame -, libxml2 -, ffmpeg -, vlc -, xdg-utils -, xdotool -, which + alsa-lib, + curl, + gtk3, + lame, + libxml2, + ffmpeg, + vlc, + xdg-utils, + xdotool, + which, -, jackSupport ? stdenv.hostPlatform.isLinux -, jackLibrary -, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux -, libpulseaudio + jackSupport ? stdenv.hostPlatform.isLinux, + jackLibrary, + pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, + libpulseaudio, }: let - url_for_platform = version: arch: if stdenv.hostPlatform.isDarwin - then "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_universal.dmg" - else "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${arch}.tar.xz"; + url_for_platform = + version: arch: + if stdenv.hostPlatform.isDarwin then + "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${ + builtins.replaceStrings [ "." ] [ "" ] version + }_universal.dmg" + else + "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${ + builtins.replaceStrings [ "." ] [ "" ] version + }_linux_${arch}.tar.xz"; in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.28"; + version = "7.29"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.hostPlatform.isDarwin then "sha256-bhrBIXrE3gaAjpqrOtFK9Awb3rKMIckYhpQKVioBbqY=" else { - x86_64-linux = "sha256-HTxuu1IfjDYnCRksW5tjbOLIFz150wBwyJKCkMATlAk="; - aarch64-linux = "sha256-3jH6UwQefhLyymGltw7+//tUaO0V/3VySWuDsS3cqSo="; - }.${stdenv.hostPlatform.system}; + hash = + if stdenv.hostPlatform.isDarwin then + "sha256-b1Gb5guaFyWrt9KEwptuXGvfrJAvgnFEl8QuwSufktE=" + else + { + x86_64-linux = "sha256-uFK8Y36pYTDK3foCKH9kiq3u1MTir2nNM5KrDwIHEm0="; + aarch64-linux = "sha256-KZTUeEtyAVwIFTmclYv4GcGJ2WXukEF0/mfYmmBPfz0="; + } + .${stdenv.hostPlatform.system}; }; - nativeBuildInputs = [ - makeWrapper - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - which - autoPatchelfHook - xdg-utils # Required for desktop integration - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - undmg - ]; + nativeBuildInputs = + [ + makeWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + which + autoPatchelfHook + xdg-utils # Required for desktop integration + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + undmg + ]; sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "Reaper.app"; - buildInputs = [ - (lib.getLib stdenv.cc.cc) # reaper and libSwell need libstdc++.so.6 - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - gtk3 - alsa-lib - ]; + buildInputs = + [ + (lib.getLib stdenv.cc.cc) # reaper and libSwell need libstdc++.so.6 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + gtk3 + alsa-lib + ]; - runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ - gtk3 # libSwell needs libgdk-3.so.0 - ] - ++ lib.optional jackSupport jackLibrary - ++ lib.optional pulseaudioSupport libpulseaudio; + runtimeDependencies = + lib.optionals stdenv.hostPlatform.isLinux [ + gtk3 # libSwell needs libgdk-3.so.0 + ] + ++ lib.optional jackSupport jackLibrary + ++ lib.optional pulseaudioSupport libpulseaudio; dontBuild = true; - installPhase = if stdenv.hostPlatform.isDarwin then '' - runHook preInstall - mkdir -p "$out/Applications/Reaper.app" - cp -r * "$out/Applications/Reaper.app/" - makeWrapper "$out/Applications/Reaper.app/Contents/MacOS/REAPER" "$out/bin/reaper" - runHook postInstall - '' else '' - runHook preInstall + installPhase = + if stdenv.hostPlatform.isDarwin then + '' + runHook preInstall + mkdir -p "$out/Applications/Reaper.app" + cp -r * "$out/Applications/Reaper.app/" + makeWrapper "$out/Applications/Reaper.app/Contents/MacOS/REAPER" "$out/bin/reaper" + runHook postInstall + '' + else + '' + runHook preInstall - HOME="$out/share" XDG_DATA_HOME="$out/share" ./install-reaper.sh \ - --install $out/opt \ - --integrate-user-desktop - rm $out/opt/REAPER/uninstall-reaper.sh + HOME="$out/share" XDG_DATA_HOME="$out/share" ./install-reaper.sh \ + --install $out/opt \ + --integrate-user-desktop + rm $out/opt/REAPER/uninstall-reaper.sh - # Dynamic loading of plugin dependencies does not adhere to rpath of - # reaper executable that gets modified with runtimeDependencies. - # Patching each plugin with DT_NEEDED is cumbersome and requires - # hardcoding of API versions of each dependency. - # Setting the rpath of the plugin shared object files does not - # seem to have an effect for some plugins. - # We opt for wrapping the executable with LD_LIBRARY_PATH prefix. - # Note that libcurl and libxml2 are needed for ReaPack to run. - wrapProgram $out/opt/REAPER/reaper \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl lame libxml2 ffmpeg vlc xdotool stdenv.cc.cc ]}" + # Dynamic loading of plugin dependencies does not adhere to rpath of + # reaper executable that gets modified with runtimeDependencies. + # Patching each plugin with DT_NEEDED is cumbersome and requires + # hardcoding of API versions of each dependency. + # Setting the rpath of the plugin shared object files does not + # seem to have an effect for some plugins. + # We opt for wrapping the executable with LD_LIBRARY_PATH prefix. + # Note that libcurl and libxml2 are needed for ReaPack to run. + wrapProgram $out/opt/REAPER/reaper \ + --prefix LD_LIBRARY_PATH : "${ + lib.makeLibraryPath [ + curl + lame + libxml2 + ffmpeg + vlc + xdotool + stdenv.cc.cc + ] + }" - mkdir $out/bin - ln -s $out/opt/REAPER/reaper $out/bin/ + mkdir $out/bin + ln -s $out/opt/REAPER/reaper $out/bin/ - runHook postInstall - ''; + runHook postInstall + ''; passthru.updateScript = ./updater.sh; @@ -103,7 +138,18 @@ stdenv.mkDerivation rec { homepage = "https://www.reaper.fm/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ ilian orivej uniquepointer viraptor ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + maintainers = with maintainers; [ + atinba + ilian + orivej + uniquepointer + viraptor + ]; }; } diff --git a/pkgs/applications/audio/reaper/updater.sh b/pkgs/applications/audio/reaper/updater.sh index ef070c38aa22..a47df805345f 100755 --- a/pkgs/applications/audio/reaper/updater.sh +++ b/pkgs/applications/audio/reaper/updater.sh @@ -8,14 +8,14 @@ reaper_ver=$(curl -Ls https://www.reaper.fm/download.php | grep -o 'Version [0-9 function set_hash_for_linux() { local arch=$1 pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_linux_$arch.tar.xz) - pkg_hash=$(nix hash to-sri "sha256:$pkg_hash") + pkg_hash=$(nix hash convert "sha256:$pkg_hash") update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-linux --ignore-same-version } function set_hash_for_darwin() { local arch=$1 pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_universal.dmg) - pkg_hash=$(nix hash to-sri "sha256:$pkg_hash") + pkg_hash=$(nix hash convert "sha256:$pkg_hash") update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-darwin --ignore-same-version } diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index c24cca9fcf0b..440b59b5bd63 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.10.7"; + version = "0.10.8"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-KDl+SV5U2aqsl3UMK8WWZiwkcqLpaRGmH/J8vBKTZcQ="; + hash = "sha256-L26jzAn8vwnw9kFd6ciyYS/OLEFTbN8doNKy3P8qKRE="; }; - cargoHash = "sha256-vcn+94KklWlYQw4fbH8KxhBnovk0dJc8Hkj+jJ+SeB0="; + cargoHash = "sha256-/0XS4xF5gzEBWXS39f0FsIK1dFwmGT4McaExR/srB5Y="; # needed for librocksdb-sys nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix index e29f2a1fb93e..f9a586b23b8d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix @@ -8,13 +8,13 @@ melpaBuild { pname = "edraw"; - version = "1.2.0-unstable-2024-12-18"; + version = "1.2.0-unstable-2025-01-06"; src = fetchFromGitHub { owner = "misohena"; repo = "el-easydraw"; - rev = "1c46469d0ea3642958eaf7cea1016fcf05b4daec"; - hash = "sha256-Z7LPC112FXHtDop1HXPnR6S+cSqfEW1HuYS8YD/qM+c="; + rev = "9a5b5e2b071be99350bfc8db6fbc2c9c667f3725"; + hash = "sha256-lQYSUQFAv6rqvZySsFbe8B7ZqEaa2L+L3HXB231D4OQ="; }; propagatedUserEnvPkgs = [ gzip ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix index 9b1efb8dbcf2..4c4526e013dc 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix @@ -9,12 +9,12 @@ replaceVars, }: let - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.cmp"; tag = "v${version}"; - hash = "sha256-j6hBURbIZbvNE69l4AyCtCwfeOi3oNxVtooFK7/WUuA="; + hash = "sha256-MfHI4efAdaoCU8si6YFdznZmSTprthDq3YKuF91z7ss="; }; libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; blink-fuzzy-lib = rustPlatform.buildRustPackage { diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 432ec2db9f7f..0c5744e77c8c 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "24.7.17"; + version = "26.0.4"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-DWNFh3ocU5WVi5WZheMOMUYH6FHJ+LJbaUC1XkQ5TFo="; + hash = "sha256-3tEWLRen8lRQEDFlfTWT9+L15k+7z/7To6p7SkmdJhU="; }; # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-bAvS7AXmmS+yYsEkXxvszlErpZ3J5hVVXxxzYcsVP5Y="; + hash = "sha256-DElSCZwVGZF/sjec0SFi7iIe/2Ern85oT5rp6bQl5wg="; }; nativeBuildInputs = diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index bf30838cc12b..b237c5f1bcf1 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -119,11 +119,9 @@ lib.makeScope pkgs.newScope ( nativeBuildInputs = with pkgs; [ which ]; - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals stdenv.cc.isClang [ - "-Wno-error=incompatible-function-pointer-types" - ] - ); + # workaround for issue: + # https://github.com/alessandrofrancesconi/gimp-plugin-bimp/issues/411 + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; installFlags = [ "SYSTEM_INSTALL_DIR=${placeholder "out"}/${gimp.targetPluginDir}/bimp" @@ -139,69 +137,6 @@ lib.makeScope pkgs.newScope ( }; }; - gap = pluginDerivation { - /* - menu: - Video - */ - pname = "gap"; - version = "2.6.0-unstable-2023-05-20"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "Archive"; - repo = "gimp-gap"; - rev = "b2aa06cc7ee4ae1938f14640fe46b75ef5b15982"; - hash = "sha256-q5TgCy0+iIfxyqJRXsKxiFrWMFSzBqC0SA9MBGTHXcA="; - }; - - nativeBuildInputs = with pkgs; [ autoreconfHook ]; - - postUnpack = '' - tar -xf $sourceRoot/extern_libs/ffmpeg.tar.gz -C $sourceRoot/extern_libs - ''; - - postPatch = - let - ffmpegPatch = fetchpatch2 { - name = "fix-ffmpeg-binutil-2.41.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb"; - hash = "sha256-vLSltvZVMcQ0CnkU0A29x6fJSywE8/aU+Mp9os8DZYY="; - }; - in - '' - patch -Np1 -i ${ffmpegPatch} -d extern_libs/ffmpeg - ffmpegSrc=$(realpath extern_libs/ffmpeg) - ''; - - configureFlags = - [ - "--with-ffmpegsrcdir=${placeholder "ffmpegSrc"}" - ] - ++ lib.optionals (!stdenv.hostPlatform.isx86) [ - "--disable-libavformat" - ]; - - hardeningDisable = [ "format" ]; - - env = { - NIX_LDFLAGS = "-lm"; - }; - - meta = with lib; { - description = "GIMP Animation Package"; - homepage = "https://www.gimp.org"; - # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license - # falls inside "free". - license = with licenses; [ - gpl3 - free - ]; - # Depends on linux/soundcard.h - platforms = platforms.linux; - }; - }; - farbfeld = pluginDerivation { pname = "farbfeld"; version = "unstable-2019-08-12"; @@ -371,10 +306,14 @@ lib.makeScope pkgs.newScope ( sha256 = "1jj3n7spkjc63aipwdqsvq9gi07w13bb1v8iqzvxwzld2kxa3c8w"; }; - buildInputs = with pkgs; [ - lensfun - gexiv2 - ]; + buildInputs = ( + with pkgs; + [ + lensfun + gexiv2 + ] + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp + ); installPhase = " installPlugin gimp-lensfun @@ -387,7 +326,6 @@ lib.makeScope pkgs.newScope ( license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; }; }; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 18fb74a8343d..0246a6ba928b 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.33"; + version = "13.34"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-5x21KEalRpNhtSNlStziXDyDnvNmqvy6Lq0jgAZ2WE8="; + hash = "sha256-adZTcZGRE0PkG9rntvD3vLIqXOsVxP28LCZrfyVqy9M="; }; buildInputs = diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 494d287364c2..19dc0653c753 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "phoc"; - version = "0.41.0"; + version = "0.44.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Phosh"; repo = "phoc"; rev = "v${finalAttrs.version}"; - hash = "sha256-T2gKvP3WyrGNOiCwiX93UjMuSTnnZ+nykEAFhq0BF4U="; + hash = "sha256-KaCQtORMJUM7/BLD+Jnbunhd/9/3NYWYx/XMYMo27hI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix index b0a3dbf1e7e9..4c9f11357220 100644 --- a/pkgs/applications/misc/tandoor-recipes/common.nix +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -1,18 +1,19 @@ { lib, fetchFromGitHub }: rec { - version = "1.5.25"; + version = "1.5.27"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; rev = version; - hash = "sha256-Yw68wxLqoyPRQmP/krSaxByv24CKh7Y7O07NU+dL5mo="; + hash = "sha256-HP4gVk127hvvL337Cb4Wbvvf55RWY7u5RF/FKDCottw="; }; yarnHash = "sha256-lU8QrTkI32XOHefIkj/0fa2UKhuZpQIT1wyweQnzXmQ="; meta = with lib; { homepage = "https://tandoor.dev/"; + changelog = "https://github.com/TandoorRecipes/recipes/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ jvanbruegge ]; }; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index bdee1a9a8f33..1aea581a76f5 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,9 +1,9 @@ { "chromium": { - "version": "131.0.6778.204", + "version": "131.0.6778.264", "chromedriver": { - "hash_darwin": "sha256-xxTu1aPNTfGpaPFC55NihzJbcjDL3fBXimQIGBPaU18=", - "hash_darwin_aarch64": "sha256-WyNiLNIPPUesDCYYs6Uc0aZDou0N60kZvL31DlqHMtw=" + "hash_darwin": "sha256-ibvVBD3q+ed1VffgSEZie7VAmSdBT3CJ9bNnjyYzWis=", + "hash_darwin_aarch64": "sha256-Eup+/qrFxMAU9AoYfd5BYTKM+J7CWE7GLGETiYdYorU=" }, "deps": { "depot_tools": { @@ -19,8 +19,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "52183f9e99a61056f9b78535f53d256f1516f2a0", - "hash": "sha256-D7+Ji8Y1vw1Sgt9njbZDGbgbzT8eAvx/95M8SsHyiN4=", + "rev": "2d05e31515360f4da764174f7c448b33e36da871", + "hash": "sha256-aAb+lMefY4+zADsVeyLIhNI4AQfGmzu+7Y8o3t2csmU=", "recompress": true }, "src/third_party/clang-format/script": { @@ -760,8 +760,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "7f72bbed40ca85a6b68ca2f15feca342c9c256d0", - "hash": "sha256-QJcC6T2IOCXhObwND0jPQTUl84lotcYRCIQe4GTtczc=" + "rev": "9c09e7876ff830e1f9a731aa930040d1028ff5a1", + "hash": "sha256-OKa0W4s3VfaQ/MBHkrkZ8/LeRGqjGh9hTaqet7S4o58=" } } }, diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f8db665a9ff7..d3ad8efd000d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -615,11 +615,11 @@ "vendorHash": "sha256-GoOKTT+EOhaPhpbgSW3SycYsE8LEQP0v4eQfiTEnPy8=" }, "huaweicloud": { - "hash": "sha256-WVoG8XoH1u0mnM4i/mULV+c6gGr3u6AVj5RiqOAlBmA=", + "hash": "sha256-cfyd8vbzRPaGqgo3iPqjzoeb3h2hWvLgFP+Q41kDn/c=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.71.2", + "rev": "v1.72.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -958,13 +958,13 @@ "vendorHash": "sha256-0Atbzx1DjInPMa1lNxyNKfNMILjN4S814TlIAQeTfdI=" }, "opentelekomcloud": { - "hash": "sha256-H7IG6YjGSbPXaprWfGjQzHcaEIa9H6xUuoG4PPho/8s=", + "hash": "sha256-gcELIKjDeXp0rqz+tDp2S9VEzPVoL+7RfvpfNF/qets=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.27", + "rev": "v1.36.28", "spdx": "MPL-2.0", - "vendorHash": "sha256-3dDj0I7kBkwbQun90VUqdvpUcelMz1v7/OfgXfb87yE=" + "vendorHash": "sha256-KvQNpXn11KdGbGQBWj7FwVypJOcFhLjgOKBfFZOyL7M=" }, "opsgenie": { "hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index c886f4adb8ea..892e264e0be4 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -184,9 +184,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.10.3"; - hash = "sha256-KY18YFTKWj366CPTh1MJ9DLamiFUVql3BhuMUzN7zf8="; - vendorHash = "sha256-AajBuUwOhK0OniRRfCqR89+mA9LnQBkbG3Xge9c0qSQ="; + version = "1.10.4"; + hash = "sha256-wJg/BfKWgDzv9HKOsNaq+l2jG37VbOtmBF+QEhNLQ1k="; + vendorHash = "sha256-YFsPxDlD7SqHo0x2UQnsJ5jDTp2JXdhEgDvtIpWVQ9o="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2d0e4413d46a..17825ae97ff2 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,24 +9,24 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.78"; + stable = "0.0.79"; ptb = "0.0.124"; - canary = "0.0.549"; - development = "0.0.60"; + canary = "0.0.556"; + development = "0.0.61"; } else { - stable = "0.0.330"; - ptb = "0.0.153"; - canary = "0.0.661"; - development = "0.0.68"; + stable = "0.0.331"; + ptb = "0.0.154"; + canary = "0.0.668"; + development = "0.0.70"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-1G9NM0Z6dN2LtunHkkIzNNA+xFslxhnI8GVrjXlNZK8="; + hash = "sha256-gQVx+PueGDofUjKSvyorCu73myNujcKz9gugMKB9koY="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; @@ -34,29 +34,29 @@ let }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-hwgvPNoEGjfg6uLlC/k3iYfxfjbja5H2F2aSiEcGZ/o="; + hash = "sha256-5qn0YL0+1uE6kmQO3Fh2DD0gNjk6MT+yAdIoMK7Y8Tw="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-SL+lWMSXC1Y11Sk59sE7F8n04DED2365RKKeKFU8R6o="; + hash = "sha256-9ssgue3Y8StyKnc1dvr6b0Z3hjPYtJCNuVsruqFx8ug="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-wLDr2jtjPsV3rUsFCNKKHXTwGPdoR/whLmr4w8I7x+U="; + hash = "sha256-U37JyZwPmsk6ArD8Lz0xAiy/I78H+wHSig3+1BpD9iA="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-EvIEMyqOotnyqBC8w4XbF+RuP+g2Bjt4hD4aEeEzZGU="; + hash = "sha256-BVKhyLoz/EoaZ6LgCaJuZZ37u9ProXOPddrfg171Eu4="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-dCeLnfgvaKngO8r/VIDgQLkMKgV7BDOOKcXUdo91Eeo="; + hash = "sha256-1eCHufW68AuYuYWzfq6Tt+YylFgCLT88DrvrNZvQG8A="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-5sUkGN9ucyYArGkfbGBdJokoqpHKBrkwxH055LpMlrs="; + hash = "sha256-UdHwa/ALOOt/bNA6UmVJB8GNe+yHJ1xFoyF0nT1Zn3g="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 23df7627e6fa..2ed07af8eeb3 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -18,13 +18,13 @@ buildPythonApplication rec { pname = "matrix-commander"; - version = "7.6.2"; + version = "8.0.4"; src = fetchFromGitHub { owner = "8go"; repo = "matrix-commander"; rev = "v${version}"; - hash = "sha256-BiQShJHCTvEdkhp21uxxCTxBZ1eezuWE6btMc/wkPlc="; + hash = "sha256-JZcdAo6d7huwDQ9hJE8oT5FH0ZQjg0DhoglOkhOyk1o="; }; format = "pyproject"; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index da3d47bb7597..5b5d63fb5909 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -102,6 +102,9 @@ stdenv.mkDerivation rec { DEFAULT_JVM_OPTS=$(sed -n -E "s/^DEFAULT_JVM_OPTS='(.*)'$/\1/p" $out/bin/JabRef | sed -e "s|\$APP_HOME|$out|g" -e 's/"//g') + # Temp fix: openjfx doesn't build with webkit + unzip $out/lib/javafx-web-*-*.jar libjfxwebkit.so -d $out/lib/ + runHook postInstall ''; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index ca48c99ea9f6..4ac22ade4ac5 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.32.1"; + version = "2.32.2"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-b+HaFXi3Z2vOU2saEvg22uLHbJLdM4dGEZeI6lvI/dk="; + hash = "sha256-i4wpM7Rc4pFUUzPFvoPxUlifIvk4GJzBhCLpUndFnjE="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-AOLAyyg8ZFPjreK/PEY+TJy4puxqMCg5kjEyBfEfmPk="; + vendorHash = "sha256-UP1SDAaoGD1iYqb0RKCZgB22CuE2OU8FW7YFPxiY42w="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index bba1f204da6a..5f3820737308 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -16,6 +16,7 @@ , pulseaudio , evince , glib +, modemmanager , gtk4 , gnome-bluetooth , gnome-control-center @@ -41,12 +42,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "phosh"; - version = "0.41.1"; + version = "0.44.0"; src = fetchurl { # Release tarball which includes subprojects gvc and libcall-ui url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-Oc6Dltjj+2D3LWZz1eYArqEKEJYYqJPSrScEkxyNhX0="; + hash = "sha256-b4yrSC0TzTuh5kl93DeJNh06ZKjvNhTSjhDzmsEuK2g="; }; nativeBuildInputs = [ @@ -70,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { evolution-data-server pulseaudio glib + modemmanager gcr networkmanager polkit diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index cf227a738186..26c04553d989 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ab-av1"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "alexheretic"; repo = "ab-av1"; rev = "v${version}"; - hash = "sha256-xKZVvwRSCd4AxJnfEnRYuyB0yhxkg19a2tI0x2rcvWs="; + hash = "sha256-I9XApll0/mvfhL/BLWoVwL0ffqa5r3dOBWYTHizJ0hc="; }; - cargoHash = "sha256-nK3ye3wJBBv4ei41e9V/bj5kg5ujjzi0EvLwKKfvfUU="; + cargoHash = "sha256-jTCAB4O+SePCaKivHwbfFJZKjlxZmzP4uLT5idKmiO4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ac/actionlint/package.nix b/pkgs/by-name/ac/actionlint/package.nix index 37cc1d585236..7bdec394417b 100644 --- a/pkgs/by-name/ac/actionlint/package.nix +++ b/pkgs/by-name/ac/actionlint/package.nix @@ -10,7 +10,7 @@ }: let - version = "1.7.5"; + version = "1.7.6"; in buildGoModule { pname = "actionlint"; @@ -22,10 +22,10 @@ buildGoModule { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - hash = "sha256-CJ3T47zPO1p29Nxpxtgf7oTe3TT240RXJG14DW1uANY="; + hash = "sha256-NHmz+r7xO84eSQFBNwaI+ctzIgd014rRQtqvi8hOWPE="; }; - vendorHash = "sha256-3c+0Hxn7JcJzrg9Ep/BKKb0mu0nbb5qX2snljCeu1N0="; + vendorHash = "sha256-4hBIDrFOADGo3gsTRW8hjBYzmWRo/5yyoM7Ylv3KJBk="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/tools/security/authoscope/default.nix b/pkgs/by-name/au/authoscope/package.nix similarity index 54% rename from pkgs/tools/security/authoscope/default.nix rename to pkgs/by-name/au/authoscope/package.nix index 728db72a8b8c..3cd61f98fb21 100644 --- a/pkgs/tools/security/authoscope/default.nix +++ b/pkgs/by-name/au/authoscope/package.nix @@ -1,13 +1,14 @@ { lib, stdenv, + darwin, fetchFromGitHub, installShellFiles, libcap, + nix-update-script, openssl, pkg-config, rustPlatform, - Security, zlib, }: @@ -17,9 +18,9 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "kpcyrd"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk="; + repo = "authoscope"; + tag = "v${version}"; + hash = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk="; }; cargoHash = "sha256-rSHuKy86iJNLAKSVcb7fn7A/cc75EOc97jGI14EaC6k="; @@ -29,11 +30,15 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ - libcap - zlib - openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = + [ + libcap + zlib + openssl + ] + ++ lib.optional stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; postInstall = '' installManPage docs/${pname}.1 @@ -42,10 +47,13 @@ rustPlatform.buildRustPackage rec { # Tests requires access to httpin.org doCheck = false; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Scriptable network authentication cracker"; homepage = "https://github.com/kpcyrd/authoscope"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ fab ]; + changelog = "https://github.com/kpcyrd/authoscope/releases/tag/v${version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/bi/bigloo/package.nix b/pkgs/by-name/bi/bigloo/package.nix index 53f76870a4fc..054acfa7c8f1 100644 --- a/pkgs/by-name/bi/bigloo/package.nix +++ b/pkgs/by-name/bi/bigloo/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "bigloo"; - version = "4.4b"; + version = "4.5b"; src = fetchurl { url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo-${version}.tar.gz"; - sha256 = "sha256-oxOSJwKWmwo7PYAwmeoFrKaYdYvmvQquWXyutolc488="; + sha256 = "sha256-hk1SXuan/zOf2ajJc8xGv5piOjgn2Ev7bgSikiNwfaU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix index 8581b17225bf..76fd676fba51 100644 --- a/pkgs/by-name/ca/cadical/package.nix +++ b/pkgs/by-name/ca/cadical/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem, - version ? "2.1.1", + version ? "2.1.2", }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = "rel-${version}"; hash = { - "2.1.1" = "sha256-1/qJGGyx+hGZ09pIT2uNykotaYlU8BCKArblYhHsMxo="; + "2.1.2" = "sha256-fhvQd/f8eaw7OA2/XoOTVOnQxSSxUvugu6VWo2nmpQ0="; "2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc="; } .${version}; diff --git a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix index c9d6943efc55..4772ed1ad744 100644 --- a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix +++ b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bundle-licenses"; - version = "1.3.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "sstadick"; repo = "cargo-bundle-licenses"; rev = "v${version}"; - hash = "sha256-pWQU0IMahbFJR7oRUqnz73cB8yRbTpkh5NASmUKg0E0="; + hash = "sha256-oyb5uWIKXhPSMpb1t6C/IYKK8FMSANIQXs2XdJ/bD2A="; }; - cargoHash = "sha256-eUY3dyyWbqSqFqafdZ2AdI7vsH60vCRNk2cAGJw0ROk="; + cargoHash = "sha256-HxFRHgb0nBF6YGaiynv95fNwej70IAwP4jhVcGvdFok="; meta = with lib; { description = "Generate a THIRDPARTY file with all licenses in a cargo project"; diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix index 49b1ac6770c9..256b4c0ab1b4 100644 --- a/pkgs/by-name/ca/cargo-component/package.nix +++ b/pkgs/by-name/ca/cargo-component/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-HiDwFWEzzCmwlEKsVmKREtn5OfAziC+irgeh66fRWIQ="; + hash = "sha256-pW3hhcsMzKSWmUX8HwAtZCB+v9B4qXw6WUGODhPtW+Q="; }; - cargoHash = "sha256-AtOZGYH0ya5mza3QFTfaXvw9tcFDGuz72JUhfTdUml8="; + cargoHash = "sha256-knNtEBSJigamj1hE6wU4Hc/f3TUcFiufOUMLwsK6t+A="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix index 63fa78ef0cd8..0b2902163bd5 100644 --- a/pkgs/by-name/ca/cargo-deb/package.nix +++ b/pkgs/by-name/ca/cargo-deb/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.9.4"; + version = "2.10.0"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-jTmETLENCUaGIJIN2smSS+QKNco0mFJWrOkQgiMBcz8="; + hash = "sha256-J3ChNrZUctDcs1bOCoDLTQtqTT9rWi24XK2fki8PYLw="; }; - cargoHash = "sha256-QruSmVER4WE0++b5MHKCtVduQkyF2Dkszw6gmhdZEKs="; + cargoHash = "sha256-CjlMadj4/QhbSlCoZs3JRaplbY4XlcBFKR4ZXJLK+Uo="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix index 500e02ef0acb..6efee85320f0 100644 --- a/pkgs/by-name/ca/cargo-shuttle/package.nix +++ b/pkgs/by-name/ca/cargo-shuttle/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.49.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-97AiRgTPzkNsnxMTF0zleHVR6QYLyRlhguh2nz+duUM="; + hash = "sha256-D3o4GdGD/lP4bchjpyj684G1CDWMhnZHke131GAI1es="; }; useFetchCargoVendor = true; - cargoHash = "sha256-eHmNGIcSXzFdfEHKKr0R+igtZbm8bPRFg2uhzJwKDhk="; + cargoHash = "sha256-hlYcDQi4wv43UBYSvnWUMunAKVCFVFA7hvxjaeGA2pA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index c4e672e62b7b..869ce53a5255 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.35.0"; + version = "11.36.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-WBzl3DyjPr5vV9oobqZx1pprs4gkVN9BafOMIMqqb7E="; + hash = "sha256-LISy9xMAv9Wal+iRF9qoCLrQnq0r4HOqCir/w0uTrAA="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-rgjYpiTWp9KqC7gX05Fx5h2hKT1ah2GQorPzPhJpQH0="; + vendorHash = "sha256-JweIdmjnybaOyL5GOxCmP8TpyMYTG9qD5aFbabAJ4h8="; ldflags = [ "-w" diff --git a/pkgs/by-name/co/codux/package.nix b/pkgs/by-name/co/codux/package.nix index 54e74f46cf90..954c33cab990 100644 --- a/pkgs/by-name/co/codux/package.nix +++ b/pkgs/by-name/co/codux/package.nix @@ -6,11 +6,11 @@ let pname = "codux"; - version = "15.40.0"; + version = "15.41.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - hash = "sha256-HPpzlIpMieQbFJFFshGtKm7ztnZ8obnVEpJTETQekL8="; + hash = "sha256-l1Z4jcbsTdzn4kFDcAGENAuewIThP2ENB/fbG7XerdY="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index a5e1d0ed5d9d..d1bc9f05b928 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + nix-update-script, rustPlatform, appstream, makeBinaryWrapper, @@ -24,18 +25,18 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-store"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.4"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-store"; rev = "epoch-${version}"; - hash = "sha256-mq94ZMVOdXAPR52ID5x8nppJ9mNoTOPBfn7Eouj3T1U="; + hash = "sha256-VaOKF3cCnNbfUfJeuhx0wXRvprAnSspTe8gIiR/t2Ng="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-lhMMzT6igjEEvwpcc7d8JyyHU0DcWVIh3z9KR6eCv7c="; + cargoHash = "sha256-Zt2199zlxNbrN/S6bogp4JPM3ZMZpQL5jTXKMki6LQE="; postPatch = '' substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" @@ -99,6 +100,10 @@ rustPlatform.buildRustPackage rec { } ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-store"; description = "App Store for the COSMIC Desktop Environment"; diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix index 370c82f502ca..1f081fcbcb7a 100644 --- a/pkgs/by-name/da/dart-sass/package.nix +++ b/pkgs/by-name/da/dart-sass/package.nix @@ -22,13 +22,13 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.83.0"; + version = "1.83.1"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-BT9ubYNireRXWqTHRrL7gHXle6tX3pjKG3siQ9TNf1M="; + hash = "sha256-uy3kp6oT51AW2qE+qHOvvDDS59Tgw9fEAer94PsQOkg="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json index aac3db336c76..4d9d63e4a0a6 100644 --- a/pkgs/by-name/da/dart-sass/pubspec.lock.json +++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json @@ -180,11 +180,11 @@ "dependency": "direct dev", "description": { "name": "dart_style", - "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "sha256": "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.7" + "version": "3.0.1" }, "dartdoc": { "dependency": "direct dev", @@ -290,11 +290,11 @@ "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.1" + "version": "4.1.2" }, "io": { "dependency": "transitive", @@ -510,11 +510,11 @@ "dependency": "direct dev", "description": { "name": "pub_api_client", - "sha256": "d9ced27bb5b933012a5218120f1fbee2a7d3bd234a7d5cc6fe29dedf4df6127a", + "sha256": "1b95df9b91bc1d5edf21a46e74b7aad64eaf33d56467781bfd8d730539a1f57d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "3.1.0" }, "pub_semver": { "dependency": "direct main", @@ -530,11 +530,11 @@ "dependency": "direct dev", "description": { "name": "pubspec_parse", - "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "retry": { "dependency": "transitive", @@ -620,21 +620,21 @@ "dependency": "direct main", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.12.1" }, "stream_channel": { "dependency": "direct main", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "stream_transform": { "dependency": "direct main", @@ -670,11 +670,11 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "43490fe4c0f5ecb898f3fa1cdcdad8d521d7f6ff17ebdc4e8cd32b2e99524a20", + "sha256": "8391fbe68d520daf2314121764d38e37f934c02fd7301ad18307bd93bd6b725d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.13" + "version": "1.25.14" }, "test_api": { "dependency": "transitive", @@ -700,11 +700,11 @@ "dependency": "direct dev", "description": { "name": "test_descriptor", - "sha256": "abe245e8b0d61245684127fe32343542c25dc2a1ce8f405531637241d98d07e4", + "sha256": "9ce468c97ae396e8440d26bb43763f84e2a2a5331813ee5a397cb4da481aaf9a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "2.0.2" }, "test_process": { "dependency": "direct dev", @@ -810,11 +810,11 @@ "dependency": "direct dev", "description": { "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" } }, "sdks": { diff --git a/pkgs/by-name/de/debootstrap/package.nix b/pkgs/by-name/de/debootstrap/package.nix index 08b65af738b2..520fd3f97b46 100644 --- a/pkgs/by-name/de/debootstrap/package.nix +++ b/pkgs/by-name/de/debootstrap/package.nix @@ -11,7 +11,7 @@ coreutils, util-linux, gnugrep, - gnupg1, + gnupg, gnutar, gnused, gzip, @@ -32,7 +32,7 @@ let dpkg gawk gnugrep - gnupg1 + gnupg gnused gnutar gzip @@ -43,14 +43,14 @@ let in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.138"; + version = "1.0.140"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "debootstrap"; rev = "refs/tags/${version}"; - hash = "sha256-2NUFt39isGThOqlg1LNOFxYJOPm93jDCvIztJoE5Vts="; + hash = "sha256-kusY42HwyMFuzwJimdVzuwx9XGjKssGAR7guB4E0TbQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/di/diffnav/package.nix b/pkgs/by-name/di/diffnav/package.nix index 807dffc8486b..a104299e95d2 100644 --- a/pkgs/by-name/di/diffnav/package.nix +++ b/pkgs/by-name/di/diffnav/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "diffnav"; - version = "0.2.8"; + version = "0.3.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "diffnav"; rev = "refs/tags/v${version}"; - hash = "sha256-xZAi/Ky1RjOxjhQKHvozaPTqDPcrGfhMemGWzi7WyW4="; + hash = "sha256-JXxeRq8OuTvzkbxDr1xVXeW0RFtCRyEbhCGvXeWHb0g="; }; vendorHash = "sha256-2JjQF+fwl8+Xoq9T3jCvngRAOa3935zpi9qbF4w4hEI="; diff --git a/pkgs/by-name/di/diodon/package.nix b/pkgs/by-name/di/diodon/package.nix new file mode 100644 index 000000000000..c65646b31a16 --- /dev/null +++ b/pkgs/by-name/di/diodon/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchFromGitHub, + desktop-file-utils, + glib, + gobject-introspection, + gtk3, + meson, + ninja, + pkg-config, + vala, + wrapGAppsHook3, + xvfb-run, + libayatana-appindicator, + libpeas, + libXtst, + zeitgeist, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "diodon"; + version = "1.13.0"; + + src = fetchFromGitHub { + owner = "diodon-dev"; + repo = "diodon"; + tag = finalAttrs.version; + hash = "sha256-VCJANasrGmC0jIy8JNNURvmgpL/SLOaVsKo7Pf+X8DQ="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + desktop-file-utils # for `desktop-file-validate` + glib # for glib-compile-schemas + gobject-introspection # For g-ir-compiler + gtk3 # for gtk-update-icon-cache + meson + ninja + pkg-config + vala + wrapGAppsHook3 + xvfb-run + ]; + + buildInputs = [ + gtk3 + libayatana-appindicator + libpeas + libXtst + zeitgeist + ]; + + doCheck = true; + + meta = { + description = "Aiming to be the best integrated clipboard manager for the Unity desktop"; + homepage = "https://launchpad.net/diodon"; + mainProgram = "diodon"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.sfrijters ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ea/eartag/package.nix b/pkgs/by-name/ea/eartag/package.nix index d55be4b866e2..7d045857fa1b 100644 --- a/pkgs/by-name/ea/eartag/package.nix +++ b/pkgs/by-name/ea/eartag/package.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { pname = "eartag"; - version = "0.6.3"; + version = "0.6.4"; format = "other"; src = fetchFromGitLab { @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = pname; rev = version; - hash = "sha256-eo6Vboo2Kn39M0r1OeqRFG3ug6frxzMKler5qT9KysY="; + hash = "sha256-K93sj84MdDCQgIMghkjpGIieSrlnlQiw85JSgggRlf4="; }; postPatch = '' diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index ba8ad3271e3c..1870c8143547 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -17,14 +17,14 @@ let in flutter324.buildFlutterApplication rec { pname = "ente-auth"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "auth" ]; tag = "auth-v${version}"; - hash = "sha256-pg2ivtTsMtDRNmxp2SQwI2n94qg60q8JfIWoO/rEUJE="; + hash = "sha256-G+uSEEJUD8mq8d7FJRKSHjpcFsILZJmtpgBmtpQYP58="; }; sourceRoot = "${src.name}/auth"; diff --git a/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch b/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch index 983408cab16c..e9cb4d5526e9 100644 --- a/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch +++ b/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch @@ -1,4 +1,4 @@ -From 47406ebaf0260e5b66a92baac3717936c8386b69 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:52:59 +0200 Subject: [PATCH] nixpkgs: use system Python @@ -10,7 +10,7 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl -index 9f2b336b1a..53a2c93c59 100644 +index 9f2b336b1a36ca0d2f04a40ac1809b30ff21df27..53a2c93c59492a12ef4a6ecfc0c8a679f0df73f7 100644 --- a/bazel/python_dependencies.bzl +++ b/bazel/python_dependencies.bzl @@ -1,28 +1,25 @@ @@ -47,7 +47,7 @@ index 9f2b336b1a..53a2c93c59 100644 extra_pip_args = ["--require-hashes"], ) diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl -index b92dd461ba..cef32b3140 100644 +index b92dd461ba7037d2f1c079f283ff2c466686f7a4..cef32b3140588cb7668d47d0c08528f131184fe4 100644 --- a/bazel/repositories_extra.bzl +++ b/bazel/repositories_extra.bzl @@ -2,19 +2,11 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies") diff --git a/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch b/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch index 0e42864dadba..b3f66ac22552 100644 --- a/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch +++ b/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch @@ -1,4 +1,4 @@ -From 4be181e96199529a36e9a93c837af7173c827493 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:58:00 +0200 Subject: [PATCH] nixpkgs: use system Go @@ -9,7 +9,7 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl -index c68eb4bf3e..addee4f6af 100644 +index c68eb4bf3ed2d39d46d38d7bd0eeab2c74a507fa..addee4f6af74ea78ae778b73384e01db83ac6694 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -20,7 +20,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common") diff --git a/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch b/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch index 8b1a0b016259..b8be06be0730 100644 --- a/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch +++ b/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch @@ -1,4 +1,4 @@ -From 3ecb08a7603a07310d1a38c0f47bc54bbe1f11c8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 22 Apr 2024 11:59:22 +0200 Subject: [PATCH] nixpkgs: use system C/C++ toolchains @@ -9,7 +9,7 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl -index addee4f6af..dc1967e43b 100644 +index addee4f6af74ea78ae778b73384e01db83ac6694..dc1967e43b2b71358d2767a3d83b52819987290d 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -26,7 +26,11 @@ JQ_VERSION = "1.7" diff --git a/pkgs/by-name/en/envoy/0004-nixpkgs-patch-boringssl-for-gcc14.patch b/pkgs/by-name/en/envoy/0004-nixpkgs-patch-boringssl-for-gcc14.patch new file mode 100644 index 000000000000..4c31f1e8a90c --- /dev/null +++ b/pkgs/by-name/en/envoy/0004-nixpkgs-patch-boringssl-for-gcc14.patch @@ -0,0 +1,55 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Paul Meyer +Date: Thu, 2 Jan 2025 09:32:41 +0100 +Subject: [PATCH] nixpkgs: patch boringssl for gcc14 + +Signed-off-by: Paul Meyer +--- + bazel/boringssl-gcc14.patch | 25 +++++++++++++++++++++++++ + bazel/repositories.bzl | 1 + + 2 files changed, 26 insertions(+) + create mode 100644 bazel/boringssl-gcc14.patch + +diff --git a/bazel/boringssl-gcc14.patch b/bazel/boringssl-gcc14.patch +new file mode 100644 +index 0000000000000000000000000000000000000000..8dcad4cc11f691eec93efa29075c1d356732e58b +--- /dev/null ++++ b/bazel/boringssl-gcc14.patch +@@ -0,0 +1,25 @@ ++diff --git a/crypto/internal.h b/crypto/internal.h ++index a77102d..a45f97b 100644 ++--- a/crypto/internal.h +++++ b/crypto/internal.h ++@@ -1174,6 +1174,11 @@ ++ ++ // Arithmetic functions. ++ +++// The most efficient versions of these functions on GCC and Clang depend on C11 +++// |_Generic|. If we ever need to call these from C++, we'll need to add a +++// variant that uses C++ overloads instead. +++#if !defined(__cplusplus) +++ ++ // CRYPTO_addc_* returns |x + y + carry|, and sets |*out_carry| to the carry ++ // bit. |carry| must be zero or one. ++ #if OPENSSL_HAS_BUILTIN(__builtin_addc) ++@@ -1275,6 +1280,8 @@ ++ #define CRYPTO_subc_w CRYPTO_subc_u32 ++ #endif ++ +++#endif // !__cplusplus +++ ++ ++ // FIPS functions. ++ +diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl +index 5cb573770f0aeac7b42d803673c8c520b5e35131..e864ef24db4bf837ef50d90c8eca316eba939d74 100644 +--- a/bazel/repositories.bzl ++++ b/bazel/repositories.bzl +@@ -264,6 +264,7 @@ def _boringssl(): + patch_args = ["-p1"], + patches = [ + "@envoy//bazel:boringssl_static.patch", ++ "@envoy//bazel:boringssl-gcc14.patch", + ], + ) + diff --git a/pkgs/by-name/en/envoy/0005-deps-Bump-rules_rust-0.54.1-37056.patch b/pkgs/by-name/en/envoy/0005-deps-Bump-rules_rust-0.54.1-37056.patch new file mode 100644 index 000000000000..5537128a4582 --- /dev/null +++ b/pkgs/by-name/en/envoy/0005-deps-Bump-rules_rust-0.54.1-37056.patch @@ -0,0 +1,128 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "dependency-envoy[bot]" + <148525496+dependency-envoy[bot]@users.noreply.github.com> +Date: Fri, 8 Nov 2024 21:09:22 +0000 +Subject: [PATCH] deps: Bump `rules_rust` -> 0.54.1 (#37056) + +Fix #37054 + +Signed-off-by: dependency-envoy[bot] <148525496+dependency-envoy[bot]@users.noreply.github.com> +Signed-off-by: Ryan Northey +--- + bazel/repository_locations.bzl | 10 ++++++--- + .../dynamic_modules/sdk/rust/Cargo.Bazel.lock | 21 +++++++++++-------- + 2 files changed, 19 insertions(+), 12 deletions(-) + +diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl +index 85a125d44ece6c655f94aab3d986d96ab837897f..cfe7d145b59b691f6455b58b1baaae48276b7e9f 100644 +--- a/bazel/repository_locations.bzl ++++ b/bazel/repository_locations.bzl +@@ -1465,12 +1465,16 @@ REPOSITORY_LOCATIONS_SPEC = dict( + license = "Emscripten SDK", + license_url = "https://github.com/emscripten-core/emsdk/blob/{version}/LICENSE", + ), ++ # After updating you may need to run: ++ # ++ # CARGO_BAZEL_REPIN=1 bazel sync --only=crate_index ++ # + rules_rust = dict( + project_name = "Bazel rust rules", + project_desc = "Bazel rust rules (used by Wasm)", + project_url = "https://github.com/bazelbuild/rules_rust", +- version = "0.51.0", +- sha256 = "042acfb73469b2d1848fe148d81c3422c61ea47a9e1900f1c9ec36f51e8e7193", ++ version = "0.54.1", ++ sha256 = "af4f56caae50a99a68bfce39b141b509dd68548c8204b98ab7a1cafc94d5bb02", + # Note: rules_rust should point to the releases, not archive to avoid the hassle of bootstrapping in crate_universe. + # This is described in https://bazelbuild.github.io/rules_rust/crate_universe.html#setup, otherwise bootstrap + # is required which in turn requires a system CC toolchains, not the bazel controlled ones. +@@ -1482,7 +1486,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( + ], + implied_untracked_deps = ["rules_cc"], + extensions = ["envoy.wasm.runtime.wasmtime"], +- release_date = "2024-09-19", ++ release_date = "2024-11-07", + cpe = "N/A", + license = "Apache-2.0", + license_url = "https://github.com/bazelbuild/rules_rust/blob/{version}/LICENSE.txt", +diff --git a/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock b/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock +index fa6012f406464428b37d548eecd6cec3fdaf901b..6af752304b65af39aa621fa201a8c0108931dad0 100644 +--- a/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock ++++ b/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock +@@ -1,5 +1,5 @@ + { +- "checksum": "96b309ddded40cf6f46a62829d15a02d7253b4cc94af2ac1890e492f9c07e93f", ++ "checksum": "b550022ca979d6b55c6dbee950bbf18368e4b8da16973c4e88e292b4d6f28e81", + "crates": { + "aho-corasick 1.1.3": { + "name": "aho-corasick", +@@ -2149,9 +2149,6 @@ + "aarch64-apple-ios-sim": [ + "aarch64-apple-ios-sim" + ], +- "aarch64-fuchsia": [ +- "aarch64-fuchsia" +- ], + "aarch64-linux-android": [ + "aarch64-linux-android" + ], +@@ -2159,6 +2156,9 @@ + "aarch64-pc-windows-msvc": [ + "aarch64-pc-windows-msvc" + ], ++ "aarch64-unknown-fuchsia": [ ++ "aarch64-unknown-fuchsia" ++ ], + "aarch64-unknown-linux-gnu": [ + "aarch64-unknown-linux-gnu" + ], +@@ -2197,8 +2197,8 @@ + "aarch64-apple-darwin", + "aarch64-apple-ios", + "aarch64-apple-ios-sim", +- "aarch64-fuchsia", + "aarch64-linux-android", ++ "aarch64-unknown-fuchsia", + "aarch64-unknown-linux-gnu", + "aarch64-unknown-nixos-gnu", + "aarch64-unknown-nto-qnx710", +@@ -2213,9 +2213,9 @@ + "s390x-unknown-linux-gnu", + "x86_64-apple-darwin", + "x86_64-apple-ios", +- "x86_64-fuchsia", + "x86_64-linux-android", + "x86_64-unknown-freebsd", ++ "x86_64-unknown-fuchsia", + "x86_64-unknown-linux-gnu", + "x86_64-unknown-nixos-gnu" + ], +@@ -2264,15 +2264,15 @@ + "wasm32-wasi": [ + "wasm32-wasi" + ], ++ "wasm32-wasip1": [ ++ "wasm32-wasip1" ++ ], + "x86_64-apple-darwin": [ + "x86_64-apple-darwin" + ], + "x86_64-apple-ios": [ + "x86_64-apple-ios" + ], +- "x86_64-fuchsia": [ +- "x86_64-fuchsia" +- ], + "x86_64-linux-android": [ + "x86_64-linux-android" + ], +@@ -2283,6 +2283,9 @@ + "x86_64-unknown-freebsd": [ + "x86_64-unknown-freebsd" + ], ++ "x86_64-unknown-fuchsia": [ ++ "x86_64-unknown-fuchsia" ++ ], + "x86_64-unknown-linux-gnu": [ + "x86_64-unknown-linux-gnu" + ], diff --git a/pkgs/by-name/en/envoy/0006-gcc-warnings.patch b/pkgs/by-name/en/envoy/0006-gcc-warnings.patch new file mode 100644 index 000000000000..a0c7dd94a263 --- /dev/null +++ b/pkgs/by-name/en/envoy/0006-gcc-warnings.patch @@ -0,0 +1,127 @@ +From 448e4e14f4f188687580362a861ae4a0dbb5b1fb Mon Sep 17 00:00:00 2001 +From: "Krinkin, Mike" +Date: Sat, 16 Nov 2024 00:40:40 +0000 +Subject: [PATCH] [contrib] Disable GCC warnings and broken features (#37131) + +Currently contrib does not build with GCC because of various false +positive compiler warnings turned to errors and a GCC compiler bug. + +Let's first start with the bug, in GCC apparently +using -gsplit-dwarf (debug fission) and -fdebug-types-section (used to +optimize the size of debug inforamtion), when used together, can result +in a linker failure. + +Refer to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110885 for the GCC +bug report of this issue. When it comes to Envoy, optimized builds with +GCC are affected on at least GCC 11 (used by --config=docker-gcc) and +GCC 12 (and I'm pretty sure the bug isn't fixed in any newer versions +either, though I didn't check each version). + +Given that we cannot have both debug fission and a debug types section, +we decided to abandon the debug types sections and keep the fission. + +That being said, apparently both of those options are unmaintained in +GCC which poses a question of long term viability of using those or GCC. + +Other changes in this commit disable GCC compiler errors for various +warnings that happen when building contrib. I checked those warnings and +didn't find any true +positive. + +And additionally, for warnings that exists in both Clang and GCC, Clang +warnings don't trigger, so Clang also disagrees with GCC here. + +Additionally missing-requires warning is new and does not exist in GCC +11, but exists in later versions of GCC, so to avoid breaking on this +warning for future versions of GCC I disabled it, but also tell GCC to +not complain if it sees a flag related to an unknwon diagnostic. + +This is the last change required to make GCC contrib builds work (you +can find more context and discussions in +https://github.com/envoyproxy/envoy/issues/31807) + +Risk Level: Low +Testing: building with --config=gcc and --config=docker-gcc +Docs Changes: N/A +Release Notes: N/A +Platform Specific Features: N/A +Fixes #31807 + +Signed-off-by: Mikhail Krinkin +--- + .bazelrc | 18 +++++++++++++++++- + bazel/envoy_internal.bzl | 16 +++++++++++++++- + 2 files changed, 32 insertions(+), 2 deletions(-) + +diff --git a/.bazelrc b/.bazelrc +index e0e4899cecf1..7df94c77944c 100644 +--- a/.bazelrc ++++ b/.bazelrc +@@ -57,9 +57,9 @@ test --experimental_ui_max_stdouterr_bytes=11712829 #default 1048576 + # Allow tags to influence execution requirements + common --experimental_allow_tags_propagation + ++build:linux --copt=-fdebug-types-section + # Enable position independent code (this is the default on macOS and Windows) + # (Workaround for https://github.com/bazelbuild/rules_foreign_cc/issues/421) +-build:linux --copt=-fdebug-types-section + build:linux --copt=-fPIC + build:linux --copt=-Wno-deprecated-declarations + build:linux --cxxopt=-std=c++20 --host_cxxopt=-std=c++20 +@@ -95,6 +95,21 @@ build:gcc --linkopt=-fuse-ld=gold --host_linkopt=-fuse-ld=gold + build:gcc --test_env=HEAPCHECK= + build:gcc --action_env=BAZEL_COMPILER=gcc + build:gcc --action_env=CC=gcc --action_env=CXX=g++ ++# This is to work around a bug in GCC that makes debug-types-section ++# option not play well with fission: ++# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110885 ++build:gcc --copt=-fno-debug-types-section ++# These trigger errors in multiple places both in Envoy dependecies ++# and in Envoy code itself when using GCC. ++# And in all cases the reports appear to be clear false positives. ++build:gcc --copt=-Wno-error=restrict ++build:gcc --copt=-Wno-error=uninitialized ++build:gcc --cxxopt=-Wno-missing-requires ++# We need this because -Wno-missing-requires options is rather new ++# in GCC, so flags -Wno-missing-requires exists in GCC 12, but does ++# not in GCC 11 and GCC 11 is what is used in docker-gcc ++# configuration currently ++build:gcc --cxxopt=-Wno-unknown-warning + + # Clang-tidy + # TODO(phlax): enable this, its throwing some errors as well as finding more issues +@@ -375,6 +390,7 @@ build:docker-clang-libc++ --config=docker-sandbox + build:docker-clang-libc++ --config=rbe-toolchain-clang-libc++ + + build:docker-gcc --config=docker-sandbox ++build:docker-gcc --config=gcc + build:docker-gcc --config=rbe-toolchain-gcc + + build:docker-asan --config=docker-sandbox +diff --git a/bazel/envoy_internal.bzl b/bazel/envoy_internal.bzl +index 015659851c1b..27ecaa0bbf47 100644 +--- a/bazel/envoy_internal.bzl ++++ b/bazel/envoy_internal.bzl +@@ -68,7 +68,21 @@ def envoy_copts(repository, test = False): + "-Wc++2a-extensions", + "-Wrange-loop-analysis", + ], +- repository + "//bazel:gcc_build": ["-Wno-maybe-uninitialized"], ++ repository + "//bazel:gcc_build": [ ++ "-Wno-maybe-uninitialized", ++ # GCC implementation of this warning is too noisy. ++ # ++ # It generates warnings even in cases where there is no ambiguity ++ # between the overloaded version of a method and the hidden version ++ # from the base class. E.g., when the two have different number of ++ # arguments or incompatible types and therefore a wrong function ++ # cannot be called by mistake without triggering a compiler error. ++ # ++ # As a safeguard, this warning is only disabled for GCC builds, so ++ # if Clang catches a problem in the code we would get a warning ++ # anyways. ++ "-Wno-error=overloaded-virtual", ++ ], + # Allow 'nodiscard' function results values to be discarded for test code only + # TODO(envoyproxy/windows-dev): Replace /Zc:preprocessor with /experimental:preprocessor + # for msvc versions between 15.8 through 16.4.x. see diff --git a/pkgs/by-name/en/envoy/0007-protobuf-remove-Werror.patch b/pkgs/by-name/en/envoy/0007-protobuf-remove-Werror.patch new file mode 100644 index 000000000000..196a499ec651 --- /dev/null +++ b/pkgs/by-name/en/envoy/0007-protobuf-remove-Werror.patch @@ -0,0 +1,19 @@ +diff -Naur a/bazel/protobuf.patch b/bazel/protobuf.patch +--- a/bazel/protobuf.patch 2025-01-06 23:00:26.683972526 +0100 ++++ b/bazel/protobuf.patch 2025-01-07 00:53:33.997482569 +0100 +@@ -149,3 +149,15 @@ + #if PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII + #define PROTOBUF_DEBUG true + #else ++diff -Naur a/build_defs/cpp_opts.bzl b/build_defs/cpp_opts.bzl ++--- a/build_defs/cpp_opts.bzl 2025-01-06 23:02:56.356552216 +0100 +++++ b/build_defs/cpp_opts.bzl 2025-01-07 00:23:30.534047300 +0100 ++@@ -22,7 +22,7 @@ ++ "-Woverloaded-virtual", ++ "-Wno-sign-compare", ++ "-Wno-nonnull", ++- "-Werror", +++ "-Wno-maybe-uninitialized", ++ ], ++ }) ++ diff --git a/pkgs/by-name/en/envoy/package.nix b/pkgs/by-name/en/envoy/package.nix index c2e5025e298b..823e2c180b41 100644 --- a/pkgs/by-name/en/envoy/package.nix +++ b/pkgs/by-name/en/envoy/package.nix @@ -4,6 +4,7 @@ bazel-gazelle, buildBazelPackage, fetchFromGitHub, + applyPatches, stdenv, cacert, cargo, @@ -29,32 +30,66 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.32.0"; - rev = "86dc7ef91ca15fb4957a74bd599397413fc26a24"; - hash = "sha256-Wcbt62RfaNcTntmPjaAM0cP3LJangm4ht7Q0bzEpu5A="; + version = "1.32.3"; + rev = "58bd599ebd5918d4d005de60954fcd2cb00abd95"; + hash = "sha256-5HpxcsAPoyVOJ3Aem+ZjSLa8Zu6s76iCMiWJbp8RjHc="; }; # these need to be updated for any changes to fetchAttrs depsHash = { - x86_64-linux = "sha256-LkDNPFT7UUCsGPG1dMnwzdIw0lzc5+3JYDoblF5oZVk="; - aarch64-linux = "sha256-DkibjmY1YND9Q2aQ41bhNdch0SKM5ghY2mjYSQfV30M="; + x86_64-linux = "sha256-YFXNatolLM9DdwkMnc9SWsa6Z6/aGzqLmo/zKE7OFy0="; + aarch64-linux = "sha256-AjG1OBjPjiSwWCmIJgHevSQHx8+rzRgmLsw3JwwD0hk="; } .${stdenv.system} or (throw "unsupported system ${stdenv.system}"); + in buildBazelPackage rec { pname = "envoy"; inherit (srcVer) version; bazel = bazel_6; - src = fetchFromGitHub { - owner = "envoyproxy"; - repo = "envoy"; - inherit (srcVer) hash rev; - postFetch = '' - chmod -R +w $out - rm $out/.bazelversion - echo ${srcVer.rev} > $out/SOURCE_VERSION + src = applyPatches { + src = fetchFromGitHub { + owner = "envoyproxy"; + repo = "envoy"; + inherit (srcVer) hash rev; + }; + patches = [ + # use system Python, not bazel-fetched binary Python + ./0001-nixpkgs-use-system-Python.patch + + # use system Go, not bazel-fetched binary Go + ./0002-nixpkgs-use-system-Go.patch + + # use system C/C++ tools + ./0003-nixpkgs-use-system-C-C-toolchains.patch + + # patch boringssl to work with GCC 14 + # vendored patch from https://boringssl.googlesource.com/boringssl/+/c70190368c7040c37c1d655f0690bcde2b109a0d + ./0004-nixpkgs-patch-boringssl-for-gcc14.patch + + # update rust rules to work with rustc v1.83 + # cherry-pick of https://github.com/envoyproxy/envoy/commit/019f589da2cc8da7673edd077478a100b4d99436 + # drop with v1.33.x + ./0005-deps-Bump-rules_rust-0.54.1-37056.patch + + # patch gcc flags to work with GCC 14 + # (silences erroneus -Werror=maybe-uninitialized and others) + # cherry-pick of https://github.com/envoyproxy/envoy/commit/448e4e14f4f188687580362a861ae4a0dbb5b1fb + # drop with v1.33.x + ./0006-gcc-warnings.patch + + # Remove "-Werror" from protobuf build + # This is fixed in protobuf v28 and later: + # https://github.com/protocolbuffers/protobuf/commit/f5a1b178ad52c3e64da40caceaa4ca9e51045cb4 + # drop with v1.33.x + ./0007-protobuf-remove-Werror.patch + ]; + postPatch = '' + chmod -R +w . + rm ./.bazelversion + echo ${srcVer.rev} > ./SOURCE_VERSION ''; }; @@ -80,17 +115,6 @@ buildBazelPackage rec { mv bazel/nix/rules_rust.patch bazel/rules_rust.patch ''; - patches = [ - # use system Python, not bazel-fetched binary Python - ./0001-nixpkgs-use-system-Python.patch - - # use system Go, not bazel-fetched binary Go - ./0002-nixpkgs-use-system-Go.patch - - # use system C/C++ tools - ./0003-nixpkgs-use-system-C-C-toolchains.patch - ]; - nativeBuildInputs = [ cmake python3 @@ -194,6 +218,8 @@ buildBazelPackage rec { "--noexperimental_strict_action_env" "--cxxopt=-Wno-error" "--linkopt=-Wl,-z,noexecstack" + "--config=gcc" + "--verbose_failures" # Force use of system Java. "--extra_toolchains=@local_jdk//:all" diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index a06f9fa607a9..90226370579b 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -16,16 +16,16 @@ }: let - version = "0.132.0"; + version = "0.132.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-9HF9Beu2nLUoRViFluEc4kqGah2NfN/K0hqTZ4Bmo5c="; + hash = "sha256-TrKPI+b9hlVPGUXmJ73QO2TfGoDip31KZ5RzgQC+BS4="; }; - vendorHash = "sha256-xxE/KBZvPBMd9cLE/uU74iyLaOYRd6m9HokTDi0FnRg="; + vendorHash = "sha256-jhYDk2BV1L6lrkOl6sSiYe79Q7vtC4Da/DzWzilCXRM="; commonMeta = with lib; { license = licenses.mit; diff --git a/pkgs/by-name/fa/faustPhysicalModeling/package.nix b/pkgs/by-name/fa/faustPhysicalModeling/package.nix index a4b3480d2cb8..4ffa2d799996 100644 --- a/pkgs/by-name/fa/faustPhysicalModeling/package.nix +++ b/pkgs/by-name/fa/faustPhysicalModeling/package.nix @@ -1,6 +1,7 @@ { stdenv, lib, + bash, fetchFromGitHub, faust2jaqt, faust2lv2, @@ -16,28 +17,45 @@ stdenv.mkDerivation rec { sha256 = "sha256-CADiJXyB4FivQjbh1nhpAVgCkTi1pW/vtXKXfL7o7xU="; }; - buildInputs = [ + nativeBuildInputs = [ faust2jaqt faust2lv2 ]; + buildInputs = [ + bash + ]; + + # ld: /nix/store/*-gcc-14-20241116/lib/gcc/x86_64-unknown-linux-gnu/14.2.1/crtbegin.o: + # relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a PIE object + hardeningDisable = [ "pie" ]; + dontWrapQtApps = true; buildPhase = '' + runHook preBuild + cd examples/physicalModeling for f in *MIDI.dsp; do faust2jaqt -time -vec -double -midi -nvoices 16 -t 99999 $f faust2lv2 -time -vec -double -gui -nvoices 16 -t 99999 $f done + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/lib/lv2 $out/bin mv *.lv2/ $out/lib/lv2 for f in $(find . -executable -type f); do cp $f $out/bin/ done + patchShebangs --host $out/bin + + runHook postInstall ''; meta = with lib; { @@ -46,5 +64,7 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ magnetophon ]; + # compiles stuff for the build platform, difficult to do properly + broken = stdenv.hostPlatform != stdenv.buildPlatform; }; } diff --git a/pkgs/by-name/fc/fcgi/package.nix b/pkgs/by-name/fc/fcgi/package.nix index 9096aa413c93..08e34c4b5914 100644 --- a/pkgs/by-name/fc/fcgi/package.nix +++ b/pkgs/by-name/fc/fcgi/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fcgi"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "FastCGI-Archives"; repo = "fcgi2"; rev = finalAttrs.version; - hash = "sha256-P8wkiURBc5gV0PxwemkIIpTPOpug6YIZE//3j5U76K0="; + hash = "sha256-GI2RL0djfCej7bBhxR6cK/FrTbDYEl75SEfQFgl0ctA="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index 7ca46e9e1cdb..6d88b0a87725 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.13.5"; + version = "3.13.6"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; tag = "v${version}"; - hash = "sha256-R6E5NWnrnezJsDm+Nnqgibv4e6mXVrOrKaCl/MBqUnY="; + hash = "sha256-I6AQtoGk/YUDM5DzegvLi8QmVvoma16zJGZ8BMUUN3c="; }; # relax dep constrains, keep environment constraints diff --git a/pkgs/by-name/fl/flip-link/package.nix b/pkgs/by-name/fl/flip-link/package.nix index e4db9c909712..e97969c57c2a 100644 --- a/pkgs/by-name/fl/flip-link/package.nix +++ b/pkgs/by-name/fl/flip-link/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "flip-link"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "knurling-rs"; repo = pname; rev = "v${version}"; - hash = "sha256-slidPVL0LAUtmCI2rlAwfGVUmB4WRF9bHqQhdgbO2oc="; + hash = "sha256-Nw43I8EIlNGPptsLVxFBapFp6qdFoUOEicHc9FTcm2g="; }; - cargoHash = "sha256-x3JnqztoLol5dNMact/qMveQuvcMTg/jqHxW0lksB7Y="; + cargoHash = "sha256-OxmRIJ2LtAz+Paxzy1ppxnLliMocKbiJXf/io8mGPNQ="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/fl/flirt/package.nix b/pkgs/by-name/fl/flirt/package.nix index b4a2b7245b5e..2169efd63c7d 100644 --- a/pkgs/by-name/fl/flirt/package.nix +++ b/pkgs/by-name/fl/flirt/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "flirt"; - version = "0.2.1"; + version = "0.3"; src = fetchFromSourcehut { owner = "~hadronized"; repo = "flirt"; rev = "v${version}"; - hash = "sha256-LCwSETvXHAUbe4QIeGpT7vVbuZl1SDfIehVG8svkmHM="; + hash = "sha256-xhNo85xwcVI4qliHU4/uNEvS7rW5avKOv8fMfRrvqD0="; }; - cargoHash = "sha256-EquriyhfbYyi87TP3zuLiCXDV7baDRaTRuZd7Yht/UA="; + cargoHash = "sha256-9DmTSx1sKINnvJv3px8UKaa5j8AUnJiYB1lwnBR+xn8="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gi/git-aggregator/package.nix b/pkgs/by-name/gi/git-aggregator/package.nix index 5c95e7debed4..c74d926bde18 100644 --- a/pkgs/by-name/gi/git-aggregator/package.nix +++ b/pkgs/by-name/gi/git-aggregator/package.nix @@ -1,17 +1,19 @@ { lib, python3Packages, - fetchPypi, + fetchFromGitHub, git, }: python3Packages.buildPythonApplication rec { pname = "git-aggregator"; - version = "2.1.0"; + version = "4.0.2"; - src = fetchPypi { - inherit pname version; - hash = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw="; + src = fetchFromGitHub { + owner = "acsone"; + repo = "git-aggregator"; + tag = version; + hash = "sha256-6o+bf3s5KyRQWA7hp3xk76AfxBdzP0lOBOozgwe3Wtw="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index 2e2fcc03974b..a45fc205e6e2 100644 --- a/pkgs/by-name/gi/git-spice/package.nix +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -10,16 +10,16 @@ buildGo123Module rec { pname = "git-spice"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; tag = "v${version}"; - hash = "sha256-Q5cNkX6ZtNXh+qDjpR0a2FfHmk5YA9izLCBRPFRpdvs="; + hash = "sha256-1EWuKjvDeOV6W+nntdevUI/SO68ssYgoxJ5QIy5jkFM="; }; - vendorHash = "sha256-4NkeLDToefiRYv9xta3U6O/5L2/J0d+59Er515R2zcw="; + vendorHash = "sha256-F9CyhUtdkwvEsmQ+T5zt2n+TBRhVgyr2CEOvIzcXpug="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index 98ff2f100368..f0926ddfe4ee 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (final: { pname = "glaze"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; rev = "v${final.version}"; - hash = "sha256-P6hrwSpeQXHhag7HV28EVXsEwd2ZJEad3GRclCiOz8w="; + hash = "sha256-exEmEV4j18WGnnEFPaHlfFuLk0dPu18pYp85XBX8Y2w="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/gn/gnome-robots/package.nix b/pkgs/by-name/gn/gnome-robots/package.nix index dfe37b8dff4c..72b8725d3da6 100644 --- a/pkgs/by-name/gn/gnome-robots/package.nix +++ b/pkgs/by-name/gn/gnome-robots/package.nix @@ -1,73 +1,116 @@ { lib, stdenv, + cargo, + desktop-file-utils, fetchurl, - pkg-config, + glib, gnome, - gtk3, - wrapGAppsHook3, - librsvg, - gsound, - gettext, + gtk4, itstool, + libadwaita, + librsvg, libxml2, - libgnome-games-support, - libgee, + gst_all_1, meson, ninja, - vala, - python3, - desktop-file-utils, - adwaita-icon-theme, + pkg-config, + rustc, + rustPlatform, + wrapGAppsHook4, + _experimental-update-script-combinators, + common-updater-scripts, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-robots"; - version = "40.0"; + version = "41.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/gnome-robots-${version}.tar.xz"; - hash = "sha256-b78viFdQ8aURCnJPjzWt3ZvGEYTuMc8MDLiZU+T0yxE="; + url = "mirror://gnome/sources/gnome-robots/${lib.versions.major finalAttrs.version}/gnome-robots-${finalAttrs.version}.tar.xz"; + hash = "sha256-K4BQcFrIPpOL56iREyYB62XHk/IJzX6RDGzWQphzBHg="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + name = "gnome-robots-${finalAttrs.version}"; + hash = "sha256-rn/rs0D2qKDYf8oxpegQalPQIVuT8rSrHTzeZqWGn44="; }; nativeBuildInputs = [ pkg-config meson ninja - vala - python3 - libxml2 - wrapGAppsHook3 - gettext + cargo + rustc + rustPlatform.cargoSetupHook + gtk4 # for gtk4-update-icon-cache + wrapGAppsHook4 itstool desktop-file-utils ]; buildInputs = [ - gtk3 + glib + gtk4 + libadwaita librsvg - gsound - libgnome-games-support - libgee - adwaita-icon-theme + libxml2 + # Sound playback, not checked at build time. + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good ]; postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py + # https://gitlab.gnome.org/GNOME/gnome-robots/-/merge_requests/38 + substituteInPlace data/icons/meson.build \ + --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' + ''; + + preFixup = '' + # Seal GStreamer plug-ins so that we can notice when they are missing. + gappsWrapperArgs+=(--set "GST_PLUGIN_SYSTEM_PATH_1_0" "$GST_PLUGIN_SYSTEM_PATH_1_0") + unset GST_PLUGIN_SYSTEM_PATH_1_0 ''; passthru = { - updateScript = gnome.updateScript { packageName = "gnome-robots"; }; + updateScript = + let + updateSource = gnome.updateScript { + packageName = "gnome-robots"; + }; + + updateLockfile = { + command = [ + "sh" + "-c" + '' + PATH=${ + lib.makeBinPath [ + common-updater-scripts + ] + } + update-source-version gnome-robots --ignore-same-version --source-key=cargoDeps > /dev/null + '' + ]; + # Experimental feature: do not copy! + supportedFeatures = [ "silent" ]; + }; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateLockfile + ]; }; meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-robots"; - changelog = "https://gitlab.gnome.org/GNOME/gnome-robots/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-robots/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Avoid the robots and make them crash into each other"; mainProgram = "gnome-robots"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gn/gnucobol/fix-libxml2-include.patch b/pkgs/by-name/gn/gnucobol/fix-libxml2-include.patch new file mode 100644 index 000000000000..5e43ddc96961 --- /dev/null +++ b/pkgs/by-name/gn/gnucobol/fix-libxml2-include.patch @@ -0,0 +1,16 @@ +libcob: Fix include for xmlCleanupParser + +common.c uses xmlCleanupParser, which is defined in libxml/parser.h. +--- + +--- a/libcob/common.c 2025-01-01 03:03:49.762316279 +0100 ++++ b/libcob/common.c 2025-01-01 03:01:56.632597306 +0100 +@@ -136,6 +136,7 @@ + #if defined (WITH_XML2) + #include + #include ++#include + #endif + + #if defined (WITH_CJSON) + diff --git a/pkgs/by-name/gn/gnucobol/package.nix b/pkgs/by-name/gn/gnucobol/package.nix index 75341f91bbb9..ef165c8e45f7 100644 --- a/pkgs/by-name/gn/gnucobol/package.nix +++ b/pkgs/by-name/gn/gnucobol/package.nix @@ -63,6 +63,10 @@ stdenv.mkDerivation (finalAttrs: { # XXX: Without this, we get a cycle between bin and dev propagatedBuildOutputs = [ ]; + patches = [ + ./fix-libxml2-include.patch + ]; + # Skips a broken test postPatch = '' sed -i '/^AT_CHECK.*crud\.cob/i AT_SKIP_IF([true])' tests/testsuite.src/listings.at diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix index ea494cf1b8e9..d297854794eb 100644 --- a/pkgs/by-name/go/go-ios/package.nix +++ b/pkgs/by-name/go/go-ios/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "go-ios"; - version = "1.0.166"; + version = "1.0.168"; src = fetchFromGitHub { owner = "danielpaulus"; repo = "go-ios"; rev = "v${version}"; - sha256 = "sha256-Lao7cK7ZWeU0WXa9qDHlc+NuE9Ktl7k3mJXxIIfbROk="; + sha256 = "sha256-BaJFFaNPPpPvDc8bMl89SfGYglvx9TwpoDQUEr0mqYM="; }; proxyVendor = true; diff --git a/pkgs/by-name/go/go-mockery/package.nix b/pkgs/by-name/go/go-mockery/package.nix index 39d5656960d7..53927a778e06 100644 --- a/pkgs/by-name/go/go-mockery/package.nix +++ b/pkgs/by-name/go/go-mockery/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.50.1"; + version = "2.50.4"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-WRzrWyBkngTlAh8Nu1dKht28A5R7mV/8pljtwh6SZQU="; + sha256 = "sha256-pJUMdCnvgfm/re442QhuQs4UCdPicitLu1NTS+I61IY="; }; preCheck = '' diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index 66738bfc88b2..94e31f5b3ca3 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.63.1"; + version = "1.63.4"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-Q7SwLm+rnwyjlXf8iArUQWYC0DyjFZI9HIWJsgNplyw="; + hash = "sha256-7nIo6Nuz8KLuQlT7btjnTRFpOl+KVd30v973HRKzh08="; }; - vendorHash = "sha256-Rsg/bVbMsA2dUz0GjAdzifBTpDDVrFYY+ptyB5m3AgM="; + vendorHash = "sha256-atr4HMxoPEfGeaNlHqwTEAcvgbSyzgCe262VUg3J86c="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/by-name/go/gom/package.nix b/pkgs/by-name/go/gom/package.nix index 7d902ec5ee24..11b7745baf60 100644 --- a/pkgs/by-name/go/gom/package.nix +++ b/pkgs/by-name/go/gom/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "gom"; - version = "0.4"; + version = "0.5.3"; outputs = [ "out" @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17ca07hpg7dqxjn0jpqim3xqcmplk2a87wbwrrlq3dd3m8381l38"; + url = "mirror://gnome/sources/gom/${lib.versions.majorMinor version}/gom-${version}.tar.xz"; + sha256 = "Bp0JCfvca00n7feoeTZhlOOrUIsDVIv1uJ/2NUbSAXc="; }; patches = [ @@ -54,8 +54,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; + packageName = "gom"; }; }; diff --git a/pkgs/by-name/gq/gql/package.nix b/pkgs/by-name/gq/gql/package.nix index 55303842e370..df4da88f86bc 100644 --- a/pkgs/by-name/gq/gql/package.nix +++ b/pkgs/by-name/gq/gql/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.33.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-I0ggNHvswuRhcUkndl0acEU3eOHGJqHB2csm9rXZ2sU="; + hash = "sha256-3aIZZvOmmGOa1+QHz7VrhLeEcyHSbsUMdD3PAqPpXVY="; }; - cargoHash = "sha256-yOf5kKHiPMvKi/+j6SCBZD1+gUBK4oR+H1JICPThwBA="; + cargoHash = "sha256-IHh+7BdIZZOUyjJPHpuoUDfZDHUYoVQaMYjq1CCoxfM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gx/gxml/package.nix b/pkgs/by-name/gx/gxml/package.nix index dc9a8b2f53b9..771c4f6039ea 100644 --- a/pkgs/by-name/gx/gxml/package.nix +++ b/pkgs/by-name/gx/gxml/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gxml"; - version = "0.20.3"; + version = "0.20.4"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "gxml"; rev = finalAttrs.version; - hash = "sha256-GlctGxsLyQ2kPV3oBmusRiouG4PPncBTh3vgxhVaQOo="; + hash = "sha256-/gaWuUytBsvAsC95ee6MtTW6g3ltGbkD+JWqrAjJLDc="; }; nativeBuildInputs = [ @@ -47,8 +47,11 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # https://gitlab.gnome.org/GNOME/gxml/-/merge_requests/24 + # https://gitlab.gnome.org/GNOME/gxml/-/merge_requests/28 substituteInPlace gxml/gxml.pc.in \ - --replace-fail "includedir=@prefix@/include" "includedir=${placeholder "dev"}/include" + --replace-fail "includedir=@prefix@/include" "includedir=${placeholder "dev"}/include" \ + --replace-fail ">=2" ">= 2" \ + --replace-fail ">=0" ">= 0" ''; doCheck = true; diff --git a/pkgs/by-name/ho/howard-hinnant-date/make-zoneinfo-available.diff b/pkgs/by-name/ho/howard-hinnant-date/make-zoneinfo-available.diff index f9e69ff38cbb..e9a0f006a6e8 100644 --- a/pkgs/by-name/ho/howard-hinnant-date/make-zoneinfo-available.diff +++ b/pkgs/by-name/ho/howard-hinnant-date/make-zoneinfo-available.diff @@ -1,11 +1,9 @@ -diff --git a/src/tz.cpp b/src/tz.cpp -index 68436c3..2bfe19e 100644 --- a/src/tz.cpp +++ b/src/tz.cpp -@@ -349,7 +349,7 @@ discover_tz_dir() - struct stat sb; - using namespace std; - # ifndef __APPLE__ +@@ -498,7 +498,7 @@ discover_tz_dir() + else + throw runtime_error("discover_tz_dir failed to find zoneinfo\n"); + # elif !defined(__APPLE__) - CONSTDATA auto tz_dir_default = "/usr/share/zoneinfo"; + CONSTDATA auto tz_dir_default = "@tzdata@/share/zoneinfo"; CONSTDATA auto tz_dir_buildroot = "/usr/share/zoneinfo/uclibc"; diff --git a/pkgs/by-name/ho/howard-hinnant-date/package.nix b/pkgs/by-name/ho/howard-hinnant-date/package.nix index 3f7210df56f7..0387bad95e0e 100644 --- a/pkgs/by-name/ho/howard-hinnant-date/package.nix +++ b/pkgs/by-name/ho/howard-hinnant-date/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "howard-hinnant-date"; - version = "3.0.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "HowardHinnant"; repo = "date"; rev = "v${version}"; - sha256 = "1qk7pgnk0bpinja28104qha6f7r1xwh5dy3gra7vjkqwl0jdwa35"; + hash = "sha256-qfrmH3NRyrDVmHRmmWzM5Zz37E7RFXJqaV1Rq2E59qs="; }; patches = [ @@ -19,13 +19,6 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/community/date/538-output-date-pc-for-pkg-config.patch?id=11f6b4d4206b0648182e7b41cd57dcc9ccea0728"; sha256 = "1ma0586jsd89jgwbmd2qlvlc8pshs1pc4zk5drgxi3qvp8ai1154"; }) - # Fix CMake include directory path. - # https://github.com/HowardHinnant/date/pull/753 - (fetchpatch { - name = "fix-cmake-include-dir.patch"; - url = "https://github.com/HowardHinnant/date/commit/8061b53c489b0c8676feedcb65049b27664327b5.patch"; - hash = "sha256-weZUgu0SDad7EK7msUbVzk1zY4euI0Biafj/5jD4JV4="; - }) # Without this patch, this library will drop a `tzdata` directory into # `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it # searches for `zoneinfo` be the one from the `tzdata` package. @@ -33,13 +26,6 @@ stdenv.mkDerivation rec { src = ./make-zoneinfo-available.diff; inherit tzdata; }) - # The reported version to cmake's find_package() is 3.0.0, but the actual - # version is 3.0.1. This patch fixes that. - (fetchpatch { - name = "fix-cmake-version.patch"; - url = "https://github.com/HowardHinnant/date/commit/2e19c006e2218447ee31f864191859517603f59f.patch"; - hash = "sha256-SRAWrwv64ap3Qh3RlhwqgS0L2YsrjqVSgw6iH3KlWvk="; - }) ]; # Tweaks to fix undefined variable substitutions diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 4c4be18f2f4b..0bdbc37ba1d5 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.140.1"; + version = "0.140.2"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${version}"; - hash = "sha256-9H7hXBz/rKJZr/XvqFRmOQylf6sfJtkwik3jh/k+Vec="; + hash = "sha256-4W/iUJHVsmCrIR5z0qSQ/Fsa4qtiuSie6/cot6oYQNM="; }; - vendorHash = "sha256-swcj1JxYoRqKscu/IC0uiAATp4AXN0aANWkSq/mJsyc="; + vendorHash = "sha256-gyXvxg1pKf0MYbwf2FTUnDLSBf0Bcb4uNZ5rDq/2QGY="; checkFlags = let diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index b35d874fea04..6e11e1c0d7ea 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -3,12 +3,18 @@ fetchFromGitHub, python3Packages, pciutils, + installShellFiles, }: python3Packages.buildPythonApplication rec { pname = "hyfetch"; version = "1.99.0"; pyproject = true; + outputs = [ + "out" + "man" + ]; + src = fetchFromGitHub { owner = "hykilpikonna"; repo = "hyfetch"; @@ -24,6 +30,10 @@ python3Packages.buildPythonApplication rec { python3Packages.typing-extensions ]; + nativeBuildInputs = [ + installShellFiles + ]; + # No test available doCheck = false; @@ -31,6 +41,15 @@ python3Packages.buildPythonApplication rec { "hyfetch" ]; + # NOTE: The HyFetch project maintains an updated version of neofetch renamed + # to "neowofetch" which is included in this package. However, the man page + # included is still named "neofetch", so to prevent conflicts and confusion + # we rename the file to "neowofetch" before installing it: + postInstall = '' + mv ./docs/neofetch.1 ./docs/neowofetch.1 + installManPage ./docs/hyfetch.1 ./docs/neowofetch.1 + ''; + postFixup = '' wrapProgram $out/bin/neowofetch \ --prefix PATH : ${lib.makeBinPath [ pciutils ]} @@ -53,6 +72,7 @@ python3Packages.buildPythonApplication rec { maintainers = with lib.maintainers; [ yisuidenghua isabelroses + nullcube ]; }; } diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index f1eca052c99a..5638815b133f 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -72,8 +72,8 @@ python3Packages.buildPythonApplication rec { preBuild = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==69.0.2" "setuptools" \ - --replace-fail "wheel==0.42.0" "wheel" + --replace-fail "setuptools==75.6.0" "setuptools" \ + --replace-fail "wheel==0.45.1" "wheel" substituteInPlace src/foundation/__init__.py \ --replace-fail "0.0.1" "${version}" diff --git a/pkgs/by-name/ji/jitsi-meet-electron/package.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix index 7229a0fb1515..956e97365bcc 100644 --- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix +++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix @@ -91,6 +91,8 @@ buildNpmPackage rec { -c.electronVersion=${electron.version} ''; + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ku/kubectl-linstor/package.nix b/pkgs/by-name/ku/kubectl-linstor/package.nix new file mode 100644 index 000000000000..1972af6b1af6 --- /dev/null +++ b/pkgs/by-name/ku/kubectl-linstor/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + nix-update-script, +}: + +buildGoModule rec { + pname = "kubectl-linstor"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "piraeusdatastore"; + repo = "kubectl-linstor"; + tag = "v${version}"; + hash = "sha256-1wXhrnQlOIg2mJi6DhHGcb+OxSblDq+V95pZ5bl72R4="; + }; + + vendorHash = "sha256-3PnXB8AfZtgmYEPJuh0fwvG38dtngoS/lxyx3H+rvFs="; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Plugin to control a LINSTOR cluster using kubectl"; + homepage = "https://github.com/piraeusdatastore/kubectl-linstor"; + changelog = "https://github.com/piraeusdatastore/kubectl-linstor/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "kubectl-linstor"; + }; +} diff --git a/pkgs/by-name/ku/kubelogin-oidc/package.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix index a5fde3f9f365..b8c600bade79 100644 --- a/pkgs/by-name/ku/kubelogin-oidc/package.nix +++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubelogin"; - version = "1.31.0"; + version = "1.31.1"; src = fetchFromGitHub { owner = "int128"; repo = "kubelogin"; rev = "v${version}"; - hash = "sha256-IEKP5mHxJyGzlxNL4h0MR/Ge7g1kKidIjinYr+bL6as="; + hash = "sha256-LfMxfXM3L4r0S8eDQVgFO1jTf/BcYpxxQSMl4zRh/yA="; }; subPackages = [ "." ]; @@ -22,7 +22,7 @@ buildGoModule rec { "-X main.version=v${version}" ]; - vendorHash = "sha256-3hNc16zpazm9YqDx2M/RafCBLev2S8TzJzClGRkKydg="; + vendorHash = "sha256-o+74+PnwhMe2oMfFLMD95R4m3gMjQS2d4pAvCEjh05U="; # test all packages preCheck = '' diff --git a/pkgs/by-name/ld/ldapvi/package.nix b/pkgs/by-name/ld/ldapvi/package.nix index f7a5cf400f6e..794eb6ef4819 100644 --- a/pkgs/by-name/ld/ldapvi/package.nix +++ b/pkgs/by-name/ld/ldapvi/package.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation { sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030"; }; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-implicit-function-declaration" + "-Wno-error=int-conversion" + "-Wno-error=return-mismatch" + ]; + nativeBuildInputs = [ pkg-config autoconf diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix index 7d5e7ef838bf..6ad44fd0144f 100644 --- a/pkgs/by-name/le/lean4/package.nix +++ b/pkgs/by-name/le/lean4/package.nix @@ -5,19 +5,21 @@ fetchFromGitHub, git, gmp, + cadical, + libuv, perl, testers, }: stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.11.0"; + version = "4.12.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${finalAttrs.version}"; - hash = "sha256-5KIZGt4glC2rZDKDL0FiHUNVjVZAyY8iWDWQgdF/PIs="; + hash = "sha256-O2Egyh2D0TfQWzQKfHUeAh7qAjMfeLVwXwGUw5QqcvE="; }; postPatch = '' @@ -35,10 +37,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + cadical ]; buildInputs = [ gmp + libuv ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/le/lesspipe/package.nix b/pkgs/by-name/le/lesspipe/package.nix index a9c135010efe..0fd06e2758de 100644 --- a/pkgs/by-name/le/lesspipe/package.nix +++ b/pkgs/by-name/le/lesspipe/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "lesspipe"; - version = "2.14"; + version = "2.17"; src = fetchFromGitHub { owner = "wofr06"; repo = "lesspipe"; rev = "v${version}"; - hash = "sha256-SEFyiKxfKC2Rx5tQ2OK8zEiCBFex2kZUY/vnnDsdCoc="; + hash = "sha256-afJuTByGUMU6kFqGGa3pbPaFVdYGcJYiR0RfDNYNgDk="; }; nativeBuildInputs = [ @@ -85,89 +85,84 @@ stdenv.mkDerivation rec { ]; fake = { # script guards usage behind has_cmd test function, it's safe to leave these external and optional - external = - [ - "cpio" - "isoinfo" - "cabextract" - "bsdtar" - "rpm2cpio" - "bsdtar" - "unzip" - "ar" - "unrar" - "rar" - "7zr" - "7za" - "isoinfo" - "gzip" - "bzip2" - "lzip" - "lzma" - "xz" - "brotli" - "compress" - "zstd" - "lz4" - "archive_color" - "bat" - "batcat" - "pygmentize" - "source-highlight" - "vimcolor" - "code2color" + external = [ + "cpio" + "isoinfo" + "cabextract" + "bsdtar" + "rpm2cpio" + "bsdtar" + "unzip" + "ar" + "unrar" + "rar" + "7zr" + "7za" + "isoinfo" + "gzip" + "bzip2" + "lzip" + "lzma" + "xz" + "brotli" + "compress" + "zstd" + "lz4" + "archive_color" + "bat" + "batcat" + "pygmentize" + "source-highlight" + "vimcolor" + "code2color" - "w3m" - "lynx" - "elinks" - "html2text" - "xmq" - "dtc" - "pdftotext" - "pdftohtml" - "pdfinfo" - "ps2ascii" - "procyon" - "ccze" - "mdcat" - "pandoc" - "docx2txt" - "libreoffice" - "pptx2md" - "mdcat" - "xlscat" - "odt2txt" - "wvText" - "catdoc" - "broken_catppt" - "sxw2txt" - "groff" - "mandoc" - "unrtf" - "dvi2tty" - "pod2text" - "perldoc" - "h5dump" - "ncdump" - "matdump" - "djvutxt" - "openssl" - "gpg" - "plistutil" - "plutil" - "id3v2" - "csvlook" - "csvtable" - "jq" - "zlib-flate" - "lessfilter" - "snap" - ] - ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) [ - # resholve only identifies this on darwin/bsd - # call site is guarded by || so it's safe to leave dynamic - "locale" - ]; + "w3m" + "lynx" + "elinks" + "html2text" + "xmq" + "dtc" + "pdftotext" + "pdftohtml" + "pdfinfo" + "ps2ascii" + "procyon" + "ccze" + "mdcat" + "pandoc" + "docx2txt" + "libreoffice" + "pptx2md" + "mdcat" + "xlscat" + "odt2txt" + "wvText" + "catdoc" + "broken_catppt" + "sxw2txt" + "groff" + "mandoc" + "unrtf" + "dvi2tty" + "pod2text" + "perldoc" + "h5dump" + "ncdump" + "matdump" + "djvutxt" + "openssl" + "gpg" + "plistutil" + "plutil" + "id3v2" + "csvlook" + "csvtable" + "jq" + "zlib-flate" + "lessfilter" + "snap" + "locale" # call site is guarded by || so it's safe to leave dynamic + ]; builtin = [ "setopt" ]; }; execer = [ diff --git a/pkgs/by-name/li/libmsquic/package.nix b/pkgs/by-name/li/libmsquic/package.nix new file mode 100644 index 000000000000..965df2d62ad0 --- /dev/null +++ b/pkgs/by-name/li/libmsquic/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + lttng-tools, + libatomic_ops, + perl, + coreutils, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libmsquic"; + version = "2.4.7"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "msquic"; + tag = "v${finalAttrs.version}"; + hash = "sha256-WveyZ9rMevLTc5C4cgMFcnj0O6Hd+HcfU8ccD6VBgyU="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + perl + ]; + + buildInputs = [ + lttng-tools + libatomic_ops + ]; + + postUnpack = '' + for f in "$(find . -type f -name "*.pl")"; do + patchShebangs --build $f 2>&1 > /dev/null + done + + for g in $(find . -type f -name "*" ); do + if test -f $g; then + sed -i "s|/usr/bin/env|${coreutils}/bin/env|g" $g + fi + done + ''; + + meta = { + description = "Cross-platform, C implementation of the IETF QUIC protocol, exposed to C, C++, C# and Rust"; + homepage = "https://github.com/microsoft/msquic"; + changelog = "https://github.com/microsoft/msquic/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ SohamG ]; + }; +}) diff --git a/pkgs/by-name/li/lime3ds/package.nix b/pkgs/by-name/li/lime3ds/package.nix index 9f62fc5e86b4..f927ff1c1283 100644 --- a/pkgs/by-name/li/lime3ds/package.nix +++ b/pkgs/by-name/li/lime3ds/package.nix @@ -7,6 +7,7 @@ cpp-jwt, doxygen, enet, + fetchpatch, fetchzip, fmt, ffmpeg_6-headless, @@ -112,6 +113,14 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals enableCubeb [ cubeb ] ++ optional useDiscordRichPresence rapidjson; + patches = [ + # Fix boost errors + (fetchpatch { + url = "https://raw.githubusercontent.com/Tatsh/tatsh-overlay/fa2f92b888f8c0aab70414ca560b823ffb33b122/games-emulation/lime3ds/files/lime3ds-0002-boost-fix.patch"; + hash = "sha256-XJogqvQE7I5lVHtvQja0woVlO40blhFOqnoYftIQwJs="; + }) + ]; + postPatch = '' # Fix file not found when looking in var/empty instead of opt mkdir externals/dynarmic/src/dynarmic/ir/var diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix index c861eb855584..72429925b7b8 100644 --- a/pkgs/by-name/lu/lua-language-server/package.nix +++ b/pkgs/by-name/lu/lua-language-server/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.13.4"; + version = "3.13.5"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; tag = finalAttrs.version; - hash = "sha256-keyJ1Vtt+QjBAgGSIx6WEWAowFKgBpCfZMgemt6Qh9M="; + hash = "sha256-t1kKRLrh5gVWIiVNEW2O3YAyECVzWc84Wp91Sc9fTrU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 4aff832dda89..8f286b23454b 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-tRLT/jR6e9fwmQWAZ1OwjAOMiLy7us9WjiGpS8NBOzHO7jJ4TofSRvvSwpohr9YsnLiLnqANdlWtuabRpQhLLw=="; + hash = "sha512-Gpm17h5U9Cw9r5EHE1wF5e0aza9yaGPUf+rhMVAhXjrVYBqiUsc/UG11TXWqarKlLpRmPDe+BvCF0qqTtTEZhw=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index ffe3f06d68a0..3af113acb926 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -2,22 +2,33 @@ lib, rustPlatform, fetchFromGitHub, + pkg-config, + openssl, testers, mago, }: rustPlatform.buildRustPackage rec { pname = "mago"; - version = "0.0.9"; + version = "0.0.18"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = version; - hash = "sha256-MeI2pya0K1W7tbEJU8VrT6b0wYlr9Q7MTi27+wHfJjg="; + hash = "sha256-QSb+5wlv8uFT2wTeJyfsz+vE4Kegqgi7Dqyl1KZU//U="; }; - cargoHash = "sha256-LcY04XkTQHpixPPPs86OVO1ehPrcdynKmScgfWEU24Q="; + cargoHash = "sha256-7ElDEhWZLFuqzZjeh7TdrLy1++bmdS7CLRwyOLzaJ18="; + + env = { + # Get openssl-sys to use pkg-config + OPENSSL_NO_VENDOR = 1; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/ma/marmite/package.nix b/pkgs/by-name/ma/marmite/package.nix new file mode 100644 index 000000000000..64d16f9e5224 --- /dev/null +++ b/pkgs/by-name/ma/marmite/package.nix @@ -0,0 +1,43 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + oniguruma, + stdenv, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "marmite"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "rochacbruno"; + repo = "marmite"; + tag = version; + hash = "sha256-AblitYe7YDUc2Tg2P7j+wnOjMAhDtieDsbq6B6x+uMs="; + }; + + cargoHash = "sha256-u8sJS9hvIao+af7IA4vE0eUSx0xmI1Kb5NXyZBrOCIw="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + oniguruma + ]; + + env = { + RUSTONIG_SYSTEM_LIBONIG = true; + }; + + meta = { + description = "Static Site Generator for Blogs"; + homepage = "https://github.com/rochacbruno/marmite"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ matthewcroughan ]; + mainProgram = "marmite"; + }; +} diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix index 7713aa87fb6d..e4853c99aa6a 100644 --- a/pkgs/by-name/me/melange/package.nix +++ b/pkgs/by-name/me/melange/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-DlFGB0uVAPUd9EqTWEQm1AKtUbTgm1z5ftENzPMkAz4="; + hash = "sha256-bFlILwA8Vy7u8pJFx8PHvfYaeh8M2SRzrTpdDMYz6+M="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix index 1f7df3303d83..6b5ad34ee504 100644 --- a/pkgs/by-name/mi/minio-warp/package.nix +++ b/pkgs/by-name/mi/minio-warp/package.nix @@ -3,20 +3,21 @@ fetchFromGitHub, buildGoModule, versionCheckHook, + nix-update-script, }: buildGoModule rec { pname = "minio-warp"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "minio"; repo = "warp"; rev = "v${version}"; - hash = "sha256-TqgF8WkWz+OZGSwrjIMFg4WaSdunOrcjuYDhWuPZTU8="; + hash = "sha256-kME4yafNZtHDF/EAIG8qR4PH6HlokIfdBAJH+ibl5ro="; }; - vendorHash = "sha256-i0npOEo+rplC+hU4yxGRpY8gX+VGjR7HwKbiv5mQ28M="; + vendorHash = "sha256-073ssCOh0CiiJaatwzhNrwpe2QO21iC6GSkwVtsmYjs="; # See .goreleaser.yml ldflags = [ @@ -37,6 +38,8 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "S3 benchmarking tool"; homepage = "https://github.com/minio/warp"; diff --git a/pkgs/by-name/mo/moar/package.nix b/pkgs/by-name/mo/moar/package.nix index f1aee260c750..150e81956eee 100644 --- a/pkgs/by-name/mo/moar/package.nix +++ b/pkgs/by-name/mo/moar/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.30.0"; + version = "1.31.0"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-fEJttsZt3pET1Xga8AYkLCX5aGkW23R2jGQvML3w+eo="; + hash = "sha256-0HDFK2wPQtwIAVup/pVSjrdt1zpbfLV08HxeVPWC8dE="; }; vendorHash = "sha256-J9u7LxzXk4npRyymmMKyN2ZTmhT4WwKjy0X5ITcHtoE="; diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index db9f45077bfa..bbffcba5c745 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.86"; + version = "10.87"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-kT44DHD1XcIcijQ2LM69kvDfTfxiNYTQS/JFn0kEHgY="; + hash = "sha256-IKOFJMt/9auQEQmRksoByS4UEkKorCurvnIxe8VsAI0="; stripRoot = false; }; diff --git a/pkgs/by-name/mr/mrpeach/package.nix b/pkgs/by-name/mr/mrpeach/package.nix index 2fa63b5da8ad..ef9194be5adc 100644 --- a/pkgs/by-name/mr/mrpeach/package.nix +++ b/pkgs/by-name/mr/mrpeach/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - patchPhase = '' + postPatch = '' for D in net osc do sed -i "s@prefix = /usr/local@prefix = $out@g" $D/Makefile @@ -34,24 +34,28 @@ stdenv.mkDerivation { ''; buildPhase = '' + runHook preBuild for D in net osc do cd $D make cd .. done + runHook postBuild ''; installPhase = '' + runHook preInstall for D in net osc do cd $D make install cd .. done + runHook postInstall ''; - fixupPhase = '' + preFixup = '' mv $out/lib/pd-externals/net $out mv $out/lib/pd-externals/osc $out rm -rf $out/lib diff --git a/pkgs/by-name/my/mycelium/Cargo.lock b/pkgs/by-name/my/mycelium/Cargo.lock deleted file mode 100644 index 8ba8bc84cdfb..000000000000 --- a/pkgs/by-name/my/mycelium/Cargo.lock +++ /dev/null @@ -1,3449 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "aes-gcm" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "anstream" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" - -[[package]] -name = "anstyle-parse" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] -name = "arraydeque" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "async-trait" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.85", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "axum" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" -dependencies = [ - "async-trait", - "axum-core", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper 1.0.1", - "tokio", - "tower 0.5.1", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper 1.0.1", - "tower-layer", - "tower-service", -] - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" -dependencies = [ - "serde", -] - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "blake3" -version = "1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", -] - -[[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 = "borsh" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" -dependencies = [ - "borsh-derive", - "cfg_aliases", -] - -[[package]] -name = "borsh-derive" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" -dependencies = [ - "once_cell", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.85", - "syn_derive", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "byte-unit" -version = "5.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e" -dependencies = [ - "rust_decimal", - "serde", - "utf8-width", -] - -[[package]] -name = "bytecheck" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" - -[[package]] -name = "c2rust-bitfields" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b43c3f07ab0ef604fa6f595aa46ec2f8a22172c975e186f6f5bf9829a3b72c41" -dependencies = [ - "c2rust-bitfields-derive", -] - -[[package]] -name = "c2rust-bitfields-derive" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3cbc102e2597c9744c8bd8c15915d554300601c91a079430d309816b0912545" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "cc" -version = "1.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" -dependencies = [ - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clap" -version = "4.5.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.85", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "colorchoice" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" - -[[package]] -name = "config" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68578f196d2a33ff61b27fae256c3164f65e36382648e30666dde05b8cc9dfdf" -dependencies = [ - "async-trait", - "convert_case", - "json5", - "nom", - "pathdiff", - "ron", - "rust-ini", - "serde", - "serde_json", - "toml", - "yaml-rust2", -] - -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom", - "once_cell", - "tiny-keccak", -] - -[[package]] -name = "constant_time_eq" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "rand_core", - "typenum", -] - -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - -[[package]] -name = "curve25519-dalek" -version = "4.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "fiat-crypto", - "rustc_version", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.85", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dlopen2" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b4f5f101177ff01b8ec4ecc81eead416a8aa42819a2869311b3420fa114ffa" -dependencies = [ - "libc", - "once_cell", - "winapi", -] - -[[package]] -name = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - -[[package]] -name = "encode_unicode" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" - -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "etherparse" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d8a704b617484e9d867a0423cd45f7577f008c4068e2e33378f8d3860a6d73" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "faster-hex" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7223ae2d2f179b803433d9c830478527e92b8117eab39460edae7f1614d9fb73" -dependencies = [ - "heapless", - "serde", -] - -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futures" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" - -[[package]] -name = "futures-executor" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" - -[[package]] -name = "futures-macro" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.85", -] - -[[package]] -name = "futures-sink" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" - -[[package]] -name = "futures-task" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" - -[[package]] -name = "futures-util" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "ghash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "h2" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hash32" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash 0.8.11", - "allocator-api2", -] - -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "heapless" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" -dependencies = [ - "hash32", - "stable_deref_trait", -] - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-util" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower 0.4.13", - "tower-service", - "tracing", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown 0.14.5", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "ioctl-sys" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd11f3a29434026f5ff98c730b668ba74b1033637b8817940b54d040696133c" - -[[package]] -name = "ip_network_table-deps-treebitmap" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e537132deb99c0eb4b752f0346b6a836200eaaa3516dd7e5514b63930a09e5d" - -[[package]] -name = "ipnet" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" - -[[package]] -name = "is-terminal" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json5" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" -dependencies = [ - "pest", - "pest_derive", - "serde", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "left-right" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cabfddf3ad712b726484562039aa6fc2014bc1b5c088bb211b208052cf0439e6" -dependencies = [ - "loom", - "slab", -] - -[[package]] -name = "libc" -version = "0.2.161" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" - -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.5.0", - "libc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" -dependencies = [ - "hermit-abi", - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "mycelium" -version = "0.5.7" -dependencies = [ - "aes-gcm", - "arc-swap", - "blake3", - "bytes", - "etherparse", - "faster-hex", - "futures", - "ip_network_table-deps-treebitmap", - "ipnet", - "left-right", - "libc", - "netdev", - "nix 0.29.0", - "quinn", - "rand", - "rcgen", - "rtnetlink", - "rustls", - "serde", - "tokio", - "tokio-stream", - "tokio-tun", - "tokio-util", - "tracing", - "tracing-logfmt", - "tracing-subscriber", - "tun", - "wintun 0.5.0", - "x25519-dalek", -] - -[[package]] -name = "mycelium-api" -version = "0.5.7" -dependencies = [ - "axum", - "base64 0.22.1", - "mycelium", - "mycelium-metrics", - "serde", - "tokio", - "tracing", -] - -[[package]] -name = "mycelium-cli" -version = "0.5.7" -dependencies = [ - "base64 0.22.1", - "byte-unit", - "mycelium", - "mycelium-api", - "prettytable-rs", - "reqwest", - "serde", - "serde_json", - "tokio", - "tracing", - "urlencoding", -] - -[[package]] -name = "mycelium-metrics" -version = "0.5.7" -dependencies = [ - "axum", - "mycelium", - "prometheus", - "tokio", - "tracing", -] - -[[package]] -name = "myceliumd" -version = "0.5.7" -dependencies = [ - "base64 0.22.1", - "byte-unit", - "clap", - "config", - "dirs", - "mycelium", - "mycelium-api", - "mycelium-cli", - "mycelium-metrics", - "prettytable-rs", - "reqwest", - "serde", - "serde_json", - "tokio", - "tracing", - "tracing-logfmt", - "tracing-subscriber", - "urlencoding", -] - -[[package]] -name = "netdev" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f901362e84cd407be6f8cd9d3a46bccf09136b095792785401ea7d283c79b91d" -dependencies = [ - "dlopen2", - "ipnet", - "libc", - "netlink-packet-core", - "netlink-packet-route 0.17.1", - "netlink-sys", - "once_cell", - "system-configuration", - "windows-sys 0.52.0", -] - -[[package]] -name = "netlink-packet-core" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4" -dependencies = [ - "anyhow", - "byteorder", - "netlink-packet-utils", -] - -[[package]] -name = "netlink-packet-route" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66" -dependencies = [ - "anyhow", - "bitflags 1.3.2", - "byteorder", - "libc", - "netlink-packet-core", - "netlink-packet-utils", -] - -[[package]] -name = "netlink-packet-route" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74c171cd77b4ee8c7708da746ce392440cb7bcf618d122ec9ecc607b12938bf4" -dependencies = [ - "anyhow", - "byteorder", - "libc", - "log", - "netlink-packet-core", - "netlink-packet-utils", -] - -[[package]] -name = "netlink-packet-utils" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" -dependencies = [ - "anyhow", - "byteorder", - "paste", - "thiserror", -] - -[[package]] -name = "netlink-proto" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b33524dc0968bfad349684447bfce6db937a9ac3332a1fe60c0c5a5ce63f21" -dependencies = [ - "bytes", - "futures", - "log", - "netlink-packet-core", - "netlink-sys", - "thiserror", - "tokio", -] - -[[package]] -name = "netlink-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" -dependencies = [ - "bytes", - "futures", - "libc", - "log", - "tokio", -] - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "libc", -] - -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "cfg_aliases", - "libc", - "memoffset", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "nu-ansi-term" -version = "0.50.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-multimap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" -dependencies = [ - "dlv-list", - "hashbrown 0.14.5", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "pem" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" -dependencies = [ - "base64 0.22.1", - "serde", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pest" -version = "2.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.85", -] - -[[package]] -name = "pest_meta" -version = "2.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.85", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "polyval" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[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 = "prettytable-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" -dependencies = [ - "csv", - "encode_unicode", - "is-terminal", - "lazy_static", - "term", - "unicode-width", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", -] - -[[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", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "procfs" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" -dependencies = [ - "bitflags 2.5.0", - "hex", - "lazy_static", - "procfs-core", - "rustix", -] - -[[package]] -name = "procfs-core" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" -dependencies = [ - "bitflags 2.5.0", - "hex", -] - -[[package]] -name = "prometheus" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" -dependencies = [ - "cfg-if", - "fnv", - "lazy_static", - "libc", - "memchr", - "parking_lot", - "procfs", - "thiserror", -] - -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "quinn" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "socket2", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" -dependencies = [ - "bytes", - "rand", - "ring", - "rustc-hash", - "rustls", - "slab", - "thiserror", - "tinyvec", - "tracing", -] - -[[package]] -name = "quinn-udp" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" -dependencies = [ - "libc", - "once_cell", - "socket2", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[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 = "rcgen" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779" -dependencies = [ - "pem", - "ring", - "rustls-pki-types", - "time", - "yasna", -] - -[[package]] -name = "redox_syscall" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" -dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "redox_users" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.3", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "rend" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" -dependencies = [ - "bytecheck", -] - -[[package]] -name = "reqwest" -version = "0.12.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" -dependencies = [ - "base64 0.22.1", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 1.0.1", - "tokio", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows-registry", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rkyv" -version = "0.7.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" -dependencies = [ - "bitvec", - "bytecheck", - "bytes", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64 0.21.7", - "bitflags 2.5.0", - "serde", - "serde_derive", -] - -[[package]] -name = "rtnetlink" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b684475344d8df1859ddb2d395dd3dac4f8f3422a1aa0725993cb375fc5caba5" -dependencies = [ - "futures", - "log", - "netlink-packet-core", - "netlink-packet-route 0.19.0", - "netlink-packet-utils", - "netlink-proto", - "netlink-sys", - "nix 0.27.1", - "thiserror", - "tokio", -] - -[[package]] -name = "rust-ini" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" -dependencies = [ - "cfg-if", - "ordered-multimap", -] - -[[package]] -name = "rust_decimal" -version = "1.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" -dependencies = [ - "arrayvec", - "borsh", - "bytes", - "num-traits", - "rand", - "rkyv", - "serde", - "serde_json", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.23.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" -dependencies = [ - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pki-types" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" - -[[package]] -name = "rustls-webpki" -version = "0.102.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "serde" -version = "1.0.214" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.214" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.85", -] - -[[package]] -name = "serde_json" -version = "1.0.132" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" -dependencies = [ - "itoa", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -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 = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[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.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[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.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.85", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" -dependencies = [ - "futures-core", -] - -[[package]] -name = "system-configuration" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42" -dependencies = [ - "bitflags 2.5.0", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "thiserror" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.85", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-macros" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.85", -] - -[[package]] -name = "tokio-stream" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-tun" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf48df2abbfd12d0b8495dcf960b125109493d85f2c787b44a2729a8022bc4b" -dependencies = [ - "libc", - "nix 0.29.0", - "thiserror", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.14", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.13", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper 0.1.2", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.85", -] - -[[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-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-logfmt" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1f47d22deb79c3f59fcf2a1f00f60cbdc05462bf17d1cd356c1fefa3f444bd" -dependencies = [ - "nu-ansi-term 0.50.1", - "time", - "tracing", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term 0.46.0", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "tun" -version = "0.6.1" -source = "git+https://github.com/LeeSmet/rust-tun#eb4d41c0a5d6a6e9c55340e2f61e50683d9f4731" -dependencies = [ - "byteorder", - "bytes", - "futures-core", - "ioctl-sys", - "libc", - "log", - "thiserror", - "tokio", - "tokio-util", - "wintun 0.3.2", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-width" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" - -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "utf8-width" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.85", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.85", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" -dependencies = [ - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" -dependencies = [ - "memchr", -] - -[[package]] -name = "wintun" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29b83b0eca06dd125dbcd48a45327c708a6da8aada3d95a3f06db0ce4b17e0d4" -dependencies = [ - "c2rust-bitfields", - "libloading", - "log", - "thiserror", - "windows 0.51.1", -] - -[[package]] -name = "wintun" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b196f9328341b035820c54beebca487823e2e20a5977f284f2af2a0ee8f04400" -dependencies = [ - "c2rust-bitfields", - "libloading", - "log", - "thiserror", - "windows-sys 0.52.0", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "x25519-dalek" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" -dependencies = [ - "curve25519-dalek", - "rand_core", - "serde", - "zeroize", -] - -[[package]] -name = "yaml-rust2" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8" -dependencies = [ - "arraydeque", - "encoding_rs", - "hashlink", -] - -[[package]] -name = "yasna" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" -dependencies = [ - "time", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.85", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.85", -] diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix index 8052ce1cb88a..f947e2c1f7ad 100644 --- a/pkgs/by-name/my/mycelium/package.nix +++ b/pkgs/by-name/my/mycelium/package.nix @@ -23,12 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PbEoM+AnZTuo9xtwcDcTH9FZAzPzfBhX41+zVVTdgRo="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "tun-0.6.1" = "sha256-tJx/qRwPcZOAfxyjZUHKLKsLu+loltVUOCP8IzWMryM="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-63AB63vmxXi6ugLCAOKI1eJcOB8XHWEiCc5yoIEqd+w="; nativeBuildInputs = [ versionCheckHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 403a735b6f95..e3095ec8b428 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.398"; + version = "0.0.399"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-wSRlasUxHb4ukmQRZcuLqjcIwN/vat4kWet2R8Cyxt0="; + hash = "sha256-n1dnJOrrpfDlwdkuh7fcudZz3/W4+8Cg5E7/ecetr3U="; }; vendorHash = "sha256-b8er/iF7Dqq+BAulzE/tUebNeKmTMilc+a0yCAJ5E/0="; diff --git a/pkgs/by-name/ni/niri/Cargo.lock b/pkgs/by-name/ni/niri/Cargo.lock deleted file mode 100644 index fd237aeaa6fd..000000000000 --- a/pkgs/by-name/ni/niri/Cargo.lock +++ /dev/null @@ -1,5196 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "android-activity" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" -dependencies = [ - "android-properties", - "bitflags 2.6.0", - "cc", - "cesu8", - "jni", - "jni-sys", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "android-properties" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" - -[[package]] -name = "annotate-snippets" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" -dependencies = [ - "unicode-width", - "yansi-term", -] - -[[package]] -name = "anstream" -version = "0.6.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" - -[[package]] -name = "anstyle-parse" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" -dependencies = [ - "anstyle", - "windows-sys 0.59.0", -] - -[[package]] -name = "anyhow" -version = "1.0.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" - -[[package]] -name = "appendlist" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e149dc73cd30538307e7ffa2acd3d2221148eaeed4871f246657b1c3eaa1cbd2" - -[[package]] -name = "approx" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" -dependencies = [ - "num-traits", -] - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "arrayvec" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" - -[[package]] -name = "as-raw-xcb-connection" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" - -[[package]] -name = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand 2.2.0", - "futures-lite 2.3.0", - "slab", -] - -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" -dependencies = [ - "async-lock 3.4.0", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite 2.3.0", - "parking", - "polling 3.7.3", - "rustix 0.38.38", - "slab", - "tracing", - "windows-sys 0.59.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" -dependencies = [ - "event-listener 5.3.1", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-process" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" -dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", - "async-signal", - "blocking", - "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.38", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "async-signal" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" -dependencies = [ - "async-io 2.3.4", - "async-lock 3.4.0", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 0.38.38", - "signal-hook-registry", - "slab", - "windows-sys 0.59.0", -] - -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - -[[package]] -name = "async-trait" -version = "0.1.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "atomic" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "autocfg" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" - -[[package]] -name = "backtrace" -version = "0.3.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets 0.52.6", -] - -[[package]] -name = "backtrace-ext" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" -dependencies = [ - "backtrace", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "bindgen" -version = "0.69.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" -dependencies = [ - "annotate-snippets", - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "itertools", - "lazy_static", - "lazycell", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.86", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[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 = "block2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" -dependencies = [ - "objc2", -] - -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel", - "async-task", - "futures-io", - "futures-lite 2.3.0", - "piper", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "bytemuck" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" - -[[package]] -name = "cairo-rs" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a0ea147c94108c9613235388f540e4d14c327f7081c9e471fc8ee8a2533e69" -dependencies = [ - "bitflags 2.6.0", - "cairo-sys-rs", - "glib", - "libc", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" -dependencies = [ - "glib-sys", - "libc", - "system-deps 7.0.3", -] - -[[package]] -name = "calloop" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" -dependencies = [ - "bitflags 2.6.0", - "log", - "polling 3.7.3", - "rustix 0.38.38", - "slab", - "thiserror", -] - -[[package]] -name = "calloop" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ead1e1514bce44c0f40e027899fbc595907fc112635bed21b3b5d975c0a5e7" -dependencies = [ - "async-task", - "bitflags 2.6.0", - "futures-io", - "polling 3.7.3", - "rustix 0.38.38", - "slab", - "tracing", -] - -[[package]] -name = "calloop-wayland-source" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" -dependencies = [ - "calloop 0.13.0", - "rustix 0.38.38", - "wayland-backend", - "wayland-client", -] - -[[package]] -name = "cc" -version = "1.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" -dependencies = [ - "jobserver", - "libc", - "shlex", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cfg-expr" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "cgmath" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317" -dependencies = [ - "approx 0.4.0", - "num-traits", -] - -[[package]] -name = "chumsky" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "4.5.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "clap_lex" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" - -[[package]] -name = "colorchoice" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" - -[[package]] -name = "colored" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" -dependencies = [ - "lazy_static", - "windows-sys 0.48.0", -] - -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "cookie-factory" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" -dependencies = [ - "futures", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "core-graphics" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] - -[[package]] -name = "cpufeatures" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[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 = "csscolorparser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f9a16a848a7fb95dd47ce387ac1ee9a6df879ba784b815537fcd388a1a8288" -dependencies = [ - "phf", -] - -[[package]] -name = "cursor-icon" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "directories" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading", -] - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "dpi" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" - -[[package]] -name = "drm" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80bc8c5c6c2941f70a55c15f8d9f00f9710ebda3ffda98075f996a0e6c92756f" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "drm-ffi", - "drm-fourcc", - "libc", - "rustix 0.38.38", -] - -[[package]] -name = "drm-ffi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e41459d99a9b529845f6d2c909eb9adf3b6d2f82635ae40be8de0601726e8b" -dependencies = [ - "drm-sys", - "rustix 0.38.38", -] - -[[package]] -name = "drm-fourcc" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" - -[[package]] -name = "drm-sys" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bafb66c8dbc944d69e15cfcc661df7e703beffbaec8bd63151368b06c5f9858c" -dependencies = [ - "libc", - "linux-raw-sys 0.6.5", -] - -[[package]] -name = "dyn-clone" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "enumflags2" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" -dependencies = [ - "event-listener 5.3.1", - "pin-project-lite", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" - -[[package]] -name = "fdeflate" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset 0.9.1", - "rustc_version", -] - -[[package]] -name = "flate2" -version = "1.0.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" -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.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" - -[[package]] -name = "futures-executor" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand 2.2.0", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "futures-sink" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" - -[[package]] -name = "futures-task" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" - -[[package]] -name = "futures-util" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gbm" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c724107aa10444b1d2709aae4727c18a33c16b3e15ea8a46cc4ae226c084c88a" -dependencies = [ - "bitflags 2.6.0", - "drm", - "drm-fourcc", - "gbm-sys", - "libc", - "wayland-backend", - "wayland-server", -] - -[[package]] -name = "gbm-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9cc2f64de9fa707b5c6b2d2f10d7a7e49e845018a9f5685891eb40d3bab2538" -dependencies = [ - "libc", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4c29071a9e92337d8270a85cb0510cda4ac478be26d09ad027cc1d081911b19" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687343b059b91df5f3fbd87b4307038fa9e647fcc0461d0d3f93e94fee20bf3d" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 7.0.3", -] - -[[package]] -name = "gdk4" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c121aeeb0cf7545877ae615dac6bfd088b739d8abee4d55e7143b06927d16a31" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3c03d1ea9d5199f14f060890fde68a3b5ec5699144773d1fa6abf337bfbc9c" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps 7.0.3", -] - -[[package]] -name = "generator" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb949699c3e4df3a183b1d2142cb24277057055ed23c68ed58894f76c517223" -dependencies = [ - "cfg-if", - "libc", - "log", - "rustversion", - "windows 0.58.0", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - -[[package]] -name = "gio" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d999e8fb09583e96080867e364bc1e701284ad206c76a5af480d63833ad43c" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "pin-project-lite", - "smallvec", -] - -[[package]] -name = "gio-sys" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7efc368de04755344f0084104835b6bb71df2c1d41e37d863947392a894779" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 7.0.3", - "windows-sys 0.52.0", -] - -[[package]] -name = "git-version" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad568aa3db0fcbc81f2f116137f263d7304f512a1209b35b85150d3ef88ad19" -dependencies = [ - "git-version-macro", -] - -[[package]] -name = "git-version-macro" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - -[[package]] -name = "glam" -version = "0.29.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc46dd3ec48fdd8e693a98d2b8bafae273a2d54c1de02a2a7e3d57d501f39677" - -[[package]] -name = "glib" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf1ec6d3650bf9fdbc6cee242d4fcebc6f6bfd9bea5b929b6a8b7344eb85ff" -dependencies = [ - "bitflags 2.6.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "smallvec", -] - -[[package]] -name = "glib-macros" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6bf88f70cd5720a6197639dcabcb378dd528d0cb68cb1f45e3b358bcb841cd7" -dependencies = [ - "heck 0.5.0", - "proc-macro-crate 3.2.0", - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "glib-sys" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9eca5d88cfa6a453b00d203287c34a2b7cac3a7831779aa2bb0b3c7233752b" -dependencies = [ - "libc", - "system-deps 7.0.3", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gobject-sys" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c674d2ff8478cf0ec29d2be730ed779fef54415a2fb4b565c52def62696462" -dependencies = [ - "glib-sys", - "libc", - "system-deps 7.0.3", -] - -[[package]] -name = "graphene-rs" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f53144c7fe78292705ff23935f1477d511366fb2f73c43d63b37be89076d2fe" -dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e741797dc5081e59877a4d72c442c72d61efdd99161a0b1c1b29b6b988934b99" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps 7.0.3", -] - -[[package]] -name = "gsk4" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa21a2f7c51ee1c6cc1242c2faf3aae2b7566138f182696759987bde8219e922" -dependencies = [ - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9fb607554f9f4e8829eb7ea301b0fde051e1dbfd5d16b143a8a9c2fac6c01b" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps 7.0.3", -] - -[[package]] -name = "gtk4" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34465497f5a4c182c9c94a582a187db7d6af0863f28e87ccf4379f21f0e2a22" -dependencies = [ - "cairo-rs", - "field-offset", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gtk4-macros" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e7b362c8fccd2712297903717d65d30defdab2b509bc9d209cbe5ffb9fabaf" -dependencies = [ - "proc-macro-crate 3.2.0", - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "gtk4-sys" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbe4325908b1c1642dbb48e9f49c07a73185babf43e8b2065b0f881a589f55b8" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys", - "system-deps 7.0.3", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "hashbrown" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "idna" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" -dependencies = [ - "idna_adapter", - "smallvec", - "utf8_iter", -] - -[[package]] -name = "idna_adapter" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" -dependencies = [ - "icu_normalizer", - "icu_properties", -] - -[[package]] -name = "indexmap" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" -dependencies = [ - "equivalent", - "hashbrown 0.15.0", -] - -[[package]] -name = "input" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdc09524a91f9cacd26f16734ff63d7dc650daffadd2b6f84d17a285bd875a9" -dependencies = [ - "bitflags 2.6.0", - "input-sys", - "libc", - "log", - "udev", -] - -[[package]] -name = "input-sys" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd4f5b4d1c00331c5245163aacfe5f20be75b564c7112d45893d4ae038119eb0" - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "io-lifetimes" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" - -[[package]] -name = "is-terminal" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" -dependencies = [ - "hermit-abi 0.4.0", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "is_ci" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "k9" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088bcebb5b68b1b14b64d7f05b0f802719250b97fdc0338ec42529ea777ed614" -dependencies = [ - "anyhow", - "colored", - "diff", - "lazy_static", - "libc", - "proc-macro2", - "regex", - "syn 2.0.86", - "terminal_size 0.2.6", -] - -[[package]] -name = "keyframe" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60708bf7981518d09095d6f5673ce5cf6a64f1e0d9708b554f670e6d9d2bd9a9" -dependencies = [ - "num-traits", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "knuffel" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04bee6ddc6071011314b1ce4f7705fef6c009401dba4fd22cb0009db6a177413" -dependencies = [ - "base64", - "chumsky", - "knuffel-derive", - "miette", - "thiserror", - "unicode-width", -] - -[[package]] -name = "knuffel-derive" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91977f56c49cfb961e3d840e2e7c6e4a56bde7283898cf606861f1421348283d" -dependencies = [ - "heck 0.4.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libadwaita" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8611ee9fb85e7606c362b513afcaf5b59853f79e4d98caaaf581d99465014247" -dependencies = [ - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "pango", -] - -[[package]] -name = "libadwaita-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps 7.0.3", -] - -[[package]] -name = "libc" -version = "0.2.162" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" - -[[package]] -name = "libdisplay-info" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6dd47a677df2378a8bb88d08a593f51e8dddf4b61d2db5f2ceb35e67f9389d" -dependencies = [ - "bitflags 2.6.0", - "libc", - "libdisplay-info-derive", - "libdisplay-info-sys", - "thiserror", -] - -[[package]] -name = "libdisplay-info-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea1cd31036b732a546d845f9485c56b1b606b5e476b0821c680dd66c8cd6fcee" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "libdisplay-info-sys" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea8cec1fa7872b621f40c756bc1304b1a975461282e250b0e76737b037c0c236" - -[[package]] -name = "libloading" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" -dependencies = [ - "cfg-if", - "windows-targets 0.48.5", -] - -[[package]] -name = "libm" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00419de735aac21d53b0de5ce2c03bd3627277cf471300f27ebc89f7d828047" - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall 0.5.7", -] - -[[package]] -name = "libseat" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a0adf8d8607a73a5b74cbe4132f57cb349e4bf860103cd089461bbcbc9907e" -dependencies = [ - "errno", - "libseat-sys", - "log", -] - -[[package]] -name = "libseat-sys" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3671cb5e03871f1d6bf0b3b5daa9275549e348fa6359e0f9adb910ca163d4c34" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "libspa" -version = "0.8.0" -source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#86df39190c0ab67444666a42908f7e8c1344e24a" -dependencies = [ - "bitflags 2.6.0", - "cc", - "convert_case", - "cookie-factory", - "libc", - "libspa-sys", - "nix 0.27.1", - "nom", - "system-deps 6.2.2", -] - -[[package]] -name = "libspa-sys" -version = "0.8.0" -source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#86df39190c0ab67444666a42908f7e8c1344e24a" -dependencies = [ - "bindgen", - "cc", - "system-deps 6.2.2", -] - -[[package]] -name = "libudev-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "linux-raw-sys" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" - -[[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "loom" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "mac-notification-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce8f34f3717aa37177e723df6c1fc5fb02b2a1087374ea3fe0ea42316dc8f91" -dependencies = [ - "cc", - "dirs-next", - "objc-foundation", - "objc_id", - "time", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memmap2" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miette" -version = "5.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" -dependencies = [ - "backtrace", - "backtrace-ext", - "is-terminal", - "miette-derive", - "once_cell", - "owo-colors", - "supports-color", - "supports-hyperlinks", - "supports-unicode", - "terminal_size 0.1.17", - "textwrap", - "thiserror", - "unicode-width", -] - -[[package]] -name = "miette-derive" -version = "5.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[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.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" -dependencies = [ - "adler2", - "simd-adler32", -] - -[[package]] -name = "ndk" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" -dependencies = [ - "bitflags 2.6.0", - "jni-sys", - "log", - "ndk-sys", - "num_enum", - "raw-window-handle", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.6.0+11769913" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "niri" -version = "0.1.10-1" -dependencies = [ - "anyhow", - "approx 0.5.1", - "arrayvec", - "async-channel", - "async-io 1.13.0", - "atomic", - "bitflags 2.6.0", - "bytemuck", - "calloop 0.14.1", - "clap", - "directories", - "drm-ffi", - "fastrand 2.2.0", - "futures-util", - "git-version", - "glam", - "input", - "k9", - "keyframe", - "libc", - "libdisplay-info", - "log", - "niri-config", - "niri-ipc", - "notify-rust", - "ordered-float", - "pango", - "pangocairo", - "pipewire", - "png", - "portable-atomic", - "profiling", - "proptest", - "proptest-derive", - "sd-notify", - "serde", - "serde_json", - "smithay", - "smithay-drm-extras", - "tracing", - "tracing-subscriber", - "tracy-client", - "url", - "wayland-backend", - "wayland-scanner", - "xcursor", - "xshell", - "zbus", -] - -[[package]] -name = "niri-config" -version = "0.1.10-1" -dependencies = [ - "bitflags 2.6.0", - "csscolorparser", - "k9", - "knuffel", - "miette", - "niri-ipc", - "pretty_assertions", - "regex", - "smithay", - "tracing", - "tracy-client", -] - -[[package]] -name = "niri-ipc" -version = "0.1.10-1" -dependencies = [ - "clap", - "schemars", - "serde", - "serde_json", -] - -[[package]] -name = "niri-visual-tests" -version = "0.1.10-1" -dependencies = [ - "anyhow", - "gtk4", - "libadwaita", - "niri", - "niri-config", - "smithay", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "libc", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "notify-rust" -version = "4.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226" -dependencies = [ - "log", - "mac-notification-sys", - "serde", - "tauri-winrt-notification", - "zbus", -] - -[[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-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_enum" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" -dependencies = [ - "objc-sys", - "objc2-encode", -] - -[[package]] -name = "objc2-app-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" -dependencies = [ - "bitflags 2.6.0", - "block2", - "libc", - "objc2", - "objc2-core-data", - "objc2-core-image", - "objc2-foundation", - "objc2-quartz-core", -] - -[[package]] -name = "objc2-cloud-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-core-location", - "objc2-foundation", -] - -[[package]] -name = "objc2-contacts" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-core-data" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-core-image" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "objc2-core-location" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" -dependencies = [ - "block2", - "objc2", - "objc2-contacts", - "objc2-foundation", -] - -[[package]] -name = "objc2-encode" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" - -[[package]] -name = "objc2-foundation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" -dependencies = [ - "bitflags 2.6.0", - "block2", - "dispatch", - "libc", - "objc2", -] - -[[package]] -name = "objc2-link-presentation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" -dependencies = [ - "block2", - "objc2", - "objc2-app-kit", - "objc2-foundation", -] - -[[package]] -name = "objc2-metal" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-quartz-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "objc2-symbols" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" -dependencies = [ - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-ui-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-cloud-kit", - "objc2-core-data", - "objc2-core-image", - "objc2-core-location", - "objc2-foundation", - "objc2-link-presentation", - "objc2-quartz-core", - "objc2-symbols", - "objc2-uniform-type-identifiers", - "objc2-user-notifications", -] - -[[package]] -name = "objc2-uniform-type-identifiers" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-user-notifications" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-core-location", - "objc2-foundation", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.36.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "orbclient" -version = "0.3.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43" -dependencies = [ - "libredox", -] - -[[package]] -name = "ordered-float" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65ee1f9701bf938026630b455d5315f490640234259037edb259798b3bcf85e" -dependencies = [ - "num-traits", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "pango" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa26aa54b11094d72141a754901cd71d9356432bb8147f9cace8d9c7ba95f356" -dependencies = [ - "gio", - "glib", - "libc", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fd65917bf12f06544ae2bbc200abf9fc0a513a5a88a0fa81013893aef2b838" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 7.0.3", -] - -[[package]] -name = "pangocairo" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4291ca8cdd05e4330752bf8a450d3a4e701ca48fd9aad2b3566e92849ee4055e" -dependencies = [ - "cairo-rs", - "glib", - "libc", - "pango", - "pangocairo-sys", -] - -[[package]] -name = "pangocairo-sys" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ed959258ea648a49bde7dfdbaa98310717cb15159b421fa76510c45ec306e" -dependencies = [ - "cairo-sys-rs", - "glib-sys", - "libc", - "pango-sys", - "system-deps 7.0.3", -] - -[[package]] -name = "parking" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" -dependencies = [ - "atomic-waker", - "fastrand 2.2.0", - "futures-io", -] - -[[package]] -name = "pipewire" -version = "0.8.0" -source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#86df39190c0ab67444666a42908f7e8c1344e24a" -dependencies = [ - "anyhow", - "bitflags 2.6.0", - "libc", - "libspa", - "libspa-sys", - "nix 0.27.1", - "once_cell", - "pipewire-sys", - "thiserror", -] - -[[package]] -name = "pipewire-sys" -version = "0.8.0" -source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#86df39190c0ab67444666a42908f7e8c1344e24a" -dependencies = [ - "bindgen", - "libspa-sys", - "system-deps 6.2.2", -] - -[[package]] -name = "pixman" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a24da0bec14f4e43a495c1837a3c358b87532e7fe66bd75c348b89f0451b6" -dependencies = [ - "drm-fourcc", - "paste", - "pixman-sys", - "thiserror", -] - -[[package]] -name = "pixman-sys" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0483e89e81d7915defe83c51f23f6800594d64f6f4a21253ce87fd8444ada" - -[[package]] -name = "pkg-config" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" - -[[package]] -name = "png" -version = "0.17.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi 0.4.0", - "pin-project-lite", - "rustix 0.38.38", - "tracing", - "windows-sys 0.59.0", -] - -[[package]] -name = "portable-atomic" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" - -[[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.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "pretty_assertions" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" -dependencies = [ - "toml_edit 0.22.22", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "profiling" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d" -dependencies = [ - "profiling-procmacros", - "tracy-client", -] - -[[package]] -name = "profiling-procmacros" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30" -dependencies = [ - "quote", - "syn 2.0.86", -] - -[[package]] -name = "proptest" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" -dependencies = [ - "bit-set", - "bit-vec", - "bitflags 2.6.0", - "lazy_static", - "num-traits", - "rand", - "rand_chacha", - "rand_xorshift", - "regex-syntax 0.8.5", - "rusty-fork", - "tempfile", - "unarray", -] - -[[package]] -name = "proptest-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.36.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core", -] - -[[package]] -name = "raw-window-handle" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" - -[[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_syscall" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.8", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes 1.0.11", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys 0.4.14", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustversion" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" - -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[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 = "schemars" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" -dependencies = [ - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", -] - -[[package]] -name = "schemars_derive" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 2.0.86", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "sd-notify" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be20c5f7f393ee700f8b2f28ea35812e4e212f40774b550cd2a93ea91684451" - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "serde" -version = "1.0.214" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.214" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "serde_derive_internals" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "serde_json" -version = "1.0.132" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "serde_spanned" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" -dependencies = [ - "serde", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "smawk" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" - -[[package]] -name = "smithay" -version = "0.3.0" -source = "git+https://github.com/Smithay/smithay.git#5e137dcebc9f2de4d026180dfc4ce81282f7f14f" -dependencies = [ - "appendlist", - "bitflags 2.6.0", - "calloop 0.14.1", - "cc", - "cgmath", - "cursor-icon", - "downcast-rs", - "drm", - "drm-ffi", - "drm-fourcc", - "errno", - "gbm", - "gl_generator", - "indexmap", - "input", - "libc", - "libloading", - "libseat", - "once_cell", - "pixman", - "pkg-config", - "profiling", - "rand", - "rustix 0.38.38", - "smallvec", - "tempfile", - "thiserror", - "tracing", - "udev", - "wayland-backend", - "wayland-client", - "wayland-cursor", - "wayland-egl", - "wayland-protocols", - "wayland-protocols-misc", - "wayland-protocols-wlr", - "wayland-server", - "wayland-sys", - "winit", - "xkbcommon", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" -dependencies = [ - "bitflags 2.6.0", - "calloop 0.13.0", - "calloop-wayland-source", - "cursor-icon", - "libc", - "log", - "memmap2", - "rustix 0.38.38", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", - "wayland-scanner", - "xkeysym", -] - -[[package]] -name = "smithay-drm-extras" -version = "0.1.0" -source = "git+https://github.com/Smithay/smithay.git#5e137dcebc9f2de4d026180dfc4ce81282f7f14f" -dependencies = [ - "drm", - "libdisplay-info", -] - -[[package]] -name = "smol_str" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" -dependencies = [ - "serde", -] - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "supports-color" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" -dependencies = [ - "is-terminal", - "is_ci", -] - -[[package]] -name = "supports-hyperlinks" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d" -dependencies = [ - "is-terminal", -] - -[[package]] -name = "supports-unicode" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f850c19edd184a205e883199a261ed44471c81e39bd95b1357f5febbef00e77a" -dependencies = [ - "is-terminal", -] - -[[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.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr 0.15.8", - "heck 0.5.0", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "system-deps" -version = "7.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005" -dependencies = [ - "cfg-expr 0.17.0", - "heck 0.5.0", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "tauri-winrt-notification" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" -dependencies = [ - "quick-xml 0.30.0", - "windows 0.51.1", -] - -[[package]] -name = "tempfile" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" -dependencies = [ - "cfg-if", - "fastrand 2.2.0", - "once_cell", - "rustix 0.38.38", - "windows-sys 0.59.0", -] - -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "terminal_size" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" -dependencies = [ - "rustix 0.37.27", - "windows-sys 0.48.0", -] - -[[package]] -name = "textwrap" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" -dependencies = [ - "smawk", - "unicode-linebreak", - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "num-conv", - "powerfmt", - "serde", - "time-core", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "zerovec", -] - -[[package]] -name = "toml" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.22", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.20", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[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-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "tracy-client" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "746b078c6a09ebfd5594609049e07116735c304671eaab06ce749854d23435bc" -dependencies = [ - "loom", - "once_cell", - "tracy-client-sys", -] - -[[package]] -name = "tracy-client-sys" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68613466112302fdbeabc5fa55f7d57462a0b247d5a6b7d7e09401fb471a144d" -dependencies = [ - "cc", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "udev" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d5c197b95f1769931c89f85c33c407801d1fb7a311113bc0b39ad036f1bd81" -dependencies = [ - "io-lifetimes 1.0.11", - "libc", - "libudev-sys", - "pkg-config", -] - -[[package]] -name = "uds_windows" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" -dependencies = [ - "memoffset 0.9.1", - "tempfile", - "winapi", -] - -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - -[[package]] -name = "unicode-ident" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - -[[package]] -name = "unicode-linebreak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - -[[package]] -name = "unicode-segmentation" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "url" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[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.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.86", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" - -[[package]] -name = "wayland-backend" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" -dependencies = [ - "cc", - "downcast-rs", - "rustix 0.38.38", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.31.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" -dependencies = [ - "bitflags 2.6.0", - "rustix 0.38.38", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-csd-frame" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" -dependencies = [ - "bitflags 2.6.0", - "cursor-icon", - "wayland-backend", -] - -[[package]] -name = "wayland-cursor" -version = "0.31.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b08bc3aafdb0035e7fe0fdf17ba0c09c268732707dca4ae098f60cb28c9e4c" -dependencies = [ - "rustix 0.38.38", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-egl" -version = "0.32.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3cb8b84ff95310fe59ce6c61f1fa344ec22f4c240c369a2b20f15caebfede4" -dependencies = [ - "wayland-backend", - "wayland-sys", -] - -[[package]] -name = "wayland-protocols" -version = "0.32.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", - "wayland-server", -] - -[[package]] -name = "wayland-protocols-misc" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2e42969764e469a115d4bb1c16e9588ef8b75b127ba7a2c9ddf1e140b25ca7" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-protocols", - "wayland-scanner", - "wayland-server", -] - -[[package]] -name = "wayland-protocols-plasma" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b31cab548ee68c7eb155517f2212049dc151f7cd7910c2b66abfd31c3ee12bd" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "782e12f6cd923c3c316130d56205ebab53f55d6666b7faddfad36cecaeeb4022" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", - "wayland-server", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" -dependencies = [ - "proc-macro2", - "quick-xml 0.36.2", - "quote", -] - -[[package]] -name = "wayland-server" -version = "0.31.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89532cc712a2adb119eb4d09694b402576052254d0bb284f82ac1c47fb786ad" -dependencies = [ - "bitflags 2.6.0", - "downcast-rs", - "io-lifetimes 2.0.3", - "rustix 0.38.38", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-sys" -version = "0.31.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" -dependencies = [ - "dlib", - "libc", - "log", - "memoffset 0.9.1", - "once_cell", - "pkg-config", -] - -[[package]] -name = "web-sys" -version = "0.3.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.0", -] - -[[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" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winit" -version = "0.30.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67" -dependencies = [ - "ahash", - "android-activity", - "atomic-waker", - "bitflags 2.6.0", - "block2", - "bytemuck", - "calloop 0.13.0", - "cfg_aliases", - "concurrent-queue", - "core-foundation", - "core-graphics", - "cursor-icon", - "dpi", - "js-sys", - "libc", - "memmap2", - "ndk", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "objc2-ui-kit", - "orbclient", - "percent-encoding", - "pin-project", - "raw-window-handle", - "redox_syscall 0.4.1", - "rustix 0.38.38", - "smithay-client-toolkit", - "smol_str", - "tracing", - "unicode-segmentation", - "wasm-bindgen", - "wasm-bindgen-futures", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-plasma", - "web-sys", - "web-time", - "windows-sys 0.52.0", - "x11-dl", - "x11rb", - "xkbcommon-dl", -] - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" -dependencies = [ - "memchr", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" -dependencies = [ - "as-raw-xcb-connection", - "gethostname", - "libc", - "libloading", - "once_cell", - "rustix 0.38.38", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" - -[[package]] -name = "xcursor" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" - -[[package]] -name = "xdg-home" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - -[[package]] -name = "xkbcommon" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9" -dependencies = [ - "libc", - "memmap2", - "xkeysym", -] - -[[package]] -name = "xkbcommon-dl" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" -dependencies = [ - "bitflags 2.6.0", - "dlib", - "log", - "once_cell", - "xkeysym", -] - -[[package]] -name = "xkeysym" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" - -[[package]] -name = "xml-rs" -version = "0.8.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" - -[[package]] -name = "xshell" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db0ab86eae739efd1b054a8d3d16041914030ac4e01cd1dca0cf252fd8b6437" -dependencies = [ - "xshell-macros", -] - -[[package]] -name = "xshell-macros" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852" - -[[package]] -name = "yansi" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" - -[[package]] -name = "yansi-term" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" -dependencies = [ - "winapi", -] - -[[package]] -name = "yoke" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", - "synstructure", -] - -[[package]] -name = "zbus" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "byteorder", - "derivative", - "enumflags2", - "event-listener 2.5.3", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.26.4", - "once_cell", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "winapi", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zbus_names" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" -dependencies = [ - "serde", - "static_assertions", - "zvariant", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "zerofrom" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", - "synstructure", -] - -[[package]] -name = "zerovec" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.86", -] - -[[package]] -name = "zvariant" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "3.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 044ec7e16625..312d7e95f3cb 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -39,13 +39,8 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/bin' "$out/bin" ''; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "libspa-0.8.0" = "sha256-kp5x5QhmgEqCrt7xDRfMFGoTK5IXOuvW2yOW02B8Ftk="; - "smithay-0.3.0" = "sha256-nSM7LukWHO2n2eWz5ipFNkTCYDvx/VvPXnKVngJFU0U="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-2hFavY3Y6aBPjo53o7GMjuvUKOcj+ZQiV0M1mpoH/Ck="; strictDeps = true; diff --git a/pkgs/by-name/ni/nixos-option/nixos-option.sh b/pkgs/by-name/ni/nixos-option/nixos-option.sh index 81dbc523f4b7..5690783c5657 100644 --- a/pkgs/by-name/ni/nixos-option/nixos-option.sh +++ b/pkgs/by-name/ni/nixos-option/nixos-option.sh @@ -8,6 +8,34 @@ positional_args=() nix_args=(--arg nixos "import { }") flake="" + +discover_git() { + if [[ $# -ne 1 ]]; then + echo "$0 directory" + return 1 + fi + local previous= + local current=$1 + + while [[ -d "$current" && "$current" != "$previous" ]]; do + # .git can be a file for worktrees otherwise it's a directory + if [[ -d "$current/.git" ]]; then + echo "$current" + return + elif [[ -f "$current/.git" ]]; then + # resolve worktree + dotgit=$(<"$current/.git") + if [[ ${dotgit[0]} =~ gitdir:\ (.*) ]]; then + echo "${BASH_REMATCH[1]}" + return + fi + else + previous=$current + current=$(dirname "$current") + fi + done +} + while [[ $# -gt 0 ]]; do case "$1" in --help) @@ -66,18 +94,17 @@ if [[ -z "$flake" ]] && [[ -e /etc/nixos/flake.nix ]] && [[ "$no_flake" == "fals fi if [[ -n "$flake" ]]; then - echo >&2 "[WARN] Flake support in nixos-option is experimental and has known issues." - if [[ $flake =~ ^(.*)\#([^\#\"]*)$ ]]; then flake="${BASH_REMATCH[1]}" flakeAttr="${BASH_REMATCH[2]}" fi # Unlike nix cli, builtins.getFlake infer path:// when a path is given # See https://github.com/NixOS/nix/issues/5836 - # Using `git rev-parse --show-toplevel` since we can't assume the flake dir - # itself is a git repo, because the flake could be in a sub directory - if [[ -d "$flake" ]] && git -C "$flake" rev-parse --show-toplevel &>/dev/null; then - flake="git+file://$(realpath "$flake")" + if [[ -d "$flake" ]]; then + repo=$(discover_git "$(realpath "$flake")") + if [[ -n "$repo" ]]; then + flake="git+file://$repo" + fi fi if [[ -z "${flakeAttr:-}" ]]; then hostname=$(< /proc/sys/kernel/hostname) diff --git a/pkgs/by-name/ni/nixos-option/package.nix b/pkgs/by-name/ni/nixos-option/package.nix index ce9f924766d7..10f1f51833ac 100644 --- a/pkgs/by-name/ni/nixos-option/package.nix +++ b/pkgs/by-name/ni/nixos-option/package.nix @@ -1,7 +1,6 @@ { lib, coreutils, - git, installShellFiles, jq, makeWrapper, @@ -57,7 +56,6 @@ stdenvNoCC.mkDerivation { --prefix PATH : ${ lib.makeBinPath [ coreutils - git jq man-db nix diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix index 48fdc0e61649..d85ed923a2c7 100644 --- a/pkgs/by-name/nu/nuclei/package.nix +++ b/pkgs/by-name/nu/nuclei/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.3.7"; + version = "3.3.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; tag = "v${version}"; - hash = "sha256-cvbxLEXPvJgAWHAMmHXPyHtBkYOOXj9xz1zfrm8oLG4="; + hash = "sha256-RL6/H1X6+rt9n1rpeRpKv+u3SloOnRX6YzMKDDQw+78="; }; - vendorHash = "sha256-+eAZ/YJc8nqeTu8oRu2H6EFUyI5HDQZNO+hCUARPtcA="; + vendorHash = "sha256-k4seYTUO7BmU2HhTWweDRfNnXp+HshWM1riSc9BbYYg="; proxyVendor = true; # hash mismatch between Linux and Darwin diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix index 699ca788c733..5e64db8b9542 100644 --- a/pkgs/by-name/nw/nwg-panel/package.nix +++ b/pkgs/by-name/nw/nwg-panel/package.nix @@ -23,13 +23,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.58"; + version = "0.9.59"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; tag = "v${version}"; - hash = "sha256-zYxZk3j8ODrK52aLSI+qA9tmJbH/eFfKYXMyd0V1LzM="; + hash = "sha256-ey0Fb9ilm7I2QWG1gQpnHTlMPoQswNlkrZ/WhUaLbDk="; }; # No tests diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix index b3fc07de125e..4a67f2ae08d7 100644 --- a/pkgs/by-name/nz/nzbhydra2/package.nix +++ b/pkgs/by-name/nz/nzbhydra2/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "nzbhydra2"; - version = "7.11.0"; + version = "7.11.3"; src = fetchzip { url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip"; - hash = "sha256-vFPpBM438TU9kthrt80soNki0T34j6EktWYhvIJNhWw="; + hash = "sha256-OR0Yk0tVajfMtMHisWqBbLeCScgenjyYTmNWTcMG/KE="; stripRoot = false; }; diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index 2e6aaf029b75..c9cae817ef92 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.6.9"; + version = "0.7.3"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; tag = version; - hash = "sha256-ltzwb6r7zg41jlTJdU+/zTJ0H6jOL/4NKCZRBN6HQR4="; + hash = "sha256-COIvnn6qDG9srv4ByWTBoRHfIva3a2dLS+yIZDguo+M="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix index 8e72aa925dc5..f09487dcc088 100644 --- a/pkgs/by-name/pi/pinact/package.nix +++ b/pkgs/by-name/pi/pinact/package.nix @@ -2,48 +2,57 @@ lib, fetchFromGitHub, buildGoModule, - testers, + versionCheckHook, nix-update-script, - pinact, }: let pname = "pinact"; - version = "1.0.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "suzuki-shunsuke"; repo = "pinact"; - rev = "v${version}"; - hash = "sha256-fOmQDfqG1aWzpL80Nc8JA6HWQR+z9mhqtwU4rC2g2Gg="; + tag = "v${version}"; + hash = "sha256-QBWxs0YRTWItJ1aTG33Z6vK8/vaZBTuZAVPYqD6dIvE="; }; + mainProgram = "pinact"; in buildGoModule { inherit pname version src; - vendorHash = "sha256-AFlkzs5mL/x9CwfF2apLcQbiu60GD33oFH6lQDHAL1M="; + vendorHash = "sha256-Y44nJv0eWM0xO+lB56OBcEe/CCipPj8Ptg7WuJ2Vszo="; + + env.CGO_ENABLED = 0; doCheck = true; - passthru = { - tests.version = testers.testVersion { - package = pinact; - }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${mainProgram}"; + versionCheckProgramArg = [ "version" ]; + passthru = { updateScript = nix-update-script { }; }; ldflags = [ "-s" "-w" - "-X main.version=${version} -X main.commit=${src.rev}" + "-X main.version=${version} -X main.commit=v${version}" ]; - meta = with lib; { + subPackages = [ + "cmd/pinact" + ]; + + meta = { + inherit mainProgram; description = "Pin GitHub Actions versions"; homepage = "https://github.com/suzuki-shunsuke/pinact"; - changelog = "https://github.com/suzuki-shunsuke/pinact/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = [ maintainers.kachick ]; - mainProgram = "pinact"; + changelog = "https://github.com/suzuki-shunsuke/pinact/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kachick ]; }; } diff --git a/pkgs/by-name/pl/plantuml-server/package.nix b/pkgs/by-name/pl/plantuml-server/package.nix index f8d6ca0e632f..6d384664a241 100644 --- a/pkgs/by-name/pl/plantuml-server/package.nix +++ b/pkgs/by-name/pl/plantuml-server/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "plantuml-server"; - version = "1.2024.8"; + version = "1.2025.0"; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - hash = "sha256-etarM3ByPHjGKfy+L1akYyz3J2hnDCcMKgjLviEW0yc="; + hash = "sha256-AQL5ad7xowQbZdwngWVT2RsHdyKNRKGm2rP0dFUhyTM="; }; dontUnpack = true; diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix index 0ada3f93a660..0f0078255607 100644 --- a/pkgs/by-name/pl/plantuml/package.nix +++ b/pkgs/by-name/pl/plantuml/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "plantuml"; - version = "1.2024.8"; + version = "1.2025.0"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar"; - hash = "sha256-mMhhdkR2/Sh60dmvAu63+PGryg6+UrpoE1mqQaZ7wm0="; + hash = "sha256-tHlhO7+q/iG5jbivTzQtvaOiDXoIEC/thA2nJnS6Kak="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/plemoljp-hs/package.nix b/pkgs/by-name/pl/plemoljp-hs/package.nix index 0da758e64ead..d91f734bc43e 100644 --- a/pkgs/by-name/pl/plemoljp-hs/package.nix +++ b/pkgs/by-name/pl/plemoljp-hs/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "plemoljp-hs"; - version = "2.0.0"; + version = "2.0.2"; src = fetchzip { url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_HS_v${version}.zip"; - hash = "sha256-0p1orGKMKYiIZymAtbHp87DoS89ir9SbYfhs1Ki1JbE="; + hash = "sha256-UpU3Zrvyqfsio8N3Bha9J4+v/eThKvPiA9g5ySLhJnY="; }; installPhase = '' diff --git a/pkgs/by-name/pl/plemoljp-nf/package.nix b/pkgs/by-name/pl/plemoljp-nf/package.nix index 13ae3782cb49..bac1ed0f708f 100644 --- a/pkgs/by-name/pl/plemoljp-nf/package.nix +++ b/pkgs/by-name/pl/plemoljp-nf/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "plemoljp-nf"; - version = "2.0.0"; + version = "2.0.2"; src = fetchzip { url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_NF_v${version}.zip"; - hash = "sha256-+RFUQv/OjHFfYdodcGpnGJQ6r99q2gHKNFynFm4C8Lo="; + hash = "sha256-dYkxKDUBldzW77R8/+MdkQopcanFfaKP0VbQDCIUqz0="; }; installPhase = '' diff --git a/pkgs/by-name/pl/plemoljp/package.nix b/pkgs/by-name/pl/plemoljp/package.nix index 3ecde0aa98ed..0efdc6d58089 100644 --- a/pkgs/by-name/pl/plemoljp/package.nix +++ b/pkgs/by-name/pl/plemoljp/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "plemoljp"; - version = "2.0.0"; + version = "2.0.2"; src = fetchzip { url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_v${version}.zip"; - hash = "sha256-6u7JfU5fYGGKcvLocKaT5rRun/CYhzk80rmlvP+utuM="; + hash = "sha256-e2uhDJfw3/Aisjo0ezVyxfvhBVagggTC87DSxIzbLoI="; }; installPhase = '' diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix index de8b38dcb822..618adb2ab8d0 100644 --- a/pkgs/by-name/po/pocketbase/package.nix +++ b/pkgs/by-name/po/pocketbase/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.23.12"; + version = "0.24.1"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-qYhy6fuyfgBd0Up9HXqnrXxoVqJD02r7IvtCpqGLNTg="; + hash = "sha256-SbcCa4ckRso/NzStIiFHmBWKdjbg01L/WMDgfduqnwA="; }; - vendorHash = "sha256-R/ZnPQSmiRSypCny/xnozUhEhVWpg0YkSbNJ6p6KV6Q="; + vendorHash = "sha256-YgQwi6eqW1mwUwfQ58Y0PHggGiglMmjBwuDHckP9X9o="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix index ff3abe44fc67..68526526ce86 100644 --- a/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix +++ b/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "poetry-plugin-shell"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-plugin-shell"; tag = version; - hash = "sha256-ynbZCzic6bAIwtG0rGk4oMPc8pm59UFboNAGUb0qJnE="; + hash = "sha256-BntObwrW7xt1gYWpckLJF7GklkmUJMh8D1IUwCcOOl4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index fa61f5c90ddd..28596726fba5 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -17,7 +17,7 @@ let django-bootstrap4 = prev.django-bootstrap4.overridePythonAttrs (oldAttrs: rec { version = "3.0.0"; src = oldAttrs.src.override { - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-a8BopUwZjmvxOzBVqs4fTo0SY8sEEloGUw90daYWfz8="; }; diff --git a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix index 99645faf4e4e..9533883d2252 100644 --- a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix +++ b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "connectrpc"; repo = "connect-go"; tag = "v${version}"; - hash = "sha256-GF7J21Y27LmKuDjuk2omQo2xV5pDo2GQXyu9SLwG0fs="; + hash = "sha256-/RfGduRfXEZO66qhKOOMpESNxBghjqf/vbg1gkCPyHM="; }; vendorHash = "sha256-j5T1Ho3K0kPZOo5LA6Md06W/gF6DmEElGt9BvceBtTo="; diff --git a/pkgs/by-name/pr/protolint/package.nix b/pkgs/by-name/pr/protolint/package.nix index 620964b440e5..0b9b38734c58 100644 --- a/pkgs/by-name/pr/protolint/package.nix +++ b/pkgs/by-name/pr/protolint/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "protolint"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "yoheimuta"; repo = pname; rev = "v${version}"; - hash = "sha256-q5Ck9p4UXmOur4mtQZ8nbBeXKCi5F++N5JU+E+sSHFk="; + hash = "sha256-nghe8arZwXzuZnGuVnhDnyEEgdLF1oImIy4E1jW37RQ="; }; - vendorHash = "sha256-u4KLYzM1A3t7qdIdbOw6rYPIBnO7TXKjxSgSUNB+Pcg="; + vendorHash = "sha256-3J72Pb4XqMptEXANYgNgvWGdD+z0mP7Nnx3C9Wp22s0="; # Something about the way we run tests causes issues. It doesn't happen # when using "go test" directly: diff --git a/pkgs/by-name/pr/proxmox-backup-client/package.nix b/pkgs/by-name/pr/proxmox-backup-client/package.nix index 2ba4618160d0..bf5e4a29ecde 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/package.nix +++ b/pkgs/by-name/pr/proxmox-backup-client/package.nix @@ -25,7 +25,7 @@ let proxmox-backup_src = fetchgit { url = "git://git.proxmox.com/git/proxmox-backup.git"; - rev = "ed8bc69a50301ad420366d8431a7891b4992408d"; # no version tag unfortunately + tag = "v${version}"; name = "proxmox-backup"; hash = "sha256-0piUftzuK9e8KbOe+bc3SXWa0DlnEgk5iNGWGn4fw7Y="; }; diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index 2822e743b09f..16a5d2ace96d 100644 --- a/pkgs/by-name/py/pyfa/package.nix +++ b/pkgs/by-name/py/pyfa/package.nix @@ -6,6 +6,8 @@ adwaita-icon-theme, wrapGAppsHook3, gdk-pixbuf, + makeDesktopItem, + copyDesktopItems, }: let version = "2.61.3"; @@ -22,6 +24,17 @@ python3Packages.buildPythonApplication rec { hash = "sha256-i8NcRTn817gqwQP6j0RPUJkq09eTI4nfe3EVqYnWRpo="; }; + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "${pname} %U"; + icon = "pyfa"; + desktopName = pname; + genericName = "Python fitting assistant for Eve Online"; + categories = [ "Game" ]; + }) + ]; + build-system = [ python3Packages.setuptools ]; dependencies = with python3Packages; [ wxpython @@ -50,6 +63,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.pyinstaller wrapGAppsHook3 + copyDesktopItems ]; # @@ -90,12 +104,18 @@ python3Packages.buildPythonApplication rec { # exposing the innards of pyfa to the rest of the env. # installPhase = '' + runHook preInstall + mkdir -p $out/bin mkdir -p $out/share/pixmaps + mkdir -p $out/share/icons/hicolor/64x64/apps/ cp -r dist/pyfa $out/share/ cp imgs/gui/pyfa64.png $out/share/pixmaps/pyfa.png + cp imgs/gui/pyfa64.png $out/share/icons/hicolor/64x64/apps/${pname}.png ln -sf $out/share/pyfa/pyfa $out/bin/pyfa + + runHook postInstall ''; fixupPhase = '' diff --git a/pkgs/by-name/ra/rare-regex/package.nix b/pkgs/by-name/ra/rare-regex/package.nix index a87471ce5833..671550c39555 100644 --- a/pkgs/by-name/ra/rare-regex/package.nix +++ b/pkgs/by-name/ra/rare-regex/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "rare"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "zix99"; repo = "rare"; rev = version; - hash = "sha256-UKxgzLXAXgedR0i3dREjrCNhtksg4LNO6ZM25+8EE7g="; + hash = "sha256-Sc8Ek1JfagqEDZ1Ci2UdqDkKZbQ6klH+uICML/ifO0Q="; }; vendorHash = "sha256-wUOtxNjL/4MosACCzPTWKWrnMZhxINfN1ppkRsqDh9M="; diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix index 9727352387b4..25876498160a 100644 --- a/pkgs/by-name/rm/rmpc/package.nix +++ b/pkgs/by-name/rm/rmpc/package.nix @@ -53,6 +53,6 @@ rustPlatform.buildRustPackage rec { bloxx12 ]; mainProgram = "rmpc"; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix index 43dc1cf733db..f57afe0a066f 100644 --- a/pkgs/by-name/rq/rqbit/package.nix +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -68,6 +68,8 @@ rustPlatform.buildRustPackage { doCheck = false; + passthru.webui = rqbit-webui; + meta = with lib; { description = "Bittorrent client in Rust"; homepage = "https://github.com/ikatson/rqbit"; diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix index 2e40ec4a4494..578a3f5a240e 100644 --- a/pkgs/by-name/rq/rquickshare/package.nix +++ b/pkgs/by-name/rq/rquickshare/package.nix @@ -1,34 +1,123 @@ { - appimageTools, lib, - fetchurl, + cargo-tauri, + cargo-tauri_1, + fetchFromGitHub, + glib-networking, + libayatana-appindicator, + libsoup_2_4, + libsoup_3, + nix-update, + nodejs, + openssl, + perl, + pkg-config, + pnpm, + protobuf, + rustPlatform, + stdenv, + webkitgtk_4_0, + webkitgtk_4_1, + wrapGAppsHook4, + writeShellScript, + + # This package provides can be built using tauri v1 or v2. + # Try legacy (v1) version if main (v2) doesn't work. + app-type ? "main", # main or legacy }: let - pname = "rquickshare"; - version = "0.11.2"; - src = fetchurl { - url = "https://github.com/Martichou/rquickshare/releases/download/v${version}/r-quick-share-legacy_v${version}_glibc-2.31_amd64.AppImage"; - hash = "sha256-VXYiYrTSedH8xFjuxbdplzVdfnO6s3ftY2I121Unlfw="; - }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + app-type-either = + arg1: arg2: + if app-type == "main" then + arg1 + else if app-type == "legacy" then + arg2 + else + throw "Wrong argument for app-type in rquickshare package"; + + proper-cargo-tauri = app-type-either cargo-tauri cargo-tauri_1; in -appimageTools.wrapType2 { - inherit pname version src; - extraInstallCommands = '' - install -Dm444 ${appimageContents}/r-quick-share.desktop -t $out/share/applications - substituteInPlace $out/share/applications/r-quick-share.desktop \ - --replace-fail 'Exec=r-quick-share' 'Exec=r-quick-share %u' - cp -r ${appimageContents}/usr/share/icons $out/share +rustPlatform.buildRustPackage rec { + pname = "rquickshare" + (app-type-either "" "-legacy"); + version = "0.11.3"; + + src = fetchFromGitHub { + owner = "Martichou"; + repo = "rquickshare"; + tag = "v${version}"; + hash = "sha256-6gXt1UGcjOFInsCep56s3K5Zk/KIz2ZrFlmrgXP7/e8="; + }; + + # from https://github.com/NixOS/nixpkgs/blob/04e40bca2a68d7ca85f1c47f00598abb062a8b12/pkgs/by-name/ca/cargo-tauri/test-app.nix#L23-L26 + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" ''; + pnpmRoot = "app/${app-type}"; + pnpmDeps = pnpm.fetchDeps { + inherit pname version src; + + sourceRoot = "${src.name}/app/${app-type}"; + hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-sDHysaKMdNcbL1szww7/wg0bGHOnEKsKoySZJJCcPik="; + }; + + useFetchCargoVendor = true; + cargoRoot = "app/${app-type}/src-tauri"; + buildAndTestSubdir = cargoRoot; + cargoPatches = [ ./remove-duplicate-versions-of-sys-metrics.patch ]; + cargoHash = app-type-either "sha256-R1RDBV8lcEuFdkh9vrNxFRSPSYVOWDvafPQAmQiJV2s=" "sha256-tgnSOICA/AFASIIlxnRoSjq5nx30Z7C6293bcvnWl0k="; + + nativeBuildInputs = [ + proper-cargo-tauri.hook + + # Setup pnpm + nodejs + pnpm.configHook + + # Make sure we can find our libraries + perl + pkg-config + protobuf + wrapGAppsHook4 + ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + glib-networking + libayatana-appindicator + ] + ++ lib.optionals (app-type == "main") [ + webkitgtk_4_1 + libsoup_3 + ] + ++ lib.optionals (app-type == "legacy") [ + webkitgtk_4_0 + libsoup_2_4 + ]; + + passthru.updateScript = + let + updateScript = writeShellScript "update-rquickshare.sh" '' + ${lib.getExe nix-update} rquickshare + sed -i 's/version = "0.0.0";/' pkgs/by-name/rq/rquickshare/package.nix + ${lib.getExe nix-update} rquickshare-legacy + ''; + in + # Don't set an update script for the legacy version + # so r-ryantm won't create two duplicate PRs + app-type-either updateScript null; + meta = { - description = "Rust implementation of NearbyShare/QuickShare from Android for Linux"; + description = "Rust implementation of NearbyShare/QuickShare from Android for Linux and macOS"; homepage = "https://github.com/Martichou/rquickshare"; changelog = "https://github.com/Martichou/rquickshare/blob/v${version}/CHANGELOG.md"; license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.luftmensch-luftmensch ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - mainProgram = "rquickshare"; + mainProgram = app-type-either "rquickshare" "r-quick-share"; + maintainers = with lib.maintainers; [ + perchun + luftmensch-luftmensch + ]; }; } diff --git a/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch b/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch new file mode 100644 index 000000000000..b5128e047838 --- /dev/null +++ b/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch @@ -0,0 +1,116 @@ +diff --git a/app/legacy/src-tauri/Cargo.lock b/app/legacy/src-tauri/Cargo.lock +index 109db68..c3a70c6 100644 +--- a/app/legacy/src-tauri/Cargo.lock ++++ b/app/legacy/src-tauri/Cargo.lock +@@ -4138,7 +4138,7 @@ dependencies = [ + "rand 0.8.5", + "serde", + "sha2", +- "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)", ++ "sys_metrics", + "tokio", + "tokio-util", + "tracing-subscriber", +@@ -4158,7 +4158,7 @@ dependencies = [ + "rqs_lib", + "serde", + "serde_json", +- "sys_metrics 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "sys_metrics", + "tauri", + "tauri-build", + "tauri-plugin-autostart", +@@ -4759,22 +4759,7 @@ dependencies = [ + [[package]] + name = "sys_metrics" + version = "0.2.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c9b266b80f59f86e2e1e0a4938e316e32c3730d94a749f236305152279f77484" +-dependencies = [ +- "core-foundation-sys", +- "glob", +- "io-kit-sys", +- "lazy_static", +- "libc", +- "mach", +- "serde", +-] +- +-[[package]] +-name = "sys_metrics" +-version = "0.2.7" +-source = "git+https://github.com/Martichou/sys_metrics#c0f4ec7b9156d3ab83ee61276984c7fd4e632098" ++source = "git+https://github.com/Martichou/sys_metrics#e5b324a17d1724bd97923a173c3535cc06a44b0c" + dependencies = [ + "core-foundation-sys", + "glob", +diff --git a/app/legacy/src-tauri/Cargo.toml b/app/legacy/src-tauri/Cargo.toml +index 5468707..68ed47b 100644 +--- a/app/legacy/src-tauri/Cargo.toml ++++ b/app/legacy/src-tauri/Cargo.toml +@@ -20,7 +20,7 @@ notify-rust = "4.10" + rqs_lib = { path = "../../../core_lib", features = ["experimental"] } + serde = { version = "1.0", features = ["derive"] } + serde_json = "1.0" +-sys_metrics = "0.2" ++sys_metrics = { git = "https://github.com/Martichou/sys_metrics" } + tauri = { version = "1.5", features = ["api-all", "reqwest-native-tls-vendored", "system-tray", "devtools"] } + tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } + tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } +diff --git a/app/main/src-tauri/Cargo.lock b/app/main/src-tauri/Cargo.lock +index c1f175c..7bf1450 100644 +--- a/app/main/src-tauri/Cargo.lock ++++ b/app/main/src-tauri/Cargo.lock +@@ -4182,7 +4182,7 @@ dependencies = [ + "rand 0.8.5", + "serde", + "sha2", +- "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)", ++ "sys_metrics", + "tokio", + "tokio-util", + "tracing-subscriber", +@@ -4202,7 +4202,7 @@ dependencies = [ + "rqs_lib", + "serde", + "serde_json", +- "sys_metrics 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "sys_metrics", + "tauri", + "tauri-build", + "tauri-plugin-autostart", +@@ -4867,21 +4867,6 @@ dependencies = [ + "syn 2.0.95", + ] + +-[[package]] +-name = "sys_metrics" +-version = "0.2.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c9b266b80f59f86e2e1e0a4938e316e32c3730d94a749f236305152279f77484" +-dependencies = [ +- "core-foundation-sys", +- "glob", +- "io-kit-sys", +- "lazy_static", +- "libc", +- "mach", +- "serde", +-] +- + [[package]] + name = "sys_metrics" + version = "0.2.7" +diff --git a/app/main/src-tauri/Cargo.toml b/app/main/src-tauri/Cargo.toml +index 90dcc88..56abae2 100644 +--- a/app/main/src-tauri/Cargo.toml ++++ b/app/main/src-tauri/Cargo.toml +@@ -20,7 +20,7 @@ notify-rust = "4.10" + rqs_lib = { path = "../../../core_lib", features = ["experimental"] } + serde = { version = "1.0", features = ["derive"] } + serde_json = "1.0" +-sys_metrics = "0.2" ++sys_metrics = { git = "https://github.com/Martichou/sys_metrics" } + tauri = { version = "2.2", features = [ "devtools", "tray-icon", "native-tls-vendored"] } + tauri-plugin-autostart = "2.2" + tauri-plugin-process = "2.2" diff --git a/pkgs/by-name/ru/rutorrent/package.nix b/pkgs/by-name/ru/rutorrent/package.nix index 774cd0bc3961..a587eebdd670 100644 --- a/pkgs/by-name/ru/rutorrent/package.nix +++ b/pkgs/by-name/ru/rutorrent/package.nix @@ -4,28 +4,29 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rutorrent"; version = "5.1.5"; src = fetchFromGitHub { owner = "Novik"; repo = "ruTorrent"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-si/6iZMipfm18lrwjJvuL+vQco0l+HresUEv2gj1uRw="; }; installPhase = '' runHook preInstall - mkdir -p $out/ - cp -r . $out/ - runHook postInstall; + mkdir -p "$out" + cp -r . "$out" + runHook postInstall ''; - meta = with lib; { + meta = { + changelog = "https://github.com/Novik/ruTorrent/releases/tag/v${finalAttrs.version}"; description = "Yet another web front-end for rTorrent"; homepage = "https://github.com/Novik/ruTorrent"; - license = licenses.gpl3Plus; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/se/setbfree/package.nix b/pkgs/by-name/se/setbfree/package.nix index 64211ac59fcc..27b92a83b0c1 100644 --- a/pkgs/by-name/se/setbfree/package.nix +++ b/pkgs/by-name/se/setbfree/package.nix @@ -13,28 +13,22 @@ libGL, pkg-config, ttf_bitstream_vera, + nix-update-script, }: - -stdenv.mkDerivation rec { +let + version = "0.8.13"; +in +stdenv.mkDerivation { pname = "setbfree"; - version = "0.8.12"; + inherit version; src = fetchFromGitHub { owner = "pantherb"; repo = "setBfree"; rev = "v${version}"; - hash = "sha256-e/cvD/CtT8dY1lYcsZ21DC8pNqKXqKfC/eRXX8k01eI="; + hash = "sha256-jtiyJntaFnAVeC1Rvkzi3wNodyJpEQKgnOAP7++36wo="; }; - patches = [ - # link with -lGL can remove on next update - (fetchpatch { - name = "ui-add-lGL.patch"; - url = "https://github.com/pantherb/setBfree/commit/756437db43fbf5481f101d8fc695f8b11192047f.patch"; - hash = "sha256-49PYTayD4TchAApfFvj3DLc4EBTxH8LYx48TtdSRwwA="; - }) - ]; - postPatch = '' substituteInPlace common.mak \ --replace /usr/local "$out" \ @@ -65,14 +59,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "DSP tonewheel organ emulator"; homepage = "https://setbfree.org"; - license = licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; # fails on ARM and Darwin - maintainers = [ ]; + broken = stdenv.hostPlatform.isAarch64; + maintainers = [ lib.maintainers.l1npengtul ]; }; } diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 56ca7af34eb9..3d45a3bf5813 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250106"; + version = "20250107"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-sCJA9Rns5kGYHM5D/lCqXk81m0R0T6mAigAogkcfYL0="; + hash = "sha256-NXV9QK7Ssj0wXS3bjYyHtJrhZxEH3lLGIzMPEE4FLMA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sm/smap/package.nix b/pkgs/by-name/sm/smap/package.nix new file mode 100644 index 000000000000..bad8a00ece3a --- /dev/null +++ b/pkgs/by-name/sm/smap/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + gitUpdater, +}: + +buildGoModule rec { + pname = "smap"; + version = "0.1.12"; + + src = fetchFromGitHub { + owner = "s0md3v"; + repo = "Smap"; + tag = version; + hash = "sha256-GLw0zgjWnEwtwRV4vTHqGUS6TqcFhhZ1zeThKe6S0CY="; + }; + + vendorHash = "sha256-19plbD+ibjoqAA6gGhCvpO52z/VejJkRRh8ljBHN+qY="; + + subPackages = [ "cmd/smap" ]; + + ldflags = [ + "-s" + "-w" + ]; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "Drop-in replacement for Nmap powered by shodan.io"; + homepage = "https://github.com/s0md3v/Smap"; + changelog = "https://github.com/s0md3v/Smap/releases/tag/${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ yechielw ]; + mainProgram = "smap"; + }; +} diff --git a/pkgs/by-name/sp/splitcode/add-stdint.patch b/pkgs/by-name/sp/splitcode/add-stdint.patch deleted file mode 100644 index e502856b5596..000000000000 --- a/pkgs/by-name/sp/splitcode/add-stdint.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/SplitCode.h b/src/SplitCode.h -index 45c199c..fb05250 100644 ---- a/src/SplitCode.h -+++ b/src/SplitCode.h -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - #if defined(_MSVC_LANG) - #define SPLITCODE_CPP_VERSION _MSVC_LANG diff --git a/pkgs/by-name/sp/splitcode/package.nix b/pkgs/by-name/sp/splitcode/package.nix index a63a9b43681a..5e59f7c88be9 100644 --- a/pkgs/by-name/sp/splitcode/package.nix +++ b/pkgs/by-name/sp/splitcode/package.nix @@ -5,9 +5,10 @@ cmake, libcxx, zlib, + nix-update-script, }: let - version = "0.30.0"; + version = "0.31.2"; in stdenv.mkDerivation { pname = "splitcode"; @@ -16,12 +17,10 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "pachterlab"; repo = "splitcode"; - rev = "v${version}"; - hash = "sha256-g38pJFP9uA2P5ktogAPXKgPtsEJn5vtnK5HClqqezmg="; + tag = "v${version}"; + hash = "sha256-fIx8EXdhkIkWmb86HKlUPSgsKvbGcrKsuNMWo8kU+Aw="; }; - patches = [ ./add-stdint.patch ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -36,6 +35,8 @@ stdenv.mkDerivation { bash ./func_tests/runtests.sh ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Tool for flexible, efficient parsing, interpreting, and editing of technical sequences in sequencing reads"; homepage = "https://github.com/pachterlab/splitcode"; @@ -43,5 +44,9 @@ stdenv.mkDerivation { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ zimward ]; mainProgram = "splitcode"; + badPlatforms = [ + # Test hangs indefinitely. See https://github.com/pachterlab/splitcode/issues/31 + "aarch64-linux" + ]; }; } diff --git a/pkgs/by-name/sq/squeekboard/package.nix b/pkgs/by-name/sq/squeekboard/package.nix index edcc1938c854..811a1eb65f23 100644 --- a/pkgs/by-name/sq/squeekboard/package.nix +++ b/pkgs/by-name/sq/squeekboard/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "1.41.0"; + version = "1.43.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - hash = "sha256-WHGdA0cEB1nu7vJ+pwjdl8aZzccJ232vsbSGmZohFVo="; + hash = "sha256-UsUr4UnYNo2ybEdNyOD/IiafEZ1YJFwRQ3CVy76X2H0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-CRKaH8cA/EhXQna3zCU0Z06zkB9qu6QxPJ4No3NFcs0="; + hash = "sha256-1yBGn8cZxwpEOeF2BcUIIcI4Uxn80vRau/MvlufX9GU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix index b2a8d4d4978c..c84c66a4d655 100644 --- a/pkgs/by-name/ta/tabiew/package.nix +++ b/pkgs/by-name/ta/tabiew/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "tabiew"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "shshemi"; repo = "tabiew"; rev = "v${version}"; - hash = "sha256-/AfhYr93OOtI2I8IDrXXH1zhCJcXNZM19RuKfOe5ikk="; + hash = "sha256-Q/GX3kcGx83h0XFlG0r2RGpoh63ijnaM4mp/ewrf920="; }; - cargoHash = "sha256-j68IAbjc9xlb9QKdXKmxjI9OTenDSrZoqZ5UJeLGJes="; + cargoHash = "sha256-gG9zb4DrgTiYOQ2ZFHz0Dcc0koa0++G6hNWtbfnJle0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 9f4e711cbd0f..60c4e08c658f 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "television"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; - rev = "refs/tags/" + version; - hash = "sha256-LzO6LpKsox5U2IHYZXDDkUbPeZmAa/gBpG6nk78tIzQ="; + tag = version; + hash = "sha256-p6RuLuhtgVOa8+l0JU5byQ4SHG/TmURPlZUMNVqvfp8="; }; - cargoHash = "sha256-I0muMgPfk72dnR4iufipjt+C7v6X/IMOdLCH12qHjA8="; + cargoHash = "sha256-0tXsoKSQ0c3po75oMd6LTG+HSkKr5UvI0lBg6FySwfs="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix index be57a7668331..1630d33ba1d0 100644 --- a/pkgs/by-name/te/terramate/package.nix +++ b/pkgs/by-name/te/terramate/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "terramate"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-xEV72bswFW7ie3FWa07vmffIXMIi0A5ZSpg6wRS7o5g="; + hash = "sha256-MqJc1gi+Din7G+WxOQaZmXvDvN9YXRIevenFK1m72S0="; }; vendorHash = "sha256-6nnUyNOdG1QmaHeRXRWvyjLhYPXA3Xs9062ZkF82Kzo="; diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index c46c3b4c1892..699f0cbe3142 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -7,17 +7,20 @@ python3.pkgs.buildPythonApplication rec { pname = "troubadix"; - version = "24.11.0"; + version = "25.1.0"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "troubadix"; tag = "v${version}"; - hash = "sha256-N+XZXXGIoZ9wN4GU0iHEEY8D/buFQ/5om86FTgAyvyw="; + hash = "sha256-cb9U1xxN5pUVRiB8JKCWd4XtnkH72XH7QnvFATXaPgY="; }; - pythonRelaxDeps = [ "validators" ]; + pythonRelaxDeps = [ + "pontos" + "validators" + ]; build-system = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/by-name/tw/twitch-dl/package.nix b/pkgs/by-name/tw/twitch-dl/package.nix index a97fcc1617b3..da8f29499c11 100644 --- a/pkgs/by-name/tw/twitch-dl/package.nix +++ b/pkgs/by-name/tw/twitch-dl/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "twitch-dl"; - version = "2.9.3"; + version = "2.9.4"; pyproject = true; src = fetchFromGitHub { owner = "ihabunek"; repo = "twitch-dl"; tag = version; - hash = "sha256-kkSCkSFY6UQWtzKOTJ187SDQsb+O5VRR2PRjazC83i0="; + hash = "sha256-kc/YU37q91IBcX4JOzN9549OX0jDYFTvI9g7OqN/IXs="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/uc/ucspi-tcp/package.nix b/pkgs/by-name/uc/ucspi-tcp/package.nix index 40a5533d332f..971f85f8eff0 100644 --- a/pkgs/by-name/uc/ucspi-tcp/package.nix +++ b/pkgs/by-name/uc/ucspi-tcp/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchurl, + fetchzip, + quilt, }: stdenv.mkDerivation rec { @@ -13,21 +15,22 @@ stdenv.mkDerivation rec { sha256 = "171yl9kfm8w7l17dfxild99mbf877a9k5zg8yysgb1j8nz51a1ja"; }; - # Plain upstream tarball doesn't build, get patches from Debian patches = [ - (fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/u/ucspi-tcp/ucspi-tcp_0.88-3.diff.gz"; - sha256 = "0mzmhz8hjkrs0khmkzs5i0s1kgmgaqz07h493bd5jj5fm5njxln6"; - }) ./remove-setuid.patch ]; - # Apply Debian patches + debian = fetchzip { + url = "http://ftp.de.debian.org/debian/pool/main/u/ucspi-tcp/ucspi-tcp_0.88-11.debian.tar.xz"; + sha256 = "0x8h46wkm62dvyj1acsffcl4s06k5zh6139qxib3zzhk716hv5xg"; + }; + + nativeBuildInputs = [ + quilt + ]; + + # Plain upstream tarball doesn't build, apply patches from Debian postPatch = '' - for fname in debian/diff/*.diff; do - echo "Applying patch $fname" - patch < "$fname" - done + QUILT_PATCHES=$debian/patches quilt push -a ''; # The build system is weird; 'make install' doesn't install anything, instead @@ -40,7 +43,7 @@ stdenv.mkDerivation rec { preBuild = '' echo "$out" > conf-home - echo "main() { return 0; }" > chkshsgr.c + echo "int main() { return 0; }" > chkshsgr.c ''; installPhase = '' @@ -51,7 +54,7 @@ stdenv.mkDerivation rec { ./install # Install Debian man pages (upstream has none) - cp debian/ucspi-tcp-man/*.1 "$out/share/man/man1" + cp $debian/ucspi-tcp-man/*.1 "$out/share/man/man1" ''; meta = with lib; { diff --git a/pkgs/by-name/va/vanillatd/package.nix b/pkgs/by-name/va/vanillatd/package.nix index 1322e4941d75..73754e32c14c 100644 --- a/pkgs/by-name/va/vanillatd/package.nix +++ b/pkgs/by-name/va/vanillatd/package.nix @@ -3,20 +3,27 @@ stdenv, stdenvNoCC, fetchFromGitHub, - fetchurl, - cmake, - pkg-config, - git, - libcxx, + + # buildInputs SDL2, + libcxx, openal, + + # nativeBuildInputs + cmake, + git, + pkg-config, imagemagick, libicns, - symlinkJoin, - unar, - rsync, - makeDesktopItem, copyDesktopItems, + + makeDesktopItem, + + # passthru + callPackage, + symlinkJoin, + rsync, + appName, CMAKE_BUILD_TYPE ? "RelWithDebInfo", # "Choose the type of build, recommended options are: Debug Release RelWithDebInfo" }: @@ -39,19 +46,20 @@ stdenv.mkDerivation (finalAttrs: { NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; buildInputs = [ - libcxx SDL2 + libcxx openal ]; + nativeBuildInputs = [ cmake - pkg-config git + pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libicns imagemagick + libicns ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems @@ -112,6 +120,51 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + passthru = + let + packages = callPackage ./passthru-packages.nix { inherit appName; }; + in + { + inherit packages; + + withPackages = + cb: + let + dataDerivation = symlinkJoin { + name = "${appName}-data"; + paths = if builtins.isFunction cb then cb packages else cb; + }; + in + stdenvNoCC.mkDerivation { + pname = "${appName}-with-packages"; + inherit (finalAttrs.finalPackage) version meta; + + buildInputs = [ dataDerivation ] ++ finalAttrs.buildInputs; + nativeBuildInputs = [ rsync ]; + + phases = [ "buildPhase" ]; + buildPhase = + let + Default_Data_Path = + if stdenv.isDarwin then + "$out/Applications/${appName}.app/Contents/share/${appName}" + else + "$out/share/${appName}"; + in + '' + # The default Data_Path() is rely on the Program_Path(), which is the real path of executable, so we need to make executable non symlink here. + rsync --archive --mkpath --chmod=a+w ${finalAttrs.finalPackage}/ $out/ + + # Symlink the data derivation to the default data path + mkdir -p ${builtins.dirOf Default_Data_Path} + ln -s ${dataDerivation} ${Default_Data_Path} + + # Fix `error: suspicious ownership or permission on '/nix/store/xxx-0.0.0' for output 'out'; rejecting this build output` + chmod 755 $out + ''; + }; + }; + meta = { description = { @@ -127,138 +180,4 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ xiaoxiangmoe ]; platforms = with lib.platforms; darwin ++ linux; }; - passthru = rec { - packages = - builtins.mapAttrs - ( - name: buildPhase: - stdenvNoCC.mkDerivation { - inherit name buildPhase; - phases = [ "buildPhase" ]; - nativeBuildInputs = [ unar ]; - meta = { - sourceProvenance = with lib.sourceTypes; [ - binaryBytecode - ]; - license = with lib.licenses; [ - unfree - ]; - }; - } - ) - ( - if appName == "vanillatd" then - let - CCDEMO1_ZIP = fetchurl { - url = "https://archive.org/download/CommandConquerDemo/cc1demo1.zip"; - hash = "sha256-KdM4SctFCocmJCbMWbJbql4DO5TC40leyU+BPzvAn4c="; - }; - CCDEMO2_ZIP = fetchurl { - url = "https://archive.org/download/CommandConquerDemo/cc1demo2.zip"; - hash = "sha256-pCgEuE5AFcJur3qUOTmP3GCb/Wp7p7JyVn8Yeq17PEg="; - }; - demo = '' - unar -no-directory ${CCDEMO1_ZIP} DEMO.MIX DEMOL.MIX SOUNDS.MIX SPEECH.MIX - unar -no-directory ${CCDEMO2_ZIP} DEMOM.MIX - mkdir -p $out - mv DEMO.MIX $out/demo.mix - mv DEMOL.MIX $out/demol.mix - mv SOUNDS.MIX $out/sounds.mix - mv SPEECH.MIX $out/speech.mix - mv DEMOM.MIX $out/demom.mix - ''; - in - # see https://github.com/TheAssemblyArmada/Vanilla-Conquer/wiki/Installing-VanillaTD - { - inherit demo; - } - else if appName == "vanillara" then - let - RA95DEMO_ZIP = fetchurl { - url = "https://archive.org/download/CommandConquerRedAlert_1020/ra95demo.zip"; - hash = "sha256-jEi9tTUj6k01OnkU2SNM5OPm9YMu60eztrAFhT6HSNI="; - }; - demo = '' - unar -no-directory ${RA95DEMO_ZIP} ra95demo/INSTALL/MAIN.MIX ra95demo/INSTALL/REDALERT.MIX - install -D ra95demo/INSTALL/REDALERT.MIX $out/redalert.mix - install -D ra95demo/INSTALL/MAIN.MIX $out/main.mix - ''; - REDALERT_ALLIED_ISO = fetchurl { - url = "https://archive.org/download/cnc-red-alert/redalert_allied.iso"; - hash = "sha256-Npx6hSTJetFlcb/Fi3UQEGuP0iLk9LIrRmAI7WgEtdw="; - }; - REDALERT_SOVIETS_ISO = fetchurl { - url = "https://archive.org/download/cnc-red-alert/redalert_soviets.iso"; - hash = "sha256-aJGr+w1BaGaLwX/pU0lMmu6Cgn9pZ2D/aVafBdtds2Q="; - }; - retail-allied = '' - unar -output-directory allied -no-directory ${REDALERT_ALLIED_ISO} MAIN.MIX INSTALL/REDALERT.MIX - mkdir -p $out/allied/ - mv allied/INSTALL/REDALERT.MIX $out/redalert.mix - mv allied/MAIN.MIX $out/allied/main.mix - ''; - retail-soviet = '' - unar -output-directory soviet -no-directory ${REDALERT_SOVIETS_ISO} MAIN.MIX INSTALL/REDALERT.MIX - mkdir -p $out/soviet/ - mv soviet/INSTALL/REDALERT.MIX $out/redalert.mix - mv soviet/MAIN.MIX $out/soviet/main.mix - ''; - retail = '' - unar -output-directory allied -no-directory ${REDALERT_ALLIED_ISO} MAIN.MIX INSTALL/REDALERT.MIX - unar -output-directory soviet -no-directory ${REDALERT_SOVIETS_ISO} MAIN.MIX - mkdir -p $out/allied/ $out/soviet/ - mv allied/INSTALL/REDALERT.MIX $out/redalert.mix - mv allied/MAIN.MIX $out/allied/main.mix - mv soviet/MAIN.MIX $out/soviet/main.mix - ''; - in - # see https://github.com/TheAssemblyArmada/Vanilla-Conquer/wiki/Installing-VanillaRA - { - inherit - demo - retail-allied - retail-soviet - retail - ; - } - else - { } - ); - withPackages = - cb: - let - dataDerivation = symlinkJoin { - name = "${appName}-data"; - paths = if builtins.isFunction cb then cb packages else cb; - }; - in - stdenvNoCC.mkDerivation { - pname = "${appName}-with-packages"; - inherit (finalAttrs.finalPackage) version meta; - - buildInputs = [ dataDerivation ] ++ finalAttrs.buildInputs; - nativeBuildInputs = [ rsync ]; - - phases = [ "buildPhase" ]; - buildPhase = - let - Default_Data_Path = - if stdenv.isDarwin then - "$out/Applications/${appName}.app/Contents/share/${appName}" - else - "$out/share/${appName}"; - in - '' - # The default Data_Path() is rely on the Program_Path(), which is the real path of executable, so we need to make executable non symlink here. - rsync --archive --mkpath --chmod=a+w ${finalAttrs.finalPackage}/ $out/ - - # Symlink the data derivation to the default data path - mkdir -p ${builtins.dirOf Default_Data_Path} - ln -s ${dataDerivation} ${Default_Data_Path} - - # Fix `error: suspicious ownership or permission on '/nix/store/xxx-0.0.0' for output 'out'; rejecting this build output` - chmod 755 $out - ''; - }; - }; }) diff --git a/pkgs/by-name/va/vanillatd/passthru-packages.nix b/pkgs/by-name/va/vanillatd/passthru-packages.nix new file mode 100644 index 000000000000..145871ef806e --- /dev/null +++ b/pkgs/by-name/va/vanillatd/passthru-packages.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenvNoCC, + unar, + appName, + fetchurl, + ... +}: +builtins.mapAttrs + ( + name: buildPhase: + stdenvNoCC.mkDerivation { + inherit name buildPhase; + phases = [ "buildPhase" ]; + nativeBuildInputs = [ unar ]; + meta = { + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + ]; + license = with lib.licenses; [ + unfree + ]; + }; + } + ) + ( + if appName == "vanillatd" then + let + CCDEMO1_ZIP = fetchurl { + url = "https://archive.org/download/CommandConquerDemo/cc1demo1.zip"; + hash = "sha256-KdM4SctFCocmJCbMWbJbql4DO5TC40leyU+BPzvAn4c="; + }; + CCDEMO2_ZIP = fetchurl { + url = "https://archive.org/download/CommandConquerDemo/cc1demo2.zip"; + hash = "sha256-pCgEuE5AFcJur3qUOTmP3GCb/Wp7p7JyVn8Yeq17PEg="; + }; + demo = '' + unar -no-directory ${CCDEMO1_ZIP} DEMO.MIX DEMOL.MIX SOUNDS.MIX SPEECH.MIX + unar -no-directory ${CCDEMO2_ZIP} DEMOM.MIX + mkdir -p $out + mv DEMO.MIX $out/demo.mix + mv DEMOL.MIX $out/demol.mix + mv SOUNDS.MIX $out/sounds.mix + mv SPEECH.MIX $out/speech.mix + mv DEMOM.MIX $out/demom.mix + ''; + in + # see https://github.com/TheAssemblyArmada/Vanilla-Conquer/wiki/Installing-VanillaTD + { + inherit demo; + } + else if appName == "vanillara" then + let + RA95DEMO_ZIP = fetchurl { + url = "https://archive.org/download/CommandConquerRedAlert_1020/ra95demo.zip"; + hash = "sha256-jEi9tTUj6k01OnkU2SNM5OPm9YMu60eztrAFhT6HSNI="; + }; + demo = '' + unar -no-directory ${RA95DEMO_ZIP} ra95demo/INSTALL/MAIN.MIX ra95demo/INSTALL/REDALERT.MIX + install -D ra95demo/INSTALL/REDALERT.MIX $out/redalert.mix + install -D ra95demo/INSTALL/MAIN.MIX $out/main.mix + ''; + REDALERT_ALLIED_ISO = fetchurl { + url = "https://archive.org/download/cnc-red-alert/redalert_allied.iso"; + hash = "sha256-Npx6hSTJetFlcb/Fi3UQEGuP0iLk9LIrRmAI7WgEtdw="; + }; + REDALERT_SOVIETS_ISO = fetchurl { + url = "https://archive.org/download/cnc-red-alert/redalert_soviets.iso"; + hash = "sha256-aJGr+w1BaGaLwX/pU0lMmu6Cgn9pZ2D/aVafBdtds2Q="; + }; + retail-allied = '' + unar -output-directory allied -no-directory ${REDALERT_ALLIED_ISO} MAIN.MIX INSTALL/REDALERT.MIX + mkdir -p $out/allied/ + mv allied/INSTALL/REDALERT.MIX $out/redalert.mix + mv allied/MAIN.MIX $out/allied/main.mix + ''; + retail-soviet = '' + unar -output-directory soviet -no-directory ${REDALERT_SOVIETS_ISO} MAIN.MIX INSTALL/REDALERT.MIX + mkdir -p $out/soviet/ + mv soviet/INSTALL/REDALERT.MIX $out/redalert.mix + mv soviet/MAIN.MIX $out/soviet/main.mix + ''; + retail = '' + unar -output-directory allied -no-directory ${REDALERT_ALLIED_ISO} MAIN.MIX INSTALL/REDALERT.MIX + unar -output-directory soviet -no-directory ${REDALERT_SOVIETS_ISO} MAIN.MIX + mkdir -p $out/allied/ $out/soviet/ + mv allied/INSTALL/REDALERT.MIX $out/redalert.mix + mv allied/MAIN.MIX $out/allied/main.mix + mv soviet/MAIN.MIX $out/soviet/main.mix + ''; + in + # see https://github.com/TheAssemblyArmada/Vanilla-Conquer/wiki/Installing-VanillaRA + { + inherit + demo + retail-allied + retail-soviet + retail + ; + } + else + { } + ) diff --git a/pkgs/by-name/vo/vorbisgain/fprintf.patch b/pkgs/by-name/vo/vorbisgain/fprintf.patch new file mode 100644 index 000000000000..45a6833a446c --- /dev/null +++ b/pkgs/by-name/vo/vorbisgain/fprintf.patch @@ -0,0 +1,12 @@ +--- vorbisgain-0.37/misc.c 2004-01-03 16:17:28.000000000 -0500 ++++ vorbisgain-0.37-patched/misc.c 2025-01-07 20:51:12.989521816 -0500 +@@ -56,8 +56,7 @@ + vfprintf(stderr, message, args); + va_end(args); + +- fprintf(stderr, strerror(err_num)); +- fprintf(stderr, "\n"); ++ fprintf(stderr, "%s\n", strerror(err_num)); + } + + diff --git a/pkgs/by-name/vo/vorbisgain/isatty.patch b/pkgs/by-name/vo/vorbisgain/isatty.patch new file mode 100644 index 000000000000..cb09845f980f --- /dev/null +++ b/pkgs/by-name/vo/vorbisgain/isatty.patch @@ -0,0 +1,10 @@ +--- vorbisgain-0.37/misc.c 2004-01-03 16:17:28.000000000 -0500 ++++ vorbisgain-0.37-patched/misc.c 2025-01-07 20:35:13.056221211 -0500 +@@ -23,6 +23,7 @@ + #else /* WIN32 */ + #include + #include ++#include + + #ifndef DISABLE_WINSIZE + diff --git a/pkgs/by-name/vo/vorbisgain/package.nix b/pkgs/by-name/vo/vorbisgain/package.nix index ca7b62c7715b..6775b8d500fd 100644 --- a/pkgs/by-name/vo/vorbisgain/package.nix +++ b/pkgs/by-name/vo/vorbisgain/package.nix @@ -15,18 +15,16 @@ stdenv.mkDerivation rec { sha256 = "1v1h6mhnckmvvn7345hzi9abn5z282g4lyyl4nnbqwnrr98v0vfx"; }; - hardeningDisable = [ "format" ]; + patches = [ + ./isatty.patch + ./fprintf.patch + ]; buildInputs = [ libogg libvorbis ]; - patchPhase = '' - chmod -v +x configure - configureFlags="--mandir=$out/share/man" - ''; - meta = with lib; { homepage = "https://sjeng.org/vorbisgain.html"; description = "Utility that corrects the volume of an Ogg Vorbis file to a predefined standardized loudness"; diff --git a/pkgs/by-name/wa/warpinator/package.nix b/pkgs/by-name/wa/warpinator/package.nix index 627f7ea4f52f..790470389940 100644 --- a/pkgs/by-name/wa/warpinator/package.nix +++ b/pkgs/by-name/wa/warpinator/package.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "warpinator"; - version = "1.8.7"; + version = "1.8.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-EgTz0i7Dui74xYFShkLox6ITAEAF8yYATEcQ51pc7gA="; + hash = "sha256-aqqKCYlCAL/6srbyYRoVQlIFKpTmwYZsdfLibRyAUXg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ws/wsjtz/package.nix b/pkgs/by-name/ws/wsjtz/package.nix new file mode 100644 index 000000000000..a58b8fda01a5 --- /dev/null +++ b/pkgs/by-name/ws/wsjtz/package.nix @@ -0,0 +1,31 @@ +{ + wsjtx, + fetchzip, + lib, +}: + +wsjtx.overrideAttrs (old: rec { + pname = "wsjtz"; + version = "2.7.0-rc7-1.43"; + + src = fetchzip { + url = "mirror://sourceforge/wsjt-z/Source/wsjtz-${version}.zip"; + hash = "sha256-m+P83S5P9v3NPtifc+XjZm/mAOs+NT9fTWXisxuWtZo="; + }; + + postFixup = '' + mv $out/bin/wsjtx $out/bin/wsjtz + mv $out/bin/wsjtx_app_version $out/bin/wsjtz_app_version + ''; + + meta = { + description = "WSJT-X fork, primarily focused on automation and enhanced functionality"; + homepage = "https://sourceforge.net/projects/wsjt-z/"; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + scd31 + ]; + mainProgram = "wsjtz"; + }; +}) diff --git a/pkgs/by-name/xe/xeol/package.nix b/pkgs/by-name/xe/xeol/package.nix index 884bcfcecea1..c091b51820c0 100644 --- a/pkgs/by-name/xe/xeol/package.nix +++ b/pkgs/by-name/xe/xeol/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "xeol"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "xeol-io"; repo = "xeol"; tag = "v${version}"; - hash = "sha256-4fMH07XKMnpX54mS9pAuTBiHcP6nXj8vpuk3f/3ik+k="; + hash = "sha256-4+3/k46HvNZ+hl6oYAWaRewzz4sPEfO5Tb/vCZyXGkI="; }; - vendorHash = "sha256-MLNUmJOpgKkIe5NUWYMA5avVvt6QLit0i4hpoaadcrs="; + vendorHash = "sha256-OsUsWd5AvNjAJzrC68Ed4+ZAnMY0JLB0d43eUI0Eivg="; proxyVendor = true; diff --git a/pkgs/by-name/zc/zcfan/package.nix b/pkgs/by-name/zc/zcfan/package.nix index b4dfef55272e..d661199e9a8f 100644 --- a/pkgs/by-name/zc/zcfan/package.nix +++ b/pkgs/by-name/zc/zcfan/package.nix @@ -7,13 +7,13 @@ # Testing this requires a Thinkpad or the presence of /proc/acpi/ibm/fan stdenv.mkDerivation (finalAttrs: { pname = "zcfan"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "cdown"; repo = "zcfan"; rev = finalAttrs.version; - hash = "sha256-zpYQEHXt8LBNX+luM4YxP0dKH+hb2c8Z0BEeGP09oZo="; + hash = "sha256-/q9jDqjG4g211CTb4ahagpxux2BsZWTEyoAY8kRRTB8="; }; postPatch = '' @@ -31,13 +31,16 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstallCheck ''; - meta = with lib; { + meta = { description = "Zero-configuration fan daemon for ThinkPads"; mainProgram = "zcfan"; homepage = "https://github.com/cdown/zcfan"; changelog = "https://github.com/cdown/zcfan/tags/${finalAttrs.version}"; - license = licenses.mit; - maintainers = with maintainers; [ kashw2 ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + kashw2 + ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index 2237a8a24497..679b060fb7c1 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -3,25 +3,22 @@ fetchFromGitHub, rustPlatform, pkg-config, - openssl, testers, zizmor, }: rustPlatform.buildRustPackage rec { pname = "zizmor"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "woodruffw"; repo = "zizmor"; tag = "v${version}"; - hash = "sha256-95YtFlnC8xFBz1v+qC3rh7jEUp+4JBoMGgVQd/6IFwE="; + hash = "sha256-1NpwBjJlpaP3iyTfrgMwO/1qR74/MNBYjtf4+wCe4m8="; }; - cargoHash = "sha256-imq7ElZcC9E4nDkHaaFiBf8r1VuMtw5zOn9O7EzIPkQ="; - - buildInputs = [ openssl ]; + cargoHash = "sha256-feAfHkcLvEdFblehPGtLO01Vl9QpOueuJrpEujlv4qY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index 8876f02dcd7d..eca10e366238 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -20,6 +20,13 @@ lib.switch [ coq.version mathcomp.version ] [ + { + cases = [ + (range "8.16" "8.20") + (isGe "2.1.0") + ]; + out = "2.0.3"; + } { cases = [ (range "8.16" "8.20") @@ -79,6 +86,7 @@ ] null; + release."2.0.3".sha256 = "sha256-5lDq7IWlEW0EkNzYPu+dA6KOvRgy53W/alikpDr/Kd0="; release."2.0.1".sha256 = "sha256-d/IQ4IdS2tpyPewcGobj2S6m2HU+iXQmlvR+ITNIcjI="; release."2.0.0".sha256 = "sha256-SG/KVnRJz2P+ZxkWVp1dDOnc/JVgigoexKfRUh1Y0GM"; release."1.1.3".sha256 = "sha256-xhqWpg86xbU1GbDtXXInNCTArjjPnWZctWiiasq1ScU="; diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index e4f03c4e7253..909cb7f42154 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -16,6 +16,13 @@ mkCoqDerivation { lib.switch [ coq.coq-version ssreflect.version ] [ + { + cases = [ + (range "8.17" "8.20") + (isGe "2.0.0") + ]; + out = "0.2.1"; + } { cases = [ (range "8.17" "8.20") @@ -35,6 +42,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."0.2.1".sha256 = "sha256-053bNa3rcy0fCs9CQoKPxDLXnKRHzteyClLDURpaZJo="; release."0.2.0".sha256 = "sha256-xPsuEayHstjF0PGFJZJ+5cm0oMUrpoGLXN23op97vjM="; release."0.1.1".sha256 = "sha256-Gu8aInLxTXfAFE0/gWRYI046Dx3Gv1j1+gx92v/UnPI="; release."0.1.0".sha256 = "sha256:11crnjm8hyis1qllkks3d7r07s1rfzwvyvpijya3s6iqfh8c7xwh"; diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index e7825105762b..2f5b3f330089 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -17,6 +17,13 @@ lib.switch [ coq.coq-version ssreflect.version ] [ + { + cases = [ + (range "8.17" "8.20") + (isGe "2.0.0") + ]; + out = "0.5.0"; + } { cases = [ (range "8.17" "8.20") @@ -50,6 +57,7 @@ releaseRev = v: "v${v}"; + release."0.5.0".sha256 = "sha256-Guu2+tmHym52DA6SB5Rq/rYWIQEl47Q7YvMaUkfOH2k="; release."0.4.0".sha256 = "sha256-hItFO2XY2LTPSofPTKt3AfOEfiLliaYdzUXgDv4ea9Y="; release."0.3.1".sha256 = "sha256-KcuG/11Yq5ACem4FyVnQqHKvy3tNK7hd0ir2SJzzMN0="; release."0.3.0".sha256 = "sha256:14rm0726f1732ldds495qavg26gsn30w6dfdn36xb12g5kzavp38"; diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index 63891055f22c..2e17861ea3bf 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -27,7 +27,7 @@ mkCoqDerivation { { cases = [ (range "8.16" "8.20") - (range "2.0" "2.2") + (range "2.0" "2.3") ]; out = "2.2"; } diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index 380ee69f1f8c..6ef59a006de5 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -29,7 +29,7 @@ mkCoqDerivation { { cases = [ (range "8.16" "8.19") - (range "2.0.0" "2.2.0") + (range "2.0.0" "2.3.0") ]; out = "0.9.4"; } diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index 1b7e6284afdc..bff7825637c7 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,6 +5,7 @@ let hb = mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.19" "8.20"; out = "1.8.0"; } { case = range "8.18" "8.20"; out = "1.7.1"; } { case = range "8.16" "8.18"; out = "1.6.0"; } { case = range "8.15" "8.18"; out = "1.5.0"; } @@ -13,6 +14,7 @@ let hb = mkCoqDerivation { { case = range "8.12" "8.13"; out = "1.1.0"; } { case = isEq "8.11"; out = "0.10.0"; } ] null; + release."1.8.0".sha256 = "sha256-4s/4ZZKj5tiTtSHGIM8Op/Pak4Vp52WVOpd4l9m19fY="; release."1.7.1".sha256 = "sha256-MCmOzMh/SBTFAoPbbIQ7aqd3hMcSMpAKpiZI7dbRaGs="; release."1.7.0".sha256 = "sha256-WqSeuJhmqicJgXw/xGjGvbRzfyOK7rmkVRb6tPDTAZg="; release."1.6.0".sha256 = "sha256-E8s20veOuK96knVQ7rEDSt8VmbtYfPgItD0dTY/mckg="; diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 64bd6fecab88..f148ad2a04e9 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -15,6 +15,7 @@ let repo = "analysis"; owner = "math-comp"; + release."1.8.0".sha256 = "sha256-2ZafDmZAwGB7sxdUwNIE3xvwBRw1kFDk0m5Vz+onWZc="; release."1.7.0".sha256 = "sha256-GgsMIHqLkWsPm2VyOPeZdOulkN00IoBz++qA6yE9raQ="; release."1.5.0".sha256 = "sha256-EWogrkr5TC5F9HjQJwO3bl4P8mij8U7thUGJNNI+k88="; release."1.4.0".sha256 = "sha256-eDggeuEU0fMK7D5FbxvLkbAgpLw5lwL/Rl0eLXAnJeg="; @@ -49,9 +50,9 @@ let { cases = [ (range "8.19" "8.20") - (range "2.1.0" "2.2.0") + (range "2.1.0" "2.3.0") ]; - out = "1.7.0"; + out = "1.8.0"; } { cases = [ diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix index 3c5bc6df6b4e..6390270fa736 100644 --- a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix +++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix @@ -23,6 +23,13 @@ lib.switch [ coq.version mathcomp-analysis.version ] [ + { + cases = [ + (range "8.19" "8.20") + (isGe "1.7") + ]; + out = "0.7.7"; + } { cases = [ (range "8.19" "8.20") @@ -74,6 +81,7 @@ } ] null; + release."0.7.7".sha256 = "sha256-kEbpMl7U+I2kvqi1VrjhIVFkZFO6h0tTHEUZRbHYG7E="; release."0.7.5".sha256 = "sha256-pzPo+Acjx3vlyqOkSZQ8uT2BDLSTfbAnRm39e+/CqE0="; release."0.7.3".sha256 = "sha256-7+qPtE1KfDmo9ZsQtWMzoR2MYnFpTjFHK/yZYVm+GxA="; release."0.7.2".sha256 = "sha256-dekrdVmuTcqXXmKhIb831EKtMhbPrXHJZhzmGb9rdRo="; diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index 07d0f15f3e70..91a303219b19 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -17,6 +17,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; release = { + "2.0.2".sha256 = "sha256-hBo9JMtmXDYBmf5ihKGksQLHv3c0+zDBnd8/aI2V/ao="; "2.0.1".sha256 = "sha256-tQTI3PCl0q1vWpps28oATlzOI8TpVQh1jhTwVmhaZic="; "2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8="; "1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4="; @@ -34,6 +35,13 @@ mkCoqDerivation { lib.switch [ coq.version mathcomp.version ] [ + { + cases = [ + (isGe "8.17") + (isGe "2.1.0") + ]; + out = "2.0.2"; + } { cases = [ (isGe "8.17") diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 2cb068ba11cc..2cafe8ca8ac7 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -20,6 +20,7 @@ let withDoc = single && (args.withDoc or false); defaultVersion = let inherit (lib.versions) range; in lib.switch coq.coq-version [ + { case = range "8.19" "8.20"; out = "2.3.0"; } { case = range "8.17" "8.20"; out = "2.2.0"; } { case = range "8.17" "8.18"; out = "2.1.0"; } { case = range "8.17" "8.18"; out = "2.0.0"; } @@ -39,6 +40,7 @@ let { case = range "8.5" "8.7"; out = "1.6.4"; } ] null; release = { + "2.3.0".sha256 = "sha256-wa6OBig8rhAT4iwupSylyCAMhO69rADa0MQIX5zzL+Q="; "2.2.0".sha256 = "sha256-SPyWSI5kIP5w7VpgnQ4vnK56yEuWnJylNQOT7M77yoQ="; "2.1.0".sha256 = "sha256-XDLx0BIkVRkSJ4sGCIE51j3rtkSGemNTs/cdVmTvxqo="; "2.0.0".sha256 = "sha256-dpOmrHYUXBBS9kmmz7puzufxlbNpIZofpcTvJFLG5DI="; diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 78e8150aa010..b79561b17ada 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -24,6 +24,13 @@ mkCoqDerivation { lib.switch [ coq.version mathcomp.version ] [ + { + cases = [ + (range "8.17" "8.20") + (isGe "2.1.0") + ]; + out = "2.3.0"; + } { cases = [ (range "8.17" "8.20") @@ -104,6 +111,7 @@ mkCoqDerivation { ] null; release = { + "2.3.0".sha256 = "sha256-usIcxHOAuN+f/j3WjVbPrjz8Hl9ac8R6kYeAKi3CEts="; "2.2.0".sha256 = "sha256-Cie6paweITwPZy6ej9+qIvHFWknVR382uJPW927t/fo="; "2.1.0".sha256 = "sha256-QT91SBJ6DXhyg4j/okTvPP6yj2DnnPbnSlJ/p8pvZbY="; "2.0.0".sha256 = "sha256-2zWHzMBsO2j8EjN7CgCmKQcku9Be8aVlme0LD5p4ab8="; diff --git a/pkgs/development/coq-modules/odd-order/default.nix b/pkgs/development/coq-modules/odd-order/default.nix index 30082aa3de12..1e4e044ae558 100644 --- a/pkgs/development/coq-modules/odd-order/default.nix +++ b/pkgs/development/coq-modules/odd-order/default.nix @@ -9,6 +9,7 @@ mkCoqDerivation { pname = "odd-order"; owner = "math-comp"; + release."2.1.0".sha256 = "sha256-TPlaQbO0yXEpUgy3rlCx/w1MSLECJk5tdU26fAGe48Q="; release."1.14.0".sha256 = "0iln70npkvixqyz469l6nry545a15jlaix532i1l7pzfkqqn6v68"; release."1.13.0".sha256 = "sha256-EzNKR/JzM8T17sMhPhgZNs14e50X4dY3OwFi133IsT0="; release."1.12.0".sha256 = "sha256-omsfdc294CxKAHNMMeqJCcVimvyRCHgxcQ4NJOWSfNM="; @@ -18,6 +19,10 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch mathcomp.character.version [ + { + case = (range "2.1.0" "2.3.0"); + out = "2.1.0"; + } { case = (range "1.13.0" "1.15.0"); out = "1.14.0"; diff --git a/pkgs/development/coq-modules/ssprove/default.nix b/pkgs/development/coq-modules/ssprove/default.nix index c0e5b0bf8c57..ca181478fedb 100644 --- a/pkgs/development/coq-modules/ssprove/default.nix +++ b/pkgs/development/coq-modules/ssprove/default.nix @@ -21,6 +21,13 @@ lib.switch [ coq.coq-version mathcomp-ssreflect.version ] [ + { + cases = [ + (range "8.18" "8.20") + "2.3.0" + ]; + out = "0.2.3"; + } { cases = [ (range "8.18" "8.20") @@ -47,6 +54,7 @@ releaseRev = v: "v${v}"; + release."0.2.3".sha256 = "sha256-Y3dmNIF36IuIgrVILteofOv8e5awKfq93S4YN7enswI="; release."0.2.2".sha256 = "sha256-tBF8equJd6hKZojpe+v9h6Tg9xEnMTVFgOYK7ZnMfxk="; release."0.2.1".sha256 = "sha256-X00q5QFxdcGWeNqOV/PLTOqQyyfqFEinbGUTO7q8bC4="; release."0.2.0".sha256 = "sha256-GDkWH0LUsW165vAUoYC5of9ndr0MbfBtmrPhsJVXi3o="; diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index a8bf9eb6a3d1..26c79f489f6f 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -163,7 +163,7 @@ let qtwayland = callPackage ./modules/qtwayland.nix { }; qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine { - inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds; + inherit (darwin) bootstrap_cmds; }; qtwebsockets = callPackage ./modules/qtwebsockets.nix { }; qtwebview = callPackage ./modules/qtwebview.nix { }; diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix index 1a7da3ed6c67..d58cb993f912 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix @@ -62,7 +62,6 @@ libgbm, enableProprietaryCodecs ? true, # darwin - autoSignDarwinBinariesHook, bootstrap_cmds, cctools, xcbuild, @@ -85,9 +84,6 @@ qtModule { gn nodejs ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - autoSignDarwinBinariesHook - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bootstrap_cmds cctools @@ -124,6 +120,24 @@ qtModule { extraPrefix = "src/3rdparty/chromium/third_party/xnnpack/src/"; hash = "sha256-GUESVNR88I1K2V5xr0e09ec4j2eselMhNN06+PCcINM="; }) + + # The latest version of Clang changed what macros it predefines on Apple + # targets, causing errors about predefined macros in zlib. + (fetchpatch { + url = "https://github.com/chromium/chromium/commit/2f39ac8d0a414dd65c0e1d5aae38c8f97aa06ae9.patch"; + stripLen = 1; + extraPrefix = "src/3rdparty/chromium/"; + hash = "sha256-07hWANY9JGFmqvjdOD6SFmVI6sQRRyvW+7wxGZF5GVo="; + }) + + # The latest version of Clang changed what macros it predefines on Apple + # targets, causing errors about predefined macros in libpng. + (fetchpatch { + url = "https://github.com/chromium/chromium/commit/66defc14abe47c0494da9faebebfa0a5b6efcf38.patch"; + stripLen = 1; + extraPrefix = "src/3rdparty/chromium/"; + hash = "sha256-FWIi1VsBZFqOoPIkPxPkcfexPkx1458rB5ldtA7T2uE="; + }) ]; postPatch = @@ -148,6 +162,13 @@ qtModule { --replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \ --replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \ --replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\"" + + substituteInPlace configure.cmake src/gn/CMakeLists.txt \ + --replace "AppleClang" "Clang" + + # Disable metal shader compilation, Xcode only + substituteInPlace src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/metal/metal_backend.gni \ + --replace-fail 'angle_has_build && !is_ios && target_os == host_os' "false" '' + lib.optionalString stdenv.hostPlatform.isLinux '' sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ @@ -157,8 +178,6 @@ qtModule { src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace configure.cmake src/gn/CMakeLists.txt \ - --replace "AppleClang" "Clang" substituteInPlace cmake/Functions.cmake \ --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" ''; diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix deleted file mode 100644 index 7832a765a05f..000000000000 --- a/pkgs/development/python-modules/3to2/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pytest, -}: - -buildPythonPackage rec { - pname = "py3to2"; - version = "1.1.1"; - - src = fetchPypi { - inherit version; - pname = "3to2"; - extension = "zip"; - sha256 = "fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c"; - }; - - nativeCheckInputs = [ pytest ]; - - checkPhase = '' - py.test lib3to2/tests - ''; - - # Test failing due to upstream issue (https://bitbucket.org/amentajo/lib3to2/issues/50/testsuite-fails-with-new-python-35) - doCheck = false; - - meta = { - homepage = "https://bitbucket.org/amentajo/lib3to2"; - description = "Refactors valid 3.x syntax into valid 2.x syntax, if a syntactical conversion is possible"; - mainProgram = "3to2"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ mt-caret ]; - }; -} diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 068a7c72ec05..afc678991bd8 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -14,12 +14,13 @@ pytestCheckHook, pythonOlder, syrupy, + time-machine, tzlocal, }: buildPythonPackage rec { pname = "aioautomower"; - version = "2024.12.0"; + version = "2025.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; tag = version; - hash = "sha256-JLlmvd6Hgf1a3YU9xfbw8plEbRDNgCzxF3PpveGsrPg="; + hash = "sha256-MEZdYOpBAHmWidzq+7SpEFsHNYlSaIQ4utnGK9Y3/NE="; }; postPatch = '' @@ -53,6 +54,7 @@ buildPythonPackage rec { pytest-asyncio pytest-cov-stub pytestCheckHook + time-machine syrupy ]; diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index b7e834205fcd..df45b9cee2b2 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -10,9 +10,11 @@ hatchling, httpx, jiter, + nest-asyncio, pydantic, pytest-asyncio, pytestCheckHook, + pythonAtLeast, pythonOlder, respx, sniffio, @@ -22,7 +24,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.39.0"; + version = "0.42.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +33,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; tag = "v${version}"; - hash = "sha256-lpW+waHvwgbhK7EnPZy/XI8gK3a8JjFflPqUFbDN1z8="; + hash = "sha256-7cRXKXiyq3ty21klkitjjnm9rzBRmAXGYvvVxTNWeZ4="; }; build-system = [ @@ -57,16 +59,22 @@ buildPythonPackage rec { nativeCheckInputs = [ dirty-equals pytest-asyncio + nest-asyncio pytestCheckHook respx ]; pythonImportsCheck = [ "anthropic" ]; - disabledTests = [ - # Test require network access - "test_copy_build_request" - ]; + disabledTests = + [ + # Test require network access + "test_copy_build_request" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # Fails on RuntimeWarning: coroutine method 'aclose' of 'AsyncStream._iter_events' was never awaited + "test_multi_byte_character_multiple_chunks[async]" + ]; disabledTestPaths = [ # Test require network access diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix index fcfd668844bf..68e159310ac7 100644 --- a/pkgs/development/python-modules/bleak-esphome/default.nix +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -9,13 +9,15 @@ lru-dict, poetry-core, pytest-asyncio, + pytest-codspeed, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "bleak-esphome"; - version = "1.1.1"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,17 +26,12 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = "bleak-esphome"; tag = "v${version}"; - hash = "sha256-WFswGtPX0OpDTqT25oHGZ+gIN/fhco4orWeGVXIIfzM="; + hash = "sha256-rN2vpXiOaUjjN6yNZxeEgTpcz0K5soUqKKiDDOhcBtc="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=bleak_esphome --cov-report=term-missing:skip-covered" "" - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ aioesphomeapi bleak bluetooth-data-tools @@ -44,6 +41,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-codspeed + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index b0e691404108..f17c97a74250 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.35.93"; + version = "1.35.94"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-mCAsipukijtuQ0qc+d5JktfMk+5QXx/EgcV82cgBYj0="; + hash = "sha256-KgYVjr8QsDAD/SnzqXPY24at0Uf+1knwE97gFOumhVA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index fdb12bd74e9c..01be59db277c 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.35.93"; + version = "1.35.94"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-aHLv6iTWsd0fAbdmL/HgvX+bcRDabWRHt4wbhdlDFR8="; + hash = "sha256-ceRBSq77afed9XtZW60JwMsIqqmAxy3PGufUJt4q1aI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 911a92ea5479..09b54dfc6084 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "10.11.1"; + version = "11.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; tag = version; - hash = "sha256-dXsEYHkt4Z2YldqbCorNPG7rVSLfU8shYdk6lzFBz/M="; + hash = "sha256-TJXgcoa8s22fEyXER1C+MxFrvDt5DzY/k5T5fKE4Rec="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/connexion/0001-Part-of-1992.patch b/pkgs/development/python-modules/connexion/0001-Part-of-1992.patch deleted file mode 100644 index 2f1386314cdf..000000000000 --- a/pkgs/development/python-modules/connexion/0001-Part-of-1992.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 10c3d787cc9c7fb31c6cc7074e9ce00dfeb6bb85 Mon Sep 17 00:00:00 2001 -From: wxt <3264117476@qq.com> -Date: Thu, 14 Nov 2024 16:16:17 +0800 -Subject: [PATCH] Part of 1992 - ---- - tests/decorators/test_validation.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/decorators/test_validation.py b/tests/decorators/test_validation.py -index bece403..d7e0984 100644 ---- a/tests/decorators/test_validation.py -+++ b/tests/decorators/test_validation.py -@@ -78,7 +78,7 @@ def test_invalid_type(monkeypatch): - logger = MagicMock() - monkeypatch.setattr("connexion.validators.parameter.logger", logger) - result = ParameterValidator.validate_parameter( -- "formdata", 20, {"type": "string", "name": "foo"} -+ "formdata", 20, {"name": "foo", "type": "string"} - ) - expected_result = """20 is not of type 'string' - --- -2.47.0 - diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 783c0dc04754..bd98705e3c8d 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "connexion"; - version = "3.1.0"; + version = "3.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -44,14 +44,9 @@ buildPythonPackage rec { owner = "spec-first"; repo = "connexion"; tag = version; - hash = "sha256-rngQDU9kXw/Z+Al0SCVnWN8xnphueTtZ0+xPBR5MbEM="; + hash = "sha256-ruwpA2yd7FRME1FvYrZh0EOnhmQ26YVouXzpVD9ph6g="; }; - patches = [ - # A really small Part of https://github.com/spec-first/connexion/pull/1992 Will fix check on newest dependencies - ./0001-Part-of-1992.patch - ]; - build-system = [ poetry-core ]; dependencies = [ @@ -89,17 +84,10 @@ buildPythonPackage rec { [ "test_build_example" "test_mock_resolver_no_example" + "test_sort_apis_by_basepath" + "test_sort_routes" # Tests require network access "test_remote_api" - # AssertionError - "test_headers" - # waiter.acquire() deadlock - "test_cors_server_error" - "test_get_bad_default_response" - "test_schema_response" - "test_writeonly" - # test expects "{'name': 'foo', 'type': 'string'}" rather than "{'type': 'string', 'name': 'foo'}" - "test_invalid_type" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # ImportError: Error while finding loader for '/private/tmp/nix-build-python3.12-connexion-3.1.0.drv-0/source' (: No module named '/private/tmp/nix-build-python3') diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index a837e141bdc5..de88b31cce3e 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -13,12 +12,12 @@ # dependencies clarabel, cvxopt, - ecos, osqp, scipy, scs, # checks + hypothesis, pytestCheckHook, useOpenmp ? (!stdenv.hostPlatform.isDarwin), @@ -26,16 +25,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.5.3"; + version = "1.6.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "cvxpy"; repo = "cvxpy"; tag = "v${version}"; - hash = "sha256-6RaEyFckvF3WhbfeffysMB/zt+aU1NU6B7Nm06znt9k="; + hash = "sha256-t2+j0ZrvGvTv6FoNVpD2MVFZKfGgqTaN32OKwBXM3Zw="; }; # we need to patch out numpy version caps from upstream @@ -53,14 +50,16 @@ buildPythonPackage rec { dependencies = [ clarabel cvxopt - ecos numpy osqp scipy scs ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; # Required flags from https://github.com/cvxpy/cvxpy/releases/tag/v1.1.11 preBuild = lib.optionalString useOpenmp '' @@ -84,7 +83,7 @@ buildPythonPackage rec { description = "Domain-specific language for modeling convex optimization problems in Python"; homepage = "https://www.cvxpy.org/"; downloadPage = "https://github.com/cvxpy/cvxpy//releases"; - changelog = "https://github.com/cvxpy/cvxpy/releases/tag/v${version}"; + changelog = "https://github.com/cvxpy/cvxpy/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/demetriek/default.nix b/pkgs/development/python-modules/demetriek/default.nix index b1a7701d9e2f..4a4a6ebd0c02 100644 --- a/pkgs/development/python-modules/demetriek/default.nix +++ b/pkgs/development/python-modules/demetriek/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "demetriek"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-demetriek"; tag = "v${version}"; - hash = "sha256-MDGAhsLbJqvywQntlPfM/cPyltqsqnt2C31ACpMPn0Y="; + hash = "sha256-OTYQFw3Jy+sRGoPYVp5VKgCAzv9Gy2Fn2GjTGdsKjak="; }; postPatch = '' diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 9f47ded02fa5..edaaa8f7dfe3 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "8.17.0"; + version = "8.17.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "elasticsearch_dsl"; inherit version; - hash = "sha256-wgQhgXVGLRCKhPuRM3HkXT9J6d1xHKJux+2Jq06PKH0="; + hash = "sha256-2BcGmb/bT+f6s4VM2sMZotbd26opyep5k9LsIgVttaA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index 5124264df587..e6697813e4f0 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "environs"; - version = "11.2.1"; + version = "14.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "sloria"; repo = "environs"; tag = version; - hash = "sha256-BU2D9NGNoUu3F1kx9t4j1VW0HarLVqiXTZEW67pMPV8="; + hash = "sha256-sqEe0DoJHUtHFin04+lNQKuXjvSmDmfwjQIvU6a4sDo="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix index 731479b3bf4b..f3889cc5faa9 100644 --- a/pkgs/development/python-modules/face/default.nix +++ b/pkgs/development/python-modules/face/default.nix @@ -5,12 +5,13 @@ boltons, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "face"; version = "22.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +20,9 @@ buildPythonPackage rec { hash = "sha256-1daS+QvI9Zh7Y25H42OEubvaSZqvCneqCwu+g0x2kj0="; }; - propagatedBuildInputs = [ boltons ]; + build-system = [ setuptools ]; + + dependencies = [ boltons ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flake8-class-newline/default.nix b/pkgs/development/python-modules/flake8-class-newline/default.nix new file mode 100644 index 000000000000..8e1b66d22422 --- /dev/null +++ b/pkgs/development/python-modules/flake8-class-newline/default.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchPypi, + buildPythonPackage, + setuptools, + flake8, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "flake8-class-newline"; + version = "1.6.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-UUxJI8iOuLPdUttLVbjTSDUg24nbgK9rqBKkrxVCH/E="; + }; + + build-system = [ setuptools ]; + + dependencies = [ flake8 ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "flake8_class_newline" ]; + + meta = with lib; { + description = "Flake8 extension to check if a new line is present after a class definition"; + homepage = "https://github.com/alexandervaneck/flake8-class-newline"; + license = licenses.mit; + maintainers = with maintainers; [ lopsided98 ]; + }; +} diff --git a/pkgs/development/python-modules/flake8-deprecated/default.nix b/pkgs/development/python-modules/flake8-deprecated/default.nix new file mode 100644 index 000000000000..df28a68cc467 --- /dev/null +++ b/pkgs/development/python-modules/flake8-deprecated/default.nix @@ -0,0 +1,40 @@ +{ + lib, + pythonOlder, + fetchPypi, + buildPythonPackage, + hatchling, + flake8, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "flake8-deprecated"; + version = "2.2.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "flake8_deprecated"; + inherit version; + hash = "sha256-7pbKAB0coFYfqORvI+LSRgsYqGaWNzyrZE4QKuD/KqI="; + }; + + build-system = [ hatchling ]; + + dependencies = [ flake8 ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "run_tests.py" ]; + + pythonImportsCheck = [ "flake8_deprecated" ]; + + meta = with lib; { + description = "Flake8 plugin that warns about deprecated method calls"; + homepage = "https://github.com/gforcada/flake8-deprecated"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ lopsided98 ]; + }; +} diff --git a/pkgs/development/python-modules/frelatage/default.nix b/pkgs/development/python-modules/frelatage/default.nix index 3f8d64f9e464..be04e82e7aa6 100644 --- a/pkgs/development/python-modules/frelatage/default.nix +++ b/pkgs/development/python-modules/frelatage/default.nix @@ -23,9 +23,11 @@ buildPythonPackage rec { hash = "sha256-eHVqp6govBV9FvSQyaZuEEImHQRs/mbLaW86RCvtDbM="; }; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ "numpy" ]; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ numpy timeout-decorator ]; diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index 7cf3361a6604..cd53f6fab6d5 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.12.3"; + version = "0.12.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; tag = "v${version}"; - hash = "sha256-sI24tSvwbh+zPTPVjkNlBg7TM6D5qMxfeF4pfj+6Q+E="; + hash = "sha256-h2XoHb3ukh6MKQG2v0TZg81mcwNGk4cfK8CWjzhM8W4="; }; pythonRelaxDeps = [ "hishel" ]; diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 04a8a1649f89..acd0da2f0b59 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -9,12 +9,14 @@ pythonAtLeast, pythonOlder, pyyaml, + setuptools, + tomli, }: buildPythonPackage rec { pname = "glom"; version = "24.11.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,42 +25,45 @@ buildPythonPackage rec { hash = "sha256-QyX5Z1mpEgRK97bGvQ26RK2MHrYDiqsFcylmHSAhuyc="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "face==20.1.1" "face" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ boltons attrs face ]; + optional-dependencies = { + toml = lib.optionals (pythonOlder "3.11") [ tomli ]; + yaml = [ pyyaml ]; + }; + nativeCheckInputs = [ pytestCheckHook - pyyaml - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' # test_cli.py checks the output of running "glom" export PATH=$out/bin:$PATH ''; - disabledTests = - [ - # Test is outdated (was made for PyYAML 3.x) - "test_main_yaml_target" - ] - ++ lib.optionals (pythonAtLeast "3.11") [ - "test_regular_error_stack" - "test_long_target_repr" - ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + "test_regular_error_stack" + "test_long_target_repr" + "test_glom_error_stack" + "test_glom_error_double_stack" + "test_branching_stack" + "test_midway_branch" + "test_partially_failing_branch" + "test_coalesce_stack" + "test_nesting_stack" + "test_3_11_byte_code_caret" + ]; pythonImportsCheck = [ "glom" ]; meta = with lib; { - description = "Restructuring data, the Python way"; - mainProgram = "glom"; + description = "Module for restructuring data"; longDescription = '' glom helps pull together objects from other objects in a declarative, dynamic, and downright simple way. @@ -67,5 +72,6 @@ buildPythonPackage rec { changelog = "https://github.com/mahmoud/glom/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ twey ]; + mainProgram = "glom"; }; } diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index 50e6aef3fb94..6586cb052722 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -1,8 +1,8 @@ { lib, async-interrupt, - bleak, bleak-retry-connector, + bleak, bluetooth-adapters, bluetooth-auto-recovery, bluetooth-data-tools, @@ -11,6 +11,7 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-codspeed, pytest-cov-stub, pytestCheckHook, pythonOlder, @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; tag = "v${version}"; - hash = "sha256-ypE/PvJV29+P389wLKZUErqLRvy935dAZYeap7n1z4M="; + hash = "sha256-wOWQaM1hfWaqLFIzwB7O1yOS/CJPvZ+aGbKzvAE2DAE="; }; build-system = [ @@ -48,6 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-codspeed pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jellyfish/Cargo.lock b/pkgs/development/python-modules/jellyfish/Cargo.lock new file mode 100644 index 000000000000..b8e248240923 --- /dev/null +++ b/pkgs/development/python-modules/jellyfish/Cargo.lock @@ -0,0 +1,337 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "csv" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "itoa" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" + +[[package]] +name = "jellyfish" +version = "1.1.2" +dependencies = [ + "ahash", + "csv", + "num-traits", + "pyo3", + "smallvec", + "unicode-normalization", + "unicode-segmentation", +] + +[[package]] +name = "libc" +version = "0.2.169" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "portable-atomic" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" + +[[package]] +name = "proc-macro2" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "serde" +version = "1.0.217" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.217" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "syn" +version = "2.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tinyvec" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" +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 = "unicode-ident" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 8517c239de44..ca47c0ca312b 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -1,49 +1,56 @@ { lib, - stdenv, buildPythonPackage, - fetchPypi, - isPy3k, - pytest, - unicodecsv, + cargo, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + rustc, rustPlatform, - libiconv, + unicodecsv, }: buildPythonPackage rec { pname = "jellyfish"; - version = "1.0.4"; + version = "1.1.2"; + pyproject = true; - disabled = !isPy3k; + disabled = pythonOlder "3.11"; - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-cqq7O+3VE83SBxIkL9URc7WZcsCxRregucbzLxZWKT8="; + src = fetchFromGitHub { + owner = "jamesturk"; + repo = "jellyfish"; + rev = version; + hash = "sha256-xInjoTXYgZuHyvyKm+N4PAwHozE5BOkxoYhRzZnPs3Q="; }; - nativeBuildInputs = with rustPlatform; [ - maturinBuildHook - cargoSetupHook + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}-rust-dependencies"; - hash = "sha256-HtzgxTO6tbN/tohaiTm9B9jrFYGTt1Szo9qRzpcy8BA="; - }; - nativeCheckInputs = [ - pytest + pytestCheckHook unicodecsv ]; + pythonImportsCheck = [ "jellyfish" ]; + meta = { - homepage = "https://github.com/sunlightlabs/jellyfish"; - description = "Approximate and phonetic matching of strings"; + description = "A python library for doing approximate and phonetic matching of strings"; + homepage = "https://github.com/jamesturk/jellyfish"; + changelog = "https://github.com/jamesturk/jellyfish/releases/tag/v${version}"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ koral ]; }; } diff --git a/pkgs/development/python-modules/llm-ollama/default.nix b/pkgs/development/python-modules/llm-ollama/default.nix new file mode 100644 index 000000000000..23760ce6f9d9 --- /dev/null +++ b/pkgs/development/python-modules/llm-ollama/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + llm, + + # dependencies + click, + ollama, + pydantic, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "llm-ollama"; + version = "0.8.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "taketwo"; + repo = "llm-ollama"; + tag = version; + hash = "sha256-9AgHX2FJRXSKZOLt7JR/9Fg4i2HGNQY2vSsJa4+2BGQ="; + }; + + build-system = [ + setuptools + # Follows the reasoning from https://github.com/NixOS/nixpkgs/pull/327800#discussion_r1681586659 about including llm in build-system + llm + ]; + + dependencies = [ + click + ollama + pydantic + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # These tests try to access the filesystem and fail + disabledTests = [ + "test_registered_model" + "test_registered_chat_models" + "test_registered_embedding_models" + "test_registered_models_when_ollama_is_down" + ]; + + pythonImportCheck = [ + "llm_ollama" + ]; + + meta = { + description = "LLM plugin providing access to Ollama models using HTTP API"; + homepage = "https://github.com/taketwo/llm-ollama"; + changelog = "https://github.com/taketwo/llm-ollama/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ erethon ]; + }; +} diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index acd07a2e2795..f4cd85fd778c 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.33.0"; + version = "0.33.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; tag = "v${version}"; - hash = "sha256-Eo1KBpSek1FnSp21vpsJEwISvUYEqOaodwrbarVcu7c="; + hash = "sha256-8x6Q0nGFz1pJ1jPfbepE7YL6z/HPkeyRYvwS9jJblRI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix index 7f0ae4281eb8..91f7cf1e896f 100644 --- a/pkgs/development/python-modules/model-bakery/default.nix +++ b/pkgs/development/python-modules/model-bakery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-bakery"; - version = "1.20.0"; + version = "1.20.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "model-bakers"; repo = "model_bakery"; tag = version; - hash = "sha256-71c5p6FypqbwUUoYu4dTamYnBlks1fiXTp7dUfc0ZQs="; + hash = "sha256-VA3rRzu1FhgCRCSRBQ+cZkwHVZr5/e++twk3hOWuc2c="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 18cf442ecd60..8b771d5a3c8a 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.6.10"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-L0dtNsuU6JQl0PRHB7UayLCdPwxk70FZYNomMUy/wW4="; + hash = "sha256-xwF0KCFso1Yno8mUFnVgMbVbhanvANsDtvS/WaUgSwI="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix index a74b1ccef1ff..f0f1d6db0d77 100644 --- a/pkgs/development/python-modules/niaaml/default.nix +++ b/pkgs/development/python-modules/niaaml/default.nix @@ -28,7 +28,10 @@ buildPythonPackage rec { hash = "sha256-VMZLEirE01Q9eyQIhV18PepGWmBcxLIwNeuVf7EuSWE="; }; - pythonRelaxDeps = [ "pandas" ]; + pythonRelaxDeps = [ + "numpy" + "pandas" + ]; nativeBuildInputs = [ poetry-core diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index 2baf8ed356cc..0f96ca82471d 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -28,7 +28,10 @@ buildPythonPackage rec { hash = "sha256-rYFfLtPJgIdSjRIzDIQeHwoQm9NrI6nM3/BF7wAMr1Y="; }; - pythonRelaxDeps = [ "scikit-learn" ]; + pythonRelaxDeps = [ + "numpy" + "scikit-learn" + ]; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/niaclass/default.nix b/pkgs/development/python-modules/niaclass/default.nix index f526c2d5f58b..aeb0b7099110 100644 --- a/pkgs/development/python-modules/niaclass/default.nix +++ b/pkgs/development/python-modules/niaclass/default.nix @@ -26,7 +26,10 @@ buildPythonPackage rec { hash = "sha256-2VNLXVciWInkZwk9O+U+6oU+FOVQx3InV4UVgny/B6I="; }; - pythonRelaxDeps = [ "pandas" ]; + pythonRelaxDeps = [ + "numpy" + "pandas" + ]; nativeBuildInputs = [ poetry-core diff --git a/pkgs/development/python-modules/nianet/default.nix b/pkgs/development/python-modules/nianet/default.nix index 5a9ca788238e..bcdcb08bb9df 100644 --- a/pkgs/development/python-modules/nianet/default.nix +++ b/pkgs/development/python-modules/nianet/default.nix @@ -27,18 +27,22 @@ buildPythonPackage rec { sha256 = "sha256-FZipl6Z9AfiL6WH0kvUn8bVxt8JLdDVlmTSqnyxe0nY="; }; - nativeBuildInputs = [ + build-system = [ poetry-core toml-adapt ]; - propagatedBuildInputs = [ + dependencies = [ niapy numpy scikit-learn torch ]; + pythonRelaxDeps = [ + "numpy" + ]; + # create niapy and torch dep version consistent preBuild = '' toml-adapt -path pyproject.toml -a change -dep niapy -ver X diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index 67a1937bd016..2550bcc78ac9 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "niapy"; - version = "2.5.1"; + version = "2.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "NiaOrg"; repo = "NiaPy"; tag = "v${version}"; - hash = "sha256-+5tXwubKdhkcv5NjO/DglK+WJfsJ3AzVx/Y/byDBmGo="; + hash = "sha256-8hKT0WxnJijm22w4DkzicvtikaTL/mL3VhQX/WVHL58="; }; build-system = [ poetry-core ]; @@ -35,6 +35,10 @@ buildPythonPackage rec { pandas ]; + pythonRelaxDeps = [ + "numpy" + ]; + nativeCheckInputs = [ pytest7CheckHook pytest-xdist diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index e8b431d34abe..b3b3a4e2af43 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "24.12.4"; + version = "25.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "pontos"; tag = "v${version}"; - hash = "sha256-Ri5MtUfIHE0s3Csaf08RZjGvl5HYxZJSn/JwNkkXvRA="; + hash = "sha256-Aw5PU3YfWH/YxOWkJcrUwhio71ASasZzyAsnjztOm5o="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/powerfox/default.nix b/pkgs/development/python-modules/powerfox/default.nix index 0ca94792b879..17de893e5d45 100644 --- a/pkgs/development/python-modules/powerfox/default.nix +++ b/pkgs/development/python-modules/powerfox/default.nix @@ -4,6 +4,7 @@ aresponses, buildPythonPackage, fetchFromGitHub, + fetchpatch2, mashumaro, orjson, poetry-core, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "powerfox"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,9 +27,19 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-powerfox"; tag = "v${version}"; - hash = "sha256-stHZWGkISsemRUModIlE5CqYVVu3Mdt4ksW5tBewEDo="; + hash = "sha256-VSkOCJu3HXBHkvYtSe/kYFOhJ9kMrcf/ijMqvUB9aRU="; }; + patches = [ + # requires poetry-core>=2.0 + (fetchpatch2 { + url = "https://github.com/klaasnicolaas/python-powerfox/commit/e3f1e39573fc278cd2800a2d4f4315cf0aff592b.patch"; + includes = [ "pyproject.toml" ]; + hash = "sha256-hkXLT3IWBVlbAwWvu/erENEsxOuIb8wv9UIVtAZqMPc="; + revert = true; + }) + ]; + build-system = [ poetry-core ]; dependencies = [ diff --git a/pkgs/development/python-modules/pscript/default.nix b/pkgs/development/python-modules/pscript/default.nix index dd847a486085..499f479b4d88 100644 --- a/pkgs/development/python-modules/pscript/default.nix +++ b/pkgs/development/python-modules/pscript/default.nix @@ -5,22 +5,25 @@ pytestCheckHook, nodejs, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pscript"; version = "0.7.7"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "flexxui"; - repo = pname; + repo = "pscript"; tag = "v${version}"; hash = "sha256-AhVI+7FiWyH+DfAXnau4aAHJAJtsWEpmnU90ey2z35o="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook nodejs @@ -33,6 +36,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pscript" ]; + disabledTests = [ + # https://github.com/flexxui/pscript/issues/69 + "test_async_and_await" + ]; + meta = with lib; { description = "Python to JavaScript compiler"; homepage = "https://pscript.readthedocs.io"; diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index 554b42ce3d9b..3cb25d8e04f6 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.18.0"; + version = "1.19.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GitGuardian"; repo = "py-gitguardian"; tag = "v${version}"; - hash = "sha256-4qMcBtelLiqLXKV8YIw9M6e97Nbo/K8UpsKoR0W7uKM="; + hash = "sha256-g3OH6pPk6Whd0JW6voILEK40/z6gWrdT6ibSa5kW47Q="; }; pythonRelaxDeps = [ @@ -33,9 +33,7 @@ buildPythonPackage rec { "setuptools" ]; - build-system = [ - pdm-backend - ]; + build-system = [ pdm-backend ]; dependencies = [ marshmallow @@ -53,33 +51,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pygitguardian" ]; - disabledTests = [ - # Tests require an API key - "test_api_tokens" - "test_bogus_rate_limit" - "test_compute_sca_files" - "test_content_scan_exceptions" - "test_content_scan" - "test_create_honeytoken" - "test_create_jwt" - "test_extra_headers" - "test_health_check" - "test_multi_content_exceptions" - "test_multi_content_scan" - "test_multiscan_parameters" - "test_quota_overview" - "test_rate_limit" - "test_read_metadata_bad_response" - "test_read_metadata_no_remediation_message" - "test_read_metadata_remediation_message" - "test_retrieve_secret_incident" - "test_sca_client_scan_diff" - "test_sca_scan_all_with_params" - "test_sca_scan_directory_invalid_tar" - "test_sca_scan_directory" - "test_scan" - "test_versions_from_headers" - ]; + env.GITGUARDIAN_API_KEY = "Test key for tests"; meta = with lib; { description = "Library to access the GitGuardian API"; diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index 7caead892995..d5756f745b27 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { url = "https://git.alpinelinux.org/aports/plain/community/py3-pyliblo/py3.11.patch?id=a7e1eca5533657ddd7e37c43e67e8126e3447258"; hash = "sha256-4yCWNQaE/9FHGTVuvNEimBNuViWZ9aSJMcpTOP0fnM0="; }) + # Fix compile error due to incompatible pointer type 'lo_blob_dataptr' + (fetchurl { + url = "https://github.com/dsacre/pyliblo/commit/ebbb255d6a73384ec2560047eab236660d4589db.patch?full_index=1"; + hash = "sha256-ZBAmBxSUT2xgoDVqSjq8TxW2jz3xR/pdCf2O3wMKvls="; + }) ]; build-system = [ cython_0 ]; diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index b13d9746dd38..cdabdace5294 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -15,9 +15,9 @@ zlib, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pysam"; - version = "0.22.1"; + version = "0.22.1-unstable-2024-10-30"; pyproject = true; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pysam-developers"; repo = "pysam"; - tag = "v${version}"; - hash = "sha256-1sivEf8xN4SJPtJiAcBZG1bbgy66yWXzQis1mPeU+sA="; + rev = "0eae5be21ac3ab3ac7aa770a3931e2977e37b909"; + hash = "sha256-i8glYSpuCRNhNtK4i6eUrerz8daiMfY/YgDwgSuELbc="; }; nativeBuildInputs = [ @@ -75,12 +75,12 @@ buildPythonPackage rec { "pysam.libcvcf" ]; - meta = with lib; { + meta = { description = "Python module for reading, manipulating and writing genome data sets"; downloadPage = "https://github.com/pysam-developers/pysam"; - homepage = "https://pysam.readthedocs.io/"; - maintainers = with maintainers; [ unode ]; - license = licenses.mit; - platforms = platforms.unix; + homepage = "https://pysam.readthedocs.io"; + maintainers = with lib.maintainers; [ unode ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix index 845f9cda0fd2..b4ffa898f9e4 100644 --- a/pkgs/development/python-modules/pysuez/default.nix +++ b/pkgs/development/python-modules/pysuez/default.nix @@ -4,13 +4,12 @@ fetchFromGitHub, hatchling, aiohttp, - regex, pythonOlder, }: buildPythonPackage rec { pname = "pysuez"; - version = "1.3.5"; + version = "2.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,15 +18,12 @@ buildPythonPackage rec { owner = "jb101010-2"; repo = "pySuez"; tag = version; - hash = "sha256-BG5nX2S+WV0Bdwm/cvm+mGO1RUd+F312tZ4jws6A/d8="; + hash = "sha256-D/XsJL393fDIKMB1Wyzods5hLsdU3Qgq8T5aTJ3SLrM="; }; build-system = [ hatchling ]; - dependencies = [ - aiohttp - regex - ]; + dependencies = [ aiohttp ]; # Module has no tests doCheck = false; @@ -38,7 +34,7 @@ buildPythonPackage rec { description = "Module to get water consumption data from Suez"; mainProgram = "pysuez"; homepage = "https://github.com/jb101010-2/pySuez"; - changelog = "https://github.com/jb101010-2/pySuez/releases/tag/v${version}"; + changelog = "https://github.com/jb101010-2/pySuez/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 14fbd3a853d8..d23d459b12f4 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -1,35 +1,41 @@ { lib, + stdenv, buildPythonPackage, + fetchFromGitHub, + + # build-system + cython_0, + oldest-supported-numpy, + setuptools, + + # dependencies + numpy, + packaging, + scipy, + + # tests + pytestCheckHook, + pytest-rerunfailures, + python, + + # optional-dependencies + matplotlib, + ipython, cvxopt, cvxpy, - cython_0, - fetchFromGitHub, - ipython, - matplotlib, - numpy, - oldest-supported-numpy, - packaging, - pytest-rerunfailures, - pytestCheckHook, - python, - pythonOlder, - scipy, - setuptools, }: buildPythonPackage rec { pname = "qutip"; - version = "5.0.4"; + version = "5.1.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "qutip"; + repo = "qutip"; tag = "v${version}"; - hash = "sha256-KT5Mk0w6EKTUZzGRnQ6XQPZfH5ZXVuiD+EwSflNqHNo="; + hash = "sha256-8P95uAalMeGXWNG8J8Rf/eg0x1K62o9rKjmDrB8KGRo="; }; postPatch = '' @@ -38,13 +44,13 @@ buildPythonPackage rec { --replace-fail "numpy>=2.0.0" "numpy" ''; - nativeBuildInputs = [ + build-system = [ cython_0 - setuptools oldest-supported-numpy + setuptools ]; - propagatedBuildInputs = [ + dependencies = [ numpy packaging scipy @@ -74,20 +80,30 @@ buildPythonPackage rec { pythonImportsCheck = [ "qutip" ]; + pytestFlagsArray = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Fatal Python error: Aborted + "--deselect=../tests/core/test_metrics.py::Test_hellinger_dist::test_monotonicity[25]" + ]; + optional-dependencies = { graphics = [ matplotlib ]; ipython = [ ipython ]; semidefinite = [ - cvxpy cvxopt + cvxpy ]; }; - meta = with lib; { + meta = { description = "Open-source software for simulating the dynamics of closed and open quantum systems"; homepage = "https://qutip.org/"; - changelog = "https://github.com/qutip/qutip/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ fabiangd ]; + changelog = "https://github.com/qutip/qutip/releases/tag/${src.tag}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fabiangd ]; + badPlatforms = [ + # Tests fail at ~80% + # ../tests/test_animation.py::test_result_state Fatal Python error: Aborted + lib.systems.inspect.patterns.isDarwin + ]; }; } diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index 6646a6fff78f..3ffc9dec48ef 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "3.3.4"; + version = "3.4.0"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; tag = "v${version}"; - hash = "sha256-3KlmJJmak3X9adUlcmclnCv9D1Ddr+woFokrinZBYoE="; + hash = "sha256-+spbfeJ1hMMQqLj9IIu2xj4J6y1r2f94b4NK8vcDF5M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/stop-words/default.nix b/pkgs/development/python-modules/stop-words/default.nix new file mode 100644 index 000000000000..ead093cd5622 --- /dev/null +++ b/pkgs/development/python-modules/stop-words/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + unittestCheckHook, +}: + +buildPythonPackage rec { + pname = "stop-words"; + version = "2018.7.23"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-bfOtX13ml9qkN+REXIbHNgTmvBON0NwPrFVmSqTmsD4="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "stop_words" ]; + + meta = { + description = "Get list of common stop words in various languages in Python"; + homepage = "https://github.com/Alir3z4/python-stop-words"; + license = [ lib.licenses.bsd3 ]; + maintainers = with lib.maintainers; [ lavafroth ]; + }; +} diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix index 9b215d73db33..21d9e79dcaf5 100644 --- a/pkgs/development/python-modules/stringzilla/default.nix +++ b/pkgs/development/python-modules/stringzilla/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stringzilla"; - version = "3.11.1"; + version = "3.11.3"; pyproject = true; src = fetchFromGitHub { owner = "ashvardanian"; repo = "stringzilla"; tag = "v${version}"; - hash = "sha256-8HcX0P/PCaJAV333oSYZJ6xVKwYet/CF8vnEe9/dMo4="; + hash = "sha256-2qmcjRNjCyErzwto2DqdDU9NX4+hqeibhDM85c81TgU="; }; build-system = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 88c1736b2796..363c2e622eba 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1297"; + version = "3.0.1298"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-8EVqWhS814OwmG8nebKgGsAmn4aoKMCYBBU26tOyuj4="; + hash = "sha256-0JDCfoQqw7u1Sxmwvol7CHF55U4hfkS69/c63ZSRltE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 3bc1154267dc..564bab70ca3a 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.9.4"; + version = "0.9.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; tag = "v${version}"; - hash = "sha256-BfVpFTWF6s3tyW0tnfvqkS3+w72vv1YHYpYNj3cC0LA="; + hash = "sha256-45EfV6lqhOn8sorhyzUBKOj6xtd9OzYxB7SLK07IQ08="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index fa8b6c395e7d..8f29d718b83b 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "7.1.0"; + version = "7.4.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; tag = "v${version}"; - hash = "sha256-TALjJmTI5lMXyXcJtfyMVpqLo8dBbENG22EX7B+3QKQ="; + hash = "sha256-y4rJoT70WiVS9Gs/U6FPOaGGubPI43x9tA2vcdiDBlw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/whispers/default.nix b/pkgs/development/python-modules/whispers/default.nix index fba9a13a4551..da58f753f27c 100644 --- a/pkgs/development/python-modules/whispers/default.nix +++ b/pkgs/development/python-modules/whispers/default.nix @@ -16,6 +16,7 @@ wrapt, semgrep, setuptools, + six, }: buildPythonPackage rec { @@ -38,9 +39,12 @@ buildPythonPackage rec { ''; pythonRelaxDeps = [ + "jellyfish" "lxml" "pyyaml" "semgrep" + "six" + "wrapt" ]; build-system = [ setuptools ]; @@ -54,8 +58,9 @@ buildPythonPackage rec { luhn lxml pyyaml - wrapt semgrep + six + wrapt ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 4acc1dbc7b0d..cb2ba3270dce 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.129"; + version = "0.0.130"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; tag = version; - hash = "sha256-/lcF7MZrw85H5LBL8aBdaIuFRT5yJUhr+vN9gJHnPDw="; + hash = "sha256-G5q4W9Dxjhjbkt5rcYhseeaSWC73MJCo/pX/OfNlPrQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index c94b328ed646..6e3babb9d9ac 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.44"; + version = "0.0.45"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-ZgCbhezNsWZsQQViPK04UQA2mGZz47rFiMAk2oR8xR4="; + hash = "sha256-KeHGuQGEoXQnIJKQ86DrsoufN+Ppp/fyYblXx2iGHgU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index abc1699e12cf..3d7611c95bb0 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.73.3"; + version = "0.74.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; tag = version; - hash = "sha256-+YkNV6xbM38dHVpXD264KmzozborvotZRETAncpAUEs="; + hash = "sha256-B0BjDldIzHGRKR79mqgJHbvYeDGY5EDxFKaD2Q+HMyo="; }; postPatch = '' diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 4b2ea26f6985..968825b79212 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -36,6 +36,9 @@ buildGoModule rec { doCheck = false; + # /nix/store/.../bin/ld: internal/mkcw/embed/entrypoint_amd64.o: relocation R_X86_64_32S against `.rodata.1' can not be used when making a PIE object; recompile with -fPIE + hardeningDisable = [ "pie" ]; + nativeBuildInputs = [ go-md2man installShellFiles diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 332f07240792..9ac575221749 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-9tBPV0VR1bZUgYDD6T+hthPIzN9aGAyi1sUyeaynOQA="; + sha256 = "sha256-h4GaOZ9wHhRq8/GRKrXkH7fJPpOdYmwZ2nQPsVzt66U="; }; - cargoHash = "sha256-Igq4vjIyixpAhFd1wZqrVXCUmJdetUn6uM1eIX/0CiM="; + cargoHash = "sha256-dtl1YCMZdNtgaR8TxT3UZ7+CYREzpjaxmT80C1VTTa8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/protoc-gen-dart/default.nix b/pkgs/development/tools/protoc-gen-dart/default.nix index 4b51e1469404..4eb95f412bbb 100644 --- a/pkgs/development/tools/protoc-gen-dart/default.nix +++ b/pkgs/development/tools/protoc-gen-dart/default.nix @@ -6,25 +6,26 @@ buildDartApplication rec { pname = "protoc-gen-dart"; - version = "3.1.0"; + version = "21.1.2"; src = fetchFromGitHub { owner = "google"; repo = "protobuf.dart"; - rev = "protobuf-v${version}"; - sha256 = "sha256-2QnLS6GHhDHMCnAY+2c1wMyPY3EKtlijWHQC+9AVt0k="; + tag = "protoc_plugin-v${version}"; + hash = "sha256-luptbRgOtOBapWmyIJ35GqOClpcmDuKSPu3QoDfp2FU="; }; + sourceRoot = "${src.name}/protoc_plugin"; pubspecLock = lib.importJSON ./pubspec.lock.json; passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { description = "Protobuf plugin for generating Dart code"; mainProgram = "protoc-gen-dart"; homepage = "https://pub.dev/packages/protoc_plugin"; - license = licenses.bsd3; - maintainers = with maintainers; [ lelgenio ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lelgenio ]; }; } diff --git a/pkgs/development/tools/protoc-gen-dart/pubspec.lock.json b/pkgs/development/tools/protoc-gen-dart/pubspec.lock.json index c48d164bc504..05723b64b240 100644 --- a/pkgs/development/tools/protoc-gen-dart/pubspec.lock.json +++ b/pkgs/development/tools/protoc-gen-dart/pubspec.lock.json @@ -4,91 +4,97 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051", + "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77", "url": "https://pub.dev" }, "source": "hosted", - "version": "64.0.0" + "version": "73.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893", + "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.0" + "version": "6.8.0" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.6.0" }, "async": { "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "boolean_selector": { "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "collection": { "dependency": "direct dev", "description": { "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.0" + "version": "1.19.1" }, "convert": { "dependency": "transitive", "description": { "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.1.2" }, "coverage": { "dependency": "transitive", "description": { "name": "coverage", - "sha256": "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097", + "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.6.3" + "version": "1.11.1" }, "crypto": { "dependency": "transitive", "description": { "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "3.0.6" }, "dart_flutter_team_lints": { "dependency": "direct dev", @@ -104,31 +110,31 @@ "dependency": "transitive", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "fixnum": { "dependency": "direct main", "description": { "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "frontend_server_client": { "dependency": "transitive", "description": { "name": "frontend_server_client", - "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "4.0.0" }, "glob": { "dependency": "transitive", @@ -144,41 +150,41 @@ "dependency": "transitive", "description": { "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "http_parser": { "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.2" }, "io": { "dependency": "transitive", "description": { "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "js": { "dependency": "transitive", "description": { "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.7" + "version": "0.7.1" }, "lints": { "dependency": "transitive", @@ -194,41 +200,51 @@ "dependency": "transitive", "description": { "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" }, "matcher": { "dependency": "direct dev", "description": { "name": "matcher", - "sha256": "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16" + "version": "0.12.17" }, "meta": { "dependency": "transitive", "description": { "name": "meta", - "sha256": "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.1" + "version": "1.16.0" }, "mime": { "dependency": "transitive", "description": { "name": "mime", - "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "2.0.0" }, "node_preamble": { "dependency": "transitive", @@ -244,21 +260,21 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "path": { "dependency": "direct main", "description": { "name": "path", - "sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.8.3" + "version": "1.9.1" }, "pool": { "dependency": "transitive", @@ -273,31 +289,32 @@ "protobuf": { "dependency": "direct main", "description": { - "path": "../protobuf", - "relative": true + "name": "protobuf", + "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d", + "url": "https://pub.dev" }, - "source": "path", + "source": "hosted", "version": "3.1.0" }, "pub_semver": { "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.1.5" }, "shelf": { "dependency": "transitive", "description": { "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.2" }, "shelf_packages_handler": { "dependency": "transitive", @@ -313,184 +330,204 @@ "dependency": "transitive", "description": { "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.3" }, "shelf_web_socket": { "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "2.0.1" }, "source_map_stack_trace": { "dependency": "transitive", "description": { "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "source_maps": { - "dependency": "transitive", - "description": { - "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.12" - }, - "source_span": { - "dependency": "transitive", - "description": { - "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, - "stack_trace": { - "dependency": "transitive", - "description": { - "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.1" - }, - "stream_channel": { - "dependency": "transitive", - "description": { - "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", "url": "https://pub.dev" }, "source": "hosted", "version": "2.1.2" }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.1" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "4ac0537115a24d772c408a2520ecd0abb99bca2ea9c4e634ccbdbfae64fe17ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, "string_scanner": { "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.4.1" }, "term_glyph": { "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test": { "dependency": "direct dev", "description": { "name": "test", - "sha256": "9b0dd8e36af4a5b1569029949d50a52cb2a2a2fdaa20cebb96e6603b9ae241f9", + "sha256": "8391fbe68d520daf2314121764d38e37f934c02fd7301ad18307bd93bd6b725d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.24.6" + "version": "1.25.14" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.1" + "version": "0.7.4" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "4bef837e56375537055fdbbbf6dd458b1859881f4c7e6da936158f77d61ab265", + "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.6" + "version": "0.6.8" }, "typed_data": { "dependency": "transitive", "description": { "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.4.0" }, "vm_service": { "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583", + "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.10.0" + "version": "15.0.0" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", "url": "https://pub.dev" }, "source": "hosted", "version": "1.1.0" }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "3.0.1" }, "webkit_inspection_protocol": { "dependency": "transitive", "description": { "name": "webkit_inspection_protocol", - "sha256": "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.2.1" }, "yaml": { "dependency": "transitive", "description": { "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" } }, "sdks": { - "dart": ">=3.0.0 <4.0.0" + "dart": ">=3.5.0 <4.0.0" } } diff --git a/pkgs/development/tools/protoc-gen-dart/update.sh b/pkgs/development/tools/protoc-gen-dart/update.sh index 5bea5f3bea84..888315460c49 100755 --- a/pkgs/development/tools/protoc-gen-dart/update.sh +++ b/pkgs/development/tools/protoc-gen-dart/update.sh @@ -5,14 +5,14 @@ set -xeu -o pipefail PACKAGE_DIR="$(realpath "$(dirname "$0")")" cd "$PACKAGE_DIR/.." -while ! test -f flake.nix; do cd .. ; done +while ! test -f flake.nix; do cd ..; done NIXPKGS_DIR="$PWD" version="$( - list-git-tags --url=https://github.com/google/protobuf.dart \ - | rg '^protobuf-v(.*)' -r '$1' \ - | sort --version-sort \ - | tail -n1 + list-git-tags --url=https://github.com/google/protobuf.dart | + rg '^protoc_plugin-v(.*)' -r '$1' | + sort --version-sort | + tail -n1 )" cd "$NIXPKGS_DIR" @@ -28,6 +28,6 @@ if ! test -f pubspec.lock; then dart pub update fi -yq . pubspec.lock > "$PACKAGE_DIR/pubspec.lock.json" +yq . pubspec.lock >"$PACKAGE_DIR/pubspec.lock.json" rm -rf "$TMPDIR" diff --git a/pkgs/games/curseofwar/default.nix b/pkgs/games/curseofwar/default.nix index 0a74065cec93..2bf91002024e 100644 --- a/pkgs/games/curseofwar/default.nix +++ b/pkgs/games/curseofwar/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Fast-paced action strategy game"; homepage = "https://a-nikolaev.github.io/curseofwar/"; license = licenses.gpl3; + mainProgram = if SDL != null then "curseofwar-sdl" else "curseofwar"; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index f69c15ecfa3f..a5d5b5d2355e 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -32,19 +32,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "18.7"; + version = "18.8.2"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-mOXD7lEggFus+TBZ5042QALu4PhHRBntnChQFnHu6Dw="; + hash = "sha256-+X56o8s9kbNxufDeQVLAaVG8jxcSTFVssn1HnxIHhZQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-zug7MzxqGhlmm6ZeRo+3ldwmFEn5cVCb+nvRzomFrnc="; + hash = "sha256-b1JOj8p5+Q2SvmbBvLxGFPCLALcOc4mAdegPCsMnNqc="; }; nativeBuildInputs = [ diff --git a/pkgs/kde/third-party/krohnkite/default.nix b/pkgs/kde/third-party/krohnkite/default.nix index ddf7c3b2f121..75c3b01995a8 100644 --- a/pkgs/kde/third-party/krohnkite/default.nix +++ b/pkgs/kde/third-party/krohnkite/default.nix @@ -9,16 +9,16 @@ }: buildNpmPackage rec { pname = "krohnkite"; - version = "0.9.8.4"; + version = "0.9.8.5"; src = fetchFromGitHub { owner = "anametologin"; repo = "krohnkite"; tag = version; - hash = "sha256-VVHusFuQ/awfFV4izId7VPYCrS8riTavhpB2KpJ9084="; + hash = "sha256-DcNU0nx6KHztfMPFs5PZtZIeu4hDxNYIJa5E1fwMa0Q="; }; - npmDepsHash = "sha256-k44SltKLR/Y8qWFCLW2jBWElk9JGn+0azQn0G1f0vuY="; + npmDepsHash = "sha256-Q/D6s0wOPSEziE1dBXgTakjhXCGvzhvLVS7zXcZlPCI="; dontWrapQtApps = true; diff --git a/pkgs/kde/third-party/krohnkite/package-lock.json b/pkgs/kde/third-party/krohnkite/package-lock.json index 114667dcd9d1..3360fa3a9c42 100644 --- a/pkgs/kde/third-party/krohnkite/package-lock.json +++ b/pkgs/kde/third-party/krohnkite/package-lock.json @@ -1,12 +1,12 @@ { "name": "krohnkite", - "version": "0.9.8.4", + "version": "0.9.8.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "krohnkite", - "version": "0.9.8.4", + "version": "0.9.8.5", "license": "MIT", "devDependencies": { "mocha": "^10.4.0", diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 74b201bc133c..39aabfb30332 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -58,7 +58,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-battery"; rev = "f8b8e8451990365e0c98c38c184962e4f83b793b"; - sha256 = "1bhdzsx3kdjqjmm1q4j8937lrpkzf71irr3fqhdbddsghwrrmwim"; + hash = "sha256-NfKaM4dPt7YaxG7kHMNxf95Mz0hIEhxqlVi2Obr+Da4="; }; }; @@ -69,7 +69,7 @@ in rec { owner = "NHDaly"; repo = "tmux-better-mouse-mode"; rev = "aa59077c635ab21b251bd8cb4dc24c415e64a58e"; - sha256 = "06346ih3hzwszhkj25g4xv5av7292s6sdbrdpx39p0n3kgf5mwww"; + hash = "sha256-nPNa3JvDgptGvy2vpo0WSZytyu7kFSEn/Jp/OGA0ZBg="; }; rtpFilePath = "scroll_copy_mode.tmux"; meta = { @@ -117,7 +117,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-continuum"; rev = "fc2f31d79537a5b349f55b74c8ca69abaac1ddbb"; - sha256 = "06i1jp83iybw76raaxciqz9a7ypgpkvbyjn6jjap8jpqfmj2wmjb"; + hash = "sha256-S1YuZHX4SnSVlMZKv/a87/qj0seRdaWyOXz5ONCVIRo="; }; meta = { homepage = "https://github.com/tmux-plugins/tmux-continuum"; @@ -169,7 +169,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-copycat"; rev = "77ca3aab2aed8ede3e2b941079b1c92dd221cf5f"; - sha256 = "1bchwzhai8k5rk32n4lrmh56rw944jqxr8imjk74hyaa7bbn81ds"; + hash = "sha256-ugVk1zpKeUjOlDWi3LEkJPFsCqyZEivGzGWiqODnkK0="; }; }; @@ -180,7 +180,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-cpu"; rev = "98d787191bc3e8f19c3de54b96ba1caf61385861"; - sha256 = "sha256-ymmCI6VYvf94Ot7h2GAboTRBXPIREP+EB33+px5aaJk="; + hash = "sha256-ymmCI6VYvf94Ot7h2GAboTRBXPIREP+EB33+px5aaJk="; }; }; @@ -191,7 +191,7 @@ in rec { owner = "eraserhd"; repo = "tmux-ctrlw"; rev = "v${version}"; - sha256 = "1kv5pqfjczd6z7i9jf6j5xmcai50l9bn5p2p1w1l5fi6cj8cz1k1"; + hash = "sha256-YYbPkGQmukIDD1fcYleioETFai/SOJni+aZ9Jh2+Zc8="; }; }; @@ -220,7 +220,7 @@ in rec { owner = "laktak"; repo = "extrakto"; rev = "bf9e666f2a6a8172ebe99fff61b574ba740cffc2"; - sha256 = "sha256-kIhJKgo1BDTeFyAPa//f/TrhPfV9Rfk9y4qMhIpCydk="; + hash = "sha256-kIhJKgo1BDTeFyAPa//f/TrhPfV9Rfk9y4qMhIpCydk="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.python3 ]; @@ -252,7 +252,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-fpp"; rev = "ca125d5a9c80bb156ac114ac3f3d5951a795c80e"; - sha256 = "1b89s6mfzifi7s5iwf22w7niddpq28w48nmqqy00dv38z4yga5ws"; + hash = "sha256-mhf1PPlo7AaAx7haRDgS+LYW7eFCOB6LPtHF76rRCa0="; }; postInstall = '' sed -i -e 's|fpp |${pkgs.fpp}/bin/fpp |g' $target/fpp.tmux @@ -266,7 +266,7 @@ in rec { owner = "roosta"; repo = "tmux-fuzzback"; rev = "bfd9cf0ef1c35488f0080f0c5ca4fddfdd7e18ec"; - sha256 = "w788xDBkfiLdUVv1oJi0YikFPqVk6LiN6PDfHu8on5E="; + hash = "sha256-w788xDBkfiLdUVv1oJi0YikFPqVk6LiN6PDfHu8on5E="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' @@ -311,7 +311,7 @@ in rec { owner = "egel"; repo = "tmux-gruvbox"; rev = "3f9e38d7243179730b419b5bfafb4e22b0a969ad"; - sha256 = "1l0kq77rk3cbv0rvh7bmfn90vvqqmywn9jk6gbl9mg3qbynq5wcf"; + hash = "sha256-jvGCrV94vJroembKZLmvGO8NknV1Hbgz2IuNmc/BE9A="; }; }; @@ -323,7 +323,7 @@ in rec { owner = "schasse"; repo = "tmux-jump"; rev = "416f613d3eaadbe1f6f9eda77c49430527ebaffb"; - sha256 = "1xbzdyhsgaq2in0f8f491gwjmx6cxpkf2c35d2dk0kg4jfs505sz"; + hash = "sha256-XxdQtJPkTTCbaGUw4ebtzPQq+QuJOOSAjQKrp6Fvf/U="; }; postInstall = '' sed -i -e 's|ruby|${pkgs.ruby}/bin/ruby|g' $target/scripts/tmux-jump.sh @@ -344,7 +344,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-logging"; rev = "b085ad423b5d59a2c8b8d71772352e7028b8e1d0"; - sha256 = "0p0sawysalhi8k2a5hdxniqx6kb24kd8rnvfzkjqigzid5ik37js"; + hash = "sha256-Wp4xY2nxv4jl/G7bjNokYk3TcbS9waLERBFSpT1XGlw="; }; }; @@ -355,7 +355,7 @@ in rec { owner = "MunifTanjim"; repo = "tmux-mode-indicator"; rev = "11520829210a34dc9c7e5be9dead152eaf3a4423"; - sha256 = "sha256-hlhBKC6UzkpUrCanJehs2FxK5SoYBoiGiioXdx6trC4="; + hash = "sha256-hlhBKC6UzkpUrCanJehs2FxK5SoYBoiGiioXdx6trC4="; }; meta = with lib; { homepage = "https://github.com/MunifTanjim/tmux-mode-indicator"; @@ -373,7 +373,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-net-speed"; rev = "58abb615971cb617821e2e7e41c660334f55a92d"; - sha256 = "1aj06gdhzcxsydjzf21n9kyxigwf38kh2rg8hh7gnjk260ydqlrc"; + hash = "sha256-LFPcPDBiSvsOhOhlAScajr/Y/Uw2CPdl87qzD9szQKo="; }; }; @@ -409,7 +409,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-maildir-counter"; rev = "9415f0207e71e37cbd870c9443426dbea6da78b9"; - sha256 = "0dwvqhiv9bjwr01hsi5c57n55jyv5ha5m5q1aqgglf4wyhbnfms4"; + hash = "sha256-RFdnF/ScOPoeVgGXWhQs28tS7CmsRA0DyFyutCPEmzc="; }; }; @@ -420,7 +420,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-online-status"; rev = "ea86704ced8a20f4a431116aa43f57edcf5a6312"; - sha256 = "1hy3vg8v2sir865ylpm2r4ip1zgd4wlrf24jbwh16m23qdcvc19r"; + hash = "sha256-OQW2WcNDVBMgX5IIlykn7f1wI8miXuqLQTlqsdHbw8M="; }; }; @@ -431,7 +431,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-open"; rev = "cedb4584908bd8458fadc8d3e64101d3cbb48d46"; - sha256 = "10s0xdhmg0dhpj13ybcq72pw3xgb2dq5v5h2mwidzqyh9g17wndh"; + hash = "sha256-sFl+wkvQ498irwKWXXAT6/XBrziYLT+CvLCBV2HrQIM="; }; }; @@ -443,7 +443,7 @@ in rec { owner = "odedlaz"; repo = "tmux-onedark-theme"; rev = "3607ef889a47dd3b4b31f66cda7f36da6f81b85c"; - sha256 = "19jljshwp2p83b634cd1mw69091x42jj0dg40ipw61qy6642h2m5"; + hash = "sha256-pQooiDEeB8NvBOQ1IKUgPSSQDK+hMTLMGuiKy6GWVKY="; }; }; @@ -454,7 +454,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-pain-control"; rev = "2db63de3b08fc64831d833240749133cecb67d92"; - sha256 = "0w7a6n4n86ysiqcqj12j2hg9r5fznvbp3dz8pzas9q1k3avlk0zk"; + hash = "sha256-84NJtxoz4KTVv+i3cde235WcHhRSBIkZjtobZIk16nA="; }; }; @@ -466,7 +466,7 @@ in rec { owner = "rafi"; repo = "tmux-pass"; rev = "76b1c98911d56928063a41bc93a2d9e81818ef4c"; - sha256 = "sha256-bamz4IZrozo5R7jt+z7YKyrogawPqsZ9cTJi9osjVoA="; + hash = "sha256-bamz4IZrozo5R7jt+z7YKyrogawPqsZ9cTJi9osjVoA="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; @@ -494,7 +494,7 @@ in rec { owner = "eraserhd"; repo = "tmux-plumb"; rev = "v${version}"; - sha256 = "1c6k4fdl0az9811r6k164mgd4w5la75xr6x7nabmy046xc0z5i2r"; + hash = "sha256-WcTyAeuGAF+Xsqeb3MtRtHDSXiUmTJNDQOkrQJsj07A="; }; postInstall = '' sed -i -e 's,9 plumb,${pkgs.plan9port}/bin/9 plumb,' $target/scripts/plumb @@ -526,7 +526,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-prefix-highlight"; rev = "15acc6172300bc2eb13c81718dc53da6ae69de4f"; - sha256 = "08rkflfnynxgv2s26b33l199h6xcqdfmlqbyqa1wkw7h85br3dgl"; + hash = "sha256-9LWRV0Hw8MmDwn5hWl3DrBuYUqBjLCO02K9bbx11MyM="; }; }; @@ -537,7 +537,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-resurrect"; rev = "ca6468e2deef11efadfe3a62832ae67742505432"; - sha256 = "0d7jg5dy4jq64679rf2zqmqbvgiqvpcj5jxfljk7d7y86dnqhj3n"; + hash = "sha256-dkiIbTPIn3ampK7LItndOL69cMVfuJyOIQZL4lt58jQ="; }; meta = { homepage = "https://github.com/tmux-plugins/tmux-resurrect"; @@ -575,7 +575,7 @@ in rec { owner = "rose-pine"; repo = "tmux"; rev = "dd6d01338ac4afeb96542dcf24e4a7fe179b69e6"; - sha256 = "sha256-Tccb4VjdotOSw7flJV4N0H4557NxRhXiCecZBPU9ICQ="; + hash = "sha256-Tccb4VjdotOSw7flJV4N0H4557NxRhXiCecZBPU9ICQ="; }; meta = { homepage = "https://github.com/rose-pine/tmux"; @@ -591,7 +591,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-sensible"; rev = "25cb91f42d020f675bb0a2ce3fbd3a5d96119efa"; - sha256 = "sha256-sw9g1Yzmv2fdZFLJSGhx1tatQ+TtjDYNZI5uny0+5Hg="; + hash = "sha256-sw9g1Yzmv2fdZFLJSGhx1tatQ+TtjDYNZI5uny0+5Hg="; }; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -e 's:reattach-to-user-namespace:${pkgs.reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux @@ -606,7 +606,7 @@ in rec { owner = "27medkamal"; repo = "tmux-session-wizard"; rev = "V${version}"; - sha256 = "sha256-mLpZQSo8nildawsPxGwkcETNwlRq6O1pfy/VusMNMaw="; + hash = "sha256-mLpZQSo8nildawsPxGwkcETNwlRq6O1pfy/VusMNMaw="; }; meta = with lib; { homepage = "https://github.com/27medkamal/tmux-session-wizard"; @@ -640,7 +640,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-sessionist"; rev = "09ec86be38eae98ffc27bd0dde605ed10ae0dc89"; - sha256 = "030q2mmj8akbc26jnqn8n7fckg1025p0ildx4wr401b6p1snnlw4"; + hash = "sha256-hFNrdbhmBUAyJ73RCG4RILzJ3LHIYiuNYGsqJGsVGAw="; }; }; @@ -651,7 +651,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-sidebar"; rev = "aacbdb45bc5ab69db448a72de4155d0b8dbac677"; - sha256 = "1bp90zbv19kbbiik0bgb893ybss1jqsnk3353a631993xjwsih7c"; + hash = "sha256-7MCouewjpTCMGmWMaTWWQevlR0LrLTBjXGumsNcH6a4="; }; }; @@ -662,7 +662,7 @@ in rec { owner = "samoshkin"; repo = "tmux-plugin-sysstat"; rev = "29e150f403151f2341f3abcb2b2487a5f011dd23"; - sha256 = "013mv9p6r2r0ls3p60l8hdad4hm8niv3wr27vgm925gxmibi4hyq"; + hash = "sha256-2EMSV6z9FZHq20dkPna0qELSVIOIAnOHpiCLbG7adQQ="; }; }; @@ -673,7 +673,7 @@ in rec { owner = "jabirali"; repo = "tmux-tilish"; rev = "22f7920837d827dc6cb31143ea916afa677c24c1"; - sha256 = "wP3c+p/DM6ve7GUhi0QEzggct7NS4XUa78sVQFSKrfo="; + hash = "sha256-wP3c+p/DM6ve7GUhi0QEzggct7NS4XUa78sVQFSKrfo="; }; meta = with lib; { @@ -711,7 +711,7 @@ in rec { owner = "seebi"; repo = "tmux-colors-solarized"; rev = "e5e7b4f1af37f8f3fc81ca17eadee5ae5d82cd09"; - sha256 = "1l3i82abzi4b395cgdsjg7lcfaq15kyyhijwvrgchzxi95z3hl4x"; + hash = "sha256-nVA4fkmxf8he3lxG6P0sASvH6HlSt8dKGovEv5RAcdA="; }; }; @@ -803,7 +803,7 @@ in rec { owner = "joshmedeski"; repo = "t-smart-tmux-session-manager"; rev = "v${version}"; - sha256 = "sha256-EMDEEIWJ+XFOk0WsQPAwj9BFBVDNwFUCyd1ScceqKpc="; + hash = "sha256-EMDEEIWJ+XFOk0WsQPAwj9BFBVDNwFUCyd1ScceqKpc="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' @@ -824,7 +824,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-urlview"; rev = "b84c876cffdd22990b4ab51247e795cbd7813d53"; - sha256 = "1jp4jq57cn116b3i34v6yy69izd8s6mp2ijr260cw86g0470k0fn"; + hash = "sha256-1oEJDgHPIM6AEVlGcavRqP2YjPdmkxHHMiFYdgqW5Mo="; }; postInstall = '' sed -i -e '14,20{s|extract_url|${pkgs.extract_url}/bin/extract_url|g}' $target/urlview.tmux @@ -838,7 +838,7 @@ in rec { owner = "tmux-plugins"; repo = "vim-tmux-focus-events"; rev = "a568192ca0de4ca0bd7b3cd0249aad491625c941"; - sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1"; + hash = "sha256-ITZMu2q80deOf0zqgYJDDgWQHWhJEzZlK6lVFPY4FIw="; }; meta = with lib; { @@ -889,7 +889,7 @@ in rec { owner = "tmux-plugins"; repo = "tmux-yank"; rev = "acfd36e4fcba99f8310a7dfb432111c242fe7392"; - sha256 = "sha256-/5HPaoOx2U2d8lZZJo5dKmemu6hKgHJYq23hxkddXpA="; + hash = "sha256-/5HPaoOx2U2d8lZZJo5dKmemu6hKgHJYq23hxkddXpA="; }; }; @@ -901,7 +901,7 @@ in rec { owner = "o0th"; repo = "tmux-nova"; rev = "v${version}"; - sha256 = "16llz3nlyw88lyd8mmj27i0ncyhpfjj5c1yikngf7nxcqsbjmcnh"; + hash = "sha256-0LIql8as2+OendEHVqR0F3pmQTxC1oqapwhxT+34lJo="; }; meta = with lib; { homepage = "https://github.com/o0th/tmux-nova"; diff --git a/pkgs/os-specific/linux/qc71_laptop/default.nix b/pkgs/os-specific/linux/qc71_laptop/default.nix index effd8ed5818e..952337ef282b 100644 --- a/pkgs/os-specific/linux/qc71_laptop/default.nix +++ b/pkgs/os-specific/linux/qc71_laptop/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux driver for QC71 laptop"; homepage = "https://github.com/pobrn/qc71_laptop/"; - license = licenses.gpl2Plus; + license = licenses.gpl2Only; maintainers = with maintainers; [ aacebedo ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 035451a2732c..ab86d5e31c21 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 = "2025.1.0"; + version = "2025.1.1"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix index 3c5243386135..58a5fae706d7 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "al-one"; domain = "xiaomi_miot"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "al-one"; repo = "hass-xiaomi-miot"; rev = "v${version}"; - hash = "sha256-V7GPxyRPeyHXJErW/q9o7a+kbhrE46nDjYiSKvEMKnw="; + hash = "sha256-DTIXhs5gPN96C/fWz3s7ZTOybp7Mx+/NbNGXIOGyMmk="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7005a41f5cfc..982e396b88dd 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -289,7 +289,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.1.0"; + hassVersion = "2025.1.1"; in python.pkgs.buildPythonApplication rec { @@ -310,13 +310,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-tkjOWJ29fvWzto3y6zV8h8yPIGyhC5sBIL5koOsw5i0="; + hash = "sha256-fiGdRXQmH+CcgnGQloktl66Yh8iiFEDCQyOL3jfXjdU="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-xaHD93crz4wm3CwX5d/UxeuOQ769G+ZnA26iE7y7hU4="; + hash = "sha256-CYvi2Z1d3hbcfet08TR/jScuOKGgipTEWmno7/r5qLU="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 3551e61b0826..60b22f13295d 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,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 = "20250103.0"; + version = "20250106.0"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-i+XOHFGL7UVxL+bNohhi+8pF1kZ5oOY5EpZHR3NbwL4="; + hash = "sha256-Jhbw/HNOInLAihHeP+Vpsvsukjf3OY32EbBayDEuU+k="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 23c821a49738..3254c7594ca8 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.200"; + version = "0.13.201"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-aZeC003EGa8qBR+sN3EK1EbbwLZqdzNf1bjTQyQ6l9I="; + hash = "sha256-WWfVxLYW5V5q0huBoST3n64Fm9f69rjv8B6g96ZaFDc="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 85796e4b15c5..7943fc3137c0 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.1.0"; + version = "2025.1.1"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-qKmHQrciezgGPHNNGy7lDM9LaCXJO/DuYIrk8qjWpDQ="; + hash = "sha256-9z8HX9zNzRfMTWJiHwbCpOAmYF9yfHsM/FR9siB7D/E="; }; build-system = [ diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index e7dcf7b5616f..fd8cb76ec590 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -10,15 +10,15 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-HPWmW3U0CMfF2/2pxmrMBNGJtMCJOuw/Iek0wRTR3qc="; - arm64-linux_hash = "sha256-LPcnWEcoQht+KlmAywpv89Wj/tQzaIMaMOxFamspEBI="; - x64-osx_hash = "sha256-rOwljrG216cJmG7BwrOANSsEwfpsX7DopPP7mpQ1uI4="; - arm64-osx_hash = "sha256-hKKW+WsKe1zRusBXKzTjiv64Ieo56got8ftWATGanjE="; + x64-linux_hash = "sha256-08jQhaPPS4zEQuJ2ovP/ZsNXG1dJvia4X6RrXywHNao="; + arm64-linux_hash = "sha256-70IWCu48jvoTHo8Q/78n/ZDmhFwm9PZOYXUl/17insg="; + x64-osx_hash = "sha256-fJAjGx5l4wa27krZFAeKvrWDk9p02HtXhbDv04x0+sA="; + arm64-osx_hash = "sha256-GmWDseb8MrpKIL50KAbTFjzu1MoEZXpzUI44Xwaeoeo="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "5.16.3.9541"; + version = "5.17.2.9580"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/tools/misc/vrc-get/default.nix b/pkgs/tools/misc/vrc-get/default.nix index 6e15af4c01a1..ec5c92ee9012 100644 --- a/pkgs/tools/misc/vrc-get/default.nix +++ b/pkgs/tools/misc/vrc-get/default.nix @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { pname = "vrc-get"; - version = "1.8.2"; + version = "1.9.0"; src = fetchCrate { inherit pname version; - hash = "sha256-4ZiN9sl4VImb3ufF6L9k5t45tmV1RUSvm3NL52waj0o="; + hash = "sha256-gZtaeq/PDVFZPIMH/cB/ZJNP+SbksPPbz8L8Hc7FDM8="; }; nativeBuildInputs = [ @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - cargoHash = "sha256-uPx9sujuvBp6wJzzqVlS8Rq1S9Cb2su9/gp4pnNJ9zQ="; + cargoHash = "sha256-xfW9pIaSL9bvGXk4XxRUVyvtRwKXmjS3Gc5b7v7q17A="; # Execute the resulting binary to generate shell completions, using emulation if necessary when cross-compiling. # If no emulator is available, then give up on generating shell completions diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 3f266c11bdfb..ff427b7e4fc9 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -29,6 +29,10 @@ bubblewrap, autoconf, gnupg, + + # Disable the unshare RPM plugin, which can be useful if + # RPM is ran within the Nix sandbox. + disableUnshare ? true, }: stdenv.mkDerivation rec { @@ -112,6 +116,9 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_LIBELF=OFF" "-DWITH_LIBDW=OFF" + ] + ++ lib.optionals disableUnshare [ + "-DHAVE_UNSHARE=OFF" ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be58ba5150cd..1e825bf260a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1944,10 +1944,6 @@ with pkgs; buildGoModule = buildGo123Module; }; - authoscope = callPackage ../tools/security/authoscope { - inherit (darwin.apple_sdk.frameworks) Security; - }; - avahi = callPackage ../development/libraries/avahi { }; avahi-compat = callPackage ../development/libraries/avahi { @@ -14109,7 +14105,7 @@ with pkgs; jabref = callPackage ../applications/office/jabref { jdk = jdk21.override { enableJavaFX = true; - openjfx_jdk = openjfx23.override { withWebKit = true; }; + openjfx_jdk = openjfx23; }; }; @@ -14557,6 +14553,8 @@ with pkgs; x11Support = true; }; + rquickshare-legacy = rquickshare.override { app-type = "legacy"; }; + seamly2d = libsForQt5.callPackage ../applications/graphics/seamly2d { }; # a somewhat more maintained fork of ympd diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 20c66d01c0bb..3e32d5aea390 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -452,6 +452,7 @@ mapAliases ({ pushbullet = pushbullet-py; # Added 2022-10-15 Pweave = pweave; # added 2023-02-19 pxml = throw "pxml was removed, because it was disabled on all python version since 3.8 and last updated in 2020."; # added 2024-05-13 + py3to2 = throw "py3to2 is unmaintained and source is no longer available"; # added 2024-10-23 py-radix = throw "py-radix has been removed, since it abandoned"; # added 2023-07-07 py_stringmatching = py-stringmatching; # added 2023-11-12 py17track = throw "py17track was removed because Home Assistant switched to pyseventeentrack"; # added 2024-08-08 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a341d150247..0c7f86aee44e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4634,8 +4634,12 @@ self: super: with self; { flake8-length = callPackage ../development/python-modules/flake8-length { }; + flake8-class-newline = callPackage ../development/python-modules/flake8-class-newline { }; + flake8-debugger = callPackage ../development/python-modules/flake8-debugger { }; + flake8-deprecated = callPackage ../development/python-modules/flake8-deprecated { }; + flake8-docstrings = callPackage ../development/python-modules/flake8-docstrings { }; flake8-future-import = callPackage ../development/python-modules/flake8-future-import { }; @@ -7621,6 +7625,8 @@ self: super: with self; { llm-gguf = callPackage ../development/python-modules/llm-gguf { }; + llm-ollama = callPackage ../development/python-modules/llm-ollama { }; + llmx = callPackage ../development/python-modules/llmx { }; llvmlite = callPackage ../development/python-modules/llvmlite { @@ -11277,8 +11283,6 @@ self: super: with self; { py3status = callPackage ../development/python-modules/py3status { }; - py3to2 = callPackage ../development/python-modules/3to2 { }; - py4j = callPackage ../development/python-modules/py4j { }; pyacaia-async = callPackage ../development/python-modules/pyacaia-async { }; @@ -15541,6 +15545,8 @@ self: super: with self; { stopit = callPackage ../development/python-modules/stopit { }; + stop-words = callPackage ../development/python-modules/stop-words { }; + stransi = callPackage ../development/python-modules/stransi { }; strategies = callPackage ../development/python-modules/strategies { };